@pnpm/hooks.read-package-hook 1100.0.6 → 1100.0.8

package/lib/createReadPackageHook.d.ts

@@ -1,6 +1,10 @@
 import type { PackageExtension, ReadPackageHook } from '@pnpm/types';
 import { type VersionOverrideWithoutRawSelector } from './createVersionsOverrider.js';
-export declare function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides, ignoredOptionalDependencies, packageExtensions, readPackageHook }: {
+export declare function getEffectivePackageExtensions({ ignoreCompatibilityDb, packageExtensions, }: {
+    ignoreCompatibilityDb?: boolean;
+    packageExtensions?: Record<string, PackageExtension>;
+}): Record<string, PackageExtension> | undefined;
+export declare function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides, ignoredOptionalDependencies, packageExtensions, readPackageHook, }: {
     ignoreCompatibilityDb?: boolean;
     lockfileDir: string;
     overrides?: VersionOverrideWithoutRawSelector[];

package/lib/createReadPackageHook.js

@@ -3,13 +3,30 @@ import { isEmpty, pipeWith } from 'ramda';
 import { createOptionalDependenciesRemover } from './createOptionalDependenciesRemover.js';
 import { createPackageExtender } from './createPackageExtender.js';
 import { createVersionsOverrider } from './createVersionsOverrider.js';
-export function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides, ignoredOptionalDependencies, packageExtensions, readPackageHook, }) {
-    const hooks = [];
+const PACKAGE_EXTENSION_FIELDS = [
+    'dependencies',
+    'optionalDependencies',
+    'peerDependencies',
+    'peerDependenciesMeta',
+];
+export function getEffectivePackageExtensions({ ignoreCompatibilityDb, packageExtensions, }) {
+    const effectivePackageExtensions = {};
     if (!ignoreCompatibilityDb) {
-        hooks.push(createPackageExtender(Object.fromEntries(compatPackageExtensions)));
+        mergePackageExtensions(effectivePackageExtensions, compatPackageExtensions);
     }
     if (!isEmpty(packageExtensions ?? {})) {
-        hooks.push(createPackageExtender(packageExtensions));
+        mergePackageExtensions(effectivePackageExtensions, Object.entries(packageExtensions));
+    }
+    return isEmpty(effectivePackageExtensions) ? undefined : effectivePackageExtensions;
+}
+export function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, overrides, ignoredOptionalDependencies, packageExtensions, readPackageHook, }) {
+    const hooks = [];
+    const effectivePackageExtensions = getEffectivePackageExtensions({
+        ignoreCompatibilityDb,
+        packageExtensions,
+    });
+    if (effectivePackageExtensions != null) {
+        hooks.push(createPackageExtender(effectivePackageExtensions));
     }
     if (Array.isArray(readPackageHook)) {
         hooks.push(...readPackageHook);
@@ -31,4 +48,32 @@ export function createReadPackageHook({ ignoreCompatibilityDb, lockfileDir, over
         : ((pkg, dir) => pipeWith(async (f, res) => f(await res, dir), hooks)(pkg, dir)); // eslint-disable-line @typescript-eslint/no-explicit-any
     return readPackageAndExtend;
 }
+function mergePackageExtensions(target, entries) {
+    for (const [selector, packageExtension] of entries) {
+        target[selector] = mergePackageExtension(target[selector], packageExtension);
+    }
+}
+function mergePackageExtension(previous, next) {
+    if (previous == null)
+        return clonePackageExtension(next);
+    const merged = clonePackageExtension(previous);
+    for (const field of PACKAGE_EXTENSION_FIELDS) {
+        if (next[field] == null)
+            continue;
+        merged[field] = {
+            ...next[field],
+            ...merged[field],
+        };
+    }
+    return merged;
+}
+function clonePackageExtension(packageExtension) {
+    const cloned = {};
+    for (const field of PACKAGE_EXTENSION_FIELDS) {
+        if (packageExtension[field] == null)
+            continue;
+        cloned[field] = { ...packageExtension[field] };
+    }
+    return cloned;
+}
 //# sourceMappingURL=createReadPackageHook.js.map

package/lib/index.d.ts

@@ -1 +1 @@
-export { createReadPackageHook } from './createReadPackageHook.js';
+export { createReadPackageHook, getEffectivePackageExtensions } from './createReadPackageHook.js';

package/lib/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/hooks.read-package-hook",
-  "version": "1100.0.6",
+  "version": "1100.0.8",
   "description": "Creates the default package reader hook used by pnpm",
   "keywords": [
     "pnpm",
@@ -30,21 +30,21 @@
     "@yarnpkg/extensions": "2.0.6",
     "normalize-path": "^3.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "semver": "^7.8.1",
-    "@pnpm/deps.peer-range": "1100.0.1",
-    "@pnpm/config.matcher": "1100.0.1",
-    "@pnpm/types": "1101.3.0",
+    "semver": "^7.8.4",
     "@pnpm/config.parse-overrides": "1100.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/resolving.parse-wanted-dependency": "1100.0.1"
+    "@pnpm/deps.peer-range": "1100.0.2",
+    "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
+    "@pnpm/types": "1101.3.2",
+    "@pnpm/config.matcher": "1100.0.1"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "@types/normalize-path": "^3.0.2",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@yarnpkg/core": "4.5.0",
-    "@pnpm/hooks.read-package-hook": "1100.0.6"
+    "@yarnpkg/core": "4.8.0",
+    "@pnpm/hooks.read-package-hook": "1100.0.8"
   },
   "engines": {
     "node": ">=22.13"