@vltpkg/graph 0.0.0-17 → 0.0.0-19

package/dist/esm/ideal/append-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"append-nodes.js","sourceRoot":"","sources":["../../../src/ideal/append-nodes.ts"],"names":[],"mappings":"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","sourcesContent":["import { joinDepIDTuple } from '@vltpkg/dep-id'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport { Spec } from '@vltpkg/spec'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport { longDependencyTypes } from '@vltpkg/types'\nimport type { DependencyTypeLong } from '@vltpkg/types'\nimport type { PathScurry } from 'path-scurry'\nimport { asDependency, shorten } from '../dependencies.ts'\nimport type { Dependency } from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport type { Node } from '../node.ts'\nimport { removeOptionalSubgraph } from '../remove-optional-subgraph.ts'\nimport type {\n  GraphModifier,\n  ModifierActiveEntry,\n} from '../modifiers.ts'\n\ntype FileTypeInfo = {\n  id: DepID\n  path: string\n  isDirectory: boolean\n}\n\n/**\n * Only install devDeps for git dependencies and importers\n * Everything else always gets installed\n */\nconst shouldInstallDepType = (\n  node: Node,\n  depType: DependencyTypeLong,\n) =>\n  depType !== 'devDependencies' ||\n  node.importer ||\n  node.id.startsWith('git')\n\n/**\n * Retrieve the {@link DepID} and location for a `file:` type {@link Node}.\n */\nconst getFileTypeInfo = (\n  spec: Spec,\n  fromNode: Node,\n  scurry: PathScurry,\n): FileTypeInfo | undefined => {\n  const f = spec.final\n  if (f.type !== 'file') return\n\n  /* c8 ignore start - should be impossible */\n  if (!f.file) {\n    throw error('no path on file specifier', { spec })\n  }\n  /* c8 ignore stop */\n\n  // Given that both linked folders and local tarballs (both defined with\n  // usage of the `file:` spec prefix) location needs to be relative to their\n  // parents, build the expected path and use it for both location and id\n  const target = scurry.cwd.resolve(fromNode.location).resolve(f.file)\n  const path = target.relativePosix()\n  const id = joinDepIDTuple(['file', path])\n\n  return {\n    path,\n    id,\n    isDirectory: !!target.lstatSync()?.isDirectory(),\n  }\n}\n\nconst isStringArray = (a: unknown): a is string[] =>\n  Array.isArray(a) && !a.some(b => typeof b !== 'string')\n\nexport const appendNodes = async (\n  add: Map<string, Dependency>,\n  packageInfo: PackageInfoClient,\n  graph: Graph,\n  fromNode: Node,\n  deps: Dependency[],\n  scurry: PathScurry,\n  options: SpecOptions,\n  seen: Set<DepID>,\n  modifiers?: GraphModifier,\n  modifierRefs?: Map<string, ModifierActiveEntry>,\n) => {\n  /* c8 ignore next */\n  if (seen.has(fromNode.id)) return\n  seen.add(fromNode.id)\n\n  await Promise.all(\n    deps.map(async ({ spec, type }) => {\n      // see if there's a satisfying node in the graph currently\n      const fileTypeInfo = getFileTypeInfo(spec, fromNode, scurry)\n      const activeModifier = modifierRefs?.get(spec.name)\n\n      // here is the place we swap specs if a edge modifier was defined\n      const queryModifier = activeModifier?.modifier.query\n      const completeModifier =\n        activeModifier &&\n        activeModifier.interactiveBreadcrumb.current ===\n          activeModifier.modifier.breadcrumb.last\n      if (\n        queryModifier &&\n        completeModifier &&\n        'spec' in activeModifier.modifier\n      ) {\n        spec = activeModifier.modifier.spec\n        if (spec.bareSpec === '-') {\n          return\n        }\n      }\n\n      const existingNode = graph.findResolution(\n        spec,\n        fromNode,\n        queryModifier,\n      )\n      if (existingNode) {\n        graph.addEdge(type, spec, fromNode, existingNode)\n        return\n      }\n\n      const edgeOptional =\n        type === 'optional' || type === 'peerOptional'\n      const mani = await packageInfo\n        .manifest(spec, { from: scurry.resolve(fromNode.location) })\n        .catch((er: unknown) => {\n          // optional deps ignored if inaccessible\n          if (edgeOptional || fromNode.optional) {\n            return undefined\n          }\n          throw er\n        })\n\n      // when an user is adding a nameless dependency, e.g: `github:foo/bar`,\n      // `file:./foo/bar`, we need to update the `add` option value to set the\n      // correct name once we have it, so that it can properly be stored in\n      // the `package.json` file at the end of reify.\n      if (mani?.name && spec.name === '(unknown)') {\n        const s = add.get(String(spec))\n        if (s) {\n          // removes the previous, placeholder entry key\n          add.delete(String(spec))\n          // replaces spec with a version with the correct name\n          spec = Spec.parse(mani.name, spec.bareSpec, options)\n          // updates the add map with the fixed up spec\n          const n = asDependency({\n            ...s,\n            spec,\n          })\n          add.set(mani.name, n)\n        }\n      }\n\n      if (!mani) {\n        if (!edgeOptional && fromNode.isOptional()) {\n          // failed resolution of a non-optional dep of an optional node\n          // have to clean up the dependents\n          removeOptionalSubgraph(graph, fromNode)\n          return\n        } else if (edgeOptional) {\n          // failed resolution of an optional dep, just ignore it,\n          // nothing to prune because we never added it in the first place.\n          return\n        } else {\n          throw error('failed to resolve dependency', {\n            spec,\n            from: fromNode.location,\n          })\n        }\n      }\n\n      const node = graph.placePackage(\n        fromNode,\n        type,\n        spec,\n        mani,\n        fileTypeInfo?.id,\n        queryModifier,\n      )\n\n      /* c8 ignore start - not possible, already ensured manifest */\n      if (!node) {\n        throw error('failed to place package', {\n          from: fromNode.location,\n          spec,\n        })\n      }\n      /* c8 ignore stop */\n\n      if (activeModifier) {\n        modifiers?.updateActiveEntry(node, activeModifier)\n      }\n\n      if (fileTypeInfo?.path && fileTypeInfo.isDirectory) {\n        node.location = fileTypeInfo.path\n      }\n      node.setResolved()\n      const nestedAppends: Promise<unknown>[] = []\n\n      const bundleDeps = node.manifest?.bundleDependencies\n      const bundled = new Set<string>(\n        (\n          node.id.startsWith('git') ||\n          node.importer ||\n          !isStringArray(bundleDeps)\n        ) ?\n          []\n        : bundleDeps,\n      )\n\n      const nextDeps: Dependency[] = []\n\n      for (const depTypeName of longDependencyTypes) {\n        const depRecord: Record<string, string> | undefined =\n          mani[depTypeName]\n\n        if (depRecord && shouldInstallDepType(node, depTypeName)) {\n          for (const [name, bareSpec] of Object.entries(depRecord)) {\n            if (bundled.has(name)) continue\n            nextDeps.push({\n              type: shorten(depTypeName, name, mani),\n              spec: Spec.parse(name, bareSpec, {\n                ...options,\n                registry: spec.registry,\n              }),\n            })\n          }\n        }\n      }\n\n      if (nextDeps.length) {\n        nestedAppends.push(\n          appendNodes(\n            add,\n            packageInfo,\n            graph,\n            node,\n            nextDeps,\n            scurry,\n            options,\n            seen,\n            modifiers,\n            modifiers?.tryDependencies(node, nextDeps),\n          ),\n        )\n      }\n      await Promise.all(nestedAppends)\n    }),\n  )\n}\n"]}
+{"version":3,"file":"append-nodes.js","sourceRoot":"","sources":["../../../src/ideal/append-nodes.ts"],"names":[],"mappings":"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","sourcesContent":["import { joinDepIDTuple } from '@vltpkg/dep-id'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport { Spec } from '@vltpkg/spec'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport { longDependencyTypes, normalizeManifest } from '@vltpkg/types'\nimport type { DependencyTypeLong, Manifest } from '@vltpkg/types'\nimport type { PathScurry } from 'path-scurry'\nimport { asDependency, shorten } from '../dependencies.ts'\nimport type { Dependency } from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport type { Node } from '../node.ts'\nimport { removeOptionalSubgraph } from '../remove-optional-subgraph.ts'\nimport type {\n  GraphModifier,\n  ModifierActiveEntry,\n} from '../modifiers.ts'\n\ntype FileTypeInfo = {\n  id: DepID\n  path: string\n  isDirectory: boolean\n}\n\n/**\n * Only install devDeps for git dependencies and importers\n * Everything else always gets installed\n */\nconst shouldInstallDepType = (\n  node: Node,\n  depType: DependencyTypeLong,\n) =>\n  depType !== 'devDependencies' ||\n  node.importer ||\n  node.id.startsWith('git')\n\n/**\n * Retrieve the {@link DepID} and location for a `file:` type {@link Node}.\n */\nconst getFileTypeInfo = (\n  spec: Spec,\n  fromNode: Node,\n  scurry: PathScurry,\n): FileTypeInfo | undefined => {\n  const f = spec.final\n  if (f.type !== 'file') return\n\n  /* c8 ignore start - should be impossible */\n  if (!f.file) {\n    throw error('no path on file specifier', { spec })\n  }\n  /* c8 ignore stop */\n\n  // Given that both linked folders and local tarballs (both defined with\n  // usage of the `file:` spec prefix) location needs to be relative to their\n  // parents, build the expected path and use it for both location and id\n  const target = scurry.cwd.resolve(fromNode.location).resolve(f.file)\n  const path = target.relativePosix()\n  const id = joinDepIDTuple(['file', path])\n\n  return {\n    path,\n    id,\n    isDirectory: !!target.lstatSync()?.isDirectory(),\n  }\n}\n\nconst isStringArray = (a: unknown): a is string[] =>\n  Array.isArray(a) && !a.some(b => typeof b !== 'string')\n\nexport const appendNodes = async (\n  add: Map<string, Dependency>,\n  packageInfo: PackageInfoClient,\n  graph: Graph,\n  fromNode: Node,\n  deps: Dependency[],\n  scurry: PathScurry,\n  options: SpecOptions,\n  seen: Set<DepID>,\n  modifiers?: GraphModifier,\n  modifierRefs?: Map<string, ModifierActiveEntry>,\n) => {\n  /* c8 ignore next */\n  if (seen.has(fromNode.id)) return\n  seen.add(fromNode.id)\n\n  await Promise.all(\n    deps.map(async ({ spec, type }) => {\n      // see if there's a satisfying node in the graph currently\n      const fileTypeInfo = getFileTypeInfo(spec, fromNode, scurry)\n      const activeModifier = modifierRefs?.get(spec.name)\n\n      // here is the place we swap specs if a edge modifier was defined\n      const queryModifier = activeModifier?.modifier.query\n      const completeModifier =\n        activeModifier &&\n        activeModifier.interactiveBreadcrumb.current ===\n          activeModifier.modifier.breadcrumb.last\n      if (\n        queryModifier &&\n        completeModifier &&\n        'spec' in activeModifier.modifier\n      ) {\n        spec = activeModifier.modifier.spec\n        if (spec.bareSpec === '-') {\n          return\n        }\n      }\n\n      const existingNode = graph.findResolution(\n        spec,\n        fromNode,\n        queryModifier,\n      )\n      if (existingNode) {\n        graph.addEdge(type, spec, fromNode, existingNode)\n        return\n      }\n\n      const edgeOptional =\n        type === 'optional' || type === 'peerOptional'\n      const mani = await packageInfo\n        .manifest(spec, { from: scurry.resolve(fromNode.location) })\n        .catch((er: unknown) => {\n          // optional deps ignored if inaccessible\n          if (edgeOptional || fromNode.optional) {\n            return undefined\n          }\n          throw er\n        })\n\n      // when an user is adding a nameless dependency, e.g: `github:foo/bar`,\n      // `file:./foo/bar`, we need to update the `add` option value to set the\n      // correct name once we have it, so that it can properly be stored in\n      // the `package.json` file at the end of reify.\n      if (mani?.name && spec.name === '(unknown)') {\n        const s = add.get(String(spec))\n        if (s) {\n          // removes the previous, placeholder entry key\n          add.delete(String(spec))\n          // replaces spec with a version with the correct name\n          spec = Spec.parse(mani.name, spec.bareSpec, options)\n          // updates the add map with the fixed up spec\n          const n = asDependency({\n            ...s,\n            spec,\n          })\n          add.set(mani.name, n)\n        }\n      }\n\n      if (!mani) {\n        if (!edgeOptional && fromNode.isOptional()) {\n          // failed resolution of a non-optional dep of an optional node\n          // have to clean up the dependents\n          removeOptionalSubgraph(graph, fromNode)\n          return\n        } else if (edgeOptional) {\n          // failed resolution of an optional dep, just ignore it,\n          // nothing to prune because we never added it in the first place.\n          return\n        } else {\n          throw error('failed to resolve dependency', {\n            spec,\n            from: fromNode.location,\n          })\n        }\n      }\n\n      const node = graph.placePackage(\n        fromNode,\n        type,\n        spec,\n        normalizeManifest(mani as Manifest),\n        fileTypeInfo?.id,\n        queryModifier,\n      )\n\n      /* c8 ignore start - not possible, already ensured manifest */\n      if (!node) {\n        throw error('failed to place package', {\n          from: fromNode.location,\n          spec,\n        })\n      }\n      /* c8 ignore stop */\n\n      if (activeModifier) {\n        modifiers?.updateActiveEntry(node, activeModifier)\n      }\n\n      if (fileTypeInfo?.path && fileTypeInfo.isDirectory) {\n        node.location = fileTypeInfo.path\n      }\n      node.setResolved()\n      const nestedAppends: Promise<unknown>[] = []\n\n      const bundleDeps = node.manifest?.bundleDependencies\n      const bundled = new Set<string>(\n        (\n          node.id.startsWith('git') ||\n          node.importer ||\n          !isStringArray(bundleDeps)\n        ) ?\n          []\n        : bundleDeps,\n      )\n\n      const nextDeps: Dependency[] = []\n\n      for (const depTypeName of longDependencyTypes) {\n        const depRecord: Record<string, string> | undefined =\n          mani[depTypeName]\n\n        if (depRecord && shouldInstallDepType(node, depTypeName)) {\n          for (const [name, bareSpec] of Object.entries(depRecord)) {\n            if (bundled.has(name)) continue\n            nextDeps.push({\n              type: shorten(depTypeName, name, mani),\n              spec: Spec.parse(name, bareSpec, {\n                ...options,\n                registry: spec.registry,\n              }),\n            })\n          }\n        }\n      }\n\n      if (nextDeps.length) {\n        nestedAppends.push(\n          appendNodes(\n            add,\n            packageInfo,\n            graph,\n            node,\n            nextDeps,\n            scurry,\n            options,\n            seen,\n            modifiers,\n            modifiers?.tryDependencies(node, nextDeps),\n          ),\n        )\n      }\n      await Promise.all(nestedAppends)\n    }),\n  )\n}\n"]}

package/dist/esm/ideal/build.d.ts

@@ -3,6 +3,10 @@ import type { LoadOptions as LoadActualOptions } from '../actual/load.ts';
 import type { AddImportersDependenciesMap, RemoveImportersDependenciesMap } from '../dependencies.ts';
 import type { Graph } from '../graph.ts';
 export type BuildIdealOptions = LoadActualOptions & {
+    /**
+     * An actual graph
+     */
+    actual?: Graph;
     /**
      * A `Map` in which keys are {@link DepID} linking to another `Map` in which
      * keys are the dependency names and values are {@link Dependency}. This

package/dist/esm/ideal/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/ideal/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,OAAO,KAAK,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,KAAK,EACV,2BAA2B,EAC3B,8BAA8B,EAE/B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AASxC,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG;IAClD;;;;;OAKG;IACH,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,YACP,iBAAiB,KACzB,OAAO,CAAC,KAAK,CAmCf,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/ideal/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,OAAO,KAAK,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,KAAK,EACV,2BAA2B,EAC3B,8BAA8B,EAE/B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AASxC,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG;IAClD;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAA;IACd;;;;;OAKG;IACH,GAAG,CAAC,EAAE,2BAA2B,CAAA;IACjC;;;;OAIG;IACH,MAAM,CAAC,EAAE,8BAA8B,CAAA;IACvC;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,YACP,iBAAiB,KACzB,OAAO,CAAC,KAAK,CAmCf,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/ideal/build.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAQtD,OAAO,EAAE,IAAI,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAA;AAElF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,GAAG,CAA0B,CAAK,EAAE,EAAE,CAChD,CAAC,IAAK,IAAI,GAAG,EAAQ,CAAA;AAsBvB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACxB,OAA0B,EACV,EAAE;IAClB,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAE/B,yDAAyD;IACzD,iDAAiD;IACjD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAC9D,MAAM,YAAY,GAChB,OAAO,CAAC,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC/D,IAAI,KAAK,CAAA;IACT,IAAI,CAAC;QACH,KAAK,GAAG,WAAW,CAAC;YAClB,GAAG,OAAO;YACV,YAAY;YACZ,QAAQ;YACR,iCAAiC,EAAE,IAAI;SACxC,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,UAAU,CAAC;YACjB,GAAG,OAAO;YACV,YAAY;YACZ,QAAQ;YACR,iCAAiC,EAAE,IAAI;SACxC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,2BAA2B,CAAC;QAC5C,GAAG,OAAO;QACV,MAAM;QACN,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QACxB,KAAK;QACL,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAC/B,CAAC,CAAA;IACF,IAAI,EAAE,CAAA;IACN,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA","sourcesContent":["import type { PackageInfoClient } from '@vltpkg/package-info'\nimport { load as loadActual } from '../actual/load.ts'\nimport type { LoadOptions as LoadActualOptions } from '../actual/load.ts'\nimport type {\n  AddImportersDependenciesMap,\n  RemoveImportersDependenciesMap,\n  Dependency,\n} from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport { load as loadVirtual } from '../lockfile/load.ts'\nimport { buildIdealFromStartingGraph } from './build-ideal-from-starting-graph.ts'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { graphStep } from '@vltpkg/output'\n\nconst getMap = <T extends Map<any, any>>(m?: T) =>\n  m ?? (new Map() as T)\n\nexport type BuildIdealOptions = LoadActualOptions & {\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   * A {@link PackageInfoClient} instance to read manifest info from.\n   */\n  packageInfo: PackageInfoClient\n}\n\n/**\n * Builds an ideal {@link Graph} representing the dependencies that\n * should be present in order to fulfill the requirements defined\n * by the `package.json` and `vlt-lock.json` files using either the\n * virtual or actual graph as a starting point. Also add / remove any\n * dependencies listed in the `add` and `remove` properties.\n */\nexport const build = async (\n  options: BuildIdealOptions,\n): Promise<Graph> => {\n  const done = graphStep('build')\n\n  // Creates the shared instances that are going to be used\n  // in both the loader methods and the build graph\n  const { packageInfo, packageJson, scurry, monorepo } = options\n  const mainManifest =\n    options.mainManifest ?? packageJson.read(options.projectRoot)\n  let graph\n  try {\n    graph = loadVirtual({\n      ...options,\n      mainManifest,\n      monorepo,\n      skipLoadingNodesOnModifiersChange: true,\n    })\n  } catch {\n    graph = loadActual({\n      ...options,\n      mainManifest,\n      monorepo,\n      skipLoadingNodesOnModifiersChange: true,\n    })\n  }\n\n  const res = await buildIdealFromStartingGraph({\n    ...options,\n    scurry,\n    add: getMap(options.add),\n    graph,\n    packageInfo,\n    remove: getMap(options.remove),\n  })\n  done()\n  return res\n}\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/ideal/build.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAQtD,OAAO,EAAE,IAAI,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAA;AAElF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,GAAG,CAA0B,CAAK,EAAE,EAAE,CAChD,CAAC,IAAK,IAAI,GAAG,EAAQ,CAAA;AA0BvB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACxB,OAA0B,EACV,EAAE;IAClB,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAE/B,yDAAyD;IACzD,iDAAiD;IACjD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAC9D,MAAM,YAAY,GAChB,OAAO,CAAC,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC/D,IAAI,KAAK,CAAA;IACT,IAAI,CAAC;QACH,KAAK,GAAG,WAAW,CAAC;YAClB,GAAG,OAAO;YACV,YAAY;YACZ,QAAQ;YACR,iCAAiC,EAAE,IAAI;SACxC,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,UAAU,CAAC;YACjB,GAAG,OAAO;YACV,YAAY;YACZ,QAAQ;YACR,iCAAiC,EAAE,IAAI;SACxC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,2BAA2B,CAAC;QAC5C,GAAG,OAAO;QACV,MAAM;QACN,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;QACxB,KAAK;QACL,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAC/B,CAAC,CAAA;IACF,IAAI,EAAE,CAAA;IACN,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA","sourcesContent":["import type { PackageInfoClient } from '@vltpkg/package-info'\nimport { load as loadActual } from '../actual/load.ts'\nimport type { LoadOptions as LoadActualOptions } from '../actual/load.ts'\nimport type {\n  AddImportersDependenciesMap,\n  RemoveImportersDependenciesMap,\n  Dependency,\n} from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport { load as loadVirtual } from '../lockfile/load.ts'\nimport { buildIdealFromStartingGraph } from './build-ideal-from-starting-graph.ts'\nimport type { DepID } from '@vltpkg/dep-id'\nimport { graphStep } from '@vltpkg/output'\n\nconst getMap = <T extends Map<any, any>>(m?: T) =>\n  m ?? (new Map() as T)\n\nexport type BuildIdealOptions = LoadActualOptions & {\n  /**\n   * An actual graph\n   */\n  actual?: Graph\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   * A {@link PackageInfoClient} instance to read manifest info from.\n   */\n  packageInfo: PackageInfoClient\n}\n\n/**\n * Builds an ideal {@link Graph} representing the dependencies that\n * should be present in order to fulfill the requirements defined\n * by the `package.json` and `vlt-lock.json` files using either the\n * virtual or actual graph as a starting point. Also add / remove any\n * dependencies listed in the `add` and `remove` properties.\n */\nexport const build = async (\n  options: BuildIdealOptions,\n): Promise<Graph> => {\n  const done = graphStep('build')\n\n  // Creates the shared instances that are going to be used\n  // in both the loader methods and the build graph\n  const { packageInfo, packageJson, scurry, monorepo } = options\n  const mainManifest =\n    options.mainManifest ?? packageJson.read(options.projectRoot)\n  let graph\n  try {\n    graph = loadVirtual({\n      ...options,\n      mainManifest,\n      monorepo,\n      skipLoadingNodesOnModifiersChange: true,\n    })\n  } catch {\n    graph = loadActual({\n      ...options,\n      mainManifest,\n      monorepo,\n      skipLoadingNodesOnModifiersChange: true,\n    })\n  }\n\n  const res = await buildIdealFromStartingGraph({\n    ...options,\n    scurry,\n    add: getMap(options.add),\n    graph,\n    packageInfo,\n    remove: getMap(options.remove),\n  })\n  done()\n  return res\n}\n"]}

package/dist/esm/index.d.ts

@@ -20,7 +20,7 @@ import type { LoadOptions as LockfileLoadOptions } from './lockfile/load.ts';
 export declare const lockfile: {
     load: (options: LockfileLoadOptions) => import("./graph.ts").Graph;
     loadEdges: (graph: import("./types.ts").GraphLike, edges: import("./lockfile/types.ts").LockfileData["edges"], options: import("@vltpkg/spec").SpecOptions) => void;
-    loadNodes: (graph: import("./types.ts").GraphLike, nodes: import("./lockfile/types.ts").LockfileData["nodes"]) => void;
+    loadNodes: (graph: import("./types.ts").GraphLike, nodes: import("./lockfile/types.ts").LockfileData["nodes"], actual?: import("./types.ts").GraphLike) => void;
     save: (options: Omit<import("./lockfile/save.ts").SaveOptions, "saveManifests">) => void;
 };
 export type { ActualLoadOptions, LockfileLoadOptions };

package/dist/esm/install.d.ts

@@ -3,6 +3,7 @@ import type { LoadOptions } from './actual/load.ts';
 import type { AddImportersDependenciesMap } from './dependencies.ts';
 export type InstallOptions = LoadOptions & {
     packageInfo: PackageInfoClient;
+    cleanInstall?: boolean;
 };
 export declare const install: (options: InstallOptions, add?: AddImportersDependenciesMap) => Promise<{
     graph: import("./graph.ts").Graph;

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

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/install.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAA;AAEpE,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IACzC,WAAW,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAED,eAAO,MAAM,OAAO,YACT,cAAc,QACjB,2BAA2B;;;EAwClC,CAAA"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/install.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEnD,OAAO,KAAK,EACV,2BAA2B,EAE5B,MAAM,mBAAmB,CAAA;AAQ1B,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IACzC,WAAW,EAAE,iBAAiB,CAAA;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,OAAO,YACT,cAAc,QACjB,2BAA2B;;;EA4KlC,CAAA"}

package/dist/esm/install.js

@@ -3,8 +3,23 @@ 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) => {
+    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);
@@ -20,28 +35,115 @@ export const install = async (options, add) => {
             throw err;
         }
     }
-    const modifiers = GraphModifier.maybeLoad(options);
-    const graph = await idealBuild({
-        ...options,
-        add,
-        mainManifest,
-        loadManifests: true,
-        modifiers,
-    });
-    const act = actualLoad({
-        ...options,
-        mainManifest,
-        loadManifests: true,
-        modifiers: undefined, // modifiers should not be used here
-    });
-    const diff = await reify({
-        ...options,
-        add,
-        actual: act,
-        graph,
-        loadManifests: true,
-        modifiers,
-    });
-    return { graph, diff };
+    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":"AAAA,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAUvC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,OAAuB,EACvB,GAAiC,EACjC,EAAE;IACF,IAAI,YAAY,GAAyB,SAAS,CAAA;IAClD,IAAI,CAAC;QACH,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC9D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,KAAK,kCAAkC,EAAE,CAAC;YAChE,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;YACxC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAC3D,MAAM,EAAE,IAAI;aACb,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IACD,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAElD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC;QAC7B,GAAG,OAAO;QACV,GAAG;QACH,YAAY;QACZ,aAAa,EAAE,IAAI;QACnB,SAAS;KACV,CAAC,CAAA;IACF,MAAM,GAAG,GAAG,UAAU,CAAC;QACrB,GAAG,OAAO;QACV,YAAY;QACZ,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,SAAS,EAAE,oCAAoC;KAC3D,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC;QACvB,GAAG,OAAO;QACV,GAAG;QACH,MAAM,EAAE,GAAG;QACX,KAAK;QACL,aAAa,EAAE,IAAI;QACnB,SAAS;KACV,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;AACxB,CAAC,CAAA","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 { asError } from '@vltpkg/types'\nimport type { Manifest } from '@vltpkg/types'\nimport type { PackageInfoClient } from '@vltpkg/package-info'\nimport type { LoadOptions } from './actual/load.ts'\nimport type { AddImportersDependenciesMap } from './dependencies.ts'\n\nexport type InstallOptions = LoadOptions & {\n  packageInfo: PackageInfoClient\n}\n\nexport const install = async (\n  options: InstallOptions,\n  add?: AddImportersDependenciesMap,\n) => {\n  let mainManifest: Manifest | 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  const modifiers = GraphModifier.maybeLoad(options)\n\n  const graph = await idealBuild({\n    ...options,\n    add,\n    mainManifest,\n    loadManifests: true,\n    modifiers,\n  })\n  const act = actualLoad({\n    ...options,\n    mainManifest,\n    loadManifests: true,\n    modifiers: undefined, // modifiers should not be used here\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}\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,SAuD7B,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,6 +1,6 @@
 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
@@ -8,13 +8,19 @@ export const loadNodes = (graph, nodes) => {
         if (graph.nodes.has(id))
             continue;
         const [flags, name, integrity, resolved, location, manifest, rawManifest,] = lockfileNode;
-        const [type, , maybeExtra, lastExtra] = splitDepID(id);
+        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)
+        const node = mani ?
+            graph.addNode(id, mani)
             : graph.addNode(id, undefined, undefined, name ?? undefined, (type === 'registry' &&
                 registrySpec &&
                 registrySpec.indexOf('@') > 0) ?
@@ -26,14 +32,21 @@ export const loadNodes = (graph, nodes) => {
         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;
-        if (manifest && rawManifest) {
-            node.setConfusedManifest(manifest, rawManifest);
+        }
+        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);
         }
     }
 };

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,CACJ,KAAK,EACL,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,WAAW,EACZ,GAAG,YAAY,CAAA;QAChB,MAAM,CAAC,IAAI,EAAE,AAAD,EAAG,UAAU,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAA;QACtD,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,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,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,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;QACtC,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;YAC5B,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QACjD,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) => {\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, , maybeExtra, lastExtra] = splitDepID(id)\n    const extra =\n      type === 'registry' || type === 'git' ? lastExtra : maybeExtra\n    const registrySpec = maybeExtra\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          (\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 ?? undefined\n    node.resolved = resolved ?? undefined\n    if (!node.resolved) node.setResolved()\n    if (location) node.location = location\n    if (manifest && rawManifest) {\n      node.setConfusedManifest(manifest, rawManifest)\n    }\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

@@ -2,11 +2,15 @@ import { PackageJson } from '@vltpkg/package-json';
 import { Monorepo } from '@vltpkg/workspaces';
 import { Graph } from '../graph.ts';
 import type { PathScurry } from 'path-scurry';
-import type { Manifest } from '@vltpkg/types';
+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.
      */
@@ -14,7 +18,7 @@ export type LoadOptions = SpecOptions & {
     /**
      * The project root manifest.
      */
-    mainManifest: Manifest;
+    mainManifest: NormalizedManifest;
     /**
      * The graph modifiers helper object.
      */
@@ -38,5 +42,5 @@ export type LoadOptions = SpecOptions & {
 };
 export declare const load: (options: LoadOptions) => Graph;
 export declare const loadHidden: (options: LoadOptions) => Graph;
-export declare const loadObject: (options: LoadOptions, lockfileData: Omit<LockfileData, "options"> & Partial<Pick<LockfileData, "options">>) => 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,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,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,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,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;IACtB;;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,CAAC,GACzC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,UAoEzC,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

@@ -58,9 +58,16 @@ export const loadObject = (options, lockfileData) => {
     const modifiersChanged = lockfileModifiers !== optionsModifiers;
     const shouldLoadDependencies = !(skipLoadingNodesOnModifiersChange && modifiersChanged);
     if (shouldLoadDependencies) {
-        loadNodes(graph, lockfileData.nodes);
+        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":"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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 { Manifest } 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   * The project root dirname.\n   */\n  projectRoot: string\n  /**\n   * The project root manifest.\n   */\n  mainManifest: Manifest\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'> &\n    Partial<Pick<LockfileData, 'options'>>,\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)\n    loadEdges(graph, lockfileData.edges, mergedOptions)\n  }\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.map

@@ -1 +1 @@
-{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../../src/lockfile/save.ts"],"names":[],"mappings":"AAaA,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;AA+FD,eAAO,MAAM,YAAY,qNAYtB,WAAW,KAAG,YAwDhB,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"}
+{"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,4 @@
-import { isRecordStringString } from '@vltpkg/types';
+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';
@@ -14,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);
@@ -32,10 +28,10 @@ const formatNodes = (nodes, saveManifests, registry) => {
         if (location) {
             lockfileNode[4] = location;
         }
-        if (saveManifests) {
-            lockfileNode[5] = node.manifest;
-            if (node.confused) {
-                lockfileNode[6] = node.rawManifest;
+        if (saveManifests && node.manifest) {
+            lockfileNode[5] = expandNormalizedManifestSymbols(node.manifest);
+            if (node.confused && node.rawManifest) {
+                lockfileNode[6] = expandNormalizedManifestSymbols(node.rawManifest);
             }
         }
         res[node.id] = lockfileNode;
@@ -85,6 +81,7 @@ export const lockfileData = ({ graph, catalog, catalogs, 'git-hosts': gitHosts,
         : undefined;
     const hasItems = (clean) => clean && Object.keys(clean).length;
     return {
+        lockfileVersion: 0,
         options: {
             ...(hasItems(cleanModifiers) ?
                 { modifiers: cleanModifiers }