@pnpm/building.commands 1000.0.0-0 → 1100.0.1

package/lib/build/rebuild.d.ts

@@ -1,16 +1,16 @@
-import { type Config } from '@pnpm/config.reader';
+import { type Config, type ConfigContext } from '@pnpm/config.reader';
 import type { LogBase } from '@pnpm/logger';
 import { type CreateStoreControllerOptions } from '@pnpm/store.connection-manager';
 export declare function rcOptionsTypes(): Record<string, unknown>;
 export declare function cliOptionsTypes(): Record<string, unknown>;
 export declare const commandNames: string[];
+export declare const overridableByScript = true;
 export declare function help(): string;
-export type RebuildCommandOpts = Pick<Config, 'allProjects' | 'dir' | 'engineStrict' | 'hooks' | 'lockfileDir' | 'nodeLinker' | 'rawLocalConfig' | 'rootProjectManifest' | 'rootProjectManifestDir' | 'registries' | 'scriptShell' | 'selectedProjectsGraph' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'scriptsPrependNodePath' | 'shellEmulator' | 'workspaceDir'> & CreateStoreControllerOptions & {
+export type RebuildCommandOpts = Pick<Config, 'dir' | 'engineStrict' | 'lockfileDir' | 'nodeLinker' | 'registries' | 'scriptShell' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'scriptsPrependNodePath' | 'shellEmulator' | 'workspaceDir'> & Pick<ConfigContext, 'allProjects' | 'hooks' | 'rootProjectManifest' | 'rootProjectManifestDir' | 'selectedProjectsGraph'> & CreateStoreControllerOptions & {
     recursive?: boolean;
     reporter?: (logObj: LogBase) => void;
     pending: boolean;
     skipIfHasSideEffectsCache?: boolean;
-    neverBuiltDependencies?: string[];
     allowBuilds?: Record<string, boolean | string>;
 };
 export declare function handler(opts: RebuildCommandOpts, params: string[]): Promise<void>;

package/lib/build/rebuild.js

@@ -25,6 +25,7 @@ export function cliOptionsTypes() {
     };
 }
 export const commandNames = ['rebuild', 'rb'];
+export const overridableByScript = true;
 export function help() {
     return renderHelp({
         aliases: ['rb'],
@@ -41,7 +42,7 @@ For options that may be used with `-r`, see "pnpm help recursive"',
                         shortAlias: '-r',
                     },
                     {
-                        description: 'Rebuild packages that were not build during installation. Packages are not build when installing with the --ignore-scripts flag',
+                        description: 'Rebuild packages that were not built during installation. Packages are not built when installing with the --ignore-scripts flag',
                         name: '--pending',
                     },
                     {

package/lib/build/recursive.d.ts

@@ -1,10 +1,10 @@
-import { type Config } from '@pnpm/config.reader';
+import { type Config, type ConfigContext } from '@pnpm/config.reader';
 import { type CreateStoreControllerOptions } from '@pnpm/store.connection-manager';
 import type { Project } from '@pnpm/types';
-type RecursiveRebuildOpts = CreateStoreControllerOptions & Pick<Config, 'hoistPattern' | 'hooks' | 'ignorePnpmfile' | 'ignoreScripts' | 'lockfileDir' | 'lockfileOnly' | 'nodeLinker' | 'packageConfigs' | 'rawLocalConfig' | 'registries' | 'rootProjectManifest' | 'rootProjectManifestDir' | 'sharedWorkspaceLockfile'> & {
+type RecursiveRebuildOpts = CreateStoreControllerOptions & Pick<Config, 'hoistPattern' | 'ignorePnpmfile' | 'ignoreScripts' | 'lockfileDir' | 'lockfileOnly' | 'nodeLinker' | 'packageConfigs' | 'registries' | 'sharedWorkspaceLockfile'> & Pick<ConfigContext, 'hooks' | 'rootProjectManifest' | 'rootProjectManifestDir'> & {
     pending?: boolean;
 } & Partial<Pick<Config, 'bail' | 'sort' | 'workspaceConcurrency'>>;
 export declare function recursiveRebuild(allProjects: Project[], params: string[], opts: RecursiveRebuildOpts & {
     ignoredPackages?: Set<string>;
-} & Required<Pick<Config, 'selectedProjectsGraph' | 'workspaceDir'>>): Promise<void>;
+} & Required<Pick<ConfigContext, 'selectedProjectsGraph'>> & Required<Pick<Config, 'workspaceDir'>>): Promise<void>;
 export {};

package/lib/build/recursive.js

@@ -84,10 +84,6 @@ export async function recursiveRebuild(allProjects, params, opts) {
                     ...localConfig,
                     dir: rootDir,
                     pending: opts.pending === true,
-                    rawConfig: {
-                        ...rebuildOpts.rawConfig,
-                        ...localConfig,
-                    },
                 });
                 result[rootDir].status = 'passed';
             }

package/lib/index.d.ts

@@ -1,4 +1,3 @@
-export { rebuild } from './build/index.js';
-export type { RebuildCommandOpts } from './build/rebuild.js';
+export { rebuild, type RebuildCommandOpts } from './build/index.js';
 export type { ApproveBuildsCommandOpts } from './policy/approveBuilds.js';
 export { approveBuilds, ignoredBuilds } from './policy/index.js';

package/lib/policy/approveBuilds.d.ts

@@ -1,11 +1,13 @@
-import { type RebuildCommandOpts } from '@pnpm/building.commands';
-import type { Config } from '@pnpm/config.reader';
-export type ApproveBuildsCommandOpts = Pick<Config, 'modulesDir' | 'dir' | 'rootProjectManifest' | 'rootProjectManifestDir' | 'allowBuilds'> & {
+import type { CommandHandlerMap } from '@pnpm/cli.command';
+import type { Config, ConfigContext } from '@pnpm/config.reader';
+import { type RebuildCommandOpts } from '../build/index.js';
+export type ApproveBuildsCommandOpts = Pick<Config, 'modulesDir' | 'dir' | 'allowBuilds' | 'enableGlobalVirtualStore'> & Pick<ConfigContext, 'rootProjectManifest' | 'rootProjectManifestDir'> & {
     all?: boolean;
     global?: boolean;
 };
 export declare const commandNames: string[];
+export declare const recursiveByDefault = true;
 export declare function help(): string;
 export declare function cliOptionsTypes(): Record<string, unknown>;
 export declare function rcOptionsTypes(): Record<string, unknown>;
-export declare function handler(opts: ApproveBuildsCommandOpts & RebuildCommandOpts): Promise<void>;
+export declare function handler(opts: ApproveBuildsCommandOpts & RebuildCommandOpts, params?: string[], commands?: CommandHandlerMap): Promise<void>;

package/lib/policy/approveBuilds.js

@@ -1,18 +1,24 @@
-import { rebuild } from '@pnpm/building.commands';
 import { writeSettings } from '@pnpm/config.writer';
+import { parse } from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
+import { install } from '@pnpm/installing.commands';
 import { writeModulesManifest } from '@pnpm/installing.modules-yaml';
 import { globalInfo } from '@pnpm/logger';
 import { lexCompare } from '@pnpm/util.lex-comparator';
 import chalk from 'chalk';
 import enquirer from 'enquirer';
 import { renderHelp } from 'render-help';
+import { rebuild } from '../build/index.js';
 import { getAutomaticallyIgnoredBuilds } from './getAutomaticallyIgnoredBuilds.js';
 export const commandNames = ['approve-builds'];
+export const recursiveByDefault = true;
 export function help() {
     return renderHelp({
         description: 'Approve dependencies for running scripts during installation',
-        usages: [],
+        usages: [
+            'pnpm approve-builds',
+            'pnpm approve-builds [<pkg> ...] [!<pkg> ...]',
+        ],
         descriptionLists: [
             {
                 title: 'Options',
@@ -35,20 +41,48 @@ export function cliOptionsTypes() {
 export function rcOptionsTypes() {
     return {};
 }
-export async function handler(opts) {
+export async function handler(opts, params = [], commands) {
     if (opts.global) {
         throw new PnpmError('APPROVE_BUILDS_NOT_SUPPORTED_WITH_GLOBAL', '"approve-builds" is not supported with global packages', {
             hint: 'Use --allow-build when installing globally, e.g. "pnpm add -g --allow-build=<pkg> <pkg>". ' +
                 'pnpm will also prompt to allow builds interactively during global install.',
         });
     }
+    if (opts.all && params.length) {
+        throw new PnpmError('APPROVE_BUILDS_ALL_WITH_ARGS', 'Cannot use --all with positional arguments');
+    }
     const { automaticallyIgnoredBuilds, modulesDir, modulesManifest, } = await getAutomaticallyIgnoredBuilds(opts);
     if (!automaticallyIgnoredBuilds?.length) {
         globalInfo('There are no packages awaiting approval');
         return;
     }
+    const denied = [];
+    const approved = [];
+    const unknown = [];
+    for (const p of params) {
+        const name = p.startsWith('!') ? p.slice(1) : p;
+        if (!automaticallyIgnoredBuilds.includes(name)) {
+            unknown.push(name);
+        }
+        else if (p.startsWith('!')) {
+            denied.push(name);
+        }
+        else {
+            approved.push(name);
+        }
+    }
+    if (unknown.length) {
+        throw new PnpmError('APPROVE_BUILDS_UNKNOWN_PACKAGES', `The following packages are not awaiting approval: ${unknown.join(', ')}`);
+    }
+    const contradictions = approved.filter((p) => denied.includes(p));
+    if (contradictions.length) {
+        throw new PnpmError('APPROVE_BUILDS_CONTRADICTING_ARGS', `The following packages are both approved and denied: ${contradictions.join(', ')}`);
+    }
     let buildPackages = [];
-    if (opts.all) {
+    if (params.length) {
+        buildPackages = sortUniqueStrings([...approved]);
+    }
+    else if (opts.all) {
         buildPackages = sortUniqueStrings([...automaticallyIgnoredBuilds]);
     }
     else {
@@ -89,19 +123,25 @@ export async function handler(opts) {
         }); // eslint-disable-line @typescript-eslint/no-explicit-any
         buildPackages = result.map(({ value }) => value);
     }
-    const ignoredPackages = automaticallyIgnoredBuilds.filter((automaticallyIgnoredBuild) => !buildPackages.includes(automaticallyIgnoredBuild));
     const allowBuilds = { ...opts.allowBuilds };
-    if (ignoredPackages.length) {
-        for (const pkg of ignoredPackages) {
+    if (params.length) {
+        for (const pkg of approved) {
+            allowBuilds[pkg] = true;
+        }
+        for (const pkg of denied) {
             allowBuilds[pkg] = false;
         }
     }
-    if (buildPackages.length) {
+    else {
+        const ignoredPackages = automaticallyIgnoredBuilds.filter((automaticallyIgnoredBuild) => !buildPackages.includes(automaticallyIgnoredBuild));
+        for (const pkg of ignoredPackages) {
+            allowBuilds[pkg] = false;
+        }
         for (const pkg of buildPackages) {
             allowBuilds[pkg] = true;
         }
     }
-    if (!opts.all) {
+    if (!opts.all && !params.length) {
         if (buildPackages.length) {
             const confirmed = await enquirer.prompt({
                 type: 'confirm',
@@ -123,16 +163,39 @@ Do you approve?`,
         workspaceDir: opts.workspaceDir ?? opts.rootProjectManifestDir,
         updatedSettings: { allowBuilds },
     });
+    if (modulesManifest?.ignoredBuilds) {
+        if (params.length) {
+            const decided = new Set([...approved, ...denied]);
+            for (const depPath of Array.from(modulesManifest.ignoredBuilds)) {
+                const name = parse(depPath).name ?? depPath;
+                if (decided.has(name)) {
+                    modulesManifest.ignoredBuilds.delete(depPath);
+                }
+            }
+            if (!modulesManifest.ignoredBuilds.size) {
+                delete modulesManifest.ignoredBuilds;
+            }
+        }
+        else {
+            delete modulesManifest.ignoredBuilds;
+        }
+        await writeModulesManifest(modulesDir, modulesManifest);
+    }
     if (buildPackages.length) {
+        if (opts.enableGlobalVirtualStore) {
+            await install.handler({
+                ...opts,
+                allowBuilds,
+                frozenLockfile: true,
+                optimisticRepeatInstall: false,
+            }, [], commands); // eslint-disable-line @typescript-eslint/no-explicit-any
+            return;
+        }
         return rebuild.handler({
             ...opts,
             allowBuilds,
         }, buildPackages);
     }
-    else if (modulesManifest) {
-        delete modulesManifest.ignoredBuilds;
-        await writeModulesManifest(modulesDir, modulesManifest);
-    }
 }
 function sortUniqueStrings(array) {
     return Array.from(new Set(array)).sort(lexCompare);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/building.commands",
-  "version": "1000.0.0-0",
+  "version": "1100.0.1",
   "description": "Commands for rebuilding and managing dependency builds",
   "keywords": [
     "pnpm",
@@ -31,42 +31,45 @@
     "p-limit": "^7.1.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
-    "@pnpm/building.after-install": "1000.0.0-0",
-    "@pnpm/cli.common-cli-options-help": "1000.0.1",
-    "@pnpm/config.writer": "1000.0.14",
-    "@pnpm/config.reader": "1004.4.2",
-    "@pnpm/deps.path": "1001.1.3",
-    "@pnpm/prepare-temp-dir": "1000.0.0",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/installing.modules-yaml": "1000.3.6",
-    "@pnpm/cli.utils": "1001.2.8",
-    "@pnpm/store.connection-manager": "1002.2.4",
-    "@pnpm/types": "1000.9.0",
-    "@pnpm/workspace.projects-sorter": "1000.0.11"
+    "@pnpm/building.after-install": "1100.0.1",
+    "@pnpm/cli.command": "1100.0.0",
+    "@pnpm/cli.common-cli-options-help": "1100.0.0",
+    "@pnpm/cli.utils": "1100.0.1",
+    "@pnpm/config.reader": "1100.0.1",
+    "@pnpm/config.writer": "1100.0.1",
+    "@pnpm/installing.commands": "1100.0.1",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/installing.modules-yaml": "1100.0.1",
+    "@pnpm/store.connection-manager": "1100.0.1",
+    "@pnpm/prepare-temp-dir": "1100.0.0",
+    "@pnpm/workspace.projects-sorter": "1100.0.1",
+    "@pnpm/deps.path": "1100.0.1",
+    "@pnpm/types": "1101.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "30.0.5",
-    "@pnpm/registry-mock": "5.2.4",
-    "@types/ramda": "0.29.12",
+    "@jest/globals": "30.3.0",
+    "@pnpm/registry-mock": "6.0.0",
+    "@types/ramda": "0.31.1",
     "execa": "npm:safe-execa@0.3.0",
     "load-json-file": "^7.0.1",
     "read-yaml-file": "^3.0.0",
     "write-package": "7.2.0",
     "write-yaml-file": "^6.0.0",
-    "@pnpm/assert-project": "1000.0.4",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/building.commands": "1000.0.0-0",
-    "@pnpm/logger": "1001.0.1",
-    "@pnpm/prepare": "1000.0.4",
-    "@pnpm/store.cafs": "1000.0.19",
-    "@pnpm/crypto.object-hasher": "1000.1.0",
-    "@pnpm/store.index": "1000.0.0-0",
-    "@pnpm/test-ipc-server": "1000.0.0",
-    "@pnpm/test-fixtures": "1000.0.0",
-    "@pnpm/workspace.projects-filter": "1000.0.43"
+    "@pnpm/building.commands": "1100.0.1",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/crypto.object-hasher": "1100.0.0",
+    "@pnpm/assert-project": "1100.0.1",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/prepare": "1100.0.1",
+    "@pnpm/store.index": "1100.0.0",
+    "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/store.cafs": "1100.0.1",
+    "@pnpm/testing.command-defaults": "1100.0.0",
+    "@pnpm/workspace.projects-filter": "1100.0.1",
+    "@pnpm/test-ipc-server": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -76,8 +79,8 @@
   },
   "scripts": {
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-    "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest",
-    "test": "pnpm run compile && pnpm run _test",
-    "compile": "tsgo --build && pnpm run lint --fix"
+    "test": "pn compile && pn --filter=pnpm compile && pn .test",
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }