@vltpkg/graph 1.0.0-rc.6 → 1.0.0-rc.8

package/dist/esm/visualization/mermaid-output.js

@@ -50,35 +50,62 @@ function createDepIdMapping(importers) {
     }
     return mapping;
 }
-const nodeLabel = (node) => `"${String(node).replaceAll('@', '#64;')}"`;
-function parseNode(seenNodes, includedItems, depIdMapping, node) {
+/**
+ * Returns a node reference: on the first occurrence of a node, returns the full label;
+ * on subsequent occurrences, returns just the shortId.
+ *
+ * Note: Mutates the `labeledNodes` set as a side effect to track which nodes have already
+ * been labeled. This tracking is shared across multiple importers to prevent duplicate
+ * labels in the output.
+ */
+const nodeRef = (node, labeledNodes, depIdMapping) => {
+    const shortId = depIdMapping.get(node.id) /* c8 ignore next - should not be possible */ ?? '';
+    if (labeledNodes.has(node.id)) {
+        return shortId;
+    }
+    labeledNodes.add(node.id);
+    return `${shortId}("${String(node).replaceAll('@', '#64;')}")`;
+};
+function parseNode(seenNodes, labeledNodes, includedItems, depIdMapping, node, isImporter = false) {
     if (seenNodes.has(node.id) || !includedItems.get(node)) {
         return '';
     }
     seenNodes.add(node.id);
-    const edges = [...node.edgesOut.values()]
-        .map(e => parseEdge(seenNodes, includedItems, depIdMapping, e))
+    // For importers, render the node label first as a standalone line before processing edges,
+    // since they appear at the top of the graph. Non-importer nodes are labeled inline as part of edge definitions.
+    const nodeLabel = isImporter ? nodeRef(node, labeledNodes, depIdMapping) : '';
+    // Include both regular edges and workspace edges (if any)
+    const allEdges = [
+        ...node.edgesOut.values(),
+        ...(node.workspaces?.values() ?? []),
+    ];
+    const edges = allEdges
+        .map(e => parseEdge(seenNodes, labeledNodes, includedItems, depIdMapping, e))
         .filter(Boolean)
         .join('\n');
-    const shortId = depIdMapping.get(node.id);
-    return `${shortId}(${nodeLabel(node)})${edges.length ? '\n' : ''}${edges}`;
+    // Only render node standalone for importers, others are rendered as part of edges
+    if (isImporter) {
+        /* c8 ignore next */
+        return `${nodeLabel}${edges.length ? '\n' : ''}${edges}`;
+    }
+    return edges;
 }
-function parseEdge(seenNodes, includedItems, depIdMapping, edge) {
+function parseEdge(seenNodes, labeledNodes, includedItems, depIdMapping, edge) {
     if (!includedItems.get(edge)) {
         return '';
     }
-    const fromShortId = depIdMapping.get(edge.from.id);
     const edgeType = edge.type === 'prod' ? '' : ` (${edge.type})`;
-    const edgeResult = `${fromShortId}(${nodeLabel(edge.from)})` +
+    const edgeResult = nodeRef(edge.from, labeledNodes, depIdMapping) +
         ` -->|"${String(edge.spec).replaceAll('@', '#64;')}${edgeType}"| `;
     const missingLabel = edge.type.endsWith('ptional') ? 'Missing Optional' : 'Missing';
     if (!edge.to) {
-        return edgeResult + `missing-${missingCount++}(${missingLabel})\n`;
+        return edgeResult + `missing-${missingCount++}(${missingLabel})`;
     }
-    const toShortId = depIdMapping.get(edge.to.id);
-    return (edgeResult +
-        `${toShortId}(${nodeLabel(edge.to)})\n` +
-        parseNode(seenNodes, includedItems, depIdMapping, edge.to));
+    // Label the target node first so that if it's referenced again later in the graph,
+    // it will use the short identifier instead of repeating the full label.
+    const toRef = nodeRef(edge.to, labeledNodes, depIdMapping);
+    const childEdges = parseNode(seenNodes, labeledNodes, includedItems, depIdMapping, edge.to);
+    return edgeResult + toRef + (childEdges ? '\n' + childEdges : '');
 }
 /**
  * Returns a mermaid string representation of the graph.
@@ -92,7 +119,10 @@ export function mermaidOutput({ edges, importers, nodes, }) {
             continue;
         seen.add(item.self);
         if (item.self instanceof Edge) {
-            if (edges.includes(item.self)) {
+            // Workspace edges are stored in mainImporter.workspaces and not in graph.edges,
+            // so we need to check for workspace spec type to always include them
+            if (edges.includes(item.self) ||
+                item.self.spec.type === 'workspace') {
                 includedItems.set(item.self, true);
             }
             if (item.self.to) {
@@ -106,6 +136,12 @@ export function mermaidOutput({ edges, importers, nodes, }) {
             for (const edge of item.self.edgesOut.values()) {
                 traverse.add({ self: edge, parent: item.self });
             }
+            // Also traverse workspace edges (only mainImporter has these)
+            if (item.self.workspaces) {
+                for (const edge of item.self.workspaces.values()) {
+                    traverse.add({ self: edge, parent: item.self });
+                }
+            }
         }
     }
     for (const item of [...traverse].reverse()) {
@@ -115,9 +151,14 @@ export function mermaidOutput({ edges, importers, nodes, }) {
     }
     // Create DepID to short identifier mapping
     const depIdMapping = createDepIdMapping(importers);
+    // Track nodes that have had their label printed (shared across all importers)
+    const labeledNodes = new Set();
+    // Track nodes that have been processed (shared across all importers to avoid duplicates)
+    const seenNodes = new Set();
     return ('flowchart TD\n' +
         [...importers]
-            .map(i => parseNode(new Set(), includedItems, depIdMapping, i))
+            .map(i => parseNode(seenNodes, labeledNodes, includedItems, depIdMapping, i, true))
+            .filter(Boolean)
             .join('\n'));
 }
 //# sourceMappingURL=mermaid-output.js.map

package/dist/esm/visualization/mermaid-output.js.map

@@ -1 +1 @@
-{"version":3,"file":"mermaid-output.js","sourceRoot":"","sources":["../../../src/visualization/mermaid-output.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAcjC,IAAI,YAAY,GAAG,CAAC,CAAA;AAEpB;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,MAAM,IAAI,GAAG,EAAE,CAAA;IAEf,yDAAyD;IACzD,MAAM,WAAW,GAAG,CAAC,KAAa,EAAU,EAAE;QAC5C,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;YACf,aAAa;YACb,OAAO,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,KAAK,CAAC,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,cAAc;YACd,OAAO,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC,CAAA;IAED,+BAA+B;IAC/B,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,GAAG,GAAG,KAAK,GAAG,CAAC,CAAA,CAAC,wCAAwC;IAE5D,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC;QACf,GAAG,EAAE,CAAA,CAAC,+CAA+C;QACrD,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,CAAA;QAC5B,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,MAAM,CAAA;QACxC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CACzB,SAAwB;IAExB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAA;IACxC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAS,CAAA;IAErC,mDAAmD;IACnD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAA;IAC5B,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACjD,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,uCAAuC;IACvC,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IAC9C,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,IAAc,EAAE,EAAE,CACnC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAA;AAE7C,SAAS,SAAS,CAChB,SAAqB,EACrB,aAAgD,EAChD,YAAgC,EAChC,IAAc;IAEd,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACvD,OAAO,EAAE,CAAA;IACX,CAAC;IACD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACtB,MAAM,KAAK,GAAW,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;SAC9C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;SAC9D,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACzC,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAA;AAC5E,CAAC;AAED,SAAS,SAAS,CAChB,SAAqB,EACrB,aAAgD,EAChD,YAAgC,EAChC,IAAc;IAEd,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,CAAA;IAC9D,MAAM,UAAU,GACd,GAAG,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACzC,SAAS,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,KAAK,CAAA;IAEpE,MAAM,YAAY,GAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAA;IAChE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,OAAO,UAAU,GAAG,WAAW,YAAY,EAAE,IAAI,YAAY,KAAK,CAAA;IACpE,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;IAC9C,OAAO,CACL,UAAU;QACV,GAAG,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK;QACvC,SAAS,CAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,CAC3D,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,KAAK,EACL,SAAS,EACT,KAAK,GACc;IACnB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC3C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAgC,CAAA;IAC7D,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAC1D,CAAA;IAED,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,SAAQ;QACjC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEnB,IAAI,IAAI,CAAC,IAAI,YAAY,IAAI,EAAE,CAAC;YAC9B,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACpC,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACjB,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YACzD,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,YAAY,IAAI,EAAE,CAAC;YAC9B,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACpC,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC/C,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3C,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChD,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM,YAAY,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;IAElD,OAAO,CACL,gBAAgB;QAChB,CAAC,GAAG,SAAS,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,CACP,SAAS,CAAC,IAAI,GAAG,EAAS,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAC5D;aACA,IAAI,CAAC,IAAI,CAAC,CACd,CAAA;AACH,CAAC","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport { Edge } from '../edge.ts'\nimport { Node } from '../node.ts'\nimport type { EdgeLike, NodeLike } from '@vltpkg/types'\n\nexport type MermaidOutputGraph = {\n  edges: EdgeLike[]\n  importers: Set<NodeLike>\n  nodes: NodeLike[]\n}\n\ntype TraverseItem = {\n  self: EdgeLike | NodeLike\n  parent: EdgeLike | NodeLike | undefined\n}\n\nlet missingCount = 0\n\n/**\n * Generates a short identifier for a given index following the pattern:\n * 0 -> a, 1 -> b, ..., 25 -> z, 26 -> A, ..., 51 -> Z, 52 -> aa, 53 -> ab, etc.\n * This implements a bijective base-52 numbering system where a-z = 0-25, A-Z = 26-51\n */\nexport function generateShortId(index: number): string {\n  const base = 52\n\n  // Helper function to convert a digit (0-51) to character\n  const digitToChar = (digit: number): string => {\n    if (digit < 26) {\n      // a-z (0-25)\n      return String.fromCharCode(97 + digit)\n    } else {\n      // A-Z (26-51)\n      return String.fromCharCode(65 + (digit - 26))\n    }\n  }\n\n  // Bijective base-52 conversion\n  let result = ''\n  let num = index + 1 // Convert to 1-based for bijective base\n\n  while (num > 0) {\n    num-- // Adjust for 0-based indexing in each position\n    const remainder = num % base\n    result = digitToChar(remainder) + result\n    num = Math.floor(num / base)\n  }\n\n  return result\n}\n\n/**\n * Creates a mapping from DepID to short identifier\n */\nfunction createDepIdMapping(\n  importers: Set<NodeLike>,\n): Map<DepID, string> {\n  const mapping = new Map<DepID, string>()\n  const uniqueDepIds = new Set<DepID>()\n\n  // Collect all unique DepIDs from nodes & importers\n  const [importer] = importers\n  if (importer) {\n    for (const node of importer.graph.nodes.values()) {\n      uniqueDepIds.add(node.id)\n    }\n  }\n\n  // Create mapping for each unique DepID\n  let index = 0\n  for (const depId of uniqueDepIds) {\n    mapping.set(depId, generateShortId(index++))\n  }\n\n  return mapping\n}\n\nconst nodeLabel = (node: NodeLike) =>\n  `\"${String(node).replaceAll('@', '#64;')}\"`\n\nfunction parseNode(\n  seenNodes: Set<DepID>,\n  includedItems: Map<EdgeLike | NodeLike, boolean>,\n  depIdMapping: Map<DepID, string>,\n  node: NodeLike,\n) {\n  if (seenNodes.has(node.id) || !includedItems.get(node)) {\n    return ''\n  }\n  seenNodes.add(node.id)\n  const edges: string = [...node.edgesOut.values()]\n    .map(e => parseEdge(seenNodes, includedItems, depIdMapping, e))\n    .filter(Boolean)\n    .join('\\n')\n  const shortId = depIdMapping.get(node.id)\n  return `${shortId}(${nodeLabel(node)})${edges.length ? '\\n' : ''}${edges}`\n}\n\nfunction parseEdge(\n  seenNodes: Set<DepID>,\n  includedItems: Map<EdgeLike | NodeLike, boolean>,\n  depIdMapping: Map<DepID, string>,\n  edge: EdgeLike,\n) {\n  if (!includedItems.get(edge)) {\n    return ''\n  }\n\n  const fromShortId = depIdMapping.get(edge.from.id)\n  const edgeType = edge.type === 'prod' ? '' : ` (${edge.type})`\n  const edgeResult =\n    `${fromShortId}(${nodeLabel(edge.from)})` +\n    ` -->|\"${String(edge.spec).replaceAll('@', '#64;')}${edgeType}\"| `\n\n  const missingLabel =\n    edge.type.endsWith('ptional') ? 'Missing Optional' : 'Missing'\n  if (!edge.to) {\n    return edgeResult + `missing-${missingCount++}(${missingLabel})\\n`\n  }\n\n  const toShortId = depIdMapping.get(edge.to.id)\n  return (\n    edgeResult +\n    `${toShortId}(${nodeLabel(edge.to)})\\n` +\n    parseNode(seenNodes, includedItems, depIdMapping, edge.to)\n  )\n}\n\n/**\n * Returns a mermaid string representation of the graph.\n */\nexport function mermaidOutput({\n  edges,\n  importers,\n  nodes,\n}: MermaidOutputGraph) {\n  const seen = new Set<EdgeLike | NodeLike>()\n  const includedItems = new Map<EdgeLike | NodeLike, boolean>()\n  const traverse = new Set<TraverseItem>(\n    [...importers].map(i => ({ self: i, parent: undefined })),\n  )\n\n  for (const item of traverse) {\n    if (seen.has(item.self)) continue\n    seen.add(item.self)\n\n    if (item.self instanceof Edge) {\n      if (edges.includes(item.self)) {\n        includedItems.set(item.self, true)\n      }\n      if (item.self.to) {\n        traverse.add({ self: item.self.to, parent: item.self })\n      }\n    }\n\n    if (item.self instanceof Node) {\n      if (nodes.includes(item.self)) {\n        includedItems.set(item.self, true)\n      }\n      for (const edge of item.self.edgesOut.values()) {\n        traverse.add({ self: edge, parent: item.self })\n      }\n    }\n  }\n\n  for (const item of [...traverse].reverse()) {\n    if (includedItems.has(item.self) && item.parent) {\n      includedItems.set(item.parent, true)\n    }\n  }\n\n  // Create DepID to short identifier mapping\n  const depIdMapping = createDepIdMapping(importers)\n\n  return (\n    'flowchart TD\\n' +\n    [...importers]\n      .map(i =>\n        parseNode(new Set<DepID>(), includedItems, depIdMapping, i),\n      )\n      .join('\\n')\n  )\n}\n"]}
+{"version":3,"file":"mermaid-output.js","sourceRoot":"","sources":["../../../src/visualization/mermaid-output.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DepID } from '@vltpkg/dep-id'\nimport { Edge } from '../edge.ts'\nimport { Node } from '../node.ts'\nimport type { EdgeLike, NodeLike } from '@vltpkg/types'\n\nexport type MermaidOutputGraph = {\n  edges: EdgeLike[]\n  importers: Set<NodeLike>\n  nodes: NodeLike[]\n}\n\ntype TraverseItem = {\n  self: EdgeLike | NodeLike\n  parent: EdgeLike | NodeLike | undefined\n}\n\nlet missingCount = 0\n\n/**\n * Generates a short identifier for a given index following the pattern:\n * 0 -> a, 1 -> b, ..., 25 -> z, 26 -> A, ..., 51 -> Z, 52 -> aa, 53 -> ab, etc.\n * This implements a bijective base-52 numbering system where a-z = 0-25, A-Z = 26-51\n */\nexport function generateShortId(index: number): string {\n  const base = 52\n\n  // Helper function to convert a digit (0-51) to character\n  const digitToChar = (digit: number): string => {\n    if (digit < 26) {\n      // a-z (0-25)\n      return String.fromCharCode(97 + digit)\n    } else {\n      // A-Z (26-51)\n      return String.fromCharCode(65 + (digit - 26))\n    }\n  }\n\n  // Bijective base-52 conversion\n  let result = ''\n  let num = index + 1 // Convert to 1-based for bijective base\n\n  while (num > 0) {\n    num-- // Adjust for 0-based indexing in each position\n    const remainder = num % base\n    result = digitToChar(remainder) + result\n    num = Math.floor(num / base)\n  }\n\n  return result\n}\n\n/**\n * Creates a mapping from DepID to short identifier\n */\nfunction createDepIdMapping(\n  importers: Set<NodeLike>,\n): Map<DepID, string> {\n  const mapping = new Map<DepID, string>()\n  const uniqueDepIds = new Set<DepID>()\n\n  // Collect all unique DepIDs from nodes & importers\n  const [importer] = importers\n  if (importer) {\n    for (const node of importer.graph.nodes.values()) {\n      uniqueDepIds.add(node.id)\n    }\n  }\n\n  // Create mapping for each unique DepID\n  let index = 0\n  for (const depId of uniqueDepIds) {\n    mapping.set(depId, generateShortId(index++))\n  }\n\n  return mapping\n}\n\n/**\n * Returns a node reference: on the first occurrence of a node, returns the full label;\n * on subsequent occurrences, returns just the shortId.\n *\n * Note: Mutates the `labeledNodes` set as a side effect to track which nodes have already\n * been labeled. This tracking is shared across multiple importers to prevent duplicate\n * labels in the output.\n */\nconst nodeRef = (\n  node: NodeLike,\n  labeledNodes: Set<DepID>,\n  depIdMapping: Map<DepID, string>,\n): string => {\n  const shortId =\n    depIdMapping.get(\n      node.id,\n    ) /* c8 ignore next - should not be possible */ ?? ''\n  if (labeledNodes.has(node.id)) {\n    return shortId\n  }\n  labeledNodes.add(node.id)\n  return `${shortId}(\"${String(node).replaceAll('@', '#64;')}\")`\n}\n\nfunction parseNode(\n  seenNodes: Set<DepID>,\n  labeledNodes: Set<DepID>,\n  includedItems: Map<EdgeLike | NodeLike, boolean>,\n  depIdMapping: Map<DepID, string>,\n  node: NodeLike,\n  isImporter = false,\n) {\n  if (seenNodes.has(node.id) || !includedItems.get(node)) {\n    return ''\n  }\n  seenNodes.add(node.id)\n  // For importers, render the node label first as a standalone line before processing edges,\n  // since they appear at the top of the graph. Non-importer nodes are labeled inline as part of edge definitions.\n  const nodeLabel =\n    isImporter ? nodeRef(node, labeledNodes, depIdMapping) : ''\n  // Include both regular edges and workspace edges (if any)\n  const allEdges = [\n    ...node.edgesOut.values(),\n    ...(node.workspaces?.values() ?? []),\n  ]\n  const edges: string = allEdges\n    .map(e =>\n      parseEdge(\n        seenNodes,\n        labeledNodes,\n        includedItems,\n        depIdMapping,\n        e,\n      ),\n    )\n    .filter(Boolean)\n    .join('\\n')\n  // Only render node standalone for importers, others are rendered as part of edges\n  if (isImporter) {\n    /* c8 ignore next */\n    return `${nodeLabel}${edges.length ? '\\n' : ''}${edges}`\n  }\n  return edges\n}\n\nfunction parseEdge(\n  seenNodes: Set<DepID>,\n  labeledNodes: Set<DepID>,\n  includedItems: Map<EdgeLike | NodeLike, boolean>,\n  depIdMapping: Map<DepID, string>,\n  edge: EdgeLike,\n) {\n  if (!includedItems.get(edge)) {\n    return ''\n  }\n\n  const edgeType = edge.type === 'prod' ? '' : ` (${edge.type})`\n  const edgeResult =\n    nodeRef(edge.from, labeledNodes, depIdMapping) +\n    ` -->|\"${String(edge.spec).replaceAll('@', '#64;')}${edgeType}\"| `\n\n  const missingLabel =\n    edge.type.endsWith('ptional') ? 'Missing Optional' : 'Missing'\n  if (!edge.to) {\n    return edgeResult + `missing-${missingCount++}(${missingLabel})`\n  }\n\n  // Label the target node first so that if it's referenced again later in the graph,\n  // it will use the short identifier instead of repeating the full label.\n  const toRef = nodeRef(edge.to, labeledNodes, depIdMapping)\n  const childEdges = parseNode(\n    seenNodes,\n    labeledNodes,\n    includedItems,\n    depIdMapping,\n    edge.to,\n  )\n  return edgeResult + toRef + (childEdges ? '\\n' + childEdges : '')\n}\n\n/**\n * Returns a mermaid string representation of the graph.\n */\nexport function mermaidOutput({\n  edges,\n  importers,\n  nodes,\n}: MermaidOutputGraph) {\n  const seen = new Set<EdgeLike | NodeLike>()\n  const includedItems = new Map<EdgeLike | NodeLike, boolean>()\n  const traverse = new Set<TraverseItem>(\n    [...importers].map(i => ({ self: i, parent: undefined })),\n  )\n\n  for (const item of traverse) {\n    if (seen.has(item.self)) continue\n    seen.add(item.self)\n\n    if (item.self instanceof Edge) {\n      // Workspace edges are stored in mainImporter.workspaces and not in graph.edges,\n      // so we need to check for workspace spec type to always include them\n      if (\n        edges.includes(item.self) ||\n        item.self.spec.type === 'workspace'\n      ) {\n        includedItems.set(item.self, true)\n      }\n      if (item.self.to) {\n        traverse.add({ self: item.self.to, parent: item.self })\n      }\n    }\n\n    if (item.self instanceof Node) {\n      if (nodes.includes(item.self)) {\n        includedItems.set(item.self, true)\n      }\n      for (const edge of item.self.edgesOut.values()) {\n        traverse.add({ self: edge, parent: item.self })\n      }\n      // Also traverse workspace edges (only mainImporter has these)\n      if (item.self.workspaces) {\n        for (const edge of item.self.workspaces.values()) {\n          traverse.add({ self: edge, parent: item.self })\n        }\n      }\n    }\n  }\n\n  for (const item of [...traverse].reverse()) {\n    if (includedItems.has(item.self) && item.parent) {\n      includedItems.set(item.parent, true)\n    }\n  }\n\n  // Create DepID to short identifier mapping\n  const depIdMapping = createDepIdMapping(importers)\n\n  // Track nodes that have had their label printed (shared across all importers)\n  const labeledNodes = new Set<DepID>()\n\n  // Track nodes that have been processed (shared across all importers to avoid duplicates)\n  const seenNodes = new Set<DepID>()\n\n  return (\n    'flowchart TD\\n' +\n    [...importers]\n      .map(i =>\n        parseNode(\n          seenNodes,\n          labeledNodes,\n          includedItems,\n          depIdMapping,\n          i,\n          true, // isImporter\n        ),\n      )\n      .filter(Boolean)\n      .join('\\n')\n  )\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": "1.0.0-rc.6",
+  "version": "1.0.0-rc.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -24,25 +24,25 @@
     "graph-run": "^1.1.0",
     "path-scurry": "^2.0.0",
     "promise-call-limit": "^3.0.2",
-    "@vltpkg/cmd-shim": "1.0.0-rc.6",
-    "@vltpkg/dep-id": "1.0.0-rc.6",
-    "@vltpkg/dss-breadcrumb": "1.0.0-rc.6",
-    "@vltpkg/error-cause": "1.0.0-rc.6",
-    "@vltpkg/fast-split": "1.0.0-rc.6",
-    "@vltpkg/init": "1.0.0-rc.6",
-    "@vltpkg/output": "1.0.0-rc.6",
-    "@vltpkg/package-json": "1.0.0-rc.6",
-    "@vltpkg/package-info": "1.0.0-rc.6",
-    "@vltpkg/pick-manifest": "1.0.0-rc.6",
-    "@vltpkg/query": "1.0.0-rc.6",
-    "@vltpkg/security-archive": "1.0.0-rc.6",
-    "@vltpkg/run": "1.0.0-rc.6",
-    "@vltpkg/rollback-remove": "1.0.0-rc.6",
-    "@vltpkg/satisfies": "1.0.0-rc.6",
-    "@vltpkg/spec": "1.0.0-rc.6",
-    "@vltpkg/types": "1.0.0-rc.6",
-    "@vltpkg/vlt-json": "1.0.0-rc.6",
-    "@vltpkg/workspaces": "1.0.0-rc.6"
+    "@vltpkg/cmd-shim": "1.0.0-rc.8",
+    "@vltpkg/dep-id": "1.0.0-rc.8",
+    "@vltpkg/dss-breadcrumb": "1.0.0-rc.8",
+    "@vltpkg/error-cause": "1.0.0-rc.8",
+    "@vltpkg/init": "1.0.0-rc.8",
+    "@vltpkg/fast-split": "1.0.0-rc.8",
+    "@vltpkg/output": "1.0.0-rc.8",
+    "@vltpkg/package-info": "1.0.0-rc.8",
+    "@vltpkg/package-json": "1.0.0-rc.8",
+    "@vltpkg/pick-manifest": "1.0.0-rc.8",
+    "@vltpkg/query": "1.0.0-rc.8",
+    "@vltpkg/rollback-remove": "1.0.0-rc.8",
+    "@vltpkg/run": "1.0.0-rc.8",
+    "@vltpkg/satisfies": "1.0.0-rc.8",
+    "@vltpkg/spec": "1.0.0-rc.8",
+    "@vltpkg/security-archive": "1.0.0-rc.8",
+    "@vltpkg/types": "1.0.0-rc.8",
+    "@vltpkg/vlt-json": "1.0.0-rc.8",
+    "@vltpkg/workspaces": "1.0.0-rc.8"
   },
   "devDependencies": {
     "@eslint/js": "^9.34.0",
@@ -55,7 +55,7 @@
     "typedoc": "~0.27.9",
     "typescript": "5.7.3",
     "typescript-eslint": "^8.40.0",
-    "@vltpkg/vlt-json": "1.0.0-rc.6"
+    "@vltpkg/vlt-json": "1.0.0-rc.8"
   },
   "license": "BSD-2-Clause-Patent",
   "engines": {