@vltpkg/graph 0.0.0-0.1730724342581 → 0.0.0-10

package/dist/esm/reify/build.js

@@ -2,12 +2,12 @@
 // at the end, we get back to the importers, and run their prepare
 // script as well as install script.
 import { run } from '@vltpkg/run';
-import { statSync } from 'fs';
-import { chmod } from 'fs/promises';
+import { statSync } from 'node:fs';
+import { chmod } from 'node:fs/promises';
 import { graphRun } from 'graph-run';
-import { nonEmptyList } from '../non-empty-list.js';
-import { binPaths } from './bin-paths.js';
-import { optionalFail } from './optional-fail.js';
+import { nonEmptyList } from "../non-empty-list.js";
+import { binPaths } from "./bin-paths.js";
+import { optionalFail } from "./optional-fail.js";
 export const build = async (diff, packageJson, scurry) => {
     const graph = diff.to;
     const nodes = nonEmptyList([...graph.importers]);
@@ -39,7 +39,7 @@ export const build = async (diff, packageJson, scurry) => {
     });
 };
 const visit = async (packageJson, scurry, node, signal, _path) => {
-    node.manifest ??= packageJson.read(scurry.resolve(node.location));
+    node.manifest ??= packageJson.read(node.resolvedLocation(scurry));
     const { manifest } = node;
     const { scripts = {} } = manifest;
     const { install, preinstall, postinstall, prepare, preprepare, postprepare, } = scripts;
@@ -51,7 +51,7 @@ const visit = async (packageJson, scurry, node, signal, _path) => {
             arg0: 'install',
             ignoreMissing: true,
             packageJson,
-            cwd: node.location,
+            cwd: node.resolvedLocation(scurry),
             projectRoot: node.projectRoot,
             manifest,
         });
@@ -65,14 +65,14 @@ const visit = async (packageJson, scurry, node, signal, _path) => {
             arg0: 'prepare',
             ignoreMissing: true,
             packageJson,
-            cwd: node.location,
+            cwd: node.resolvedLocation(scurry),
             projectRoot: node.projectRoot,
             manifest,
         });
     }
     const chmods = [];
     for (const bin of Object.values(binPaths(manifest))) {
-        const path = scurry.resolve(node.location, bin);
+        const path = scurry.resolve(`${node.resolvedLocation(scurry)}/${bin}`);
         chmods.push(makeExecutable(path));
     }
     await Promise.all(chmods);

package/dist/esm/reify/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/reify/build.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,kEAAkE;AAClE,oCAAoC;AAGpC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAIpC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACxB,IAAU,EACV,WAAwB,EACxB,MAAkB,EAClB,EAAE;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAA;IACrB,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAA;IAChD,4DAA4D;IAC5D,IAAI,CAAC,KAAK;QAAE,OAAM;IAElB,MAAM,QAAQ,CAAgB;QAC5B,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,KAAK,EAAE,IAAU,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YACxC,2DAA2D;YAC3D,mEAAmE;YACnE,iEAAiE;YACjE,qBAAqB;YACrB,6DAA6D;YAC7D,8BAA8B;YAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAM;YAEvD,MAAM,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CACvD,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CACzB,CAAA;QACH,CAAC;QAED,OAAO,EAAE,IAAI,CAAC,EAAE;YACd,MAAM,IAAI,GAAW,EAAE,CAAA;YACvB,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC5C,uDAAuD;gBACvD,IAAI,EAAE;oBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACvB,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,KAAK,EACjB,WAAwB,EACxB,MAAkB,EAClB,IAAU,EACV,MAAmB,EACnB,KAAa,EACE,EAAE;IACjB,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAA;IAEjC,MAAM,EACJ,OAAO,EACP,UAAU,EACV,WAAW,EACX,OAAO,EACP,UAAU,EACV,WAAW,GACZ,GAAG,OAAO,CAAA;IAEX,mCAAmC;IACnC,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,UAAU,IAAI,WAAW,CAAC,CAAA;IAC3D,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,GAAG,CAAC;YACR,MAAM;YACN,IAAI,EAAE,SAAS;YACf,aAAa,EAAE,IAAI;YACnB,WAAW;YACX,GAAG,EAAE,IAAI,CAAC,QAAQ;YAClB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAED,0CAA0C;IAC1C,MAAM,QAAQ,GACZ,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAA;IAClE,MAAM,UAAU,GACd,CAAC,CAAC,CAAC,OAAO,IAAI,UAAU,IAAI,WAAW,CAAC,IAAI,QAAQ,CAAA;IAEtD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,GAAG,CAAC;YACR,MAAM;YACN,IAAI,EAAE,SAAS;YACf,aAAa,EAAE,IAAI;YACnB,WAAW;YACX,GAAG,EAAE,IAAI,CAAC,QAAQ;YAClB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,MAAM,GAAuB,EAAE,CAAA;IACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAC/C,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAA;IACnC,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC,CAAA;AAED,qBAAqB;AACrB,4DAA4D;AAC5D,oEAAoE;AACpE,IAAI,QAAQ,GAAG,CAAC,CAAA;AAChB,MAAM,cAAc,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,KAAK,CAAA;IAClD,CAAC;IACD,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AAC7B,CAAC,CAAA","sourcesContent":["// walk the graph of added nodes, building and chmoding their bins\n// at the end, we get back to the importers, and run their prepare\n// script as well as install script.\n\nimport { type PackageJson } from '@vltpkg/package-json'\nimport { run } from '@vltpkg/run'\nimport { statSync } from 'fs'\nimport { chmod } from 'fs/promises'\nimport { graphRun } from 'graph-run'\nimport { type PathScurry } from 'path-scurry'\nimport { type Diff } from '../diff.js'\nimport { type Node } from '../node.js'\nimport { nonEmptyList } from '../non-empty-list.js'\nimport { binPaths } from './bin-paths.js'\nimport { optionalFail } from './optional-fail.js'\n\nexport const build = async (\n  diff: Diff,\n  packageJson: PackageJson,\n  scurry: PathScurry,\n) => {\n  const graph = diff.to\n  const nodes = nonEmptyList([...graph.importers])\n  /* c8 ignore next - all graphs have at least one importer */\n  if (!nodes) return\n\n  await graphRun<Node, unknown>({\n    graph: nodes,\n    visit: async (node: Node, signal, path) => {\n      // if it's not an importer or an added node, nothing to do.\n      // TODO: only build importers if it has changed deps, there's never\n      // been a previous build, or it contains something newer than the\n      // most recent build.\n      // For now, just always build all importers, because we don't\n      // track all that other stuff.\n      if (!node.importer && !diff.nodes.add.has(node)) return\n\n      await visit(packageJson, scurry, node, signal, path).then(\n        x => x,\n        optionalFail(diff, node),\n      )\n    },\n\n    getDeps: node => {\n      const deps: Node[] = []\n      for (const { to } of node.edgesOut.values()) {\n        /* c8 ignore next - vanishingly unlikely in practice */\n        if (to) deps.push(to)\n      }\n      return deps\n    },\n  })\n}\n\nconst visit = async (\n  packageJson: PackageJson,\n  scurry: PathScurry,\n  node: Node,\n  signal: AbortSignal,\n  _path: Node[],\n): Promise<void> => {\n  node.manifest ??= packageJson.read(scurry.resolve(node.location))\n  const { manifest } = node\n  const { scripts = {} } = manifest\n\n  const {\n    install,\n    preinstall,\n    postinstall,\n    prepare,\n    preprepare,\n    postprepare,\n  } = scripts\n\n  // if it has install script, run it\n  const runInstall = !!(install || preinstall || postinstall)\n  if (runInstall) {\n    await run({\n      signal,\n      arg0: 'install',\n      ignoreMissing: true,\n      packageJson,\n      cwd: node.location,\n      projectRoot: node.projectRoot,\n      manifest,\n    })\n  }\n\n  // if it's an importer or git, run prepare\n  const prepable =\n    node.id.startsWith('git') || node.importer || !node.inVltStore()\n  const runPrepare =\n    !!(prepare || preprepare || postprepare) && prepable\n\n  if (runPrepare) {\n    await run({\n      signal,\n      arg0: 'prepare',\n      ignoreMissing: true,\n      packageJson,\n      cwd: node.location,\n      projectRoot: node.projectRoot,\n      manifest,\n    })\n  }\n\n  const chmods: Promise<unknown>[] = []\n  for (const bin of Object.values(binPaths(manifest))) {\n    const path = scurry.resolve(node.location, bin)\n    chmods.push(makeExecutable(path))\n  }\n  await Promise.all(chmods)\n}\n\n// 0 is \"not yet set\"\n// This is defined by doing `0o111 | <mode>` so that systems\n// that create files group-writable result in 0o775 instead of 0o755\nlet execMode = 0\nconst makeExecutable = async (path: string) => {\n  if (!execMode) {\n    execMode = (statSync(path).mode & 0o777) | 0o111\n  }\n  await chmod(path, execMode)\n}\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/reify/build.ts"],"names":[],"mappings":"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","sourcesContent":["// walk the graph of added nodes, building and chmoding their bins\n// at the end, we get back to the importers, and run their prepare\n// script as well as install script.\n\nimport type { PackageJson } from '@vltpkg/package-json'\nimport { run } from '@vltpkg/run'\nimport { statSync } from 'node:fs'\nimport { chmod } from 'node:fs/promises'\nimport { graphRun } from 'graph-run'\nimport type { PathScurry } from 'path-scurry'\nimport type { Diff } from '../diff.ts'\nimport type { Node } from '../node.ts'\nimport { nonEmptyList } from '../non-empty-list.ts'\nimport { binPaths } from './bin-paths.ts'\nimport { optionalFail } from './optional-fail.ts'\n\nexport const build = async (\n  diff: Diff,\n  packageJson: PackageJson,\n  scurry: PathScurry,\n) => {\n  const graph = diff.to\n  const nodes = nonEmptyList([...graph.importers])\n  /* c8 ignore next - all graphs have at least one importer */\n  if (!nodes) return\n\n  await graphRun<Node, unknown>({\n    graph: nodes,\n    visit: async (node: Node, signal, path) => {\n      // if it's not an importer or an added node, nothing to do.\n      // TODO: only build importers if it has changed deps, there's never\n      // been a previous build, or it contains something newer than the\n      // most recent build.\n      // For now, just always build all importers, because we don't\n      // track all that other stuff.\n      if (!node.importer && !diff.nodes.add.has(node)) return\n\n      await visit(packageJson, scurry, node, signal, path).then(\n        x => x,\n        optionalFail(diff, node),\n      )\n    },\n\n    getDeps: node => {\n      const deps: Node[] = []\n      for (const { to } of node.edgesOut.values()) {\n        /* c8 ignore next - vanishingly unlikely in practice */\n        if (to) deps.push(to)\n      }\n      return deps\n    },\n  })\n}\n\nconst visit = async (\n  packageJson: PackageJson,\n  scurry: PathScurry,\n  node: Node,\n  signal: AbortSignal,\n  _path: Node[],\n): Promise<void> => {\n  node.manifest ??= packageJson.read(node.resolvedLocation(scurry))\n  const { manifest } = node\n  const { scripts = {} } = manifest\n\n  const {\n    install,\n    preinstall,\n    postinstall,\n    prepare,\n    preprepare,\n    postprepare,\n  } = scripts\n\n  // if it has install script, run it\n  const runInstall = !!(install || preinstall || postinstall)\n  if (runInstall) {\n    await run({\n      signal,\n      arg0: 'install',\n      ignoreMissing: true,\n      packageJson,\n      cwd: node.resolvedLocation(scurry),\n      projectRoot: node.projectRoot,\n      manifest,\n    })\n  }\n\n  // if it's an importer or git, run prepare\n  const prepable =\n    node.id.startsWith('git') || node.importer || !node.inVltStore()\n  const runPrepare =\n    !!(prepare || preprepare || postprepare) && prepable\n\n  if (runPrepare) {\n    await run({\n      signal,\n      arg0: 'prepare',\n      ignoreMissing: true,\n      packageJson,\n      cwd: node.resolvedLocation(scurry),\n      projectRoot: node.projectRoot,\n      manifest,\n    })\n  }\n\n  const chmods: Promise<unknown>[] = []\n  for (const bin of Object.values(binPaths(manifest))) {\n    const path = scurry.resolve(\n      `${node.resolvedLocation(scurry)}/${bin}`,\n    )\n    chmods.push(makeExecutable(path))\n  }\n  await Promise.all(chmods)\n}\n\n// 0 is \"not yet set\"\n// This is defined by doing `0o111 | <mode>` so that systems\n// that create files group-writable result in 0o775 instead of 0o755\nlet execMode = 0\nconst makeExecutable = async (path: string) => {\n  if (!execMode) {\n    execMode = (statSync(path).mode & 0o777) | 0o111\n  }\n  await chmod(path, execMode)\n}\n"]}

package/dist/esm/reify/delete-edge.d.ts

@@ -1,5 +1,5 @@
-import { type RollbackRemove } from '@vltpkg/rollback-remove';
-import { type PathScurry } from 'path-scurry';
-import { type Edge } from '../edge.js';
+import type { RollbackRemove } from '@vltpkg/rollback-remove';
+import type { PathScurry } from 'path-scurry';
+import type { Edge } from '../edge.ts';
 export declare const deleteEdge: (edge: Edge, scurry: PathScurry, remover: RollbackRemove) => Promise<void>;
 //# sourceMappingURL=delete-edge.d.ts.map

package/dist/esm/reify/delete-edge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-edge.d.ts","sourceRoot":"","sources":["../../../src/reify/delete-edge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA;AAiBtC,eAAO,MAAM,UAAU,SACf,IAAI,UACF,UAAU,WACT,cAAc,kBAmBxB,CAAA"}
+{"version":3,"file":"delete-edge.d.ts","sourceRoot":"","sources":["../../../src/reify/delete-edge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAiBtC,eAAO,MAAM,UAAU,SACf,IAAI,UACF,UAAU,WACT,cAAc,kBAmBxB,CAAA"}

package/dist/esm/reify/delete-edge.js

@@ -1,4 +1,4 @@
-import { binPaths } from './bin-paths.js';
+import { binPaths } from "./bin-paths.js";
 const rmBinPosix = (remover, bin) => {
     return [remover.rm(bin)];
 };
@@ -6,13 +6,13 @@ const rmBinWin32 = (remover, bin) => {
     return [
         remover.rm(bin),
         remover.rm(bin + '.cmd'),
-        remover.rm(bin + '.pwsh'),
+        remover.rm(bin + '.ps1'),
     ];
 };
 const rmBin = process.platform === 'win32' ? rmBinWin32 : rmBinPosix;
 export const deleteEdge = async (edge, scurry, remover) => {
     const { spec: { name }, to, } = edge;
-    const nm = edge.from.nodeModules;
+    const nm = edge.from.nodeModules(scurry);
     const path = scurry.resolve(nm, name);
     const binRoot = scurry.cwd.resolve(`${nm}/.bin`);
     const promises = [];

package/dist/esm/reify/delete-edge.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-edge.js","sourceRoot":"","sources":["../../../src/reify/delete-edge.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,MAAM,UAAU,GAAG,CAAC,OAAuB,EAAE,GAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,OAAuB,EAAE,GAAW,EAAE,EAAE;IAC1D,OAAO;QACL,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC;QACf,OAAO,CAAC,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC;KAC1B,CAAA;AACH,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA;AAEpE,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,IAAU,EACV,MAAkB,EAClB,OAAuB,EACvB,EAAE;IACF,MAAM,EACJ,IAAI,EAAE,EAAE,IAAI,EAAE,EACd,EAAE,GACH,GAAG,IAAI,CAAA;IACR,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAA;IAChC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IACrC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChD,MAAM,QAAQ,GAAuB,EAAE,CAAA;IACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/B,MAAM,QAAQ,GAAG,EAAE,EAAE,QAAQ,CAAA;IAC7B,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YAClD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;YAC3C,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC7B,CAAC,CAAA","sourcesContent":["import { type RollbackRemove } from '@vltpkg/rollback-remove'\nimport { type PathScurry } from 'path-scurry'\nimport { type Edge } from '../edge.js'\nimport { binPaths } from './bin-paths.js'\n\nconst rmBinPosix = (remover: RollbackRemove, bin: string) => {\n  return [remover.rm(bin)]\n}\n\nconst rmBinWin32 = (remover: RollbackRemove, bin: string) => {\n  return [\n    remover.rm(bin),\n    remover.rm(bin + '.cmd'),\n    remover.rm(bin + '.pwsh'),\n  ]\n}\n\nconst rmBin = process.platform === 'win32' ? rmBinWin32 : rmBinPosix\n\nexport const deleteEdge = async (\n  edge: Edge,\n  scurry: PathScurry,\n  remover: RollbackRemove,\n) => {\n  const {\n    spec: { name },\n    to,\n  } = edge\n  const nm = edge.from.nodeModules\n  const path = scurry.resolve(nm, name)\n  const binRoot = scurry.cwd.resolve(`${nm}/.bin`)\n  const promises: Promise<unknown>[] = []\n  promises.push(remover.rm(path))\n  const manifest = to?.manifest\n  if (manifest) {\n    for (const key of Object.keys(binPaths(manifest))) {\n      const bin = binRoot.resolve(key).fullpath()\n      promises.push(...rmBin(remover, bin))\n    }\n  }\n  await Promise.all(promises)\n}\n"]}
+{"version":3,"file":"delete-edge.js","sourceRoot":"","sources":["../../../src/reify/delete-edge.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,MAAM,UAAU,GAAG,CAAC,OAAuB,EAAE,GAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,OAAuB,EAAE,GAAW,EAAE,EAAE;IAC1D,OAAO;QACL,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC;QACf,OAAO,CAAC,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC;KACzB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA;AAEpE,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,IAAU,EACV,MAAkB,EAClB,OAAuB,EACvB,EAAE;IACF,MAAM,EACJ,IAAI,EAAE,EAAE,IAAI,EAAE,EACd,EAAE,GACH,GAAG,IAAI,CAAA;IACR,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IACrC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChD,MAAM,QAAQ,GAAuB,EAAE,CAAA;IACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/B,MAAM,QAAQ,GAAG,EAAE,EAAE,QAAQ,CAAA;IAC7B,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YAClD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;YAC3C,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC7B,CAAC,CAAA","sourcesContent":["import type { RollbackRemove } from '@vltpkg/rollback-remove'\nimport type { PathScurry } from 'path-scurry'\nimport type { Edge } from '../edge.ts'\nimport { binPaths } from './bin-paths.ts'\n\nconst rmBinPosix = (remover: RollbackRemove, bin: string) => {\n  return [remover.rm(bin)]\n}\n\nconst rmBinWin32 = (remover: RollbackRemove, bin: string) => {\n  return [\n    remover.rm(bin),\n    remover.rm(bin + '.cmd'),\n    remover.rm(bin + '.ps1'),\n  ]\n}\n\nconst rmBin = process.platform === 'win32' ? rmBinWin32 : rmBinPosix\n\nexport const deleteEdge = async (\n  edge: Edge,\n  scurry: PathScurry,\n  remover: RollbackRemove,\n) => {\n  const {\n    spec: { name },\n    to,\n  } = edge\n  const nm = edge.from.nodeModules(scurry)\n  const path = scurry.resolve(nm, name)\n  const binRoot = scurry.cwd.resolve(`${nm}/.bin`)\n  const promises: Promise<unknown>[] = []\n  promises.push(remover.rm(path))\n  const manifest = to?.manifest\n  if (manifest) {\n    for (const key of Object.keys(binPaths(manifest))) {\n      const bin = binRoot.resolve(key).fullpath()\n      promises.push(...rmBin(remover, bin))\n    }\n  }\n  await Promise.all(promises)\n}\n"]}

package/dist/esm/reify/delete-edges.d.ts

@@ -1,5 +1,5 @@
-import { type RollbackRemove } from '@vltpkg/rollback-remove';
-import { type PathScurry } from 'path-scurry';
-import { type Diff } from '../diff.js';
+import type { RollbackRemove } from '@vltpkg/rollback-remove';
+import type { PathScurry } from 'path-scurry';
+import type { Diff } from '../diff.ts';
 export declare const deleteEdges: (diff: Diff, scurry: PathScurry, remover: RollbackRemove) => (() => Promise<unknown>)[];
 //# sourceMappingURL=delete-edges.d.ts.map

package/dist/esm/reify/delete-edges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-edges.d.ts","sourceRoot":"","sources":["../../../src/reify/delete-edges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC,eAAO,MAAM,WAAW,SAChB,IAAI,UACF,UAAU,WACT,cAAc,KACtB,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,EAW1B,CAAA"}
+{"version":3,"file":"delete-edges.d.ts","sourceRoot":"","sources":["../../../src/reify/delete-edges.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC,eAAO,MAAM,WAAW,SAChB,IAAI,UACF,UAAU,WACT,cAAc,KACtB,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,EAW1B,CAAA"}

package/dist/esm/reify/delete-edges.js

@@ -1,4 +1,4 @@
-import { deleteEdge } from './delete-edge.js';
+import { deleteEdge } from "./delete-edge.js";
 export const deleteEdges = (diff, scurry, remover) => {
     const promises = [];
     for (const edge of diff.edges.delete) {

package/dist/esm/reify/delete-edges.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-edges.js","sourceRoot":"","sources":["../../../src/reify/delete-edges.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAU,EACV,MAAkB,EAClB,OAAuB,EACK,EAAE;IAC9B,MAAM,QAAQ,GAA+B,EAAE,CAAA;IAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACrC,2DAA2D;QAC3D,kDAAkD;QAClD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YAC/D,SAAQ;QACV,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACxD,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA","sourcesContent":["import { type RollbackRemove } from '@vltpkg/rollback-remove'\nimport { type PathScurry } from 'path-scurry'\nimport { type Diff } from '../diff.js'\nimport { deleteEdge } from './delete-edge.js'\n\nexport const deleteEdges = (\n  diff: Diff,\n  scurry: PathScurry,\n  remover: RollbackRemove,\n): (() => Promise<unknown>)[] => {\n  const promises: (() => Promise<unknown>)[] = []\n  for (const edge of diff.edges.delete) {\n    // if the edge.from is a deleted node in the store, no need\n    // the entire dir will be removed in a later step.\n    if (diff.nodes.delete.has(edge.from) && edge.from.inVltStore()) {\n      continue\n    }\n    promises.push(() => deleteEdge(edge, scurry, remover))\n  }\n  return promises\n}\n"]}
+{"version":3,"file":"delete-edges.js","sourceRoot":"","sources":["../../../src/reify/delete-edges.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAU,EACV,MAAkB,EAClB,OAAuB,EACK,EAAE;IAC9B,MAAM,QAAQ,GAA+B,EAAE,CAAA;IAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACrC,2DAA2D;QAC3D,kDAAkD;QAClD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YAC/D,SAAQ;QACV,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACxD,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA","sourcesContent":["import type { RollbackRemove } from '@vltpkg/rollback-remove'\nimport type { PathScurry } from 'path-scurry'\nimport type { Diff } from '../diff.ts'\nimport { deleteEdge } from './delete-edge.ts'\n\nexport const deleteEdges = (\n  diff: Diff,\n  scurry: PathScurry,\n  remover: RollbackRemove,\n): (() => Promise<unknown>)[] => {\n  const promises: (() => Promise<unknown>)[] = []\n  for (const edge of diff.edges.delete) {\n    // if the edge.from is a deleted node in the store, no need\n    // the entire dir will be removed in a later step.\n    if (diff.nodes.delete.has(edge.from) && edge.from.inVltStore()) {\n      continue\n    }\n    promises.push(() => deleteEdge(edge, scurry, remover))\n  }\n  return promises\n}\n"]}

package/dist/esm/reify/delete-nodes.d.ts

@@ -1,5 +1,5 @@
-import { type RollbackRemove } from '@vltpkg/rollback-remove';
-import { type PathScurry } from 'path-scurry';
-import { type Diff } from '../diff.js';
+import type { RollbackRemove } from '@vltpkg/rollback-remove';
+import type { PathScurry } from 'path-scurry';
+import type { Diff } from '../diff.ts';
 export declare const deleteNodes: (diff: Diff, remover: RollbackRemove, scurry: PathScurry) => Promise<unknown>[];
 //# sourceMappingURL=delete-nodes.d.ts.map

package/dist/esm/reify/delete-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-nodes.d.ts","sourceRoot":"","sources":["../../../src/reify/delete-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC,eAAO,MAAM,WAAW,SAChB,IAAI,WACD,cAAc,UACf,UAAU,KACjB,OAAO,CAAC,OAAO,CAAC,EASlB,CAAA"}
+{"version":3,"file":"delete-nodes.d.ts","sourceRoot":"","sources":["../../../src/reify/delete-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC,eAAO,MAAM,WAAW,SAChB,IAAI,WACD,cAAc,UACf,UAAU,KACjB,OAAO,CAAC,OAAO,CAAC,EAYlB,CAAA"}

package/dist/esm/reify/delete-nodes.js

@@ -1,3 +1,4 @@
+import { deleteEdge } from "./delete-edge.js";
 export const deleteNodes = (diff, remover, scurry) => {
     const store = scurry.resolve('node_modules/.vlt');
     const rmActions = [];
@@ -6,6 +7,9 @@ export const deleteNodes = (diff, remover, scurry) => {
         if (!node.inVltStore())
             continue;
         rmActions.push(remover.rm(scurry.resolve(store, node.id)));
+        for (const edge of node.edgesIn) {
+            rmActions.push(deleteEdge(edge, scurry, remover));
+        }
     }
     return rmActions;
 };

package/dist/esm/reify/delete-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-nodes.js","sourceRoot":"","sources":["../../../src/reify/delete-nodes.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAU,EACV,OAAuB,EACvB,MAAkB,EACE,EAAE;IACtB,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,MAAM,SAAS,GAAuB,EAAE,CAAA;IACxC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACrC,2CAA2C;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,SAAQ;QAChC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5D,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA","sourcesContent":["import { type RollbackRemove } from '@vltpkg/rollback-remove'\nimport { type PathScurry } from 'path-scurry'\nimport { type Diff } from '../diff.js'\n\nexport const deleteNodes = (\n  diff: Diff,\n  remover: RollbackRemove,\n  scurry: PathScurry,\n): Promise<unknown>[] => {\n  const store = scurry.resolve('node_modules/.vlt')\n  const rmActions: Promise<unknown>[] = []\n  for (const node of diff.nodes.delete) {\n    // do not delete workspaces or link targets\n    if (!node.inVltStore()) continue\n    rmActions.push(remover.rm(scurry.resolve(store, node.id)))\n  }\n  return rmActions\n}\n"]}
+{"version":3,"file":"delete-nodes.js","sourceRoot":"","sources":["../../../src/reify/delete-nodes.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAU,EACV,OAAuB,EACvB,MAAkB,EACE,EAAE;IACtB,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,MAAM,SAAS,GAAuB,EAAE,CAAA;IACxC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACrC,2CAA2C;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,SAAQ;QAChC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAC1D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA","sourcesContent":["import type { RollbackRemove } from '@vltpkg/rollback-remove'\nimport type { PathScurry } from 'path-scurry'\nimport type { Diff } from '../diff.ts'\nimport { deleteEdge } from './delete-edge.ts'\n\nexport const deleteNodes = (\n  diff: Diff,\n  remover: RollbackRemove,\n  scurry: PathScurry,\n): Promise<unknown>[] => {\n  const store = scurry.resolve('node_modules/.vlt')\n  const rmActions: Promise<unknown>[] = []\n  for (const node of diff.nodes.delete) {\n    // do not delete workspaces or link targets\n    if (!node.inVltStore()) continue\n    rmActions.push(remover.rm(scurry.resolve(store, node.id)))\n    for (const edge of node.edgesIn) {\n      rmActions.push(deleteEdge(edge, scurry, remover))\n    }\n  }\n  return rmActions\n}\n"]}

package/dist/esm/reify/index.d.ts

@@ -1,7 +1,8 @@
-import { type PackageInfoClient } from '@vltpkg/package-info';
-import { type LoadOptions } from '../actual/load.js';
-import { type AddImportersDependenciesMap, type RemoveImportersDependenciesMap } from '../dependencies.js';
-import { type Graph } from '../graph.js';
+import type { PackageInfoClient } from '@vltpkg/package-info';
+import type { LoadOptions } from '../actual/load.ts';
+import type { AddImportersDependenciesMap, RemoveImportersDependenciesMap } from '../dependencies.ts';
+import { Diff } from '../diff.ts';
+import type { Graph } from '../graph.ts';
 export type ReifyOptions = LoadOptions & {
     add?: AddImportersDependenciesMap;
     remove?: RemoveImportersDependenciesMap;
@@ -12,5 +13,5 @@ export type ReifyOptions = LoadOptions & {
 /**
  * Make the current project match the supplied graph.
  */
-export declare const reify: (options: ReifyOptions) => Promise<void>;
+export declare const reify: (options: ReifyOptions) => Promise<Diff>;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/reify/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/reify/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAI7D,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,8BAA8B,EACpC,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AAoBxC,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC,KAAK,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,WAAW,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK,YAAmB,YAAY,kBAwBhD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/reify/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAK7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EACV,2BAA2B,EAC3B,8BAA8B,EAC/B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAqBxC,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC,KAAK,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,WAAW,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK,YAAmB,YAAY,kBA8BhD,CAAA"}

package/dist/esm/reify/index.js

@@ -1,22 +1,24 @@
 import { RollbackRemove } from '@vltpkg/rollback-remove';
 import { availableParallelism } from 'node:os';
 import { callLimit } from 'promise-call-limit';
-import { load as loadActual, } from '../actual/load.js';
-import { Diff } from '../diff.js';
-import { lockfile } from '../index.js';
-import { lockfileData, saveData, saveHidden, } from '../lockfile/save.js';
-import { addEdges } from './add-edges.js';
-import { addNodes } from './add-nodes.js';
-import { build } from './build.js';
-import { deleteEdges } from './delete-edges.js';
-import { deleteNodes } from './delete-nodes.js';
-import { rollback } from './rollback.js';
-import { updatePackageJson } from './update-importers-package-json.js';
+import { load as loadActual } from "../actual/load.js";
+import { Diff } from "../diff.js";
+import { lockfile } from "../index.js";
+import { lockfileData, saveData, saveHidden, } from "../lockfile/save.js";
+import { addEdges } from "./add-edges.js";
+import { addNodes } from "./add-nodes.js";
+import { build } from "./build.js";
+import { deleteEdges } from "./delete-edges.js";
+import { deleteNodes } from "./delete-nodes.js";
+import { rollback } from "./rollback.js";
+import { updatePackageJson } from "./update-importers-package-json.js";
+import { graphStep } from '@vltpkg/output';
 const limit = Math.max(availableParallelism() - 1, 1) * 8;
 /**
  * Make the current project match the supplied graph.
  */
 export const reify = async (options) => {
+    const done = graphStep('reify');
     const { graph, scurry } = options;
     const actual = options.actual ??
         loadActual({
@@ -38,15 +40,19 @@ export const reify = async (options) => {
         }
         /* c8 ignore stop */
     }
+    done();
+    return diff;
 };
 const reify_ = async (options, diff, remover) => {
-    const { packageInfo, packageJson, scurry } = options;
-    const saveImportersPackageJson = updatePackageJson({
-        add: options.add,
-        remove: options.remove,
-        graph: options.graph,
-        packageJson,
-    });
+    const { add, remove, packageInfo, packageJson, scurry } = options;
+    const saveImportersPackageJson = add?.modifiedDependencies || remove?.modifiedDependencies ?
+        updatePackageJson({
+            add,
+            remove,
+            graph: options.graph,
+            packageJson,
+        })
+        : undefined;
     // before anything else happens, grab the ideal tree as it was resolved
     // so that we can store it in the lockfile. We do this here so that
     // any failed/removed optional deps are not reflected in the lockfile
@@ -78,7 +84,7 @@ const reify_ = async (options, diff, remover) => {
     if (rmActions.length)
         await Promise.all(rmActions);
     // updates package.json files if anything was added / removed
-    saveImportersPackageJson();
+    saveImportersPackageJson?.();
     // write the ideal graph data to the lockfile
     saveData(lfData, scurry.resolve('vlt-lock.json'), false);
 };

package/dist/esm/reify/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/reify/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EACL,IAAI,IAAI,UAAU,GAEnB,MAAM,mBAAmB,CAAA;AAK1B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,UAAU,GACX,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAEtE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;AAazD;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,OAAqB,EAAE,EAAE;IACnD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAEjC,MAAM,MAAM,GACV,OAAO,CAAC,MAAM;QACd,UAAU,CAAC;YACT,GAAG,OAAO;YACV,aAAa,EAAE,IAAI;SACpB,CAAC,CAAA;IAEJ,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA;IACpC,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QACpC,OAAO,CAAC,OAAO,EAAE,CAAA;QACjB,OAAO,GAAG,IAAI,CAAA;IAChB,CAAC;YAAS,CAAC;QACT,qBAAqB;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QACvD,CAAC;QACD,oBAAoB;IACtB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,MAAM,GAAG,KAAK,EAClB,OAAqB,EACrB,IAAU,EACV,OAAuB,EACvB,EAAE;IACF,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IACpD,MAAM,wBAAwB,GAAG,iBAAiB,CAAC;QACjD,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,WAAW;KACZ,CAAC,CAAA;IAEF,uEAAuE;IACvE,mEAAmE;IACnE,qEAAqE;IACrE,uBAAuB;IACvB,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,OAAO,GAA+B,QAAQ,CAClD,IAAI,EACJ,MAAM,EACN,OAAO,EACP,OAAO,EACP,WAAW,CACZ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAE5C,mDAAmD;IACnD,IAAI,OAAO,CAAC,MAAM;QAAE,MAAM,SAAS,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IAEvD,6DAA6D;IAC7D,MAAM,WAAW,GAAuB,QAAQ,CAC9C,IAAI,EACJ,WAAW,EACX,MAAM,EACN,OAAO,CACR,CAAA;IACD,IAAI,WAAW,CAAC,MAAM;QAAE,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAEtD,gCAAgC;IAChC,MAAM,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;IAEtC,oBAAoB;IACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEtB,sDAAsD;IACtD,yDAAyD;IACzD,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IACD,UAAU,CAAC,OAAO,CAAC,CAAA;IAEnB,iCAAiC;IACjC,MAAM,SAAS,GAAuB,WAAW,CAC/C,IAAI,EACJ,OAAO,EACP,MAAM,CACP,CAAA;IACD,IAAI,SAAS,CAAC,MAAM;QAAE,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAElD,6DAA6D;IAC7D,wBAAwB,EAAE,CAAA;IAE1B,6CAA6C;IAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,CAAA;AAC1D,CAAC,CAAA","sourcesContent":["import { type PackageInfoClient } from '@vltpkg/package-info'\nimport { RollbackRemove } from '@vltpkg/rollback-remove'\nimport { availableParallelism } from 'node:os'\nimport { callLimit } from 'promise-call-limit'\nimport {\n  load as loadActual,\n  type LoadOptions,\n} from '../actual/load.js'\nimport {\n  type AddImportersDependenciesMap,\n  type RemoveImportersDependenciesMap,\n} from '../dependencies.js'\nimport { Diff } from '../diff.js'\nimport { type Graph } from '../graph.js'\nimport { lockfile } from '../index.js'\nimport {\n  lockfileData,\n  saveData,\n  saveHidden,\n} from '../lockfile/save.js'\nimport { addEdges } from './add-edges.js'\nimport { addNodes } from './add-nodes.js'\nimport { build } from './build.js'\nimport { deleteEdges } from './delete-edges.js'\nimport { deleteNodes } from './delete-nodes.js'\nimport { rollback } from './rollback.js'\nimport { updatePackageJson } from './update-importers-package-json.js'\n\nconst limit = Math.max(availableParallelism() - 1, 1) * 8\n\n// - [ ] depid's with peer resolutions\n// - [ ] depid shortening\n\nexport type ReifyOptions = LoadOptions & {\n  add?: AddImportersDependenciesMap\n  remove?: RemoveImportersDependenciesMap\n  graph: Graph\n  actual?: Graph\n  packageInfo: PackageInfoClient\n}\n\n/**\n * Make the current project match the supplied graph.\n */\nexport const reify = async (options: ReifyOptions) => {\n  const { graph, scurry } = options\n\n  const actual =\n    options.actual ??\n    loadActual({\n      ...options,\n      loadManifests: true,\n    })\n\n  const diff = new Diff(actual, graph)\n  const remover = new RollbackRemove()\n  let success = false\n  try {\n    await reify_(options, diff, remover)\n    remover.confirm()\n    success = true\n  } finally {\n    /* c8 ignore start */\n    if (!success) {\n      await rollback(remover, diff, scurry).catch(() => {})\n    }\n    /* c8 ignore stop */\n  }\n}\n\nconst reify_ = async (\n  options: ReifyOptions,\n  diff: Diff,\n  remover: RollbackRemove,\n) => {\n  const { packageInfo, packageJson, scurry } = options\n  const saveImportersPackageJson = updatePackageJson({\n    add: options.add,\n    remove: options.remove,\n    graph: options.graph,\n    packageJson,\n  })\n\n  // before anything else happens, grab the ideal tree as it was resolved\n  // so that we can store it in the lockfile. We do this here so that\n  // any failed/removed optional deps are not reflected in the lockfile\n  // data as it is saved.\n  const lfData = lockfileData(options)\n  const actions: (() => Promise<unknown>)[] = addNodes(\n    diff,\n    scurry,\n    remover,\n    options,\n    packageInfo,\n  ).concat(deleteEdges(diff, scurry, remover))\n\n  // need to wait, so that the nodes exist to link to\n  if (actions.length) await callLimit(actions, { limit })\n\n  // create all node_modules symlinks, and link bins to nm/.bin\n  const edgeActions: Promise<unknown>[] = addEdges(\n    diff,\n    packageJson,\n    scurry,\n    remover,\n  )\n  if (edgeActions.length) await Promise.all(edgeActions)\n\n  // run lifecycles and chmod bins\n  await build(diff, packageJson, scurry)\n\n  // save the lockfile\n  lockfile.save(options)\n\n  // if we had to change the actual graph along the way,\n  // make sure we do not leave behind any unreachable nodes\n  if (diff.hadOptionalFailures) {\n    for (const node of options.graph.gc().values()) {\n      diff.nodes.add.delete(node)\n      diff.nodes.delete.add(node)\n    }\n  }\n  saveHidden(options)\n\n  // delete garbage from the store.\n  const rmActions: Promise<unknown>[] = deleteNodes(\n    diff,\n    remover,\n    scurry,\n  )\n  if (rmActions.length) await Promise.all(rmActions)\n\n  // updates package.json files if anything was added / removed\n  saveImportersPackageJson()\n\n  // write the ideal graph data to the lockfile\n  saveData(lfData, scurry.resolve('vlt-lock.json'), false)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/reify/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageInfoClient } from '@vltpkg/package-info'\nimport { RollbackRemove } from '@vltpkg/rollback-remove'\nimport { availableParallelism } from 'node:os'\nimport { callLimit } from 'promise-call-limit'\nimport { load as loadActual } from '../actual/load.ts'\nimport type { LoadOptions } from '../actual/load.ts'\nimport type {\n  AddImportersDependenciesMap,\n  RemoveImportersDependenciesMap,\n} from '../dependencies.ts'\nimport { Diff } from '../diff.ts'\nimport type { Graph } from '../graph.ts'\nimport { lockfile } from '../index.ts'\nimport {\n  lockfileData,\n  saveData,\n  saveHidden,\n} from '../lockfile/save.ts'\nimport { addEdges } from './add-edges.ts'\nimport { addNodes } from './add-nodes.ts'\nimport { build } from './build.ts'\nimport { deleteEdges } from './delete-edges.ts'\nimport { deleteNodes } from './delete-nodes.ts'\nimport { rollback } from './rollback.ts'\nimport { updatePackageJson } from './update-importers-package-json.ts'\nimport { graphStep } from '@vltpkg/output'\n\nconst limit = Math.max(availableParallelism() - 1, 1) * 8\n\n// - [ ] depid's with peer resolutions\n// - [ ] depid shortening\n\nexport type ReifyOptions = LoadOptions & {\n  add?: AddImportersDependenciesMap\n  remove?: RemoveImportersDependenciesMap\n  graph: Graph\n  actual?: Graph\n  packageInfo: PackageInfoClient\n}\n\n/**\n * Make the current project match the supplied graph.\n */\nexport const reify = async (options: ReifyOptions) => {\n  const done = graphStep('reify')\n\n  const { graph, scurry } = options\n\n  const actual =\n    options.actual ??\n    loadActual({\n      ...options,\n      loadManifests: true,\n    })\n\n  const diff = new Diff(actual, graph)\n  const remover = new RollbackRemove()\n  let success = false\n  try {\n    await reify_(options, diff, remover)\n    remover.confirm()\n    success = true\n  } finally {\n    /* c8 ignore start */\n    if (!success) {\n      await rollback(remover, diff, scurry).catch(() => {})\n    }\n    /* c8 ignore stop */\n  }\n\n  done()\n\n  return diff\n}\n\nconst reify_ = async (\n  options: ReifyOptions,\n  diff: Diff,\n  remover: RollbackRemove,\n) => {\n  const { add, remove, packageInfo, packageJson, scurry } = options\n  const saveImportersPackageJson =\n    add?.modifiedDependencies || remove?.modifiedDependencies ?\n      updatePackageJson({\n        add,\n        remove,\n        graph: options.graph,\n        packageJson,\n      })\n    : undefined\n\n  // before anything else happens, grab the ideal tree as it was resolved\n  // so that we can store it in the lockfile. We do this here so that\n  // any failed/removed optional deps are not reflected in the lockfile\n  // data as it is saved.\n  const lfData = lockfileData(options)\n  const actions: (() => Promise<unknown>)[] = addNodes(\n    diff,\n    scurry,\n    remover,\n    options,\n    packageInfo,\n  ).concat(deleteEdges(diff, scurry, remover))\n\n  // need to wait, so that the nodes exist to link to\n  if (actions.length) await callLimit(actions, { limit })\n\n  // create all node_modules symlinks, and link bins to nm/.bin\n  const edgeActions: Promise<unknown>[] = addEdges(\n    diff,\n    packageJson,\n    scurry,\n    remover,\n  )\n  if (edgeActions.length) await Promise.all(edgeActions)\n\n  // run lifecycles and chmod bins\n  await build(diff, packageJson, scurry)\n\n  // save the lockfile\n  lockfile.save(options)\n\n  // if we had to change the actual graph along the way,\n  // make sure we do not leave behind any unreachable nodes\n  if (diff.hadOptionalFailures) {\n    for (const node of options.graph.gc().values()) {\n      diff.nodes.add.delete(node)\n      diff.nodes.delete.add(node)\n    }\n  }\n  saveHidden(options)\n\n  // delete garbage from the store.\n  const rmActions: Promise<unknown>[] = deleteNodes(\n    diff,\n    remover,\n    scurry,\n  )\n  if (rmActions.length) await Promise.all(rmActions)\n\n  // updates package.json files if anything was added / removed\n  saveImportersPackageJson?.()\n\n  // write the ideal graph data to the lockfile\n  saveData(lfData, scurry.resolve('vlt-lock.json'), false)\n}\n"]}

package/dist/esm/reify/optional-fail.d.ts

@@ -1,5 +1,5 @@
-import { type Diff } from '../diff.js';
-import { type Node } from '../node.js';
+import type { Diff } from '../diff.ts';
+import type { Node } from '../node.ts';
 /**
  * If the node is optional, then returns an error handler that removes
  * the node and its connected optional subgraph, by moving them into the

package/dist/esm/reify/optional-fail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optional-fail.d.ts","sourceRoot":"","sources":["../../../src/reify/optional-fail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GAC9B,MAAM,IAAI,CAAA;AACb,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,GAC/B,SAAS,CAAA;AACZ,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,GACT,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAA"}
+{"version":3,"file":"optional-fail.d.ts","sourceRoot":"","sources":["../../../src/reify/optional-fail.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GAC9B,MAAM,IAAI,CAAA;AACb,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAA;CAAE,GAC/B,SAAS,CAAA;AACZ,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,GACT,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAA"}

package/dist/esm/reify/optional-fail.js

@@ -1,4 +1,4 @@
-import { removeOptionalSubgraph } from '../remove-optional-subgraph.js';
+import { removeOptionalSubgraph } from "../remove-optional-subgraph.js";
 export function optionalFail(diff, node) {
     return node.isOptional() ? () => del(diff, node) : undefined;
 }

package/dist/esm/reify/optional-fail.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional-fail.js","sourceRoot":"","sources":["../../../src/reify/optional-fail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAoBvE,MAAM,UAAU,YAAY,CAC1B,IAAU,EACV,IAAU;IAEV,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAC9D,CAAC;AAED,MAAM,GAAG,GAAG,CAAC,IAAU,EAAE,IAA+B,EAAE,EAAE;IAC1D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAA;IAC/B,KAAK,MAAM,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;QACxD,2CAA2C;QAC3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC1B,8CAA8C;QAC9C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAC7B,CAAC,CAAA","sourcesContent":["import { type Diff } from '../diff.js'\nimport { type Node } from '../node.js'\nimport { removeOptionalSubgraph } from '../remove-optional-subgraph.js'\n\n/**\n * If the node is optional, then returns an error handler that removes\n * the node and its connected optional subgraph, by moving them into the\n * \"deleted\" portion of the Diff object.\n * Otherwise, it returns `undefined` so that the promise will simply reject.\n */\nexport function optionalFail(\n  diff: Diff,\n  node: Node & { optional: true },\n): () => void\nexport function optionalFail(\n  diff: Diff,\n  node: Node & { optional: false },\n): undefined\nexport function optionalFail(\n  diff: Diff,\n  node: Node,\n): (() => void) | undefined\nexport function optionalFail(\n  diff: Diff,\n  node: Node,\n): (() => void) | undefined {\n  return node.isOptional() ? () => del(diff, node) : undefined\n}\n\nconst del = (diff: Diff, node: Node & { optional: true }) => {\n  diff.hadOptionalFailures = true\n  for (const del of removeOptionalSubgraph(diff.to, node)) {\n    // add it to the set of nodes being deleted\n    diff.nodes.delete.add(del)\n    // delete it from the set of nodes being added\n    diff.nodes.add.delete(del)\n  }\n  diff.nodes.add.delete(node)\n  diff.nodes.delete.add(node)\n}\n"]}
+{"version":3,"file":"optional-fail.js","sourceRoot":"","sources":["../../../src/reify/optional-fail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAoBvE,MAAM,UAAU,YAAY,CAC1B,IAAU,EACV,IAAU;IAEV,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAC9D,CAAC;AAED,MAAM,GAAG,GAAG,CAAC,IAAU,EAAE,IAA+B,EAAE,EAAE;IAC1D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAA;IAC/B,KAAK,MAAM,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;QACxD,2CAA2C;QAC3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC1B,8CAA8C;QAC9C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAC7B,CAAC,CAAA","sourcesContent":["import type { Diff } from '../diff.ts'\nimport type { Node } from '../node.ts'\nimport { removeOptionalSubgraph } from '../remove-optional-subgraph.ts'\n\n/**\n * If the node is optional, then returns an error handler that removes\n * the node and its connected optional subgraph, by moving them into the\n * \"deleted\" portion of the Diff object.\n * Otherwise, it returns `undefined` so that the promise will simply reject.\n */\nexport function optionalFail(\n  diff: Diff,\n  node: Node & { optional: true },\n): () => void\nexport function optionalFail(\n  diff: Diff,\n  node: Node & { optional: false },\n): undefined\nexport function optionalFail(\n  diff: Diff,\n  node: Node,\n): (() => void) | undefined\nexport function optionalFail(\n  diff: Diff,\n  node: Node,\n): (() => void) | undefined {\n  return node.isOptional() ? () => del(diff, node) : undefined\n}\n\nconst del = (diff: Diff, node: Node & { optional: true }) => {\n  diff.hadOptionalFailures = true\n  for (const del of removeOptionalSubgraph(diff.to, node)) {\n    // add it to the set of nodes being deleted\n    diff.nodes.delete.add(del)\n    // delete it from the set of nodes being added\n    diff.nodes.add.delete(del)\n  }\n  diff.nodes.add.delete(node)\n  diff.nodes.delete.add(node)\n}\n"]}

package/dist/esm/reify/rollback.d.ts

@@ -1,5 +1,5 @@
 import { RollbackRemove } from '@vltpkg/rollback-remove';
-import { type PathScurry } from 'path-scurry';
-import { type Diff } from '../diff.js';
+import type { PathScurry } from 'path-scurry';
+import type { Diff } from '../diff.ts';
 export declare const rollback: (remover: RollbackRemove, diff: Diff, scurry: PathScurry) => Promise<void>;
 //# sourceMappingURL=rollback.d.ts.map

package/dist/esm/reify/rollback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollback.d.ts","sourceRoot":"","sources":["../../../src/reify/rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC,eAAO,MAAM,QAAQ,YACV,cAAc,QACjB,IAAI,UACF,UAAU,kBAwBnB,CAAA"}
+{"version":3,"file":"rollback.d.ts","sourceRoot":"","sources":["../../../src/reify/rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAGtC,eAAO,MAAM,QAAQ,YACV,cAAc,QACjB,IAAI,UACF,UAAU,kBAwBnB,CAAA"}

package/dist/esm/reify/rollback.js

@@ -1,5 +1,5 @@
 import { RollbackRemove } from '@vltpkg/rollback-remove';
-import { deleteEdge } from './delete-edge.js';
+import { deleteEdge } from "./delete-edge.js";
 export const rollback = async (remover, diff, scurry) => {
     const promises = [];
     const store = scurry.resolve('node_modules/.vlt');

package/dist/esm/reify/rollback.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../../src/reify/rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,OAAuB,EACvB,IAAU,EACV,MAAkB,EAClB,EAAE;IACF,MAAM,QAAQ,GAAuB,EAAE,CAAA;IACvC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IAEjD,0CAA0C;IAC1C,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAA;IACvC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,SAAQ;QAChC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QAC3C,oBAAoB;QACpB,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAClC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,oBAAoB;IACpB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;IAE3C,UAAU,CAAC,OAAO,EAAE,CAAA;IAEpB,oBAAoB;IACpB,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA","sourcesContent":["import { RollbackRemove } from '@vltpkg/rollback-remove'\nimport { type PathScurry } from 'path-scurry'\nimport { type Diff } from '../diff.js'\nimport { deleteEdge } from './delete-edge.js'\n\nexport const rollback = async (\n  remover: RollbackRemove,\n  diff: Diff,\n  scurry: PathScurry,\n) => {\n  const promises: Promise<unknown>[] = []\n  const store = scurry.resolve('node_modules/.vlt')\n\n  // remove everything the diff tried to add\n  const backRoller = new RollbackRemove()\n  for (const node of diff.nodes.add) {\n    if (!node.inVltStore()) continue\n    const path = scurry.resolve(store, node.id)\n    /* c8 ignore next */\n    promises.push(backRoller.rm(path).catch(() => {}))\n  }\n  for (const edge of diff.edges.add) {\n    promises.push(deleteEdge(edge, scurry, backRoller))\n  }\n\n  /* c8 ignore next */\n  await Promise.all(promises).catch(() => {})\n\n  backRoller.confirm()\n\n  /* c8 ignore next */\n  await remover.rollback().catch(() => {})\n}\n"]}
+{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../../src/reify/rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,OAAuB,EACvB,IAAU,EACV,MAAkB,EAClB,EAAE;IACF,MAAM,QAAQ,GAAuB,EAAE,CAAA;IACvC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IAEjD,0CAA0C;IAC1C,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAA;IACvC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,SAAQ;QAChC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QAC3C,oBAAoB;QACpB,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAClC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,oBAAoB;IACpB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;IAE3C,UAAU,CAAC,OAAO,EAAE,CAAA;IAEpB,oBAAoB;IACpB,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA","sourcesContent":["import { RollbackRemove } from '@vltpkg/rollback-remove'\nimport type { PathScurry } from 'path-scurry'\nimport type { Diff } from '../diff.ts'\nimport { deleteEdge } from './delete-edge.ts'\n\nexport const rollback = async (\n  remover: RollbackRemove,\n  diff: Diff,\n  scurry: PathScurry,\n) => {\n  const promises: Promise<unknown>[] = []\n  const store = scurry.resolve('node_modules/.vlt')\n\n  // remove everything the diff tried to add\n  const backRoller = new RollbackRemove()\n  for (const node of diff.nodes.add) {\n    if (!node.inVltStore()) continue\n    const path = scurry.resolve(store, node.id)\n    /* c8 ignore next */\n    promises.push(backRoller.rm(path).catch(() => {}))\n  }\n  for (const edge of diff.edges.add) {\n    promises.push(deleteEdge(edge, scurry, backRoller))\n  }\n\n  /* c8 ignore next */\n  await Promise.all(promises).catch(() => {})\n\n  backRoller.confirm()\n\n  /* c8 ignore next */\n  await remover.rollback().catch(() => {})\n}\n"]}

package/dist/esm/reify/update-importers-package-json.d.ts

@@ -1,6 +1,6 @@
-import { type PackageJson } from '@vltpkg/package-json';
-import { type Graph } from '../graph.js';
-import { type AddImportersDependenciesMap, type RemoveImportersDependenciesMap } from '../dependencies.js';
+import type { PackageJson } from '@vltpkg/package-json';
+import type { AddImportersDependenciesMap, RemoveImportersDependenciesMap } from '../dependencies.ts';
+import type { Graph } from '../graph.ts';
 export type UpdatePackageJsonOptions = {
     /**
      * A `Map` in which keys are {@link DepID} linking to another `Map` in which

package/dist/esm/reify/update-importers-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-importers-package-json.d.ts","sourceRoot":"","sources":["../../../src/reify/update-importers-package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,8BAA8B,EAKpC,MAAM,oBAAoB,CAAA;AAY3B,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC;;;;OAIG;IACH,KAAK,EAAE,KAAK,CAAA;IACZ;;;;OAIG;IACH,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAsED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,yCAK3B,wBAAwB,eAsB1B,CAAA"}
+{"version":3,"file":"update-importers-package-json.d.ts","sourceRoot":"","sources":["../../../src/reify/update-importers-package-json.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAOvD,OAAO,KAAK,EACV,2BAA2B,EAE3B,8BAA8B,EAC/B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAaxC,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC;;;;OAIG;IACH,KAAK,EAAE,KAAK,CAAA;IACZ;;;;OAIG;IACH,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAwFD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,yCAK3B,wBAAwB,eAsB1B,CAAA"}

package/dist/esm/reify/update-importers-package-json.js

@@ -1,6 +1,7 @@
 import { splitDepID } from '@vltpkg/dep-id';
 import { error } from '@vltpkg/error-cause';
-import { longDependencyTypes, } from '../dependencies.js';
+import { longDependencyTypes } from '@vltpkg/types';
+import { resolveSaveType } from "../resolve-save-type.js";
 const SAVE_PREFIX = '^';
 const depTypesMap = new Map([
     ['prod', 'dependencies'],
@@ -34,18 +35,22 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
     for (const deleteNameOrAddItem of deps) {
         if (typeof deleteNameOrAddItem === 'string') {
             const name = deleteNameOrAddItem;
-            // TODO: needs to also remove any possible peerDependenciesMeta
             for (const depType of longDependencyTypes) {
                 if (manifest[depType]?.[name]) {
                     delete manifest[depType][name];
                     manifestChanged = true;
                 }
             }
+            if (manifest.peerDependenciesMeta?.[name]) {
+                delete manifest.peerDependenciesMeta[name];
+                manifestChanged = true;
+            }
         }
         else {
             const [name, dep] = deleteNameOrAddItem;
-            // TODO: peerOptional also needs to add peerDependenciesMeta entry
-            const depType = depTypesMap.get(dep.type);
+            // peerOptional also needs to add peerDependenciesMeta entry
+            const depTypeShort = resolveSaveType(importer, name, dep.type);
+            const depType = depTypesMap.get(depTypeShort);
             if (!depType) {
                 throw error('Failed to retrieve dependency type', {
                     validOptions: [...depTypesMap.keys()],
@@ -57,11 +62,25 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
                 throw error('Dependency node could not be found');
             }
             const [nodeType] = splitDepID(node.id);
+            for (const dtype of longDependencyTypes) {
+                if (dtype === depType || !manifest[dtype])
+                    continue;
+                delete manifest[dtype][name];
+            }
+            if (depTypeShort === 'peerOptional') {
+                manifest.peerDependenciesMeta ??= {};
+                manifest.peerDependenciesMeta[name] = { optional: true };
+            }
+            else if (manifest.peerDependenciesMeta?.[name]) {
+                delete manifest.peerDependenciesMeta[name];
+            }
             const dependencies = manifest[depType] ?? (manifest[depType] = {});
             dependencies[name] =
                 (nodeType === 'registry' &&
-                    (!dep.spec.semver || dep.spec.range?.isSingle)) ?
-                    `${SAVE_PREFIX}${node.version}`
+                    (!dep.spec.final.semver || !dep.spec.final.range)) ?
+                    dep.spec.subspec && dep.spec.namedRegistry ?
+                        `${dep.spec.final.namedRegistry}:${dep.spec.final.name}@${SAVE_PREFIX}${node.version}`
+                        : `${SAVE_PREFIX}${node.version}`
                     : dep.spec.bareSpec;
             manifestChanged = true;
         }

package/dist/esm/reify/update-importers-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-importers-package-json.js","sourceRoot":"","sources":["../../../src/reify/update-importers-package-json.ts"],"names":[],"mappings":"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","sourcesContent":["import { type DepID, splitDepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport { type PackageJson } from '@vltpkg/package-json'\nimport { type Manifest } from '@vltpkg/types'\nimport { type Graph } from '../graph.js'\nimport {\n  type AddImportersDependenciesMap,\n  type RemoveImportersDependenciesMap,\n  type DependencyTypeLong,\n  type DependencyTypeShort,\n  longDependencyTypes,\n  type Dependency,\n} from '../dependencies.js'\n\nconst SAVE_PREFIX = '^'\n\nconst depTypesMap = new Map<DependencyTypeShort, DependencyTypeLong>([\n  ['prod', 'dependencies'],\n  ['dev', 'devDependencies'],\n  ['peer', 'peerDependencies'],\n  ['peerOptional', 'peerDependencies'],\n  ['optional', 'optionalDependencies'],\n])\n\nexport type UpdatePackageJsonOptions = {\n  /**\n   * A `Map` in which keys are {@link DepID} linking to another `Map` in which\n   * keys are the dependency names and values are {@link Dependency}. This\n   * structure represents dependencies that need to be added to the importer\n   * represented by {@link DepID}.\n   */\n  add?: AddImportersDependenciesMap\n  /**\n   * A `Map` object representing nodes to be removed from the ideal graph.\n   * Each {@link DepID} key represents an importer node and the `Set` of\n   * dependency names to be removed from its dependency list.\n   */\n  remove?: RemoveImportersDependenciesMap\n  /**\n   * The {@link Graph} instance that contain the importer nodes to which\n   * the manifest data (and it's corresponding `package.json` file) are\n   * going to be updated.\n   */\n  graph: Graph\n  /**\n   * An instance of {@link PackageJson} to use when writing updated manifest\n   * data to `package.json` files. It's necessary that this is the same\n   * instance used to load these `package.json` files previously.\n   */\n  packageJson: PackageJson\n}\n\nconst addOrRemoveDeps = (\n  importerId: DepID,\n  graph: Graph,\n  addOrRemove?:\n    | AddImportersDependenciesMap\n    | RemoveImportersDependenciesMap,\n): Manifest | undefined => {\n  const importer = graph.nodes.get(importerId)\n  if (!importer) {\n    throw error('Failed to retrieve importer node', {\n      found: importerId,\n    })\n  }\n  const manifest = importer.manifest\n  if (!manifest) {\n    throw error('Could not find manifest data for node', {\n      found: importerId,\n    })\n  }\n  const deps = addOrRemove?.get(importerId)\n  /* c8 ignore start -- impossible but TS doesn't know that */\n  if (!deps) {\n    throw error('Failed to retrieve added deps info', {\n      manifest,\n    })\n  }\n  let manifestChanged = false\n  /* c8 ignore stop */\n  for (const deleteNameOrAddItem of deps) {\n    if (typeof deleteNameOrAddItem === 'string') {\n      const name = deleteNameOrAddItem\n      // TODO: needs to also remove any possible peerDependenciesMeta\n      for (const depType of longDependencyTypes) {\n        if (manifest[depType]?.[name]) {\n          delete manifest[depType][name]\n          manifestChanged = true\n        }\n      }\n    } else {\n      const [name, dep] = deleteNameOrAddItem\n      // TODO: peerOptional also needs to add peerDependenciesMeta entry\n      const depType = depTypesMap.get(dep.type)\n      if (!depType) {\n        throw error('Failed to retrieve dependency type', {\n          validOptions: [...depTypesMap.keys()],\n          found: dep.type,\n        })\n      }\n      const node = importer.edgesOut.get(name)?.to\n      if (!node) {\n        throw error('Dependency node could not be found')\n      }\n      const [nodeType] = splitDepID(node.id)\n      const dependencies =\n        manifest[depType] ?? (manifest[depType] = {})\n      dependencies[name] =\n        (\n          nodeType === 'registry' &&\n          (!dep.spec.semver || dep.spec.range?.isSingle)\n        ) ?\n          `${SAVE_PREFIX}${node.version}`\n        : dep.spec.bareSpec\n      manifestChanged = true\n    }\n  }\n  return manifestChanged ? manifest : undefined\n}\n\n/**\n * Updates the importers of a provided {@link Graph} accordingly to the\n * provided add or remove arguments.\n */\nexport const updatePackageJson = ({\n  add,\n  graph,\n  packageJson,\n  remove,\n}: UpdatePackageJsonOptions) => {\n  const manifestsToUpdate = new Set<Manifest>()\n  const operations = new Set([add, remove])\n\n  for (const operation of operations) {\n    if (operation) {\n      for (const importerId of operation.keys()) {\n        const manifest = addOrRemoveDeps(importerId, graph, operation)\n        if (manifest) {\n          manifestsToUpdate.add(manifest)\n        }\n      }\n    }\n  }\n\n  const commit = () => {\n    for (const manifest of manifestsToUpdate) {\n      packageJson.save(manifest)\n    }\n  }\n\n  return commit\n}\n"]}
+{"version":3,"file":"update-importers-package-json.js","sourceRoot":"","sources":["../../../src/reify/update-importers-package-json.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAO3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAOnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,MAAM,WAAW,GAAG,GAAG,CAAA;AAEvB,MAAM,WAAW,GAAG,IAAI,GAAG,CAA0C;IACnE,CAAC,MAAM,EAAE,cAAc,CAAC;IACxB,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAC1B,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAC5B,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACpC,CAAC,UAAU,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAA;AA8BF,MAAM,eAAe,GAAG,CACtB,UAAiB,EACjB,KAAY,EACZ,WAEkC,EACZ,EAAE;IACxB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,KAAK,CAAC,kCAAkC,EAAE;YAC9C,KAAK,EAAE,UAAU;SAClB,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;IAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,KAAK,CAAC,uCAAuC,EAAE;YACnD,KAAK,EAAE,UAAU;SAClB,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,CAAA;IACzC,4DAA4D;IAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,KAAK,CAAC,oCAAoC,EAAE;YAChD,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,eAAe,GAAG,KAAK,CAAA;IAC3B,oBAAoB;IACpB,KAAK,MAAM,mBAAmB,IAAI,IAAI,EAAE,CAAC;QACvC,IAAI,OAAO,mBAAmB,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,mBAAmB,CAAA;YAChC,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE,CAAC;gBAC1C,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;oBAC9B,eAAe,GAAG,IAAI,CAAA;gBACxB,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1C,OAAO,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;gBAC1C,eAAe,GAAG,IAAI,CAAA;YACxB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,mBAAmB,CAAA;YACvC,4DAA4D;YAC5D,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;YAC9D,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,KAAK,CAAC,oCAAoC,EAAE;oBAChD,YAAY,EAAE,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;oBACrC,KAAK,EAAE,GAAG,CAAC,IAAI;iBAChB,CAAC,CAAA;YACJ,CAAC;YACD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAA;YAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACnD,CAAC;YACD,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEtC,KAAK,MAAM,KAAK,IAAI,mBAAmB,EAAE,CAAC;gBACxC,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAAE,SAAQ;gBACnD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAA;YAC9B,CAAC;YACD,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;gBACpC,QAAQ,CAAC,oBAAoB,KAAK,EAAE,CAAA;gBACpC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;YAC1D,CAAC;iBAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjD,OAAO,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAC5C,CAAC;YAED,MAAM,YAAY,GAChB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;YAC/C,YAAY,CAAC,IAAI,CAAC;gBAChB,CACE,QAAQ,KAAK,UAAU;oBACvB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAClD,CAAC,CAAC;oBACD,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC1C,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE;wBACxF,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE;oBACnC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAA;YACrB,eAAe,GAAG,IAAI,CAAA;QACxB,CAAC;IACH,CAAC;IACD,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;AAC/C,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,GAAG,EACH,KAAK,EACL,WAAW,EACX,MAAM,GACmB,EAAE,EAAE;IAC7B,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAY,CAAA;IAC7C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IAEzC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,MAAM,UAAU,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC1C,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;gBAC9D,IAAI,QAAQ,EAAE,CAAC;oBACb,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACzC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC5B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport { splitDepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport type {\n  DependencyTypeLong,\n  DependencyTypeShort,\n  Manifest,\n} from '@vltpkg/types'\nimport { longDependencyTypes } from '@vltpkg/types'\nimport type {\n  AddImportersDependenciesMap,\n  Dependency,\n  RemoveImportersDependenciesMap,\n} from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport { resolveSaveType } from '../resolve-save-type.ts'\n\nconst SAVE_PREFIX = '^'\n\nconst depTypesMap = new Map<DependencyTypeShort, DependencyTypeLong>([\n  ['prod', 'dependencies'],\n  ['dev', 'devDependencies'],\n  ['peer', 'peerDependencies'],\n  ['peerOptional', 'peerDependencies'],\n  ['optional', 'optionalDependencies'],\n])\n\nexport type UpdatePackageJsonOptions = {\n  /**\n   * A `Map` in which keys are {@link DepID} linking to another `Map` in which\n   * keys are the dependency names and values are {@link Dependency}. This\n   * structure represents dependencies that need to be added to the importer\n   * represented by {@link DepID}.\n   */\n  add?: AddImportersDependenciesMap\n  /**\n   * A `Map` object representing nodes to be removed from the ideal graph.\n   * Each {@link DepID} key represents an importer node and the `Set` of\n   * dependency names to be removed from its dependency list.\n   */\n  remove?: RemoveImportersDependenciesMap\n  /**\n   * The {@link Graph} instance that contain the importer nodes to which\n   * the manifest data (and it's corresponding `package.json` file) are\n   * going to be updated.\n   */\n  graph: Graph\n  /**\n   * An instance of {@link PackageJson} to use when writing updated manifest\n   * data to `package.json` files. It's necessary that this is the same\n   * instance used to load these `package.json` files previously.\n   */\n  packageJson: PackageJson\n}\n\nconst addOrRemoveDeps = (\n  importerId: DepID,\n  graph: Graph,\n  addOrRemove?:\n    | AddImportersDependenciesMap\n    | RemoveImportersDependenciesMap,\n): Manifest | undefined => {\n  const importer = graph.nodes.get(importerId)\n  if (!importer) {\n    throw error('Failed to retrieve importer node', {\n      found: importerId,\n    })\n  }\n  const manifest = importer.manifest\n  if (!manifest) {\n    throw error('Could not find manifest data for node', {\n      found: importerId,\n    })\n  }\n  const deps = addOrRemove?.get(importerId)\n  /* c8 ignore start -- impossible but TS doesn't know that */\n  if (!deps) {\n    throw error('Failed to retrieve added deps info', {\n      manifest,\n    })\n  }\n  let manifestChanged = false\n  /* c8 ignore stop */\n  for (const deleteNameOrAddItem of deps) {\n    if (typeof deleteNameOrAddItem === 'string') {\n      const name = deleteNameOrAddItem\n      for (const depType of longDependencyTypes) {\n        if (manifest[depType]?.[name]) {\n          delete manifest[depType][name]\n          manifestChanged = true\n        }\n      }\n      if (manifest.peerDependenciesMeta?.[name]) {\n        delete manifest.peerDependenciesMeta[name]\n        manifestChanged = true\n      }\n    } else {\n      const [name, dep] = deleteNameOrAddItem\n      // peerOptional also needs to add peerDependenciesMeta entry\n      const depTypeShort = resolveSaveType(importer, name, dep.type)\n      const depType = depTypesMap.get(depTypeShort)\n      if (!depType) {\n        throw error('Failed to retrieve dependency type', {\n          validOptions: [...depTypesMap.keys()],\n          found: dep.type,\n        })\n      }\n      const node = importer.edgesOut.get(name)?.to\n      if (!node) {\n        throw error('Dependency node could not be found')\n      }\n      const [nodeType] = splitDepID(node.id)\n\n      for (const dtype of longDependencyTypes) {\n        if (dtype === depType || !manifest[dtype]) continue\n        delete manifest[dtype][name]\n      }\n      if (depTypeShort === 'peerOptional') {\n        manifest.peerDependenciesMeta ??= {}\n        manifest.peerDependenciesMeta[name] = { optional: true }\n      } else if (manifest.peerDependenciesMeta?.[name]) {\n        delete manifest.peerDependenciesMeta[name]\n      }\n\n      const dependencies =\n        manifest[depType] ?? (manifest[depType] = {})\n      dependencies[name] =\n        (\n          nodeType === 'registry' &&\n          (!dep.spec.final.semver || !dep.spec.final.range)\n        ) ?\n          dep.spec.subspec && dep.spec.namedRegistry ?\n            `${dep.spec.final.namedRegistry}:${dep.spec.final.name}@${SAVE_PREFIX}${node.version}`\n          : `${SAVE_PREFIX}${node.version}`\n        : dep.spec.bareSpec\n      manifestChanged = true\n    }\n  }\n  return manifestChanged ? manifest : undefined\n}\n\n/**\n * Updates the importers of a provided {@link Graph} accordingly to the\n * provided add or remove arguments.\n */\nexport const updatePackageJson = ({\n  add,\n  graph,\n  packageJson,\n  remove,\n}: UpdatePackageJsonOptions) => {\n  const manifestsToUpdate = new Set<Manifest>()\n  const operations = new Set([add, remove])\n\n  for (const operation of operations) {\n    if (operation) {\n      for (const importerId of operation.keys()) {\n        const manifest = addOrRemoveDeps(importerId, graph, operation)\n        if (manifest) {\n          manifestsToUpdate.add(manifest)\n        }\n      }\n    }\n  }\n\n  const commit = () => {\n    for (const manifest of manifestsToUpdate) {\n      packageJson.save(manifest)\n    }\n  }\n\n  return commit\n}\n"]}

package/dist/esm/remove-optional-subgraph.d.ts

@@ -1,5 +1,5 @@
-import { type Graph } from './graph.js';
-import { type Node } from './node.js';
+import type { Graph } from './graph.ts';
+import type { Node } from './node.ts';
 /**
  * Remove the affected optional nodes starting from a given optional node
  * that failed to resolve/install.

package/dist/esm/remove-optional-subgraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-optional-subgraph.d.ts","sourceRoot":"","sources":["../../src/remove-optional-subgraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,WAAW,CAAA;AAErC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,sBAAsB,UAC1B,KAAK,gBACE,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,cAQxC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAiB,oBAAoB,CACnC,IAAI,EAAE,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,EAC/B,IAAI;cAA8B,IAAI;EAAK,GAC1C,SAAS,CAAC,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,EAAE,IAAI,CAAC,CAiB5C"}
+{"version":3,"file":"remove-optional-subgraph.d.ts","sourceRoot":"","sources":["../../src/remove-optional-subgraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAErC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,sBAAsB,UAC1B,KAAK,gBACE,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,cAQxC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAiB,oBAAoB,CACnC,IAAI,EAAE,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,EAC/B,IAAI;cAA8B,IAAI;EAAK,GAC1C,SAAS,CAAC,IAAI,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,EAAE,IAAI,CAAC,CAiB5C"}