@pnpm/resolving.resolver-base 1101.1.0 → 1101.1.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @pnpm/resolver-base
 
+## 1101.1.1
+
+### Patch Changes
+
+- A runtime installed through `devEngines.runtime` now matches the host when `supportedArchitectures` lists several platforms. Listing `os: [darwin, linux]` and `cpu: [x64, arm64]` used to install the runtime built for the first entry of each list, so a machine running Linux on arm64 got a macOS x64 Node.js that could not execute [#13898](https://github.com/pnpm/pnpm/issues/13898).
+
+- Updated dependencies:
+  - @pnpm/types@1102.0.0
+
 ## 1101.1.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -162,10 +162,10 @@ export interface PlatformSelector {
 }
 /**
  * Resolve a {@link PlatformSelector} from the user's supportedArchitectures config
- * and the host's own platform/arch/libc. When `supportedArchitectures.xxx` is set
- * and its first entry is not `"current"`, that entry wins; otherwise the host's
- * value is used. Additional entries beyond the first are ignored — variant
- * selection picks exactly one (os, cpu, libc) triplet per install.
+ * and the host's own platform/arch/libc. Exactly one (os, cpu, libc) triplet is
+ * installed, so each axis prefers the host's own value: a variant built for
+ * another platform cannot run here.
+ * @see https://github.com/pnpm/pnpm/issues/13898
  */
 export declare function resolvePlatformSelector(supportedArchitectures: SupportedArchitectures | undefined, host: {
     platform: string;

package/lib/index.js

@@ -87,16 +87,16 @@ export function classifyResolution(resolution) {
 }
 /**
  * Resolve a {@link PlatformSelector} from the user's supportedArchitectures config
- * and the host's own platform/arch/libc. When `supportedArchitectures.xxx` is set
- * and its first entry is not `"current"`, that entry wins; otherwise the host's
- * value is used. Additional entries beyond the first are ignored — variant
- * selection picks exactly one (os, cpu, libc) triplet per install.
+ * and the host's own platform/arch/libc. Exactly one (os, cpu, libc) triplet is
+ * installed, so each axis prefers the host's own value: a variant built for
+ * another platform cannot run here.
+ * @see https://github.com/pnpm/pnpm/issues/13898
  */
 export function resolvePlatformSelector(supportedArchitectures, host) {
     return {
-        os: pickFirstNonCurrent(supportedArchitectures?.os) ?? host.platform,
-        cpu: pickFirstNonCurrent(supportedArchitectures?.cpu) ?? host.arch,
-        libc: pickFirstNonCurrent(supportedArchitectures?.libc) ?? host.libc,
+        os: pickSupported(supportedArchitectures?.os, host.platform),
+        cpu: pickSupported(supportedArchitectures?.cpu, host.arch),
+        libc: pickSupported(supportedArchitectures?.libc, host.libc),
     };
 }
 /**
@@ -118,11 +118,12 @@ function libcMatches(variantLibc, requestedLibc) {
     }
     return variantLibc === requestedLibc;
 }
-function pickFirstNonCurrent(requirements) {
-    if (requirements?.length && requirements[0] !== 'current') {
-        return requirements[0];
-    }
-    return undefined;
+function pickSupported(requirements, hostValue) {
+    if (!requirements?.length)
+        return hostValue;
+    if (requirements.some((requirement) => requirement === 'current' || requirement === hostValue))
+        return hostValue;
+    return requirements[0];
 }
 // This weight is set for selectors that are used on direct dependencies.
 // It is important to give a bigger weight to direct dependencies.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/resolving.resolver-base",
-  "version": "1101.1.0",
+  "version": "1101.1.1",
   "description": "Types for pnpm-compatible resolvers",
   "keywords": [
     "pnpm",
@@ -28,11 +28,11 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/types": "1101.9.0"
+    "@pnpm/types": "1102.0.0"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/resolving.resolver-base": "1101.1.0"
+    "@pnpm/resolving.resolver-base": "1101.1.1"
   },
   "engines": {
     "node": ">=22.13"