@tstdl/base 0.93.126 → 0.93.127

package/injector/graph.js

@@ -1,5 +1,6 @@
 import { toArray } from '../utils/array/array.js';
 import { isArray, isDefined, isFunction } from '../utils/type-guards.js';
+import { typeOf } from '../utils/type-of.js';
 import { Injector } from './injector.js';
 import { afterResolve } from './interfaces.js';
 import { isClassProvider, isFactoryProvider, isProviderWithInitializer, isTokenProvider, isValueProvider } from './provider.js';
@@ -185,8 +186,8 @@ export function getDependencyGraph(injector, options = {}) {
                     label += ' (multi)';
                 }
                 if (isDefined(node.argument)) {
-                    const s = JSON.stringify(node.argument);
-                    label += `\narg: ${s.length > 20 ? `${s.substring(0, 17)}...` : s}`;
+                    const s = isFunction(node.argument) ? typeOf(node.argument) : JSON.stringify(node.argument) ?? 'Could not stringify argument';
+                    label += `\narg: ${(s.length > 20) ? `${s.slice(0, 17)}...` : s}`;
                 }
                 if (node.isCached) {
                     label += '\n(cached)';
@@ -281,6 +282,7 @@ export function renderDependencyGraphToDot(graph, options = {}) {
         return tokenToId.get(token);
     };
     const lines = ['strict digraph G {'];
+    // --- Graph Global Attributes ---
     if (bgcolor) {
         lines.push(`  bgcolor=${JSON.stringify(bgcolor)};`);
     }
@@ -293,6 +295,7 @@ export function renderDependencyGraphToDot(graph, options = {}) {
     lines.push(`  node [shape=box, fontname=${JSON.stringify(fontname)}, style=filled, fillcolor="#f9f9f9", fontsize=${fontsize}];`);
     lines.push(`  edge [fontname=${JSON.stringify(fontname)}, fontsize=${fontsize - 1}];`);
     lines.push(`  rankdir=${rankdir}; compound=true;`);
+    // --- 1. Render Edges ---
     for (const edge of graph.edges) {
         const color = edge.isCycle ? '#e74c3c' : edge.color;
         const penwidth = edge.isCycle ? 2.0 : edge.penwidth;
@@ -304,18 +307,30 @@ export function renderDependencyGraphToDot(graph, options = {}) {
         ].filter(Boolean).join(', ');
         lines.push(`  ${getTokenId(edge.from)} -> ${getTokenId(edge.to)} [${attributes}];`);
     }
+    // --- Helper: Render Node Definition ---
     const renderNode = (node) => {
         const metadata = node.metadata;
         const lifecycle = metadata.lifecycle;
         const first = lifecycle.split('|')[0];
-        const colors = { singleton: '#d1e7dd', injector: '#fff3cd', resolution: '#cfe2ff', transient: '#f8d7da' };
-        const shapes = { singleton: 'doubleoctagon', injector: 'component', resolution: 'ellipse', transient: 'box' };
+        const colors = {
+            singleton: '#d1e7dd',
+            injector: '#fff3cd',
+            resolution: '#cfe2ff',
+            transient: '#f8d7da',
+        };
+        const shapes = {
+            singleton: 'doubleoctagon',
+            injector: 'component',
+            resolution: 'ellipse',
+            transient: 'box',
+        };
         const name = node.name + (metadata.hasAfterResolve ? ' *' : '');
         const label = showMetadata ? `${name}\n[${lifecycle}, ${metadata.type}]` : name;
         const fillcolor = colors[first] ?? '#f9f9f9';
         const shape = shapes[first] ?? 'box';
         return `    ${getTokenId(node.token)} [label=${JSON.stringify(label)}, fillcolor=${JSON.stringify(fillcolor)}, shape=${JSON.stringify(shape)}];`;
     };
+    // --- 2. Render Injector Clusters and Nodes ---
     const injectors = groupByInjector ? Array.from(graph.injectorNames.keys()) : [0];
     for (const injectorId of injectors) {
         if (groupByInjector) {
@@ -330,11 +345,14 @@ export function renderDependencyGraphToDot(graph, options = {}) {
                 if (!graph.nodes.has(owner)) {
                     continue;
                 }
-                const subNodes = Array.from(tokens).filter((token) => graph.nodes.has(token) && (!groupByInjector || graph.nodes.get(token).injectorId == injectorId)).map((token) => graph.nodes.get(token));
+                const subNodes = Array.from(tokens)
+                    .filter((token) => graph.nodes.has(token) && (!groupByInjector || graph.nodes.get(token).injectorId == injectorId))
+                    .map((token) => graph.nodes.get(token));
                 if (subNodes.length == 0) {
                     continue;
                 }
-                lines.push(`    subgraph cluster_${injectorId}_${getTokenId(owner)} { label = ${JSON.stringify(`Dynamic Resolutions of ${graph.nodes.get(owner).name}`)}; style = dashed; color = "#9b59b6"; fontname = ${JSON.stringify(fontname)}; fontsize = ${fontsize};`);
+                const ownerName = graph.nodes.get(owner).name;
+                lines.push(`    subgraph cluster_${injectorId}_${getTokenId(owner)} { label = ${JSON.stringify(`Dynamic Resolutions of ${ownerName}`)}; style = dashed; color = "#9b59b6"; fontname = ${JSON.stringify(fontname)}; fontsize = ${fontsize};`);
                 for (const node of subNodes) {
                     lines.push(renderNode(node));
                     inDynamic.add(node.token);
@@ -351,6 +369,7 @@ export function renderDependencyGraphToDot(graph, options = {}) {
             lines.push('  }');
         }
     }
+    // --- 3. Render Legend ---
     if (showLegend) {
         const legendFontSize = fontsize - 1;
         lines.push(`  subgraph cluster_legend { label = "Legend"; style = solid; color = gray; fontname = ${JSON.stringify(`${fontname}-Bold`)}; fontsize = ${fontsize + 1};`);
@@ -404,7 +423,9 @@ export function renderDependencyGraphToDot(graph, options = {}) {
         lines.push('    l_circular_from -> l_cached_from -> l_optional_from -> l_cross_from [style=invis];');
         lines.push('    l_circular_to -> l_cached_to -> l_optional_to -> l_cross_to [style=invis];');
         lines.push('    l_alias_from -> l_forward_from -> l_dynamic_from -> l_spacer_from [style=invis];');
+        lines.push('  }');
     }
+    lines.push('}');
     return lines.join('\n');
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.126",
+  "version": "0.93.127",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"