@vltpkg/graph 0.0.0-3 → 0.0.0-30

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,6 @@
+import type { DependencySaveType, DependencyTypeShort, NodeLike } from '@vltpkg/types';
+/**
+ * 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,EACnB,QAAQ,EACT,MAAM,eAAe,CAAA;AAEtB;;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  NodeLike,\n} from '@vltpkg/types'\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/stringify-node.d.ts

@@ -1,3 +1,3 @@
-import type { NodeLike } from './types.ts';
+import type { NodeLike } from '@vltpkg/types';
 export declare const stringifyNode: (node?: NodeLike) => string;
 //# sourceMappingURL=stringify-node.d.ts.map

package/dist/esm/stringify-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stringify-node.d.ts","sourceRoot":"","sources":["../../src/stringify-node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,eAAO,MAAM,aAAa,UAAW,QAAQ,WAmB5C,CAAA"}
+{"version":3,"file":"stringify-node.d.ts","sourceRoot":"","sources":["../../src/stringify-node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,eAAO,MAAM,aAAa,UAAW,QAAQ,WAmB5C,CAAA"}

package/dist/esm/stringify-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"stringify-node.js","sourceRoot":"","sources":["../../src/stringify-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAe,EAAE,EAAE;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACtD,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAEpD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAA;QACvC,OAAO,GAAG,MAAM,GAAG,WAAW,EAAE,CAAA;IAClC,CAAC;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,aAAa,IAAI,CAAC,IAAI,EAAE,CAAA;IACjC,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QAChD,OAAO,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAA;IAC5B,CAAC;SAAM,CAAC;QACN,iEAAiE;QACjE,yEAAyE;QACzE,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACxD,OAAO,GAAG,IAAI,IAAI,GAAG,IAAI,WAAW,EAAE,CAAA;IACxC,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { splitDepID } from '@vltpkg/dep-id/browser'\nimport type { NodeLike } from './types.ts'\n\nexport const stringifyNode = (node?: NodeLike) => {\n  if (!node) return ''\n  const version = node.version ? `@${node.version}` : ''\n  const [type, ref, nameVersion] = splitDepID(node.id)\n\n  if (type === 'registry') {\n    const prefix = ref ? `${ref}:` : 'npm:'\n    return `${prefix}${nameVersion}`\n  } else if (type === 'workspace') {\n    return `workspace:${node.name}`\n  } else if (type === 'file' && node.mainImporter) {\n    return `root:${node.name}`\n  } else {\n    // node.name getter will return the id if the package has no name\n    // property so here we check for that in order to return `type(ref)` only\n    const nameVersion =\n      node.name !== node.id ? `:${node.name}${version}` : ''\n    return `${type}(${ref})${nameVersion}`\n  }\n}\n"]}
+{"version":3,"file":"stringify-node.js","sourceRoot":"","sources":["../../src/stringify-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAe,EAAE,EAAE;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACtD,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAEpD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAA;QACvC,OAAO,GAAG,MAAM,GAAG,WAAW,EAAE,CAAA;IAClC,CAAC;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,aAAa,IAAI,CAAC,IAAI,EAAE,CAAA;IACjC,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QAChD,OAAO,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAA;IAC5B,CAAC;SAAM,CAAC;QACN,iEAAiE;QACjE,yEAAyE;QACzE,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACxD,OAAO,GAAG,IAAI,IAAI,GAAG,IAAI,WAAW,EAAE,CAAA;IACxC,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { splitDepID } from '@vltpkg/dep-id/browser'\nimport type { NodeLike } from '@vltpkg/types'\n\nexport const stringifyNode = (node?: NodeLike) => {\n  if (!node) return ''\n  const version = node.version ? `@${node.version}` : ''\n  const [type, ref, nameVersion] = splitDepID(node.id)\n\n  if (type === 'registry') {\n    const prefix = ref ? `${ref}:` : 'npm:'\n    return `${prefix}${nameVersion}`\n  } else if (type === 'workspace') {\n    return `workspace:${node.name}`\n  } else if (type === 'file' && node.mainImporter) {\n    return `root:${node.name}`\n  } else {\n    // node.name getter will return the id if the package has no name\n    // property so here we check for that in order to return `type(ref)` only\n    const nameVersion =\n      node.name !== node.id ? `:${node.name}${version}` : ''\n    return `${type}(${ref})${nameVersion}`\n  }\n}\n"]}

package/dist/esm/transfer-data/load.d.ts

@@ -0,0 +1,44 @@
+import { SecurityArchive } from '@vltpkg/security-archive/browser';
+import type { GraphLike, NormalizedManifest } from '@vltpkg/types';
+import type { LockfileData } from '../lockfile/types.ts';
+import type { SpecOptionsFilled } from '@vltpkg/spec/browser';
+/**
+ * The returned object when loading a graph from a transfer data structure,
+ * including the graph itself, the spec options used to create it, and
+ * the security archive (if any).
+ */
+export type LoadResult = {
+    graph: GraphLike;
+    specOptions: SpecOptionsFilled;
+    securityArchive: SecurityArchive | undefined;
+};
+/**
+ * A data structure defining a complete graph to be transfered, including
+ * extra information to the lockfile such as project info and importers.
+ */
+export type TransferData = {
+    importers: {
+        importer: boolean;
+        mainImporter: boolean;
+        id: string;
+        name: string;
+        version: string;
+        location: string;
+        manifest: NormalizedManifest;
+        projectRoot?: string;
+        integrity?: string;
+        resolved?: string;
+        dev?: boolean;
+        optional?: boolean;
+    }[];
+    lockfile: LockfileData;
+    projectInfo: {
+        root: string;
+        homedirRelativeRoot: string;
+        tools?: string[];
+        vltInstalled?: boolean;
+    };
+    securityArchive?: any;
+};
+export declare const load: (transfered: TransferData) => LoadResult;
+//# sourceMappingURL=load.d.ts.map

package/dist/esm/transfer-data/load.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/transfer-data/load.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAWlE,OAAO,KAAK,EAEV,SAAS,EAGT,kBAAkB,EACnB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAExD,OAAO,KAAK,EAAQ,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AA8CnE;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,SAAS,CAAA;IAChB,WAAW,EAAE,iBAAiB,CAAA;IAC9B,eAAe,EAAE,eAAe,GAAG,SAAS,CAAA;CAC7C,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE;QACT,QAAQ,EAAE,OAAO,CAAA;QACjB,YAAY,EAAE,OAAO,CAAA;QACrB,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,EAAE,kBAAkB,CAAA;QAC5B,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,GAAG,CAAC,EAAE,OAAO,CAAA;QACb,QAAQ,CAAC,EAAE,OAAO,CAAA;KACnB,EAAE,CAAA;IACH,QAAQ,EAAE,YAAY,CAAA;IACtB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAA;QACZ,mBAAmB,EAAE,MAAM,CAAA;QAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;QAChB,YAAY,CAAC,EAAE,OAAO,CAAA;KACvB,CAAA;IACD,eAAe,CAAC,EAAE,GAAG,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,IAAI,eAAgB,YAAY,KAAG,UAqK/C,CAAA"}

package/dist/esm/transfer-data/load.js

@@ -0,0 +1,176 @@
+import { error } from '@vltpkg/error-cause';
+import { SecurityArchive } from '@vltpkg/security-archive/browser';
+import { defaultGitHostArchives, defaultGitHosts, defaultRegistries, defaultRegistry, defaultScopeRegistries, } from '@vltpkg/spec/browser';
+import { stringifyNode } from "../stringify-node.js";
+import { loadEdges } from "../lockfile/load-edges.js";
+import { loadNodes } from "../lockfile/load-nodes.js";
+const loadSpecOptions = (lockfile) => {
+    const { catalog = {}, catalogs = {}, registries, registry, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, 'scope-registries': scopeRegistries, 'jsr-registries': jsrRegistries, } = lockfile.options;
+    return {
+        catalog,
+        catalogs,
+        registries: { ...defaultRegistries, ...registries },
+        registry: registry || defaultRegistry,
+        'jsr-registries': { ...jsrRegistries },
+        'git-hosts': { ...defaultGitHosts, ...gitHosts },
+        'git-host-archives': {
+            ...defaultGitHostArchives,
+            ...gitHostArchives,
+        },
+        'scope-registries': {
+            ...defaultScopeRegistries,
+            ...scopeRegistries,
+        },
+    };
+};
+export const load = (transfered) => {
+    const [mainImporter] = transfered.importers;
+    const maybeGraph = {
+        importers: new Set(),
+        edges: new Set(),
+        nodes: new Map(),
+        nodesByName: new Map(),
+        projectRoot: transfered.projectInfo.root,
+        addEdge(type, spec, from, to) {
+            const existing = from.edgesOut.get(spec.name);
+            if (existing) {
+                const edge = existing;
+                if (edge.type === type &&
+                    edge.spec.bareSpec === spec.bareSpec) {
+                    if (to && to !== edge.to) {
+                        edge.to = to;
+                        edge.to.edgesIn.add(edge);
+                    }
+                    return edge;
+                }
+                this.edges.delete(edge);
+            }
+            const edge = {
+                from,
+                name: spec.name,
+                spec,
+                to,
+                type,
+            };
+            from.edgesOut.set(spec.name, edge);
+            to?.edgesIn.add(edge);
+            this.edges.add(edge);
+            return edge;
+        },
+        addNode(id, manifest) {
+            const graph = this;
+            if (!id)
+                throw error('id is required', { manifest });
+            if (!manifest)
+                throw error('manifest is required');
+            const node = {
+                id,
+                name: manifest.name,
+                version: manifest.version,
+                manifest,
+                edgesIn: new Set(),
+                edgesOut: new Map(),
+                workspaces: undefined,
+                graph,
+                importer: false,
+                mainImporter: false,
+                projectRoot: graph.projectRoot,
+                dev: false,
+                optional: false,
+                options: transfered.lockfile.options,
+                confused: false,
+                setResolved() { },
+                setConfusedManifest(fixed, confused) {
+                    this.manifest = fixed;
+                    this.rawManifest = confused;
+                    this.confused = true;
+                },
+                maybeSetConfusedManifest() { },
+                toJSON() {
+                    return {
+                        id: this.id,
+                        name: this.name,
+                        version: this.version,
+                        location: this.location,
+                        importer: this.importer,
+                        manifest: this.manifest,
+                        projectRoot: this.projectRoot,
+                        integrity: this.integrity,
+                        resolved: this.resolved,
+                        dev: this.dev,
+                        optional: this.optional,
+                        confused: this.confused,
+                        ...(this.confused ?
+                            { rawManifest: this.rawManifest }
+                            : undefined),
+                    };
+                },
+                toString() {
+                    return stringifyNode(this);
+                },
+            };
+            this.nodes.set(node.id, node);
+            if (node.name) {
+                const allNodesWithThisName = this.nodesByName.get(node.name) ?? new Set();
+                allNodesWithThisName.add(node);
+                this.nodesByName.set(node.name, allNodesWithThisName);
+            }
+            return node;
+        },
+    };
+    // configure importer nodes
+    for (const importer of transfered.importers) {
+        const id = importer.id;
+        const graph = maybeGraph;
+        const node = graph.addNode(id, importer.manifest);
+        node.importer = true;
+        node.mainImporter = importer.id === mainImporter?.id;
+        node.location = importer.location;
+        node.integrity = importer.integrity;
+        node.resolved = importer.resolved;
+        /* c8 ignore next 2 */
+        node.dev = importer.dev ?? false;
+        node.optional = importer.optional ?? false;
+        node.confused = false;
+        node.toJSON = () => ({
+            id: node.id,
+            name: node.name,
+            version: node.version,
+            location: node.location,
+            importer: node.importer,
+            manifest: node.manifest,
+            projectRoot: node.projectRoot,
+            integrity: node.integrity,
+            resolved: node.resolved,
+            dev: node.dev,
+            optional: node.optional,
+            confused: node.confused,
+        });
+        node.toString = () => stringifyNode(node);
+        // should set the main importer in the first iteration
+        graph.mainImporter ??= node;
+        graph.importers.add(node);
+    }
+    // populate nodes and edges from loaded data
+    const graph = maybeGraph;
+    const specOptions = loadSpecOptions(transfered.lockfile);
+    loadNodes(graph, transfered.lockfile.nodes, specOptions, graph);
+    loadEdges(graph, transfered.lockfile.edges, specOptions);
+    const securityArchive = SecurityArchive.load(transfered.securityArchive);
+    // validates that all nodes have a security archive entry
+    if (securityArchive) {
+        securityArchive.ok = true;
+        for (const node of graph.nodes.values()) {
+            if (!securityArchive.has(node.id)) {
+                securityArchive.ok = false;
+                break;
+            }
+        }
+    }
+    return {
+        graph,
+        specOptions,
+        securityArchive,
+    };
+};
+//# sourceMappingURL=load.js.map

package/dist/esm/transfer-data/load.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/transfer-data/load.ts"],"names":[],"mappings":"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","sourcesContent":["import { error } from '@vltpkg/error-cause'\nimport { SecurityArchive } from '@vltpkg/security-archive/browser'\nimport {\n  defaultGitHostArchives,\n  defaultGitHosts,\n  defaultRegistries,\n  defaultRegistry,\n  defaultScopeRegistries,\n} from '@vltpkg/spec/browser'\nimport { stringifyNode } from '../stringify-node.ts'\nimport { loadEdges } from '../lockfile/load-edges.ts'\nimport { loadNodes } from '../lockfile/load-nodes.ts'\nimport type {\n  EdgeLike,\n  GraphLike,\n  NodeLike,\n  DependencyTypeShort,\n  NormalizedManifest,\n} from '@vltpkg/types'\nimport type { LockfileData } from '../lockfile/types.ts'\nimport type { DepID } from '@vltpkg/dep-id/browser'\nimport type { Spec, SpecOptionsFilled } from '@vltpkg/spec/browser'\n\nconst loadSpecOptions = (\n  lockfile: LockfileData,\n): SpecOptionsFilled => {\n  const {\n    catalog = {},\n    catalogs = {},\n    registries,\n    registry,\n    'git-hosts': gitHosts,\n    'git-host-archives': gitHostArchives,\n    'scope-registries': scopeRegistries,\n    'jsr-registries': jsrRegistries,\n  } = lockfile.options\n  return {\n    catalog,\n    catalogs,\n    registries: { ...defaultRegistries, ...registries },\n    registry: registry || defaultRegistry,\n    'jsr-registries': { ...jsrRegistries },\n    'git-hosts': { ...defaultGitHosts, ...gitHosts },\n    'git-host-archives': {\n      ...defaultGitHostArchives,\n      ...gitHostArchives,\n    },\n    'scope-registries': {\n      ...defaultScopeRegistries,\n      ...scopeRegistries,\n    },\n  }\n}\n\ntype MaybeGraphLike = Pick<\n  GraphLike,\n  | 'importers'\n  | 'edges'\n  | 'nodes'\n  | 'nodesByName'\n  | 'projectRoot'\n  | 'addEdge'\n  | 'addNode'\n> & {\n  mainImporter?: NodeLike\n}\n\n/**\n * The returned object when loading a graph from a transfer data structure,\n * including the graph itself, the spec options used to create it, and\n * the security archive (if any).\n */\nexport type LoadResult = {\n  graph: GraphLike\n  specOptions: SpecOptionsFilled\n  securityArchive: SecurityArchive | undefined\n}\n\n/**\n * A data structure defining a complete graph to be transfered, including\n * extra information to the lockfile such as project info and importers.\n */\nexport type TransferData = {\n  importers: {\n    importer: boolean\n    mainImporter: boolean\n    id: string\n    name: string\n    version: string\n    location: string\n    manifest: NormalizedManifest\n    projectRoot?: string\n    integrity?: string\n    resolved?: string\n    dev?: boolean\n    optional?: boolean\n  }[]\n  lockfile: LockfileData\n  projectInfo: {\n    root: string\n    homedirRelativeRoot: string\n    tools?: string[]\n    vltInstalled?: boolean\n  }\n  securityArchive?: any\n}\n\nexport const load = (transfered: TransferData): LoadResult => {\n  const [mainImporter] = transfered.importers\n  const maybeGraph: MaybeGraphLike = {\n    importers: new Set<NodeLike>(),\n    edges: new Set<EdgeLike>(),\n    nodes: new Map<DepID, NodeLike>(),\n    nodesByName: new Map<string, Set<NodeLike>>(),\n    projectRoot: transfered.projectInfo.root,\n    addEdge(\n      type: DependencyTypeShort,\n      spec: Spec,\n      from: NodeLike,\n      to?: NodeLike,\n    ) {\n      const existing = from.edgesOut.get(spec.name)\n      if (existing) {\n        const edge = existing\n        if (\n          edge.type === type &&\n          edge.spec.bareSpec === spec.bareSpec\n        ) {\n          if (to && to !== edge.to) {\n            edge.to = to\n            edge.to.edgesIn.add(edge)\n          }\n          return edge\n        }\n        this.edges.delete(edge)\n      }\n      const edge: EdgeLike = {\n        from,\n        name: spec.name,\n        spec,\n        to,\n        type,\n      }\n      from.edgesOut.set(spec.name, edge)\n      to?.edgesIn.add(edge)\n      this.edges.add(edge)\n      return edge\n    },\n    addNode(id?: DepID, manifest?: NormalizedManifest) {\n      const graph = this as GraphLike\n      if (!id) throw error('id is required', { manifest })\n      if (!manifest) throw error('manifest is required')\n      const node: NodeLike = {\n        id,\n        name: manifest.name,\n        version: manifest.version,\n        manifest,\n        edgesIn: new Set(),\n        edgesOut: new Map(),\n        workspaces: undefined,\n        graph,\n        importer: false,\n        mainImporter: false,\n        projectRoot: graph.projectRoot,\n        dev: false,\n        optional: false,\n        options: transfered.lockfile.options,\n        confused: false,\n        setResolved() {},\n        setConfusedManifest(\n          fixed: NormalizedManifest,\n          confused?: NormalizedManifest,\n        ) {\n          this.manifest = fixed\n          this.rawManifest = confused\n          this.confused = true\n        },\n        maybeSetConfusedManifest() {},\n        toJSON() {\n          return {\n            id: this.id,\n            name: this.name,\n            version: this.version,\n            location: this.location,\n            importer: this.importer,\n            manifest: this.manifest,\n            projectRoot: this.projectRoot,\n            integrity: this.integrity,\n            resolved: this.resolved,\n            dev: this.dev,\n            optional: this.optional,\n            confused: this.confused,\n            ...(this.confused ?\n              { rawManifest: this.rawManifest }\n            : undefined),\n          }\n        },\n        toString() {\n          return stringifyNode(this)\n        },\n      }\n      this.nodes.set(node.id, node)\n      if (node.name) {\n        const allNodesWithThisName =\n          this.nodesByName.get(node.name) ?? new Set()\n        allNodesWithThisName.add(node)\n        this.nodesByName.set(node.name, allNodesWithThisName)\n      }\n      return node\n    },\n  }\n\n  // configure importer nodes\n  for (const importer of transfered.importers) {\n    const id = importer.id as DepID\n    const graph = maybeGraph\n    const node: NodeLike = graph.addNode(id, importer.manifest)\n    node.importer = true\n    node.mainImporter = importer.id === mainImporter?.id\n    node.location = importer.location\n    node.integrity = importer.integrity\n    node.resolved = importer.resolved\n    /* c8 ignore next 2 */\n    node.dev = importer.dev ?? false\n    node.optional = importer.optional ?? false\n    node.confused = false\n    node.toJSON = () => ({\n      id: node.id,\n      name: node.name,\n      version: node.version,\n      location: node.location,\n      importer: node.importer,\n      manifest: node.manifest,\n      projectRoot: node.projectRoot,\n      integrity: node.integrity,\n      resolved: node.resolved,\n      dev: node.dev,\n      optional: node.optional,\n      confused: node.confused,\n    })\n    node.toString = () => stringifyNode(node)\n    // should set the main importer in the first iteration\n    graph.mainImporter ??= node\n    graph.importers.add(node)\n  }\n\n  // populate nodes and edges from loaded data\n  const graph = maybeGraph as GraphLike\n  const specOptions = loadSpecOptions(transfered.lockfile)\n  loadNodes(graph, transfered.lockfile.nodes, specOptions, graph)\n  loadEdges(graph, transfered.lockfile.edges, specOptions)\n\n  const securityArchive = SecurityArchive.load(\n    transfered.securityArchive,\n  )\n\n  // validates that all nodes have a security archive entry\n  if (securityArchive) {\n    securityArchive.ok = true\n    for (const node of graph.nodes.values()) {\n      if (!securityArchive.has(node.id)) {\n        securityArchive.ok = false\n        break\n      }\n    }\n  }\n\n  return {\n    graph,\n    specOptions,\n    securityArchive,\n  }\n}\n"]}