@eventcatalog/core 3.28.4 → 3.29.0

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-34MH7O22.js";
-import "../chunk-45JFXFTE.js";
+} from "../chunk-XN2XNAOY.js";
+import "../chunk-ZY6MUMIK.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -111,7 +111,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-BGEC3Y5J.js";
-import "../chunk-34MH7O22.js";
+} from "../chunk-NKN2LYFC.js";
+import "../chunk-XN2XNAOY.js";
 import "../chunk-4UVFXLPI.js";
-import "../chunk-45JFXFTE.js";
+import "../chunk-ZY6MUMIK.js";
 import "../chunk-5T63CXKU.js";
 export {
   log_build_default as default

package/dist/{chunk-TSBHPGIL.js → chunk-3YZL6CMP.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-4FMLF7P3.js";
+} from "./chunk-B3DM4RWS.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-4FMLF7P3.js → chunk-B3DM4RWS.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-45JFXFTE.js";
+} from "./chunk-ZY6MUMIK.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-BGEC3Y5J.js → chunk-NKN2LYFC.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-34MH7O22.js";
+} from "./chunk-XN2XNAOY.js";
 import {
   countResources,
   serializeCounts

package/dist/{chunk-34MH7O22.js → chunk-XN2XNAOY.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-45JFXFTE.js";
+} from "./chunk-ZY6MUMIK.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/{chunk-45JFXFTE.js → chunk-ZY6MUMIK.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-45JFXFTE.js";
+} from "./chunk-ZY6MUMIK.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -114,7 +114,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,8 +6,8 @@ import {
 } from "./chunk-PLNJC7NZ.js";
 import {
   log_build_default
-} from "./chunk-BGEC3Y5J.js";
-import "./chunk-34MH7O22.js";
+} from "./chunk-NKN2LYFC.js";
+import "./chunk-XN2XNAOY.js";
 import "./chunk-4UVFXLPI.js";
 import {
   runMigrations
@@ -22,13 +22,13 @@ import {
 } from "./chunk-3KXCGYET.js";
 import {
   generate
-} from "./chunk-TSBHPGIL.js";
+} from "./chunk-3YZL6CMP.js";
 import {
   logger
-} from "./chunk-4FMLF7P3.js";
+} from "./chunk-B3DM4RWS.js";
 import {
   VERSION
-} from "./chunk-45JFXFTE.js";
+} from "./chunk-ZY6MUMIK.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/generate.cjs

@@ -78,7 +78,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-TSBHPGIL.js";
-import "./chunk-4FMLF7P3.js";
-import "./chunk-45JFXFTE.js";
+} from "./chunk-3YZL6CMP.js";
+import "./chunk-B3DM4RWS.js";
+import "./chunk-ZY6MUMIK.js";
 import "./chunk-5T63CXKU.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.28.4";
+var version = "3.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-4FMLF7P3.js";
-import "../chunk-45JFXFTE.js";
+} from "../chunk-B3DM4RWS.js";
+import "../chunk-ZY6MUMIK.js";
 export {
   logger
 };

package/eventcatalog/src/utils/node-graphs/flows-node-graph.ts

@@ -22,6 +22,12 @@ interface Props {
   renderAllEdges?: boolean;
 }
 
+interface Maps {
+  messageMap: Map<string, any[]>;
+  serviceMap: Map<string, any[]>;
+  flowMap: Map<string, any[]>;
+}
+
 const getServiceNode = (step: any, serviceMap: Map<string, any[]>) => {
   const service = findInMap(serviceMap, step.service.id, step.service.version);
   return {
@@ -49,53 +55,58 @@ const getMessageNode = (step: any, messageMap: Map<string, any[]>) => {
   };
 };
 
-export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simple', renderAllEdges = false }: Props) => {
-  const graph = defaultFlow || createDagreGraph({ ranksep: 360, nodesep: 200 });
-  const nodes = [] as any,
-    edges = [] as any;
-
-  // Fetch all collections in parallel
-  const [flows, events, commands, queries, services] = await Promise.all([
-    getCollection('flows'),
-    getCollection('events'),
-    getCollection('commands'),
-    getCollection('queries'),
-    getCollection('services'),
-  ]);
-
-  const flow = flows.find((flow) => flow.data.id === id && flow.data.version === version);
-
-  // Nothing found...
-  if (!flow) {
-    return {
-      nodes: [],
-      edges: [],
-    };
-  }
+// Rewrite every id/source/target in a precomputed sub-flow graph with a
+// namespace prefix so inlined copies don't collide with the parent. Nested
+// `data.expandedNodes` / `data.expandedEdges` payloads are rewritten too so
+// the namespace chain stays unique when the same sub-flow is inlined under
+// multiple parents.
+const prefixGraph = (graph: { nodes: any[]; edges: any[] }, prefix: string) => {
+  if (!prefix) return graph;
+  const nodes = graph.nodes.map((n) => {
+    const next: any = { ...n, id: `${prefix}${n.id}` };
+    if (n.data?.expandedNodes || n.data?.expandedEdges) {
+      const nested = prefixGraph({ nodes: n.data.expandedNodes ?? [], edges: n.data.expandedEdges ?? [] }, prefix);
+      next.data = { ...n.data, expandedNodes: nested.nodes, expandedEdges: nested.edges };
+    }
+    return next;
+  });
+  const edges = graph.edges.map((e) => ({
+    ...e,
+    id: `${prefix}${e.id}`,
+    source: `${prefix}${e.source}`,
+    target: `${prefix}${e.target}`,
+  }));
+  return { nodes, edges };
+};
 
-  // Build maps for O(1) lookups
-  const messages = [...events, ...commands, ...queries];
-  const messageMap = createVersionedMap(messages);
-  const serviceMap = createVersionedMap(services);
-  const flowMap = createVersionedMap(flows);
+// `subFlowCache` keys each flow's graph by `id@version` so an N-times
+// referenced sub-flow is built once. `visited` short-circuits cycles.
+const buildFlowGraphInternal = (
+  flow: any,
+  maps: Maps,
+  mode: 'simple' | 'full',
+  subFlowCache: Map<string, { nodes: any[]; edges: any[] }>,
+  visited: Set<string>
+) => {
+  const nodes: any[] = [];
+  const edges: any[] = [];
 
-  const steps = flow?.data.steps || [];
+  const steps = flow?.data?.steps || [];
+  const stepNodeId = (stepId: any) => `step-${stepId}`;
 
-  //  Hydrate the steps with information they may need.
   const hydratedSteps = steps.map((step: any) => {
-    if (step.service) return getServiceNode(step, serviceMap);
-    if (step.flow) return getFlowNode(step, flowMap);
-    if (step.message) return getMessageNode(step, messageMap);
+    if (step.service) return getServiceNode(step, maps.serviceMap);
+    if (step.flow) return getFlowNode(step, maps.flowMap);
+    if (step.message) return getMessageNode(step, maps.messageMap);
     if (step.actor) return { ...step, type: 'actor', actor: step.actor };
     if (step.custom) return { ...step, type: 'custom', custom: step.custom };
     if (step.externalSystem) return { ...step, type: 'externalSystem', externalSystem: step.externalSystem };
     return { ...step, type: 'step' };
   });
 
-  // Create nodes
   hydratedSteps.forEach((step: any, index: number) => {
-    const node = {
-      id: `step-${step.id}`,
+    const node: NodeType = {
+      id: stepNodeId(step.id),
       sourcePosition: 'right',
       targetPosition: 'left',
       data: {
@@ -124,6 +135,21 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
         id: step.flow.data.id,
         version: step.flow.data.version,
       });
+
+      // Guard cycles; inline the sub-flow's graph so the client can expand on click.
+      const subFlowKey = `${step.flow.data.id}@${step.flow.data.version}`;
+      if (!visited.has(subFlowKey)) {
+        let cached = subFlowCache.get(subFlowKey);
+        if (!cached) {
+          cached = buildFlowGraphInternal(step.flow, maps, mode, subFlowCache, new Set([...visited, subFlowKey]));
+          subFlowCache.set(subFlowKey, cached);
+        }
+        if (cached.nodes.length > 0) {
+          const { nodes: childNodes, edges: childEdges } = prefixGraph(cached, `${node.id}__`);
+          node.data.expandedNodes = childNodes;
+          node.data.expandedEdges = childEdges;
+        }
+      }
     }
     if (step.message) {
       node.data.message = { ...step.message, ...step.message.data };
@@ -142,12 +168,10 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     nodes.push(node);
   });
 
-  // Create Edges
-  hydratedSteps.forEach((step: any, index: number) => {
+  hydratedSteps.forEach((step: any) => {
     let paths = step.next_steps || [];
 
     if (step.next_step) {
-      // If its a string or number
       if (!step.next_step?.id) {
         paths = [{ id: step.next_step }];
       } else {
@@ -165,8 +189,8 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     paths.forEach((path: any) => {
       edges.push({
         id: `step-${step.id}-step-${path.id}`,
-        source: `step-${step.id}`,
-        target: `step-${path.id}`,
+        source: stepNodeId(step.id),
+        target: stepNodeId(path.id),
         type: 'flow-edge',
         label: path.label,
         animated: true,
@@ -184,6 +208,45 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     });
   });
 
+  return { nodes, edges };
+};
+
+export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simple', renderAllEdges = false }: Props) => {
+  const graph = defaultFlow || createDagreGraph({ ranksep: 360, nodesep: 200 });
+
+  const [flows, events, commands, queries, services] = await Promise.all([
+    getCollection('flows'),
+    getCollection('events'),
+    getCollection('commands'),
+    getCollection('queries'),
+    getCollection('services'),
+  ]);
+
+  const flow = flows.find((flow) => flow.data.id === id && flow.data.version === version);
+
+  if (!flow) {
+    return {
+      nodes: [],
+      edges: [],
+    };
+  }
+
+  const messages = [...events, ...commands, ...queries];
+  const maps: Maps = {
+    messageMap: createVersionedMap(messages),
+    serviceMap: createVersionedMap(services),
+    flowMap: createVersionedMap(flows),
+  };
+
+  const subFlowCache = new Map<string, { nodes: any[]; edges: any[] }>();
+  const { nodes, edges } = buildFlowGraphInternal(
+    flow,
+    maps,
+    mode,
+    subFlowCache,
+    new Set([`${flow.data.id}@${flow.data.version}`])
+  );
+
   nodes.forEach((node: any) => {
     graph.setNode(node.id, { width: DEFAULT_NODE_WIDTH, height: DEFAULT_NODE_HEIGHT });
   });
@@ -192,7 +255,6 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     graph.setEdge(edge.source, edge.target);
   });
 
-  // Render the diagram in memory getting hte X and Y
   dagre.layout(graph);
 
   return {

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "3.28.4",
+  "version": "3.29.0",
   "publishConfig": {
     "access": "public"
   },
@@ -103,9 +103,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
+    "@eventcatalog/linter": "1.0.21",
     "@eventcatalog/sdk": "2.20.0",
-    "@eventcatalog/visualiser": "^3.18.4",
-    "@eventcatalog/linter": "1.0.21"
+    "@eventcatalog/visualiser": "^3.19.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.8",