@vltpkg/graph 0.0.0-2 → 0.0.0-20

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

@@ -6,7 +6,7 @@ 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;

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,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 + '.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(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"]}
+{"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-nodes.d.ts.map

@@ -1 +1 @@
-{"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;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.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  }\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

@@ -3,12 +3,14 @@ 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';
+import type { GraphModifier } from '../modifiers.ts';
 export type ReifyOptions = LoadOptions & {
     add?: AddImportersDependenciesMap;
     remove?: RemoveImportersDependenciesMap;
     graph: Graph;
     actual?: Graph;
     packageInfo: PackageInfoClient;
+    modifiers?: GraphModifier;
 };
 /**
  * Make the current project match the supplied graph.

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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/reify/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAI7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,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;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAqBpD,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;IAC9B,SAAS,CAAC,EAAE,aAAa,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK,YAAmB,YAAY,kBAoChD,CAAA"}

package/dist/esm/reify/index.js

@@ -1,3 +1,4 @@
+import { graphStep } from '@vltpkg/output';
 import { RollbackRemove } from '@vltpkg/rollback-remove';
 import { availableParallelism } from 'node:os';
 import { callLimit } from 'promise-call-limit';
@@ -10,9 +11,10 @@ import { addNodes } from "./add-nodes.js";
 import { build } from "./build.js";
 import { deleteEdges } from "./delete-edges.js";
 import { deleteNodes } from "./delete-nodes.js";
+import { internalHoist } from "./internal-hoist.js";
 import { rollback } from "./rollback.js";
 import { updatePackageJson } from "./update-importers-package-json.js";
-import { graphStep } from '@vltpkg/output';
+import { copyFileSync } from 'node:fs';
 const limit = Math.max(availableParallelism() - 1, 1) * 8;
 /**
  * Make the current project match the supplied graph.
@@ -26,6 +28,11 @@ export const reify = async (options) => {
             loadManifests: true,
         });
     const diff = new Diff(actual, graph);
+    if (!diff.hasChanges()) {
+        // nothing to do, so just return the diff
+        done();
+        return diff;
+    }
     const remover = new RollbackRemove();
     let success = false;
     try {
@@ -66,6 +73,7 @@ const reify_ = async (options, diff, remover) => {
     const edgeActions = addEdges(diff, packageJson, scurry, remover);
     if (edgeActions.length)
         await Promise.all(edgeActions);
+    await internalHoist(diff.to, options, remover);
     // run lifecycles and chmod bins
     await build(diff, packageJson, scurry);
     // save the lockfile
@@ -87,5 +95,9 @@ const reify_ = async (options, diff, remover) => {
     saveImportersPackageJson?.();
     // write the ideal graph data to the lockfile
     saveData(lfData, scurry.resolve('vlt-lock.json'), false);
+    // update the store config reference if a config file was used
+    if (scurry.lstatSync('vlt.json')) {
+        copyFileSync(scurry.resolve('vlt.json'), scurry.resolve('node_modules/.vlt/vlt.json'));
+    }
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"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"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/reify/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { graphStep } from '@vltpkg/output'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport { RollbackRemove } from '@vltpkg/rollback-remove'\nimport { availableParallelism } from 'node:os'\nimport { callLimit } from 'promise-call-limit'\nimport type { LoadOptions } from '../actual/load.ts'\nimport { load as loadActual } 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 type { GraphModifier } from '../modifiers.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 { internalHoist } from './internal-hoist.ts'\nimport { rollback } from './rollback.ts'\nimport { updatePackageJson } from './update-importers-package-json.ts'\nimport { copyFileSync } from 'node:fs'\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  modifiers?: GraphModifier\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  if (!diff.hasChanges()) {\n    // nothing to do, so just return the diff\n    done()\n    return diff\n  }\n\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  await internalHoist(diff.to, options, remover)\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  // update the store config reference if a config file was used\n  if (scurry.lstatSync('vlt.json')) {\n    copyFileSync(\n      scurry.resolve('vlt.json'),\n      scurry.resolve('node_modules/.vlt/vlt.json'),\n    )\n  }\n}\n"]}

package/dist/esm/reify/internal-hoist.d.ts

@@ -0,0 +1,9 @@
+import type { RollbackRemove } from '@vltpkg/rollback-remove';
+import type { Graph } from '../graph.ts';
+import type { Node } from '../node.ts';
+import type { ReifyOptions } from './index.ts';
+type InternalHoistOptions = Pick<ReifyOptions, 'projectRoot' | 'scurry'>;
+export declare const pickNodeToHoist: (nodes: Set<Node>) => Node | undefined;
+export declare const internalHoist: (graph: Graph, options: InternalHoistOptions, remover: RollbackRemove) => Promise<void>;
+export {};
+//# sourceMappingURL=internal-hoist.d.ts.map

package/dist/esm/reify/internal-hoist.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-hoist.d.ts","sourceRoot":"","sources":["../../../src/reify/internal-hoist.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAK7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,oBAAoB,GAAG,IAAI,CAC9B,YAAY,EACZ,aAAa,GAAG,QAAQ,CACzB,CAAA;AAED,eAAO,MAAM,eAAe,UACnB,GAAG,CAAC,IAAI,CAAC,KACf,IAAI,GAAG,SAmET,CAAA;AAED,eAAO,MAAM,aAAa,UACjB,KAAK,WACH,oBAAoB,WACpB,cAAc,kBAkExB,CAAA"}

package/dist/esm/reify/internal-hoist.js

@@ -0,0 +1,121 @@
+import { splitDepID } from '@vltpkg/dep-id';
+import { Version } from '@vltpkg/semver';
+import { mkdir, symlink } from 'node:fs/promises';
+import { dirname, relative } from 'node:path';
+export const pickNodeToHoist = (nodes) => {
+    let pick = undefined;
+    let pickNode = undefined;
+    for (const node of nodes) {
+        if (node.importer || !node.inVltStore()) {
+            continue;
+        }
+        const id = splitDepID(node.id);
+        if (!pick || !pickNode) {
+            pick = id;
+            pickNode = node;
+            continue;
+        }
+        // if one is a dep of an importer, privilege that one
+        const impDep = [...node.edgesIn].some(n => n.from.importer);
+        const pickImpDep = [...pickNode.edgesIn].some(n => n.from.importer);
+        if (impDep !== pickImpDep) {
+            if (!pickImpDep) {
+                pick = id;
+                pickNode = node;
+            }
+            continue;
+        }
+        if (id[0] === 'registry') {
+            if (pick[0] !== 'registry') {
+                pick = id;
+                pickNode = node;
+                continue;
+            }
+            // both registry.
+            // otherwise, privilege the higher-version dependency
+            const pickVersion = pickNode.version;
+            const nodeVersion = node.version;
+            if (pickVersion) {
+                if (!nodeVersion)
+                    continue;
+                if (Version.parse(nodeVersion).greaterThan(Version.parse(pickVersion))) {
+                    pick = id;
+                    pickNode = node;
+                }
+                continue;
+            }
+            else if (nodeVersion) {
+                pick = id;
+                pickNode = node;
+                continue;
+            }
+        }
+        else {
+            // current node is not registry
+            if (pick[0] === 'registry')
+                continue;
+            // neither is pick node, select highest lexically sorted
+            if (pickNode.id.localeCompare(node.id, 'en') > 0) {
+                pick = id;
+                pickNode = node;
+            }
+        }
+    }
+    return pickNode;
+};
+export const internalHoist = async (graph, options, remover) => {
+    // create a list of all the nodes that we need to hoist.
+    // For each name, we prioritize registry deps over other types,
+    // and higher versions over lower ones. In the case of non-registry
+    // deps, we just pick the first item by sorting the DepIDs.
+    const links = new Map();
+    for (const [name, nodes] of graph.nodesByName) {
+        const pickNode = pickNodeToHoist(nodes);
+        if (pickNode)
+            links.set(name, pickNode.id);
+    }
+    // now we have a list of everything to hoist
+    // first, remove anything that is not what we want, and skip
+    // anything that would be linking what we already indend to link.
+    const { scurry } = options;
+    const hoistDir = scurry.cwd.resolve('node_modules/.vlt/node_modules');
+    await mkdir(hoistDir.fullpath(), { recursive: true });
+    const removes = [];
+    for (const entry of await hoistDir.readdir()) {
+        const name = entry.name;
+        // scoped package namespace
+        if (name.startsWith('@')) {
+            for (const pkg of await entry.readdir()) {
+                await checkExisting(`${name}/${pkg.name}`, pkg, links, removes, scurry, remover);
+            }
+        }
+        else {
+            await checkExisting(name, entry, links, removes, scurry, remover);
+        }
+    }
+    await Promise.all(removes);
+    const symlinks = [];
+    for (const [name, id] of links) {
+        const target = scurry.resolve(`node_modules/.vlt/${id}/node_modules/${name}`);
+        const path = scurry.resolve(`node_modules/.vlt/node_modules/${name}`);
+        if (name.includes('/')) {
+            await mkdir(dirname(path), { recursive: true });
+        }
+        symlinks.push(symlink(relative(dirname(path), target), path, 'dir'));
+    }
+    await Promise.all(symlinks);
+};
+const checkExisting = async (name, entry, links, removes, scurry, remover) => {
+    const target = await entry.readlink();
+    const id = links.get(name);
+    if (!target ||
+        !id ||
+        target !==
+            scurry.cwd.resolve(`node_modules/.vlt/${id}/node_modules/${name}`)) {
+        removes.push(remover.rm(entry.fullpath()));
+    }
+    else {
+        links.delete(name);
+    }
+};
+//# sourceMappingURL=internal-hoist.js.map

package/dist/esm/reify/internal-hoist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-hoist.js","sourceRoot":"","sources":["../../../src/reify/internal-hoist.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DepID, DepIDTuple } from '@vltpkg/dep-id'\nimport { splitDepID } from '@vltpkg/dep-id'\nimport type { RollbackRemove } from '@vltpkg/rollback-remove'\nimport { Version } from '@vltpkg/semver'\nimport { mkdir, symlink } from 'node:fs/promises'\nimport { dirname, relative } from 'node:path'\nimport type { PathBase, PathScurry } from 'path-scurry'\nimport type { Graph } from '../graph.ts'\nimport type { Node } from '../node.ts'\nimport type { ReifyOptions } from './index.ts'\n\ntype InternalHoistOptions = Pick<\n  ReifyOptions,\n  'projectRoot' | 'scurry'\n>\n\nexport const pickNodeToHoist = (\n  nodes: Set<Node>,\n): Node | undefined => {\n  let pick: DepIDTuple | undefined = undefined\n  let pickNode: Node | undefined = undefined\n  for (const node of nodes) {\n    if (node.importer || !node.inVltStore()) {\n      continue\n    }\n    const id = splitDepID(node.id)\n    if (!pick || !pickNode) {\n      pick = id\n      pickNode = node\n      continue\n    }\n\n    // if one is a dep of an importer, privilege that one\n    const impDep = [...node.edgesIn].some(n => n.from.importer)\n    const pickImpDep = [...pickNode.edgesIn].some(\n      n => n.from.importer,\n    )\n    if (impDep !== pickImpDep) {\n      if (!pickImpDep) {\n        pick = id\n        pickNode = node\n      }\n      continue\n    }\n\n    if (id[0] === 'registry') {\n      if (pick[0] !== 'registry') {\n        pick = id\n        pickNode = node\n        continue\n      }\n\n      // both registry.\n\n      // otherwise, privilege the higher-version dependency\n      const pickVersion = pickNode.version\n      const nodeVersion = node.version\n      if (pickVersion) {\n        if (!nodeVersion) continue\n        if (\n          Version.parse(nodeVersion).greaterThan(\n            Version.parse(pickVersion),\n          )\n        ) {\n          pick = id\n          pickNode = node\n        }\n        continue\n      } else if (nodeVersion) {\n        pick = id\n        pickNode = node\n        continue\n      }\n    } else {\n      // current node is not registry\n      if (pick[0] === 'registry') continue\n      // neither is pick node, select highest lexically sorted\n      if (pickNode.id.localeCompare(node.id, 'en') > 0) {\n        pick = id\n        pickNode = node\n      }\n    }\n  }\n\n  return pickNode\n}\n\nexport const internalHoist = async (\n  graph: Graph,\n  options: InternalHoistOptions,\n  remover: RollbackRemove,\n) => {\n  // create a list of all the nodes that we need to hoist.\n  // For each name, we prioritize registry deps over other types,\n  // and higher versions over lower ones. In the case of non-registry\n  // deps, we just pick the first item by sorting the DepIDs.\n  const links = new Map<string, DepID>()\n  for (const [name, nodes] of graph.nodesByName) {\n    const pickNode = pickNodeToHoist(nodes)\n    if (pickNode) links.set(name, pickNode.id)\n  }\n\n  // now we have a list of everything to hoist\n  // first, remove anything that is not what we want, and skip\n  // anything that would be linking what we already indend to link.\n  const { scurry } = options\n\n  const hoistDir = scurry.cwd.resolve(\n    'node_modules/.vlt/node_modules',\n  )\n  await mkdir(hoistDir.fullpath(), { recursive: true })\n\n  const removes: Promise<void>[] = []\n  for (const entry of await hoistDir.readdir()) {\n    const name = entry.name\n    // scoped package namespace\n    if (name.startsWith('@')) {\n      for (const pkg of await entry.readdir()) {\n        await checkExisting(\n          `${name}/${pkg.name}`,\n          pkg,\n          links,\n          removes,\n          scurry,\n          remover,\n        )\n      }\n    } else {\n      await checkExisting(\n        name,\n        entry,\n        links,\n        removes,\n        scurry,\n        remover,\n      )\n    }\n  }\n  await Promise.all(removes)\n\n  const symlinks: Promise<void>[] = []\n  for (const [name, id] of links) {\n    const target = scurry.resolve(\n      `node_modules/.vlt/${id}/node_modules/${name}`,\n    )\n    const path = scurry.resolve(\n      `node_modules/.vlt/node_modules/${name}`,\n    )\n    if (name.includes('/')) {\n      await mkdir(dirname(path), { recursive: true })\n    }\n    symlinks.push(\n      symlink(relative(dirname(path), target), path, 'dir'),\n    )\n  }\n  await Promise.all(symlinks)\n}\n\nconst checkExisting = async (\n  name: string,\n  entry: PathBase,\n  links: Map<string, DepID>,\n  removes: Promise<void>[],\n  scurry: PathScurry,\n  remover: RollbackRemove,\n) => {\n  const target = await entry.readlink()\n  const id = links.get(name)\n  if (\n    !target ||\n    !id ||\n    target !==\n      scurry.cwd.resolve(\n        `node_modules/.vlt/${id}/node_modules/${name}`,\n      )\n  ) {\n    removes.push(remover.rm(entry.fullpath()))\n  } else {\n    links.delete(name)\n  }\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.ts';
 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":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAOvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EACV,2BAA2B,EAC3B,8BAA8B,EAE/B,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;AAwED;;;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;AAYxC,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;AAiGD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,yCAK3B,wBAAwB,eAsB1B,CAAA"}

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

@@ -1,7 +1,8 @@
 import { splitDepID } from '@vltpkg/dep-id';
 import { error } from '@vltpkg/error-cause';
 import { longDependencyTypes } from '@vltpkg/types';
-const SAVE_PREFIX = '^';
+import { resolveSaveType } from "../resolve-save-type.js";
+import { calculateSaveValue } from "./calculate-save-value.js";
 const depTypesMap = new Map([
     ['prod', 'dependencies'],
     ['dev', 'devDependencies'],
@@ -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,15 +62,33 @@ 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.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;
+            // check to see if we need to save a different version
+            // - If you install a single specific version, that is deliberate,
+            //   we save that exact version, no matter what.
+            // - If the requested spec matches the manifest, make no change
+            // If the requested spec had no bareSpec, and the manifest has
+            // a dependency entry, make no change.
+            // If the requested spec has a bareSpec that did NOT match the manifest,
+            // then update it.
+            // If the manifest does not contain anything, then update it.
+            // Only for registry dependencies
+            const existing = dependencies[name];
+            const saveValue = calculateSaveValue(nodeType, dep.spec, existing, node.version);
+            dependencies[name] = saveValue;
+            manifestChanged = manifestChanged || saveValue !== existing;
         }
     }
     return manifestChanged ? manifest : undefined;

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 { splitDepID } from '@vltpkg/dep-id'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport { longDependencyTypes } from '@vltpkg/types'\nimport type {\n  Manifest,\n  DependencyTypeLong,\n  DependencyTypeShort,\n} from '@vltpkg/types'\nimport type { Graph } from '../graph.ts'\nimport type {\n  AddImportersDependenciesMap,\n  RemoveImportersDependenciesMap,\n  Dependency,\n} from '../dependencies.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      // 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.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"]}
+{"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 } 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  NormalizedManifest,\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'\nimport { calculateSaveValue } from './calculate-save-value.ts'\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): NormalizedManifest | 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      // check to see if we need to save a different version\n      // - If you install a single specific version, that is deliberate,\n      //   we save that exact version, no matter what.\n      // - If the requested spec matches the manifest, make no change\n      // If the requested spec had no bareSpec, and the manifest has\n      // a dependency entry, make no change.\n      // If the requested spec has a bareSpec that did NOT match the manifest,\n      // then update it.\n      // If the manifest does not contain anything, then update it.\n      // Only for registry dependencies\n      const existing = dependencies[name]\n      const saveValue = calculateSaveValue(\n        nodeType,\n        dep.spec,\n        existing,\n        node.version,\n      )\n      dependencies[name] = saveValue\n      manifestChanged = manifestChanged || saveValue !== existing\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<NormalizedManifest>()\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.js

@@ -14,7 +14,7 @@
 export const removeOptionalSubgraph = (graph, startingNode) => {
     const removed = new Set();
     for (const node of findOptionalSubgraph(startingNode)) {
-        graph.removeNode(node);
+        graph.removeNode(node, undefined, true);
         removed.add(node);
     }
     return removed;

package/dist/esm/remove-optional-subgraph.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-optional-subgraph.js","sourceRoot":"","sources":["../../src/remove-optional-subgraph.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAY,EACZ,YAAuC,EACvC,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAQ,CAAA;IAC/B,KAAK,MAAM,IAAI,IAAI,oBAAoB,CAAC,YAAY,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,SAAS,CAAC,CAAC,oBAAoB,CACnC,IAA+B,EAC/B,OAAO,IAAI,GAAG,EAA6B;IAE3C,mCAAmC;IACnC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAM;IAE1B,qDAAqD;IACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACd,MAAM,IAAI,CAAA;IAEV,mDAAmD;IACnD,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC9C,qEAAqE;QACrE,oEAAoE;QACpE,2CAA2C;QAC3C,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,KAAK,MAAM,GAAG,IAAI,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;gBAAE,MAAM,GAAG,CAAA;QAC/D,CAAC;IACH,CAAC;AACH,CAAC","sourcesContent":["import type { Graph } from './graph.ts'\nimport type { Node } from './node.ts'\n\n/**\n * Remove the affected optional nodes starting from a given optional node\n * that failed to resolve/install.\n *\n * Removing these dependents will frequently leave optional *dependencies*\n * behind that are made unreachable from any project importer. For performance\n * reasons, `graph.gc()` is not called automatically by this method, since\n * multiple optional subgraphs may need to be removed in a single operation,\n * and the mark-and-sweep garbage collection (a) can be excessively expensive,\n * and (b) may need to communicate the set of garbage-collected nodes\n * for cleanup (as in the case of optional node build failures during\n * reification).\n */\nexport const removeOptionalSubgraph = (\n  graph: Graph,\n  startingNode: Node & { optional: true },\n) => {\n  const removed = new Set<Node>()\n  for (const node of findOptionalSubgraph(startingNode)) {\n    graph.removeNode(node)\n    removed.add(node)\n  }\n  return removed\n}\n\n/**\n * Given a starting node, this generator will walk back from the optional node\n * to all of its optional dependents, emitting each one, and skipping any\n * cycles.\n *\n * Note that when these are removed, it may create unreachable nodes in the\n * graph! Be sure to call `graph.gc()` if these are removed.\n */\nexport function* findOptionalSubgraph(\n  node: Node & { optional: true },\n  seen = new Set<Node & { optional: true }>(),\n): Generator<Node & { optional: true }, void> {\n  // already visited, prevent looping\n  if (seen.has(node)) return\n\n  // the node itself is part of the subgraph, of course\n  seen.add(node)\n  yield node\n\n  // and any of its dependents that are also optional\n  for (const { from, optional } of node.edgesIn) {\n    // if it's an optional *edge*, we don't need to remove it, because it\n    // doesn't need the node anyway. But if the node is optional and the\n    // dep isn't, then we do need to remove it.\n    if (from.isOptional() && !optional) {\n      for (const dep of findOptionalSubgraph(from, seen)) yield dep\n    }\n  }\n}\n"]}
+{"version":3,"file":"remove-optional-subgraph.js","sourceRoot":"","sources":["../../src/remove-optional-subgraph.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAY,EACZ,YAAuC,EACvC,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAQ,CAAA;IAC/B,KAAK,MAAM,IAAI,IAAI,oBAAoB,CAAC,YAAY,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,SAAS,CAAC,CAAC,oBAAoB,CACnC,IAA+B,EAC/B,OAAO,IAAI,GAAG,EAA6B;IAE3C,mCAAmC;IACnC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAM;IAE1B,qDAAqD;IACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACd,MAAM,IAAI,CAAA;IAEV,mDAAmD;IACnD,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC9C,qEAAqE;QACrE,oEAAoE;QACpE,2CAA2C;QAC3C,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,KAAK,MAAM,GAAG,IAAI,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;gBAAE,MAAM,GAAG,CAAA;QAC/D,CAAC;IACH,CAAC;AACH,CAAC","sourcesContent":["import type { Graph } from './graph.ts'\nimport type { Node } from './node.ts'\n\n/**\n * Remove the affected optional nodes starting from a given optional node\n * that failed to resolve/install.\n *\n * Removing these dependents will frequently leave optional *dependencies*\n * behind that are made unreachable from any project importer. For performance\n * reasons, `graph.gc()` is not called automatically by this method, since\n * multiple optional subgraphs may need to be removed in a single operation,\n * and the mark-and-sweep garbage collection (a) can be excessively expensive,\n * and (b) may need to communicate the set of garbage-collected nodes\n * for cleanup (as in the case of optional node build failures during\n * reification).\n */\nexport const removeOptionalSubgraph = (\n  graph: Graph,\n  startingNode: Node & { optional: true },\n) => {\n  const removed = new Set<Node>()\n  for (const node of findOptionalSubgraph(startingNode)) {\n    graph.removeNode(node, undefined, true)\n    removed.add(node)\n  }\n  return removed\n}\n\n/**\n * Given a starting node, this generator will walk back from the optional node\n * to all of its optional dependents, emitting each one, and skipping any\n * cycles.\n *\n * Note that when these are removed, it may create unreachable nodes in the\n * graph! Be sure to call `graph.gc()` if these are removed.\n */\nexport function* findOptionalSubgraph(\n  node: Node & { optional: true },\n  seen = new Set<Node & { optional: true }>(),\n): Generator<Node & { optional: true }, void> {\n  // already visited, prevent looping\n  if (seen.has(node)) return\n\n  // the node itself is part of the subgraph, of course\n  seen.add(node)\n  yield node\n\n  // and any of its dependents that are also optional\n  for (const { from, optional } of node.edgesIn) {\n    // if it's an optional *edge*, we don't need to remove it, because it\n    // doesn't need the node anyway. But if the node is optional and the\n    // dep isn't, then we do need to remove it.\n    if (from.isOptional() && !optional) {\n      for (const dep of findOptionalSubgraph(from, seen)) yield dep\n    }\n  }\n}\n"]}

package/dist/esm/resolve-save-type.d.ts

@@ -0,0 +1,7 @@
+import type { DependencySaveType, DependencyTypeShort } from '@vltpkg/types';
+import type { NodeLike } from './types.ts';
+/**
+ * Resolve a {@link DependencySaveType} to a {@link DependencyTypeShort}
+ */
+export declare const resolveSaveType: (node: NodeLike, name: string, saveType: DependencySaveType) => DependencyTypeShort;
+//# sourceMappingURL=resolve-save-type.d.ts.map

package/dist/esm/resolve-save-type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-save-type.d.ts","sourceRoot":"","sources":["../../src/resolve-save-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C;;GAEG;AACH,eAAO,MAAM,eAAe,SACpB,QAAQ,QACR,MAAM,YACF,kBAAkB,KAC3B,mBAGA,CAAA"}

package/dist/esm/resolve-save-type.js

@@ -0,0 +1,5 @@
+/**
+ * Resolve a {@link DependencySaveType} to a {@link DependencyTypeShort}
+ */
+export const resolveSaveType = (node, name, saveType) => saveType !== 'implicit' ? saveType : ((node.edgesOut.get(name)?.type ?? 'prod'));
+//# sourceMappingURL=resolve-save-type.js.map

package/dist/esm/resolve-save-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-save-type.js","sourceRoot":"","sources":["../../src/resolve-save-type.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,IAAc,EACd,IAAY,EACZ,QAA4B,EACP,EAAE,CACvB,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CACnC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,MAAM,CAAC,CAC1C,CAAA","sourcesContent":["import type {\n  DependencySaveType,\n  DependencyTypeShort,\n} from '@vltpkg/types'\nimport type { NodeLike } from './types.ts'\n\n/**\n * Resolve a {@link DependencySaveType} to a {@link DependencyTypeShort}\n */\nexport const resolveSaveType = (\n  node: NodeLike,\n  name: string,\n  saveType: DependencySaveType,\n): DependencyTypeShort =>\n  saveType !== 'implicit' ? saveType : (\n    (node.edgesOut.get(name)?.type ?? 'prod')\n  )\n"]}

package/dist/esm/types.d.ts

@@ -1,5 +1,5 @@
 import type { DepID } from '@vltpkg/dep-id';
-import type { Manifest, DependencyTypeShort } from '@vltpkg/types';
+import type { NormalizedManifest, DependencyTypeShort } from '@vltpkg/types';
 import type { Spec, SpecLikeBase } from '@vltpkg/spec';
 export type EdgeLike = {
     name: string;
@@ -7,22 +7,27 @@ export type EdgeLike = {
     spec: SpecLikeBase;
     to?: NodeLike;
     type: DependencyTypeShort;
+    optional?: boolean;
+    peer?: boolean;
 };
 export type GraphLike = {
     importers: Set<NodeLike>;
     mainImporter: NodeLike;
     projectRoot: string;
     nodes: Map<DepID, NodeLike>;
+    nodesByName: Map<string, Set<NodeLike>>;
     edges: Set<EdgeLike>;
     addEdge: (type: DependencyTypeShort, spec: Spec, from: NodeLike, to?: NodeLike) => EdgeLike;
-    addNode: (id?: DepID, manifest?: Manifest, spec?: Spec, name?: string, version?: string) => NodeLike;
+    addNode: (id?: DepID, manifest?: NormalizedManifest, spec?: Spec, name?: string, version?: string) => NodeLike;
 };
 export type NodeLike = {
     id: DepID;
+    confused: boolean;
     edgesIn: Set<EdgeLike>;
     edgesOut: Map<string, EdgeLike>;
     location?: string;
-    manifest?: Manifest | null;
+    manifest?: NormalizedManifest | null;
+    rawManifest?: NormalizedManifest | null;
     name?: string | null;
     version?: string | null;
     integrity?: string | null;
@@ -33,7 +38,14 @@ export type NodeLike = {
     projectRoot: string;
     dev: boolean;
     optional: boolean;
+    modifier?: string | undefined;
+    registry?: string;
+    toJSON: () => Pick<NodeLike, 'id' | 'name' | 'version' | 'location' | 'importer' | 'manifest' | 'projectRoot' | 'integrity' | 'resolved' | 'dev' | 'optional' | 'confused'> & {
+        rawManifest?: NodeLike['manifest'];
+    };
     toString(): string;
     setResolved(): void;
+    setConfusedManifest(fixed: NormalizedManifest, confused?: NormalizedManifest): void;
+    maybeSetConfusedManifest(spec: Spec, confused?: NormalizedManifest): void;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/esm/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEtD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,QAAQ,CAAA;IACd,IAAI,EAAE,YAAY,CAAA;IAClB,EAAE,CAAC,EAAE,QAAQ,CAAA;IACb,IAAI,EAAE,mBAAmB,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxB,YAAY,EAAE,QAAQ,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC3B,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACpB,OAAO,EAAE,CACP,IAAI,EAAE,mBAAmB,EACzB,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,QAAQ,EACd,EAAE,CAAC,EAAE,QAAQ,KACV,QAAQ,CAAA;IACb,OAAO,EAAE,CACP,EAAE,CAAC,EAAE,KAAK,EACV,QAAQ,CAAC,EAAE,QAAQ,EACnB,IAAI,CAAC,EAAE,IAAI,EACX,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,KACb,QAAQ,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,SAAS,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,OAAO,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,IAAI,MAAM,CAAA;IAClB,WAAW,IAAI,IAAI,CAAA;CACpB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport type { Manifest, DependencyTypeShort } from '@vltpkg/types'\nimport type { Spec, SpecLikeBase } from '@vltpkg/spec'\n\nexport type EdgeLike = {\n  name: string\n  from: NodeLike\n  spec: SpecLikeBase\n  to?: NodeLike\n  type: DependencyTypeShort\n}\n\nexport type GraphLike = {\n  importers: Set<NodeLike>\n  mainImporter: NodeLike\n  projectRoot: string\n  nodes: Map<DepID, NodeLike>\n  edges: Set<EdgeLike>\n  addEdge: (\n    type: DependencyTypeShort,\n    spec: Spec,\n    from: NodeLike,\n    to?: NodeLike,\n  ) => EdgeLike\n  addNode: (\n    id?: DepID,\n    manifest?: Manifest,\n    spec?: Spec,\n    name?: string,\n    version?: string,\n  ) => NodeLike\n}\n\nexport type NodeLike = {\n  id: DepID\n  edgesIn: Set<EdgeLike>\n  edgesOut: Map<string, EdgeLike>\n  location?: string\n  manifest?: Manifest | null\n  name?: string | null\n  version?: string | null\n  integrity?: string | null\n  resolved?: string | null\n  importer: boolean\n  graph: GraphLike\n  mainImporter: boolean\n  projectRoot: string\n  dev: boolean\n  optional: boolean\n  toString(): string\n  setResolved(): void\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport type {\n  NormalizedManifest,\n  DependencyTypeShort,\n} from '@vltpkg/types'\nimport type { Spec, SpecLikeBase } from '@vltpkg/spec'\n\nexport type EdgeLike = {\n  name: string\n  from: NodeLike\n  spec: SpecLikeBase\n  to?: NodeLike\n  type: DependencyTypeShort\n  optional?: boolean\n  peer?: boolean\n}\n\nexport type GraphLike = {\n  importers: Set<NodeLike>\n  mainImporter: NodeLike\n  projectRoot: string\n  nodes: Map<DepID, NodeLike>\n  nodesByName: Map<string, Set<NodeLike>>\n  edges: Set<EdgeLike>\n  addEdge: (\n    type: DependencyTypeShort,\n    spec: Spec,\n    from: NodeLike,\n    to?: NodeLike,\n  ) => EdgeLike\n  addNode: (\n    id?: DepID,\n    manifest?: NormalizedManifest,\n    spec?: Spec,\n    name?: string,\n    version?: string,\n  ) => NodeLike\n}\n\nexport type NodeLike = {\n  id: DepID\n  confused: boolean\n  edgesIn: Set<EdgeLike>\n  edgesOut: Map<string, EdgeLike>\n  location?: string\n  manifest?: NormalizedManifest | null\n  rawManifest?: NormalizedManifest | null\n  name?: string | null\n  version?: string | null\n  integrity?: string | null\n  resolved?: string | null\n  importer: boolean\n  graph: GraphLike\n  mainImporter: boolean\n  projectRoot: string\n  dev: boolean\n  optional: boolean\n  modifier?: string | undefined\n  registry?: string\n  toJSON: () => Pick<\n    NodeLike,\n    | 'id'\n    | 'name'\n    | 'version'\n    | 'location'\n    | 'importer'\n    | 'manifest'\n    | 'projectRoot'\n    | 'integrity'\n    | 'resolved'\n    | 'dev'\n    | 'optional'\n    | 'confused'\n  > & {\n    rawManifest?: NodeLike['manifest']\n  }\n  toString(): string\n  setResolved(): void\n  setConfusedManifest(\n    fixed: NormalizedManifest,\n    confused?: NormalizedManifest,\n  ): void\n  maybeSetConfusedManifest(\n    spec: Spec,\n    confused?: NormalizedManifest,\n  ): void\n}\n"]}

package/dist/esm/uninstall.d.ts

@@ -1,10 +1,8 @@
-import type { PackageInfoClientOptions } from '@vltpkg/package-info';
-import type { PackageJson } from '@vltpkg/package-json';
+import type { PackageInfoClient } from '@vltpkg/package-info';
 import type { LoadOptions } from './actual/load.ts';
 import type { RemoveImportersDependenciesMap } from './dependencies.ts';
-export type UninstallOptions = PackageInfoClientOptions & LoadOptions & {
-    projectRoot: string;
-    packageJson: PackageJson;
+export type UninstallOptions = LoadOptions & {
+    packageInfo: PackageInfoClient;
 };
 export declare const uninstall: (options: UninstallOptions, remove?: RemoveImportersDependenciesMap) => Promise<{
     graph: import("./graph.ts").Graph;