@vltpkg/graph 1.0.0-rc.3 → 1.0.0-rc.30

package/dist/{esm/reify → reify}/extract-node.js

@@ -42,11 +42,15 @@ export const extractNode = async (node, scurry, remover, options, packageInfo, d
         await remover.rm(target);
         if (removeOptionalFailedNode) {
             try {
-                await packageInfo.extract(spec, target, {
+                const result = await packageInfo.extract(spec, target, {
                     from,
                     integrity,
                     resolved,
                 });
+                // Store computed integrity for git/remote deps
+                if (result.integrity && !node.integrity) {
+                    node.integrity = result.integrity;
+                }
                 return { success: true, node };
             }
             catch (error) {
@@ -55,11 +59,15 @@ export const extractNode = async (node, scurry, remover, options, packageInfo, d
             }
         }
         else {
-            await packageInfo.extract(spec, target, {
+            const result = await packageInfo.extract(spec, target, {
                 from,
                 integrity,
                 resolved,
             });
+            // Store computed integrity for git/remote deps
+            if (result.integrity && !node.integrity) {
+                node.integrity = result.integrity;
+            }
             return { success: true, node };
         }
     }
@@ -73,4 +81,3 @@ export const extractNode = async (node, scurry, remover, options, packageInfo, d
         throw error;
     }
 };
-//# sourceMappingURL=extract-node.js.map

package/dist/{esm/reify → reify}/index.d.ts

@@ -15,6 +15,7 @@ export type ReifyOptions = LoadOptions & {
     packageInfo: PackageInfoClient;
     modifiers?: GraphModifier;
     remover: RollbackRemove;
+    update?: boolean;
 };
 export type ReifyResult = {
     /**
@@ -31,4 +32,3 @@ export type ReifyResult = {
  * Make the current project match the supplied graph.
  */
 export declare const reify: (options: ReifyOptions) => Promise<ReifyResult>;
-//# sourceMappingURL=index.d.ts.map

package/dist/{esm/reify → reify}/index.js

@@ -67,8 +67,9 @@ export const reify = async (options) => {
     const noModifiedDependencies = !options.add?.modifiedDependencies &&
         !options.remove?.modifiedDependencies;
     const skipOptionalOnly = noModifiedDependencies && diff.optionalOnly;
+    const skippable = skipOptionalOnly && !options.update;
     const res = { diff };
-    if (!diff.hasChanges() || skipOptionalOnly) {
+    if (!diff.hasChanges() || skippable) {
         // nothing to do, so just return the diff
         done();
         return res;
@@ -115,11 +116,11 @@ const reify_ = async (options, diff, remover) => {
     // create all node_modules symlinks, and link bins to nm/.bin
     const edgeActions = addEdges(diff, scurry, remover);
     if (edgeActions.length)
-        await Promise.all(edgeActions);
+        await callLimit(edgeActions, { limit });
     await internalHoist(diff.to, options, remover);
     // looks up all nodes setting buildState = 'needed'
     // on nodes that require building
-    checkNeededBuild({ diff });
+    checkNeededBuild({ diff, scurry, packageJson });
     // Filter nodes allowed to run scripts if allowScripts query is provided
     const allowScriptsNodes = await filterNodesByQuery(diff.to, allowScripts);
     // ensure that all added bins are chmod +x
@@ -158,4 +159,3 @@ const reify_ = async (options, diff, remover) => {
     // returns the result object
     return res;
 };
-//# sourceMappingURL=index.js.map

package/dist/{esm/reify → reify}/internal-hoist.d.ts

@@ -6,4 +6,3 @@ type InternalHoistOptions = Pick<ReifyOptions, 'projectRoot' | 'scurry'>;
 export declare const pickNodeToHoist: (nodes: Set<Node>) => Node | undefined;
 export declare const internalHoist: (graph: Graph, options: InternalHoistOptions, remover: RollbackRemove) => Promise<void>;
 export {};
-//# sourceMappingURL=internal-hoist.d.ts.map

package/dist/{esm/reify → reify}/internal-hoist.js

@@ -131,4 +131,3 @@ const checkExisting = async (name, entry, links, removes, scurry, remover) => {
         links.delete(name);
     }
 };
-//# sourceMappingURL=internal-hoist.js.map

package/dist/{esm/reify → reify}/optional-fail.d.ts

@@ -13,4 +13,3 @@ export declare function optionalFail(diff: Diff, node: Node & {
     optional: false;
 }): undefined;
 export declare function optionalFail(diff: Diff, node: Node): (() => void) | undefined;
-//# sourceMappingURL=optional-fail.d.ts.map

package/dist/{esm/reify → reify}/optional-fail.js

@@ -13,4 +13,3 @@ const del = (diff, node) => {
     diff.nodes.add.delete(node);
     diff.nodes.delete.add(node);
 };
-//# sourceMappingURL=optional-fail.js.map

package/dist/{esm/reify → reify}/rollback.d.ts

@@ -2,4 +2,3 @@ import { RollbackRemove } from '@vltpkg/rollback-remove';
 import type { PathScurry } from 'path-scurry';
 import type { Diff } from '../diff.ts';
 export declare const rollback: (remover: RollbackRemove, diff: Diff, scurry: PathScurry) => Promise<void>;
-//# sourceMappingURL=rollback.d.ts.map

package/dist/{esm/reify → reify}/rollback.js

@@ -21,4 +21,3 @@ export const rollback = async (remover, diff, scurry) => {
     /* c8 ignore next */
     await remover.rollback().catch(() => { });
 };
-//# sourceMappingURL=rollback.js.map

package/dist/{esm/reify → reify}/update-importers-package-json.d.ts

@@ -29,8 +29,7 @@ export type UpdatePackageJsonOptions = {
     packageJson: PackageJson;
 };
 /**
- * Updates the importers of a provided {@link Graph} accordingly to the
+ * Updates nodes of a provided {@link Graph} accordingly to the
  * provided add or remove arguments.
  */
 export declare const updatePackageJson: ({ add, graph, packageJson, remove, }: UpdatePackageJsonOptions) => () => void;
-//# sourceMappingURL=update-importers-package-json.d.ts.map

package/dist/{esm/reify → reify}/update-importers-package-json.js

@@ -10,20 +10,20 @@ const depTypesMap = new Map([
     ['peerOptional', 'peerDependencies'],
     ['optional', 'optionalDependencies'],
 ]);
-const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
-    const importer = graph.nodes.get(importerId);
-    if (!importer) {
-        throw error('Failed to retrieve importer node', {
-            found: importerId,
+const addOrRemoveDeps = (nodeId, graph, addOrRemove) => {
+    const node = graph.nodes.get(nodeId);
+    if (!node) {
+        throw error('Failed to retrieve node', {
+            found: nodeId,
         });
     }
-    const manifest = importer.manifest;
+    const manifest = node.manifest;
     if (!manifest) {
         throw error('Could not find manifest data for node', {
-            found: importerId,
+            found: nodeId,
         });
     }
-    const deps = addOrRemove?.get(importerId);
+    const deps = addOrRemove?.get(nodeId);
     /* c8 ignore start -- impossible but TS doesn't know that */
     if (!deps) {
         throw error('Failed to retrieve added deps info', {
@@ -49,7 +49,7 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
         else {
             const [name, dep] = deleteNameOrAddItem;
             // peerOptional also needs to add peerDependenciesMeta entry
-            const depTypeShort = resolveSaveType(importer, name, dep.type);
+            const depTypeShort = resolveSaveType(node, name, dep.type);
             const depType = depTypesMap.get(depTypeShort);
             if (!depType) {
                 throw error('Failed to retrieve dependency type', {
@@ -57,11 +57,11 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
                     found: dep.type,
                 });
             }
-            const node = importer.edgesOut.get(name)?.to;
-            if (!node) {
+            const n = node.edgesOut.get(name)?.to;
+            if (!n) {
                 throw error('Dependency node could not be found');
             }
-            const [nodeType] = splitDepID(node.id);
+            const [nodeType] = splitDepID(n.id);
             for (const dtype of longDependencyTypes) {
                 if (dtype === depType || !manifest[dtype])
                     continue;
@@ -86,7 +86,7 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
             // 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);
+            const saveValue = calculateSaveValue(nodeType, dep.spec, existing, n.version);
             dependencies[name] = saveValue;
             manifestChanged = manifestChanged || saveValue !== existing;
         }
@@ -94,7 +94,7 @@ const addOrRemoveDeps = (importerId, graph, addOrRemove) => {
     return manifestChanged ? manifest : undefined;
 };
 /**
- * Updates the importers of a provided {@link Graph} accordingly to the
+ * Updates nodes of a provided {@link Graph} accordingly to the
  * provided add or remove arguments.
  */
 export const updatePackageJson = ({ add, graph, packageJson, remove, }) => {
@@ -102,8 +102,11 @@ export const updatePackageJson = ({ add, graph, packageJson, remove, }) => {
     const operations = new Set([add, remove]);
     for (const operation of operations) {
         if (operation) {
-            for (const importerId of operation.keys()) {
-                const manifest = addOrRemoveDeps(importerId, graph, operation);
+            // These node ids are from either importer nodes or dependencies
+            // that are nested folders from which the user can also add new
+            // dependencies to
+            for (const nodeId of operation.keys()) {
+                const manifest = addOrRemoveDeps(nodeId, graph, operation);
                 if (manifest) {
                     manifestsToUpdate.add(manifest);
                 }
@@ -117,4 +120,3 @@ export const updatePackageJson = ({ add, graph, packageJson, remove, }) => {
     };
     return commit;
 };
-//# sourceMappingURL=update-importers-package-json.js.map

package/dist/{esm/remove-optional-subgraph.d.ts → remove-optional-subgraph.d.ts}

@@ -31,4 +31,3 @@ export declare function findOptionalSubgraph(node: Node & {
 }>): Generator<Node & {
     optional: true;
 }, void>;
-//# sourceMappingURL=remove-optional-subgraph.d.ts.map

package/dist/{esm/remove-optional-subgraph.js → remove-optional-subgraph.js}

@@ -45,4 +45,3 @@ export function* findOptionalSubgraph(node, seen = new Set()) {
         }
     }
 }
-//# sourceMappingURL=remove-optional-subgraph.js.map

package/dist/{esm/resolve-save-type.d.ts → resolve-save-type.d.ts}

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

package/dist/{esm/resolve-save-type.js → resolve-save-type.js}

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

package/dist/{esm/stringify-node.d.ts → stringify-node.d.ts}

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

package/dist/{esm/stringify-node.js → stringify-node.js}

@@ -1,11 +1,20 @@
 import { splitDepID } from '@vltpkg/dep-id/browser';
+import { defaultRegistryName } from '@vltpkg/spec/browser';
 export const stringifyNode = (node) => {
     if (!node)
         return '';
     const version = node.version ? `@${node.version}` : '';
     const [type, ref, nameVersion] = splitDepID(node.id);
     if (type === 'registry') {
-        const prefix = ref ? `${ref}:` : 'npm:';
+        let prefix = `${defaultRegistryName}:`;
+        if (ref) {
+            if (/^https?:\/\//.test(ref)) {
+                prefix = `registry:${ref}#`;
+            }
+            else {
+                prefix = `${ref}:`;
+            }
+        }
         return `${prefix}${nameVersion}`;
     }
     else if (type === 'workspace') {
@@ -21,4 +30,3 @@ export const stringifyNode = (node) => {
         return `${type}(${ref})${nameVersion}`;
     }
 };
-//# sourceMappingURL=stringify-node.js.map

package/dist/{esm/transfer-data → transfer-data}/load.d.ts

@@ -41,4 +41,3 @@ export type TransferData = {
     securityArchive?: any;
 };
 export declare const load: (transfered: TransferData) => LoadResult;
-//# sourceMappingURL=load.d.ts.map

package/dist/{esm/transfer-data → transfer-data}/load.js

@@ -5,7 +5,10 @@ import { stringifyNode } from "../stringify-node.js";
 import { loadEdges } from "../lockfile/load-edges.js";
 import { loadNodes } from "../lockfile/load-nodes.js";
 const loadSpecOptions = (lockfile) => {
-    const { catalog = {}, catalogs = {}, registries, registry, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, 'scope-registries': scopeRegistries, 'jsr-registries': jsrRegistries, } = lockfile.options;
+    const { catalog = {}, catalogs = {}, registries, registry, 'git-hosts': gitHosts, 'git-host-archives': gitHostArchives, 'scoped-registries': scopedRegistriesOption, 'jsr-registries': jsrRegistries, } = lockfile.options;
+    // backwards-compat: legacy lockfiles wrote this field as `scope-registries`
+    const scopeRegistries = scopedRegistriesOption ??
+        lockfile.options['scope-registries'];
     return {
         catalog,
         catalogs,
@@ -17,7 +20,7 @@ const loadSpecOptions = (lockfile) => {
             ...defaultGitHostArchives,
             ...gitHostArchives,
         },
-        'scope-registries': {
+        'scoped-registries': {
             ...defaultScopeRegistries,
             ...scopeRegistries,
         },
@@ -173,4 +176,3 @@ export const load = (transfered) => {
         securityArchive,
     };
 };
-//# sourceMappingURL=load.js.map

package/dist/{esm/uninstall.d.ts → uninstall.d.ts}

@@ -12,4 +12,3 @@ export declare const uninstall: (options: UninstallOptions, remove?: RemoveImpor
     graph: import("./graph.ts").Graph;
     diff: import("./reify/index.ts").ReifyResult;
 }>;
-//# sourceMappingURL=uninstall.d.ts.map

package/dist/{esm/uninstall.js → uninstall.js}

@@ -5,27 +5,40 @@ import { reify } from "./reify/index.js";
 import { lockfile } from "./index.js";
 import { updatePackageJson } from "./reify/update-importers-package-json.js";
 import { RollbackRemove } from '@vltpkg/rollback-remove';
+import { existsSync, rmSync } from 'node:fs';
+import { resolve } from 'node:path';
 export const uninstall = async (options, remove) => {
     const mainManifest = options.packageJson.read(options.projectRoot);
     const modifiers = GraphModifier.maybeLoad(options);
     const remover = new RollbackRemove();
     try {
-        const graph = await idealBuild({
+        // Load the actual graph before building the ideal graph so that
+        // manifest data from installed packages can be used to hydrate
+        // nodes loaded from the lockfile. Without this, nodes loaded from
+        // vlt-lock.json (which does not store manifests) will be missing
+        // manifest data, causing the hidden lockfile save to silently fail
+        // due to throwOnMissingManifest and leaving stale entries behind.
+        const act = actualLoad({
             ...options,
-            remove,
+            modifiers: undefined,
             mainManifest,
             loadManifests: true,
-            remover,
         });
-        const act = actualLoad({
+        const graph = await idealBuild({
             ...options,
+            actual: act,
+            remove,
             mainManifest,
             loadManifests: true,
+            remover,
         });
         // If lockfileOnly is enabled, skip reify and only save the lockfile
         if (options.lockfileOnly) {
-            // Save only the main lockfile, skip all filesystem operations
-            lockfile.save({ graph, modifiers });
+            // Save only the main lockfile, skip all filesystem operations.
+            // Spread `options` so that spec-level config (registry,
+            // scoped-registries, git-hosts, catalogs, etc.) round-trips
+            // through the lockfile. See vltpkg/vltpkg#1580.
+            lockfile.save({ ...options, graph, modifiers });
             const saveImportersPackageJson = 
             /* c8 ignore next */
             remove?.modifiedDependencies ?
@@ -51,8 +64,15 @@ export const uninstall = async (options, remove) => {
     }
     catch (err) {
         await remover.rollback().catch(() => { });
+        // Remove hidden lockfile on failure
+        try {
+            const hiddenLockfile = resolve(options.projectRoot, 'node_modules/.vlt-lock.json');
+            if (existsSync(hiddenLockfile)) {
+                rmSync(hiddenLockfile, { force: true });
+            }
+        }
+        catch { }
         throw err;
     }
     /* c8 ignore stop */
 };
-//# sourceMappingURL=uninstall.js.map

package/dist/{esm/update.d.ts → update.d.ts}

@@ -10,4 +10,3 @@ export declare const update: (options: UpdateOptions) => Promise<{
     graph: Graph;
     diff: import("./diff.ts").Diff;
 }>;
-//# sourceMappingURL=update.d.ts.map

package/dist/{esm/update.js → update.js}

@@ -7,6 +7,8 @@ import { asError } from '@vltpkg/types';
 import { Graph } from "./graph.js";
 import { graphStep } from '@vltpkg/output';
 import { RollbackRemove } from '@vltpkg/rollback-remove';
+import { existsSync, rmSync } from 'node:fs';
+import { resolve } from 'node:path';
 export const update = async (options) => {
     let mainManifest = undefined;
     try {
@@ -50,14 +52,22 @@ export const update = async (options) => {
             loadManifests: true,
             modifiers,
             remover,
+            update: true,
         });
         return { buildQueue, graph, diff };
         /* c8 ignore start */
     }
     catch (err) {
         await remover.rollback().catch(() => { });
+        // Remove hidden lockfile on failure
+        try {
+            const hiddenLockfile = resolve(options.projectRoot, 'node_modules/.vlt-lock.json');
+            if (existsSync(hiddenLockfile)) {
+                rmSync(hiddenLockfile, { force: true });
+            }
+        }
+        catch { }
         throw err;
     }
     /* c8 ignore stop */
 };
-//# sourceMappingURL=update.js.map

package/dist/{esm/virtual-root.d.ts → virtual-root.d.ts}

@@ -13,4 +13,3 @@ export declare const VIRTUAL_ROOT_ID: import("@vltpkg/dep-id/browser").DepID;
  * Returns undefined if a virtual root is not needed.
  */
 export declare const createVirtualRoot: (name: string | undefined, options: SpecOptions, mainImporters: NodeLike[]) => NodeLike | undefined;
-//# sourceMappingURL=virtual-root.d.ts.map

package/dist/{esm/virtual-root.js → virtual-root.js}

@@ -76,4 +76,3 @@ export const createVirtualRoot = (name = 'virtual-root', options, mainImporters)
     }
     return res;
 };
-//# sourceMappingURL=virtual-root.js.map

package/dist/{esm/visualization → visualization}/human-readable-output.d.ts

@@ -24,4 +24,3 @@ export type TreeMap = Map<EdgeLike | undefined, EdgeMap>;
 export declare function humanReadableOutput(options: HumanReadableOutputGraph, { colors }: {
     colors?: boolean;
 }): string;
-//# sourceMappingURL=human-readable-output.d.ts.map

package/dist/{esm/visualization → visualization}/human-readable-output.js

@@ -1,3 +1,4 @@
+import { defaultRegistryName } from '@vltpkg/spec';
 import { splitDepID } from '@vltpkg/dep-id';
 import { styleText as utilStyleText } from 'node:util';
 const styleText = (format, s) => utilStyleText(format, s, { validateStream: false });
@@ -119,7 +120,9 @@ export function humanReadableOutput(options, { colors }) {
                 // prefixes the node name with the registry name
                 // if a custom registry name is found
                 const depIdTuple = nextItem.node?.id && splitDepID(nextItem.node.id);
-                const hasCustomReg = depIdTuple?.[0] === 'registry' && depIdTuple[1];
+                const hasCustomReg = depIdTuple?.[0] === 'registry' &&
+                    depIdTuple[1] &&
+                    depIdTuple[1] !== defaultRegistryName;
                 const nodeName = hasCustomReg ?
                     `${depIdTuple[1]}:${nextItem.node?.name}`
                     : nextItem.node?.name;
@@ -127,7 +130,9 @@ export function humanReadableOutput(options, { colors }) {
                     `${nodeName}@${nextItem.node.version}`
                     : nodeName;
                 const nextChar = isLast ? 'last-child' : 'middle-child';
-                const aliasedPackage = nextItem.node?.name && nextItem.edge?.name !== nodeName;
+                const aliasedPackage = hasCustomReg ||
+                    (nextItem.node?.name &&
+                        nextItem.edge?.name !== nextItem.node.name);
                 nextItem.name =
                     nextItem.node?.confused ?
                         `${nextItem.edge?.name} ${red('(confused)')}`
@@ -156,4 +161,3 @@ export function humanReadableOutput(options, { colors }) {
     }
     return reset(res);
 }
-//# sourceMappingURL=human-readable-output.js.map

package/dist/{esm/visualization → visualization}/json-output.d.ts

@@ -32,10 +32,10 @@ export type JSONOutputItem = {
 };
 export type JSONOutputGraph = {
     edges: EdgeLike[];
+    nodes: NodeLike[];
     importers: Set<NodeLike>;
 };
 /**
  * Returns a JSON string representation of the graph.
  */
-export declare function jsonOutput({ edges, importers }: JSONOutputGraph): JSONOutputItem[];
-//# sourceMappingURL=json-output.d.ts.map
+export declare function jsonOutput({ edges, nodes, importers, }: JSONOutputGraph): JSONOutputItem[];

package/dist/{esm/visualization → visualization}/json-output.js

@@ -1,7 +1,7 @@
 /**
  * Returns a JSON string representation of the graph.
  */
-export function jsonOutput({ edges, importers }) {
+export function jsonOutput({ edges, nodes, importers, }) {
     const res = [];
     const seenIds = new Set();
     // Collects edge & it's linked nodes as json output items
@@ -37,7 +37,7 @@ export function jsonOutput({ edges, importers }) {
         return a.name.localeCompare(b.name);
     });
     for (const node of orderedImporters) {
-        if (seenIds.has(node.id))
+        if (!nodes.includes(node) || seenIds.has(node.id))
             continue;
         res.unshift({
             /* c8 ignore next - name can't be missing but ts won't know */
@@ -48,4 +48,3 @@ export function jsonOutput({ edges, importers }) {
     }
     return res;
 }
-//# sourceMappingURL=json-output.js.map

package/dist/{esm/visualization → visualization}/mermaid-output.d.ts

@@ -3,6 +3,7 @@ export type MermaidOutputGraph = {
     edges: EdgeLike[];
     importers: Set<NodeLike>;
     nodes: NodeLike[];
+    highlightSelection?: boolean;
 };
 /**
  * Generates a short identifier for a given index following the pattern:
@@ -13,5 +14,4 @@ export declare function generateShortId(index: number): string;
 /**
  * Returns a mermaid string representation of the graph.
  */
-export declare function mermaidOutput({ edges, importers, nodes, }: MermaidOutputGraph): string;
-//# sourceMappingURL=mermaid-output.d.ts.map
+export declare function mermaidOutput(options: MermaidOutputGraph): string;