@pnpm/engine.runtime.node-resolver 1101.1.7 → 1101.1.9

package/lib/index.js

@@ -25,7 +25,7 @@ export async function resolveNodeRuntime(ctx, wantedDependency, opts) {
     }
     if (ctx.offline)
         throw new PnpmError('NO_OFFLINE_NODEJS_RESOLUTION', 'Offline Node.js resolution is not supported');
-    const versionSpec = wantedDependency.bareSpecifier.substring('runtime:'.length);
+    const versionSpec = normalizeRuntimeSpec(wantedDependency.bareSpecifier.substring('runtime:'.length));
     const { releaseChannel, versionSpecifier } = parseNodeSpecifier(versionSpec);
     const nodeMirrorBaseUrl = getNodeMirror(ctx.nodeDownloadMirrors, releaseChannel);
     const version = await resolveNodeVersion(ctx.fetchFromRegistry, versionSpecifier, nodeMirrorBaseUrl);
@@ -33,7 +33,7 @@ export async function resolveNodeRuntime(ctx, wantedDependency, opts) {
         throw new PnpmError('NODEJS_VERSION_NOT_FOUND', `Could not find a Node.js version that satisfies ${versionSpec}`);
     }
     const variants = await readNodeAssets(ctx.fetchFromRegistry, nodeMirrorBaseUrl, version, releaseChannel);
-    const range = version === versionSpec ? version : `^${version}`;
+    const range = createNodeRuntimeVersionSpec(versionSpec, version, wantedDependency);
     return {
         id: `node@runtime:${version}`,
         normalizedBareSpecifier: `runtime:${range}`,
@@ -53,7 +53,7 @@ export async function resolveLatestNodeRuntime(ctx, query, _opts) {
     const manifestSpec = query.wantedDependency.bareSpecifier;
     if (query.wantedDependency.alias !== 'node' || !manifestSpec?.startsWith('runtime:'))
         return undefined;
-    const versionSpec = query.compatible ? manifestSpec.substring('runtime:'.length) : 'latest';
+    const versionSpec = query.compatible ? normalizeRuntimeSpec(manifestSpec.substring('runtime:'.length)) : 'latest';
     const { releaseChannel, versionSpecifier } = parseNodeSpecifier(versionSpec);
     const nodeMirrorBaseUrl = getNodeMirror(ctx.nodeDownloadMirrors, releaseChannel);
     const version = await resolveNodeVersion(ctx.fetchFromRegistry, versionSpecifier, nodeMirrorBaseUrl);
@@ -61,6 +61,20 @@ export async function resolveLatestNodeRuntime(ctx, query, _opts) {
         return {};
     return { latestManifest: { name: 'node', version } };
 }
+function createNodeRuntimeVersionSpec(versionSpec, resolvedVersion, wantedDependency) {
+    if (resolvedVersion === versionSpec || semver.parse(resolvedVersion)?.prerelease.length) {
+        return resolvedVersion;
+    }
+    const source = wantedDependency.prevSpecifier?.startsWith('runtime:')
+        ? wantedDependency.prevSpecifier.substring('runtime:'.length)
+        : versionSpec;
+    const spec = source.includes('/') ? source.split('/', 2)[1] : source;
+    if (spec.startsWith('^'))
+        return `^${resolvedVersion}`;
+    if (spec.startsWith('~'))
+        return `~${resolvedVersion}`;
+    return resolvedVersion;
+}
 async function readNodeAssets(fetch, nodeMirrorBaseUrl, version, releaseChannel) {
     // The mirror is repository-configurable, so the SHASUMS file's hashes are only
     // trustworthy once its OpenPGP signature is verified against the Node.js
@@ -142,6 +156,7 @@ const SEMVER_OPTS = {
 };
 export async function resolveNodeVersion(fetch, versionSpec, nodeMirrorBaseUrl) {
     const allVersions = await fetchAllVersions(fetch, nodeMirrorBaseUrl);
+    versionSpec = normalizeRuntimeSpec(versionSpec);
     if (versionSpec === 'latest') {
         return allVersions[0].version;
     }
@@ -150,15 +165,20 @@ export async function resolveNodeVersion(fetch, versionSpec, nodeMirrorBaseUrl)
 }
 export async function resolveNodeVersions(fetch, versionSpec, nodeMirrorBaseUrl) {
     const allVersions = await fetchAllVersions(fetch, nodeMirrorBaseUrl);
-    if (!versionSpec) {
+    if (versionSpec == null) {
         return allVersions.map(({ version }) => version);
     }
+    versionSpec = normalizeRuntimeSpec(versionSpec);
     if (versionSpec === 'latest') {
         return [allVersions[0].version];
     }
     const { versions, versionRange } = filterVersions(allVersions, versionSpec);
     return versions.filter(version => semver.satisfies(version, versionRange, SEMVER_OPTS));
 }
+function normalizeRuntimeSpec(versionSpec) {
+    versionSpec = versionSpec.trim();
+    return versionSpec === '' ? 'latest' : versionSpec;
+}
 async function fetchAllVersions(fetch, nodeMirrorBaseUrl) {
     const response = await fetch(`${nodeMirrorBaseUrl ?? 'https://nodejs.org/download/release/'}index.json`);
     return (await response.json()).map(({ version, lts }) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.runtime.node-resolver",
-  "version": "1101.1.7",
+  "version": "1101.1.9",
   "description": "Resolves a Node.js version specifier to an exact Node.js version",
   "keywords": [
     "pnpm",
@@ -12,9 +12,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node-resolver"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/engine/runtime/node-resolver"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node-resolver#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/engine/runtime/node-resolver#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -31,18 +31,18 @@
   "dependencies": {
     "semver": "^7.8.4",
     "version-selector-type": "^3.0.0",
-    "@pnpm/crypto.shasums-file": "1100.1.1",
-    "@pnpm/error": "1100.0.0",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/config.reader": "1101.10.1",
     "@pnpm/fetching.types": "1100.0.2",
-    "@pnpm/config.reader": "1101.9.0",
-    "@pnpm/resolving.resolver-base": "1100.4.2",
-    "@pnpm/types": "1101.3.2"
+    "@pnpm/resolving.resolver-base": "1100.5.0",
+    "@pnpm/types": "1101.3.2",
+    "@pnpm/crypto.shasums-file": "1100.1.2"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
     "@types/semver": "7.7.1",
-    "@pnpm/network.fetch": "1100.1.3",
-    "@pnpm/engine.runtime.node-resolver": "1101.1.7"
+    "@pnpm/network.fetch": "1100.1.4",
+    "@pnpm/engine.runtime.node-resolver": "1101.1.9"
   },
   "engines": {
     "node": ">=22.13"