@pnpm/installing.deps-resolver 1100.0.7 → 1100.0.9

package/lib/replaceVersionInBareSpecifier.d.ts

@@ -1 +1 @@
-export declare function replaceVersionInBareSpecifier(bareSpecifier: string, version: string): string;
+export declare function replaceVersionInBareSpecifier(bareSpecifier: string, version: string, namedRegistryPrefixes?: readonly string[]): string;

package/lib/replaceVersionInBareSpecifier.js

@@ -1,11 +1,29 @@
 import semver from 'semver';
-export function replaceVersionInBareSpecifier(bareSpecifier, version) {
+export function replaceVersionInBareSpecifier(bareSpecifier, version, namedRegistryPrefixes = []) {
     if (semver.validRange(bareSpecifier)) {
         return version;
     }
-    if (!bareSpecifier.startsWith('npm:')) {
+    let prefix;
+    if (bareSpecifier.startsWith('npm:')) {
+        prefix = 'npm:';
+    }
+    else {
+        for (const candidate of namedRegistryPrefixes) {
+            if (bareSpecifier.startsWith(candidate)) {
+                prefix = candidate;
+                break;
+            }
+        }
+    }
+    if (prefix == null) {
         return bareSpecifier;
     }
+    // `<prefix>:<version_selector>` paired with a package alias — replace the
+    // whole body. Covers both `npm:^1.0.0` and named-registry forms like
+    // `gh:^1.0.0`, where the package name comes from the dependency alias.
+    if (semver.validRange(bareSpecifier.slice(prefix.length))) {
+        return `${prefix}${version}`;
+    }
     const versionDelimiter = bareSpecifier.lastIndexOf('@');
     if (versionDelimiter === -1 || bareSpecifier.indexOf('/') > versionDelimiter) {
         return `${bareSpecifier}@${version}`;

package/lib/resolveDependencies.d.ts

@@ -99,6 +99,7 @@ export interface ResolutionContext {
     nodeVersion?: string;
     pnpmVersion: string;
     registries: Registries;
+    namedRegistryPrefixes: readonly string[];
     resolutionMode?: 'highest' | 'time-based' | 'lowest-direct';
     virtualStoreDir: string;
     virtualStoreDirMaxLength: number;

package/lib/resolveDependencies.js

@@ -748,7 +748,7 @@ async function resolveDependency(wantedDependency, ctx, options) {
     try {
         const calcSpecifier = options.currentDepth === 0;
         if (!options.update && currentPkg.version && currentPkg.pkgId?.endsWith(`@${currentPkg.version}`) && !calcSpecifier) {
-            wantedDependency.bareSpecifier = replaceVersionInBareSpecifier(wantedDependency.bareSpecifier, currentPkg.version);
+            wantedDependency.bareSpecifier = replaceVersionInBareSpecifier(wantedDependency.bareSpecifier, currentPkg.version, ctx.namedRegistryPrefixes);
         }
         pkgResponse = await ctx.storeController.requestPackage(wantedDependency, {
             allowBuild: ctx.allowBuild,
@@ -1172,6 +1172,7 @@ const NON_EXOTIC_RESOLVED_VIA = new Set([
     'github.com/oven-sh/bun',
     'jsr-registry',
     'local-filesystem',
+    'named-registry',
     'nodejs.org',
     'npm-registry',
     'workspace',

package/lib/resolveDependencyTree.d.ts

@@ -82,6 +82,7 @@ export interface ResolveDependenciesOptions {
     };
     nodeVersion?: string;
     registries: Registries;
+    namedRegistries?: Record<string, string>;
     patchedDependencies?: PatchGroupRecord;
     pnpmVersion: string;
     preferredVersions?: PreferredVersions;

package/lib/resolveDependencyTree.js

@@ -2,6 +2,7 @@ import { resolveFromCatalog } from '@pnpm/catalogs.resolver';
 import { createPackageVersionPolicy } from '@pnpm/config.version-policy';
 import { PnpmError } from '@pnpm/error';
 import { globalWarn } from '@pnpm/logger';
+import { BUILTIN_NAMED_REGISTRIES } from '@pnpm/resolving.npm-resolver';
 import { partition } from 'ramda';
 import { nextNodeId } from './nextNodeId.js';
 import { parentIdsContainSequence } from './parentIdsContainSequence.js';
@@ -35,6 +36,10 @@ export async function resolveDependencyTree(importers, opts) {
         preferWorkspacePackages: opts.preferWorkspacePackages,
         readPackageHook: opts.hooks.readPackage,
         registries: opts.registries,
+        namedRegistryPrefixes: Array.from(new Set([
+            ...Object.keys(BUILTIN_NAMED_REGISTRIES),
+            ...Object.keys(opts.namedRegistries ?? {}),
+        ])).map((alias) => `${alias}:`),
         resolvedPkgsById: {},
         resolvePeersFromWorkspaceRoot: opts.resolvePeersFromWorkspaceRoot,
         resolutionMode: opts.resolutionMode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-resolver",
-  "version": "1100.0.7",
+  "version": "1100.0.9",
   "description": "Resolves dependency graph of a package",
   "keywords": [
     "pnpm",
@@ -36,43 +36,43 @@
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "rename-overwrite": "^7.0.1",
     "safe-promise-defer": "^2.0.0",
-    "semver": "^7.7.4",
+    "semver": "^7.7.2",
     "semver-range-intersect": "^0.3.1",
     "version-selector-type": "^3.0.0",
-    "@pnpm/config.version-policy": "1100.0.2",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/catalogs.resolver": "1100.0.0",
+    "@pnpm/config.version-policy": "1100.0.3",
+    "@pnpm/core-loggers": "1100.0.2",
+    "@pnpm/deps.graph-hasher": "1100.1.5",
+    "@pnpm/deps.path": "1100.0.3",
     "@pnpm/catalogs.types": "1100.0.0",
-    "@pnpm/core-loggers": "1100.0.1",
-    "@pnpm/deps.graph-hasher": "1100.1.4",
-    "@pnpm/deps.peer-range": "1100.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.5",
-    "@pnpm/lockfile.types": "1100.0.4",
-    "@pnpm/hooks.types": "1100.0.5",
-    "@pnpm/patching.config": "1100.0.2",
-    "@pnpm/lockfile.utils": "1100.0.6",
-    "@pnpm/pkg-manifest.reader": "1100.0.2",
-    "@pnpm/resolving.npm-resolver": "1101.0.2",
-    "@pnpm/pkg-manifest.utils": "1100.1.1",
+    "@pnpm/fetching.pick-fetcher": "1100.0.6",
+    "@pnpm/catalogs.resolver": "1100.0.0",
+    "@pnpm/lockfile.pruner": "1100.0.5",
+    "@pnpm/lockfile.types": "1100.0.5",
+    "@pnpm/lockfile.preferred-versions": "1100.0.8",
+    "@pnpm/lockfile.utils": "1100.0.7",
+    "@pnpm/patching.config": "1100.0.3",
+    "@pnpm/hooks.types": "1100.0.6",
     "@pnpm/patching.types": "1100.0.0",
-    "@pnpm/lockfile.preferred-versions": "1100.0.7",
-    "@pnpm/resolving.resolver-base": "1100.1.2",
+    "@pnpm/deps.peer-range": "1100.0.1",
+    "@pnpm/pkg-manifest.utils": "1100.1.2",
+    "@pnpm/resolving.npm-resolver": "1101.1.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.3",
+    "@pnpm/types": "1101.1.0",
     "@pnpm/workspace.spec-parser": "1100.0.0",
-    "@pnpm/types": "1101.0.0",
-    "@pnpm/store.controller-types": "1100.0.5",
-    "@pnpm/deps.path": "1100.0.2",
-    "@pnpm/lockfile.pruner": "1100.0.4"
+    "@pnpm/store.controller-types": "1100.0.6",
+    "@pnpm/resolving.resolver-base": "1100.1.3"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^1001.0.1"
+    "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
     "@types/normalize-path": "^3.0.2",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@pnpm/installing.deps-resolver": "1100.0.7",
+    "@pnpm/installing.deps-resolver": "1100.0.9",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {