@vltpkg/graph 0.0.0-2 → 0.0.0-20

package/dist/esm/install.js

@@ -1,29 +1,149 @@
-import { PackageInfoClient } from '@vltpkg/package-info';
 import { load as actualLoad } from "./actual/load.js";
 import { build as idealBuild } from "./ideal/build.js";
 import { reify } from "./reify/index.js";
+import { GraphModifier } from "./modifiers.js";
+import { init } from '@vltpkg/init';
+import { error } from '@vltpkg/error-cause';
+import { asError } from '@vltpkg/types';
+import { getDependencies } from "./dependencies.js";
+import { RollbackRemove } from '@vltpkg/rollback-remove';
+import { existsSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { load as loadVirtual } from "./lockfile/load.js";
+import { getImporterSpecs } from "./ideal/get-importer-specs.js";
 export const install = async (options, add) => {
-    const mainManifest = options.packageJson.read(options.projectRoot);
-    const graph = await idealBuild({
-        ...options,
-        add,
-        mainManifest,
-        loadManifests: true,
-        packageInfo: new PackageInfoClient(options),
-    });
-    const act = actualLoad({
-        ...options,
-        mainManifest,
-        loadManifests: true,
-    });
-    const diff = await reify({
-        ...options,
-        packageInfo: new PackageInfoClient(options),
-        add,
-        actual: act,
-        graph,
-        loadManifests: true,
-    });
-    return { graph, diff };
+    if (options.expectLockfile || options.frozenLockfile) {
+        const lockfilePath = resolve(options.projectRoot, 'vlt-lock.json');
+        if (!existsSync(lockfilePath)) {
+            throw error('vlt-lock.json file is required when using --expect-lockfile, --frozen-lockfile, or ci command', {
+                path: lockfilePath,
+            });
+        }
+    }
+    let mainManifest = undefined;
+    try {
+        mainManifest = options.packageJson.read(options.projectRoot);
+    }
+    catch (err) {
+        if (asError(err).message === 'Could not read package.json file') {
+            await init({ cwd: options.projectRoot });
+            mainManifest = options.packageJson.read(options.projectRoot, {
+                reload: true,
+            });
+        }
+        else {
+            throw err;
+        }
+    }
+    if (options.frozenLockfile) {
+        if (add?.modifiedDependencies) {
+            const dependencies = [];
+            for (const [, deps] of add) {
+                for (const [name] of deps) {
+                    dependencies.push(name);
+                }
+            }
+            throw error('Cannot add dependencies when using --frozen-lockfile', { found: dependencies.join(', ') });
+        }
+        const lockfileGraph = loadVirtual({
+            ...options,
+            mainManifest,
+            skipLoadingNodesOnModifiersChange: false,
+        });
+        const emptyAdd = Object.assign(new Map(), { modifiedDependencies: false });
+        const emptyRemove = Object.assign(new Map(), {
+            modifiedDependencies: false,
+        });
+        const importerSpecs = getImporterSpecs({
+            graph: lockfileGraph,
+            add: emptyAdd,
+            remove: emptyRemove,
+            ...options,
+        });
+        // Check for spec changes by comparing package.json specs with lockfile edges
+        const specChanges = [];
+        for (const importer of lockfileGraph.importers) {
+            const deps = getDependencies(importer, options);
+            for (const [depName, dep] of deps) {
+                const edge = importer.edgesOut.get(depName);
+                if (edge?.spec) {
+                    if (edge.spec.toString() !== dep.spec.toString()) {
+                        const node = lockfileGraph.nodes.get(importer.id);
+                        /* c8 ignore next */
+                        const location = node?.location || importer.id;
+                        specChanges.push(`  ${location}: ${depName} spec changed from "${edge.spec}" to "${dep.spec}"`);
+                    }
+                }
+            }
+        }
+        if (importerSpecs.add.modifiedDependencies ||
+            importerSpecs.remove.modifiedDependencies ||
+            specChanges.length > 0) {
+            const details = [];
+            if (specChanges.length > 0) {
+                details.push(...specChanges);
+            }
+            for (const [importerId, deps] of importerSpecs.add) {
+                if (deps.size > 0) {
+                    const node = lockfileGraph.nodes.get(importerId);
+                    const location = node?.location || importerId;
+                    const depNames = Array.from(deps.keys());
+                    details.push(`  ${location}: ${deps.size} dependencies to add (${depNames.join(', ')})`);
+                }
+            }
+            for (const [importerId, deps] of importerSpecs.remove) {
+                if (deps.size > 0) {
+                    const node = lockfileGraph.nodes.get(importerId);
+                    const location = node?.location || importerId;
+                    const depNames = Array.from(deps);
+                    details.push(`  ${location}: ${deps.size} dependencies to remove (${depNames.join(', ')})`);
+                }
+            }
+            const lockfilePath = resolve(options.projectRoot, 'vlt-lock.json');
+            throw error('Lockfile is out of sync with package.json. Run "vlt install" to update.\n' +
+                details.join('\n'), {
+                path: lockfilePath,
+            });
+        }
+    }
+    const remover = new RollbackRemove();
+    if (options.cleanInstall) {
+        const nodeModulesPath = resolve(options.projectRoot, 'node_modules');
+        if (existsSync(nodeModulesPath)) {
+            await remover.rm(nodeModulesPath);
+            remover.confirm();
+        }
+    }
+    try {
+        const modifiers = GraphModifier.maybeLoad(options);
+        const act = actualLoad({
+            ...options,
+            mainManifest,
+            loadManifests: true,
+            modifiers: undefined, // modifiers should not be used here
+        });
+        const graph = await idealBuild({
+            ...options,
+            actual: act,
+            add,
+            mainManifest,
+            loadManifests: true,
+            modifiers,
+        });
+        const diff = await reify({
+            ...options,
+            add,
+            actual: act,
+            graph,
+            loadManifests: true,
+            modifiers,
+        });
+        return { graph, diff };
+    }
+    catch (err) {
+        /* c8 ignore next */
+        await remover.rollback().catch(() => { });
+        throw err;
+    }
 };
 //# sourceMappingURL=install.js.map

package/dist/esm/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/install.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAQxC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,OAAuB,EACvB,GAAiC,EACjC,EAAE;IACF,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAElE,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC;QAC7B,GAAG,OAAO;QACV,GAAG;QACH,YAAY;QACZ,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,IAAI,iBAAiB,CAAC,OAAO,CAAC;KAC5C,CAAC,CAAA;IACF,MAAM,GAAG,GAAG,UAAU,CAAC;QACrB,GAAG,OAAO;QACV,YAAY;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC;QACvB,GAAG,OAAO;QACV,WAAW,EAAE,IAAI,iBAAiB,CAAC,OAAO,CAAC;QAC3C,GAAG;QACH,MAAM,EAAE,GAAG;QACX,KAAK;QACL,aAAa,EAAE,IAAI;KACpB,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;AACxB,CAAC,CAAA","sourcesContent":["import type { PackageInfoClientOptions } from '@vltpkg/package-info'\nimport { PackageInfoClient } from '@vltpkg/package-info'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport type { LoadOptions } from './actual/load.ts'\nimport { load as actualLoad } from './actual/load.ts'\nimport type { AddImportersDependenciesMap } from './dependencies.ts'\nimport { build as idealBuild } from './ideal/build.ts'\nimport { reify } from './reify/index.ts'\n\nexport type InstallOptions = PackageInfoClientOptions &\n  LoadOptions & {\n    projectRoot: string\n    packageJson: PackageJson\n  }\n\nexport const install = async (\n  options: InstallOptions,\n  add?: AddImportersDependenciesMap,\n) => {\n  const mainManifest = options.packageJson.read(options.projectRoot)\n\n  const graph = await idealBuild({\n    ...options,\n    add,\n    mainManifest,\n    loadManifests: true,\n    packageInfo: new PackageInfoClient(options),\n  })\n  const act = actualLoad({\n    ...options,\n    mainManifest,\n    loadManifests: true,\n  })\n  const diff = await reify({\n    ...options,\n    packageInfo: new PackageInfoClient(options),\n    add,\n    actual: act,\n    graph,\n    loadManifests: true,\n  })\n\n  return { graph, diff }\n}\n"]}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/install.ts"],"names":[],"mappings":"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","sourcesContent":["import { load as actualLoad } from './actual/load.ts'\nimport { build as idealBuild } from './ideal/build.ts'\nimport { reify } from './reify/index.ts'\nimport { GraphModifier } from './modifiers.ts'\nimport { init } from '@vltpkg/init'\nimport { error } from '@vltpkg/error-cause'\nimport type { NormalizedManifest } from '@vltpkg/types'\nimport { asError } from '@vltpkg/types'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport type { LoadOptions } from './actual/load.ts'\nimport { getDependencies } from './dependencies.ts'\nimport type {\n  AddImportersDependenciesMap,\n  Dependency,\n} from './dependencies.ts'\nimport { RollbackRemove } from '@vltpkg/rollback-remove'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { existsSync } from 'node:fs'\nimport { resolve } from 'node:path'\nimport { load as loadVirtual } from './lockfile/load.ts'\nimport { getImporterSpecs } from './ideal/get-importer-specs.ts'\n\nexport type InstallOptions = LoadOptions & {\n  packageInfo: PackageInfoClient\n  cleanInstall?: boolean // Only set by ci command for clean install\n}\n\nexport const install = async (\n  options: InstallOptions,\n  add?: AddImportersDependenciesMap,\n) => {\n  if (options.expectLockfile || options.frozenLockfile) {\n    const lockfilePath = resolve(options.projectRoot, 'vlt-lock.json')\n    if (!existsSync(lockfilePath)) {\n      throw error(\n        'vlt-lock.json file is required when using --expect-lockfile, --frozen-lockfile, or ci command',\n        {\n          path: lockfilePath,\n        },\n      )\n    }\n  }\n\n  let mainManifest: NormalizedManifest | undefined = undefined\n  try {\n    mainManifest = options.packageJson.read(options.projectRoot)\n  } catch (err) {\n    if (asError(err).message === 'Could not read package.json file') {\n      await init({ cwd: options.projectRoot })\n      mainManifest = options.packageJson.read(options.projectRoot, {\n        reload: true,\n      })\n    } else {\n      throw err\n    }\n  }\n\n  if (options.frozenLockfile) {\n    if (add?.modifiedDependencies) {\n      const dependencies: string[] = []\n      for (const [, deps] of add) {\n        for (const [name] of deps) {\n          dependencies.push(name)\n        }\n      }\n      throw error(\n        'Cannot add dependencies when using --frozen-lockfile',\n        { found: dependencies.join(', ') },\n      )\n    }\n\n    const lockfileGraph = loadVirtual({\n      ...options,\n      mainManifest,\n      skipLoadingNodesOnModifiersChange: false,\n    })\n\n    const emptyAdd = Object.assign(\n      new Map<DepID, Map<string, Dependency>>(),\n      { modifiedDependencies: false },\n    )\n    const emptyRemove = Object.assign(new Map<DepID, Set<string>>(), {\n      modifiedDependencies: false,\n    })\n    const importerSpecs = getImporterSpecs({\n      graph: lockfileGraph,\n      add: emptyAdd,\n      remove: emptyRemove,\n      ...options,\n    })\n\n    // Check for spec changes by comparing package.json specs with lockfile edges\n    const specChanges: string[] = []\n    for (const importer of lockfileGraph.importers) {\n      const deps = getDependencies(importer, options)\n      for (const [depName, dep] of deps) {\n        const edge = importer.edgesOut.get(depName)\n        if (edge?.spec) {\n          if (edge.spec.toString() !== dep.spec.toString()) {\n            const node = lockfileGraph.nodes.get(importer.id)\n            /* c8 ignore next */\n            const location = node?.location || importer.id\n            specChanges.push(\n              `  ${location}: ${depName} spec changed from \"${edge.spec}\" to \"${dep.spec}\"`,\n            )\n          }\n        }\n      }\n    }\n\n    if (\n      importerSpecs.add.modifiedDependencies ||\n      importerSpecs.remove.modifiedDependencies ||\n      specChanges.length > 0\n    ) {\n      const details: string[] = []\n\n      if (specChanges.length > 0) {\n        details.push(...specChanges)\n      }\n\n      for (const [importerId, deps] of importerSpecs.add) {\n        if (deps.size > 0) {\n          const node = lockfileGraph.nodes.get(importerId)\n          const location = node?.location || importerId\n          const depNames = Array.from(deps.keys())\n          details.push(\n            `  ${location}: ${deps.size} dependencies to add (${depNames.join(', ')})`,\n          )\n        }\n      }\n\n      for (const [importerId, deps] of importerSpecs.remove) {\n        if (deps.size > 0) {\n          const node = lockfileGraph.nodes.get(importerId)\n          const location = node?.location || importerId\n          const depNames = Array.from(deps)\n          details.push(\n            `  ${location}: ${deps.size} dependencies to remove (${depNames.join(', ')})`,\n          )\n        }\n      }\n\n      const lockfilePath = resolve(\n        options.projectRoot,\n        'vlt-lock.json',\n      )\n      throw error(\n        'Lockfile is out of sync with package.json. Run \"vlt install\" to update.\\n' +\n          details.join('\\n'),\n        {\n          path: lockfilePath,\n        },\n      )\n    }\n  }\n\n  const remover = new RollbackRemove()\n  if (options.cleanInstall) {\n    const nodeModulesPath = resolve(\n      options.projectRoot,\n      'node_modules',\n    )\n    if (existsSync(nodeModulesPath)) {\n      await remover.rm(nodeModulesPath)\n      remover.confirm()\n    }\n  }\n\n  try {\n    const modifiers = GraphModifier.maybeLoad(options)\n\n    const act = actualLoad({\n      ...options,\n      mainManifest,\n      loadManifests: true,\n      modifiers: undefined, // modifiers should not be used here\n    })\n    const graph = await idealBuild({\n      ...options,\n      actual: act,\n      add,\n      mainManifest,\n      loadManifests: true,\n      modifiers,\n    })\n    const diff = await reify({\n      ...options,\n      add,\n      actual: act,\n      graph,\n      loadManifests: true,\n      modifiers,\n    })\n\n    return { graph, diff }\n  } catch (err) {\n    /* c8 ignore next */\n    await remover.rollback().catch(() => {})\n    throw err\n  }\n}\n"]}

package/dist/esm/lockfile/load-nodes.d.ts

@@ -1,4 +1,4 @@
 import type { LockfileData } from './types.ts';
 import type { GraphLike } from '../types.ts';
-export declare const loadNodes: (graph: GraphLike, nodes: LockfileData["nodes"]) => void;
+export declare const loadNodes: (graph: GraphLike, nodes: LockfileData["nodes"], actual?: GraphLike) => void;
 //# sourceMappingURL=load-nodes.d.ts.map

package/dist/esm/lockfile/load-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-nodes.d.ts","sourceRoot":"","sources":["../../../src/lockfile/load-nodes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,YAAY,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,eAAO,MAAM,SAAS,UACb,SAAS,SACT,YAAY,CAAC,OAAO,CAAC,SAmC7B,CAAA"}
+{"version":3,"file":"load-nodes.d.ts","sourceRoot":"","sources":["../../../src/lockfile/load-nodes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,YAAY,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,eAAO,MAAM,SAAS,UACb,SAAS,SACT,YAAY,CAAC,OAAO,CAAC,WACnB,SAAS,SAqEnB,CAAA"}

package/dist/esm/lockfile/load-nodes.js

@@ -1,30 +1,53 @@
 import { splitDepID } from '@vltpkg/dep-id/browser';
 import { getBooleanFlagsFromNum } from "./types.js";
-export const loadNodes = (graph, nodes) => {
+export const loadNodes = (graph, nodes, actual) => {
     const entries = Object.entries(nodes);
     for (const [id, lockfileNode] of entries) {
         // workspace nodes and the project root node are already part of the
         // graph and it should not create new nodes if an existing one is there
         if (graph.nodes.has(id))
             continue;
-        const [flags, name, integrity, resolved, location, manifest] = lockfileNode;
-        const [type, , spec] = splitDepID(id);
+        const [flags, name, integrity, resolved, location, manifest, rawManifest,] = lockfileNode;
+        const [type, filepath, maybeExtra, lastExtra] = splitDepID(id);
+        const extra = type === 'registry' || type === 'git' ? lastExtra : maybeExtra;
+        const registrySpec = maybeExtra;
+        // The reference node is a node that matches the same id from the
+        // current iterating node in the provided `actual` graph, this allows
+        // for hydrating missing manifest, integrity, and resolved values
+        // that may be missing from the lockfile
+        const referenceNode = actual?.nodes.get(id);
+        const mani = manifest ?? referenceNode?.manifest;
         // if the lockfile has manifest data then it should just use that
         // otherwise tries to infer name / version value from the lockfile node
-        const node = manifest ?
-            graph.addNode(id, manifest)
-            : graph.addNode(id, undefined, undefined, name ?? undefined, type === 'registry' && spec.indexOf('@') > 0 ?
-                spec.split('@').slice(-1)[0]
+        const node = mani ?
+            graph.addNode(id, mani)
+            : graph.addNode(id, undefined, undefined, name ?? undefined, (type === 'registry' &&
+                registrySpec &&
+                registrySpec.indexOf('@') > 0) ?
+                registrySpec.split('@').slice(-1)[0]
                 : undefined);
+        if (extra) {
+            node.modifier = extra;
+        }
         const { dev, optional } = getBooleanFlagsFromNum(flags);
         node.dev = dev;
         node.optional = optional;
-        node.integrity = integrity ?? undefined;
-        node.resolved = resolved ?? undefined;
+        node.integrity = integrity ?? referenceNode?.integrity;
+        node.resolved = resolved ?? referenceNode?.resolved;
         if (!node.resolved)
             node.setResolved();
-        if (location)
+        if (location) {
             node.location = location;
+        }
+        else {
+            // set the location to file dependencies based on the id value
+            if (type === 'file') {
+                node.location = filepath;
+            }
+        }
+        if (mani && rawManifest) {
+            node.setConfusedManifest(mani, rawManifest);
+        }
     }
 };
 //# sourceMappingURL=load-nodes.js.map

package/dist/esm/lockfile/load-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-nodes.js","sourceRoot":"","sources":["../../../src/lockfile/load-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAKnD,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,KAAgB,EAChB,KAA4B,EAC5B,EAAE;IACF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAA4B,CAAA;IAChE,KAAK,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,IAAI,OAAO,EAAE,CAAC;QACzC,oEAAoE;QACpE,uEAAuE;QACvE,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,SAAQ;QAEjC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAC1D,YAAY,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,AAAD,EAAG,IAAI,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAA;QAErC,iEAAiE;QACjE,uEAAuE;QACvE,MAAM,IAAI,GACR,QAAQ,CAAC,CAAC;YACR,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC;YAC7B,CAAC,CAAC,KAAK,CAAC,OAAO,CACX,EAAE,EACF,SAAS,EACT,SAAS,EACT,IAAI,IAAI,SAAS,EACjB,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9B,CAAC,CAAC,SAAS,CACZ,CAAA;QAEL,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;QACvD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,SAAS,CAAA;QACvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,SAAS,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,WAAW,EAAE,CAAA;QACtC,IAAI,QAAQ;YAAE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACxC,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { splitDepID } from '@vltpkg/dep-id/browser'\nimport { getBooleanFlagsFromNum } from './types.ts'\nimport type { LockfileData, LockfileNode } from './types.ts'\nimport type { DepID } from '@vltpkg/dep-id'\nimport type { GraphLike } from '../types.ts'\n\nexport const loadNodes = (\n  graph: GraphLike,\n  nodes: LockfileData['nodes'],\n) => {\n  const entries = Object.entries(nodes) as [DepID, LockfileNode][]\n  for (const [id, lockfileNode] of entries) {\n    // workspace nodes and the project root node are already part of the\n    // graph and it should not create new nodes if an existing one is there\n    if (graph.nodes.has(id)) continue\n\n    const [flags, name, integrity, resolved, location, manifest] =\n      lockfileNode\n    const [type, , spec] = splitDepID(id)\n\n    // if the lockfile has manifest data then it should just use that\n    // otherwise tries to infer name / version value from the lockfile node\n    const node =\n      manifest ?\n        graph.addNode(id, manifest)\n      : graph.addNode(\n          id,\n          undefined,\n          undefined,\n          name ?? undefined,\n          type === 'registry' && spec.indexOf('@') > 0 ?\n            spec.split('@').slice(-1)[0]\n          : undefined,\n        )\n\n    const { dev, optional } = getBooleanFlagsFromNum(flags)\n    node.dev = dev\n    node.optional = optional\n    node.integrity = integrity ?? undefined\n    node.resolved = resolved ?? undefined\n    if (!node.resolved) node.setResolved()\n    if (location) node.location = location\n  }\n}\n"]}
+{"version":3,"file":"load-nodes.js","sourceRoot":"","sources":["../../../src/lockfile/load-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAKnD,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,KAAgB,EAChB,KAA4B,EAC5B,MAAkB,EAClB,EAAE;IACF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAA4B,CAAA;IAChE,KAAK,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,IAAI,OAAO,EAAE,CAAC;QACzC,oEAAoE;QACpE,uEAAuE;QACvE,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,SAAQ;QAEjC,MAAM,CACJ,KAAK,EACL,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,WAAW,EACZ,GAAG,YAAY,CAAA;QAChB,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAA;QAC9D,MAAM,KAAK,GACT,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;QAChE,MAAM,YAAY,GAAG,UAAU,CAAA;QAE/B,iEAAiE;QACjE,qEAAqE;QACrE,iEAAiE;QACjE,wCAAwC;QACxC,MAAM,aAAa,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC3C,MAAM,IAAI,GAAG,QAAQ,IAAI,aAAa,EAAE,QAAQ,CAAA;QAEhD,iEAAiE;QACjE,uEAAuE;QACvE,MAAM,IAAI,GACR,IAAI,CAAC,CAAC;YACJ,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC;YACzB,CAAC,CAAC,KAAK,CAAC,OAAO,CACX,EAAE,EACF,SAAS,EACT,SAAS,EACT,IAAI,IAAI,SAAS,EACjB,CACE,IAAI,KAAK,UAAU;gBACjB,YAAY;gBACZ,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAChC,CAAC,CAAC;gBACD,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,CAAC,CAAC,SAAS,CACZ,CAAA;QACL,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACvB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;QACvD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,aAAa,EAAE,SAAS,CAAA;QACtD,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,aAAa,EAAE,QAAQ,CAAA;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,WAAW,EAAE,CAAA;QACtC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAC1B,CAAC;aAAM,CAAC;YACN,8DAA8D;YAC9D,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;YAC1B,CAAC;QACH,CAAC;QACD,IAAI,IAAI,IAAI,WAAW,EAAE,CAAC;YACxB,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;AACH,CAAC,CAAA","sourcesContent":["import { splitDepID } from '@vltpkg/dep-id/browser'\nimport { getBooleanFlagsFromNum } from './types.ts'\nimport type { LockfileData, LockfileNode } from './types.ts'\nimport type { DepID } from '@vltpkg/dep-id'\nimport type { GraphLike } from '../types.ts'\n\nexport const loadNodes = (\n  graph: GraphLike,\n  nodes: LockfileData['nodes'],\n  actual?: GraphLike,\n) => {\n  const entries = Object.entries(nodes) as [DepID, LockfileNode][]\n  for (const [id, lockfileNode] of entries) {\n    // workspace nodes and the project root node are already part of the\n    // graph and it should not create new nodes if an existing one is there\n    if (graph.nodes.has(id)) continue\n\n    const [\n      flags,\n      name,\n      integrity,\n      resolved,\n      location,\n      manifest,\n      rawManifest,\n    ] = lockfileNode\n    const [type, filepath, maybeExtra, lastExtra] = splitDepID(id)\n    const extra =\n      type === 'registry' || type === 'git' ? lastExtra : maybeExtra\n    const registrySpec = maybeExtra\n\n    // The reference node is a node that matches the same id from the\n    // current iterating node in the provided `actual` graph, this allows\n    // for hydrating missing manifest, integrity, and resolved values\n    // that may be missing from the lockfile\n    const referenceNode = actual?.nodes.get(id)\n    const mani = manifest ?? referenceNode?.manifest\n\n    // if the lockfile has manifest data then it should just use that\n    // otherwise tries to infer name / version value from the lockfile node\n    const node =\n      mani ?\n        graph.addNode(id, mani)\n      : graph.addNode(\n          id,\n          undefined,\n          undefined,\n          name ?? undefined,\n          (\n            type === 'registry' &&\n              registrySpec &&\n              registrySpec.indexOf('@') > 0\n          ) ?\n            registrySpec.split('@').slice(-1)[0]\n          : undefined,\n        )\n    if (extra) {\n      node.modifier = extra\n    }\n\n    const { dev, optional } = getBooleanFlagsFromNum(flags)\n    node.dev = dev\n    node.optional = optional\n    node.integrity = integrity ?? referenceNode?.integrity\n    node.resolved = resolved ?? referenceNode?.resolved\n    if (!node.resolved) node.setResolved()\n    if (location) {\n      node.location = location\n    } else {\n      // set the location to file dependencies based on the id value\n      if (type === 'file') {\n        node.location = filepath\n      }\n    }\n    if (mani && rawManifest) {\n      node.setConfusedManifest(mani, rawManifest)\n    }\n  }\n}\n"]}

package/dist/esm/lockfile/load.d.ts

@@ -1,11 +1,16 @@
 import { PackageJson } from '@vltpkg/package-json';
-import type { Manifest } from '@vltpkg/types';
 import { Monorepo } from '@vltpkg/workspaces';
-import type { SpecOptions } from '@vltpkg/spec';
-import type { PathScurry } from 'path-scurry';
 import { Graph } from '../graph.ts';
+import type { PathScurry } from 'path-scurry';
+import type { NormalizedManifest } from '@vltpkg/types';
+import type { SpecOptions } from '@vltpkg/spec';
 import type { LockfileData } from './types.ts';
+import type { GraphModifier } from '../modifiers.ts';
 export type LoadOptions = SpecOptions & {
+    /**
+     * An optional {@link Graph} object to hydrate extra data from.
+     */
+    actual?: Graph;
     /**
      * The project root dirname.
      */
@@ -13,7 +18,11 @@ export type LoadOptions = SpecOptions & {
     /**
      * The project root manifest.
      */
-    mainManifest: Manifest;
+    mainManifest: NormalizedManifest;
+    /**
+     * The graph modifiers helper object.
+     */
+    modifiers?: GraphModifier;
     /**
      * A {@link Monorepo} object, for managing workspaces
      */
@@ -26,8 +35,12 @@ export type LoadOptions = SpecOptions & {
      * A {@link PathScurry} object, for use in globs
      */
     scurry?: PathScurry;
+    /**
+     * Load only importers into the graph if the modifiers have changed.
+     */
+    skipLoadingNodesOnModifiersChange?: boolean;
 };
 export declare const load: (options: LoadOptions) => Graph;
 export declare const loadHidden: (options: LoadOptions) => Graph;
-export declare const loadObject: (options: LoadOptions, lockfileData: LockfileData) => Graph;
+export declare const loadObject: (options: LoadOptions, lockfileData: Omit<LockfileData, "options" | "lockfileVersion"> & Partial<Pick<LockfileData, "options" | "lockfileVersion">>) => Graph;
 //# sourceMappingURL=load.d.ts.map

package/dist/esm/lockfile/load.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lockfile/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAG/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,CAAA;AASD,eAAO,MAAM,IAAI,YAAa,WAAW,KAAG,KAM3C,CAAA;AAED,eAAO,MAAM,UAAU,YAAa,WAAW,KAAG,KAMjD,CAAA;AAED,eAAO,MAAM,UAAU,YACZ,WAAW,gBACN,YAAY,UA6C3B,CAAA"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lockfile/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAK7C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAA;IACd;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAA;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,aAAa,CAAA;IACzB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB;;OAEG;IACH,iCAAiC,CAAC,EAAE,OAAO,CAAA;CAC5C,CAAA;AASD,eAAO,MAAM,IAAI,YAAa,WAAW,KAAG,KAM3C,CAAA;AAED,eAAO,MAAM,UAAU,YAAa,WAAW,KAAG,KAMjD,CAAA;AAED,eAAO,MAAM,UAAU,YACZ,WAAW,gBACN,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,iBAAiB,CAAC,GAC7D,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC,UA4E7D,CAAA"}

package/dist/esm/lockfile/load.js

@@ -17,15 +17,15 @@ export const loadHidden = (options) => {
     return loadObject(options, loadLockfile(projectRoot, 'node_modules/.vlt-lock.json'));
 };
 export const loadObject = (options, lockfileData) => {
-    const { mainManifest, scurry } = options;
+    const { mainManifest, modifiers, scurry, skipLoadingNodesOnModifiersChange, } = options;
     const packageJson = options.packageJson ?? new PackageJson();
     const monorepo = options.monorepo ??
         Monorepo.maybeLoad(options.projectRoot, { packageJson, scurry });
-    const { 'scope-registries': scopeRegistries, registry, registries, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives,
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-     } = lockfileData.options || {};
+    const { catalog = {}, catalogs = {}, modifiers: modifiersLockfileConfig, 'scope-registries': scopeRegistries, registry, registries, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, } = lockfileData.options ?? {};
     const mergedOptions = {
         ...options,
+        catalog,
+        catalogs,
         'scope-registries': {
             ...options['scope-registries'],
             ...scopeRegistries,
@@ -49,8 +49,25 @@ export const loadObject = (options, lockfileData) => {
         mainManifest,
         monorepo,
     });
-    loadNodes(graph, lockfileData.nodes);
-    loadEdges(graph, lockfileData.edges, mergedOptions);
+    // When using the skipLoadingNodesOnModifiersChange option, we should skip loading
+    // dependencies in case the modifiers have changed since we'll need to
+    // recalculate the graph - useful for refreshing an ideal graph when
+    // modifiers are swapped.
+    const lockfileModifiers = JSON.stringify(modifiersLockfileConfig ?? {});
+    const optionsModifiers = JSON.stringify(modifiers?.config);
+    const modifiersChanged = lockfileModifiers !== optionsModifiers;
+    const shouldLoadDependencies = !(skipLoadingNodesOnModifiersChange && modifiersChanged);
+    if (shouldLoadDependencies) {
+        loadNodes(graph, lockfileData.nodes, options.actual);
+        loadEdges(graph, lockfileData.edges, mergedOptions);
+    }
+    // hydrate missing node-level registry data
+    for (const node of graph.nodes.values()) {
+        const [firstEdge] = node.edgesIn;
+        if (firstEdge?.spec.registry) {
+            node.registry = firstEdge.spec.registry;
+        }
+    }
     return graph;
 };
 //# sourceMappingURL=load.js.map

package/dist/esm/lockfile/load.js.map

@@ -1 +1 @@
-{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/lockfile/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA0BnC,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAE,YAAoB,EAAE,EAAE,CACjE,IAAI,CAAC,KAAK,CACR,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE;IAC/C,QAAQ,EAAE,MAAM;CACjB,CAAC,CACa,CAAA;AAEnB,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,OAAoB,EAAS,EAAE;IAClD,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAC/B,OAAO,UAAU,CACf,OAAO,EACP,YAAY,CAAC,WAAW,EAAE,eAAe,CAAC,CAC3C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAoB,EAAS,EAAE;IACxD,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAC/B,OAAO,UAAU,CACf,OAAO,EACP,YAAY,CAAC,WAAW,EAAE,6BAA6B,CAAC,CACzD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAoB,EACpB,YAA0B,EAC1B,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IACxC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,IAAI,WAAW,EAAE,CAAA;IAC5D,MAAM,QAAQ,GACZ,OAAO,CAAC,QAAQ;QAChB,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;IAClE,MAAM,EACJ,kBAAkB,EAAE,eAAe,EACnC,QAAQ,EACR,UAAU,EACV,WAAW,EAAE,QAAQ,EACrB,mBAAmB,EAAE,eAAe;IACpC,uEAAuE;MACxE,GAAG,YAAY,CAAC,OAAO,IAAI,EAAE,CAAA;IAC9B,MAAM,aAAa,GAAG;QACpB,GAAG,OAAO;QACV,kBAAkB,EAAE;YAClB,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAC9B,GAAG,eAAe;SACnB;QACD,QAAQ,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ;QACtC,UAAU,EAAE;YACV,GAAG,OAAO,CAAC,UAAU;YACrB,GAAG,UAAU;SACd;QACD,WAAW,EAAE;YACX,GAAG,OAAO,CAAC,WAAW,CAAC;YACvB,GAAG,QAAQ;SACZ;QACD,mBAAmB,EAAE;YACnB,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAC/B,GAAG,eAAe;SACnB;KACF,CAAA;IACD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,GAAG,aAAa;QAChB,YAAY;QACZ,QAAQ;KACT,CAAC,CAAA;IAEF,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;IACpC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,aAAa,CAAC,CAAA;IAEnD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA","sourcesContent":["import { PackageJson } from '@vltpkg/package-json'\nimport type { Manifest } from '@vltpkg/types'\nimport { Monorepo } from '@vltpkg/workspaces'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport { readFileSync } from 'node:fs'\nimport { resolve } from 'node:path'\nimport type { PathScurry } from 'path-scurry'\nimport { loadEdges } from './load-edges.ts'\nimport { loadNodes } from './load-nodes.ts'\nimport { Graph } from '../graph.ts'\nimport type { LockfileData } from './types.ts'\n\nexport type LoadOptions = SpecOptions & {\n  /**\n   * The project root dirname.\n   */\n  projectRoot: string\n  /**\n   * The project root manifest.\n   */\n  mainManifest: Manifest\n  /**\n   * A {@link Monorepo} object, for managing workspaces\n   */\n  monorepo?: Monorepo\n  /**\n   * A {@link PackageJson} object, for sharing manifest caches\n   */\n  packageJson?: PackageJson\n  /**\n   * A {@link PathScurry} object, for use in globs\n   */\n  scurry?: PathScurry\n}\n\nconst loadLockfile = (projectRoot: string, lockfilePath: string) =>\n  JSON.parse(\n    readFileSync(resolve(projectRoot, lockfilePath), {\n      encoding: 'utf8',\n    }),\n  ) as LockfileData\n\nexport const load = (options: LoadOptions): Graph => {\n  const { projectRoot } = options\n  return loadObject(\n    options,\n    loadLockfile(projectRoot, 'vlt-lock.json'),\n  )\n}\n\nexport const loadHidden = (options: LoadOptions): Graph => {\n  const { projectRoot } = options\n  return loadObject(\n    options,\n    loadLockfile(projectRoot, 'node_modules/.vlt-lock.json'),\n  )\n}\n\nexport const loadObject = (\n  options: LoadOptions,\n  lockfileData: LockfileData,\n) => {\n  const { mainManifest, scurry } = options\n  const packageJson = options.packageJson ?? new PackageJson()\n  const monorepo =\n    options.monorepo ??\n    Monorepo.maybeLoad(options.projectRoot, { packageJson, scurry })\n  const {\n    'scope-registries': scopeRegistries,\n    registry,\n    registries,\n    'git-hosts': gitHosts,\n    'git-host-archives': gitHostArchives,\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n  } = lockfileData.options || {}\n  const mergedOptions = {\n    ...options,\n    'scope-registries': {\n      ...options['scope-registries'],\n      ...scopeRegistries,\n    },\n    registry: registry ?? options.registry,\n    registries: {\n      ...options.registries,\n      ...registries,\n    },\n    'git-hosts': {\n      ...options['git-hosts'],\n      ...gitHosts,\n    },\n    'git-host-archives': {\n      ...options['git-host-archives'],\n      ...gitHostArchives,\n    },\n  }\n  const graph = new Graph({\n    ...mergedOptions,\n    mainManifest,\n    monorepo,\n  })\n\n  loadNodes(graph, lockfileData.nodes)\n  loadEdges(graph, lockfileData.edges, mergedOptions)\n\n  return graph\n}\n"]}
+{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/lockfile/load.ts"],"names":[],"mappings":"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","sourcesContent":["import { PackageJson } from '@vltpkg/package-json'\nimport { Monorepo } from '@vltpkg/workspaces'\nimport { readFileSync } from 'node:fs'\nimport { resolve } from 'node:path'\nimport { loadEdges } from './load-edges.ts'\nimport { loadNodes } from './load-nodes.ts'\nimport { Graph } from '../graph.ts'\nimport type { PathScurry } from 'path-scurry'\nimport type { NormalizedManifest } from '@vltpkg/types'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport type { LockfileData } from './types.ts'\nimport type { GraphModifier } from '../modifiers.ts'\n\nexport type LoadOptions = SpecOptions & {\n  /**\n   * An optional {@link Graph} object to hydrate extra data from.\n   */\n  actual?: Graph\n  /**\n   * The project root dirname.\n   */\n  projectRoot: string\n  /**\n   * The project root manifest.\n   */\n  mainManifest: NormalizedManifest\n  /**\n   * The graph modifiers helper object.\n   */\n  modifiers?: GraphModifier\n  /**\n   * A {@link Monorepo} object, for managing workspaces\n   */\n  monorepo?: Monorepo\n  /**\n   * A {@link PackageJson} object, for sharing manifest caches\n   */\n  packageJson?: PackageJson\n  /**\n   * A {@link PathScurry} object, for use in globs\n   */\n  scurry?: PathScurry\n  /**\n   * Load only importers into the graph if the modifiers have changed.\n   */\n  skipLoadingNodesOnModifiersChange?: boolean\n}\n\nconst loadLockfile = (projectRoot: string, lockfilePath: string) =>\n  JSON.parse(\n    readFileSync(resolve(projectRoot, lockfilePath), {\n      encoding: 'utf8',\n    }),\n  ) as LockfileData\n\nexport const load = (options: LoadOptions): Graph => {\n  const { projectRoot } = options\n  return loadObject(\n    options,\n    loadLockfile(projectRoot, 'vlt-lock.json'),\n  )\n}\n\nexport const loadHidden = (options: LoadOptions): Graph => {\n  const { projectRoot } = options\n  return loadObject(\n    options,\n    loadLockfile(projectRoot, 'node_modules/.vlt-lock.json'),\n  )\n}\n\nexport const loadObject = (\n  options: LoadOptions,\n  lockfileData: Omit<LockfileData, 'options' | 'lockfileVersion'> &\n    Partial<Pick<LockfileData, 'options' | 'lockfileVersion'>>,\n) => {\n  const {\n    mainManifest,\n    modifiers,\n    scurry,\n    skipLoadingNodesOnModifiersChange,\n  } = options\n  const packageJson = options.packageJson ?? new PackageJson()\n  const monorepo =\n    options.monorepo ??\n    Monorepo.maybeLoad(options.projectRoot, { packageJson, scurry })\n  const {\n    catalog = {},\n    catalogs = {},\n    modifiers: modifiersLockfileConfig,\n    'scope-registries': scopeRegistries,\n    registry,\n    registries,\n    'git-hosts': gitHosts,\n    'git-host-archives': gitHostArchives,\n  } = lockfileData.options ?? {}\n  const mergedOptions = {\n    ...options,\n    catalog,\n    catalogs,\n    'scope-registries': {\n      ...options['scope-registries'],\n      ...scopeRegistries,\n    },\n    registry: registry ?? options.registry,\n    registries: {\n      ...options.registries,\n      ...registries,\n    },\n    'git-hosts': {\n      ...options['git-hosts'],\n      ...gitHosts,\n    },\n    'git-host-archives': {\n      ...options['git-host-archives'],\n      ...gitHostArchives,\n    },\n  }\n  const graph = new Graph({\n    ...mergedOptions,\n    mainManifest,\n    monorepo,\n  })\n\n  // When using the skipLoadingNodesOnModifiersChange option, we should skip loading\n  // dependencies in case the modifiers have changed since we'll need to\n  // recalculate the graph - useful for refreshing an ideal graph when\n  // modifiers are swapped.\n  const lockfileModifiers = JSON.stringify(\n    modifiersLockfileConfig ?? {},\n  )\n  const optionsModifiers = JSON.stringify(modifiers?.config)\n  const modifiersChanged = lockfileModifiers !== optionsModifiers\n  const shouldLoadDependencies = !(\n    skipLoadingNodesOnModifiersChange && modifiersChanged\n  )\n  if (shouldLoadDependencies) {\n    loadNodes(graph, lockfileData.nodes, options.actual)\n    loadEdges(graph, lockfileData.edges, mergedOptions)\n  }\n\n  // hydrate missing node-level registry data\n  for (const node of graph.nodes.values()) {\n    const [firstEdge] = node.edgesIn\n    if (firstEdge?.spec.registry) {\n      node.registry = firstEdge.spec.registry\n    }\n  }\n\n  return graph\n}\n"]}

package/dist/esm/lockfile/save.d.ts

@@ -1,18 +1,23 @@
 import type { SpecOptions } from '@vltpkg/spec';
 import type { Graph } from '../graph.ts';
 import type { LockfileData } from './types.ts';
+import type { GraphModifier } from '../modifiers.ts';
 export type SaveOptions = SpecOptions & {
     /**
      * The graph to be stored in the lockfile.
      */
     graph: Graph;
+    /**
+     * The graph modifiers helper object.
+     */
+    modifiers?: GraphModifier;
     /**
      * Should it save manifest data in the lockfile?
      */
     saveManifests?: boolean;
 };
-export declare const lockfileData: ({ graph, "git-hosts": gitHosts, "git-host-archives": gitHostArchives, registry, registries, saveManifests, "scope-registries": scopeRegistries, }: SaveOptions) => LockfileData;
+export declare const lockfileData: ({ graph, catalog, catalogs, "git-hosts": gitHosts, "git-host-archives": gitHostArchives, modifiers, registry, registries, saveManifests, "scope-registries": scopeRegistries, "jsr-registries": jsrRegistries, }: SaveOptions) => LockfileData;
 export declare const saveData: (data: LockfileData, fileName: string, saveManifests?: boolean) => void;
-export declare const save: (options: SaveOptions) => void;
-export declare const saveHidden: (options: SaveOptions) => void;
+export declare const save: (options: Omit<SaveOptions, "saveManifests">) => void;
+export declare const saveHidden: (options: Omit<SaveOptions, "saveManifests">) => void;
 //# sourceMappingURL=save.d.ts.map

package/dist/esm/lockfile/save.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lockfile/save.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAI/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGxC,OAAO,KAAK,EACV,YAAY,EAKb,MAAM,YAAY,CAAA;AAEnB,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC;;OAEG;IACH,KAAK,EAAE,KAAK,CAAA;IACZ;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAgGD,eAAO,MAAM,YAAY,sJAQtB,WAAW,KAAG,YAwChB,CAAA;AAeD,eAAO,MAAM,QAAQ,SACb,YAAY,YACR,MAAM,kCAMjB,CAAA;AAED,eAAO,MAAM,IAAI,YAAa,WAAW,SAKxC,CAAA;AAED,eAAO,MAAM,UAAU,YAAa,WAAW,SAS9C,CAAA"}
+{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lockfile/save.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,KAAK,EACV,YAAY,EAKb,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC;;OAEG;IACH,KAAK,EAAE,KAAK,CAAA;IACZ;;OAEG;IACH,SAAS,CAAC,EAAE,aAAa,CAAA;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAyFD,eAAO,MAAM,YAAY,qNAYtB,WAAW,KAAG,YAyDhB,CAAA;AAeD,eAAO,MAAM,QAAQ,SACb,YAAY,YACR,MAAM,8BAEf,IAIF,CAAA;AAED,eAAO,MAAM,IAAI,YACN,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,KAC1C,IAKF,CAAA;AAED,eAAO,MAAM,UAAU,YACZ,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,KAC1C,IASF,CAAA"}

package/dist/esm/lockfile/save.js

@@ -1,4 +1,5 @@
-import { defaultRegistry, defaultRegistries, defaultGitHosts, defaultGitHostArchives, defaultScopeRegistries, } from '@vltpkg/spec';
+import { expandNormalizedManifestSymbols, isRecordStringString, } from '@vltpkg/types';
+import { defaultGitHostArchives, defaultGitHosts, defaultJsrRegistries, defaultRegistries, defaultRegistry, defaultScopeRegistries, } from '@vltpkg/spec';
 import { mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { getFlagNumFromNode } from "./types.js";
@@ -13,11 +14,7 @@ const formatNodes = (nodes, saveManifests, registry) => {
         const customRegistry = node.resolved && registry && !node.resolved.startsWith(registry);
         const resolved = customRegistry ? node.resolved : undefined;
         // if it's in a location other than the default, stash that
-        const location = (node.id.startsWith('file') ||
-            node.location.endsWith('/node_modules/.vlt/' +
-                node.id +
-                '/node_modules/' +
-                node.name)) ?
+        const location = node.id.startsWith('file') || node.inVltStore() ?
             undefined
             : node.location;
         const flags = getFlagNumFromNode(node);
@@ -31,8 +28,11 @@ const formatNodes = (nodes, saveManifests, registry) => {
         if (location) {
             lockfileNode[4] = location;
         }
-        if (saveManifests) {
-            lockfileNode[5] = node.manifest;
+        if (saveManifests && node.manifest) {
+            lockfileNode[5] = expandNormalizedManifestSymbols(node.manifest);
+            if (node.confused && node.rawManifest) {
+                lockfileNode[6] = expandNormalizedManifestSymbols(node.rawManifest);
+            }
         }
         res[node.id] = lockfileNode;
     }
@@ -51,7 +51,6 @@ Number(b.from.importer) - Number(a.from.importer) ||
     `${edge.from.id} ${edge.spec.name}`,
     `${edge.type} ${edge.spec.bareSpec || '*'} ${edge.to?.id ?? 'MISSING'}`,
 ]));
-const isRecordStringString = (registries) => !(!registries || typeof registries === 'string');
 const removeDefaultItems = (defaultItems, items) => {
     const res = {};
     for (const [key, value] of Object.entries(items)) {
@@ -61,25 +60,40 @@ const removeDefaultItems = (defaultItems, items) => {
     }
     return res;
 };
-export const lockfileData = ({ graph, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, registry, registries, saveManifests, 'scope-registries': scopeRegistries, }) => {
+export const lockfileData = ({ graph, catalog, catalogs, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, modifiers, registry, registries, saveManifests, 'scope-registries': scopeRegistries, 'jsr-registries': jsrRegistries, }) => {
     const cleanGitHosts = isRecordStringString(gitHosts) ?
         removeDefaultItems(defaultGitHosts, gitHosts)
         : undefined;
     const cleanGitHostArchives = isRecordStringString(gitHostArchives) ?
         removeDefaultItems(defaultGitHostArchives, gitHostArchives)
         : undefined;
+    const cleanModifiers = modifiers && isRecordStringString(modifiers.config) ?
+        modifiers.config
+        : undefined;
     const cleanRegistries = isRecordStringString(registries) ?
         removeDefaultItems(defaultRegistries, registries)
         : undefined;
     const cleanScopeRegistries = isRecordStringString(scopeRegistries) ?
         removeDefaultItems(defaultScopeRegistries, scopeRegistries)
         : undefined;
+    const cleanJsrRegistries = isRecordStringString(jsrRegistries) ?
+        removeDefaultItems(defaultJsrRegistries, jsrRegistries)
+        : undefined;
     const hasItems = (clean) => clean && Object.keys(clean).length;
     return {
+        lockfileVersion: 0,
         options: {
+            ...(hasItems(cleanModifiers) ?
+                { modifiers: cleanModifiers }
+                : {}),
+            ...(hasItems(catalog) ? { catalog } : {}),
+            ...(hasItems(catalogs) ? { catalogs } : {}),
             ...(hasItems(cleanScopeRegistries) ?
                 { 'scope-registries': cleanScopeRegistries }
                 : undefined),
+            ...(hasItems(cleanJsrRegistries) ?
+                { 'jsr-registries': cleanJsrRegistries }
+                : undefined),
             ...(registry !== undefined && registry !== defaultRegistry ?
                 { registry }
                 : undefined),
@@ -116,13 +130,13 @@ export const save = (options) => {
     const { graph } = options;
     const data = lockfileData({ ...options, saveManifests: false });
     const fileName = resolve(graph.projectRoot, 'vlt-lock.json');
-    return saveData(data, fileName, false);
+    saveData(data, fileName, false);
 };
 export const saveHidden = (options) => {
     const { graph } = options;
     const data = lockfileData({ ...options, saveManifests: true });
     const fileName = resolve(graph.projectRoot, 'node_modules/.vlt-lock.json');
     mkdirSync(dirname(fileName), { recursive: true });
-    return saveData(data, fileName, true);
+    saveData(data, fileName, true);
 };
 //# sourceMappingURL=save.js.map