@pnpm/catalogs.config 1100.0.0 → 1100.0.2

package/lib/index.d.ts

@@ -1 +1,2 @@
 export { getCatalogsFromWorkspaceManifest } from './getCatalogsFromWorkspaceManifest.js';
+export { mergeCatalogs } from './mergeCatalogs.js';

package/lib/index.js

@@ -1,2 +1,3 @@
 export { getCatalogsFromWorkspaceManifest } from './getCatalogsFromWorkspaceManifest.js';
+export { mergeCatalogs } from './mergeCatalogs.js';
 //# sourceMappingURL=index.js.map

package/lib/mergeCatalogs.d.ts

@@ -0,0 +1,14 @@
+import type { Catalogs } from '@pnpm/catalogs.types';
+/**
+ * Deep-merges catalog definitions, later arguments taking precedence over
+ * earlier ones at the individual entry level. Use it to fold the catalog
+ * changes produced by an install (`updatedCatalogs`) back into the catalogs
+ * read at startup, so the result reflects what was actually written to
+ * `pnpm-workspace.yaml`.
+ *
+ * Catalog and dependency names originate from `pnpm-workspace.yaml`, so the
+ * result is built from null-prototype records and entries are copied with
+ * `Object.defineProperty`. A name like `__proto__` then becomes an ordinary
+ * own property instead of mutating a prototype.
+ */
+export declare function mergeCatalogs(...catalogsList: Array<Catalogs | undefined>): Catalogs;

package/lib/mergeCatalogs.js

@@ -0,0 +1,41 @@
+/**
+ * Deep-merges catalog definitions, later arguments taking precedence over
+ * earlier ones at the individual entry level. Use it to fold the catalog
+ * changes produced by an install (`updatedCatalogs`) back into the catalogs
+ * read at startup, so the result reflects what was actually written to
+ * `pnpm-workspace.yaml`.
+ *
+ * Catalog and dependency names originate from `pnpm-workspace.yaml`, so the
+ * result is built from null-prototype records and entries are copied with
+ * `Object.defineProperty`. A name like `__proto__` then becomes an ordinary
+ * own property instead of mutating a prototype.
+ */
+export function mergeCatalogs(...catalogsList) {
+    const result = Object.create(null);
+    for (const catalogs of catalogsList) {
+        if (catalogs == null)
+            continue;
+        for (const catalogName of Object.keys(catalogs)) {
+            const catalog = catalogs[catalogName];
+            if (catalog == null)
+                continue;
+            const target = result[catalogName] ?? Object.create(null);
+            for (const dependencyName of Object.keys(catalog)) {
+                Object.defineProperty(target, dependencyName, {
+                    value: catalog[dependencyName],
+                    writable: true,
+                    enumerable: true,
+                    configurable: true,
+                });
+            }
+            Object.defineProperty(result, catalogName, {
+                value: target,
+                writable: true,
+                enumerable: true,
+                configurable: true,
+            });
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=mergeCatalogs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/catalogs.config",
-  "version": "1100.0.0",
+  "version": "1100.0.2",
   "description": "Create a normalized catalogs config from pnpm-workspace.yaml contents.",
   "keywords": [
     "pnpm",
@@ -9,8 +9,11 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/catalogs/config",
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/catalogs/config#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/catalogs/config"
+  },
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/catalogs/config#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -25,12 +28,13 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/error": "1100.0.0"
+    "@pnpm/error": "1100.0.1"
   },
   "devDependencies": {
-    "@pnpm/catalogs.config": "1100.0.0",
+    "@jest/globals": "30.4.1",
     "@pnpm/catalogs.types": "1100.0.0",
-    "@pnpm/workspace.workspace-manifest-reader": "1100.0.0"
+    "@pnpm/catalogs.config": "1100.0.2",
+    "@pnpm/workspace.workspace-manifest-reader": "1100.0.9"
   },
   "engines": {
     "node": ">=22.13"