Add identifier fallback for Apple Silicon architecture

Author: charlespierce

crates/volta-core/src/tool/node/metadata.rs

@@ -1,6 +1,8 @@
 use std::collections::HashSet;
 
 use super::NODE_DISTRO_IDENTIFIER;
+#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
+use super::NODE_DISTRO_IDENTIFIER_FALLBACK;
 use crate::version::{option_version_serde, version_serde};
 use semver::Version;
 use serde::{Deserialize, Deserializer};
@@ -37,6 +39,7 @@ impl From<RawNodeIndex> for NodeIndex {
             .0
             .into_iter()
             .filter_map(|entry| {
+                #[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
                 if entry.npm.is_some() && entry.files.contains(NODE_DISTRO_IDENTIFIER) {
                     Some(NodeEntry {
                         version: entry.version,
@@ -45,6 +48,19 @@ impl From<RawNodeIndex> for NodeIndex {
                 } else {
                     None
                 }
+
+                #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
+                if entry.npm.is_some()
+                    && (entry.files.contains(NODE_DISTRO_IDENTIFIER)
+                        || entry.files.contains(NODE_DISTRO_IDENTIFIER_FALLBACK))
+                {
+                    Some(NodeEntry {
+                        version: entry.version,
+                        lts: entry.lts,
+                    })
+                } else {
+                    None
+                }
             })
             .collect();
 

crates/volta-core/src/tool/node/mod.rs

@@ -39,12 +39,7 @@ cfg_if! {
         pub const NODE_DISTRO_EXTENSION: &str = "zip";
         /// The file identifier in the Node index `files` array
         pub const NODE_DISTRO_IDENTIFIER: &str = "win-x64-zip";
-    } else if #[cfg(all(target_os = "macos", any(target_arch = "x86_64", target_arch = "aarch64")))] {
-        // NOTE: Currently, Node does not provide prebuilt binaries for Apple M1 machines, so we
-        // fall back to using the x64 binaries through Rosetta 2. When Node starts shipping M1
-        // binaries, then we will need to adjust our logic to search for those first and only fall
-        // back if they aren't found
-
+    } else if #[cfg(all(target_os = "macos", target_arch = "x86_64"))] {
         /// The OS component of a Node distro filename
         pub const NODE_DISTRO_OS: &str = "darwin";
         /// The architecture component of a Node distro filename
@@ -53,6 +48,23 @@ cfg_if! {
         pub const NODE_DISTRO_EXTENSION: &str = "tar.gz";
         /// The file identifier in the Node index `files` array
         pub const NODE_DISTRO_IDENTIFIER: &str = "osx-x64-tar";
+    } else if #[cfg(all(target_os = "macos", target_arch = "aarch64"))] {
+        /// The OS component of a Node distro filename
+        pub const NODE_DISTRO_OS: &str = "darwin";
+        /// The architecture component of a Node distro filename
+        pub const NODE_DISTRO_ARCH: &str = "arm64";
+        /// The extension for Node distro files
+        pub const NODE_DISTRO_EXTENSION: &str = "tar.gz";
+        /// The file identifier in the Node index `files` array
+        pub const NODE_DISTRO_IDENTIFIER: &str = "osx-arm64-tar";
+
+        // NOTE: Node support for pre-built Apple Silicon binaries was added in major version 16
+        // For versions prior to that, we need to fall back on the x64 binaries via Rosetta 2
+
+        /// The fallback architecture component of a Node distro filename
+        pub const NODE_DISTRO_ARCH_FALLBACK: &str = "x64";
+        /// The fallback file identifier in the Node index `files` array
+        pub const NODE_DISTRO_IDENTIFIER_FALLBACK: &str = "osx-x64-tar";
     } else if #[cfg(all(target_os = "linux", target_arch = "x86_64"))] {
         /// The OS component of a Node distro filename
         pub const NODE_DISTRO_OS: &str = "linux";