@pnpm/installing.package-requester 1100.0.1 → 1101.0.0

package/lib/packageRequester.d.ts

@@ -1,6 +1,6 @@
 import type { Fetchers } from '@pnpm/fetching.fetcher-base';
 import type { CustomFetcher } from '@pnpm/hooks.types';
-import type { ResolveFunction } from '@pnpm/resolving.resolver-base';
+import { type ResolveFunction } from '@pnpm/resolving.resolver-base';
 import type { Cafs } from '@pnpm/store.cafs-types';
 import type { FetchPackageToStoreFunction, GetFilesIndexFilePath, RequestPackageFunction } from '@pnpm/store.controller-types';
 export declare function createPackageRequester(opts: {

package/lib/packageRequester.js

@@ -7,6 +7,7 @@ import { PnpmError } from '@pnpm/error';
 import { pickFetcher } from '@pnpm/fetching.pick-fetcher';
 import gfs from '@pnpm/fs.graceful-fs';
 import { logger } from '@pnpm/logger';
+import { resolvePlatformSelector, selectPlatformVariant, } from '@pnpm/resolving.resolver-base';
 import { normalizeBundledManifest, } from '@pnpm/store.cafs';
 import { gitHostedStoreIndexKey, storeIndexKey } from '@pnpm/store.index';
 import { calcMaxWorkers, readPkgFromCafs as _readPkgFromCafs, } from '@pnpm/worker';
@@ -249,24 +250,17 @@ function getFilesIndexFilePath(ctx, opts) {
     return { filesIndexFile, target, resolution };
 }
 function findResolution(resolutionVariants, supportedArchitectures) {
-    const platform = getOneIfNonCurrent(supportedArchitectures?.os) ?? process.platform;
-    const cpu = getOneIfNonCurrent(supportedArchitectures?.cpu) ?? process.arch;
-    const libc = getOneIfNonCurrent(supportedArchitectures?.libc) ?? getLibcFamilySync();
-    const resolutionVariant = resolutionVariants
-        .find((resolutionVariant) => resolutionVariant.targets.some((target) => target.os === platform &&
-        target.cpu === cpu &&
-        (target.libc == null || target.libc === libc)));
-    if (!resolutionVariant) {
+    const selector = resolvePlatformSelector(supportedArchitectures, {
+        platform: process.platform,
+        arch: process.arch,
+        libc: getLibcFamilySync(),
+    });
+    const variant = selectPlatformVariant(resolutionVariants, selector);
+    if (!variant) {
         const resolutionTargets = resolutionVariants.map((variant) => variant.targets);
         throw new PnpmError('NO_RESOLUTION_MATCHED', `Cannot find a resolution variant for the current platform in these resolutions: ${JSON.stringify(resolutionTargets)}`);
     }
-    return resolutionVariant.resolution;
-}
-function getOneIfNonCurrent(requirements) {
-    if (requirements?.length && requirements[0] !== 'current') {
-        return requirements[0];
-    }
-    return undefined;
+    return variant.resolution;
 }
 function fetchToStore(ctx, opts) {
     if (!opts.pkg.name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.package-requester",
-  "version": "1100.0.1",
+  "version": "1101.0.0",
   "description": "Concurrent downloader of npm-compatible packages",
   "keywords": [
     "pnpm",
@@ -36,22 +36,22 @@
     "semver": "^7.7.2",
     "ssri": "13.0.1",
     "@pnpm/config.package-is-installable": "1100.0.1",
-    "@pnpm/deps.path": "1100.0.1",
-    "@pnpm/fetching.fetcher-base": "1100.0.1",
     "@pnpm/core-loggers": "1100.0.1",
-    "@pnpm/fs.graceful-fs": "1100.0.0",
+    "@pnpm/deps.path": "1100.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.1",
-    "@pnpm/hooks.types": "1100.0.1",
-    "@pnpm/store.cafs": "1100.0.1",
-    "@pnpm/store.index": "1100.0.0",
-    "@pnpm/store.controller-types": "1100.0.1",
+    "@pnpm/fetching.fetcher-base": "1100.1.0",
+    "@pnpm/fs.graceful-fs": "1100.0.0",
+    "@pnpm/fetching.pick-fetcher": "1100.0.3",
+    "@pnpm/hooks.types": "1100.0.3",
+    "@pnpm/resolving.resolver-base": "1100.1.0",
+    "@pnpm/store.cafs": "1100.1.0",
+    "@pnpm/store.controller-types": "1100.0.3",
     "@pnpm/types": "1101.0.0",
-    "@pnpm/resolving.resolver-base": "1100.0.1"
+    "@pnpm/store.index": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1100.0.1"
+    "@pnpm/worker": "^1100.1.0"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
@@ -63,13 +63,13 @@
     "delay": "^7.0.0",
     "normalize-path": "^3.0.0",
     "tempy": "3.0.0",
-    "@pnpm/installing.client": "1100.0.1",
-    "@pnpm/installing.package-requester": "1100.0.1",
-    "@pnpm/logger": "1100.0.0",
+    "@pnpm/installing.package-requester": "1101.0.0",
+    "@pnpm/installing.client": "1100.0.4",
     "@pnpm/store.cafs-types": "1100.0.0",
+    "@pnpm/store.create-cafs-store": "1100.0.3",
+    "@pnpm/logger": "1100.0.0",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.mock-agent": "1100.0.1",
-    "@pnpm/store.create-cafs-store": "1100.0.1"
+    "@pnpm/testing.mock-agent": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"