@pnpm/network.auth-header 1101.1.0 → 1101.1.2

package/lib/getAuthHeadersFromConfig.d.ts

@@ -1,2 +1,8 @@
-import type { RegistryConfig } from '@pnpm/types';
-export declare function getAuthHeadersFromCreds(configByUri: Record<string, RegistryConfig>): Record<string, string>;
+import { type RegistryConfig } from '@pnpm/types';
+export interface AuthHeaders {
+    authHeaderValueByURI: Record<string, string>;
+    scopedAuthHeaderValueByURI: Record<string, Record<string, string>>;
+}
+export type AuthHeadersByScope = Record<string, Record<string, string>>;
+export declare function getAuthHeadersFromCreds(configByUri: Record<string, RegistryConfig>): AuthHeaders;
+export declare function getAuthHeadersByScope(authHeaders: AuthHeaders): AuthHeadersByScope;

package/lib/getAuthHeadersFromConfig.js

@@ -1,14 +1,51 @@
 import { spawnSync } from 'node:child_process';
 import { PnpmError } from '@pnpm/error';
+import { DEFAULT_REGISTRY_SCOPE } from '@pnpm/types';
 export function getAuthHeadersFromCreds(configByUri) {
-    const authHeaderValueByURI = {};
+    const authHeaders = {
+        authHeaderValueByURI: {},
+        scopedAuthHeaderValueByURI: {},
+    };
     for (const [uri, registryConfig] of Object.entries(configByUri)) {
-        const header = credsToHeader(registryConfig.creds);
+        const normalizedUri = normalizeAuthKey(uri);
+        const header = credsToHeader(registryConfig[DEFAULT_REGISTRY_SCOPE]);
         if (header) {
-            authHeaderValueByURI[uri] = header;
+            authHeaders.authHeaderValueByURI[normalizedUri] = header;
         }
+        for (const scope of getRegistryScopes(registryConfig)) {
+            if (scope === DEFAULT_REGISTRY_SCOPE)
+                continue;
+            const scopedCreds = registryConfig[scope];
+            const scopedHeader = credsToHeader(scopedCreds);
+            if (scopedHeader) {
+                authHeaders.scopedAuthHeaderValueByURI[normalizedUri] ??= {};
+                authHeaders.scopedAuthHeaderValueByURI[normalizedUri][scope] = scopedHeader;
+            }
+        }
+    }
+    return authHeaders;
+}
+export function getAuthHeadersByScope(authHeaders) {
+    const result = {};
+    for (const [registryURI, authHeader] of Object.entries(authHeaders.authHeaderValueByURI)) {
+        result[registryURI] ??= {};
+        result[registryURI][DEFAULT_REGISTRY_SCOPE] = authHeader;
     }
-    return authHeaderValueByURI;
+    for (const [registryURI, scopedAuthHeaders] of Object.entries(authHeaders.scopedAuthHeaderValueByURI)) {
+        result[registryURI] ??= {};
+        for (const [scope, authHeader] of Object.entries(scopedAuthHeaders)) {
+            result[registryURI][scope] = authHeader;
+        }
+    }
+    return result;
+}
+function getRegistryScopes(registryConfig) {
+    return Object.keys(registryConfig).filter((scope) => scope.startsWith('@'));
+}
+function normalizeAuthKey(uri) {
+    if (!uri)
+        return uri;
+    return uri.endsWith('/') ? uri : `${uri}/`;
 }
 function credsToHeader(creds) {
     if (!creds)

package/lib/index.d.ts

@@ -1,4 +1,7 @@
 import type { RegistryConfig } from '@pnpm/types';
-import { getAuthHeadersFromCreds } from './getAuthHeadersFromConfig.js';
-export { getAuthHeadersFromCreds };
-export declare function createGetAuthHeaderByURI(configByUri: Record<string, RegistryConfig>): (uri: string) => string | undefined;
+import { type AuthHeaders, type AuthHeadersByScope, getAuthHeadersByScope, getAuthHeadersFromCreds } from './getAuthHeadersFromConfig.js';
+export { type AuthHeaders, type AuthHeadersByScope, getAuthHeadersByScope, getAuthHeadersFromCreds };
+interface GetAuthHeaderOptions {
+    pkgName?: string;
+}
+export declare function createGetAuthHeaderByURI(configByUri: Record<string, RegistryConfig>): (uri: string, opts?: GetAuthHeaderOptions) => string | undefined;

package/lib/index.js

@@ -1,15 +1,19 @@
 import { nerfDart } from '@pnpm/config.nerf-dart';
-import { getAuthHeadersFromCreds } from './getAuthHeadersFromConfig.js';
+import { getAuthHeadersByScope, getAuthHeadersFromCreds } from './getAuthHeadersFromConfig.js';
 import { removePort } from './helpers/removePort.js';
-// Re-exported so callers that need the whole nerf-darted-URI → header map
-// (e.g. forwarding every registry credential to the pnpr install
-// accelerator) can build it without re-implementing `credsToHeader`.
-export { getAuthHeadersFromCreds };
+// Re-exported so callers can build the same URL/scoped credential lookup
+// without re-implementing `credsToHeader`.
+export { getAuthHeadersByScope, getAuthHeadersFromCreds };
 export function createGetAuthHeaderByURI(configByUri) {
     const authHeaders = getAuthHeadersFromCreds(configByUri);
-    if (Object.keys(authHeaders).length === 0)
+    const registryURIs = Object.keys(authHeaders.authHeaderValueByURI);
+    const scopedAuthHeaderValueByScope = getScopedAuthHeaderValueByScope(authHeaders.scopedAuthHeaderValueByURI);
+    if (registryURIs.length === 0 && Object.keys(scopedAuthHeaderValueByScope).length === 0)
         return (uri) => basicAuth(new URL(uri));
-    return getAuthHeaderByURI.bind(null, authHeaders, getMaxParts(Object.keys(authHeaders)));
+    return getAuthHeaderByURI.bind(null, authHeaders, {
+        maxParts: getMaxParts(registryURIs),
+        scopedAuthHeaderValueByScope,
+    });
 }
 function getMaxParts(uris) {
     return uris.reduce((max, uri) => {
@@ -17,7 +21,24 @@ function getMaxParts(uris) {
         return parts > max ? parts : max;
     }, 0);
 }
-function getAuthHeaderByURI(authHeaders, maxParts, uri) {
+function getScopedAuthHeaderValueByScope(authHeaders) {
+    const result = {};
+    for (const [uri, scopedAuthHeaders] of Object.entries(authHeaders)) {
+        const parts = uri.split('/').length;
+        for (const [scope, authHeader] of Object.entries(scopedAuthHeaders)) {
+            const scopedAuthHeaderLookup = result[scope] ??= {
+                authHeaderValueByURI: {},
+                maxParts: 0,
+            };
+            scopedAuthHeaderLookup.authHeaderValueByURI[uri] = authHeader;
+            if (parts > scopedAuthHeaderLookup.maxParts) {
+                scopedAuthHeaderLookup.maxParts = parts;
+            }
+        }
+    }
+    return result;
+}
+function getAuthHeaderByURI(authHeaders, lookup, uri, opts) {
     if (!uri.endsWith('/')) {
         uri += '/';
     }
@@ -25,6 +46,17 @@ function getAuthHeaderByURI(authHeaders, maxParts, uri) {
     const basic = basicAuth(parsedUri);
     if (basic)
         return basic;
+    const scope = getScope(opts?.pkgName);
+    const scopedAuthHeaderLookup = scope ? lookup.scopedAuthHeaderValueByScope[scope] : undefined;
+    if (scopedAuthHeaderLookup) {
+        const scopedAuth = getAuthHeaderByNerfedURI(scopedAuthHeaderLookup.authHeaderValueByURI, scopedAuthHeaderLookup.maxParts, uri);
+        if (scopedAuth)
+            return scopedAuth;
+    }
+    return getAuthHeaderByNerfedURI(authHeaders.authHeaderValueByURI, lookup.maxParts, uri);
+}
+function getAuthHeaderByNerfedURI(authHeaders, maxParts, uri) {
+    const parsedUri = new URL(uri);
     const nerfed = nerfDart(uri);
     const parts = nerfed.split('/');
     for (let i = Math.min(parts.length, maxParts) - 1; i >= 3; i--) {
@@ -34,10 +66,18 @@ function getAuthHeaderByURI(authHeaders, maxParts, uri) {
     }
     const urlWithoutPort = removePort(parsedUri);
     if (urlWithoutPort !== uri) {
-        return getAuthHeaderByURI(authHeaders, maxParts, urlWithoutPort);
+        return getAuthHeaderByNerfedURI(authHeaders, maxParts, urlWithoutPort);
     }
     return undefined;
 }
+function getScope(pkgName) {
+    if (!pkgName?.startsWith('@'))
+        return undefined;
+    const index = pkgName.indexOf('/');
+    if (index <= 1)
+        return undefined;
+    return pkgName.slice(0, index);
+}
 function basicAuth(uri) {
     if (!uri.username && !uri.password)
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/network.auth-header",
-  "version": "1101.1.0",
+  "version": "1101.1.2",
   "description": "Gets the authorization header for the given URI",
   "keywords": [
     "pnpm",
@@ -28,14 +28,14 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/config.nerf-dart": "^1.0.1",
+    "@pnpm/config.nerf-dart": "^2.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/types": "1101.3.0"
+    "@pnpm/types": "1101.3.2"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "safe-buffer": "5.2.1",
-    "@pnpm/network.auth-header": "1101.1.0"
+    "@pnpm/network.auth-header": "1101.1.2"
   },
   "engines": {
     "node": ">=22.13"