@pnpm/installing.deps-restorer 1006.0.0 → 1100.0.0

package/lib/index.d.ts

@@ -4,7 +4,7 @@ import { type LockfileObject } from '@pnpm/lockfile.fs';
 import { type LogBase } from '@pnpm/logger';
 import type { PatchGroupRecord } from '@pnpm/patching.config';
 import type { StoreController } from '@pnpm/store.controller-types';
-import { type DepPath, type HoistedDependencies, type IgnoredBuilds, type ProjectId, type ProjectManifest, type ProjectRootDir, type Registries, type SupportedArchitectures } from '@pnpm/types';
+import { type DepPath, type HoistedDependencies, type IgnoredBuilds, type ProjectId, type ProjectManifest, type ProjectRootDir, type Registries, type RegistryConfig, type SupportedArchitectures } from '@pnpm/types';
 export { extendProjectsWithTargetDirs } from './extendProjectsWithTargetDirs.js';
 export type { HoistingLimits };
 export type ReporterFunction = (logObj: LogBase) => void;
@@ -36,7 +36,6 @@ export interface HeadlessOptions {
     preferSymlinkedExecutables?: boolean;
     hoistingLimits?: HoistingLimits;
     externalDependencies?: Set<string>;
-    ignoreDepScripts: boolean;
     ignoreScripts: boolean;
     ignorePackageManifest?: boolean;
     /**
@@ -72,7 +71,7 @@ export interface HeadlessOptions {
     disableRelinkLocalDirDeps?: boolean;
     force: boolean;
     storeDir: string;
-    rawConfig: object;
+    configByUri: Record<string, RegistryConfig>;
     unsafePerm: boolean;
     userAgent: string;
     registries: Registries;

package/lib/index.js

@@ -62,7 +62,7 @@ export async function headlessInstall(opts) {
         extraNodePaths: opts.extraNodePaths,
         preferSymlinkedExecutables: opts.preferSymlinkedExecutables,
         extraEnv: opts.extraEnv,
-        rawConfig: opts.rawConfig,
+        configByUri: opts.configByUri,
         resolveSymlinksInInjectedDirs: opts.resolveSymlinksInInjectedDirs,
         scriptsPrependNodePath: opts.scriptsPrependNodePath,
         scriptShell: opts.scriptShell,
@@ -152,6 +152,9 @@ export async function headlessInstall(opts) {
             }
         }
     }
+    if (opts.enableGlobalVirtualStore) {
+        opts.allowBuilds ??= {};
+    }
     const allowBuild = createAllowBuildFunction(opts);
     const lockfileToDepGraphOpts = {
         ...opts,
@@ -182,6 +185,7 @@ export async function headlessInstall(opts) {
     }
     const depNodes = Object.values(graph);
     const added = depNodes.filter(({ fetching }) => fetching).length;
+    const skipGvsInternalLinking = opts.enableGlobalVirtualStore === true && added === 0;
     statsLogger.debug({
         added,
         prefix: lockfileDir,
@@ -222,28 +226,30 @@ export async function headlessInstall(opts) {
         }
     }
     else if (opts.enableModulesDir !== false || opts.enableGlobalVirtualStore) {
-        if (opts.enableModulesDir !== false) {
-            await Promise.all(depNodes.map(async (depNode) => fs.mkdir(depNode.modules, { recursive: true })));
-        }
-        await Promise.all([
-            opts.symlink === false || opts.enableModulesDir === false
-                ? Promise.resolve()
-                : linkAllModules(depNodes, {
-                    optional: opts.include.optionalDependencies,
+        if (!skipGvsInternalLinking) {
+            if (opts.enableModulesDir !== false) {
+                await Promise.all(depNodes.map(async (depNode) => fs.mkdir(depNode.modules, { recursive: true })));
+            }
+            await Promise.all([
+                opts.symlink === false || opts.enableModulesDir === false
+                    ? Promise.resolve()
+                    : linkAllModules(depNodes, {
+                        optional: opts.include.optionalDependencies,
+                    }),
+                linkAllPkgs(opts.storeController, depNodes, {
+                    allowBuild,
+                    force: opts.force,
+                    disableRelinkLocalDirDeps: opts.disableRelinkLocalDirDeps,
+                    depGraph: graph,
+                    depsStateCache,
+                    enableGlobalVirtualStore: opts.enableGlobalVirtualStore,
+                    ignoreScripts: opts.ignoreScripts,
+                    lockfileDir: opts.lockfileDir,
+                    sideEffectsCacheRead: opts.sideEffectsCacheRead,
+                    storeDir: opts.storeDir,
                 }),
-            linkAllPkgs(opts.storeController, depNodes, {
-                allowBuild,
-                force: opts.force,
-                disableRelinkLocalDirDeps: opts.disableRelinkLocalDirDeps,
-                depGraph: graph,
-                depsStateCache,
-                enableGlobalVirtualStore: opts.enableGlobalVirtualStore,
-                ignoreScripts: opts.ignoreScripts,
-                lockfileDir: opts.lockfileDir,
-                sideEffectsCacheRead: opts.sideEffectsCacheRead,
-                storeDir: opts.storeDir,
-            }),
-        ]);
+            ]);
+        }
         stageLogger.debug({
             prefix: lockfileDir,
             stage: 'importing_done',
@@ -284,7 +290,7 @@ export async function headlessInstall(opts) {
         else {
             newHoistedDependencies = {};
         }
-        if (!skipPostImportLinking) {
+        if (!skipPostImportLinking && !skipGvsInternalLinking) {
             await linkAllBins(graph, {
                 extraNodePaths: opts.extraNodePaths,
                 optional: opts.include.optionalDependencies,
@@ -353,12 +359,11 @@ export async function headlessInstall(opts) {
             extraBinPaths,
             extraEnv,
             depsStateCache,
-            ignoreScripts: opts.ignoreScripts || opts.ignoreDepScripts,
+            ignoreScripts: opts.ignoreScripts,
             hoistedLocations,
             lockfileDir,
             optional: opts.include.optionalDependencies,
             preferSymlinkedExecutables: opts.preferSymlinkedExecutables,
-            rawConfig: opts.rawConfig,
             rootModulesDir: virtualStoreDir,
             scriptsPrependNodePath: opts.scriptsPrependNodePath,
             scriptShell: opts.scriptShell,
@@ -404,6 +409,9 @@ export async function headlessInstall(opts) {
                                 }
                             }
                         }
+                        // Skip packages without bins to avoid unnecessary manifest reads.
+                        // Dirs not in graph (e.g. link: deps) are kept since they may expose bins.
+                        directPkgDirs = directPkgDirs.filter((dir) => graph[dir] == null || graph[dir].hasBin);
                         await linkBinsOfPackages((await Promise.all(directPkgDirs.map(async (dir) => ({
                             location: dir,
                             manifest: await safeReadProjectManifestOnly(dir),
@@ -624,7 +632,7 @@ async function linkAllPkgs(storeController, depNodes, opts) {
         depNode.requiresBuild = filesResponse.requiresBuild;
         let sideEffectsCacheKey;
         if (opts.sideEffectsCacheRead && filesResponse.sideEffectsMaps && !isEmpty(filesResponse.sideEffectsMaps)) {
-            if (opts?.allowBuild?.(depNode.name, depNode.version) !== false) {
+            if (opts.allowBuild?.(depNode.name, depNode.version) === true) {
                 sideEffectsCacheKey = calcDepState(opts.depGraph, opts.depsStateCache, depNode.dir, {
                     includeDepGraphHash: !opts.ignoreScripts && depNode.requiresBuild, // true when is built
                     patchFileHash: depNode.patch?.hash,

package/lib/linkHoistedModules.js

@@ -63,7 +63,7 @@ async function linkAllPkgsInOrder(storeController, graph, hierarchy, parentDir,
             depNode.requiresBuild = filesResponse.requiresBuild;
             let sideEffectsCacheKey;
             if (opts.sideEffectsCacheRead && filesResponse.sideEffectsMaps && !isEmpty(filesResponse.sideEffectsMaps)) {
-                if (opts?.allowBuild?.(depNode.name, depNode.version) !== false) {
+                if (opts.allowBuild?.(depNode.name, depNode.version) === true) {
                     sideEffectsCacheKey = _calcDepState(dir, {
                         includeDepGraphHash: !opts.ignoreScripts && depNode.requiresBuild, // true when is built
                         patchFileHash: depNode.patch?.hash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-restorer",
-  "version": "1006.0.0",
+  "version": "1100.0.0",
   "description": "Fast installation using only pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -35,60 +35,60 @@
     "path-exists": "^5.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "realpath-missing": "^2.0.0",
-    "@pnpm/bins.linker": "1000.2.6",
-    "@pnpm/building.policy": "1000.0.0-0",
-    "@pnpm/building.during-install": "1000.0.0-0",
-    "@pnpm/config.package-is-installable": "1000.0.15",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/deps.graph-builder": "1002.3.0",
-    "@pnpm/core-loggers": "1001.0.4",
-    "@pnpm/deps.graph-hasher": "1002.0.8",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/exec.lifecycle": "1001.0.25",
-    "@pnpm/fs.symlink-dependency": "1000.0.12",
-    "@pnpm/deps.path": "1001.1.3",
-    "@pnpm/installing.linking.direct-dep-linker": "1000.0.12",
-    "@pnpm/installing.linking.hoist": "1002.0.8",
-    "@pnpm/installing.linking.modules-cleaner": "1001.0.23",
-    "@pnpm/installing.linking.real-hoist": "1001.0.20",
-    "@pnpm/installing.modules-yaml": "1000.3.6",
-    "@pnpm/installing.package-requester": "1008.0.0",
-    "@pnpm/lockfile.filtering": "1001.0.21",
-    "@pnpm/lockfile.utils": "1003.0.3",
-    "@pnpm/lockfile.to-pnp": "1001.0.23",
-    "@pnpm/pkg-manifest.reader": "1000.1.2",
-    "@pnpm/lockfile.fs": "1001.1.21",
-    "@pnpm/store.controller-types": "1004.1.0",
-    "@pnpm/patching.config": "1001.0.11",
-    "@pnpm/types": "1000.9.0",
-    "@pnpm/workspace.project-manifest-reader": "1001.1.4"
+    "@pnpm/building.during-install": "1100.0.0",
+    "@pnpm/config.package-is-installable": "1100.0.0",
+    "@pnpm/building.policy": "1100.0.0",
+    "@pnpm/deps.graph-builder": "1100.0.0",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/core-loggers": "1100.0.0",
+    "@pnpm/deps.graph-hasher": "1100.0.0",
+    "@pnpm/deps.path": "1100.0.0",
+    "@pnpm/bins.linker": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/exec.lifecycle": "1100.0.0",
+    "@pnpm/fs.symlink-dependency": "1100.0.0",
+    "@pnpm/installing.linking.direct-dep-linker": "1100.0.0",
+    "@pnpm/installing.linking.hoist": "1100.0.0",
+    "@pnpm/installing.linking.real-hoist": "1100.0.0",
+    "@pnpm/installing.linking.modules-cleaner": "1100.0.0",
+    "@pnpm/installing.package-requester": "1100.0.0",
+    "@pnpm/installing.modules-yaml": "1100.0.0",
+    "@pnpm/lockfile.filtering": "1100.0.0",
+    "@pnpm/lockfile.fs": "1100.0.0",
+    "@pnpm/lockfile.to-pnp": "1100.0.0",
+    "@pnpm/lockfile.utils": "1100.0.0",
+    "@pnpm/patching.config": "1100.0.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.0",
+    "@pnpm/store.controller-types": "1100.0.0",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.0",
+    "@pnpm/types": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1000.3.0"
+    "@pnpm/worker": "^1100.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "30.0.5",
-    "@pnpm/registry-mock": "5.2.4",
-    "@types/fs-extra": "^9.0.13",
-    "@types/ramda": "0.29.12",
+    "@jest/globals": "30.3.0",
+    "@pnpm/registry-mock": "6.0.0",
+    "@types/fs-extra": "^11.0.4",
+    "@types/ramda": "0.31.1",
     "concurrently": "9.2.1",
-    "isexe": "2.0.0",
+    "isexe": "4.0.0",
     "load-json-file": "^7.0.1",
     "tempy": "3.0.0",
     "write-json-file": "^7.0.0",
-    "@pnpm/installing.deps-restorer": "1006.0.0",
-    "@pnpm/crypto.object-hasher": "1000.1.0",
-    "@pnpm/installing.read-projects-context": "1000.0.24",
-    "@pnpm/assert-project": "1000.0.4",
-    "@pnpm/logger": "1001.0.1",
-    "@pnpm/prepare": "1000.0.4",
-    "@pnpm/store.cafs": "1000.0.19",
-    "@pnpm/store.path": "1000.0.5",
-    "@pnpm/store.index": "1000.0.0-0",
-    "@pnpm/test-fixtures": "1000.0.0",
-    "@pnpm/testing.temp-store": "1000.0.23",
-    "@pnpm/test-ipc-server": "1000.0.0"
+    "@pnpm/assert-project": "1100.0.0",
+    "@pnpm/crypto.object-hasher": "1100.0.0",
+    "@pnpm/installing.deps-restorer": "1100.0.0",
+    "@pnpm/prepare": "1100.0.0",
+    "@pnpm/store.cafs": "1100.0.0",
+    "@pnpm/store.index": "1100.0.0",
+    "@pnpm/test-ipc-server": "1100.0.0",
+    "@pnpm/store.path": "1100.0.0",
+    "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/installing.read-projects-context": "1100.0.0",
+    "@pnpm/testing.temp-store": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -99,10 +99,10 @@
   "scripts": {
     "start": "tsgo --watch",
     "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",
+    "test": "pn compile && pn .test",
     "runPrepareFixtures": "node ../../pnpm/bin/pnpm.mjs i -r -C test/fixtures --no-shared-workspace-lockfile --no-link-workspace-packages --lockfile-only --registry http://localhost:4873/ --ignore-scripts --force --no-strict-peer-dependencies",
     "prepareFixtures": "git clean -fdx test/fixtures && rm -rf \"test/fixtures/*/pnpm-lock.yaml\" && registry-mock prepare && concurrently --success=first --kill-others registry-mock \"pnpm run runPrepareFixtures\"",
-    "compile": "tsgo --build && pnpm run lint --fix"
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }