@shumoku/core 0.2.3 → 0.2.5

package/dist/hierarchical.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Hierarchical sheet generation utilities
+ * Shared logic for building child sheets with export connectors
+ */
+import type { LayoutResult, NetworkGraph } from './models/types.js';
+export interface SheetData {
+    graph: NetworkGraph;
+    layout: LayoutResult;
+}
+export interface LayoutEngine {
+    layoutAsync(graph: NetworkGraph): Promise<LayoutResult>;
+}
+/**
+ * Check if a node is a virtual export connector
+ */
+export declare function isExportNode(nodeId: string): boolean;
+/**
+ * Check if a link is a virtual export connector link
+ */
+export declare function isExportLink(linkId: string): boolean;
+/**
+ * Build hierarchical sheets from a root graph
+ *
+ * Creates child sheets for each subgraph with:
+ * - Filtered nodes (only those belonging to the subgraph)
+ * - Internal links (both endpoints in subgraph)
+ * - Export connector nodes/links for boundary connections
+ *
+ * @param graph - Root network graph with subgraphs
+ * @param rootLayout - Layout result for the root graph
+ * @param layoutEngine - Engine to layout child sheets
+ * @returns Map of sheet ID to SheetData (includes 'root')
+ */
+export declare function buildHierarchicalSheets(graph: NetworkGraph, rootLayout: LayoutResult, layoutEngine: LayoutEngine): Promise<Map<string, SheetData>>;
+//# sourceMappingURL=hierarchical.d.ts.map

package/dist/hierarchical.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hierarchical.d.ts","sourceRoot":"","sources":["../src/hierarchical.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAQ,YAAY,EAAkB,MAAM,mBAAmB,CAAA;AAazF,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,YAAY,CAAA;IACnB,MAAM,EAAE,YAAY,CAAA;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;CACxD;AAgBD;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEpD;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,YAAY,EACxB,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAsBjC"}

package/dist/hierarchical.js

@@ -0,0 +1,176 @@
+/**
+ * Hierarchical sheet generation utilities
+ * Shared logic for building child sheets with export connectors
+ */
+// ============================================
+// Constants
+// ============================================
+const EXPORT_NODE_PREFIX = '__export_';
+const EXPORT_LINK_PREFIX = '__export_link_';
+// ============================================
+// Type Guards
+// ============================================
+/**
+ * Check if a node is a virtual export connector
+ */
+export function isExportNode(nodeId) {
+    return nodeId.startsWith(EXPORT_NODE_PREFIX);
+}
+/**
+ * Check if a link is a virtual export connector link
+ */
+export function isExportLink(linkId) {
+    return linkId.startsWith(EXPORT_LINK_PREFIX);
+}
+// ============================================
+// Main Function
+// ============================================
+/**
+ * Build hierarchical sheets from a root graph
+ *
+ * Creates child sheets for each subgraph with:
+ * - Filtered nodes (only those belonging to the subgraph)
+ * - Internal links (both endpoints in subgraph)
+ * - Export connector nodes/links for boundary connections
+ *
+ * @param graph - Root network graph with subgraphs
+ * @param rootLayout - Layout result for the root graph
+ * @param layoutEngine - Engine to layout child sheets
+ * @returns Map of sheet ID to SheetData (includes 'root')
+ */
+export async function buildHierarchicalSheets(graph, rootLayout, layoutEngine) {
+    const sheets = new Map();
+    // Add root sheet
+    sheets.set('root', { graph, layout: rootLayout });
+    if (!graph.subgraphs || graph.subgraphs.length === 0) {
+        return sheets;
+    }
+    // Mark subgraphs as clickable
+    for (const sg of graph.subgraphs) {
+        sg.file = sg.id;
+    }
+    // Build child sheets
+    for (const sg of graph.subgraphs) {
+        const childSheet = await buildChildSheet(graph, sg, layoutEngine);
+        sheets.set(sg.id, childSheet);
+    }
+    return sheets;
+}
+// ============================================
+// Internal Functions
+// ============================================
+async function buildChildSheet(rootGraph, subgraph, layoutEngine) {
+    // Get nodes belonging to this subgraph
+    const childNodes = rootGraph.nodes.filter((n) => n.parent === subgraph.id);
+    const childNodeIds = new Set(childNodes.map((n) => n.id));
+    // Get internal links (both endpoints in subgraph)
+    const childLinks = rootGraph.links.filter((l) => {
+        const fromNode = typeof l.from === 'string' ? l.from : l.from.node;
+        const toNode = typeof l.to === 'string' ? l.to : l.to.node;
+        return childNodeIds.has(fromNode) && childNodeIds.has(toNode);
+    });
+    // Generate export connectors for boundary connections
+    const { exportNodes, exportLinks } = generateExportConnectors(rootGraph, subgraph.id, childNodeIds);
+    // Build child graph
+    const childGraph = {
+        ...rootGraph,
+        name: subgraph.label,
+        nodes: [
+            ...childNodes.map((n) => ({ ...n, parent: undefined })),
+            ...exportNodes,
+        ],
+        links: [...childLinks, ...exportLinks],
+        subgraphs: undefined,
+    };
+    // Layout child sheet
+    const childLayout = await layoutEngine.layoutAsync(childGraph);
+    return { graph: childGraph, layout: childLayout };
+}
+function generateExportConnectors(rootGraph, subgraphId, childNodeIds) {
+    const exportNodes = [];
+    const exportLinks = [];
+    const exportPoints = new Map();
+    // Find boundary links
+    for (const link of rootGraph.links) {
+        const fromNode = typeof link.from === 'string' ? link.from : link.from.node;
+        const toNode = typeof link.to === 'string' ? link.to : link.to.node;
+        const fromPort = typeof link.from === 'object' ? link.from.port : undefined;
+        const toPort = typeof link.to === 'object' ? link.to.port : undefined;
+        const fromInside = childNodeIds.has(fromNode);
+        const toInside = childNodeIds.has(toNode);
+        if (fromInside && !toInside) {
+            // Outgoing connection
+            const key = `${subgraphId}:${fromNode}:${fromPort || ''}`;
+            if (!exportPoints.has(key)) {
+                const destSubgraph = findNodeSubgraph(rootGraph, toNode);
+                exportPoints.set(key, {
+                    subgraphId,
+                    device: fromNode,
+                    port: fromPort,
+                    destSubgraphLabel: destSubgraph?.label || toNode,
+                    destDevice: toNode,
+                    destPort: toPort,
+                    isSource: true,
+                });
+            }
+        }
+        else if (!fromInside && toInside) {
+            // Incoming connection
+            const key = `${subgraphId}:${toNode}:${toPort || ''}`;
+            if (!exportPoints.has(key)) {
+                const destSubgraph = findNodeSubgraph(rootGraph, fromNode);
+                exportPoints.set(key, {
+                    subgraphId,
+                    device: toNode,
+                    port: toPort,
+                    destSubgraphLabel: destSubgraph?.label || fromNode,
+                    destDevice: fromNode,
+                    destPort: fromPort,
+                    isSource: false,
+                });
+            }
+        }
+    }
+    // Create export nodes and links
+    for (const [key, exportPoint] of exportPoints) {
+        const exportId = key.replace(/:/g, '_');
+        // Export node
+        exportNodes.push({
+            id: `${EXPORT_NODE_PREFIX}${exportId}`,
+            label: exportPoint.destSubgraphLabel,
+            shape: 'stadium',
+            metadata: {
+                _isExport: true,
+                _destSubgraph: exportPoint.destSubgraphLabel,
+                _destDevice: exportPoint.destDevice,
+                _destPort: exportPoint.destPort,
+                _isSource: exportPoint.isSource,
+            },
+        });
+        // Export link
+        const exportNodeId = `${EXPORT_NODE_PREFIX}${exportId}`;
+        const deviceEndpoint = exportPoint.port
+            ? { node: exportPoint.device, port: exportPoint.port }
+            : exportPoint.device;
+        exportLinks.push({
+            id: `${EXPORT_LINK_PREFIX}${exportId}`,
+            from: exportPoint.isSource ? deviceEndpoint : exportNodeId,
+            to: exportPoint.isSource ? exportNodeId : deviceEndpoint,
+            type: 'dashed',
+            arrow: 'forward',
+            metadata: {
+                _destSubgraphLabel: exportPoint.destSubgraphLabel,
+                _destDevice: exportPoint.destDevice,
+                _destPort: exportPoint.destPort,
+            },
+        });
+    }
+    return { exportNodes, exportLinks };
+}
+function findNodeSubgraph(graph, nodeId) {
+    const node = graph.nodes.find((n) => n.id === nodeId);
+    if (!node?.parent)
+        return undefined;
+    return graph.subgraphs?.find((s) => s.id === node.parent);
+}
+//# sourceMappingURL=hierarchical.js.map

package/dist/hierarchical.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hierarchical.js","sourceRoot":"","sources":["../src/hierarchical.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,+CAA+C;AAC/C,YAAY;AACZ,+CAA+C;AAE/C,MAAM,kBAAkB,GAAG,WAAW,CAAA;AACtC,MAAM,kBAAkB,GAAG,gBAAgB,CAAA;AAyB3C,+CAA+C;AAC/C,cAAc;AACd,+CAA+C;AAE/C;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,OAAO,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAA;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,OAAO,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAA;AAC9C,CAAC;AAED,+CAA+C;AAC/C,gBAAgB;AAChB,+CAA+C;AAE/C;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAAmB,EACnB,UAAwB,EACxB,YAA0B;IAE1B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqB,CAAA;IAE3C,iBAAiB;IACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;IAEjD,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,8BAA8B;IAC9B,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,CAAA;IACjB,CAAC;IAED,qBAAqB;IACrB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,YAAY,CAAC,CAAA;QACjE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,+CAA+C;AAC/C,qBAAqB;AACrB,+CAA+C;AAE/C,KAAK,UAAU,eAAe,CAC5B,SAAuB,EACvB,QAAkB,EAClB,YAA0B;IAE1B,uCAAuC;IACvC,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC1E,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEzD,kDAAkD;IAClD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAClE,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA;QAC1D,OAAO,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/D,CAAC,CAAC,CAAA;IAEF,sDAAsD;IACtD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,wBAAwB,CAC3D,SAAS,EACT,QAAQ,CAAC,EAAE,EACX,YAAY,CACb,CAAA;IAED,oBAAoB;IACpB,MAAM,UAAU,GAAiB;QAC/B,GAAG,SAAS;QACZ,IAAI,EAAE,QAAQ,CAAC,KAAK;QACpB,KAAK,EAAE;YACL,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YACvD,GAAG,WAAW;SACf;QACD,KAAK,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;QACtC,SAAS,EAAE,SAAS;KACrB,CAAA;IAED,qBAAqB;IACrB,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAE9D,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,CAAA;AACnD,CAAC;AAED,SAAS,wBAAwB,CAC/B,SAAuB,EACvB,UAAkB,EAClB,YAAyB;IAEzB,MAAM,WAAW,GAAW,EAAE,CAAA;IAC9B,MAAM,WAAW,GAAW,EAAE,CAAA;IAC9B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuB,CAAA;IAEnD,sBAAsB;IACtB,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;QAC3E,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAA;QACnE,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QAC3E,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QAErE,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC7C,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAEzC,IAAI,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,sBAAsB;YACtB,MAAM,GAAG,GAAG,GAAG,UAAU,IAAI,QAAQ,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAA;YACzD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;gBACxD,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE;oBACpB,UAAU;oBACV,MAAM,EAAE,QAAQ;oBAChB,IAAI,EAAE,QAAQ;oBACd,iBAAiB,EAAE,YAAY,EAAE,KAAK,IAAI,MAAM;oBAChD,UAAU,EAAE,MAAM;oBAClB,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;YACnC,sBAAsB;YACtB,MAAM,GAAG,GAAG,GAAG,UAAU,IAAI,MAAM,IAAI,MAAM,IAAI,EAAE,EAAE,CAAA;YACrD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAC1D,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE;oBACpB,UAAU;oBACV,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,MAAM;oBACZ,iBAAiB,EAAE,YAAY,EAAE,KAAK,IAAI,QAAQ;oBAClD,UAAU,EAAE,QAAQ;oBACpB,QAAQ,EAAE,QAAQ;oBAClB,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,KAAK,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,YAAY,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAEvC,cAAc;QACd,WAAW,CAAC,IAAI,CAAC;YACf,EAAE,EAAE,GAAG,kBAAkB,GAAG,QAAQ,EAAE;YACtC,KAAK,EAAE,WAAW,CAAC,iBAAiB;YACpC,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE;gBACR,SAAS,EAAE,IAAI;gBACf,aAAa,EAAE,WAAW,CAAC,iBAAiB;gBAC5C,WAAW,EAAE,WAAW,CAAC,UAAU;gBACnC,SAAS,EAAE,WAAW,CAAC,QAAQ;gBAC/B,SAAS,EAAE,WAAW,CAAC,QAAQ;aAChC;SACF,CAAC,CAAA;QAEF,cAAc;QACd,MAAM,YAAY,GAAG,GAAG,kBAAkB,GAAG,QAAQ,EAAE,CAAA;QACvD,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI;YACrC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE;YACtD,CAAC,CAAC,WAAW,CAAC,MAAM,CAAA;QAEtB,WAAW,CAAC,IAAI,CAAC;YACf,EAAE,EAAE,GAAG,kBAAkB,GAAG,QAAQ,EAAE;YACtC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY;YAC1D,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,cAAc;YACxD,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE;gBACR,kBAAkB,EAAE,WAAW,CAAC,iBAAiB;gBACjD,WAAW,EAAE,WAAW,CAAC,UAAU;gBACnC,SAAS,EAAE,WAAW,CAAC,QAAQ;aAChC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAA;AACrC,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAmB,EAAE,MAAc;IAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,CAAA;IACrD,IAAI,CAAC,IAAI,EAAE,MAAM;QAAE,OAAO,SAAS,CAAA;IACnC,OAAO,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,CAAA;AAC3D,CAAC"}

package/dist/index.d.ts

@@ -2,6 +2,7 @@
  * @shumoku/core - Network topology visualization core library
  */
 export * from './constants.js';
+export * from './hierarchical.js';
 export * from './icons/index.js';
 export * from './layout/index.js';
 export * from './models/index.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,cAAc,gBAAgB,CAAA;AAE9B,cAAc,kBAAkB,CAAA;AAEhC,cAAc,mBAAmB,CAAA;AAEjC,cAAc,mBAAmB,CAAA;AAEjC,cAAc,mBAAmB,CAAA;AAGjC,eAAO,MAAM,OAAO,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,cAAc,gBAAgB,CAAA;AAE9B,cAAc,mBAAmB,CAAA;AAEjC,cAAc,kBAAkB,CAAA;AAEhC,cAAc,mBAAmB,CAAA;AAEjC,cAAc,mBAAmB,CAAA;AAEjC,cAAc,mBAAmB,CAAA;AAGjC,eAAO,MAAM,OAAO,UAAU,CAAA"}

package/dist/index.js

@@ -3,6 +3,8 @@
  */
 // Constants
 export * from './constants.js';
+// Hierarchical
+export * from './hierarchical.js';
 // Icons
 export * from './icons/index.js';
 // Layout

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY;AACZ,cAAc,gBAAgB,CAAA;AAC9B,QAAQ;AACR,cAAc,kBAAkB,CAAA;AAChC,SAAS;AACT,cAAc,mBAAmB,CAAA;AACjC,SAAS;AACT,cAAc,mBAAmB,CAAA;AACjC,SAAS;AACT,cAAc,mBAAmB,CAAA;AAEjC,UAAU;AACV,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY;AACZ,cAAc,gBAAgB,CAAA;AAC9B,eAAe;AACf,cAAc,mBAAmB,CAAA;AACjC,QAAQ;AACR,cAAc,kBAAkB,CAAA;AAChC,SAAS;AACT,cAAc,mBAAmB,CAAA;AACjC,SAAS;AACT,cAAc,mBAAmB,CAAA;AACjC,SAAS;AACT,cAAc,mBAAmB,CAAA;AAEjC,UAAU;AACV,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAA"}

package/dist/layout/hierarchical.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hierarchical.d.ts","sourceRoot":"","sources":["../../src/layout/hierarchical.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAqBH,OAAO,EAGL,KAAK,eAAe,EAGpB,KAAK,YAAY,EAGjB,KAAK,YAAY,EAIlB,MAAM,oBAAoB,CAAA;AAwG3B,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAgBD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,GAAG,CAA0B;gBAEzB,OAAO,CAAC,EAAE,yBAAyB;IAK/C;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAwC/B,OAAO,CAAC,mBAAmB;IAarB,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IA8B7D;;OAEG;IACH,OAAO,CAAC,aAAa;IA+XrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuR3B,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY;IAczC,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,mBAAmB;IAgE3B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,oBAAoB;IAqD5B,OAAO,CAAC,uBAAuB;IAwE/B,4CAA4C;IAC5C,OAAO,CAAC,aAAa;IAmBrB,kDAAkD;IAClD,OAAO,CAAC,sBAAsB;CAiB/B;AAGD,eAAO,MAAM,kBAAkB,oBAA2B,CAAA"}
+{"version":3,"file":"hierarchical.d.ts","sourceRoot":"","sources":["../../src/layout/hierarchical.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAqBH,OAAO,EAGL,KAAK,eAAe,EAGpB,KAAK,YAAY,EAGjB,KAAK,YAAY,EAIlB,MAAM,oBAAoB,CAAA;AAgH3B,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAgBD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,GAAG,CAA0B;gBAEzB,OAAO,CAAC,EAAE,yBAAyB;IAK/C;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAwC/B,OAAO,CAAC,mBAAmB;IAarB,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IA8B7D;;OAEG;IACH,OAAO,CAAC,aAAa;IAoarB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAqV3B,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY;IAczC,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,mBAAmB;IAgE3B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,oBAAoB;IAqD5B,OAAO,CAAC,uBAAuB;IAwE/B,4CAA4C;IAC5C,OAAO,CAAC,aAAa;IAmBrB,kDAAkD;IAClD,OAAO,CAAC,sBAAsB;CAiB/B;AAGD,eAAO,MAAM,kBAAkB,oBAA2B,CAAA"}

package/dist/layout/hierarchical.js

@@ -13,6 +13,14 @@ function toEndpoint(endpoint) {
     if (typeof endpoint === 'string') {
         return { node: endpoint };
     }
+    // Convert pin to port for subgraph boundary connections
+    if ('pin' in endpoint && endpoint.pin) {
+        return {
+            node: endpoint.node,
+            port: endpoint.pin, // Use pin as port
+            ip: endpoint.ip,
+        };
+    }
     return endpoint;
 }
 /** Collect ports for each node from links */
@@ -343,15 +351,39 @@ export class HierarchicalLayout {
             }
             const sgPadding = subgraph.style?.padding ?? options.subgraphPadding;
             const sgEdges = edgesByContainer.get(subgraph.id) || [];
-            return {
+            // Set minimum size for empty subgraphs (e.g., those with file references)
+            const hasFileRef = !!subgraph.file;
+            const minWidth = hasFileRef && childNodes.length === 0 ? 200 : undefined;
+            const minHeight = hasFileRef && childNodes.length === 0 ? 100 : undefined;
+            // Subgraph-specific direction (can override parent)
+            const sgDirection = subgraph.direction
+                ? this.toElkDirection(subgraph.direction)
+                : elkDirection;
+            const elkNode = {
                 id: subgraph.id,
                 labels: [{ text: subgraph.label }],
                 children: childNodes,
                 edges: sgEdges,
                 layoutOptions: {
+                    'elk.algorithm': 'layered',
+                    'elk.direction': sgDirection,
+                    'elk.hierarchyHandling': 'INCLUDE_CHILDREN',
                     'elk.padding': `[top=${sgPadding + options.subgraphLabelHeight},left=${sgPadding},bottom=${sgPadding},right=${sgPadding}]`,
+                    'elk.spacing.nodeNode': String(options.nodeSpacing),
+                    'elk.layered.spacing.nodeNodeBetweenLayers': String(options.rankSpacing),
+                    'elk.edgeRouting': 'ORTHOGONAL',
+                    // Use ROOT coordinate system for consistent edge/shape positioning
+                    'org.eclipse.elk.json.edgeCoords': 'ROOT',
+                    'org.eclipse.elk.json.shapeCoords': 'ROOT',
                 },
             };
+            // Note: Subgraph pins are resolved to device:port in parser
+            // ELK handles cross-hierarchy edges directly with INCLUDE_CHILDREN
+            if (minWidth)
+                elkNode.width = minWidth;
+            if (minHeight)
+                elkNode.height = minHeight;
+            return elkNode;
         };
         // Build root children
         const buildRootChildren = (edgesByContainer) => {
@@ -382,11 +414,15 @@ export class HierarchicalLayout {
             }
             return children;
         };
-        // Build node to parent map
+        // Build node to parent map (includes both nodes and subgraphs)
         const nodeParentMap = new Map();
         for (const node of graph.nodes) {
             nodeParentMap.set(node.id, node.parent);
         }
+        // Add subgraphs to parent map for LCA calculation
+        for (const sg of subgraphMap.values()) {
+            nodeParentMap.set(sg.id, sg.parent);
+        }
         // Find LCA (Lowest Common Ancestor) of two nodes
         const findLCA = (nodeA, nodeB) => {
             const ancestorsA = new Set();
@@ -427,6 +463,8 @@ export class HierarchicalLayout {
             if (link.redundancy && isHALink(from.node, to.node)) {
                 continue;
             }
+            // ELK port reference format: nodeId:portId in sources/targets
+            // Note: Pin references are already resolved to device:port in parser
             const sourceId = from.port ? `${from.node}:${from.port}` : from.node;
             const targetId = to.port ? `${to.node}:${to.port}` : to.node;
             const edge = {
@@ -451,13 +489,17 @@ export class HierarchicalLayout {
                     },
                 ];
             }
-            // Find LCA and place edge in appropriate container
+            // Determine edge container using LCA (Lowest Common Ancestor)
+            // All pin references are already resolved to actual devices in parser
             const lca = findLCA(from.node, to.node);
             let container = lca;
             if (container === from.node || container === to.node) {
                 container = nodeParentMap.get(container);
             }
             const containerId = container && subgraphMap.has(container) ? container : 'root';
+            if (!edgesByContainer.has(containerId)) {
+                edgesByContainer.set(containerId, []);
+            }
             edgesByContainer.get(containerId).push(edge);
         }
         // Dynamic edge spacing
@@ -519,11 +561,12 @@ export class HierarchicalLayout {
             if (subgraphMap.has(elkNode.id)) {
                 // Subgraph
                 const sg = subgraphMap.get(elkNode.id);
-                layoutSubgraphs.set(elkNode.id, {
+                const layoutSg = {
                     id: elkNode.id,
                     bounds: { x, y, width, height },
                     subgraph: sg,
-                });
+                };
+                layoutSubgraphs.set(elkNode.id, layoutSg);
                 if (elkNode.children) {
                     for (const child of elkNode.children) {
                         processElkNode(child);
@@ -630,11 +673,32 @@ export class HierarchicalLayout {
                     const id = link.id || `link-${index}`;
                     const fromEndpoint = toEndpoint(link.from);
                     const toEndpoint_ = toEndpoint(link.to);
+                    // Get layout info for endpoints (can be nodes or subgraphs)
                     const fromNode = layoutNodes.get(fromEndpoint.node);
                     const toNode = layoutNodes.get(toEndpoint_.node);
-                    if (!fromNode || !toNode)
+                    const fromSubgraph = layoutSubgraphs.get(fromEndpoint.node);
+                    const toSubgraph = layoutSubgraphs.get(toEndpoint_.node);
+                    // Get position and size for from/to (either node or subgraph)
+                    // LayoutSubgraph uses bounds {x, y, width, height}, convert to position/size format
+                    const fromLayout = fromNode || (fromSubgraph ? {
+                        position: {
+                            x: fromSubgraph.bounds.x + fromSubgraph.bounds.width / 2,
+                            y: fromSubgraph.bounds.y + fromSubgraph.bounds.height / 2,
+                        },
+                        size: { width: fromSubgraph.bounds.width, height: fromSubgraph.bounds.height },
+                    } : null);
+                    const toLayout = toNode || (toSubgraph ? {
+                        position: {
+                            x: toSubgraph.bounds.x + toSubgraph.bounds.width / 2,
+                            y: toSubgraph.bounds.y + toSubgraph.bounds.height / 2,
+                        },
+                        size: { width: toSubgraph.bounds.width, height: toSubgraph.bounds.height },
+                    } : null);
+                    if (!fromLayout || !toLayout)
                         continue;
                     let points = [];
+                    // Check if this is a subgraph-to-subgraph edge
+                    const isSubgraphEdge = fromSubgraph || toSubgraph;
                     // HA edges inside HA containers: use ELK's edge routing directly
                     if (isHAContainer(container.id) && elkEdge.sections && elkEdge.sections.length > 0) {
                         const section = elkEdge.sections[0];
@@ -646,38 +710,76 @@ export class HierarchicalLayout {
                         }
                         points.push({ x: section.endPoint.x, y: section.endPoint.y });
                     }
-                    else if (!isHAContainer(container.id)) {
-                        // Normal vertical edges
-                        const fromBottomY = fromNode.position.y + fromNode.size.height / 2;
-                        const toTopY = toNode.position.y - toNode.size.height / 2;
+                    else if (isSubgraphEdge) {
+                        // Subgraph edges: use ELK's coordinates directly
                         if (elkEdge.sections && elkEdge.sections.length > 0) {
                             const section = elkEdge.sections[0];
-                            points.push({
-                                x: section.startPoint.x,
-                                y: fromBottomY,
-                            });
+                            points.push({ x: section.startPoint.x, y: section.startPoint.y });
                             if (section.bendPoints) {
                                 for (const bp of section.bendPoints) {
                                     points.push({ x: bp.x, y: bp.y });
                                 }
                             }
-                            points.push({
-                                x: section.endPoint.x,
-                                y: toTopY,
-                            });
+                            points.push({ x: section.endPoint.x, y: section.endPoint.y });
+                        }
+                        else {
+                            // Fallback: simple line between centers
+                            points = [
+                                { x: fromLayout.position.x, y: fromLayout.position.y + fromLayout.size.height / 2 },
+                                { x: toLayout.position.x, y: toLayout.position.y - toLayout.size.height / 2 },
+                            ];
+                        }
+                    }
+                    else if (!isHAContainer(container.id)) {
+                        // Check if this is a cross-subgraph edge
+                        const fromParent = graph.nodes.find((n) => n.id === fromEndpoint.node)?.parent;
+                        const toParent = graph.nodes.find((n) => n.id === toEndpoint_.node)?.parent;
+                        const isCrossSubgraph = fromParent !== toParent;
+                        if (elkEdge.sections && elkEdge.sections.length > 0) {
+                            const section = elkEdge.sections[0];
+                            if (isCrossSubgraph) {
+                                // Cross-subgraph edges: use ELK's coordinates directly
+                                points.push({ x: section.startPoint.x, y: section.startPoint.y });
+                                if (section.bendPoints) {
+                                    for (const bp of section.bendPoints) {
+                                        points.push({ x: bp.x, y: bp.y });
+                                    }
+                                }
+                                points.push({ x: section.endPoint.x, y: section.endPoint.y });
+                            }
+                            else {
+                                // Same-subgraph edges: snap to node boundaries for cleaner look
+                                const fromBottomY = fromLayout.position.y + fromLayout.size.height / 2;
+                                const toTopY = toLayout.position.y - toLayout.size.height / 2;
+                                points.push({
+                                    x: section.startPoint.x,
+                                    y: fromBottomY,
+                                });
+                                if (section.bendPoints) {
+                                    for (const bp of section.bendPoints) {
+                                        points.push({ x: bp.x, y: bp.y });
+                                    }
+                                }
+                                points.push({
+                                    x: section.endPoint.x,
+                                    y: toTopY,
+                                });
+                            }
                         }
                         else {
-                            points = this.generateOrthogonalPath({ x: fromNode.position.x, y: fromBottomY }, { x: toNode.position.x, y: toTopY });
+                            const fromBottomY = fromLayout.position.y + fromLayout.size.height / 2;
+                            const toTopY = toLayout.position.y - toLayout.size.height / 2;
+                            points = this.generateOrthogonalPath({ x: fromLayout.position.x, y: fromBottomY }, { x: toLayout.position.x, y: toTopY });
                         }
                     }
                     else {
                         // HA edge fallback: simple horizontal line
-                        const leftNode = fromNode.position.x < toNode.position.x ? fromNode : toNode;
-                        const rightNode = fromNode.position.x < toNode.position.x ? toNode : fromNode;
-                        const y = (leftNode.position.y + rightNode.position.y) / 2;
+                        const leftLayout = fromLayout.position.x < toLayout.position.x ? fromLayout : toLayout;
+                        const rightLayout = fromLayout.position.x < toLayout.position.x ? toLayout : fromLayout;
+                        const y = (leftLayout.position.y + rightLayout.position.y) / 2;
                         points = [
-                            { x: leftNode.position.x + leftNode.size.width / 2, y },
-                            { x: rightNode.position.x - rightNode.size.width / 2, y },
+                            { x: leftLayout.position.x + leftLayout.size.width / 2, y },
+                            { x: rightLayout.position.x - rightLayout.size.width / 2, y },
                         ];
                     }
                     layoutLinks.set(id, {