@pnpm/node.resolver 1000.1.0 → 1001.0.0

package/lib/getNodeArtifactAddress.d.ts

@@ -0,0 +1,12 @@
+export interface NodeArtifactAddress {
+    basename: string;
+    extname: string;
+    dirname: string;
+}
+export interface GetNodeArtifactAddressOptions {
+    version: string;
+    baseUrl: string;
+    platform: string;
+    arch: string;
+}
+export declare function getNodeArtifactAddress({ version, baseUrl, platform, arch, }: GetNodeArtifactAddressOptions): NodeArtifactAddress;

package/lib/getNodeArtifactAddress.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNodeArtifactAddress = getNodeArtifactAddress;
+const normalizeArch_1 = require("./normalizeArch");
+function getNodeArtifactAddress({ version, baseUrl, platform, arch, }) {
+    const isWindowsPlatform = platform === 'win32';
+    const normalizedPlatform = isWindowsPlatform ? 'win' : platform;
+    const normalizedArch = (0, normalizeArch_1.getNormalizedArch)(platform, arch, version);
+    return {
+        dirname: `${baseUrl}v${version}`,
+        basename: `node-v${version}-${normalizedPlatform}-${normalizedArch}`,
+        extname: isWindowsPlatform ? '.zip' : '.tar.gz',
+    };
+}
+//# sourceMappingURL=getNodeArtifactAddress.js.map

package/lib/getNodeArtifactAddress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNodeArtifactAddress.js","sourceRoot":"","sources":["../src/getNodeArtifactAddress.ts"],"names":[],"mappings":";;AAeA,wDAcC;AA7BD,mDAAmD;AAenD,SAAgB,sBAAsB,CAAE,EACtC,OAAO,EACP,OAAO,EACP,QAAQ,EACR,IAAI,GAC0B;IAC9B,MAAM,iBAAiB,GAAG,QAAQ,KAAK,OAAO,CAAA;IAC9C,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAA;IAC/D,MAAM,cAAc,GAAG,IAAA,iCAAiB,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACjE,OAAO;QACL,OAAO,EAAE,GAAG,OAAO,IAAI,OAAO,EAAE;QAChC,QAAQ,EAAE,SAAS,OAAO,IAAI,kBAAkB,IAAI,cAAc,EAAE;QACpE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;KAChD,CAAA;AACH,CAAC"}

package/lib/index.d.ts

@@ -1,10 +1,11 @@
 import { type FetchFromRegistry } from '@pnpm/fetching-types';
-import { type WantedDependency, type NodeRuntimeResolution, type ResolveResult } from '@pnpm/resolver-base';
+import { type ResolveResult, type VariationsResolution, type WantedDependency } from '@pnpm/resolver-base';
 import { parseEnvSpecifier } from './parseEnvSpecifier';
 import { getNodeMirror } from './getNodeMirror';
-export { getNodeMirror, parseEnvSpecifier };
+import { getNodeArtifactAddress } from './getNodeArtifactAddress';
+export { getNodeMirror, parseEnvSpecifier, getNodeArtifactAddress };
 export interface NodeRuntimeResolveResult extends ResolveResult {
-    resolution: NodeRuntimeResolution;
+    resolution: VariationsResolution;
     resolvedVia: 'nodejs.org';
 }
 export declare function resolveNodeRuntime(ctx: {

package/lib/index.js

@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseEnvSpecifier = exports.getNodeMirror = void 0;
+exports.getNodeArtifactAddress = exports.parseEnvSpecifier = exports.getNodeMirror = void 0;
 exports.resolveNodeRuntime = resolveNodeRuntime;
 exports.resolveNodeVersion = resolveNodeVersion;
 exports.resolveNodeVersions = resolveNodeVersions;
 const constants_1 = require("@pnpm/constants");
-const crypto_hash_1 = require("@pnpm/crypto.hash");
 const crypto_shasums_file_1 = require("@pnpm/crypto.shasums-file");
 const error_1 = require("@pnpm/error");
 const semver_1 = __importDefault(require("semver"));
@@ -17,6 +16,8 @@ const parseEnvSpecifier_1 = require("./parseEnvSpecifier");
 Object.defineProperty(exports, "parseEnvSpecifier", { enumerable: true, get: function () { return parseEnvSpecifier_1.parseEnvSpecifier; } });
 const getNodeMirror_1 = require("./getNodeMirror");
 Object.defineProperty(exports, "getNodeMirror", { enumerable: true, get: function () { return getNodeMirror_1.getNodeMirror; } });
+const getNodeArtifactAddress_1 = require("./getNodeArtifactAddress");
+Object.defineProperty(exports, "getNodeArtifactAddress", { enumerable: true, get: function () { return getNodeArtifactAddress_1.getNodeArtifactAddress; } });
 async function resolveNodeRuntime(ctx, wantedDependency) {
     if (wantedDependency.alias !== 'node' || !wantedDependency.bareSpecifier?.startsWith('runtime:'))
         return null;
@@ -29,10 +30,11 @@ async function resolveNodeRuntime(ctx, wantedDependency) {
     if (!version) {
         throw new error_1.PnpmError('NODEJS_VERSION_NOT_FOUND', `Could not find a Node.js version that satisfies ${versionSpec}`);
     }
-    const { versionIntegrity: integrity, shasumsFileContent } = await loadShasumsFile(ctx.fetchFromRegistry, nodeMirrorBaseUrl, version);
+    const variants = await readNodeAssets(ctx.fetchFromRegistry, nodeMirrorBaseUrl, version);
+    const range = version === versionSpec ? version : `^${version}`;
     return {
         id: `node@runtime:${version}`,
-        normalizedBareSpecifier: `runtime:${versionSpec}`,
+        normalizedBareSpecifier: `runtime:${range}`,
         resolvedVia: 'nodejs.org',
         manifest: {
             name: 'node',
@@ -40,20 +42,51 @@ async function resolveNodeRuntime(ctx, wantedDependency) {
             bin: (0, constants_1.getNodeBinLocationForCurrentOS)(),
         },
         resolution: {
-            type: 'nodeRuntime',
-            integrity,
-            _shasumsFileContent: shasumsFileContent,
+            type: 'variations',
+            variants,
         },
     };
 }
-async function loadShasumsFile(fetch, nodeMirrorBaseUrl, version) {
+async function readNodeAssets(fetch, nodeMirrorBaseUrl, version) {
     const integritiesFileUrl = `${nodeMirrorBaseUrl}/v${version}/SHASUMS256.txt`;
-    const shasumsFileContent = await (0, crypto_shasums_file_1.fetchShasumsFile)(fetch, integritiesFileUrl);
-    const versionIntegrity = (0, crypto_hash_1.createHash)(shasumsFileContent);
-    return {
-        shasumsFileContent,
-        versionIntegrity,
-    };
+    const shasumsFileItems = await (0, crypto_shasums_file_1.fetchShasumsFile)(fetch, integritiesFileUrl);
+    const escaped = version.replace(/\\/g, '\\\\').replace(/\./g, '\\.');
+    const pattern = new RegExp(`^node-v${escaped}-([^-.]+)-([^.]+)\\.(?:tar\\.gz|zip)$`);
+    const assets = [];
+    for (const { integrity, fileName } of shasumsFileItems) {
+        const match = pattern.exec(fileName);
+        if (!match)
+            continue;
+        let [, platform, arch] = match;
+        if (platform === 'win') {
+            platform = 'win32';
+        }
+        const address = (0, getNodeArtifactAddress_1.getNodeArtifactAddress)({
+            version,
+            baseUrl: nodeMirrorBaseUrl,
+            platform,
+            arch,
+        });
+        const url = `${address.dirname}/${address.basename}${address.extname}`;
+        const resolution = {
+            type: 'binary',
+            archive: address.extname === '.zip' ? 'zip' : 'tarball',
+            bin: (0, constants_1.getNodeBinLocationForCurrentOS)(platform),
+            integrity,
+            url,
+        };
+        if (resolution.archive === 'zip') {
+            resolution.prefix = address.basename;
+        }
+        assets.push({
+            targets: [{
+                    os: platform,
+                    cpu: arch,
+                }],
+            resolution,
+        });
+    }
+    return assets;
 }
 const SEMVER_OPTS = {
     includePrerelease: true,

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/normalizeArch.d.ts

@@ -0,0 +1 @@
+export declare function getNormalizedArch(platform: string, arch: string, nodeVersion?: string): string;

package/lib/normalizeArch.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNormalizedArch = getNormalizedArch;
+function getNormalizedArch(platform, arch, nodeVersion) {
+    if (nodeVersion) {
+        const nodeMajorVersion = +nodeVersion.split('.')[0];
+        if ((platform === 'darwin' && arch === 'arm64' && (nodeMajorVersion < 16))) {
+            return 'x64';
+        }
+    }
+    if (platform === 'win32' && arch === 'ia32') {
+        return 'x86';
+    }
+    if (arch === 'arm') {
+        return 'armv7l';
+    }
+    return arch;
+}
+//# sourceMappingURL=normalizeArch.js.map

package/lib/normalizeArch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeArch.js","sourceRoot":"","sources":["../src/normalizeArch.ts"],"names":[],"mappings":";;AAAA,8CAcC;AAdD,SAAgB,iBAAiB,CAAE,QAAgB,EAAE,IAAY,EAAE,WAAoB;IACrF,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,gBAAgB,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACnD,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3E,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAA;IACjB,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/node.resolver",
-  "version": "1000.1.0",
+  "version": "1001.0.0",
   "description": "Resolves a Node.js version specifier to an exact Node.js version",
   "keywords": [
     "pnpm",
@@ -28,19 +28,18 @@
   "dependencies": {
     "semver": "^7.7.1",
     "version-selector-type": "^3.0.0",
-    "@pnpm/config": "1004.2.0",
-    "@pnpm/constants": "1001.2.0",
-    "@pnpm/crypto.hash": "1000.2.0",
-    "@pnpm/error": "1000.0.3",
+    "@pnpm/config": "1004.2.1",
+    "@pnpm/constants": "1001.3.0",
+    "@pnpm/crypto.shasums-file": "1001.0.0",
     "@pnpm/fetching-types": "1000.2.0",
-    "@pnpm/crypto.shasums-file": "1000.0.0",
-    "@pnpm/types": "1000.7.0",
-    "@pnpm/resolver-base": "1004.1.0"
+    "@pnpm/error": "1000.0.4",
+    "@pnpm/resolver-base": "1005.0.0",
+    "@pnpm/types": "1000.7.0"
   },
   "devDependencies": {
     "@types/semver": "7.5.3",
     "@pnpm/fetch": "1000.2.3",
-    "@pnpm/node.resolver": "1000.1.0"
+    "@pnpm/node.resolver": "1001.0.0"
   },
   "engines": {
     "node": ">=18.12"