@eventcatalog/core 3.6.1 → 3.7.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.6.1";
+var version = "3.7.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-N2VBSHPU.js";
-import "../chunk-SI6IEUYS.js";
+} from "../chunk-6DINZHVK.js";
+import "../chunk-WFIM5UXN.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.1";
+var version = "3.7.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-XRLZZXIS.js";
-import "../chunk-N2VBSHPU.js";
-import "../chunk-SI6IEUYS.js";
+} from "../chunk-2CIYDOFG.js";
+import "../chunk-6DINZHVK.js";
+import "../chunk-WFIM5UXN.js";
 import "../chunk-UPONRQSN.js";
 export {
   log_build_default as default

package/dist/{chunk-XRLZZXIS.js → chunk-2CIYDOFG.js}

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

package/dist/{chunk-N2VBSHPU.js → chunk-6DINZHVK.js}

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

package/dist/{chunk-OFHFRJ42.js → chunk-TWL75YK3.js}

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

package/dist/{chunk-FCIJEGOL.js → chunk-VA6OWAKW.js}

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

package/dist/{chunk-SI6IEUYS.js → chunk-WFIM5UXN.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-SI6IEUYS.js";
+} from "./chunk-WFIM5UXN.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.1";
+var version = "3.7.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-XRLZZXIS.js";
-import "./chunk-N2VBSHPU.js";
+} from "./chunk-2CIYDOFG.js";
+import "./chunk-6DINZHVK.js";
 import {
   runMigrations
 } from "./chunk-BH3JMNAV.js";
@@ -21,13 +21,13 @@ import {
 } from "./chunk-5VBIXL6C.js";
 import {
   generate
-} from "./chunk-FCIJEGOL.js";
+} from "./chunk-VA6OWAKW.js";
 import {
   logger
-} from "./chunk-OFHFRJ42.js";
+} from "./chunk-TWL75YK3.js";
 import {
   VERSION
-} from "./chunk-SI6IEUYS.js";
+} from "./chunk-WFIM5UXN.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.1";
+var version = "3.7.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-FCIJEGOL.js";
-import "./chunk-OFHFRJ42.js";
-import "./chunk-SI6IEUYS.js";
+} from "./chunk-VA6OWAKW.js";
+import "./chunk-TWL75YK3.js";
+import "./chunk-WFIM5UXN.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.1";
+var version = "3.7.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-OFHFRJ42.js";
-import "../chunk-SI6IEUYS.js";
+} from "../chunk-TWL75YK3.js";
+import "../chunk-WFIM5UXN.js";
 export {
   logger
 };

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

@@ -96,7 +96,7 @@ try {
     throw new Error(`Unknown resource type: ${type}`);
   }
 
-  const resourcesCollection = await getCollection(collection as any);
+  const resourcesCollection = (await getCollection(collection as any)) as { data: { id: string; version: string } }[];
   const resources = getItemsFromCollectionByIdAndSemverOrLatest(resourcesCollection, resourceId, version);
 
   if (resources.length === 0) {
@@ -153,7 +153,7 @@ const resolveMessage = async (msg: any): Promise<{ version: string | null; colle
   const collections = ['events', 'commands', 'queries'];
   for (const col of collections) {
     try {
-      const items = await getCollection(col as any);
+      const items = (await getCollection(col as any)) as { data: { id: string; version: string } }[];
       const found = getItemsFromCollectionByIdAndSemverOrLatest(items, msg.id);
       if (found.length > 0 && found[0].data.version && found[0].data.version !== 'latest') {
         return { version: found[0].data.version, collection: col };

package/eventcatalog/src/components/Search/SearchModal.tsx

@@ -25,6 +25,7 @@ import {
 import { StarIcon as StarIconSolid, CircleStackIcon } from '@heroicons/react/24/solid';
 import { useStore } from '@nanostores/react';
 import { sidebarStore } from '../../stores/sidebar-store';
+import type { NavNode } from '../../stores/sidebar-store/state';
 import { favoritesStore, toggleFavorite as toggleFavoriteAction } from '../../stores/favorites-store';
 import { buildUrl } from '@utils/url-builder';
 

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/layouts/VerticalSideBarLayout.astro

@@ -52,10 +52,17 @@ import { getQueries } from '@utils/collections/queries';
 import { hasLandingPageForDocs } from '@utils/pages';
 
 import { isEventCatalogUpgradeEnabled, isEmbedEnabled, isCustomStylesEnabled } from '@utils/feature';
+import { getUsers } from '@utils/collections/users';
+import { getTeams } from '@utils/collections/teams';
 
 const catalogHasDefaultLandingPageForDocs = await hasLandingPageForDocs();
 const customDocs = await getCollection('customPages');
 
+// Get users and teams for directory navigation
+const users = await getUsers();
+const teams = await getTeams();
+const directoryDefaultUrl = users.length > 0 ? '/directory/users' : teams.length > 0 ? '/directory/teams' : '/directory/users';
+
 let events: any[] = [];
 let commands: any[] = [];
 let queries: any[] = [];
@@ -145,7 +152,7 @@ const navigationItems = [
     id: '/directory',
     label: 'Users & Teams',
     icon: Users,
-    href: buildUrl('/directory/users'),
+    href: buildUrl(directoryDefaultUrl),
     current: currentPath.includes('/directory'),
   },
 ].filter((item) => {

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.1",
+  "version": "3.7.0",
   "publishConfig": {
     "access": "public"
   },
@@ -158,6 +158,7 @@
     "release": "changeset publish",
     "format": "prettier --config .prettierrc --write \"**/*.{js,jsx,ts,tsx,json,astro}\"",
     "format:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx,json,astro}\"",
-    "lint:catalog": "pnpm dlx @eventcatalog/linter examples/default"
+    "lint:catalog": "pnpm dlx @eventcatalog/linter examples/default",
+    "check": "node scripts/check-types.js"
   }
 }