@vltpkg/graph 0.0.0-11 → 0.0.0-13

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

@@ -29,5 +29,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: LockfileData) => Graph;
+export declare const loadObject: (options: LoadOptions, lockfileData: Omit<LockfileData, "options"> & Partial<Pick<LockfileData, "options">>) => 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,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,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,GACzC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,UA4CzC,CAAA"}

package/dist/esm/lockfile/load.js

@@ -21,9 +21,7 @@ export const loadObject = (options, lockfileData) => {
     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 { 'scope-registries': scopeRegistries, registry, registries, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, } = lockfileData.options ?? {};
     const mergedOptions = {
         ...options,
         'scope-registries': {

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":"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,YACwC,EACxC,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,GACrC,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: Omit<LockfileData, 'options'> &\n    Partial<Pick<LockfileData, 'options'>>,\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  } = 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"]}

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

@@ -11,7 +11,7 @@ export type SaveOptions = SpecOptions & {
      */
     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, "git-hosts": gitHosts, "git-host-archives": gitHostArchives, 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: Omit<SaveOptions, "saveManifests">) => void;
 export declare const saveHidden: (options: Omit<SaveOptions, "saveManifests">) => void;

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;AAoGD,eAAO,MAAM,YAAY,sJAQtB,WAAW,KAAG,YAwChB,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":"AASA,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;AAoGD,eAAO,MAAM,YAAY,uLAStB,WAAW,KAAG,YA+ChB,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 { defaultRegistry, defaultRegistries, defaultGitHosts, defaultGitHostArchives, defaultScopeRegistries, } from '@vltpkg/spec';
+import { defaultRegistry, defaultRegistries, defaultGitHosts, defaultGitHostArchives, defaultScopeRegistries, defaultJsrRegistries, } from '@vltpkg/spec';
 import { mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { getFlagNumFromNode } from "./types.js";
@@ -64,7 +64,7 @@ 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, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, registry, registries, saveManifests, 'scope-registries': scopeRegistries, 'jsr-registries': jsrRegistries, }) => {
     const cleanGitHosts = isRecordStringString(gitHosts) ?
         removeDefaultItems(defaultGitHosts, gitHosts)
         : undefined;
@@ -77,12 +77,18 @@ export const lockfileData = ({ graph, 'git-hosts': gitHosts, 'git-host-archives'
     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 {
         options: {
             ...(hasItems(cleanScopeRegistries) ?
                 { 'scope-registries': cleanScopeRegistries }
                 : undefined),
+            ...(hasItems(cleanJsrRegistries) ?
+                { 'jsr-registries': cleanJsrRegistries }
+                : undefined),
             ...(registry !== undefined && registry !== defaultRegistry ?
                 { registry }
                 : undefined),

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

@@ -1 +1 @@
-{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../src/lockfile/save.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport {\n  defaultRegistry,\n  defaultRegistries,\n  defaultGitHosts,\n  defaultGitHostArchives,\n  defaultScopeRegistries,\n} from '@vltpkg/spec'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport { mkdirSync, writeFileSync } from 'node:fs'\nimport { dirname, resolve } from 'node:path'\nimport type { Edge } from '../edge.ts'\nimport type { Graph } from '../graph.ts'\nimport type { Node } from '../node.ts'\nimport { getFlagNumFromNode } from './types.ts'\nimport type {\n  LockfileData,\n  LockfileEdgeKey,\n  LockfileEdges,\n  LockfileEdgeValue,\n  LockfileNode,\n} from './types.ts'\n\nexport type SaveOptions = SpecOptions & {\n  /**\n   * The graph to be stored in the lockfile.\n   */\n  graph: Graph\n  /**\n   * Should it save manifest data in the lockfile?\n   */\n  saveManifests?: boolean\n}\n\nconst formatNodes = (\n  nodes: Iterable<Node>,\n  saveManifests?: boolean,\n  registry?: string,\n) => {\n  // we do not store importers in the lockfile, though we do store\n  // their edges. when we load, we always read workspaces/main fresh.\n  const arr: Node[] = [...nodes].filter(node => !node.importer)\n  // nodes are sorted in order to have a deterministic result\n  const orderedNodes: Node[] = arr.sort((a, b) =>\n    a.id.localeCompare(b.id, 'en'),\n  )\n\n  const res: Record<DepID, LockfileNode> = {}\n  for (const node of orderedNodes) {\n    const customRegistry =\n      node.resolved && registry && !node.resolved.startsWith(registry)\n    const resolved = customRegistry ? node.resolved : undefined\n    // if it's in a location other than the default, stash that\n    const location =\n      (\n        node.id.startsWith('file') ||\n        node.location.endsWith(\n          '/node_modules/.vlt/' +\n            node.id +\n            '/node_modules/' +\n            node.name,\n        )\n      ) ?\n        undefined\n      : node.location\n\n    const flags = getFlagNumFromNode(node)\n    const lockfileNode: LockfileNode = [flags, node.name]\n\n    if (node.integrity) {\n      lockfileNode[2] = node.integrity\n    }\n\n    if (resolved) {\n      lockfileNode[3] = resolved\n    }\n\n    if (location) {\n      lockfileNode[4] = location\n    }\n\n    if (saveManifests) {\n      lockfileNode[5] = node.manifest\n\n      if (node.confused) {\n        lockfileNode[6] = node.rawManifest\n      }\n    }\n\n    res[node.id] = lockfileNode\n  }\n  return res\n}\n\nconst formatEdges = (edges: Set<Edge>): LockfileEdges =>\n  Object.fromEntries(\n    [...edges]\n      .sort(\n        (a, b) =>\n          /* c8 ignore start - nondeterminstic and annoying to test */\n          // sort importers to the top, then alphabetically by\n          // id, type, target\n          Number(b.from.importer) - Number(a.from.importer) ||\n          a.from.id.localeCompare(b.from.id, 'en') ||\n          a.type.localeCompare(b.type, 'en') ||\n          (a.to?.id ?? '').localeCompare(b.to?.id ?? ''),\n        /* c8 ignore stop */\n      )\n      .map((edge): [LockfileEdgeKey, LockfileEdgeValue] => [\n        `${edge.from.id} ${edge.spec.name}`,\n        `${edge.type} ${edge.spec.bareSpec || '*'} ${edge.to?.id ?? 'MISSING'}`,\n      ]),\n  )\n\nconst isRecordStringString = (\n  registries: unknown,\n): registries is Record<string, string> =>\n  !(!registries || typeof registries === 'string')\n\nconst removeDefaultItems = (\n  defaultItems: Record<string, string>,\n  items: Record<string, string>,\n) => {\n  const res: Record<string, string> = {}\n  for (const [key, value] of Object.entries(items)) {\n    if (!defaultItems[key] || defaultItems[key] !== value) {\n      res[key] = value\n    }\n  }\n  return res\n}\n\nexport const lockfileData = ({\n  graph,\n  'git-hosts': gitHosts,\n  'git-host-archives': gitHostArchives,\n  registry,\n  registries,\n  saveManifests,\n  'scope-registries': scopeRegistries,\n}: SaveOptions): LockfileData => {\n  const cleanGitHosts =\n    isRecordStringString(gitHosts) ?\n      removeDefaultItems(defaultGitHosts, gitHosts)\n    : undefined\n  const cleanGitHostArchives =\n    isRecordStringString(gitHostArchives) ?\n      removeDefaultItems(defaultGitHostArchives, gitHostArchives)\n    : undefined\n  const cleanRegistries =\n    isRecordStringString(registries) ?\n      removeDefaultItems(defaultRegistries, registries)\n    : undefined\n  const cleanScopeRegistries =\n    isRecordStringString(scopeRegistries) ?\n      removeDefaultItems(defaultScopeRegistries, scopeRegistries)\n    : undefined\n  const hasItems = (clean: Record<string, string> | undefined) =>\n    clean && Object.keys(clean).length\n  return {\n    options: {\n      ...(hasItems(cleanScopeRegistries) ?\n        { 'scope-registries': cleanScopeRegistries }\n      : undefined),\n      ...(registry !== undefined && registry !== defaultRegistry ?\n        { registry }\n      : undefined),\n      ...(hasItems(registries) ?\n        { registries: cleanRegistries }\n      : undefined),\n      ...(hasItems(cleanGitHosts) ?\n        { 'git-hosts': cleanGitHosts }\n      : undefined),\n      ...(hasItems(cleanGitHostArchives) ?\n        { 'git-host-archives': cleanGitHostArchives }\n      : undefined),\n    },\n    nodes: formatNodes(graph.nodes.values(), saveManifests, registry),\n    edges: formatEdges(graph.edges),\n  }\n}\n\n// renders each node / edge as a single line entry\nconst extraFormat = (jsonString: string) => {\n  const str = `${jsonString}\\n`\n  const [init, ...parts] = str.split('  \"nodes\": {')\n  const res = [init]\n  for (const part of parts) {\n    res.push(\n      part.replaceAll('\\n      ', '').replaceAll('\\n    ]', ']'),\n    )\n  }\n  return res.join('  \"nodes\": {')\n}\n\nexport const saveData = (\n  data: LockfileData,\n  fileName: string,\n  saveManifests = false,\n): void => {\n  const json = JSON.stringify(data, null, 2)\n  const content = saveManifests ? json : extraFormat(json)\n  writeFileSync(fileName, content)\n}\n\nexport const save = (\n  options: Omit<SaveOptions, 'saveManifests'>,\n): void => {\n  const { graph } = options\n  const data = lockfileData({ ...options, saveManifests: false })\n  const fileName = resolve(graph.projectRoot, 'vlt-lock.json')\n  saveData(data, fileName, false)\n}\n\nexport const saveHidden = (\n  options: Omit<SaveOptions, 'saveManifests'>,\n): void => {\n  const { graph } = options\n  const data = lockfileData({ ...options, saveManifests: true })\n  const fileName = resolve(\n    graph.projectRoot,\n    'node_modules/.vlt-lock.json',\n  )\n  mkdirSync(dirname(fileName), { recursive: true })\n  saveData(data, fileName, true)\n}\n"]}
+{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../src/lockfile/save.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport {\n  defaultRegistry,\n  defaultRegistries,\n  defaultGitHosts,\n  defaultGitHostArchives,\n  defaultScopeRegistries,\n  defaultJsrRegistries,\n} from '@vltpkg/spec'\nimport type { SpecOptions } from '@vltpkg/spec'\nimport { mkdirSync, writeFileSync } from 'node:fs'\nimport { dirname, resolve } from 'node:path'\nimport type { Edge } from '../edge.ts'\nimport type { Graph } from '../graph.ts'\nimport type { Node } from '../node.ts'\nimport { getFlagNumFromNode } from './types.ts'\nimport type {\n  LockfileData,\n  LockfileEdgeKey,\n  LockfileEdges,\n  LockfileEdgeValue,\n  LockfileNode,\n} from './types.ts'\n\nexport type SaveOptions = SpecOptions & {\n  /**\n   * The graph to be stored in the lockfile.\n   */\n  graph: Graph\n  /**\n   * Should it save manifest data in the lockfile?\n   */\n  saveManifests?: boolean\n}\n\nconst formatNodes = (\n  nodes: Iterable<Node>,\n  saveManifests?: boolean,\n  registry?: string,\n) => {\n  // we do not store importers in the lockfile, though we do store\n  // their edges. when we load, we always read workspaces/main fresh.\n  const arr: Node[] = [...nodes].filter(node => !node.importer)\n  // nodes are sorted in order to have a deterministic result\n  const orderedNodes: Node[] = arr.sort((a, b) =>\n    a.id.localeCompare(b.id, 'en'),\n  )\n\n  const res: Record<DepID, LockfileNode> = {}\n  for (const node of orderedNodes) {\n    const customRegistry =\n      node.resolved && registry && !node.resolved.startsWith(registry)\n    const resolved = customRegistry ? node.resolved : undefined\n    // if it's in a location other than the default, stash that\n    const location =\n      (\n        node.id.startsWith('file') ||\n        node.location.endsWith(\n          '/node_modules/.vlt/' +\n            node.id +\n            '/node_modules/' +\n            node.name,\n        )\n      ) ?\n        undefined\n      : node.location\n\n    const flags = getFlagNumFromNode(node)\n    const lockfileNode: LockfileNode = [flags, node.name]\n\n    if (node.integrity) {\n      lockfileNode[2] = node.integrity\n    }\n\n    if (resolved) {\n      lockfileNode[3] = resolved\n    }\n\n    if (location) {\n      lockfileNode[4] = location\n    }\n\n    if (saveManifests) {\n      lockfileNode[5] = node.manifest\n\n      if (node.confused) {\n        lockfileNode[6] = node.rawManifest\n      }\n    }\n\n    res[node.id] = lockfileNode\n  }\n  return res\n}\n\nconst formatEdges = (edges: Set<Edge>): LockfileEdges =>\n  Object.fromEntries(\n    [...edges]\n      .sort(\n        (a, b) =>\n          /* c8 ignore start - nondeterminstic and annoying to test */\n          // sort importers to the top, then alphabetically by\n          // id, type, target\n          Number(b.from.importer) - Number(a.from.importer) ||\n          a.from.id.localeCompare(b.from.id, 'en') ||\n          a.type.localeCompare(b.type, 'en') ||\n          (a.to?.id ?? '').localeCompare(b.to?.id ?? ''),\n        /* c8 ignore stop */\n      )\n      .map((edge): [LockfileEdgeKey, LockfileEdgeValue] => [\n        `${edge.from.id} ${edge.spec.name}`,\n        `${edge.type} ${edge.spec.bareSpec || '*'} ${edge.to?.id ?? 'MISSING'}`,\n      ]),\n  )\n\nconst isRecordStringString = (\n  registries: unknown,\n): registries is Record<string, string> =>\n  !(!registries || typeof registries === 'string')\n\nconst removeDefaultItems = (\n  defaultItems: Record<string, string>,\n  items: Record<string, string>,\n) => {\n  const res: Record<string, string> = {}\n  for (const [key, value] of Object.entries(items)) {\n    if (!defaultItems[key] || defaultItems[key] !== value) {\n      res[key] = value\n    }\n  }\n  return res\n}\n\nexport const lockfileData = ({\n  graph,\n  'git-hosts': gitHosts,\n  'git-host-archives': gitHostArchives,\n  registry,\n  registries,\n  saveManifests,\n  'scope-registries': scopeRegistries,\n  'jsr-registries': jsrRegistries,\n}: SaveOptions): LockfileData => {\n  const cleanGitHosts =\n    isRecordStringString(gitHosts) ?\n      removeDefaultItems(defaultGitHosts, gitHosts)\n    : undefined\n  const cleanGitHostArchives =\n    isRecordStringString(gitHostArchives) ?\n      removeDefaultItems(defaultGitHostArchives, gitHostArchives)\n    : undefined\n  const cleanRegistries =\n    isRecordStringString(registries) ?\n      removeDefaultItems(defaultRegistries, registries)\n    : undefined\n  const cleanScopeRegistries =\n    isRecordStringString(scopeRegistries) ?\n      removeDefaultItems(defaultScopeRegistries, scopeRegistries)\n    : undefined\n  const cleanJsrRegistries =\n    isRecordStringString(jsrRegistries) ?\n      removeDefaultItems(defaultJsrRegistries, jsrRegistries)\n    : undefined\n  const hasItems = (clean: Record<string, string> | undefined) =>\n    clean && Object.keys(clean).length\n  return {\n    options: {\n      ...(hasItems(cleanScopeRegistries) ?\n        { 'scope-registries': cleanScopeRegistries }\n      : undefined),\n      ...(hasItems(cleanJsrRegistries) ?\n        { 'jsr-registries': cleanJsrRegistries }\n      : undefined),\n      ...(registry !== undefined && registry !== defaultRegistry ?\n        { registry }\n      : undefined),\n      ...(hasItems(registries) ?\n        { registries: cleanRegistries }\n      : undefined),\n      ...(hasItems(cleanGitHosts) ?\n        { 'git-hosts': cleanGitHosts }\n      : undefined),\n      ...(hasItems(cleanGitHostArchives) ?\n        { 'git-host-archives': cleanGitHostArchives }\n      : undefined),\n    },\n    nodes: formatNodes(graph.nodes.values(), saveManifests, registry),\n    edges: formatEdges(graph.edges),\n  }\n}\n\n// renders each node / edge as a single line entry\nconst extraFormat = (jsonString: string) => {\n  const str = `${jsonString}\\n`\n  const [init, ...parts] = str.split('  \"nodes\": {')\n  const res = [init]\n  for (const part of parts) {\n    res.push(\n      part.replaceAll('\\n      ', '').replaceAll('\\n    ]', ']'),\n    )\n  }\n  return res.join('  \"nodes\": {')\n}\n\nexport const saveData = (\n  data: LockfileData,\n  fileName: string,\n  saveManifests = false,\n): void => {\n  const json = JSON.stringify(data, null, 2)\n  const content = saveManifests ? json : extraFormat(json)\n  writeFileSync(fileName, content)\n}\n\nexport const save = (\n  options: Omit<SaveOptions, 'saveManifests'>,\n): void => {\n  const { graph } = options\n  const data = lockfileData({ ...options, saveManifests: false })\n  const fileName = resolve(graph.projectRoot, 'vlt-lock.json')\n  saveData(data, fileName, false)\n}\n\nexport const saveHidden = (\n  options: Omit<SaveOptions, 'saveManifests'>,\n): void => {\n  const { graph } = options\n  const data = lockfileData({ ...options, saveManifests: true })\n  const fileName = resolve(\n    graph.projectRoot,\n    'node_modules/.vlt-lock.json',\n  )\n  mkdirSync(dirname(fileName), { recursive: true })\n  saveData(data, fileName, true)\n}\n"]}

package/dist/esm/reify/calculate-save-value.d.ts

@@ -0,0 +1,3 @@
+import type { Spec } from '@vltpkg/spec';
+export declare const calculateSaveValue: (nodeType: string, spec: Spec, existing: string | undefined, nodeVersion: string | undefined) => string;
+//# sourceMappingURL=calculate-save-value.d.ts.map

package/dist/esm/reify/calculate-save-value.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculate-save-value.d.ts","sourceRoot":"","sources":["../../../src/reify/calculate-save-value.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAGxC,eAAO,MAAM,kBAAkB,aACnB,MAAM,QACV,IAAI,YACA,MAAM,GAAG,SAAS,eACf,MAAM,GAAG,SAAS,KAC9B,MAoDF,CAAA"}

package/dist/esm/reify/calculate-save-value.js

@@ -0,0 +1,45 @@
+const SAVE_PREFIX = '^';
+export const calculateSaveValue = (nodeType, spec, existing, nodeVersion) => {
+    if (
+    // if not from the registry, save whatever we requested
+    nodeType === 'registry' &&
+        // if we installed exactly what we already wanted, leave it untouched
+        spec.bareSpec !== existing &&
+        // if we installed a specific version, keep that specific version.
+        !spec.final.range?.isSingle) {
+        // if we had a single version, and got that version, then
+        // leave it as-is.
+        if (existing && existing === nodeVersion) {
+            // depend on 1.2.3, got 1.2.3, keep unchanged
+            return existing;
+        }
+        else if (existing && !spec.bareSpec) {
+            // if we had `"express": "5.1"` and did `vlt i express`,
+            // then leave it as-is, because we just installed our pj dep
+            return existing;
+        }
+        else {
+            const finalRange = (spec.final.semver && spec.final.bareSpec) ||
+                `${SAVE_PREFIX}${nodeVersion}`;
+            // didn't have dep previously, or depended on a different thing
+            // than what was requested. Update with the ^ range based on
+            // the node that landed in the graph, but preserve alias prefix
+            if (spec.subspec && spec.final.namedRegistry) {
+                return `${spec.final.namedRegistry}:${spec.final.name}@${finalRange}`;
+            }
+            if (spec.final.namedJsrRegistry) {
+                // if we were given an alternative name, preserve that
+                // do this with a regexp because the Spec objects get a little
+                // weird here, and the string is relatively straightforward.
+                return spec.bareSpec
+                    .replace(new RegExp(`^(?:.*?@)?${spec.final.namedJsrRegistry}:(@[^/]+/[^@]+)(@.*?)?$`), `${spec.final.namedJsrRegistry}:$1@${finalRange}`)
+                    .replace(
+                // otherwise, swap out the final version for the save range
+                new RegExp(`^(?:.*?@)?${spec.final.namedJsrRegistry}:([^@].*?)?$`), `${spec.final.namedJsrRegistry}:${finalRange}`);
+            }
+            return finalRange;
+        }
+    }
+    return spec.bareSpec;
+};
+//# sourceMappingURL=calculate-save-value.js.map

package/dist/esm/reify/calculate-save-value.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculate-save-value.js","sourceRoot":"","sources":["../../../src/reify/calculate-save-value.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,GAAG,GAAG,CAAA;AAEvB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAAgB,EAChB,IAAU,EACV,QAA4B,EAC5B,WAA+B,EACvB,EAAE;IACV;IACE,uDAAuD;IACvD,QAAQ,KAAK,UAAU;QACvB,qEAAqE;QACrE,IAAI,CAAC,QAAQ,KAAK,QAAQ;QAC1B,kEAAkE;QAClE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAC3B,CAAC;QACD,yDAAyD;QACzD,kBAAkB;QAClB,IAAI,QAAQ,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;YACzC,6CAA6C;YAC7C,OAAO,QAAQ,CAAA;QACjB,CAAC;aAAM,IAAI,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,wDAAwD;YACxD,4DAA4D;YAC5D,OAAO,QAAQ,CAAA;QACjB,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GACd,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAC1C,GAAG,WAAW,GAAG,WAAW,EAAE,CAAA;YAChC,+DAA+D;YAC/D,4DAA4D;YAC5D,+DAA+D;YAC/D,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAC7C,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,UAAU,EAAE,CAAA;YACvE,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAChC,sDAAsD;gBACtD,8DAA8D;gBAC9D,4DAA4D;gBAC5D,OAAO,IAAI,CAAC,QAAQ;qBACjB,OAAO,CACN,IAAI,MAAM,CACR,aAAa,IAAI,CAAC,KAAK,CAAC,gBAAgB,yBAAyB,CAClE,EACD,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,OAAO,UAAU,EAAE,CAClD;qBACA,OAAO;gBACN,2DAA2D;gBAC3D,IAAI,MAAM,CACR,aAAa,IAAI,CAAC,KAAK,CAAC,gBAAgB,cAAc,CACvD,EACD,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,UAAU,EAAE,CAC/C,CAAA;YACL,CAAC;YACD,OAAO,UAAU,CAAA;QACnB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,CAAA;AACtB,CAAC,CAAA","sourcesContent":["import type { Spec } from '@vltpkg/spec'\nconst SAVE_PREFIX = '^'\n\nexport const calculateSaveValue = (\n  nodeType: string,\n  spec: Spec,\n  existing: string | undefined,\n  nodeVersion: string | undefined,\n): string => {\n  if (\n    // if not from the registry, save whatever we requested\n    nodeType === 'registry' &&\n    // if we installed exactly what we already wanted, leave it untouched\n    spec.bareSpec !== existing &&\n    // if we installed a specific version, keep that specific version.\n    !spec.final.range?.isSingle\n  ) {\n    // if we had a single version, and got that version, then\n    // leave it as-is.\n    if (existing && existing === nodeVersion) {\n      // depend on 1.2.3, got 1.2.3, keep unchanged\n      return existing\n    } else if (existing && !spec.bareSpec) {\n      // if we had `\"express\": \"5.1\"` and did `vlt i express`,\n      // then leave it as-is, because we just installed our pj dep\n      return existing\n    } else {\n      const finalRange =\n        (spec.final.semver && spec.final.bareSpec) ||\n        `${SAVE_PREFIX}${nodeVersion}`\n      // didn't have dep previously, or depended on a different thing\n      // than what was requested. Update with the ^ range based on\n      // the node that landed in the graph, but preserve alias prefix\n      if (spec.subspec && spec.final.namedRegistry) {\n        return `${spec.final.namedRegistry}:${spec.final.name}@${finalRange}`\n      }\n\n      if (spec.final.namedJsrRegistry) {\n        // if we were given an alternative name, preserve that\n        // do this with a regexp because the Spec objects get a little\n        // weird here, and the string is relatively straightforward.\n        return spec.bareSpec\n          .replace(\n            new RegExp(\n              `^(?:.*?@)?${spec.final.namedJsrRegistry}:(@[^/]+/[^@]+)(@.*?)?$`,\n            ),\n            `${spec.final.namedJsrRegistry}:$1@${finalRange}`,\n          )\n          .replace(\n            // otherwise, swap out the final version for the save range\n            new RegExp(\n              `^(?:.*?@)?${spec.final.namedJsrRegistry}:([^@].*?)?$`,\n            ),\n            `${spec.final.namedJsrRegistry}:${finalRange}`,\n          )\n      }\n      return finalRange\n    }\n  }\n  return spec.bareSpec\n}\n"]}

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

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

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

@@ -2,7 +2,7 @@ import { splitDepID } from '@vltpkg/dep-id';
 import { error } from '@vltpkg/error-cause';
 import { longDependencyTypes } from '@vltpkg/types';
 import { resolveSaveType } from "../resolve-save-type.js";
-const SAVE_PREFIX = '^';
+import { calculateSaveValue } from "./calculate-save-value.js";
 const depTypesMap = new Map([
     ['prod', 'dependencies'],
     ['dev', 'devDependencies'],
@@ -75,14 +75,20 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
                 delete manifest.peerDependenciesMeta[name];
             }
             const dependencies = manifest[depType] ?? (manifest[depType] = {});
-            dependencies[name] =
-                (nodeType === 'registry' &&
-                    (!dep.spec.final.semver || !dep.spec.final.range)) ?
-                    dep.spec.subspec && dep.spec.namedRegistry ?
-                        `${dep.spec.final.namedRegistry}:${dep.spec.final.name}@${SAVE_PREFIX}${node.version}`
-                        : `${SAVE_PREFIX}${node.version}`
-                    : dep.spec.bareSpec;
-            manifestChanged = true;
+            // check to see if we need to save a different version
+            // - If you install a single specific version, that is deliberate,
+            //   we save that exact version, no matter what.
+            // - If the requested spec matches the manifest, make no change
+            // If the requested spec had no bareSpec, and the manifest has
+            // a dependency entry, make no change.
+            // If the requested spec has a bareSpec that did NOT match the manifest,
+            // then update it.
+            // If the manifest does not contain anything, then update it.
+            // Only for registry dependencies
+            const existing = dependencies[name];
+            const saveValue = calculateSaveValue(nodeType, dep.spec, existing, node.version);
+            dependencies[name] = saveValue;
+            manifestChanged = saveValue !== existing;
         }
     }
     return manifestChanged ? manifest : undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"update-importers-package-json.js","sourceRoot":"","sources":["../../../src/reify/update-importers-package-json.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport { splitDepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport type {\n  DependencyTypeLong,\n  DependencyTypeShort,\n  Manifest,\n} from '@vltpkg/types'\nimport { longDependencyTypes } from '@vltpkg/types'\nimport type {\n  AddImportersDependenciesMap,\n  Dependency,\n  RemoveImportersDependenciesMap,\n} from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport { resolveSaveType } from '../resolve-save-type.ts'\n\nconst SAVE_PREFIX = '^'\n\nconst depTypesMap = new Map<DependencyTypeShort, DependencyTypeLong>([\n  ['prod', 'dependencies'],\n  ['dev', 'devDependencies'],\n  ['peer', 'peerDependencies'],\n  ['peerOptional', 'peerDependencies'],\n  ['optional', 'optionalDependencies'],\n])\n\nexport type UpdatePackageJsonOptions = {\n  /**\n   * A `Map` in which keys are {@link DepID} linking to another `Map` in which\n   * keys are the dependency names and values are {@link Dependency}. This\n   * structure represents dependencies that need to be added to the importer\n   * represented by {@link DepID}.\n   */\n  add?: AddImportersDependenciesMap\n  /**\n   * A `Map` object representing nodes to be removed from the ideal graph.\n   * Each {@link DepID} key represents an importer node and the `Set` of\n   * dependency names to be removed from its dependency list.\n   */\n  remove?: RemoveImportersDependenciesMap\n  /**\n   * The {@link Graph} instance that contain the importer nodes to which\n   * the manifest data (and it's corresponding `package.json` file) are\n   * going to be updated.\n   */\n  graph: Graph\n  /**\n   * An instance of {@link PackageJson} to use when writing updated manifest\n   * data to `package.json` files. It's necessary that this is the same\n   * instance used to load these `package.json` files previously.\n   */\n  packageJson: PackageJson\n}\n\nconst addOrRemoveDeps = (\n  importerId: DepID,\n  graph: Graph,\n  addOrRemove?:\n    | AddImportersDependenciesMap\n    | RemoveImportersDependenciesMap,\n): Manifest | undefined => {\n  const importer = graph.nodes.get(importerId)\n  if (!importer) {\n    throw error('Failed to retrieve importer node', {\n      found: importerId,\n    })\n  }\n  const manifest = importer.manifest\n  if (!manifest) {\n    throw error('Could not find manifest data for node', {\n      found: importerId,\n    })\n  }\n  const deps = addOrRemove?.get(importerId)\n  /* c8 ignore start -- impossible but TS doesn't know that */\n  if (!deps) {\n    throw error('Failed to retrieve added deps info', {\n      manifest,\n    })\n  }\n  let manifestChanged = false\n  /* c8 ignore stop */\n  for (const deleteNameOrAddItem of deps) {\n    if (typeof deleteNameOrAddItem === 'string') {\n      const name = deleteNameOrAddItem\n      for (const depType of longDependencyTypes) {\n        if (manifest[depType]?.[name]) {\n          delete manifest[depType][name]\n          manifestChanged = true\n        }\n      }\n      if (manifest.peerDependenciesMeta?.[name]) {\n        delete manifest.peerDependenciesMeta[name]\n        manifestChanged = true\n      }\n    } else {\n      const [name, dep] = deleteNameOrAddItem\n      // peerOptional also needs to add peerDependenciesMeta entry\n      const depTypeShort = resolveSaveType(importer, name, dep.type)\n      const depType = depTypesMap.get(depTypeShort)\n      if (!depType) {\n        throw error('Failed to retrieve dependency type', {\n          validOptions: [...depTypesMap.keys()],\n          found: dep.type,\n        })\n      }\n      const node = importer.edgesOut.get(name)?.to\n      if (!node) {\n        throw error('Dependency node could not be found')\n      }\n      const [nodeType] = splitDepID(node.id)\n\n      for (const dtype of longDependencyTypes) {\n        if (dtype === depType || !manifest[dtype]) continue\n        delete manifest[dtype][name]\n      }\n      if (depTypeShort === 'peerOptional') {\n        manifest.peerDependenciesMeta ??= {}\n        manifest.peerDependenciesMeta[name] = { optional: true }\n      } else if (manifest.peerDependenciesMeta?.[name]) {\n        delete manifest.peerDependenciesMeta[name]\n      }\n\n      const dependencies =\n        manifest[depType] ?? (manifest[depType] = {})\n      dependencies[name] =\n        (\n          nodeType === 'registry' &&\n          (!dep.spec.final.semver || !dep.spec.final.range)\n        ) ?\n          dep.spec.subspec && dep.spec.namedRegistry ?\n            `${dep.spec.final.namedRegistry}:${dep.spec.final.name}@${SAVE_PREFIX}${node.version}`\n          : `${SAVE_PREFIX}${node.version}`\n        : dep.spec.bareSpec\n      manifestChanged = true\n    }\n  }\n  return manifestChanged ? manifest : undefined\n}\n\n/**\n * Updates the importers of a provided {@link Graph} accordingly to the\n * provided add or remove arguments.\n */\nexport const updatePackageJson = ({\n  add,\n  graph,\n  packageJson,\n  remove,\n}: UpdatePackageJsonOptions) => {\n  const manifestsToUpdate = new Set<Manifest>()\n  const operations = new Set([add, remove])\n\n  for (const operation of operations) {\n    if (operation) {\n      for (const importerId of operation.keys()) {\n        const manifest = addOrRemoveDeps(importerId, graph, operation)\n        if (manifest) {\n          manifestsToUpdate.add(manifest)\n        }\n      }\n    }\n  }\n\n  const commit = () => {\n    for (const manifest of manifestsToUpdate) {\n      packageJson.save(manifest)\n    }\n  }\n\n  return commit\n}\n"]}
+{"version":3,"file":"update-importers-package-json.js","sourceRoot":"","sources":["../../../src/reify/update-importers-package-json.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport { splitDepID } from '@vltpkg/dep-id'\nimport { error } from '@vltpkg/error-cause'\nimport type { PackageJson } from '@vltpkg/package-json'\nimport type {\n  DependencyTypeLong,\n  DependencyTypeShort,\n  Manifest,\n} from '@vltpkg/types'\nimport { longDependencyTypes } from '@vltpkg/types'\nimport type {\n  AddImportersDependenciesMap,\n  Dependency,\n  RemoveImportersDependenciesMap,\n} from '../dependencies.ts'\nimport type { Graph } from '../graph.ts'\nimport { resolveSaveType } from '../resolve-save-type.ts'\nimport { calculateSaveValue } from './calculate-save-value.ts'\n\nconst depTypesMap = new Map<DependencyTypeShort, DependencyTypeLong>([\n  ['prod', 'dependencies'],\n  ['dev', 'devDependencies'],\n  ['peer', 'peerDependencies'],\n  ['peerOptional', 'peerDependencies'],\n  ['optional', 'optionalDependencies'],\n])\n\nexport type UpdatePackageJsonOptions = {\n  /**\n   * A `Map` in which keys are {@link DepID} linking to another `Map` in which\n   * keys are the dependency names and values are {@link Dependency}. This\n   * structure represents dependencies that need to be added to the importer\n   * represented by {@link DepID}.\n   */\n  add?: AddImportersDependenciesMap\n  /**\n   * A `Map` object representing nodes to be removed from the ideal graph.\n   * Each {@link DepID} key represents an importer node and the `Set` of\n   * dependency names to be removed from its dependency list.\n   */\n  remove?: RemoveImportersDependenciesMap\n  /**\n   * The {@link Graph} instance that contain the importer nodes to which\n   * the manifest data (and it's corresponding `package.json` file) are\n   * going to be updated.\n   */\n  graph: Graph\n  /**\n   * An instance of {@link PackageJson} to use when writing updated manifest\n   * data to `package.json` files. It's necessary that this is the same\n   * instance used to load these `package.json` files previously.\n   */\n  packageJson: PackageJson\n}\n\nconst addOrRemoveDeps = (\n  importerId: DepID,\n  graph: Graph,\n  addOrRemove?:\n    | AddImportersDependenciesMap\n    | RemoveImportersDependenciesMap,\n): Manifest | undefined => {\n  const importer = graph.nodes.get(importerId)\n  if (!importer) {\n    throw error('Failed to retrieve importer node', {\n      found: importerId,\n    })\n  }\n  const manifest = importer.manifest\n  if (!manifest) {\n    throw error('Could not find manifest data for node', {\n      found: importerId,\n    })\n  }\n  const deps = addOrRemove?.get(importerId)\n  /* c8 ignore start -- impossible but TS doesn't know that */\n  if (!deps) {\n    throw error('Failed to retrieve added deps info', {\n      manifest,\n    })\n  }\n  let manifestChanged = false\n  /* c8 ignore stop */\n  for (const deleteNameOrAddItem of deps) {\n    if (typeof deleteNameOrAddItem === 'string') {\n      const name = deleteNameOrAddItem\n      for (const depType of longDependencyTypes) {\n        if (manifest[depType]?.[name]) {\n          delete manifest[depType][name]\n          manifestChanged = true\n        }\n      }\n      if (manifest.peerDependenciesMeta?.[name]) {\n        delete manifest.peerDependenciesMeta[name]\n        manifestChanged = true\n      }\n    } else {\n      const [name, dep] = deleteNameOrAddItem\n      // peerOptional also needs to add peerDependenciesMeta entry\n      const depTypeShort = resolveSaveType(importer, name, dep.type)\n      const depType = depTypesMap.get(depTypeShort)\n      if (!depType) {\n        throw error('Failed to retrieve dependency type', {\n          validOptions: [...depTypesMap.keys()],\n          found: dep.type,\n        })\n      }\n      const node = importer.edgesOut.get(name)?.to\n      if (!node) {\n        throw error('Dependency node could not be found')\n      }\n      const [nodeType] = splitDepID(node.id)\n\n      for (const dtype of longDependencyTypes) {\n        if (dtype === depType || !manifest[dtype]) continue\n        delete manifest[dtype][name]\n      }\n      if (depTypeShort === 'peerOptional') {\n        manifest.peerDependenciesMeta ??= {}\n        manifest.peerDependenciesMeta[name] = { optional: true }\n      } else if (manifest.peerDependenciesMeta?.[name]) {\n        delete manifest.peerDependenciesMeta[name]\n      }\n\n      const dependencies =\n        manifest[depType] ?? (manifest[depType] = {})\n      // check to see if we need to save a different version\n      // - If you install a single specific version, that is deliberate,\n      //   we save that exact version, no matter what.\n      // - If the requested spec matches the manifest, make no change\n      // If the requested spec had no bareSpec, and the manifest has\n      // a dependency entry, make no change.\n      // If the requested spec has a bareSpec that did NOT match the manifest,\n      // then update it.\n      // If the manifest does not contain anything, then update it.\n      // Only for registry dependencies\n      const existing = dependencies[name]\n      const saveValue = calculateSaveValue(\n        nodeType,\n        dep.spec,\n        existing,\n        node.version,\n      )\n      dependencies[name] = saveValue\n      manifestChanged = saveValue !== existing\n    }\n  }\n  return manifestChanged ? manifest : undefined\n}\n\n/**\n * Updates the importers of a provided {@link Graph} accordingly to the\n * provided add or remove arguments.\n */\nexport const updatePackageJson = ({\n  add,\n  graph,\n  packageJson,\n  remove,\n}: UpdatePackageJsonOptions) => {\n  const manifestsToUpdate = new Set<Manifest>()\n  const operations = new Set([add, remove])\n\n  for (const operation of operations) {\n    if (operation) {\n      for (const importerId of operation.keys()) {\n        const manifest = addOrRemoveDeps(importerId, graph, operation)\n        if (manifest) {\n          manifestsToUpdate.add(manifest)\n        }\n      }\n    }\n  }\n\n  const commit = () => {\n    for (const manifest of manifestsToUpdate) {\n      packageJson.save(manifest)\n    }\n  }\n\n  return commit\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/graph",
   "description": "A library that helps understanding & expressing what happens on an install",
-  "version": "0.0.0-11",
+  "version": "0.0.0-13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -23,20 +23,20 @@
     "graph-run": "^1.0.4",
     "path-scurry": "^2.0.0",
     "promise-call-limit": "^3.0.2",
-    "@vltpkg/cmd-shim": "0.0.0-11",
-    "@vltpkg/error-cause": "0.0.0-11",
-    "@vltpkg/dep-id": "0.0.0-11",
-    "@vltpkg/fast-split": "0.0.0-11",
-    "@vltpkg/output": "0.0.0-11",
-    "@vltpkg/package-info": "0.0.0-11",
-    "@vltpkg/package-json": "0.0.0-11",
-    "@vltpkg/rollback-remove": "0.0.0-11",
-    "@vltpkg/pick-manifest": "0.0.0-11",
-    "@vltpkg/run": "0.0.0-11",
-    "@vltpkg/satisfies": "0.0.0-11",
-    "@vltpkg/types": "0.0.0-11",
-    "@vltpkg/spec": "0.0.0-11",
-    "@vltpkg/workspaces": "0.0.0-11"
+    "@vltpkg/cmd-shim": "0.0.0-13",
+    "@vltpkg/error-cause": "0.0.0-13",
+    "@vltpkg/dep-id": "0.0.0-13",
+    "@vltpkg/fast-split": "0.0.0-13",
+    "@vltpkg/output": "0.0.0-13",
+    "@vltpkg/package-info": "0.0.0-13",
+    "@vltpkg/package-json": "0.0.0-13",
+    "@vltpkg/pick-manifest": "0.0.0-13",
+    "@vltpkg/rollback-remove": "0.0.0-13",
+    "@vltpkg/run": "0.0.0-13",
+    "@vltpkg/satisfies": "0.0.0-13",
+    "@vltpkg/spec": "0.0.0-13",
+    "@vltpkg/types": "0.0.0-13",
+    "@vltpkg/workspaces": "0.0.0-13"
   },
   "devDependencies": {
     "@eslint/js": "^9.25.1",