@vltpkg/cli-js 1.3.3 → 1.3.4

package/{chunk-TJBBYDUN.js → chunk-QEWKCTQY.js}

@@ -14,12 +14,12 @@ import {
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-LY5FNWRY.js";
+} from "./chunk-BFR3XHEM.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-CSZTT7QN.js";
+} from "./chunk-TOKUDCSW.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
@@ -27,10 +27,10 @@ import {
   Query,
   actual,
   isRunResult
-} from "./chunk-ZRRNOLEG.js";
+} from "./chunk-QGFDMXDH.js";
 import {
   Monorepo
-} from "./chunk-BUKZHMMK.js";
+} from "./chunk-INEKXXUQ.js";
 import {
   isErrorWithCause
 } from "./chunk-BP3PQ67D.js";

package/{chunk-ZRRNOLEG.js → chunk-QGFDMXDH.js}

@@ -13,14 +13,15 @@ import {
   AbortError,
   SecurityArchive,
   pRetry
-} from "./chunk-DCFLXO2M.js";
+} from "./chunk-MVD5AUNS.js";
 import {
   Monorepo,
   PackageJson,
+  detectLibc,
   getUser,
   minimatch,
   platformCheck
-} from "./chunk-BUKZHMMK.js";
+} from "./chunk-INEKXXUQ.js";
 import {
   asDepID,
   baseDepID,
@@ -46,7 +47,7 @@ import {
 import {
   userAgent,
   userAgentHeaders
-} from "./chunk-YU2W5UPG.js";
+} from "./chunk-WXRS5PRL.js";
 import {
   graphStep,
   promiseSpawn
@@ -10669,6 +10670,108 @@ var hasBindingGyp = (node, scurry) => node.bindingGyp ?? onDisk(node.resolvedLoc
 // ../../src/graph/src/reify/scripts-manifest.ts
 var scriptsManifest = (manifest, dir, packageJson) => manifest.hasInstallScript && !manifest.scripts ? packageJson.read(dir) : manifest;
 
+// ../../src/graph/src/reify/unshare.ts
+import { randomBytes } from "node:crypto";
+import { lstatSync as lstatSync2, readdirSync, rmSync } from "node:fs";
+import {
+  chmod as chmod3,
+  readFile,
+  rename,
+  rm,
+  writeFile as writeFile2
+} from "node:fs/promises";
+import { join as join4 } from "node:path";
+
+// ../../node_modules/.vlt/~npm~promise-call-limit@3.0.2/node_modules/promise-call-limit/dist/esm/index.js
+import * as os from "node:os";
+var defLimit = "availableParallelism" in os ? Math.max(1, os.availableParallelism() - 1) : Math.max(1, os.cpus().length - 1);
+var callLimit = (queue, { limit: limit2 = defLimit, rejectLate } = {}) => new Promise((res, rej) => {
+  let active = 0;
+  let current = 0;
+  const results = [];
+  let rejected = false;
+  let rejection;
+  const reject = (er) => {
+    if (rejected)
+      return;
+    rejected = true;
+    rejection ??= er;
+    if (!rejectLate)
+      rej(rejection);
+  };
+  let resolved = false;
+  const resolve14 = () => {
+    if (resolved || active > 0)
+      return;
+    resolved = true;
+    res(results);
+  };
+  const run2 = () => {
+    const c = current++;
+    if (c >= queue.length)
+      return rejected ? reject() : resolve14();
+    active++;
+    const step = queue[c];
+    if (!step)
+      throw new Error("walked off queue");
+    results[c] = step().then((result) => {
+      active--;
+      results[c] = result;
+      return result;
+    }, (er) => {
+      active--;
+      reject(er);
+    }).then((result) => {
+      if (rejected && active === 0)
+        return rej(rejection);
+      run2();
+      return result;
+    });
+  };
+  for (let i = 0; i < limit2; i++)
+    run2();
+});
+
+// ../../src/graph/src/reify/unshare.ts
+var TMP = ".vlt-unshare-";
+var own = async (p, mode, tmp) => {
+  const body = await readFile(p);
+  try {
+    await writeFile2(tmp, body, { mode: mode & 511, flag: "wx" });
+    if (mode & 73) await chmod3(tmp, mode & 511);
+    await rename(tmp, p);
+  } catch (er) {
+    await rm(tmp, { force: true });
+    throw er;
+  }
+};
+var unshare = async (dir) => {
+  const pjPath = join4(dir, "package.json");
+  const pj = lstatSync2(pjPath, { throwIfNoEntry: false });
+  if (!pj || pj.nlink < 2) return;
+  const tag = `${TMP}${randomBytes(4).toString("hex")}-`;
+  let n = 0;
+  const shared = [];
+  const walk2 = (d) => {
+    for (const ent of readdirSync(d, { withFileTypes: true })) {
+      const p = join4(d, ent.name);
+      if (ent.isDirectory()) walk2(p);
+      else if (ent.isFile() && p !== pjPath) {
+        const { mode, nlink } = lstatSync2(p);
+        if (nlink > 1) {
+          const tmp = join4(d, `${tag}${n++}`);
+          shared.push(() => own(p, mode, tmp));
+        } else if (ent.name.startsWith(TMP)) {
+          rmSync(p);
+        }
+      }
+    }
+  };
+  walk2(dir);
+  await callLimit(shared, { limit: 16, rejectLate: true });
+  await own(pjPath, pj.mode, join4(dir, `${tag}${n}`));
+};
+
 // ../../src/graph/src/reify/build.ts
 var build = async (diff2, packageJson, scurry, allowScriptsNodes) => {
   const graph = diff2.to;
@@ -10722,26 +10825,28 @@ var visit = async (packageJson, scurry, node, signal, _path) => {
   } = scripts2;
   const hasImplicitInstall = hasBindingGyp(node, scurry) && !install2 && !preinstall;
   const runInstall = !!(install2 || preinstall || postinstall) || hasImplicitInstall;
+  const prepable = node.id.startsWith("git") || node.importer || !node.inVltStore();
+  const runPrepare = !!(prepare || preprepare || postprepare) && prepable;
+  if ((runInstall || runPrepare) && node.inVltStore())
+    await unshare(dir);
   if (runInstall) {
     await run({
       signal,
       arg0: "install",
       ignoreMissing: true,
       packageJson,
-      cwd: node.resolvedLocation(scurry),
+      cwd: dir,
       projectRoot: node.projectRoot,
       manifest
     });
   }
-  const prepable = node.id.startsWith("git") || node.importer || !node.inVltStore();
-  const runPrepare = !!(prepare || preprepare || postprepare) && prepable;
   if (runPrepare) {
     await run({
       signal,
       arg0: "prepare",
       ignoreMissing: true,
       packageJson,
-      cwd: node.resolvedLocation(scurry),
+      cwd: dir,
       projectRoot: node.projectRoot,
       manifest
     });
@@ -11269,7 +11374,7 @@ function mermaidOutput(options) {
 
 // ../../src/rollback-remove/src/index.ts
 import { spawn as spawn3 } from "node:child_process";
-import { rename } from "node:fs/promises";
+import { rename as rename2 } from "node:fs/promises";
 import { basename, dirname as dirname3 } from "node:path";
 
 // ../../src/rollback-remove/src/remove.ts
@@ -11285,7 +11390,7 @@ var RollbackRemove = class {
     if (this.#paths.has(path2)) return;
     const target = `${dirname3(path2)}/.VLT.DELETE.${this.#key}.${basename(path2)}`;
     try {
-      await rename(path2, target);
+      await rename2(path2, target);
     } catch (e) {
       if (e instanceof Error && "code" in e && /* c8 ignore start - very spurious weirdness on Windows */
       (e.code === "ENOENT" || e.code === "EPERM")) {
@@ -11326,7 +11431,7 @@ var RollbackRemove = class {
     for (const [original, moved] of this.#paths) {
       promises.push(
         rimraf(original).catch(() => {
-        }).then(() => rename(moved, original))
+        }).then(() => rename2(moved, original))
       );
     }
     await Promise.all(promises);
@@ -12510,7 +12615,7 @@ var canonicalizePeerIds = (graph, options = {}) => {
 
 // ../../src/graph/src/ideal/move-peer-store-dirs.ts
 import { existsSync as existsSync3 } from "node:fs";
-import { rename as rename2 } from "node:fs/promises";
+import { rename as rename3 } from "node:fs/promises";
 var movePeerStoreDirs = async (moves, {
   scurry,
   remover
@@ -12530,7 +12635,7 @@ var movePeerStoreDirs = async (moves, {
       }
       const tmp = scurry.resolve(store, `.VLT.MOVE.${key}.${to}`);
       try {
-        await rename2(src, tmp);
+        await rename3(src, tmp);
       } catch {
         node.extracted = false;
         return;
@@ -12544,7 +12649,7 @@ var movePeerStoreDirs = async (moves, {
       const { node, tmp, dest } = s;
       try {
         await remover.rm(dest);
-        await rename2(tmp, dest);
+        await rename3(tmp, dest);
       } catch {
         node.extracted = false;
         try {
@@ -12647,13 +12752,12 @@ var isPathSecurityError = (er) => {
 };
 
 // ../../src/graph/src/reify/extract-node.ts
-import { lstatSync as lstatSync2 } from "node:fs";
+import { lstatSync as lstatSync3 } from "node:fs";
 var getOptionalFailedNodeRemover = (node, diff2) => {
   return diff2 ? optionalFail(diff2, node) : node.isOptional() ? () => removeOptionalSubgraph(node.graph, node) : void 0;
 };
 var extractNode = async (node, scurry, remover, options, packageInfo, diff2) => {
   node.extracted = true;
-  const { manifest = {} } = node;
   const target = node.resolvedLocation(scurry);
   const from = scurry.resolve("");
   const spec2 = hydrate2(node.id, node.name, options);
@@ -12670,13 +12774,11 @@ var extractNode = async (node, scurry, remover, options, packageInfo, diff2) =>
       error: new Error("Platform check failed or package deprecated")
     };
   }
-  const { scripts: scripts2, hasInstallScript } = manifest;
   const extractOptions = {
     from,
     integrity,
     resolved,
-    fromLockfile: node.resolvedFromLockfile,
-    installScripts: !!(hasInstallScript || scripts2?.install || scripts2?.preinstall || scripts2?.postinstall)
+    fromLockfile: node.resolvedFromLockfile
   };
   const extracted = (r) => {
     if (r.integrity && !node.integrity) node.integrity = r.integrity;
@@ -12692,7 +12794,7 @@ var extractNode = async (node, scurry, remover, options, packageInfo, diff2) =>
     return { success: true, node };
   };
   try {
-    if (lstatSync2(target, { throwIfNoEntry: false })) {
+    if (lstatSync3(target, { throwIfNoEntry: false })) {
       await remover.rm(target);
     }
     if (removeOptionalFailedNode) {
@@ -13819,7 +13921,6 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
           peerContext,
           depth
         }) => {
-          seen.add(node.id);
           const result = await fetchManifestsForDeps(
             packageInfo,
             graph,
@@ -13896,15 +13997,12 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
       levelResults.push(placed);
     }
     postPlacementPeerCheck(graph, levelResults);
+    const nextDepth = (currentLevelDeps[0]?.depth ?? 0) + 1;
     for (const childDepsToProcess of levelResults) {
       for (const childDep of childDepsToProcess) {
-        if (!seen.has(childDep.node.id)) {
-          const currentDepth = currentLevelDeps[0]?.depth ?? 0;
-          nextLevelDeps.push({
-            ...childDep,
-            depth: currentDepth + 1
-          });
-        }
+        if (seen.has(childDep.node.id)) continue;
+        seen.add(childDep.node.id);
+        nextLevelDeps.push({ ...childDep, depth: nextDepth });
       }
     }
     currentLevelDeps = nextLevelDeps;
@@ -14076,6 +14174,57 @@ var buildIdealFromStartingGraph = async (options) => {
   return options.graph;
 };
 
+// ../../src/graph/src/ideal/prefetch-resolve.ts
+var prefetchResolve = (graph, packageInfo, options) => {
+  if (options.modifiers) return 0;
+  const registry2 = options.registry;
+  if (!registry2) return 0;
+  const scopes = Object.keys(options["scoped-registries"] ?? {});
+  const scoped = (name) => scopes.some((scope2) => name.startsWith(`${scope2}/`));
+  const roots = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const importer of graph.importers) {
+    const manifest = importer.manifest;
+    if (!manifest) continue;
+    for (const field of [
+      "dependencies",
+      "devDependencies",
+      "optionalDependencies"
+    ]) {
+      const deps = manifest[field];
+      if (!deps) continue;
+      for (const [name, spec2] of Object.entries(deps)) {
+        if (typeof spec2 !== "string") continue;
+        if (spec2.includes(":") || scoped(name)) continue;
+        const key = `${name}@${spec2}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        roots.push({ name, spec: spec2 });
+      }
+    }
+  }
+  if (!roots.length) return 0;
+  const have = [];
+  for (const node of graph.nodes.values()) {
+    if (node.manifest && node.name && node.version && !scoped(node.name)) {
+      have.push(`${node.name}@${node.version}`);
+    }
+  }
+  packageInfo.prefetchResolve(registry2, {
+    roots,
+    have,
+    ...scopes.length ? { stop: { scopes } } : {},
+    platform: {
+      os: process.platform,
+      cpu: process.arch,
+      node: process.versions.node,
+      // undefined never serializes, so no libc means the field is absent
+      libc: detectLibc()
+    }
+  });
+  return roots.length;
+};
+
 // ../../src/graph/src/ideal/build.ts
 var getMap2 = (m) => m ?? /* @__PURE__ */ new Map();
 var validateFileDepNode = (graph, id2) => {
@@ -14112,6 +14261,7 @@ var build3 = async (options) => {
       monorepo
     });
   }
+  prefetchResolve(graph, packageInfo, options);
   const res = await buildIdealFromStartingGraph({
     ...options,
     scurry,
@@ -14138,63 +14288,13 @@ var build3 = async (options) => {
 // ../../src/graph/src/reify/index.ts
 import { availableParallelism as availableParallelism2 } from "node:os";
 
-// ../../node_modules/.vlt/~npm~promise-call-limit@3.0.2/node_modules/promise-call-limit/dist/esm/index.js
-import * as os from "node:os";
-var defLimit = "availableParallelism" in os ? Math.max(1, os.availableParallelism() - 1) : Math.max(1, os.cpus().length - 1);
-var callLimit = (queue, { limit: limit2 = defLimit, rejectLate } = {}) => new Promise((res, rej) => {
-  let active = 0;
-  let current = 0;
-  const results = [];
-  let rejected = false;
-  let rejection;
-  const reject = (er) => {
-    if (rejected)
-      return;
-    rejected = true;
-    rejection ??= er;
-    if (!rejectLate)
-      rej(rejection);
-  };
-  let resolved = false;
-  const resolve14 = () => {
-    if (resolved || active > 0)
-      return;
-    resolved = true;
-    res(results);
-  };
-  const run2 = () => {
-    const c = current++;
-    if (c >= queue.length)
-      return rejected ? reject() : resolve14();
-    active++;
-    const step = queue[c];
-    if (!step)
-      throw new Error("walked off queue");
-    results[c] = step().then((result) => {
-      active--;
-      results[c] = result;
-      return result;
-    }, (er) => {
-      active--;
-      reject(er);
-    }).then((result) => {
-      if (rejected && active === 0)
-        return rej(rejection);
-      run2();
-      return result;
-    });
-  };
-  for (let i = 0; i < limit2; i++)
-    run2();
-});
-
 // ../../src/cmd-shim/src/index.ts
 import {
-  chmod as chmod3,
+  chmod as chmod4,
   mkdir as mkdir2,
-  readFile as readFile2,
+  readFile as readFile3,
   stat as stat2,
-  writeFile as writeFile2
+  writeFile as writeFile3
 } from "node:fs/promises";
 import { dirname as dirname5, relative as relative2 } from "node:path";
 
@@ -14228,7 +14328,7 @@ var replaceDollarWithPercentPair = (value) => {
 };
 
 // ../../src/cmd-shim/src/read.ts
-import { lstat, readFile, readlink } from "node:fs/promises";
+import { lstat, readFile as readFile2, readlink } from "node:fs/promises";
 import { dirname as dirname4, resolve as resolve8 } from "node:path";
 
 // ../../src/cmd-shim/src/paths.ts
@@ -14280,7 +14380,7 @@ var readCmdShimIfExists = async (path2) => {
     if (st.isSymbolicLink()) {
       return resolve8(dirname4(path2), await readlink(path2));
     }
-    const contents = await readFile(path2);
+    const contents = await readFile2(path2);
     const destination = extractPath(path2, contents.toString());
     if (destination) return resolve8(dirname4(path2), destination);
   } catch {
@@ -14305,7 +14405,7 @@ var writeShim = async (from, to, remover) => {
     remover.rm(to + ".pwsh")
   ]);
   await mkdir2(dirname5(to), { recursive: true });
-  const data = await readFile2(from, "utf8").catch(() => "");
+  const data = await readFile3(from, "utf8").catch(() => "");
   if (!data) {
     return await writeShim_(from, to);
   }
@@ -14420,16 +14520,16 @@ exit $LASTEXITCODE
 `;
   }
   await Promise.all([
-    writeFile2(to + ".cmd", cmd, "utf8"),
-    writeFile2(to + ".ps1", pwsh, "utf8"),
-    writeFile2(to, sh, "utf8")
+    writeFile3(to + ".cmd", cmd, "utf8"),
+    writeFile3(to + ".ps1", pwsh, "utf8"),
+    writeFile3(to, sh, "utf8")
   ]);
   await chmodShim(to);
 };
 var chmodShim = async (to) => await Promise.all([
-  chmod3(to, 493),
-  chmod3(to + ".cmd", 493),
-  chmod3(to + ".ps1", 493)
+  chmod4(to, 493),
+  chmod4(to + ".cmd", 493),
+  chmod4(to + ".ps1", 493)
 ]);
 
 // ../../src/graph/src/reify/add-edge.ts
@@ -15034,7 +15134,7 @@ var reify_ = async (options, diff2, remover, saveImportersPackageJson) => {
 };
 
 // ../../src/graph/src/install.ts
-import { existsSync as existsSync6, rmSync as rmSync3 } from "node:fs";
+import { existsSync as existsSync6, rmSync as rmSync4 } from "node:fs";
 import { resolve as resolve13 } from "node:path";
 
 // ../../src/graph/src/lockfile/format-options-change.ts
@@ -15054,7 +15154,7 @@ var formatOptionsChange = ({
 }) => `${section}:${key === void 0 ? "" : ` ${key}`} ` + (from === void 0 ? "(missing)" : `"${redactUserinfo(from)}"`) + ` -> ${to === void 0 ? "(removed)" : `"${redactUserinfo(to)}"`}`;
 
 // ../../src/graph/src/uninstall.ts
-import { existsSync as existsSync4, rmSync } from "node:fs";
+import { existsSync as existsSync4, rmSync as rmSync2 } from "node:fs";
 import { resolve as resolve11 } from "node:path";
 var uninstall = async (options, remove) => {
   const mainManifest = options.packageJson.read(options.projectRoot);
@@ -15107,7 +15207,7 @@ var uninstall = async (options, remove) => {
         "node_modules/.vlt-lock.json"
       );
       if (existsSync4(hiddenLockfile)) {
-        rmSync(hiddenLockfile, { force: true });
+        rmSync2(hiddenLockfile, { force: true });
       }
     } catch {
     }
@@ -15116,7 +15216,7 @@ var uninstall = async (options, remove) => {
 };
 
 // ../../src/graph/src/update.ts
-import { existsSync as existsSync5, rmSync as rmSync2 } from "node:fs";
+import { existsSync as existsSync5, rmSync as rmSync3 } from "node:fs";
 import { resolve as resolve12 } from "node:path";
 var update = async (options) => {
   let mainManifest = void 0;
@@ -15171,7 +15271,7 @@ var update = async (options) => {
         "node_modules/.vlt-lock.json"
       );
       if (existsSync5(hiddenLockfile)) {
-        rmSync2(hiddenLockfile, { force: true });
+        rmSync3(hiddenLockfile, { force: true });
       }
     } catch {
     }
@@ -15471,7 +15571,7 @@ var install = async (options, add) => {
         "node_modules/.vlt-lock.json"
       );
       if (existsSync6(hiddenLockfile)) {
-        rmSync3(hiddenLockfile, { force: true });
+        rmSync4(hiddenLockfile, { force: true });
       }
     } catch {
     }
@@ -15490,12 +15590,12 @@ export {
   execFG,
   runExec,
   runExecFG,
+  callLimit,
   Query,
   build2 as build,
   jsonOutput,
   humanReadableOutput,
   mermaidOutput,
-  callLimit,
   findCmdShimIfExists,
   RollbackRemove,
   GraphModifier,

package/{chunk-ZBJRZXSU.js → chunk-QZIC3WVP.js}

@@ -11,14 +11,14 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-MOL2DUEQ.js";
+} from "./chunk-TL5SYXSC.js";
 import {
   findCmdShimIfExists,
   install
-} from "./chunk-ZRRNOLEG.js";
+} from "./chunk-QGFDMXDH.js";
 import {
   PathScurry
-} from "./chunk-BUKZHMMK.js";
+} from "./chunk-INEKXXUQ.js";
 import {
   Spec
 } from "./chunk-64VFL4WI.js";