@pnpm/hooks.pnpmfile 1100.0.21 → 1100.0.22

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @pnpm/pnpmfile
 
+## 1100.0.22
+
+### Patch Changes
+
+- Republished every package: the tarballs published by the v11.13.1 through v11.16.0 releases were missing most of their compiled files due to a packing bug [#13164](https://github.com/pnpm/pnpm/issues/13164).
+
+- Updated dependencies:
+  - @pnpm/core-loggers@1100.2.5
+  - @pnpm/crypto.hash@1100.0.2
+  - @pnpm/error@1100.1.0
+  - @pnpm/hooks.types@1100.2.3
+  - @pnpm/lockfile.types@1100.0.16
+  - @pnpm/store.controller-types@1100.1.10
+  - @pnpm/types@1101.6.0
+
 ## 1100.0.21
 
 ### Patch Changes

package/lib/Hooks.d.ts

@@ -0,0 +1,16 @@
+import type { Log } from '@pnpm/core-loggers';
+import type { PreResolutionHook } from '@pnpm/hooks.types';
+import type { LockfileObject } from '@pnpm/lockfile.types';
+import type { ImportIndexedPackageAsync } from '@pnpm/store.controller-types';
+export interface HookContext {
+    log: (message: string) => void;
+}
+export interface Hooks {
+    readPackage?: (pkg: any, context: HookContext) => any;
+    beforePacking?: (pkg: any, dir: string, context: HookContext) => any;
+    preResolution?: PreResolutionHook;
+    afterAllResolved?: (lockfile: LockfileObject, context: HookContext) => LockfileObject | Promise<LockfileObject>;
+    filterLog?: (log: Log) => boolean;
+    importPackage?: ImportIndexedPackageAsync;
+    updateConfig?: (config: any) => any;
+}

package/lib/Hooks.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Hooks.js.map

package/lib/index.d.ts

@@ -0,0 +1,5 @@
+import type { CookedHooks } from './requireHooks.js';
+export type { HookContext } from './Hooks.js';
+export { requireHooks } from './requireHooks.js';
+export { BadReadPackageHookError } from './requirePnpmfile.js';
+export type Hooks = CookedHooks;

package/lib/requireHooks.d.ts

@@ -0,0 +1,30 @@
+import type { CustomFetcher, CustomResolver, PreResolutionHookContext } from '@pnpm/hooks.types';
+import type { LockfileObject } from '@pnpm/lockfile.types';
+import type { ImportIndexedPackageAsync } from '@pnpm/store.controller-types';
+import type { BeforePackingHook, ReadPackageHook } from '@pnpm/types';
+import type { Hooks } from './Hooks.js';
+import { type Finders } from './requirePnpmfile.js';
+type Cook<T extends (...args: any[]) => any> = (arg: Parameters<T>[0], ...otherArgs: any[]) => ReturnType<T>;
+export interface CookedHooks {
+    readPackage?: ReadPackageHook[];
+    beforePacking?: BeforePackingHook[];
+    preResolution?: Array<(ctx: PreResolutionHookContext) => Promise<void>>;
+    afterAllResolved?: Array<(lockfile: LockfileObject) => LockfileObject | Promise<LockfileObject>>;
+    filterLog?: Array<Cook<Required<Hooks>['filterLog']>>;
+    updateConfig?: Array<Cook<Required<Hooks>['updateConfig']>>;
+    importPackage?: ImportIndexedPackageAsync;
+    customResolvers?: CustomResolver[];
+    customFetchers?: CustomFetcher[];
+    calculatePnpmfileChecksum?: () => Promise<string>;
+}
+export interface RequireHooksResult {
+    hooks: CookedHooks;
+    finders: Finders;
+    resolvedPnpmfilePaths: string[];
+}
+export declare function requireHooks(prefix: string, opts: {
+    globalPnpmfile?: string;
+    pnpmfiles?: string[];
+    tryLoadDefaultPnpmfile?: boolean;
+}): Promise<RequireHooksResult>;
+export {};

package/lib/requireHooks.js

@@ -0,0 +1,189 @@
+import { hookLogger } from '@pnpm/core-loggers';
+import { createHashFromMultipleFiles } from '@pnpm/crypto.hash';
+import { PnpmError } from '@pnpm/error';
+import { pathAbsolute } from 'path-absolute';
+import { requirePnpmfile } from './requirePnpmfile.js';
+export async function requireHooks(prefix, opts) {
+    const pnpmfiles = [];
+    if (opts.globalPnpmfile) {
+        pnpmfiles.push({
+            path: opts.globalPnpmfile,
+            includeInChecksum: false,
+        });
+    }
+    const entries = [];
+    const loadedFiles = [];
+    if (opts.tryLoadDefaultPnpmfile) {
+        // Prefer .pnpmfile.mjs over .pnpmfile.cjs. Only load one.
+        const mjsPath = pathAbsolute('.pnpmfile.mjs', prefix);
+        const mjsResult = await requirePnpmfile(mjsPath, prefix);
+        if (mjsResult != null) {
+            loadedFiles.push(mjsPath);
+            entries.push({
+                file: mjsPath,
+                includeInChecksum: true,
+                hooks: mjsResult.pnpmfileModule?.hooks,
+                finders: mjsResult.pnpmfileModule?.finders,
+                resolvers: mjsResult.pnpmfileModule?.resolvers,
+                fetchers: mjsResult.pnpmfileModule?.fetchers,
+            });
+        }
+        else {
+            pnpmfiles.push({
+                path: '.pnpmfile.cjs',
+                includeInChecksum: true,
+                optional: true,
+            });
+        }
+    }
+    if (opts.pnpmfiles) {
+        for (const pnpmfile of opts.pnpmfiles) {
+            pnpmfiles.push({
+                path: pnpmfile,
+                includeInChecksum: true,
+            });
+        }
+    }
+    await Promise.all(pnpmfiles.map(async ({ path, includeInChecksum, optional }) => {
+        const file = pathAbsolute(path, prefix);
+        if (!loadedFiles.includes(file)) {
+            loadedFiles.push(file);
+            const requirePnpmfileResult = await requirePnpmfile(file, prefix);
+            if (requirePnpmfileResult != null) {
+                entries.push({
+                    file,
+                    includeInChecksum,
+                    hooks: requirePnpmfileResult.pnpmfileModule?.hooks,
+                    finders: requirePnpmfileResult.pnpmfileModule?.finders,
+                    resolvers: requirePnpmfileResult.pnpmfileModule?.resolvers,
+                    fetchers: requirePnpmfileResult.pnpmfileModule?.fetchers,
+                });
+            }
+            else if (!optional) {
+                throw new PnpmError('PNPMFILE_NOT_FOUND', `pnpmfile at "${file}" is not found`);
+            }
+        }
+    }));
+    const mergedFinders = {};
+    const cookedHooks = {
+        readPackage: [],
+        beforePacking: [],
+        preResolution: [],
+        afterAllResolved: [],
+        filterLog: [],
+        updateConfig: [],
+    };
+    // calculate combined checksum for all included files
+    if (entries.some((entry) => entry.hooks != null)) {
+        cookedHooks.calculatePnpmfileChecksum = async () => {
+            const filesToIncludeInHash = [];
+            for (const { includeInChecksum, file } of entries) {
+                if (includeInChecksum) {
+                    filesToIncludeInHash.push(file);
+                }
+            }
+            filesToIncludeInHash.sort();
+            return createHashFromMultipleFiles(filesToIncludeInHash);
+        };
+    }
+    let importProvider;
+    const finderProviders = {};
+    // process hooks in order
+    for (const { hooks, file, finders } of entries) {
+        if (finders != null) {
+            for (const [finderName, finder] of Object.entries(finders)) {
+                if (mergedFinders[finderName] != null) {
+                    const firstDefinedIn = finderProviders[finderName];
+                    throw new PnpmError('DUPLICATE_FINDER', `Finder "${finderName}" defined in both ${firstDefinedIn} and ${file}`);
+                }
+                mergedFinders[finderName] = finder;
+                finderProviders[finderName] = file;
+            }
+        }
+        const fileHooks = hooks ?? {};
+        // readPackage
+        if (fileHooks.readPackage) {
+            const fn = fileHooks.readPackage;
+            const context = createReadPackageHookContext(file, prefix, 'readPackage');
+            cookedHooks.readPackage.push((pkg, _dir) => fn(pkg, context));
+        }
+        // beforePacking
+        if (fileHooks.beforePacking) {
+            const fn = fileHooks.beforePacking;
+            const context = createReadPackageHookContext(file, prefix, 'beforePacking');
+            cookedHooks.beforePacking.push((pkg, dir) => fn(pkg, dir, context));
+        }
+        // afterAllResolved
+        if (fileHooks.afterAllResolved) {
+            const fn = fileHooks.afterAllResolved;
+            const context = createReadPackageHookContext(file, prefix, 'afterAllResolved');
+            cookedHooks.afterAllResolved.push((lockfile) => fn(lockfile, context));
+        }
+        // filterLog
+        if (fileHooks.filterLog) {
+            cookedHooks.filterLog.push(fileHooks.filterLog);
+        }
+        // updateConfig
+        if (fileHooks.updateConfig) {
+            const updateConfig = fileHooks.updateConfig;
+            cookedHooks.updateConfig.push((config) => {
+                const updated = updateConfig(config);
+                if (updated == null) {
+                    throw new PnpmError('CONFIG_IS_UNDEFINED', 'The updateConfig hook returned undefined');
+                }
+                return updated;
+            });
+        }
+        // preResolution
+        if (fileHooks.preResolution) {
+            const preRes = fileHooks.preResolution;
+            cookedHooks.preResolution.push((ctx) => preRes(ctx, createPreResolutionHookLogger(prefix)));
+        }
+        // importPackage: only one allowed
+        if (fileHooks.importPackage) {
+            if (importProvider) {
+                throw new PnpmError('MULTIPLE_IMPORT_PACKAGE', `importPackage hook defined in both ${importProvider} and ${file}`);
+            }
+            importProvider = file;
+            cookedHooks.importPackage = fileHooks.importPackage;
+        }
+    }
+    // Process top-level resolvers and fetchers exports
+    for (const { resolvers, fetchers } of entries) {
+        // Custom resolvers: merge all
+        if (resolvers) {
+            cookedHooks.customResolvers = cookedHooks.customResolvers ?? [];
+            cookedHooks.customResolvers.push(...resolvers);
+        }
+        // Custom fetchers: merge all
+        if (fetchers) {
+            cookedHooks.customFetchers = cookedHooks.customFetchers ?? [];
+            cookedHooks.customFetchers.push(...fetchers);
+        }
+    }
+    return {
+        hooks: cookedHooks,
+        finders: mergedFinders,
+        resolvedPnpmfilePaths: entries.map(({ file }) => file),
+    };
+}
+function createReadPackageHookContext(calledFrom, prefix, hook) {
+    return {
+        log: (message) => {
+            hookLogger.debug({ from: calledFrom, hook, message, prefix });
+        },
+    };
+}
+function createPreResolutionHookLogger(prefix) {
+    const hook = 'preResolution';
+    const from = 'pnpmfile';
+    return {
+        info: (message) => {
+            hookLogger.info({ message, prefix, hook, from }); // eslint-disable-line @typescript-eslint/no-explicit-any
+        },
+        warn: (message) => {
+            hookLogger.warn({ message, prefix, hook, from }); // eslint-disable-line @typescript-eslint/no-explicit-any
+        },
+    };
+}
+//# sourceMappingURL=requireHooks.js.map

package/lib/requirePnpmfile.d.ts

@@ -0,0 +1,18 @@
+import { PnpmError } from '@pnpm/error';
+import type { CustomFetcher, CustomResolver } from '@pnpm/hooks.types';
+import type { Finder } from '@pnpm/types';
+import type { Hooks } from './Hooks.js';
+export declare class BadReadPackageHookError extends PnpmError {
+    readonly pnpmfile: string;
+    constructor(pnpmfile: string, message: string);
+}
+export type Finders = Record<string, Finder>;
+export interface Pnpmfile {
+    hooks?: Hooks;
+    finders?: Finders;
+    resolvers?: CustomResolver[];
+    fetchers?: CustomFetcher[];
+}
+export declare function requirePnpmfile(pnpmFilePath: string, prefix: string): Promise<{
+    pnpmfileModule: Pnpmfile | undefined;
+} | undefined>;

package/lib/requirePnpmfile.js

@@ -0,0 +1,105 @@
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { pathToFileURL } from 'node:url';
+import util from 'node:util';
+import { PnpmError } from '@pnpm/error';
+import { logger } from '@pnpm/logger';
+import chalk from 'chalk';
+const require = createRequire(import.meta.url);
+export class BadReadPackageHookError extends PnpmError {
+    pnpmfile;
+    constructor(pnpmfile, message) {
+        super('BAD_READ_PACKAGE_HOOK_RESULT', `${message} Hook imported via ${pnpmfile}`);
+        this.pnpmfile = pnpmfile;
+    }
+}
+class PnpmFileFailError extends PnpmError {
+    pnpmfile;
+    originalError;
+    constructor(pnpmfile, originalError) {
+        super('PNPMFILE_FAIL', `Error during pnpmfile execution. pnpmfile: "${pnpmfile}". Error: "${originalError.message}".`);
+        this.pnpmfile = pnpmfile;
+        this.originalError = originalError;
+    }
+}
+export async function requirePnpmfile(pnpmFilePath, prefix) {
+    try {
+        let pnpmfile;
+        // Check if it's an ESM module (ends with .mjs)
+        if (pnpmFilePath.endsWith('.mjs')) {
+            const url = pathToFileURL(path.resolve(pnpmFilePath)).href;
+            pnpmfile = await import(url);
+        }
+        else {
+            // Use require for CommonJS modules
+            pnpmfile = require(pnpmFilePath);
+        }
+        if (typeof pnpmfile === 'undefined') {
+            logger.warn({
+                message: `Ignoring the pnpmfile at "${pnpmFilePath}". It exports "undefined".`,
+                prefix,
+            });
+            return { pnpmfileModule: undefined };
+        }
+        if (pnpmfile?.hooks?.readPackage && typeof pnpmfile.hooks.readPackage !== 'function') {
+            throw new TypeError('hooks.readPackage should be a function');
+        }
+        if (pnpmfile?.hooks?.readPackage) {
+            const readPackage = pnpmfile.hooks.readPackage; // eslint-disable-line
+            pnpmfile.hooks.readPackage = async function (pkg, ...args) {
+                pkg.dependencies = pkg.dependencies ?? {};
+                pkg.devDependencies = pkg.devDependencies ?? {};
+                pkg.optionalDependencies = pkg.optionalDependencies ?? {};
+                pkg.peerDependencies = pkg.peerDependencies ?? {};
+                const newPkg = await readPackage(pkg, ...args);
+                if (!newPkg) {
+                    throw new BadReadPackageHookError(pnpmFilePath, 'readPackage hook did not return a package manifest object.');
+                }
+                const dependencies = ['dependencies', 'devDependencies', 'optionalDependencies', 'peerDependencies'];
+                for (const dep of dependencies) {
+                    if (newPkg[dep] != null && (typeof newPkg[dep] !== 'object' || Array.isArray(newPkg[dep]))) {
+                        throw new BadReadPackageHookError(pnpmFilePath, `readPackage hook returned package manifest object's property '${dep}' must be an object.`);
+                    }
+                }
+                return newPkg;
+            };
+            if (pnpmfile?.hooks?.beforePacking && typeof pnpmfile.hooks.beforePacking !== 'function') {
+                throw new TypeError('hooks.beforePacking should be a function');
+            }
+        }
+        return { pnpmfileModule: pnpmfile };
+    }
+    catch (err) {
+        if (err instanceof SyntaxError) {
+            console.error(chalk.red(`A syntax error in the "${pnpmFilePath}"\n`));
+            console.error(err);
+            process.exit(1);
+        }
+        if (!util.types.isNativeError(err)) {
+            throw new PnpmFileFailError(pnpmFilePath, toError(err));
+        }
+        if (!('code' in err && (err.code === 'MODULE_NOT_FOUND' || err.code === 'ERR_MODULE_NOT_FOUND')) ||
+            pnpmFileExistsSync(pnpmFilePath)) {
+            throw new PnpmFileFailError(pnpmFilePath, err);
+        }
+        return undefined;
+    }
+}
+function pnpmFileExistsSync(pnpmFilePath) {
+    const pnpmFileRealName = pnpmFilePath.endsWith('.cjs') || pnpmFilePath.endsWith('.mjs')
+        ? pnpmFilePath
+        : `${pnpmFilePath}.cjs`;
+    return fs.existsSync(pnpmFileRealName);
+}
+function toError(err) {
+    if (err instanceof Error)
+        return err;
+    try {
+        return new Error(String(err), { cause: err });
+    }
+    catch {
+        return new Error('[non-Error value thrown]', { cause: err });
+    }
+}
+//# sourceMappingURL=requirePnpmfile.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/hooks.pnpmfile",
-  "version": "1100.0.21",
+  "version": "1100.0.22",
   "description": "Reading a .pnpmfile.cjs",
   "keywords": [
     "pnpm",
@@ -27,13 +27,13 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/core-loggers": "1100.2.4",
-    "@pnpm/crypto.hash": "1100.0.1",
-    "@pnpm/error": "1100.0.1",
-    "@pnpm/hooks.types": "1100.2.2",
-    "@pnpm/lockfile.types": "1100.0.15",
-    "@pnpm/store.controller-types": "1100.1.9",
-    "@pnpm/types": "1101.5.0",
+    "@pnpm/core-loggers": "1100.2.5",
+    "@pnpm/crypto.hash": "1100.0.2",
+    "@pnpm/error": "1100.1.0",
+    "@pnpm/hooks.types": "1100.2.3",
+    "@pnpm/lockfile.types": "1100.0.16",
+    "@pnpm/store.controller-types": "1100.1.10",
+    "@pnpm/types": "1101.6.0",
     "chalk": "^5.6.2",
     "path-absolute": "^2.0.0"
   },
@@ -42,10 +42,10 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/fetching.fetcher-base": "1100.2.3",
-    "@pnpm/hooks.pnpmfile": "1100.0.21",
+    "@pnpm/fetching.fetcher-base": "1100.2.4",
+    "@pnpm/hooks.pnpmfile": "1100.0.22",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/test-fixtures": "1100.0.0"
+    "@pnpm/test-fixtures": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"