@eventcatalog/core 3.26.16 → 3.27.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.26.16";
+var version = "3.27.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-3CPDUB6E.js";
-import "../chunk-LKJCBJX3.js";
+} from "../chunk-KNR65XBF.js";
+import "../chunk-SWTABLK7.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.26.16";
+var version = "3.27.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-E27MVTFI.js";
-import "../chunk-3CPDUB6E.js";
+} from "../chunk-VOS4MRLD.js";
+import "../chunk-KNR65XBF.js";
 import "../chunk-4UVFXLPI.js";
-import "../chunk-LKJCBJX3.js";
+import "../chunk-SWTABLK7.js";
 import "../chunk-5T63CXKU.js";
 export {
   log_build_default as default

package/dist/{chunk-IYV3DBOW.js → chunk-6KGRDHJX.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-232PH27E.js";
+} from "./chunk-R7ILHVCQ.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-3CPDUB6E.js → chunk-KNR65XBF.js}

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

package/dist/{chunk-232PH27E.js → chunk-R7ILHVCQ.js}

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

package/dist/{chunk-LKJCBJX3.js → chunk-SWTABLK7.js}

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

package/dist/{chunk-E27MVTFI.js → chunk-VOS4MRLD.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-3CPDUB6E.js";
+} from "./chunk-KNR65XBF.js";
 import {
   countResources,
   serializeCounts

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-LKJCBJX3.js";
+} from "./chunk-SWTABLK7.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.26.16";
+var version = "3.27.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-E27MVTFI.js";
-import "./chunk-3CPDUB6E.js";
+} from "./chunk-VOS4MRLD.js";
+import "./chunk-KNR65XBF.js";
 import "./chunk-4UVFXLPI.js";
 import {
   runMigrations
@@ -22,13 +22,13 @@ import {
 } from "./chunk-3KXCGYET.js";
 import {
   generate
-} from "./chunk-IYV3DBOW.js";
+} from "./chunk-6KGRDHJX.js";
 import {
   logger
-} from "./chunk-232PH27E.js";
+} from "./chunk-R7ILHVCQ.js";
 import {
   VERSION
-} from "./chunk-LKJCBJX3.js";
+} from "./chunk-SWTABLK7.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.26.16";
+var version = "3.27.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-IYV3DBOW.js";
-import "./chunk-232PH27E.js";
-import "./chunk-LKJCBJX3.js";
+} from "./chunk-6KGRDHJX.js";
+import "./chunk-R7ILHVCQ.js";
+import "./chunk-SWTABLK7.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.26.16";
+var version = "3.27.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-232PH27E.js";
-import "../chunk-LKJCBJX3.js";
+} from "../chunk-R7ILHVCQ.js";
+import "../chunk-SWTABLK7.js";
 export {
   logger
 };

package/eventcatalog/src/content.config.ts

@@ -68,6 +68,7 @@ const sendsPointer = z.object({
   id: z.string(),
   version: z.string().optional().default('latest'),
   fields: z.array(z.string()).optional(),
+  group: z.string().optional(),
   to: z
     .array(
       z.object({
@@ -82,6 +83,7 @@ const receivesPointer = z.object({
   id: z.string(),
   version: z.string().optional().default('latest'),
   fields: z.array(z.string()).optional(),
+  group: z.string().optional(),
   from: z
     .array(
       z.object({

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

@@ -11,13 +11,89 @@ import {
   versionMatches,
   DEFAULT_NODE_WIDTH,
   DEFAULT_NODE_HEIGHT,
+  partitionMessagesByGroup,
+  getOperationFields,
 } from '@utils/node-graphs/utils/utils';
 
+const sanitizeGroupId = (name: string) => name.replace(/[^a-zA-Z0-9]/g, '-').toLowerCase();
+
 import { findMatchingNodes, findInMap, createVersionedMap } from '@utils/collections/util';
-import { MarkerType } from '@xyflow/react';
+import { MarkerType, type Node, type Edge } from '@xyflow/react';
 import type { CollectionMessageTypes } from '@types';
 import { getNodesAndEdgesForConsumedMessage, getNodesAndEdgesForProducedMessage } from './message-node-graph';
 
+/**
+ * Pre-compute the downstream nodes/edges that should appear when a message group
+ * is expanded. Calls the standard message node-graph function for each grouped
+ * message, then strips out the service and message nodes/edges that the client-side
+ * expand logic handles separately.
+ */
+const precomputeGroupExpansion = (
+  messages: any[],
+  channelPointers: any[],
+  direction: 'sends' | 'receives',
+  opts: {
+    serviceNodeId: string;
+    services: any;
+    service: any;
+    mode: string;
+    channels: any;
+    channelMap: any;
+    existingNodes: any[];
+    existingEdges: any[];
+  }
+) => {
+  const expandedNodes: Node[] = [];
+  const expandedEdges: Edge[] = [];
+
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    const channelRefs = channelPointers[i] || [];
+
+    // Call the same function used by the ungrouped path
+    const args =
+      direction === 'receives'
+        ? {
+            message: msg as any,
+            targetChannels: channelRefs,
+            services: opts.services,
+            currentNodes: [...opts.existingNodes, ...expandedNodes],
+            target: opts.service,
+            mode: opts.mode,
+            channels: opts.channels,
+            channelMap: opts.channelMap,
+          }
+        : {
+            message: msg as any,
+            sourceChannels: channelRefs,
+            services: opts.services,
+            currentNodes: [...opts.existingNodes, ...expandedNodes],
+            source: opts.service,
+            currentEdges: [...opts.existingEdges, ...expandedEdges],
+            mode: opts.mode,
+            channels: opts.channels,
+            channelMap: opts.channelMap,
+          };
+
+    const { nodes: msgNodes, edges: msgEdges } =
+      direction === 'receives'
+        ? getNodesAndEdgesForConsumedMessage(args as any)
+        : getNodesAndEdgesForProducedMessage(args as any);
+
+    // Strip the service node and message node — the client expand logic creates these.
+    // Also strip the direct service↔message edge for the same reason.
+    const msgId = `${msg.data.id}-${msg.data.version}`;
+    const isServiceOrMessage = (id: string) => id === opts.serviceNodeId || id === msgId;
+    const isDirectEdge = (e: any) =>
+      (e.source === opts.serviceNodeId && e.target === msgId) || (e.source === msgId && e.target === opts.serviceNodeId);
+
+    expandedNodes.push(...msgNodes.filter((n: any) => !isServiceOrMessage(n.id)));
+    expandedEdges.push(...msgEdges.filter((e: any) => !isDirectEdge(e)));
+  }
+
+  return { expandedNodes, expandedEdges };
+};
+
 type DagreGraph = any;
 
 interface Props {
@@ -124,15 +200,89 @@ export const getNodesAndEdges = async ({
   const bothSentAndReceived = findMatchingNodes(receives, sends);
   const bothReadsAndWrites = findMatchingNodes(readsFrom, writesTo);
 
+  // Partition messages by group
+  const receivesPartition = partitionMessagesByGroup(receivesRaw, receives);
+  const sendsPartition = partitionMessagesByGroup(sendsRaw, sends);
+
+  // Collect grouped message IDs to exclude from bothSentAndReceived
+  const groupedMessageIds = new Set<string>();
+  for (const [, groupData] of receivesPartition.grouped) {
+    groupData.messages.forEach((m: any) => groupedMessageIds.add(`${m.data.id}-${m.data.version}`));
+  }
+  for (const [, groupData] of sendsPartition.grouped) {
+    groupData.messages.forEach((m: any) => groupedMessageIds.add(`${m.data.id}-${m.data.version}`));
+  }
+
+  const filteredBothSentAndReceived = bothSentAndReceived.filter(
+    (m: any) => m && !groupedMessageIds.has(`${m.data.id}-${m.data.version}`)
+  );
+
+  const serviceNodeId = `${service.data.id}-${service.data.version}`;
+
   if (renderMessages) {
-    // All the messages the service receives
-    receives.forEach((receive) => {
-      const targetChannels = receivesRaw.find(
-        (receiveRaw) => receiveRaw.id === receive.data.id && versionMatches(receiveRaw.version, receive.data.version)
-      )?.from;
+    // Emit group nodes for grouped receives
+    for (const [groupName, groupData] of receivesPartition.grouped) {
+      const groupNodeId = `message-group-${service.data.id}-${service.data.version}-${sanitizeGroupId(groupName)}-receives`;
+
+      // Match each message to its pointer by id/version (not index) to avoid
+      // misalignment when a pointer fails hydration and is missing from messages.
+      const findPointerForMessage = (msg: any) =>
+        groupData.pointers.find((p: any) => p.id === msg.data.id && versionMatches(p.version, msg.data.version));
+
+      const { expandedNodes, expandedEdges } = precomputeGroupExpansion(
+        groupData.messages,
+        groupData.messages.map((msg: any) => findPointerForMessage(msg)?.from || []),
+        'receives',
+        { serviceNodeId, services, service, mode, channels, channelMap, existingNodes: nodes, existingEdges: edges }
+      );
+
+      nodes.push({
+        id: groupNodeId,
+        sourcePosition: 'right',
+        targetPosition: 'left',
+        type: 'messageGroup',
+        data: {
+          mode,
+          groupName,
+          direction: 'receives' as const,
+          messageCount: groupData.messages.length,
+          messageTypes: [...new Set(groupData.messages.map((m: any) => m.collection))],
+          messages: groupData.messages.map((msg: any) => ({
+            message: { ...msg, data: { ...msg.data, ...getOperationFields(msg.data) } },
+            channels: findPointerForMessage(msg)?.from || [],
+          })),
+          service: { id: service.data.id, version: service.data.version },
+          expandedNodes,
+          expandedEdges,
+        },
+      });
+
+      edges.push(
+        createEdge({
+          id: `${groupNodeId}-to-${serviceNodeId}`,
+          source: groupNodeId,
+          target: serviceNodeId,
+          label: `consumes ${groupData.messages.length}\nmessages`,
+          type: 'multiline',
+          markerEnd: {
+            type: MarkerType.ArrowClosed,
+            color: '#666',
+            width: 20,
+            height: 20,
+          },
+        })
+      );
+    }
+
+    // Ungrouped receives go through existing path
+    receivesPartition.ungrouped.messages.forEach((receive) => {
+      const receiveRaw = receivesRaw.find(
+        (r) => r.id === (receive as any).data.id && versionMatches(r.version, (receive as any).data.version)
+      );
+      const targetChannels = receiveRaw?.from;
 
       const { nodes: consumedMessageNodes, edges: consumedMessageEdges } = getNodesAndEdgesForConsumedMessage({
-        message: receive,
+        message: receive as any,
         targetChannels: targetChannels,
         services,
         currentNodes: nodes,
@@ -239,13 +389,68 @@ export const getNodesAndEdges = async ({
   });
 
   if (renderMessages) {
-    sends.forEach((send) => {
-      const sourceChannels = sendsRaw.find(
-        (sendRaw) => sendRaw.id === send.data.id && versionMatches(sendRaw.version, send.data.version)
-      )?.to;
+    // Emit group nodes for grouped sends
+    for (const [groupName, groupData] of sendsPartition.grouped) {
+      const groupNodeId = `message-group-${service.data.id}-${service.data.version}-${sanitizeGroupId(groupName)}-sends`;
+
+      // Match each message to its pointer by id/version (not index) — same reason as receives above
+      const findPointerForMessage = (msg: any) =>
+        groupData.pointers.find((p: any) => p.id === msg.data.id && versionMatches(p.version, msg.data.version));
+
+      const { expandedNodes, expandedEdges } = precomputeGroupExpansion(
+        groupData.messages,
+        groupData.messages.map((msg: any) => findPointerForMessage(msg)?.to || []),
+        'sends',
+        { serviceNodeId, services, service, mode, channels, channelMap, existingNodes: nodes, existingEdges: edges }
+      );
+
+      nodes.push({
+        id: groupNodeId,
+        sourcePosition: 'right',
+        targetPosition: 'left',
+        type: 'messageGroup',
+        data: {
+          mode,
+          groupName,
+          direction: 'sends' as const,
+          messageCount: groupData.messages.length,
+          messageTypes: [...new Set(groupData.messages.map((m: any) => m.collection))],
+          messages: groupData.messages.map((msg: any) => ({
+            message: { ...msg, data: { ...msg.data, ...getOperationFields(msg.data) } },
+            channels: findPointerForMessage(msg)?.to || [],
+          })),
+          service: { id: service.data.id, version: service.data.version },
+          expandedNodes,
+          expandedEdges,
+        },
+      });
+
+      edges.push(
+        createEdge({
+          id: `${serviceNodeId}-to-${groupNodeId}`,
+          source: serviceNodeId,
+          target: groupNodeId,
+          label: `publishes ${groupData.messages.length}\nmessages`,
+          type: 'multiline',
+          markerEnd: {
+            type: MarkerType.ArrowClosed,
+            color: '#666',
+            width: 20,
+            height: 20,
+          },
+        })
+      );
+    }
+
+    // Ungrouped sends through existing path
+    sendsPartition.ungrouped.messages.forEach((send) => {
+      const sendRaw = sendsRaw.find(
+        (s) => s.id === (send as any).data.id && versionMatches(s.version, (send as any).data.version)
+      );
+      const sourceChannels = sendRaw?.to;
 
       const { nodes: producedMessageNodes, edges: producedMessageEdges } = getNodesAndEdgesForProducedMessage({
-        message: send,
+        message: send as any,
         sourceChannels: sourceChannels,
         services,
         currentNodes: nodes,
@@ -260,8 +465,8 @@ export const getNodesAndEdges = async ({
       edges.push(...producedMessageEdges);
     });
 
-    // Handle messages that are both sent and received
-    bothSentAndReceived.forEach((message) => {
+    // Handle messages that are both sent and received (filtered to exclude grouped)
+    filteredBothSentAndReceived.forEach((message) => {
       if (message) {
         edges.push({
           id: generatedIdForEdge(service, message) + '-both',

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

@@ -310,6 +310,55 @@ export const getOperationFields = (data: Record<string, any>) => {
   };
 };
 
+interface PointerWithGroup {
+  id: string;
+  version?: string;
+  group?: string;
+  [key: string]: any;
+}
+
+interface PartitionResult {
+  grouped: Map<string, { messages: CollectionItem[]; pointers: PointerWithGroup[] }>;
+  ungrouped: { messages: CollectionItem[]; pointers: PointerWithGroup[] };
+}
+
+/**
+ * Partition raw message pointers and their hydrated messages by group.
+ * Matches each pointer to its hydrated message by id + version.
+ */
+export const partitionMessagesByGroup = (
+  rawPointers: PointerWithGroup[],
+  hydratedMessages: CollectionItem[]
+): PartitionResult => {
+  const grouped = new Map<string, { messages: CollectionItem[]; pointers: PointerWithGroup[] }>();
+  const ungrouped: { messages: CollectionItem[]; pointers: PointerWithGroup[] } = {
+    messages: [],
+    pointers: [],
+  };
+
+  rawPointers.forEach((pointer) => {
+    const message = hydratedMessages.find((m) => m.data.id === pointer.id && versionMatches(pointer.version, m.data.version));
+
+    if (pointer.group) {
+      if (!grouped.has(pointer.group)) {
+        grouped.set(pointer.group, { messages: [], pointers: [] });
+      }
+      const group = grouped.get(pointer.group)!;
+      group.pointers.push(pointer);
+      if (message) {
+        group.messages.push(message);
+      }
+    } else {
+      ungrouped.pointers.push(pointer);
+      if (message) {
+        ungrouped.messages.push(message);
+      }
+    }
+  });
+
+  return { grouped, ungrouped };
+};
+
 export const getNodesAndEdgesFromDagre = ({
   nodes,
   edges,

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "3.26.16",
+  "version": "3.27.0",
   "publishConfig": {
     "access": "public"
   },
@@ -104,8 +104,8 @@
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
     "@eventcatalog/linter": "1.0.19",
-    "@eventcatalog/sdk": "2.18.4",
-    "@eventcatalog/visualiser": "^3.16.1"
+    "@eventcatalog/visualiser": "^3.17.0",
+    "@eventcatalog/sdk": "2.18.4"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.8",