@eventcatalog/core 4.10.7 → 4.10.9

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.10.7";
+var version = "4.10.9";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-Z7YK3QA3.js";
-import "../chunk-RJYRPQOA.js";
+} from "../chunk-5WB6CXZH.js";
+import "../chunk-3EEFSHHW.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.10.7";
+var version = "4.10.9";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-YJVD7UW3.js";
-import "../chunk-Z7YK3QA3.js";
+} from "../chunk-ONRJA5DX.js";
+import "../chunk-5WB6CXZH.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-RJYRPQOA.js";
+import "../chunk-3EEFSHHW.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-RJYRPQOA.js → chunk-3EEFSHHW.js}

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

package/dist/{chunk-Z7YK3QA3.js → chunk-5WB6CXZH.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-RJYRPQOA.js";
+} from "./chunk-3EEFSHHW.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-YBRQCBWG.js → chunk-BYPWHDX6.js}

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

package/dist/{chunk-YJVD7UW3.js → chunk-ONRJA5DX.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-Z7YK3QA3.js";
+} from "./chunk-5WB6CXZH.js";
 import {
   countResources,
   hashCatalogContent,

package/dist/{chunk-TFALFJEC.js → chunk-WD5UW4A4.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-YBRQCBWG.js";
+} from "./chunk-BYPWHDX6.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-RJYRPQOA.js";
+} from "./chunk-3EEFSHHW.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

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

package/dist/eventcatalog.js

@@ -1,12 +1,12 @@
+import {
+  log_build_default
+} from "./chunk-ONRJA5DX.js";
+import "./chunk-5WB6CXZH.js";
+import "./chunk-ZAZHAVKB.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
-import {
-  log_build_default
-} from "./chunk-YJVD7UW3.js";
-import "./chunk-Z7YK3QA3.js";
-import "./chunk-ZAZHAVKB.js";
 import {
   FederationConflictError,
   FederationDiagnosticError,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-TFALFJEC.js";
+} from "./chunk-WD5UW4A4.js";
 import {
   logger
-} from "./chunk-YBRQCBWG.js";
+} from "./chunk-BYPWHDX6.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -54,7 +54,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-RJYRPQOA.js";
+} from "./chunk-3EEFSHHW.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-TFALFJEC.js";
-import "./chunk-YBRQCBWG.js";
-import "./chunk-RJYRPQOA.js";
+} from "./chunk-WD5UW4A4.js";
+import "./chunk-BYPWHDX6.js";
+import "./chunk-3EEFSHHW.js";
 import "./chunk-6QENHZZP.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 = "4.10.7";
+var version = "4.10.9";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-YBRQCBWG.js";
-import "../chunk-RJYRPQOA.js";
+} from "../chunk-BYPWHDX6.js";
+import "../chunk-3EEFSHHW.js";
 export {
   logger
 };

package/eventcatalog/src/components/MDX/NodeGraph/NodeGraph.astro

@@ -31,6 +31,7 @@ import { getNodesAndEdges as getNodesAndEdgesForChannel } from '@utils/node-grap
 import config from '@config';
 import { isEventCatalogChatEnabled, isDevMode } from '@utils/feature';
 import { loadSavedLayout, applyLayoutToNodes, buildResourceKey } from '@utils/node-graphs/layout-persistence';
+import { compactVisualiserGraph } from '@utils/node-graphs/compact-visualiser-graph';
 
 const isChatEnabled = isEventCatalogChatEnabled();
 
@@ -198,13 +199,16 @@ if (collection === 'services-containers') {
 const resourceKey = buildResourceKey(collection, id, version);
 const savedLayout = await loadSavedLayout(resourceKey);
 const nodesWithLayout = applyLayoutToNodes(nodes as any[], savedLayout);
+// Drop hydrated collection entries / markdown bodies before Astro serialises
+// the graph into the page. Visualiser components only need a small field set.
+const { nodes: clientNodes, edges: clientEdges } = compactVisualiserGraph(nodesWithLayout as any[], edges as any[]);
 ---
 
 <div>
   <AstroNodeGraph
     id={id}
-    nodes={nodesWithLayout}
-    edges={edges}
+    nodes={clientNodes}
+    edges={clientEdges}
     title={title}
     hrefLabel={href?.label}
     href={href?.url}

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/field-lineage/_index.data.spec.ts

@@ -0,0 +1,52 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const getMessageIdsWithFieldUsage = vi.fn();
+const pageDataLoader = {
+  events: vi.fn(),
+  commands: vi.fn(),
+  queries: vi.fn(),
+};
+
+vi.mock('@utils/feature', () => ({
+  isSSR: () => false,
+}));
+
+vi.mock('@utils/collections/field-usage', () => ({
+  getMessageIdsWithFieldUsage: () => getMessageIdsWithFieldUsage(),
+}));
+
+vi.mock('@utils/page-loaders/page-data-loader', () => ({
+  pageDataLoader,
+}));
+
+import { Page } from './_index.data';
+
+const event = (id: string) => ({
+  collection: 'events',
+  data: { id, version: '1.0.0', name: id },
+});
+
+describe('field-lineage static paths', () => {
+  beforeEach(() => {
+    getMessageIdsWithFieldUsage.mockReset();
+    pageDataLoader.events.mockReset();
+    pageDataLoader.commands.mockReset();
+    pageDataLoader.queries.mockReset();
+  });
+
+  it('when we build a catalog, field usage pages are only created for messages that declare fields', async () => {
+    getMessageIdsWithFieldUsage.mockResolvedValue(new Set(['OrderCreated']));
+    pageDataLoader.events.mockResolvedValue([event('OrderCreated'), event('OrderCancelled')]);
+    pageDataLoader.commands.mockResolvedValue([]);
+    pageDataLoader.queries.mockResolvedValue([]);
+
+    const paths = await Page.getStaticPaths();
+
+    expect(paths).toEqual([
+      {
+        params: { type: 'events', id: 'OrderCreated', version: '1.0.0' },
+        props: { type: 'events', ...event('OrderCreated') },
+      },
+    ]);
+  });
+});

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/field-lineage/_index.data.ts

@@ -1,6 +1,7 @@
 import { isSSR } from '@utils/feature';
 import { HybridPage } from '@utils/page-loaders/hybrid-page';
 import type { PageTypes } from '@types';
+import { getMessageIdsWithFieldUsage } from '@utils/collections/field-usage';
 
 const MESSAGE_TYPES: PageTypes[] = ['events', 'commands', 'queries'];
 
@@ -15,21 +16,24 @@ export class Page extends HybridPage {
     }
 
     const { pageDataLoader } = await import('@utils/page-loaders/page-data-loader');
+    const messagesWithFieldUsage = await getMessageIdsWithFieldUsage();
 
     const allItems = await Promise.all(MESSAGE_TYPES.map((type) => pageDataLoader[type]()));
 
     return allItems.flatMap((items, index) =>
-      items.map((item) => ({
-        params: {
-          type: MESSAGE_TYPES[index],
-          id: item.data.id,
-          version: item.data.version,
-        },
-        props: {
-          type: MESSAGE_TYPES[index],
-          ...item,
-        },
-      }))
+      items
+        .filter((item) => messagesWithFieldUsage.has(item.data.id))
+        .map((item) => ({
+          params: {
+            type: MESSAGE_TYPES[index],
+            id: item.data.id,
+            version: item.data.version,
+          },
+          props: {
+            type: MESSAGE_TYPES[index],
+            ...item,
+          },
+        }))
     );
   }
 
@@ -40,6 +44,11 @@ export class Page extends HybridPage {
       return null;
     }
 
+    const messagesWithFieldUsage = await getMessageIdsWithFieldUsage();
+    if (!messagesWithFieldUsage.has(id)) {
+      return null;
+    }
+
     const { pageDataLoader } = await import('@utils/page-loaders/page-data-loader');
 
     const items = await pageDataLoader[type as PageTypes]();

package/eventcatalog/src/stores/sidebar-store/state.ts

@@ -42,6 +42,7 @@ import {
   withArchitectureDecisionsSection,
 } from './builders/shared';
 import { isArchitectureGraphEnabled, isChangelogEnabled, isResourceDocsEnabled } from '@utils/feature';
+import { collectMessageIdsWithFieldUsage } from '@utils/collections/field-usage';
 
 export type { NavigationData, NavNode, ChildRef };
 
@@ -580,34 +581,8 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     {} as Record<string, NavNode | string>
   );
 
-  // Build a set of message IDs that have field usage declared by any resource that can receive messages.
-  // We use raw collections because the hydrated resources replace
-  // sends/receives pointers with resolved message entries, which strips the fields property.
-  const messagesWithFieldUsage = new Set<string>();
-  for (const agent of rawAgents) {
-    for (const pointer of agent.data.sends || []) {
-      if (pointer.fields?.length) messagesWithFieldUsage.add(pointer.id);
-    }
-    for (const pointer of agent.data.receives || []) {
-      if (pointer.fields?.length) messagesWithFieldUsage.add(pointer.id);
-    }
-  }
-  for (const service of rawServices) {
-    for (const pointer of service.data.sends || []) {
-      if (pointer.fields?.length) messagesWithFieldUsage.add(pointer.id);
-    }
-    for (const pointer of service.data.receives || []) {
-      if (pointer.fields?.length) messagesWithFieldUsage.add(pointer.id);
-    }
-  }
-  for (const domain of rawDomains) {
-    for (const pointer of domain.data.sends || []) {
-      if (pointer.fields?.length) messagesWithFieldUsage.add(pointer.id);
-    }
-    for (const pointer of domain.data.receives || []) {
-      if (pointer.fields?.length) messagesWithFieldUsage.add(pointer.id);
-    }
-  }
+  // Raw collections keep send/receive pointers (and their `fields`) which hydration strips.
+  const messagesWithFieldUsage = collectMessageIdsWithFieldUsage(rawAgents, rawServices, rawDomains);
 
   const flowRefsByMessage = buildFlowReferencesByMessage({
     flows,

package/eventcatalog/src/utils/collections/field-usage.ts

@@ -0,0 +1,48 @@
+import { getCollection } from 'astro:content';
+
+type PointerWithFields = { id?: string; fields?: string[] };
+
+type ResourceWithMessagePointers = {
+  data: {
+    sends?: PointerWithFields[];
+    receives?: PointerWithFields[];
+  };
+};
+
+const addFieldUsageFromPointers = (messageIds: Set<string>, pointers: PointerWithFields[] | undefined) => {
+  for (const pointer of pointers || []) {
+    if (pointer.id && pointer.fields?.length) {
+      messageIds.add(pointer.id);
+    }
+  }
+};
+
+/**
+ * Message ids that have field-level lineage declared on a send/receive pointer.
+ * Uses raw (unhydrated) resources because hydration replaces those pointers and drops `fields`.
+ * Matches the sidebar "Field Usage" link gate.
+ */
+export const collectMessageIdsWithFieldUsage = (
+  agents: ResourceWithMessagePointers[],
+  services: ResourceWithMessagePointers[],
+  domains: ResourceWithMessagePointers[]
+): Set<string> => {
+  const messageIds = new Set<string>();
+
+  for (const resource of [...agents, ...services, ...domains]) {
+    addFieldUsageFromPointers(messageIds, resource.data.sends);
+    addFieldUsageFromPointers(messageIds, resource.data.receives);
+  }
+
+  return messageIds;
+};
+
+export const getMessageIdsWithFieldUsage = async (): Promise<Set<string>> => {
+  const [agents, services, domains] = await Promise.all([
+    getCollection('agents'),
+    getCollection('services'),
+    getCollection('domains'),
+  ]);
+
+  return collectMessageIdsWithFieldUsage(agents, services, domains);
+};

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

@@ -1,5 +1,4 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   buildContextMenuForAgent,
   buildContextMenuForMessage,
@@ -17,6 +16,7 @@ import {
   getOperationFields,
   DEFAULT_NODE_WIDTH,
   DEFAULT_NODE_HEIGHT,
+  layoutDagreGraph,
 } from './utils/utils';
 import { createVersionedMap, findInMap } from '@utils/collections/util';
 import { getChannelChain, getChannels } from '@utils/collections/channels';
@@ -457,7 +457,7 @@ export const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simpl
   });
 
   if (layout) {
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   return {

package/eventcatalog/src/utils/node-graphs/compact-visualiser-graph.ts

@@ -0,0 +1,246 @@
+import type { Edge, Node } from '@xyflow/react';
+
+/**
+ * Fields the visualiser nodes actually read from a resource. Everything else
+ * (markdown bodies, file paths, hydrated producers/consumers, full send/receive
+ * collections) is dropped before Astro serialises the graph into the page.
+ */
+const RESOURCE_DATA_KEYS = [
+  'id',
+  'name',
+  'version',
+  'summary',
+  'owners',
+  'deprecated',
+  'draft',
+  'notes',
+  'styles',
+  'badges',
+  'latestVersion',
+  'method',
+  'path',
+  'statusCodes',
+  'specifications',
+  'externalSystem',
+  'repository',
+  'model',
+  'tools',
+  'parameters',
+  'protocols',
+  'address',
+  'deliveryGuarantee',
+  'type',
+  'container_type',
+  'schemas',
+  'properties',
+  'aggregateRoot',
+  'sidebar',
+] as const;
+
+const RESOURCE_OBJECT_KEYS = new Set([
+  'message',
+  'service',
+  'agent',
+  'domain',
+  'channel',
+  'dataProduct',
+  'container',
+  'entity',
+  'flow',
+  'data',
+]);
+
+const DROP_EDGE_RESOURCE_KEYS = new Set(['publisherService', 'consumerService']);
+
+const isPlainObject = (value: unknown): value is Record<string, unknown> =>
+  typeof value === 'object' && value !== null && !Array.isArray(value);
+
+const isCollectionEntry = (value: Record<string, unknown>): boolean =>
+  isPlainObject(value.data) &&
+  ('collection' in value || 'filePath' in value || 'digest' in value || 'body' in value || 'rendered' in value);
+
+const compactDomainService = (service: unknown) => {
+  if (!isPlainObject(service)) return service;
+
+  const data = isPlainObject(service.data) ? service.data : service;
+  const id = data.id ?? service.id;
+  const name = data.name ?? service.name;
+  const version = data.version ?? service.version;
+
+  return {
+    data: {
+      ...(id !== undefined ? { id } : {}),
+      ...(name !== undefined ? { name } : {}),
+      ...(version !== undefined ? { version } : {}),
+    },
+  };
+};
+
+const compactOwners = (owners: unknown): unknown => {
+  if (!Array.isArray(owners)) return owners;
+  return owners.map((owner) => {
+    if (typeof owner === 'string') return owner;
+    if (!isPlainObject(owner)) return owner;
+    const data = isPlainObject(owner.data) ? owner.data : owner;
+    const id = data.id ?? owner.id;
+    const name = data.name ?? owner.name;
+    if (id === undefined && name === undefined) return owner;
+    return {
+      ...(id !== undefined ? { id } : {}),
+      ...(name !== undefined ? { name } : {}),
+    };
+  });
+};
+
+export const compactVisualiserResource = (value: unknown): unknown => {
+  if (value == null || typeof value !== 'object') return value;
+  if (Array.isArray(value)) return value.map(compactVisualiserResource);
+
+  const obj = value as Record<string, unknown>;
+
+  if (isCollectionEntry(obj)) {
+    const data = compactVisualiserResourceData(obj.data);
+    const resourceId = isPlainObject(data) && data.id !== undefined ? data.id : obj.id;
+    return {
+      ...(resourceId !== undefined ? { id: resourceId } : {}),
+      ...(obj.collection !== undefined ? { collection: obj.collection } : {}),
+      data,
+      // EventNode / ServiceNode / ChannelNode read name/version/summary from the
+      // top level. Collection-entry shaped payloads only have those on `.data`.
+      ...(isPlainObject(data) ? data : {}),
+    };
+  }
+
+  return compactVisualiserResourceData(obj);
+};
+
+const compactVisualiserResourceData = (value: unknown): unknown => {
+  if (!isPlainObject(value)) return value;
+
+  const out: Record<string, unknown> = {};
+  for (const key of RESOURCE_DATA_KEYS) {
+    if (value[key] === undefined) continue;
+    if (key === 'owners') {
+      out[key] = compactOwners(value[key]);
+      continue;
+    }
+    if (key === 'tools' && Array.isArray(value[key])) {
+      out[key] = value[key];
+      continue;
+    }
+    out[key] = value[key];
+  }
+
+  // Domain nodes render `domain.data.services[].data.{id,name,version}`.
+  if (Array.isArray(value.services)) {
+    out.services = value.services.map(compactDomainService);
+  }
+
+  return out;
+};
+
+const compactEndpoint = (endpoint: unknown): unknown => {
+  if (!isPlainObject(endpoint)) return endpoint;
+
+  const data = isPlainObject(endpoint.data) ? endpoint.data : undefined;
+  const collection = endpoint.collection ?? data?.collection;
+  const id = endpoint.id ?? (data?.id !== undefined && data?.version !== undefined ? `${data.id}-${data.version}` : data?.id);
+
+  return {
+    ...(id !== undefined ? { id } : {}),
+    ...(collection !== undefined ? { collection } : {}),
+    ...(data
+      ? {
+          data: {
+            ...(data.id !== undefined ? { id: data.id } : {}),
+            ...(data.version !== undefined ? { version: data.version } : {}),
+            ...(collection !== undefined ? { collection } : {}),
+          },
+        }
+      : {}),
+  };
+};
+
+const compactNodeData = (data: unknown): unknown => {
+  if (!isPlainObject(data)) return data;
+
+  const out: Record<string, unknown> = {};
+
+  for (const [key, value] of Object.entries(data)) {
+    if (value === undefined) continue;
+
+    if (RESOURCE_OBJECT_KEYS.has(key)) {
+      out[key] = compactVisualiserResource(value);
+      continue;
+    }
+
+    if (key === 'messages' && Array.isArray(value)) {
+      out[key] = value.map((entry) => {
+        if (!isPlainObject(entry)) return entry;
+        return {
+          ...entry,
+          ...(entry.message !== undefined ? { message: compactVisualiserResource(entry.message) } : {}),
+          ...(Array.isArray(entry.channels) ? { channels: entry.channels.map(compactVisualiserResource) } : {}),
+        };
+      });
+      continue;
+    }
+
+    out[key] = value;
+  }
+
+  return out;
+};
+
+const compactEdgeData = (data: unknown): unknown => {
+  if (!isPlainObject(data)) return data;
+
+  const out: Record<string, unknown> = {};
+
+  for (const [key, value] of Object.entries(data)) {
+    if (value === undefined || DROP_EDGE_RESOURCE_KEYS.has(key)) continue;
+
+    if (key === 'rootSourceAndTarget' && isPlainObject(value)) {
+      out[key] = {
+        source: compactEndpoint(value.source),
+        target: compactEndpoint(value.target),
+      };
+      continue;
+    }
+
+    if (RESOURCE_OBJECT_KEYS.has(key) || key === 'message') {
+      out[key] = compactVisualiserResource(value);
+      continue;
+    }
+
+    out[key] = value;
+  }
+
+  return out;
+};
+
+const compactNode = <T extends Node>(node: T): T => {
+  const { data, ...rest } = node;
+  return {
+    ...rest,
+    ...(data !== undefined ? { data: compactNodeData(data) } : {}),
+  } as T;
+};
+
+const compactEdge = <T extends Edge>(edge: T): T => {
+  const { data, ...rest } = edge;
+  return {
+    ...rest,
+    ...(data !== undefined ? { data: compactEdgeData(data) } : {}),
+  } as T;
+};
+
+/**
+ * Strip collection-entry weight from a React Flow graph before it is serialised
+ * into an Astro island. Node/edge structure and the fields visualiser components
+ * read are preserved.
+ */
+export const compactVisualiserGraph = <N extends Node, E extends Edge>(nodes: N[], edges: E[]): { nodes: N[]; edges: E[] } => ({
+  nodes: nodes.map(compactNode),
+  edges: edges.map(compactEdge),
+});

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

@@ -1,5 +1,4 @@
 import type { CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   calculatedNodes,
   createDagreGraph,
@@ -10,6 +9,7 @@ import {
   buildContextMenuForResource,
   DEFAULT_NODE_WIDTH,
   DEFAULT_NODE_HEIGHT,
+  layoutDagreGraph,
 } from './utils/utils';
 import { MarkerType } from '@xyflow/react';
 import { findMatchingNodes } from '@utils/collections/util';
@@ -299,7 +299,7 @@ export const getNodesAndEdges = async ({
 
   // Render the diagram in memory getting hte X and Y
   if (layout) {
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   return {

package/eventcatalog/src/utils/node-graphs/data-products-node-graph.ts

@@ -1,5 +1,4 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   createDagreGraph,
   generateIdForNode,
@@ -10,6 +9,7 @@ import {
   buildContextMenuForResource,
   DEFAULT_NODE_WIDTH,
   DEFAULT_NODE_HEIGHT,
+  layoutDagreGraph,
 } from '@utils/node-graphs/utils/utils';
 
 import { findInMap, createVersionedMap, mergeMaps, collectionToResourceMap } from '@utils/collections/util';
@@ -220,7 +220,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
 
   if (layout) {
     // Render the diagram in memory getting the X and Y
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   // Find any duplicated edges, and merge them into one edge

package/eventcatalog/src/utils/node-graphs/domains-canvas.ts

@@ -1,11 +1,11 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   generateIdForNode,
   createDagreGraph,
   calculatedNodes,
   createEdge,
   getOperationFields,
+  layoutDagreGraph,
 } from '@utils/node-graphs/utils/utils';
 import { findInMap, createVersionedMap } from '@utils/collections/util';
 import type { Node, Edge } from '@xyflow/react';
@@ -247,7 +247,7 @@ export const getDomainsCanvasData = async (): Promise<DomainCanvasData> => {
   });
 
   // Calculate layout using dagre
-  dagre.layout(dagreGraph);
+  layoutDagreGraph(dagreGraph);
 
   // Apply calculated positions to nodes
   const layoutedDomainNodes = calculatedNodes(dagreGraph, domainNodes);

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

@@ -1,5 +1,4 @@
 import { getCollection } from 'astro:content';
-import dagre from 'dagre';
 import {
   createDagreGraph,
   calculatedNodes,
@@ -7,6 +6,7 @@ import {
   getEdgeLabelForServiceAsTarget,
   generatedIdForEdge,
   createEdge,
+  layoutDagreGraph,
 } from '@utils/node-graphs/utils/utils';
 import { getNodesAndEdges as getServicesNodeAndEdges } from './services-node-graph';
 import { getNodesAndEdges as getAgentsNodeAndEdges } from './agents-node-graph';
@@ -176,7 +176,7 @@ export const getNodesAndEdges = async ({
   }
 
   if (layout) {
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   return {

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

@@ -1,5 +1,4 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   createDagreGraph,
   calculatedNodes,
@@ -7,6 +6,7 @@ import {
   DEFAULT_NODE_HEIGHT,
   buildContextMenuForResource,
   buildContextMenuForService,
+  layoutDagreGraph,
 } from '@utils/node-graphs/utils/utils';
 import { MarkerType } from '@xyflow/react';
 import type { Node as NodeType } from '@xyflow/react';
@@ -321,7 +321,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     graph.setEdge(edge.source, edge.target);
   });
 
-  dagre.layout(graph);
+  layoutDagreGraph(graph);
 
   return {
     nodes: calculatedNodes(graph, nodes),

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

@@ -1,7 +1,6 @@
 // import { getColor } from '@utils/colors';
 import { getEvents } from '@utils/collections/events';
 import { getCollection, type CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   calculatedNodes,
   createDagreGraph,
@@ -12,6 +11,7 @@ import {
   getEdgeLabelForMessageAsSource,
   getEdgeLabelForServiceAsTarget,
   versionMatches,
+  layoutDagreGraph,
 } from './utils/utils';
 import { MarkerType, type Node, type Edge } from '@xyflow/react';
 import {
@@ -691,7 +691,7 @@ const getNodesAndEdges = async ({
   });
 
   // Render the diagram in memory getting hte X and Y
-  dagre.layout(flow);
+  layoutDagreGraph(flow);
 
   return {
     nodes: calculatedNodes(flow, nodes),

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

@@ -1,5 +1,4 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   createDagreGraph,
   generateIdForNode,
@@ -14,6 +13,7 @@ import {
   DEFAULT_NODE_HEIGHT,
   partitionMessagesByGroup,
   getOperationFields,
+  layoutDagreGraph,
 } from '@utils/node-graphs/utils/utils';
 
 const sanitizeGroupId = (name: string) => name.replace(/[^a-zA-Z0-9]/g, '-').toLowerCase();
@@ -636,7 +636,7 @@ export const getNodesAndEdges = async ({
 
   if (layout) {
     // Render the diagram in memory getting the X and Y
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   // Find any duplicated edges, and merge them into one edge

package/eventcatalog/src/utils/node-graphs/system-context-node-graph.ts

@@ -1,6 +1,5 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
-import dagre from 'dagre';
 import {
   createDagreGraph,
   calculatedNodes,
@@ -8,6 +7,7 @@ import {
   generateIdForNode,
   buildContextMenuForSystem,
   DEFAULT_NODE_HEIGHT,
+  layoutDagreGraph,
 } from '@utils/node-graphs/utils/utils';
 import { MarkerType } from '@xyflow/react';
 import { createVersionedMap, findInMap } from '@utils/collections/util';
@@ -302,7 +302,7 @@ const buildContextGraphFromSeeds = ({
   edges.forEach((edge) => flow.setEdge(edge.source, edge.target));
 
   if (layout) {
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   return {

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

@@ -1,6 +1,11 @@
 import { getCollection } from 'astro:content';
-import dagre from 'dagre';
-import { createDagreGraph, calculatedNodes, DEFAULT_NODE_WIDTH, DEFAULT_NODE_HEIGHT } from '@utils/node-graphs/utils/utils';
+import {
+  createDagreGraph,
+  calculatedNodes,
+  DEFAULT_NODE_WIDTH,
+  DEFAULT_NODE_HEIGHT,
+  layoutDagreGraph,
+} from '@utils/node-graphs/utils/utils';
 import { getNodesAndEdges as getServicesNodeAndEdges } from './services-node-graph';
 import { getNodesAndEdges as getContainerNodeAndEdges } from './container-node-graph';
 import merge from 'lodash.merge';
@@ -121,7 +126,7 @@ export const getNodesAndEdges = async ({
   }
 
   if (layout) {
-    dagre.layout(flow);
+    layoutDagreGraph(flow);
   }
 
   let laidOutNodes = calculatedNodes(flow, Array.from(nodes.values()));

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

@@ -109,6 +109,34 @@ export const createDagreGraph = ({ ranksep = 180, nodesep = 50, ...rest }: any)
   return graph;
 };
 
+/**
+ * network-simplex produces the nicest layered layout but is O(V·E) and hangs on
+ * large architecture maps. tight-tree keeps the same LR layering with far less
+ * work. Callers can still force a ranker via createDagreGraph({ ranker }).
+ */
+export const LARGE_GRAPH_NODE_THRESHOLD = 80;
+export const LARGE_GRAPH_EDGE_THRESHOLD = 200;
+export const LARGE_GRAPH_RANKER = 'tight-tree';
+
+export const selectDagreRanker = (nodeCount: number, edgeCount: number, explicitRanker?: string) => {
+  if (explicitRanker) return explicitRanker;
+  if (nodeCount >= LARGE_GRAPH_NODE_THRESHOLD || edgeCount >= LARGE_GRAPH_EDGE_THRESHOLD) {
+    return LARGE_GRAPH_RANKER;
+  }
+  return undefined;
+};
+
+export const layoutDagreGraph = (flow: dagre.graphlib.Graph) => {
+  const label = (flow.graph() || {}) as { ranker?: string };
+  const nodeCount = flow.nodeCount();
+  const edgeCount = flow.edgeCount();
+  const ranker = selectDagreRanker(nodeCount, edgeCount, label.ranker);
+  if (ranker && label.ranker !== ranker) {
+    flow.setGraph({ ...label, ranker });
+  }
+  dagre.layout(flow);
+};
+
 export const createEdge = (edgeOptions: Edge) => {
   return {
     label: 'subscribed by',
@@ -430,8 +458,8 @@ export const getNodesAndEdgesFromDagre = ({
     flow.setEdge(edge.source, edge.target);
   });
 
-  // Render the diagram in memory getting hte X and Y
-  dagre.layout(flow);
+  // Render the diagram in memory getting the X and Y
+  layoutDagreGraph(flow);
 
   return {
     nodes: calculatedNodes(flow, nodes),

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.10.7",
+  "version": "4.10.9",
   "publishConfig": {
     "access": "public"
   },
@@ -118,9 +118,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^11.1.1",
     "zod": "^4.3.6",
-    "@eventcatalog/sdk": "2.28.1",
-    "@eventcatalog/linter": "1.1.17",
-    "@eventcatalog/visualiser": "^4.1.3"
+    "@eventcatalog/linter": "1.1.18",
+    "@eventcatalog/visualiser": "^4.1.4",
+    "@eventcatalog/sdk": "2.29.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",