@eventcatalog/core 3.48.1 → 3.48.3

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 = "3.48.1";
+var version = "3.48.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-VH5LYGTZ.js";
-import "../chunk-OUXBZ7LA.js";
+} from "../chunk-EE5Q6MJZ.js";
+import "../chunk-X7GMZVB3.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 = "3.48.1";
+var version = "3.48.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-UHKKOUQ6.js";
+} from "../chunk-4BRGEUVO.js";
+import "../chunk-EE5Q6MJZ.js";
 import "../chunk-DAOXTQVS.js";
-import "../chunk-VH5LYGTZ.js";
-import "../chunk-OUXBZ7LA.js";
+import "../chunk-X7GMZVB3.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-UHKKOUQ6.js → chunk-4BRGEUVO.js}

@@ -1,10 +1,10 @@
+import {
+  raiseEvent
+} from "./chunk-EE5Q6MJZ.js";
 import {
   countResources,
   serializeCounts
 } from "./chunk-DAOXTQVS.js";
-import {
-  raiseEvent
-} from "./chunk-VH5LYGTZ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-VH5LYGTZ.js → chunk-EE5Q6MJZ.js}

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

package/dist/{chunk-D6IADQY4.js → chunk-PWBFBCJ4.js}

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

package/dist/{chunk-OUXBZ7LA.js → chunk-X7GMZVB3.js}

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

package/dist/{chunk-ZIID2J67.js → chunk-XEUW7PEQ.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-OUXBZ7LA.js";
+} from "./chunk-X7GMZVB3.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 = "3.48.1";
+var version = "3.48.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,7 +1,7 @@
 import {
-  log_build_default
-} from "./chunk-UHKKOUQ6.js";
-import "./chunk-DAOXTQVS.js";
+  runMigrations
+} from "./chunk-XUAF2H54.js";
+import "./chunk-CA4U2JP7.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -12,10 +12,10 @@ import {
   watch
 } from "./chunk-O3Y2G6CY.js";
 import {
-  runMigrations
-} from "./chunk-XUAF2H54.js";
-import "./chunk-CA4U2JP7.js";
-import "./chunk-VH5LYGTZ.js";
+  log_build_default
+} from "./chunk-4BRGEUVO.js";
+import "./chunk-EE5Q6MJZ.js";
+import "./chunk-DAOXTQVS.js";
 import {
   catalogToAstro
 } from "./chunk-WQNKHIDM.js";
@@ -28,13 +28,13 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-ZIID2J67.js";
+} from "./chunk-XEUW7PEQ.js";
 import {
   logger
-} from "./chunk-D6IADQY4.js";
+} from "./chunk-PWBFBCJ4.js";
 import {
   VERSION
-} from "./chunk-OUXBZ7LA.js";
+} from "./chunk-X7GMZVB3.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-ZIID2J67.js";
-import "./chunk-D6IADQY4.js";
-import "./chunk-OUXBZ7LA.js";
+} from "./chunk-XEUW7PEQ.js";
+import "./chunk-PWBFBCJ4.js";
+import "./chunk-X7GMZVB3.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 = "3.48.1";
+var version = "3.48.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-D6IADQY4.js";
-import "../chunk-OUXBZ7LA.js";
+} from "../chunk-PWBFBCJ4.js";
+import "../chunk-X7GMZVB3.js";
 export {
   logger
 };

package/eventcatalog/src/stores/sidebar-store/builders/shared.ts

@@ -102,6 +102,12 @@ export const buildOwnersSection = (owners: any[]): NavNode | null => {
   };
 };
 
+const byAdrName = (a: Adr, b: Adr) => {
+  const name = (a.data.name || a.data.id).localeCompare(b.data.name || b.data.id);
+  if (name !== 0) return name;
+  return a.data.id.localeCompare(b.data.id);
+};
+
 export const buildArchitectureDecisionsSection = (resource: AdrResource, adrs: Adr[]): NavNode | null => {
   const relatedAdrs = getAdrsForResource(resource, adrs);
   if (relatedAdrs.length === 0) return null;
@@ -110,7 +116,7 @@ export const buildArchitectureDecisionsSection = (resource: AdrResource, adrs: A
     type: 'group',
     title: 'Decision Records',
     icon: 'BookText',
-    pages: relatedAdrs.map(getAdrNodeKey),
+    pages: [...relatedAdrs].sort(byAdrName).map(getAdrNodeKey),
   };
 };
 

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

@@ -58,12 +58,6 @@ const byResourceName = <T extends { data: { name?: string; id: string } }>(a: T,
 
 const sortByResourceName = <T extends { data: { name?: string; id: string } }>(items: T[]) => [...items].sort(byResourceName);
 
-const byAdrDateDesc = (a: Adr, b: Adr) => {
-  const date = new Date(b.data.date).getTime() - new Date(a.data.date).getTime();
-  if (date !== 0) return date;
-  return byResourceName(a, b);
-};
-
 const groupAdrsByStatus = (adrs: Adr[]): NavNode[] =>
   ADR_STATUS_VALUES.reduce<NavNode[]>((groups, status) => {
     const adrsForStatus = adrs.filter((adr) => adr.data.status === status);
@@ -73,7 +67,7 @@ const groupAdrsByStatus = (adrs: Adr[]): NavNode[] =>
       type: 'group',
       title: `${formatAdrStatus(status)} (${adrsForStatus.length})`,
       subtle: true,
-      pages: [...adrsForStatus].sort(byAdrDateDesc).map(getAdrNodeKey),
+      pages: [...adrsForStatus].sort(byResourceName).map(getAdrNodeKey),
     });
 
     return groups;

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

@@ -26,6 +26,7 @@ interface Props {
   version: string;
   defaultFlow?: DagreGraph;
   mode?: 'simple' | 'full';
+  layout?: boolean;
 }
 
 const getNodePropertyFromCollectionType = (type: string) => {
@@ -34,7 +35,7 @@ const getNodePropertyFromCollectionType = (type: string) => {
   return collectionToResourceMap[type as keyof typeof collectionToResourceMap];
 };
 
-export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simple' }: Props) => {
+export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simple', layout = true }: Props) => {
   const flow = defaultFlow || createDagreGraph({ ranksep: 300, nodesep: 50 });
   let nodes = [] as any,
     edges = [] as any;
@@ -217,17 +218,19 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     flow.setEdge(edge.source, edge.target);
   });
 
-  // Render the diagram in memory getting the X and Y
-  dagre.layout(flow);
+  if (layout) {
+    // Render the diagram in memory getting the X and Y
+    dagre.layout(flow);
+  }
 
   // Find any duplicated edges, and merge them into one edge
-  const uniqueEdges = edges.reduce((acc: any[], edge: any) => {
-    const existingEdge = acc.find((e: any) => e.id === edge.id);
-    if (!existingEdge) {
-      acc.push(edge);
+  const uniqueEdgesById = new Map<string, any>();
+  edges.forEach((edge: any) => {
+    if (!uniqueEdgesById.has(edge.id)) {
+      uniqueEdgesById.set(edge.id, edge);
     }
-    return acc;
-  }, []);
+  });
+  const uniqueEdges = Array.from(uniqueEdgesById.values());
 
   return {
     nodes: calculatedNodes(flow, nodes),

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

@@ -1,4 +1,5 @@
 import { getCollection } from 'astro:content';
+import dagre from 'dagre';
 import {
   createDagreGraph,
   calculatedNodes,
@@ -194,6 +195,7 @@ interface NodesAndEdgesProps {
   mode: 'simple' | 'full';
   group?: boolean;
   channelRenderMode?: 'single' | 'flat';
+  layout?: boolean;
 }
 
 export const getNodesAndEdges = async ({
@@ -203,6 +205,7 @@ export const getNodesAndEdges = async ({
   mode = 'simple',
   group = false,
   channelRenderMode = 'flat',
+  layout = true,
 }: NodesAndEdgesProps) => {
   const flow = defaultFlow || createDagreGraph({ ranksep: 360, nodesep: 50, edgesep: 50 });
   let nodes = new Map(),
@@ -268,6 +271,7 @@ export const getNodesAndEdges = async ({
       mode,
       renderAllEdges: true,
       channelRenderMode,
+      layout: false,
     });
     serviceNodes.forEach((n) => {
       /**
@@ -292,6 +296,7 @@ export const getNodesAndEdges = async ({
       mode,
       renderAllEdges: true,
       channelRenderMode,
+      layout: false,
     });
     agentNodes.forEach((n) => {
       nodes.set(n.id, nodes.has(n.id) ? merge(nodes.get(n.id), n) : n);
@@ -306,6 +311,7 @@ export const getNodesAndEdges = async ({
       version: dataProduct.version,
       defaultFlow: flow,
       mode,
+      layout: false,
     });
     dataProductNodes.forEach((n: any) => {
       nodes.set(n.id, nodes.has(n.id) ? merge(nodes.get(n.id), n) : n);
@@ -322,6 +328,7 @@ export const getNodesAndEdges = async ({
       mode,
       group: true,
       channelRenderMode,
+      layout: false,
     });
     subDomainNodes.forEach((n) => {
       nodes.set(n.id, nodes.has(n.id) ? merge(nodes.get(n.id), n) : n);
@@ -338,6 +345,10 @@ export const getNodesAndEdges = async ({
     });
   }
 
+  if (layout) {
+    dagre.layout(flow);
+  }
+
   return {
     nodes: calculatedNodes(flow, Array.from(nodes.values())),
     edges: [...edges.values()],

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

@@ -119,6 +119,7 @@ interface Props {
   channelRenderMode?: 'single' | 'flat';
   renderMessages?: boolean;
   collection?: 'agents' | 'services';
+  layout?: boolean;
 }
 
 const getResourceContextMenu = (resource: CollectionEntry<'agents'> | CollectionEntry<'services'>) => {
@@ -178,6 +179,7 @@ export const getNodesAndEdges = async ({
   channelRenderMode = 'flat',
   renderMessages = true,
   collection = 'services',
+  layout = true,
 }: Props) => {
   const flow = defaultFlow || createDagreGraph({ ranksep: 300, nodesep: 50 });
   let nodes = [] as any,
@@ -598,9 +600,13 @@ export const getNodesAndEdges = async ({
     });
   });
 
-  const uniqueNodes = nodes.filter(
-    (node: any, index: number, self: any[]) => index === self.findIndex((n: any) => n.id === node.id)
-  );
+  const uniqueNodesById = new Map<string, any>();
+  nodes.forEach((node: any) => {
+    if (!uniqueNodesById.has(node.id)) {
+      uniqueNodesById.set(node.id, node);
+    }
+  });
+  const uniqueNodes = Array.from(uniqueNodesById.values());
 
   uniqueNodes.forEach((node: any) => {
     flow.setNode(node.id, { width: DEFAULT_NODE_WIDTH, height: DEFAULT_NODE_HEIGHT });
@@ -610,12 +616,15 @@ export const getNodesAndEdges = async ({
     flow.setEdge(edge.source, edge.target);
   });
 
-  // Render the diagram in memory getting the X and Y
-  dagre.layout(flow);
+  if (layout) {
+    // Render the diagram in memory getting the X and Y
+    dagre.layout(flow);
+  }
 
   // Find any duplicated edges, and merge them into one edge
-  const uniqueEdges = edges.reduce((acc: any[], edge: any) => {
-    const existingEdge = acc.find((e: any) => e.id === edge.id);
+  const uniqueEdgesById = new Map<string, any>();
+  edges.forEach((edge: any) => {
+    const existingEdge = uniqueEdgesById.get(edge.id);
     if (existingEdge) {
       if (edge.data?.customColor || existingEdge.data?.customColor) {
         // Add custom colors to the existing edge when grouped message paths converge.
@@ -629,10 +638,10 @@ export const getNodesAndEdges = async ({
         };
       }
     } else {
-      acc.push(edge);
+      uniqueEdgesById.set(edge.id, edge);
     }
-    return acc;
-  }, []);
+  });
+  const uniqueEdges = Array.from(uniqueEdgesById.values());
 
   return {
     nodes: calculatedNodes(flow, uniqueNodes),

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "3.48.1",
+  "version": "3.48.3",
   "publishConfig": {
     "access": "public"
   },
@@ -112,8 +112,8 @@
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
     "@eventcatalog/linter": "1.1.0",
-    "@eventcatalog/sdk": "2.24.1",
-    "@eventcatalog/visualiser": "^3.22.1"
+    "@eventcatalog/visualiser": "^3.22.1",
+    "@eventcatalog/sdk": "2.24.1"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.9",