@eventcatalog/core 3.6.2 → 3.7.1

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-NI3M6IVT.js";
-import "../chunk-LFXU3MEP.js";
+} from "../chunk-BVJJ3COQ.js";
+import "../chunk-MIHGWXCX.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

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

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-S3764NRV.js";
-import "../chunk-NI3M6IVT.js";
-import "../chunk-LFXU3MEP.js";
+} from "../chunk-B6NBNZGS.js";
+import "../chunk-BVJJ3COQ.js";
+import "../chunk-MIHGWXCX.js";
 import "../chunk-UPONRQSN.js";
 export {
   log_build_default as default

package/dist/{chunk-KOD6UMZD.js → chunk-44EDP7IH.js}

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

package/dist/{chunk-S3764NRV.js → chunk-B6NBNZGS.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-NI3M6IVT.js";
+} from "./chunk-BVJJ3COQ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-NI3M6IVT.js → chunk-BVJJ3COQ.js}

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

package/dist/{chunk-LFXU3MEP.js → chunk-MIHGWXCX.js}

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

package/dist/{chunk-BWIAPGUD.js → chunk-PV5ER42D.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-LFXU3MEP.js";
+} from "./chunk-MIHGWXCX.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -109,7 +109,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.6.2";
+var version = "3.7.1";
 
 // 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-S3764NRV.js";
-import "./chunk-NI3M6IVT.js";
+} from "./chunk-B6NBNZGS.js";
+import "./chunk-BVJJ3COQ.js";
 import {
   runMigrations
 } from "./chunk-BH3JMNAV.js";
@@ -21,13 +21,13 @@ import {
 } from "./chunk-5VBIXL6C.js";
 import {
   generate
-} from "./chunk-KOD6UMZD.js";
+} from "./chunk-44EDP7IH.js";
 import {
   logger
-} from "./chunk-BWIAPGUD.js";
+} from "./chunk-PV5ER42D.js";
 import {
   VERSION
-} from "./chunk-LFXU3MEP.js";
+} from "./chunk-MIHGWXCX.js";
 import "./chunk-UPONRQSN.js";
 
 // src/eventcatalog.ts

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-KOD6UMZD.js";
-import "./chunk-BWIAPGUD.js";
-import "./chunk-LFXU3MEP.js";
+} from "./chunk-44EDP7IH.js";
+import "./chunk-PV5ER42D.js";
+import "./chunk-MIHGWXCX.js";
 import "./chunk-UPONRQSN.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.6.2";
+var version = "3.7.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-BWIAPGUD.js";
-import "../chunk-LFXU3MEP.js";
+} from "../chunk-PV5ER42D.js";
+import "../chunk-MIHGWXCX.js";
 export {
   logger
 };

package/eventcatalog/src/components/SchemaExplorer/JSONSchemaViewer.tsx

@@ -157,32 +157,32 @@ function processSchema(schema: any, rootSchema?: any): any {
     return mergeAllOfSchemas({ ...schema, processSchema: (s: any) => processSchema(s, root) });
   }
 
-  if (schema.oneOf) {
-    const processedVariants = schema.oneOf.map((variant: any) => {
+  if (schema.oneOf || schema.anyOf) {
+    const variantsArray = schema.oneOf || schema.anyOf;
+    const variantType = schema.oneOf ? 'oneOf' : 'anyOf';
+
+    const processedVariants = variantsArray.map((variant: any, index: number) => {
       const processedVariant = processSchema(variant, root);
       return {
-        title: processedVariant.title || variant.title || 'Unnamed Variant',
+        title: processedVariant.title || variant.title || processedVariant.$id || `Option ${index + 1}`,
+        description: processedVariant.description || variant.description,
         required: processedVariant.required || variant.required || [],
         properties: processedVariant.properties || {},
+        type: processedVariant.type || variant.type || 'object',
         ...processedVariant,
       };
     });
 
-    const allProperties: Record<string, any> = {};
-    processedVariants.forEach((variant: any) => {
-      if (variant.properties) {
-        Object.assign(allProperties, variant.properties);
-      }
-    });
-
     return {
       ...schema,
       type: schema.type || 'object',
-      properties: {
-        ...(schema.properties || {}),
-        ...allProperties,
-      },
+      properties: schema.properties
+        ? Object.fromEntries(
+            Object.entries(schema.properties).map(([key, prop]: [string, any]) => [key, processSchema(prop, root)])
+          )
+        : {},
       variants: processedVariants,
+      variantType,
     };
   }
 
@@ -203,9 +203,66 @@ function processSchema(schema: any, rootSchema?: any): any {
   return schema;
 }
 
+// NestedVariantSelector component for handling variants within array items
+const NestedVariantSelector = ({
+  variants,
+  variantType,
+  level,
+  expand,
+}: {
+  variants: any[];
+  variantType?: string;
+  level: number;
+  expand: boolean;
+}) => {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const selectedVariant = variants[selectedIndex];
+
+  return (
+    <div className="mt-2">
+      <div className="p-2 bg-[rgb(var(--ec-accent-subtle,var(--ec-content-hover)))] border border-[rgb(var(--ec-page-border))] rounded-md">
+        <div className="flex flex-col sm:flex-row sm:items-center gap-2">
+          <span className="text-xs font-medium text-[rgb(var(--ec-page-text))]">
+            {variantType === 'anyOf' ? 'Any of' : 'One of'} {variants.length} options:
+          </span>
+          <select
+            value={selectedIndex}
+            onChange={(e) => setSelectedIndex(parseInt(e.target.value))}
+            className="form-select text-xs border-[rgb(var(--ec-input-border))] bg-[rgb(var(--ec-input-bg))] text-[rgb(var(--ec-input-text))] rounded-md shadow-sm focus:border-[rgb(var(--ec-accent))] focus:ring focus:ring-[rgb(var(--ec-accent)/0.2)] py-1"
+          >
+            {variants.map((variant: any, index: number) => (
+              <option key={index} value={index}>
+                {variant.title}
+              </option>
+            ))}
+          </select>
+        </div>
+        {selectedVariant?.description && (
+          <p className="text-xs text-[rgb(var(--ec-page-text-muted))] mt-1">{selectedVariant.description}</p>
+        )}
+      </div>
+      {selectedVariant?.properties && (
+        <div className="mt-2">
+          {Object.entries(selectedVariant.properties).map(([propName, propDetails]: [string, any]) => (
+            <SchemaProperty
+              key={`${selectedIndex}-${propName}`}
+              name={propName}
+              details={propDetails}
+              isRequired={selectedVariant.required?.includes(propName) ?? false}
+              level={level}
+              expand={expand}
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  );
+};
+
 // SchemaProperty component
 const SchemaProperty = ({ name, details, isRequired, level, isListItem = false, expand }: SchemaPropertyProps) => {
   const [isExpanded, setIsExpanded] = useState(expand);
+  const [selectedVariantIndex, setSelectedVariantIndex] = useState(0);
   const contentId = useRef(`prop-${name}-${level}-${Math.random().toString(36).substring(2, 7)}`).current;
 
   useEffect(() => {
@@ -219,8 +276,11 @@ const SchemaProperty = ({ name, details, isRequired, level, isListItem = false,
     ((details.items.type === 'object' && details.items.properties) ||
       details.items.allOf ||
       details.items.oneOf ||
+      details.items.anyOf ||
+      details.items.variants ||
       details.items.$ref);
-  const isCollapsible = hasNestedProperties || hasArrayItemProperties;
+  const hasVariants = details.variants && details.variants.length > 0;
+  const isCollapsible = hasNestedProperties || hasArrayItemProperties || hasVariants;
 
   const indentationClass = `pl-${level * 3}`;
 
@@ -247,7 +307,7 @@ const SchemaProperty = ({ name, details, isRequired, level, isListItem = false,
             <div>
               <span className="font-semibold text-[rgb(var(--ec-page-text))] text-sm">{name}</span>
               <span className="ml-1.5 text-[rgb(var(--ec-accent))] font-mono text-xs">
-                {details.type}
+                {hasVariants ? (details.variantType === 'anyOf' ? 'anyOf' : 'oneOf') : details.type}
                 {details.type === 'array' && details.items?.type ? `[${details.items.type}]` : ''}
                 {details.format ? `<${details.format}>` : ''}
                 {details._refPath && (
@@ -325,9 +385,53 @@ const SchemaProperty = ({ name, details, isRequired, level, isListItem = false,
             )}
           </div>
 
-          {(hasNestedProperties || hasArrayItems) && (
+          {(hasNestedProperties || hasArrayItems || hasVariants) && (
             <div id={contentId} className={`nested-content mt-1 ${isCollapsible && !isExpanded ? 'hidden' : ''}`}>
+              {hasVariants && (
+                <div className="mt-2 mb-2 p-2 bg-[rgb(var(--ec-accent-subtle,var(--ec-content-hover)))] border border-[rgb(var(--ec-page-border))] rounded-md">
+                  <div className="flex flex-col sm:flex-row sm:items-center gap-2">
+                    <span className="text-xs font-medium text-[rgb(var(--ec-page-text))]">
+                      {details.variantType === 'anyOf' ? 'Any of' : 'One of'} {details.variants.length} options:
+                    </span>
+                    <select
+                      value={selectedVariantIndex}
+                      onChange={(e) => setSelectedVariantIndex(parseInt(e.target.value))}
+                      className="form-select text-xs border-[rgb(var(--ec-input-border))] bg-[rgb(var(--ec-input-bg))] text-[rgb(var(--ec-input-text))] rounded-md shadow-sm focus:border-[rgb(var(--ec-accent))] focus:ring focus:ring-[rgb(var(--ec-accent)/0.2)] py-1"
+                    >
+                      {details.variants.map((variant: any, index: number) => (
+                        <option key={index} value={index}>
+                          {variant.title}
+                        </option>
+                      ))}
+                    </select>
+                  </div>
+                  {details.variants[selectedVariantIndex]?.description && (
+                    <p className="text-xs text-[rgb(var(--ec-page-text-muted))] mt-1">
+                      {details.variants[selectedVariantIndex].description}
+                    </p>
+                  )}
+                </div>
+              )}
+
+              {hasVariants && details.variants[selectedVariantIndex]?.properties && (
+                <div className="mt-1">
+                  {Object.entries(details.variants[selectedVariantIndex].properties).map(
+                    ([nestedName, nestedDetails]: [string, any]) => (
+                      <SchemaProperty
+                        key={`${selectedVariantIndex}-${nestedName}`}
+                        name={nestedName}
+                        details={nestedDetails}
+                        isRequired={details.variants[selectedVariantIndex]?.required?.includes(nestedName) ?? false}
+                        level={level + 1}
+                        expand={expand}
+                      />
+                    )
+                  )}
+                </div>
+              )}
+
               {hasNestedProperties &&
+                !hasVariants &&
                 details.properties &&
                 Object.entries(details.properties).map(([nestedName, nestedDetails]: [string, any]) => (
                   <SchemaProperty
@@ -355,11 +459,21 @@ const SchemaProperty = ({ name, details, isRequired, level, isListItem = false,
                         expand={expand}
                       />
                     ))}
-                  {(details.items.allOf || details.items.oneOf || details.items.$ref) && !details.items.properties && (
-                    <div className="text-xs text-[rgb(var(--ec-page-text-muted))] mt-1">
-                      Complex array item schema detected. The properties should be processed by the parent SchemaViewer.
-                    </div>
+                  {details.items.variants && details.items.variants.length > 0 && (
+                    <NestedVariantSelector
+                      variants={details.items.variants}
+                      variantType={details.items.variantType}
+                      level={level + 1}
+                      expand={expand}
+                    />
                   )}
+                  {(details.items.allOf || details.items.oneOf || details.items.anyOf || details.items.$ref) &&
+                    !details.items.properties &&
+                    !details.items.variants && (
+                      <div className="text-xs text-[rgb(var(--ec-page-text-muted))] mt-1">
+                        Complex array item schema detected. The properties should be processed by the parent SchemaViewer.
+                      </div>
+                    )}
                 </div>
               )}
             </div>
@@ -421,7 +535,7 @@ export default function JSONSchemaViewer({
     return { displaySchema: display, isRootArray: isArray };
   }, [processedSchema]);
 
-  const { description, properties, required = [], variants } = displaySchema;
+  const { description, properties, required = [], variants, variantType } = displaySchema;
   const totalProperties = useMemo(() => countProperties(displaySchema), [displaySchema]);
 
   // Search functionality
@@ -667,14 +781,16 @@ export default function JSONSchemaViewer({
         )}
         {description && <p className="text-[rgb(var(--ec-page-text-muted))] text-xs mb-5">{description}</p>}
 
-        {variants && (
-          <div className="mb-4">
-            <div className="flex items-center space-x-2">
-              <span className="text-sm text-[rgb(var(--ec-page-text-muted))]">(one of)</span>
+        {variants && variants.length > 0 && (
+          <div className="mb-4 p-3 bg-[rgb(var(--ec-accent-subtle,var(--ec-content-hover)))] border border-[rgb(var(--ec-page-border))] rounded-md">
+            <div className="flex flex-col sm:flex-row sm:items-center gap-2">
+              <span className="text-sm font-medium text-[rgb(var(--ec-page-text))]">
+                {variantType === 'anyOf' ? 'Any of' : 'One of'} {variants.length} options:
+              </span>
               <select
                 value={selectedVariantIndex}
                 onChange={(e) => setSelectedVariantIndex(parseInt(e.target.value))}
-                className="form-select text-sm border-[rgb(var(--ec-input-border))] bg-[rgb(var(--ec-input-bg))] text-[rgb(var(--ec-input-text))] rounded-md shadow-sm focus:border-[rgb(var(--ec-accent))] focus:ring focus:ring-[rgb(var(--ec-accent)/0.2)]"
+                className="form-select text-sm border-[rgb(var(--ec-input-border))] bg-[rgb(var(--ec-input-bg))] text-[rgb(var(--ec-input-text))] rounded-md shadow-sm focus:border-[rgb(var(--ec-accent))] focus:ring focus:ring-[rgb(var(--ec-accent)/0.2)] flex-1 sm:flex-initial"
               >
                 {variants.map((variant: any, index: number) => (
                   <option key={index} value={index}>
@@ -683,27 +799,41 @@ export default function JSONSchemaViewer({
                 ))}
               </select>
             </div>
+            {variants[selectedVariantIndex]?.description && (
+              <p className="text-xs text-[rgb(var(--ec-page-text-muted))] mt-2">{variants[selectedVariantIndex].description}</p>
+            )}
           </div>
         )}
 
-        {properties ? (
-          <div ref={propertiesContainerRef}>
-            {Object.entries(properties).map(([name, details]: [string, any]) => (
-              <SchemaProperty
-                key={name}
-                name={name}
-                details={details}
-                isRequired={
-                  variants ? variants[selectedVariantIndex]?.required?.includes(name) || false : required.includes(name)
-                }
-                level={0}
-                expand={expandAll}
-              />
-            ))}
-          </div>
-        ) : !isRootArray ? (
-          <p className="text-[rgb(var(--ec-page-text-muted))] text-sm">Schema does not contain any properties.</p>
-        ) : (
+        {(() => {
+          // Determine which properties to display
+          const propsToDisplay =
+            variants && variants.length > 0 && variants[selectedVariantIndex]?.properties
+              ? { ...properties, ...variants[selectedVariantIndex].properties }
+              : properties;
+          const requiredProps = variants && variants.length > 0 ? variants[selectedVariantIndex]?.required || [] : required;
+
+          if (propsToDisplay && Object.keys(propsToDisplay).length > 0) {
+            return (
+              <div ref={propertiesContainerRef}>
+                {Object.entries(propsToDisplay).map(([name, details]: [string, any]) => (
+                  <SchemaProperty
+                    key={`${selectedVariantIndex}-${name}`}
+                    name={name}
+                    details={details}
+                    isRequired={requiredProps.includes(name)}
+                    level={0}
+                    expand={expandAll}
+                  />
+                ))}
+              </div>
+            );
+          } else if (!isRootArray) {
+            return <p className="text-[rgb(var(--ec-page-text-muted))] text-sm">Schema does not contain any properties.</p>;
+          }
+          return null;
+        })()}
+        {!properties && !variants && isRootArray && (
           <div className="text-center py-8">
             <div className="text-[rgb(var(--ec-page-text-muted))] text-sm">
               <p>

package/eventcatalog/src/content.config.ts

@@ -490,6 +490,8 @@ const domains = defineCollection({
       domains: z.array(pointer).optional(),
       entities: z.array(pointer).optional(),
       flows: z.array(pointer).optional(),
+      sends: z.array(sendsPointer).optional(),
+      receives: z.array(receivesPointer).optional(),
       detailsPanel: z
         .object({
           parentDomains: detailPanelPropertySchema.optional(),

package/eventcatalog/src/pages/api/sidebar-data.json.ts

@@ -1,6 +1,8 @@
 import type { APIRoute } from 'astro';
 import { getNestedSideBarData } from '@stores/sidebar-store/state';
 
+const isDev = import.meta.env.DEV;
+
 /**
  * API route that returns the sidebar navigation data as JSON.
  * This is pre-rendered in static mode to avoid embedding the data in every HTML page.
@@ -12,11 +14,14 @@ export const GET: APIRoute = async () => {
   return new Response(JSON.stringify(sidebarData), {
     headers: {
       'Content-Type': 'application/json',
-      // Cache for 1 hour in browser, allow CDN to cache and revalidate
-      'Cache-Control': 'public, max-age=3600, s-maxage=3600, stale-while-revalidate=86400',
+      // In dev mode, disable caching to ensure fresh data. In production, cache for 1 hour.
+      'Cache-Control': isDev
+        ? 'no-cache, no-store, must-revalidate'
+        : 'public, max-age=3600, s-maxage=3600, stale-while-revalidate=86400',
     },
   });
 };
 
 // Pre-render this route in static mode so it becomes a static JSON file
-export const prerender = true;
+// In dev mode, don't pre-render to allow dynamic updates
+export const prerender = !isDev;

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

@@ -11,6 +11,7 @@ import {
   buildDiagramNavItems,
 } from './shared';
 import { isVisualiserEnabled } from '@utils/feature';
+import { pluralizeMessageType } from '@utils/collections/messages';
 
 export const buildDomainNode = (domain: CollectionEntry<'domains'>, owners: any[], context: ResourceGroupContext): NavNode => {
   const servicesInDomain = domain.data.services || [];
@@ -37,6 +38,11 @@ export const buildDomainNode = (domain: CollectionEntry<'domains'>, owners: any[
 
   const renderRepository = domain.data.repository && shouldRenderSideBarSection(domain, 'repository');
 
+  // Domain-level messages (sends/receives)
+  const sendsMessages = domain.data.sends || [];
+  const receivesMessages = domain.data.receives || [];
+  const renderMessages = shouldRenderSideBarSection(domain, 'messages');
+
   // Diagrams
   const domainDiagrams = domain.data.diagrams || [];
   const diagramNavItems = buildDiagramNavItems(domainDiagrams, context.diagrams);
@@ -111,6 +117,24 @@ export const buildDomainNode = (domain: CollectionEntry<'domains'>, owners: any[
         icon: 'Server',
         pages: servicesInDomain.map((service) => `service:${(service as any).data.id}:${(service as any).data.version}`),
       },
+      sendsMessages.length > 0 &&
+        renderMessages && {
+          type: 'group',
+          title: 'Domain Events',
+          icon: 'Mail',
+          pages: sendsMessages.map(
+            (message) => `${pluralizeMessageType(message as any)}:${(message as any).data.id}:${(message as any).data.version}`
+          ),
+        },
+      receivesMessages.length > 0 &&
+        renderMessages && {
+          type: 'group',
+          title: 'External Events',
+          icon: 'Mail',
+          pages: receivesMessages.map(
+            (receive) => `${pluralizeMessageType(receive as any)}:${(receive as any).data.id}:${(receive as any).data.version}`
+          ),
+        },
       renderOwners && buildOwnersSection(owners),
       renderRepository && buildRepositorySection(domain.data.repository as { url: string; language: string }),
       hasAttachments && buildAttachmentsSection(domain.data.attachments as any[]),

package/eventcatalog/src/utils/collections/domains.ts

@@ -79,35 +79,21 @@ export const getDomains = async ({
     return memoryCache[cacheKey];
   }
 
-  // 1. Fetch collections
-  const collectionsToFetch: any[] = [
+  // 1. Fetch collections (always fetch messages to hydrate domain-level sends/receives)
+  const [allDomains, allServices, allEntities, allFlows, allEvents, allCommands, allQueries, allContainers] = await Promise.all([
     getCollection('domains'),
     getCollection('services'),
     getCollection('entities'),
     getCollection('flows'),
-  ];
-
-  if (enrichServices) {
-    collectionsToFetch.push(
-      getCollection('events'),
-      getCollection('commands'),
-      getCollection('queries'),
-      getCollection('containers')
-    );
-  }
-
-  const results = await Promise.all(collectionsToFetch);
-  const [allDomains, allServices, allEntities, allFlows] = results;
-
-  let messageMap = new Map();
-  let containerMap = new Map();
+    getCollection('events'),
+    getCollection('commands'),
+    getCollection('queries'),
+    getCollection('containers'),
+  ]);
 
-  if (enrichServices) {
-    const [, , , , allEvents, allCommands, allQueries, allContainers] = results;
-    const allMessages = [...allEvents, ...allCommands, ...allQueries];
-    messageMap = createVersionedMap(allMessages);
-    containerMap = createVersionedMap(allContainers);
-  }
+  const allMessages = [...allEvents, ...allCommands, ...allQueries];
+  const messageMap = createVersionedMap(allMessages);
+  const containerMap = createVersionedMap(allContainers);
 
   // 2. Build optimized maps
   const domainMap = createVersionedMap(allDomains);
@@ -192,6 +178,15 @@ export const getDomains = async ({
         ? [...(hydratedMainServices as any), ...(hydratedSubdomainServices as any)]
         : (hydratedMainServices as any);
 
+      // Hydrate domain-level sends and receives
+      const domainSends = (domain.data.sends || [])
+        .map((m: { id: string; version: string | undefined }) => findInMap(messageMap, m.id, m.version))
+        .filter((e): e is CollectionEntry<CollectionMessageTypes> => !!e);
+
+      const domainReceives = (domain.data.receives || [])
+        .map((m: { id: string; version: string | undefined }) => findInMap(messageMap, m.id, m.version))
+        .filter((e): e is CollectionEntry<CollectionMessageTypes> => !!e);
+
       // Calculate folder paths
       const folderName = await getResourceFolderName(
         process.env.PROJECT_DIR ?? '',
@@ -208,6 +203,8 @@ export const getDomains = async ({
           domains: subDomains as any,
           entities: entities as any,
           flows: flows as any,
+          sends: domainSends as any,
+          receives: domainReceives as any,
           latestVersion,
           versions,
         },
@@ -249,20 +246,43 @@ export const getMessagesForDomain = async (
   const allMessages = [...events, ...commands, ...queries];
   const messageMap = createVersionedMap(allMessages);
 
-  const sends = services.flatMap((service) => service.data.sends || []);
-  const receives = services.flatMap((service) => service.data.receives || []);
+  // Get service-level sends/receives
+  const serviceSends = services.flatMap((service) => service.data.sends || []);
+  const serviceReceives = services.flatMap((service) => service.data.receives || []);
+
+  // Get domain-level sends/receives (already hydrated if domain came from getDomains)
+  const domainSends = domain.data.sends || [];
+  const domainReceives = domain.data.receives || [];
 
-  const sendsMessages = sends
-    .map((send) => findInMap(messageMap, send.id, send.version))
+  // Combine and deduplicate - domain-level messages take priority
+  const allSends = [...domainSends, ...serviceSends];
+  const allReceives = [...domainReceives, ...serviceReceives];
+
+  const sendsMessages = allSends
+    .map((send: any) => {
+      // If already hydrated (has data property), return as-is
+      if (send.data) return send;
+      // Otherwise, resolve from map
+      return findInMap(messageMap, send.id, send.version);
+    })
     .filter((msg): msg is CollectionEntry<CollectionMessageTypes> => !!msg);
 
-  const receivesMessages = receives
-    .map((receive) => findInMap(messageMap, receive.id, receive.version))
+  const receivesMessages = allReceives
+    .map((receive: any) => {
+      // If already hydrated (has data property), return as-is
+      if (receive.data) return receive;
+      // Otherwise, resolve from map
+      return findInMap(messageMap, receive.id, receive.version);
+    })
     .filter((msg): msg is CollectionEntry<CollectionMessageTypes> => !!msg);
 
+  // Deduplicate by id and version
+  const uniqueSends = Array.from(new Map(sendsMessages.map((msg) => [`${msg.data.id}-${msg.data.version}`, msg])).values());
+  const uniqueReceives = Array.from(new Map(receivesMessages.map((msg) => [`${msg.data.id}-${msg.data.version}`, msg])).values());
+
   return {
-    sends: sendsMessages,
-    receives: receivesMessages,
+    sends: uniqueSends,
+    receives: uniqueReceives,
   };
 };
 

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "3.6.2",
+  "version": "3.7.1",
   "publishConfig": {
     "access": "public"
   },
@@ -23,9 +23,9 @@
     "@ai-sdk/react": "^3.0.17",
     "@astrojs/markdown-remark": "^6.3.10",
     "@astrojs/mdx": "^4.3.13",
-    "@astrojs/node": "^9.5.1",
+    "@astrojs/node": "^9.5.2",
     "@astrojs/react": "^4.4.2",
-    "@astrojs/rss": "^4.0.14",
+    "@astrojs/rss": "^4.0.15",
     "@astrojs/tailwind": "^6.0.2",
     "@asyncapi/avro-schema-parser": "3.0.24",
     "@asyncapi/parser": "3.4.0",
@@ -55,7 +55,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "ai": "^6.0.17",
-    "astro": "^5.16.8",
+    "astro": "^5.16.10",
     "astro-compress": "^2.3.8",
     "astro-expressive-code": "^0.41.3",
     "astro-seo": "^0.8.4",