@eventcatalog/core 3.33.0 → 3.35.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.33.0";
+var version = "3.35.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-TDRDRXOZ.js";
-import "../chunk-YKTTWB2P.js";
+} from "../chunk-B2LDVIVY.js";
+import "../chunk-NEWQKEP7.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.33.0";
+var version = "3.35.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-GBSBBBF5.js";
-import "../chunk-TDRDRXOZ.js";
+} from "../chunk-DFLUDECO.js";
+import "../chunk-B2LDVIVY.js";
 import "../chunk-4UVFXLPI.js";
-import "../chunk-YKTTWB2P.js";
+import "../chunk-NEWQKEP7.js";
 import "../chunk-5T63CXKU.js";
 export {
   log_build_default as default

package/dist/{chunk-TDRDRXOZ.js → chunk-B2LDVIVY.js}

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

package/dist/{chunk-GBSBBBF5.js → chunk-DFLUDECO.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-TDRDRXOZ.js";
+} from "./chunk-B2LDVIVY.js";
 import {
   countResources,
   serializeCounts

package/dist/{chunk-DN6F4AAQ.js → chunk-LUWCWNOR.js}

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

package/dist/{chunk-YKTTWB2P.js → chunk-NEWQKEP7.js}

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

package/dist/{chunk-VRXBFCYB.js → chunk-Y5O6SCX3.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-DN6F4AAQ.js";
+} from "./chunk-LUWCWNOR.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.33.0";
+var version = "3.35.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-YKTTWB2P.js";
+} from "./chunk-NEWQKEP7.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.33.0";
+var version = "3.35.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,18 +1,18 @@
-import {
-  log_build_default
-} from "./chunk-GBSBBBF5.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-WAJIJEI3.js";
 import {
   watch
 } from "./chunk-K3ZVEX2Y.js";
+import {
+  log_build_default
+} from "./chunk-DFLUDECO.js";
+import "./chunk-B2LDVIVY.js";
+import "./chunk-4UVFXLPI.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
-import "./chunk-TDRDRXOZ.js";
-import "./chunk-4UVFXLPI.js";
 import {
   catalogToAstro
 } from "./chunk-YDXB3BD2.js";
@@ -22,13 +22,13 @@ import {
 } from "./chunk-3KXCGYET.js";
 import {
   generate
-} from "./chunk-VRXBFCYB.js";
+} from "./chunk-Y5O6SCX3.js";
 import {
   logger
-} from "./chunk-DN6F4AAQ.js";
+} from "./chunk-LUWCWNOR.js";
 import {
   VERSION
-} from "./chunk-YKTTWB2P.js";
+} from "./chunk-NEWQKEP7.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.33.0";
+var version = "3.35.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-VRXBFCYB.js";
-import "./chunk-DN6F4AAQ.js";
-import "./chunk-YKTTWB2P.js";
+} from "./chunk-Y5O6SCX3.js";
+import "./chunk-LUWCWNOR.js";
+import "./chunk-NEWQKEP7.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.33.0";
+var version = "3.35.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-DN6F4AAQ.js";
-import "../chunk-YKTTWB2P.js";
+} from "../chunk-LUWCWNOR.js";
+import "../chunk-NEWQKEP7.js";
 export {
   logger
 };

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

@@ -27,6 +27,7 @@ import { useStore } from '@nanostores/react';
 import { favoritesStore, toggleFavorite as toggleFavoriteAction } from '../../stores/favorites-store';
 import { buildUrl } from '@utils/url-builder';
 import { resolveIconUrl } from '@utils/icon';
+import { getUrlForSearchItem } from './search-utils';
 
 const typeIcons: any = {
   Domain: RectangleGroupIcon,
@@ -43,6 +44,8 @@ const typeIcons: any = {
   AsyncAPI: DocumentTextIcon,
   Design: Square2StackIcon,
   Container: CircleStackIcon,
+  'Data Product': CubeIcon,
+  Flow: QueueListIcon,
   default: DocumentTextIcon,
 };
 
@@ -62,6 +65,8 @@ const typeColors: any = {
   AsyncAPI: 'text-violet-500 dark:text-violet-400 bg-violet-50 dark:bg-violet-500/10 ring-violet-200 dark:ring-violet-500/30',
   Design: 'text-gray-500 dark:text-gray-400 bg-gray-50 dark:bg-gray-500/10 ring-gray-200 dark:ring-gray-500/30',
   Container: 'text-indigo-500 dark:text-indigo-400 bg-indigo-50 dark:bg-indigo-500/10 ring-indigo-200 dark:ring-indigo-500/30',
+  'Data Product': 'text-sky-500 dark:text-sky-400 bg-sky-50 dark:bg-sky-500/10 ring-sky-200 dark:ring-sky-500/30',
+  Flow: 'text-fuchsia-500 dark:text-fuchsia-400 bg-fuchsia-50 dark:bg-fuchsia-500/10 ring-fuchsia-200 dark:ring-fuchsia-500/30',
   default: 'text-gray-500 dark:text-gray-400 bg-gray-50 dark:bg-gray-500/10 ring-gray-200 dark:ring-gray-500/30',
 };
 
@@ -69,35 +74,6 @@ function classNames(...classes: (string | boolean | undefined)[]) {
   return classes.filter(Boolean).join(' ');
 }
 
-// Helper to construct URL from key if href is missing
-const getUrlForItem = (node: any, key: string) => {
-  const parts = key.split(':');
-  if (parts.length < 2) return null; // Need at least type:id
-
-  const type = parts[0];
-  const id = parts[1];
-  const version = parts[2]; // May be undefined
-
-  // Skip list items and other special keys
-  if (type === 'list') return null;
-
-  // Only show items that have a version to avoid duplicates
-  if (!version) return null;
-
-  // If node has href, use it, otherwise construct from key
-  if (node.href) return node.href;
-
-  // Pluralize type for URL if needed
-  let pluralType = type;
-  if (['event', 'command', 'domain', 'service', 'flow', 'container', 'channel'].includes(type)) {
-    pluralType = type + 's';
-  } else if (type === 'query') {
-    pluralType = 'queries';
-  }
-
-  return buildUrl(`/docs/${pluralType}/${id}/${version}`);
-};
-
 interface SearchNode {
   key: string;
   title: string;
@@ -203,7 +179,7 @@ export default function SearchModal() {
   const items = useMemo(() => {
     return searchNodes
       .map((node) => {
-        const url = getUrlForItem(node as any, node.key);
+        const url = getUrlForSearchItem(node as any, node.key);
         if (!url) return null;
 
         return {
@@ -252,8 +228,11 @@ export default function SearchModal() {
       Message: 0,
       Team: 0,
       Container: 0,
+      Entity: 0,
       Design: 0,
       Channel: 0,
+      Flow: 0,
+      'Data Product': 0,
     };
 
     itemsToCount.forEach((item) => {
@@ -277,8 +256,12 @@ export default function SearchModal() {
     if (counts.Domain > 0) dynamicFilters.push({ id: 'Domain', name: `Domains (${counts.Domain})` });
     if (counts.Service > 0) dynamicFilters.push({ id: 'Service', name: `Services (${counts.Service})` });
     if (counts.Message > 0) dynamicFilters.push({ id: 'Message', name: `Messages (${counts.Message})` });
-    if (counts.Container > 0) dynamicFilters.push({ id: 'Container', name: `Containers (${counts.Container})` });
+    if (counts.Container > 0) dynamicFilters.push({ id: 'Container', name: `Data Stores (${counts.Container})` });
+    if (counts.Entity > 0) dynamicFilters.push({ id: 'Entity', name: `Entities (${counts.Entity})` });
     if (counts.Channel > 0) dynamicFilters.push({ id: 'Channel', name: `Channels (${counts.Channel})` });
+    if (counts.Flow > 0) dynamicFilters.push({ id: 'Flow', name: `Flows (${counts.Flow})` });
+    if (counts['Data Product'] > 0)
+      dynamicFilters.push({ id: 'Data Product', name: `Data Products (${counts['Data Product']})` });
     if (counts.Design > 0) dynamicFilters.push({ id: 'Design', name: `Designs (${counts.Design})` });
     if (counts.Team > 0) dynamicFilters.push({ id: 'Team', name: `Teams & Users (${counts.Team})` });
 
@@ -317,7 +300,7 @@ export default function SearchModal() {
           .slice(0, 5)
           .map((fav) => {
             const node = searchNodeLookup.get(fav.nodeKey);
-            const url = node ? getUrlForItem(node as any, fav.nodeKey) : fav.href;
+            const url = node ? getUrlForSearchItem(node as any, fav.nodeKey) : fav.href;
             if (!url) return null;
 
             return {
@@ -411,7 +394,13 @@ export default function SearchModal() {
                 </div>
 
                 {/* Filter Tabs */}
-                <div className="flex items-center gap-2 px-4 py-3 overflow-x-auto no-scrollbar border-b border-[rgb(var(--ec-page-border))]">
+                <div
+                  className="flex items-center gap-2 px-4 pt-3 pb-3.5 overflow-x-auto overscroll-x-contain border-b border-[rgb(var(--ec-page-border))]"
+                  style={{
+                    scrollbarWidth: 'thin',
+                    scrollbarColor: 'rgb(var(--ec-page-border)) transparent',
+                  }}
+                >
                   {filters.map((tab) => (
                     <button
                       key={tab.id}
@@ -566,7 +555,7 @@ export default function SearchModal() {
                     <MagnifyingGlassIcon className="mx-auto h-6 w-6 text-[rgb(var(--ec-icon-color))]" />
                     <p className="mt-4 font-semibold text-[rgb(var(--ec-page-text))]">Search for anything</p>
                     <p className="mt-2 text-[rgb(var(--ec-page-text-muted))]">
-                      Search for domains, services, events, commands, queries and more.
+                      Search for domains, services, events, commands, queries, data stores, data products, flows and more.
                     </p>
                   </div>
                 )}

package/eventcatalog/src/components/Search/search-utils.spec.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it, beforeEach } from 'vitest';
+import { getUrlForSearchItem } from './search-utils';
+
+declare global {
+  interface Window {
+    __EC_TRAILING_SLASH__: boolean;
+  }
+}
+
+describe('getUrlForSearchItem', () => {
+  beforeEach(() => {
+    // @ts-ignore
+    global.__EC_TRAILING_SLASH__ = false;
+  });
+
+  it.each([
+    ['container:OrdersDatabase:1.0.0', '/docs/containers/OrdersDatabase/1.0.0'],
+    ['data-product:Customer360:1.0.0', '/docs/data-products/Customer360/1.0.0'],
+    ['entity:Order:1.0.0', '/docs/entities/Order/1.0.0'],
+    ['flow:CheckoutFlow:1.0.0', '/docs/flows/CheckoutFlow/1.0.0'],
+  ])('builds a docs URL for %s', (key, expected) => {
+    expect(getUrlForSearchItem({}, key)).toBe(expected);
+  });
+
+  it('uses the explicit node href when provided', () => {
+    expect(getUrlForSearchItem({ href: '/custom/search-result' }, 'data-product:Customer360:1.0.0')).toBe(
+      '/custom/search-result'
+    );
+  });
+
+  it('skips aliases and unsupported keys', () => {
+    expect(getUrlForSearchItem({}, 'data-product:Customer360')).toBeNull();
+    expect(getUrlForSearchItem({}, 'list:data-products')).toBeNull();
+    expect(getUrlForSearchItem({}, 'unknown:Customer360:1.0.0')).toBeNull();
+  });
+});

package/eventcatalog/src/components/Search/search-utils.ts

@@ -0,0 +1,34 @@
+import { buildUrl } from '@utils/url-builder';
+
+const docsPathByType: Record<string, string> = {
+  channel: 'channels',
+  command: 'commands',
+  container: 'containers',
+  'data-product': 'data-products',
+  domain: 'domains',
+  entity: 'entities',
+  event: 'events',
+  flow: 'flows',
+  query: 'queries',
+  service: 'services',
+};
+
+export const getUrlForSearchItem = (node: { href?: string }, key: string) => {
+  const parts = key.split(':');
+  if (parts.length < 2) return null;
+
+  const type = parts[0];
+  const id = parts[1];
+  const version = parts[2];
+
+  if (type === 'list') return null;
+
+  if (!version) return null;
+
+  if (node.href) return node.href;
+
+  const docsPath = docsPathByType[type];
+  if (!docsPath) return null;
+
+  return buildUrl(`/docs/${docsPath}/${id}/${version}`);
+};

package/eventcatalog/src/components/SideNav/NestedSideBar/SearchBar.tsx

@@ -16,6 +16,8 @@ import {
   SquareMousePointer,
   ListOrdered,
   ArrowLeftRight,
+  Package,
+  Box,
 } from 'lucide-react';
 import type { NavNode } from '@stores/sidebar-store/state';
 import { getBadgeClasses } from './utils';
@@ -83,8 +85,10 @@ export default function SearchBar({ nodes, onSelectResult, onSearchChange }: Pro
     { key: 'channel', label: 'Channels', badge: 'Channel', icon: ArrowLeftRight },
     { key: 'command', label: 'Commands', badge: 'Command', icon: MessageSquare },
     { key: 'container', label: 'Data Stores', badge: 'Container', icon: Database },
+    { key: 'data-product', label: 'Data Products', badge: 'Data Product', icon: Package },
     { key: 'design', label: 'Designs', badge: 'Design', icon: SquareMousePointer },
     { key: 'domain', label: 'Domains', badge: 'Domain', icon: Boxes },
+    { key: 'entity', label: 'Entities', badge: 'Entity', icon: Box },
     { key: 'event', label: 'Events', badge: 'Event', icon: Zap },
     { key: 'flow', label: 'Flows', badge: 'Flow', icon: Waypoints },
     { key: 'query', label: 'Queries', badge: 'Query', icon: SearchIcon },
@@ -116,9 +120,11 @@ export default function SearchBar({ nodes, onSelectResult, onSearchChange }: Pro
       Command: 'command',
       Query: 'query',
       Container: 'container',
+      'Data Product': 'data-product',
       Flow: 'flow',
       Design: 'design',
       Channel: 'channel',
+      Entity: 'entity',
     };
 
     // Use the memoized array instead of Object.entries(nodes)
@@ -135,7 +141,7 @@ export default function SearchBar({ nodes, onSelectResult, onSearchChange }: Pro
 
       const keyParts = key.split(':');
       if (keyParts.length >= 3) {
-        const id = keyParts[2].toLowerCase();
+        const id = keyParts[1].toLowerCase();
         if (id.includes(query)) {
           results.push({ nodeKey: key, node, matchType: 'id' });
         }

package/eventcatalog/src/components/SideNav/NestedSideBar/index.tsx

@@ -239,6 +239,8 @@ export default function NestedSideBar() {
         // Data Products
         { pattern: /^\/docs\/data-products\/([^/]+)\/([^/]+)/, type: 'data-product' },
         { pattern: /^\/visualiser\/data-products\/([^/]+)\/([^/]+)/, type: 'data-product' },
+        // Entities
+        { pattern: /^\/docs\/entities\/([^/]+)\/([^/]+)/, type: 'entity' },
       ];
 
       // URL patterns without version (language pages, etc)

package/eventcatalog/src/enterprise/custom-documentation/utils/custom-docs.ts

@@ -6,9 +6,20 @@
 import config from '@config';
 import fs from 'node:fs';
 import path from 'node:path';
-import { getEntry } from 'astro:content';
+import { getCollection } from 'astro:content';
 import matter from 'gray-matter';
 
+// Use getCollection (which returns plain entries) instead of getEntry, which installs
+// Astro's `slug` deprecation accessor on every entry it returns. The accessor fires a
+// `console.error` on each access of `entry.data.slug`, even though our schema legitimately
+// defines `slug` as an optional user field. See packages/core/eventcatalog/src/enterprise/collections/custom-pages.ts.
+const getCustomPagesById = async () => {
+  const all = await getCollection('customPages');
+  const map = new Map<string, (typeof all)[number]>();
+  for (const e of all) map.set(e.id, e);
+  return map;
+};
+
 type Badge = {
   text: string;
   color: string;
@@ -55,12 +66,16 @@ const DOCS_DIR = 'docs';
  * If an index.mdx or index.md file exists in the directory, it will be used as the
  * folder's link target (making the folder clickable) and excluded from the items list.
  */
+type CustomPagesMap = Awaited<ReturnType<typeof getCustomPagesById>>;
+
 const processAutoGeneratedDirectory = async (
   directory: string,
   label: string,
   badge?: Badge,
-  collapsed?: boolean
+  collapsed?: boolean,
+  customPages?: CustomPagesMap
 ): Promise<SidebarItem> => {
+  customPages ??= await getCustomPagesById();
   // @ts-ignore
   const items = fs.readdirSync(path.join(process.env.PROJECT_DIR || '', DOCS_DIR, directory));
 
@@ -78,7 +93,7 @@ const processAutoGeneratedDirectory = async (
     // Normalize path separators for cross-platform compatibility
     // Note: Astro's glob loader strips '/index' from the ID, so docs/foo/index.mdx becomes docs/foo
     const astroId = data.slug || path.join(DOCS_DIR, directory).replace(/\\/g, '/');
-    const entry = await getEntry('customPages', astroId.toLowerCase());
+    const entry = customPages.get(astroId.toLowerCase());
 
     if (entry) {
       // Use the index file's slug as the folder's link target
@@ -101,7 +116,8 @@ const processAutoGeneratedDirectory = async (
         path.join(directory, item),
         item, // Use directory name as label
         undefined, // No badge for subdirectories
-        collapsed // Inherit collapsed state
+        collapsed, // Inherit collapsed state
+        customPages
       );
       // Only add the directory if it contains valid items (mdx/md files) or has a slug (index file)
       if ((subdirResult.items && subdirResult.items.length > 0) || subdirResult.slug) {
@@ -115,7 +131,7 @@ const processAutoGeneratedDirectory = async (
       // Normalize path separators to forward slashes for cross-platform compatibility (Windows uses backslashes)
       const astroId =
         data.slug || path.join(DOCS_DIR, directory, item).replace('.mdx', '').replace('.md', '').replace(/\\/g, '/');
-      const entry = await getEntry('customPages', astroId.toLowerCase());
+      const entry = customPages.get(astroId.toLowerCase());
 
       if (entry) {
         allItems.push({
@@ -138,7 +154,8 @@ const processAutoGeneratedDirectory = async (
 /**
  * Recursively process sidebar items to handle auto-generated content at any nesting level
  */
-const processSidebarItems = async (items: SideBarConfigurationItem[]): Promise<SidebarItem[]> => {
+const processSidebarItems = async (items: SideBarConfigurationItem[], customPages?: CustomPagesMap): Promise<SidebarItem[]> => {
+  customPages ??= await getCustomPagesById();
   const processedItems: SidebarItem[] = [];
 
   for (const item of items) {
@@ -148,13 +165,14 @@ const processSidebarItems = async (items: SideBarConfigurationItem[]): Promise<S
         item.autogenerated.directory,
         item.label,
         item.badge,
-        item.autogenerated.collapsed !== undefined ? item.autogenerated.collapsed : item.collapsed
+        item.autogenerated.collapsed !== undefined ? item.autogenerated.collapsed : item.collapsed,
+        customPages
       );
       processedItems.push(processedItem);
     }
     // If item has nested items, process them recursively
     else if (item.items && item.items.length > 0) {
-      const processedNestedItems = await processSidebarItems(item.items);
+      const processedNestedItems = await processSidebarItems(item.items, customPages);
       processedItems.push({
         label: item.label,
         slug: item.slug,

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

@@ -3,6 +3,44 @@ import { buildUrl } from '@utils/url-builder';
 import type { NavNode, ChildRef, ResourceGroupContext } from './shared';
 import { buildQuickReferenceSection, buildResourceDocsSection, shouldRenderSideBarSection } from './shared';
 import { isChangelogEnabled } from '@utils/feature';
+import { createVersionedMap, findInMap } from '@utils/collections/util';
+import { pluralizeMessageType } from '@utils/collections/messages';
+
+type VersionedEntry = { collection?: string; data: { id: string; version: string } };
+type VersionedEntryMap<T extends VersionedEntry> = Map<string, T[]>;
+
+const uniqueRefs = (refs: string[]) => [...new Set(refs)];
+
+const resolvePointer = <T extends VersionedEntry>(
+  map: VersionedEntryMap<T>,
+  pointer: { id: string; version?: string }
+): T | undefined => {
+  return findInMap(map, pointer.id, pointer.version);
+};
+
+const resolveMessageStep = (
+  step: any,
+  maps: {
+    eventMap: VersionedEntryMap<CollectionEntry<'events'>>;
+    commandMap: VersionedEntryMap<CollectionEntry<'commands'>>;
+    queryMap: VersionedEntryMap<CollectionEntry<'queries'>>;
+  }
+): string | null => {
+  if (!step.message) return null;
+
+  const hydratedMessage = Array.isArray(step.message) ? step.message[0] : undefined;
+  if (hydratedMessage?.collection && hydratedMessage?.data) {
+    return `${pluralizeMessageType(hydratedMessage as any)}:${hydratedMessage.data.id}:${hydratedMessage.data.version}`;
+  }
+
+  const pointer = Array.isArray(step.message) ? undefined : step.message;
+  if (!pointer?.id) return null;
+
+  const message =
+    resolvePointer(maps.eventMap, pointer) || resolvePointer(maps.commandMap, pointer) || resolvePointer(maps.queryMap, pointer);
+
+  return message ? `${pluralizeMessageType(message as any)}:${message.data.id}:${message.data.version}` : null;
+};
 
 export const buildFlowNode = (flow: CollectionEntry<'flows'>, context: ResourceGroupContext): NavNode => {
   const docsSection = buildResourceDocsSection(
@@ -12,6 +50,27 @@ export const buildFlowNode = (flow: CollectionEntry<'flows'>, context: ResourceG
     context.resourceDocs,
     context.resourceDocCategories
   );
+  const steps = flow.data.steps || [];
+  const eventMap = createVersionedMap(context.events);
+  const commandMap = createVersionedMap(context.commands);
+  const queryMap = createVersionedMap(context.queries);
+  const serviceMap = createVersionedMap(context.services);
+  const flowMap = createVersionedMap(context.flows);
+  const messageRefs = uniqueRefs(
+    steps.map((step) => resolveMessageStep(step, { eventMap, commandMap, queryMap })).filter(Boolean) as string[]
+  );
+  const serviceRefs = uniqueRefs(
+    steps
+      .map((step) => (step.service ? resolvePointer(serviceMap, step.service) : undefined))
+      .filter(Boolean)
+      .map((service) => `service:${service!.data.id}:${service!.data.version}`)
+  );
+  const flowRefs = uniqueRefs(
+    steps
+      .map((step) => (step.flow ? resolvePointer(flowMap, step.flow) : undefined))
+      .filter(Boolean)
+      .map((referencedFlow) => `flow:${referencedFlow!.data.id}:${referencedFlow!.data.version}`)
+  );
 
   return {
     type: 'item',
@@ -43,6 +102,24 @@ export const buildFlowNode = (flow: CollectionEntry<'flows'>, context: ResourceG
           },
         ].filter(Boolean) as ChildRef[],
       },
+      messageRefs.length > 0 && {
+        type: 'group',
+        title: 'Messages',
+        icon: 'Mail',
+        pages: messageRefs,
+      },
+      serviceRefs.length > 0 && {
+        type: 'group',
+        title: 'Services',
+        icon: 'Server',
+        pages: serviceRefs,
+      },
+      flowRefs.length > 0 && {
+        type: 'group',
+        title: 'Subflows',
+        icon: 'Waypoints',
+        pages: flowRefs,
+      },
     ].filter(Boolean) as ChildRef[],
   };
 };

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

@@ -18,7 +18,8 @@ export const buildMessageNode = (
   message: CollectionEntry<'events' | 'commands' | 'queries'>,
   owners: any[],
   context: ResourceGroupContext,
-  hasFieldUsage: boolean = false
+  hasFieldUsage: boolean = false,
+  flowRefs: string[] = []
 ): NavNode => {
   const producers = message.data.producers || [];
   const consumers = message.data.consumers || [];
@@ -26,6 +27,7 @@ export const buildMessageNode = (
 
   const renderProducers = producers.length > 0 && shouldRenderSideBarSection(message, 'producers');
   const renderConsumers = consumers.length > 0 && shouldRenderSideBarSection(message, 'consumers');
+  const renderFlows = flowRefs.length > 0 && shouldRenderSideBarSection(message, 'flows');
   const renderRepository = message.data.repository && shouldRenderSideBarSection(message, 'repository');
 
   // Determine badge based on collection type
@@ -132,6 +134,13 @@ export const buildMessageNode = (
         pages: consumers.map((consumer) => `service:${(consumer as any).data.id}:${(consumer as any).data.version}`),
         visible: consumers.length > 0,
       },
+      renderFlows && {
+        type: 'group',
+        title: 'Flows',
+        icon: 'Waypoints',
+        pages: flowRefs,
+        visible: flowRefs.length > 0,
+      },
       renderOwners && buildOwnersSection(owners),
       renderRepository && buildRepositorySection(message.data.repository as { url: string; language: string }),
       hasAttachments && buildAttachmentsSection(message.data.attachments as any[]),

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

@@ -17,11 +17,14 @@ import { isVisualiserEnabled, isChangelogEnabled } from '@utils/feature';
 import { pluralizeMessageType } from '@utils/collections/messages';
 import { iconFieldsForResource } from '@utils/icon';
 
+const uniqueRefs = (refs: string[]) => [...new Set(refs)];
+
 export const buildServiceNode = (
   service: CollectionEntry<'services'>,
   owners: any[],
   context: ResourceGroupContext,
-  serviceChannels: CollectionEntry<'channels'>[] = []
+  serviceChannels: CollectionEntry<'channels'>[] = [],
+  flowRefs: string[] = []
 ): NavNode => {
   const sendsMessages = service.data.sends || [];
   const receivesMessages = service.data.receives || [];
@@ -36,7 +39,11 @@ export const buildServiceNode = (
   const dataStoresInService = uniqueBy([...(service.data.writesTo || []), ...(service.data.readsFrom || [])], 'id');
 
   const serviceFlows = service.data.flows || [];
-  const hasFlows = serviceFlows.length > 0;
+  const serviceFlowRefs = uniqueRefs([
+    ...serviceFlows.map((flow) => `flow:${(flow as any).data.id}:${(flow as any).data.version}`),
+    ...flowRefs,
+  ]);
+  const hasFlows = serviceFlowRefs.length > 0;
 
   const hasAttachments = service.data.attachments && service.data.attachments.length > 0;
 
@@ -197,7 +204,7 @@ export const buildServiceNode = (
         type: 'group',
         title: 'Flows',
         icon: 'Waypoints',
-        pages: serviceFlows.map((flow) => `flow:${(flow as any).data.id}:${(flow as any).data.version}`),
+        pages: serviceFlowRefs,
       },
       renderOwners && buildOwnersSection(owners),
       renderRepository && buildRepositorySection(service.data.repository as { url: string; language: string }),

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

@@ -10,6 +10,7 @@ import { getUsers } from '@utils/collections/users';
 import { getTeams } from '@utils/collections/teams';
 import { getDiagrams } from '@utils/collections/diagrams';
 import { getDataProducts } from '@utils/collections/data-products';
+import { getEntities } from '@utils/collections/entities';
 import { getResourceDocCategories, getResourceDocs } from '@utils/collections/resource-docs';
 import { buildUrl } from '@utils/url-builder';
 import type { NavigationData, NavNode, ChildRef } from './builders/shared';
@@ -32,6 +33,92 @@ export type { NavigationData, NavNode, ChildRef };
 const CACHE_ENABLED = process.env.DISABLE_EVENTCATALOG_CACHE !== 'true';
 let memoryCache: NavigationData | null = null;
 
+type MessageEntry = CollectionEntry<'events' | 'commands' | 'queries'>;
+type ServiceEntry = CollectionEntry<'services'>;
+
+const getMessageNodeKey = (message: MessageEntry) =>
+  `${pluralizeMessageType(message)}:${message.data.id}:${message.data.version}`;
+
+const uniqueRefs = (refs: string[]) => [...new Set(refs)];
+
+const buildFlowReferencesByMessage = ({
+  flows,
+  events,
+  commands,
+  queries,
+}: {
+  flows: CollectionEntry<'flows'>[];
+  events: CollectionEntry<'events'>[];
+  commands: CollectionEntry<'commands'>[];
+  queries: CollectionEntry<'queries'>[];
+}) => {
+  const eventMap = createVersionedMap(events);
+  const commandMap = createVersionedMap(commands);
+  const queryMap = createVersionedMap(queries);
+  const flowRefsByMessage = new Map<string, string[]>();
+
+  const addFlowRef = (message: MessageEntry, flow: CollectionEntry<'flows'>) => {
+    const messageKey = getMessageNodeKey(message);
+    const flowKey = `flow:${flow.data.id}:${flow.data.version}`;
+    flowRefsByMessage.set(messageKey, uniqueRefs([...(flowRefsByMessage.get(messageKey) || []), flowKey]));
+  };
+
+  const resolveMessagePointer = (pointer: { id: string; version?: string }): MessageEntry | undefined => {
+    return (
+      findInMap(eventMap, pointer.id, pointer.version) ||
+      findInMap(commandMap, pointer.id, pointer.version) ||
+      findInMap(queryMap, pointer.id, pointer.version)
+    );
+  };
+
+  for (const flow of flows) {
+    for (const step of flow.data.steps || []) {
+      if (!step.message) continue;
+
+      const hydratedMessage = Array.isArray(step.message) ? step.message[0] : undefined;
+      if (hydratedMessage?.collection && hydratedMessage?.data) {
+        addFlowRef(hydratedMessage as MessageEntry, flow);
+        continue;
+      }
+
+      if (Array.isArray(step.message)) continue;
+
+      const message = resolveMessagePointer(step.message);
+      if (message) addFlowRef(message, flow);
+    }
+  }
+
+  return flowRefsByMessage;
+};
+
+const buildFlowReferencesByService = ({
+  flows,
+  services,
+}: {
+  flows: CollectionEntry<'flows'>[];
+  services: CollectionEntry<'services'>[];
+}) => {
+  const serviceMap = createVersionedMap(services);
+  const flowRefsByService = new Map<string, string[]>();
+
+  const addFlowRef = (service: ServiceEntry, flow: CollectionEntry<'flows'>) => {
+    const serviceKey = `service:${service.data.id}:${service.data.version}`;
+    const flowKey = `flow:${flow.data.id}:${flow.data.version}`;
+    flowRefsByService.set(serviceKey, uniqueRefs([...(flowRefsByService.get(serviceKey) || []), flowKey]));
+  };
+
+  for (const flow of flows) {
+    for (const step of flow.data.steps || []) {
+      if (!step.service) continue;
+
+      const service = findInMap(serviceMap, step.service.id, step.service.version);
+      if (service) addFlowRef(service, flow);
+    }
+  }
+
+  return flowRefsByService;
+};
+
 /**
  * Get the navigation data for the sidebar
  */
@@ -52,6 +139,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     channels,
     diagrams,
     dataProducts,
+    entities,
     resourceDocs,
     resourceDocCategories,
   ] = await Promise.all([
@@ -66,6 +154,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     getChannels({ getAllVersions: false }),
     getDiagrams({ getAllVersions: false }),
     getDataProducts({ getAllVersions: false }),
+    getEntities({ getAllVersions: false }),
     getResourceDocs(),
     getResourceDocCategories(),
   ]);
@@ -86,6 +175,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     containers,
     diagrams,
     dataProducts,
+    entities,
     resourceDocs,
     resourceDocCategories,
   };
@@ -190,11 +280,13 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     }
   }
 
+  const flowRefsByService = buildFlowReferencesByService({ flows, services });
+
   const serviceNodes = servicesWithOwners.reduce(
     (acc, { service, owners }) => {
       const versionedKey = `service:${service.data.id}:${service.data.version}`;
       const serviceChannels = serviceChannelsMap.get(`${service.data.id}:${service.data.version}`) || [];
-      acc[versionedKey] = buildServiceNode(service, owners, context, serviceChannels);
+      acc[versionedKey] = buildServiceNode(service, owners, context, serviceChannels, flowRefsByService.get(versionedKey) || []);
       if (service.data.latestVersion === service.data.version) {
         // Store reference to versioned key instead of duplicating the full node
         acc[`service:${service.data.id}`] = versionedKey;
@@ -217,12 +309,14 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     }
   }
 
+  const flowRefsByMessage = buildFlowReferencesByMessage({ flows, events, commands, queries });
+
   const messageNodes = messagesWithOwners.reduce(
     (acc, { message, owners }) => {
       const type = pluralizeMessageType(message as any);
       const versionedKey = `${type}:${message.data.id}:${message.data.version}`;
       const hasFieldUsage = messagesWithFieldUsage.has(message.data.id);
-      acc[versionedKey] = buildMessageNode(message, owners, context, hasFieldUsage);
+      acc[versionedKey] = buildMessageNode(message, owners, context, hasFieldUsage, flowRefsByMessage.get(versionedKey) || []);
       if (message.data.latestVersion === message.data.version) {
         // Store reference to versioned key instead of duplicating the full node
         acc[`${type}:${message.data.id}`] = versionedKey;
@@ -276,6 +370,25 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     {} as Record<string, NavNode | string>
   );
 
+  const entityNodes = entities.reduce(
+    (acc, entity) => {
+      const versionedKey = `entity:${entity.data.id}:${entity.data.version}`;
+      acc[versionedKey] = {
+        type: 'item',
+        title: entity.data.name,
+        badge: 'Entity',
+        summary: entity.data.summary,
+        icon: 'Box',
+        href: buildUrl(`/docs/entities/${entity.data.id}/${entity.data.version}`),
+      };
+      if (entity.data.latestVersion === entity.data.version) {
+        acc[`entity:${entity.data.id}`] = versionedKey;
+      }
+      return acc;
+    },
+    {} as Record<string, NavNode | string>
+  );
+
   const designNodes = designs.reduce(
     (acc, design) => {
       acc[`design:${design.data.id}`] = {
@@ -435,6 +548,13 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     pages: dataProducts.map((dataProduct) => `data-product:${dataProduct.data.id}:${dataProduct.data.version}`),
   });
 
+  const entitiesList = createLeaf(entities, {
+    type: 'item',
+    title: 'Entities',
+    icon: 'Box',
+    pages: entities.map((entity) => `entity:${entity.data.id}:${entity.data.version}`),
+  });
+
   const designsList = createLeaf(designs, {
     type: 'item',
     title: 'Designs',
@@ -498,6 +618,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     'list:flows',
     'list:containers',
     'list:data-products',
+    'list:entities',
     'list:designs',
     'list:people',
   ];
@@ -510,6 +631,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     flowsList,
     containersList,
     dataProductsList,
+    entitiesList,
     designsList,
     peopleList,
   ];
@@ -537,6 +659,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     ...(flowsList ? { 'list:flows': flowsList } : {}),
     ...(containersList ? { 'list:containers': containersList } : {}),
     ...(dataProductsList ? { 'list:data-products': dataProductsList } : {}),
+    ...(entitiesList ? { 'list:entities': entitiesList } : {}),
     ...(designsList ? { 'list:designs': designsList } : {}),
     ...(teamsList ? { 'list:teams': teamsList } : {}),
     ...(usersList ? { 'list:users': usersList } : {}),
@@ -572,6 +695,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     ...channelNodes,
     ...containerNodes,
     ...dataProductNodes,
+    ...entityNodes,
     ...flowNodes,
     ...userNodes,
     ...teamNodes,

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

@@ -24,13 +24,14 @@ export const getFlows = async ({ getAllVersions = true }: Props = {}): Promise<F
   }
 
   // 1. Fetch collections in parallel
-  const [allFlows, allEvents, allCommands] = await Promise.all([
+  const [allFlows, allEvents, allCommands, allQueries] = await Promise.all([
     getCollection('flows'),
     getCollection('events'),
     getCollection('commands'),
+    getCollection('queries'),
   ]);
 
-  const allMessages = [...allEvents, ...allCommands];
+  const allMessages = [...allEvents, ...allCommands, ...allQueries];
 
   // 2. Build optimized maps
   const flowMap = createVersionedMap(allFlows);

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "3.33.0",
+  "version": "3.35.0",
   "publishConfig": {
     "access": "public"
   },
@@ -22,10 +22,10 @@
   ],
   "dependencies": {
     "@ai-sdk/react": "^3.0.17",
-    "@astrojs/markdown-remark": "^7.0.1",
-    "@astrojs/mdx": "^5.0.2",
-    "@astrojs/node": "^10.0.5",
-    "@astrojs/react": "^5.0.1",
+    "@astrojs/markdown-remark": "^7.1.1",
+    "@astrojs/mdx": "^5.0.4",
+    "@astrojs/node": "^10.1.0",
+    "@astrojs/react": "^5.0.4",
     "@astrojs/rss": "^4.0.18",
     "@asyncapi/avro-schema-parser": "3.0.24",
     "@asyncapi/parser": "^3.6.0",
@@ -51,7 +51,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "ai": "^6.0.17",
-    "astro": "^6.0.8",
+    "astro": "^6.3.1",
     "astro-compress": "^2.4.0",
     "astro-expressive-code": "^0.41.7",
     "astro-seo": "^0.8.4",
@@ -68,7 +68,7 @@
     "elkjs": "^0.10.0",
     "glob": "^13.0.6",
     "gray-matter": "^4.0.3",
-    "hono": "4.12.12",
+    "hono": "4.12.18",
     "html-to-image": "^1.11.11",
     "js-yaml": "^4.1.1",
     "jsonpath-plus": "^10.4.0",
@@ -110,7 +110,7 @@
     "@eventcatalog/visualiser": "^3.20.0"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.8",
+    "@astrojs/check": "^0.9.9",
     "@types/dagre": "^0.7.52",
     "@types/diff": "^5.2.2",
     "@types/js-yaml": "^4.0.9",
@@ -119,8 +119,8 @@
     "@types/lodash.merge": "4.6.9",
     "@types/node": "^20.14.2",
     "@types/pako": "^2.0.3",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^19.2.13",
+    "@types/react-dom": "^19.2.3",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.15",