@pnpm/config.commands 1100.1.0 → 1101.0.0

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @pnpm/plugin-commands-config
 
+## 1101.0.0
+
+### Major Changes
+
+- The three registry lookups are now named for what they are keyed by, so that none of them is called `registries` — a name the `registries` setting itself has taken:
+
+  | before | after |
+  |---|---|
+  | `Config.registries` | `Config.registriesByScope` |
+  | `Config.namedRegistries` | `Config.registriesByPrefix` |
+  | `Config.registryOptions` | `Config.registryOptionsByUrl` |
+
+  The same rename applies to the `RegistryContext` fields, the `Registries` and `NamedRegistries` types (now `RegistriesByScope` and `RegistriesByPrefix`), `normalizeRegistries` / `normalizeNamedRegistries` (now `normalizeRegistriesByScope` / `normalizeRegistriesByPrefix`), and the `BUILTIN_NAMED_REGISTRIES` constant (now `BUILTIN_REGISTRIES_BY_PREFIX`).
+
+  This is an internal rename: no setting, error code, lockfile field, or `.pnpmfile.cjs` hook field changes. A `preResolution` hook still reads `ctx.registries`, which is the name pacquet passes as well. The `registries` and `namedRegistries` settings are read under the names users write them.
+
+  The pnpr resolve request sends `registriesByPrefix` where it sent `namedRegistries`. A pnpr server and its clients must be on matching versions, which is already the case for an experimental server.
+
+### Minor Changes
+
+- `pnpm config get` and `pnpm config list` now show the settings pnpm acts on under their documented names:
+
+  - `registries` shows the registries pnpm resolves from, merged across every source (`.npmrc`, `pnpm-workspace.yaml`, the global config, CLI flags), in the shape the setting is written in: keyed by registry URL, with the default registry declared as the bare `@` scope. Built-in routes are included — the `@jsr` scope and the `npmjs` and `gh` prefixes — unless pointed elsewhere. Previously `pnpm config get registries` printed `undefined`.
+  - `update` and `audit` show the effective sections, whichever spelling set them. The deprecated internal spellings (`updateConfig`, `auditConfig`, `auditLevel`) are no longer listed.
+  - `catalogs` shows the complete resolved catalog set — the singular `catalog` block is its `default` entry — whichever spelling declared it.
+  - The `registry` and `@scope:registry` entries show the merged routes rather than raw `.npmrc` values, so they always agree with the `registries` view.
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/cli.utils@1101.0.24
+  - @pnpm/config.normalize-registries@1101.0.0
+  - @pnpm/config.reader@1102.0.0
+  - @pnpm/constants@1102.0.0
+  - @pnpm/error@1100.1.3
+  - @pnpm/object.property-path@1100.1.5
+  - @pnpm/workspace.workspace-manifest-writer@1100.1.1
+
 ## 1100.1.0
 
 ### Minor Changes

package/lib/configGet.js

@@ -20,7 +20,7 @@ function lookupConfig(opts, key, isScopedKey) {
         // `pnpm publish` and the resolvers actually use.
         if (key.endsWith(':registry')) {
             const scope = key.slice(0, key.length - ':registry'.length);
-            const merged = opts._config.registries?.[scope];
+            const merged = opts._config.registriesByScope?.[scope];
             if (merged !== undefined) {
                 return { value: merged };
             }
@@ -31,6 +31,12 @@ function lookupConfig(opts, key, isScopedKey) {
         return { value: getGlobalConfigPath(opts.configDir) };
     }
     const kebabKey = isCamelCase(key) ? kebabCase(key) : key;
+    // The merged map is what resolvers use, so `registry` answers the same
+    // default the resolved `registries` view declares as the bare `@` scope —
+    // a raw `.npmrc` value would contradict it.
+    if (kebabKey === 'registry') {
+        return { value: opts._config.registriesByScope?.default ?? opts.authConfig.registry };
+    }
     // Resolve typed keys from Config — check explicitly set values first,
     // then fall back to authConfig (for keys like registry set in .npmrc)
     if (Object.hasOwn(types, kebabKey)) {

package/lib/configToRecord.d.ts

@@ -2,7 +2,9 @@ import { type Config } from '@pnpm/config.reader';
 /**
  * Convert a Config object to a camelCase record for display.
  * Only includes explicitly set values (from CLI, env vars, or workspace yaml),
- * not default values. Auth/registry keys from authConfig are always included.
+ * not default values. Auth/registry keys from authConfig are always included,
+ * and so is `registries` — the registries the CLI resolves from, merged
+ * across every source.
  *
  * Accepts a clean Config object (without ConfigContext fields mixed in),
  * so no INTERNAL_CONFIG_KEYS exclusion list is needed.

package/lib/configToRecord.js

@@ -1,15 +1,24 @@
-import { types } from '@pnpm/config.reader';
+import { pickRegistryContext, toResolvedRegistryDeclarations } from '@pnpm/config.normalize-registries';
+import { toAuditSettings, toUpdateSettings, types } from '@pnpm/config.reader';
 import { sortDirectKeys } from '@pnpm/object.key-sorting';
 import camelcase from 'camelcase';
 import { censorProtectedSettings } from './protectedSettings.js';
-// Auth-related Config fields that are internal objects, not user settings.
+// Config fields the record does not copy verbatim: internal objects, the
+// lookups and spellings the `registries` / `update` / `audit` settings are
+// split into (shown re-joined under the documented names instead), and
+// `catalogs`, which is re-added below as the resolved catalog set.
 const NON_SETTING_CONFIG_KEYS = new Set([
     'authConfig', 'configByUri',
+    'registriesByScope', 'registriesByPrefix', 'registryOptionsByUrl',
+    'updateConfig', 'auditConfig', 'auditLevel',
+    'catalogs',
 ]);
 /**
  * Convert a Config object to a camelCase record for display.
  * Only includes explicitly set values (from CLI, env vars, or workspace yaml),
- * not default values. Auth/registry keys from authConfig are always included.
+ * not default values. Auth/registry keys from authConfig are always included,
+ * and so is `registries` — the registries the CLI resolves from, merged
+ * across every source.
  *
  * Accepts a clean Config object (without ConfigContext fields mixed in),
  * so no INTERNAL_CONFIG_KEYS exclusion list is needed.
@@ -19,7 +28,7 @@ export function configToRecord(config, explicitlySetKeys) {
     // Add typed settings (only explicitly set ones if tracking is available)
     for (const kebabKey of Object.keys(types)) {
         const camelKey = camelcase(kebabKey, { locale: 'en-US' });
-        if (!explicitlySetKeys.has(camelKey))
+        if (!explicitlySetKeys.has(camelKey) || NON_SETTING_CONFIG_KEYS.has(camelKey))
             continue;
         const value = config[camelKey];
         if (value !== undefined) {
@@ -40,10 +49,30 @@ export function configToRecord(config, explicitlySetKeys) {
             result[key] = value;
         }
     }
+    // The `registry` / `@scope:registry` rows show the merged routes — the
+    // values `config get` answers — so a raw `.npmrc` row cannot contradict
+    // the resolved `registries` view.
+    for (const [scope, url] of Object.entries(config.registriesByScope ?? {})) {
+        result[scope === 'default' ? 'registry' : `${scope}:registry`] = url;
+    }
     // Always include user-agent for debugging connectivity issues
     if (config.userAgent) {
         result.userAgent = config.userAgent;
     }
+    result.registries = toResolvedRegistryDeclarations(pickRegistryContext(config));
+    const update = toUpdateSettings(config.updateConfig);
+    if (update != null) {
+        result.update = update;
+    }
+    const audit = toAuditSettings(config);
+    if (audit != null) {
+        result.audit = audit;
+    }
+    // `catalogs` shows the complete resolved catalog set — the singular
+    // `catalog` block is its `default` entry — whichever spelling declared it.
+    if (config.catalogs != null && Object.values(config.catalogs).some((catalog) => catalog != null)) {
+        result.catalogs = config.catalogs;
+    }
     return censorProtectedSettings(sortDirectKeys(result));
 }
 //# sourceMappingURL=configToRecord.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/config.commands",
-  "version": "1100.1.0",
+  "version": "1101.0.0",
   "description": "Commands for reading and writing settings to/from config files",
   "keywords": [
     "pnpm",
@@ -28,14 +28,15 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/cli.utils": "1101.0.23",
-    "@pnpm/config.reader": "1101.17.0",
-    "@pnpm/constants": "1101.0.0",
-    "@pnpm/error": "1100.1.2",
+    "@pnpm/cli.utils": "1101.0.24",
+    "@pnpm/config.normalize-registries": "1101.0.0",
+    "@pnpm/config.reader": "1102.0.0",
+    "@pnpm/constants": "1102.0.0",
+    "@pnpm/error": "1100.1.3",
     "@pnpm/object.key-sorting": "1100.0.2",
-    "@pnpm/object.property-path": "1100.1.4",
+    "@pnpm/object.property-path": "1100.1.5",
     "@pnpm/text.naming-cases": "1100.0.2",
-    "@pnpm/workspace.workspace-manifest-writer": "1100.1.0",
+    "@pnpm/workspace.workspace-manifest-writer": "1100.1.1",
     "camelcase": "^9.0.0",
     "ini": "6.0.0",
     "lodash.kebabcase": "^4.1.1",
@@ -49,9 +50,9 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/config.commands": "1100.1.0",
+    "@pnpm/config.commands": "1101.0.0",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.26",
+    "@pnpm/prepare": "1100.0.27",
     "@types/ini": "4.1.1",
     "@types/lodash.kebabcase": "4.1.9",
     "read-yaml-file": "^3.0.0"