@eventcatalog/core 4.10.10 → 4.10.11

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.10.10";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-QXANW76J.js";
-import "../chunk-PR77FB54.js";
+} from "../chunk-TWZKZIRW.js";
+import "../chunk-3XTFNVGA.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.10.10";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-K45ABG6N.js";
-import "../chunk-QXANW76J.js";
+} from "../chunk-N6U5CNT7.js";
+import "../chunk-TWZKZIRW.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-PR77FB54.js";
+import "../chunk-3XTFNVGA.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-PR77FB54.js → chunk-3XTFNVGA.js}

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

package/dist/{chunk-K45ABG6N.js → chunk-N6U5CNT7.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-QXANW76J.js";
+} from "./chunk-TWZKZIRW.js";
 import {
   countResources,
   hashCatalogContent,

package/dist/{chunk-U6R6BFJ5.js → chunk-RLGMIZSH.js}

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

package/dist/{chunk-QXANW76J.js → chunk-TWZKZIRW.js}

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

package/dist/{chunk-Y6VX2CGL.js → chunk-VFRR3M72.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-PR77FB54.js";
+} from "./chunk-3XTFNVGA.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -144,7 +144,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.10.10";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -4,8 +4,8 @@ import {
 import "./chunk-CA4U2JP7.js";
 import {
   log_build_default
-} from "./chunk-K45ABG6N.js";
-import "./chunk-QXANW76J.js";
+} from "./chunk-N6U5CNT7.js";
+import "./chunk-TWZKZIRW.js";
 import "./chunk-ZAZHAVKB.js";
 import {
   FederationConflictError,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-Y6VX2CGL.js";
+} from "./chunk-VFRR3M72.js";
 import {
   logger
-} from "./chunk-U6R6BFJ5.js";
+} from "./chunk-RLGMIZSH.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -54,7 +54,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-PR77FB54.js";
+} from "./chunk-3XTFNVGA.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-Y6VX2CGL.js";
-import "./chunk-U6R6BFJ5.js";
-import "./chunk-PR77FB54.js";
+} from "./chunk-VFRR3M72.js";
+import "./chunk-RLGMIZSH.js";
+import "./chunk-3XTFNVGA.js";
 import "./chunk-6QENHZZP.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.10.10";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-U6R6BFJ5.js";
-import "../chunk-PR77FB54.js";
+} from "../chunk-RLGMIZSH.js";
+import "../chunk-3XTFNVGA.js";
 export {
   logger
 };

package/eventcatalog/src/components/Grids/DomainGrid.tsx

@@ -17,6 +17,7 @@ import {
 import { buildUrl } from '@utils/url-builder';
 import { BoxIcon, Group as GroupIcon } from 'lucide-react';
 import { getSpecUrl, getSpecIcon, getSpecLabel, getServiceSpecifications } from './specification-utils';
+import { getMessageLinkProps } from './message-link';
 
 // ============================================
 // Types
@@ -64,12 +65,8 @@ export const EntityBadge = memo(({ entity }: { entity: any }) => {
 });
 
 const MessageLink = memo(({ message }: { message: any }) => {
-  const data = message?.data || message;
-  const collection = message?.collection || 'events';
-  const { Icon, color } = getMessageIcon(collection);
-  const id = data?.id || message?.id;
-  const name = data?.name || data?.id || id;
-  const version = data?.version || message?.data?.version || 'latest';
+  const { collection, name, version, href } = getMessageLinkProps(message);
+  const { Icon, color } = getMessageIcon(collection || '');
 
   const iconStyles: Record<string, string> = {
     orange: 'text-orange-500',
@@ -78,14 +75,25 @@ const MessageLink = memo(({ message }: { message: any }) => {
     gray: 'text-gray-500',
   };
 
-  return (
-    <a
-      href={buildUrl(`/docs/${collection}/${id}/${version}`)}
-      className="flex items-center gap-2 py-1.5 text-sm text-[rgb(var(--ec-page-text-muted))] hover:text-[rgb(var(--ec-page-text))] transition-colors group"
-    >
+  const content = (
+    <>
       <Icon className={`h-4 w-4 flex-shrink-0 ${iconStyles[color]}`} />
-      <span className="group-hover:underline">{name}</span>
+      <span className={href ? 'group-hover:underline' : undefined}>{name}</span>
       <span className="text-xs text-[rgb(var(--ec-icon-color))]">v{version}</span>
+    </>
+  );
+
+  const className =
+    'flex items-center gap-2 py-1.5 text-sm text-[rgb(var(--ec-page-text-muted))] hover:text-[rgb(var(--ec-page-text))] transition-colors group';
+
+  // Missing collection means an unhydrated pointer — do not guess `/docs/events/...`.
+  if (!href) {
+    return <span className={className}>{content}</span>;
+  }
+
+  return (
+    <a href={buildUrl(href)} className={className}>
+      {content}
     </a>
   );
 });

package/eventcatalog/src/components/Grids/message-link.spec.ts

@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest';
+import { getMessageLinkProps } from './message-link';
+
+describe('getMessageLinkProps', () => {
+  it('builds a command docs url and prefers the resource name over the id', () => {
+    expect(
+      getMessageLinkProps({
+        collection: 'commands',
+        data: { id: 'order-create', name: 'Create Order', version: '0.0.1' },
+      })
+    ).toEqual({
+      collection: 'commands',
+      id: 'order-create',
+      name: 'Create Order',
+      version: '0.0.1',
+      href: '/docs/commands/order-create/0.0.1',
+    });
+  });
+
+  it('builds a query docs url from a hydrated collection entry', () => {
+    expect(
+      getMessageLinkProps({
+        collection: 'queries',
+        data: { id: 'get-stock-level', name: 'Get Stock Level', version: '1.0.0' },
+      })
+    ).toEqual({
+      collection: 'queries',
+      id: 'get-stock-level',
+      name: 'Get Stock Level',
+      version: '1.0.0',
+      href: '/docs/queries/get-stock-level/1.0.0',
+    });
+  });
+
+  it('does not default a missing collection to events', () => {
+    expect(getMessageLinkProps({ id: 'order-create', version: '0.0.1' })).toEqual({
+      collection: undefined,
+      id: 'order-create',
+      name: 'order-create',
+      version: '0.0.1',
+      href: undefined,
+    });
+  });
+
+  it('ignores unknown collection values instead of linking to events', () => {
+    expect(
+      getMessageLinkProps({
+        collection: 'services',
+        data: { id: 'order-service', name: 'Order Service', version: '1.0.0' },
+      })
+    ).toEqual({
+      collection: undefined,
+      id: 'order-service',
+      name: 'Order Service',
+      version: '1.0.0',
+      href: undefined,
+    });
+  });
+});

package/eventcatalog/src/components/Grids/message-link.ts

@@ -0,0 +1,38 @@
+import type { CollectionMessageTypes } from '@types';
+
+export const MESSAGE_COLLECTIONS: readonly CollectionMessageTypes[] = ['events', 'commands', 'queries'];
+
+export function isMessageCollection(value: unknown): value is CollectionMessageTypes {
+  return value === 'events' || value === 'commands' || value === 'queries';
+}
+
+export interface MessageLinkProps {
+  collection?: CollectionMessageTypes;
+  id?: string;
+  name?: string;
+  version: string;
+  href?: string;
+}
+
+/**
+ * Resolve a DomainGrid/SystemGrid receives/sends item into a docs link.
+ *
+ * Hydrated collection entries carry `collection` + `data.name`. Bare `{id, version}`
+ * pointers do not — never guess `events` for those, or commands/queries get the wrong URL.
+ */
+export function getMessageLinkProps(message: any): MessageLinkProps {
+  const data = message?.data ?? message;
+  const collectionCandidate = message?.collection ?? data?.collection;
+  const collection = isMessageCollection(collectionCandidate) ? collectionCandidate : undefined;
+  const id = data?.id ?? message?.id;
+  const name = data?.name || message?.name || id;
+  const version = data?.version ?? message?.version ?? 'latest';
+
+  return {
+    collection,
+    id,
+    name,
+    version,
+    href: collection && id ? `/docs/${collection}/${id}/${version}` : undefined,
+  };
+}

package/eventcatalog/src/pages/architecture/[type]/[id]/[version]/_index.data.spec.ts

@@ -0,0 +1,88 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { loadArchitectureItems, Page } from './_index.data';
+
+const collectionMocks = vi.hoisted(() => ({
+  getDomains: vi.fn(),
+  getServices: vi.fn(),
+  getSystems: vi.fn(),
+}));
+
+vi.mock('@utils/feature', () => ({
+  isSSR: () => false,
+}));
+
+vi.mock('@utils/collections/domains', () => ({ getDomains: collectionMocks.getDomains }));
+vi.mock('@utils/collections/systems', () => ({ getSystems: collectionMocks.getSystems }));
+vi.mock('@utils/page-loaders/page-data-loader', () => ({
+  pageDataLoader: {
+    services: (...args: unknown[]) => collectionMocks.getServices(...args),
+    domains: (...args: unknown[]) => collectionMocks.getDomains(...args),
+    systems: (...args: unknown[]) => collectionMocks.getSystems(...args),
+  },
+}));
+
+const domain = {
+  collection: 'domains',
+  data: { id: 'ordering', name: 'Ordering', version: '1.0.0' },
+};
+
+const service = {
+  collection: 'services',
+  data: { id: 'order-service', name: 'Order Service', version: '1.0.0' },
+};
+
+const system = {
+  collection: 'systems',
+  data: { id: 'order-management-system', name: 'Order Management', version: '1.0.0' },
+};
+
+describe('architecture page data', () => {
+  beforeEach(() => {
+    collectionMocks.getDomains.mockReset().mockResolvedValue([domain]);
+    collectionMocks.getServices.mockReset().mockResolvedValue([service]);
+    collectionMocks.getSystems.mockReset().mockResolvedValue([system]);
+  });
+
+  it('hydrates domain and system services for static architecture paths', async () => {
+    const paths = await Page.getStaticPaths();
+
+    expect(collectionMocks.getDomains).toHaveBeenCalledWith({ enrichServices: true });
+    expect(collectionMocks.getSystems).toHaveBeenCalledWith({ enrichServices: true });
+    expect(paths).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          params: { type: 'domains', id: 'ordering', version: '1.0.0' },
+        }),
+        expect.objectContaining({
+          params: { type: 'systems', id: 'order-management-system', version: '1.0.0' },
+        }),
+        expect.objectContaining({
+          params: { type: 'services', id: 'order-service', version: '1.0.0' },
+        }),
+      ])
+    );
+  });
+
+  it('hydrates domain services when architecture pages are fetched in SSR', async () => {
+    await Page.getData({
+      props: {},
+      params: { type: 'domains', id: 'ordering', version: '1.0.0' },
+    } as any);
+
+    expect(collectionMocks.getDomains).toHaveBeenCalledWith({ enrichServices: true });
+  });
+
+  it('hydrates system services when architecture pages are fetched in SSR', async () => {
+    await Page.getData({
+      props: {},
+      params: { type: 'systems', id: 'order-management-system', version: '1.0.0' },
+    } as any);
+
+    expect(collectionMocks.getSystems).toHaveBeenCalledWith({ enrichServices: true });
+  });
+
+  it('loads domains with enrichServices so DomainGrid command links keep their collection', async () => {
+    await loadArchitectureItems('domains');
+    expect(collectionMocks.getDomains).toHaveBeenCalledWith({ enrichServices: true });
+  });
+});

package/eventcatalog/src/pages/architecture/[type]/[id]/[version]/_index.data.ts

@@ -3,11 +3,27 @@ import { HybridPage } from '@utils/page-loaders/hybrid-page';
 import type { PageTypes } from '@types';
 import { pageDataLoader } from '@utils/page-loaders/page-data-loader';
 import { getDomains } from '@utils/collections/domains';
-import { getServices } from '@utils/collections/services';
 import { getSystems } from '@utils/collections/systems';
 
 const architecturePageTypes: PageTypes[] = ['services', 'domains', 'systems'];
 
+/**
+ * Architecture grids render service sends/receives as docs links, so domains and
+ * systems must hydrate those messages (collection + name). `pageDataLoader`
+ * uses the cheaper unenriched path used by docs/sidebar.
+ */
+export const loadArchitectureItems = (type: PageTypes) => {
+  if (type === 'domains') {
+    return getDomains({ enrichServices: true });
+  }
+
+  if (type === 'systems') {
+    return getSystems({ enrichServices: true });
+  }
+
+  return pageDataLoader[type as PageTypes]();
+};
+
 /**
  * Documentation page class for all collection types with versioning
  */
@@ -17,11 +33,7 @@ export class Page extends HybridPage {
       return [];
     }
 
-    const domains = await getDomains({ enrichServices: true });
-    const services = await getServices();
-    const systems = await getSystems();
-
-    const pageData = [services, domains, systems];
+    const pageData = await Promise.all(architecturePageTypes.map((type) => loadArchitectureItems(type)));
 
     return pageData.flatMap((items, index) =>
       items.map((item) => ({
@@ -47,8 +59,7 @@ export class Page extends HybridPage {
       return null;
     }
 
-    // Get all items of the specified type
-    const items = await pageDataLoader[type as PageTypes]();
+    const items = await loadArchitectureItems(type as PageTypes);
 
     // Find the specific item by id and version
     const item = items.find((i) => i.data.id === id && i.data.version === version);

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

@@ -4,6 +4,7 @@ import path from 'path';
 import type { CollectionMessageTypes } from '@types';
 import type { Agent, Service } from './types';
 import { createVersionedMap, findInMap, processSpecifications } from '@utils/collections/util';
+import { hydrateAgents, hydrateServices } from '@utils/collections/hydrate-services';
 
 const CACHE_ENABLED = process.env.DISABLE_EVENTCATALOG_CACHE !== 'true';
 
@@ -19,86 +20,6 @@ interface Props {
 // Simple in-memory cache variable
 let memoryCache: Record<string, Domain[]> = {};
 
-// Helper to hydrate services
-const hydrateServices = (
-  servicesList: any[],
-  serviceMap: Map<string, any[]>,
-  messageMap: Map<string, any[]>,
-  containerMap: Map<string, any[]>
-) => {
-  return servicesList
-    .map((service: { id: string; version: string | undefined }) => findInMap(serviceMap, service.id, service.version))
-    .filter((s) => !!s)
-    .map((service) => {
-      // Hydrate service messages and containers
-      const sends = (service.data.sends || [])
-        .map((msg: any) => findInMap(messageMap, msg.id, msg.version))
-        .filter((m: any) => !!m);
-
-      const receives = (service.data.receives || [])
-        .map((msg: any) => findInMap(messageMap, msg.id, msg.version))
-        .filter((m: any) => !!m);
-
-      const readsFrom = (service.data.readsFrom || [])
-        .map((c: any) => findInMap(containerMap, c.id, c.version))
-        .filter((c: any) => !!c);
-
-      const writesTo = (service.data.writesTo || [])
-        .map((c: any) => findInMap(containerMap, c.id, c.version))
-        .filter((c: any) => !!c);
-
-      return {
-        ...service,
-        data: {
-          ...service.data,
-          sends: sends as any,
-          receives: receives as any,
-          readsFrom: readsFrom as any,
-          writesTo: writesTo as any,
-        },
-      };
-    });
-};
-
-const hydrateAgents = (
-  agentsList: any[],
-  agentMap: Map<string, any[]>,
-  messageMap: Map<string, any[]>,
-  containerMap: Map<string, any[]>
-) => {
-  return agentsList
-    .map((agent: { id: string; version: string | undefined }) => findInMap(agentMap, agent.id, agent.version))
-    .filter((a) => !!a)
-    .map((agent) => {
-      const sends = (agent.data.sends || [])
-        .map((msg: any) => findInMap(messageMap, msg.id, msg.version))
-        .filter((m: any) => !!m);
-
-      const receives = (agent.data.receives || [])
-        .map((msg: any) => findInMap(messageMap, msg.id, msg.version))
-        .filter((m: any) => !!m);
-
-      const readsFrom = (agent.data.readsFrom || [])
-        .map((c: any) => findInMap(containerMap, c.id, c.version))
-        .filter((c: any) => !!c);
-
-      const writesTo = (agent.data.writesTo || [])
-        .map((c: any) => findInMap(containerMap, c.id, c.version))
-        .filter((c: any) => !!c);
-
-      return {
-        ...agent,
-        data: {
-          ...agent.data,
-          sends: sends as any,
-          receives: receives as any,
-          readsFrom: readsFrom as any,
-          writesTo: writesTo as any,
-        },
-      };
-    });
-};
-
 // --- MAIN FUNCTION ---
 
 export const getDomains = async ({

package/eventcatalog/src/utils/collections/hydrate-services.ts

@@ -0,0 +1,51 @@
+import { findInMap } from '@utils/collections/util';
+
+/**
+ * Resolve service/agent pointers to collection entries and hydrate their
+ * sends/receives/readsFrom/writesTo relationships.
+ */
+export const hydrateServices = (
+  servicesList: any[],
+  serviceMap: Map<string, any[]>,
+  messageMap: Map<string, any[]>,
+  containerMap: Map<string, any[]>
+) => {
+  return servicesList
+    .map((service: { id: string; version: string | undefined }) => findInMap(serviceMap, service.id, service.version))
+    .filter((s) => !!s)
+    .map((service) => {
+      const sends = (service.data.sends || [])
+        .map((msg: any) => findInMap(messageMap, msg.id, msg.version))
+        .filter((m: any) => !!m);
+
+      const receives = (service.data.receives || [])
+        .map((msg: any) => findInMap(messageMap, msg.id, msg.version))
+        .filter((m: any) => !!m);
+
+      const readsFrom = (service.data.readsFrom || [])
+        .map((c: any) => findInMap(containerMap, c.id, c.version))
+        .filter((c: any) => !!c);
+
+      const writesTo = (service.data.writesTo || [])
+        .map((c: any) => findInMap(containerMap, c.id, c.version))
+        .filter((c: any) => !!c);
+
+      return {
+        ...service,
+        data: {
+          ...service.data,
+          sends: sends as any,
+          receives: receives as any,
+          readsFrom: readsFrom as any,
+          writesTo: writesTo as any,
+        },
+      };
+    });
+};
+
+export const hydrateAgents = (
+  agentsList: any[],
+  agentMap: Map<string, any[]>,
+  messageMap: Map<string, any[]>,
+  containerMap: Map<string, any[]>
+) => hydrateServices(agentsList, agentMap, messageMap, containerMap);

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

@@ -1,5 +1,6 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
+import { hydrateServices } from '@utils/collections/hydrate-services';
 import { createVersionedMap, findInMap } from './util';
 
 const CACHE_ENABLED = process.env.DISABLE_EVENTCATALOG_CACHE !== 'true';
@@ -7,24 +8,28 @@ export type System = CollectionEntry<'systems'>;
 
 interface Props {
   getAllVersions?: boolean;
+  enrichServices?: boolean;
 }
 
 // cache for build time
 let memoryCache: Record<string, System[]> = {};
 
-export const getSystems = async ({ getAllVersions = true }: Props = {}): Promise<System[]> => {
-  const cacheKey = getAllVersions ? 'allVersions' : 'currentVersions';
+export const getSystems = async ({ getAllVersions = true, enrichServices = false }: Props = {}): Promise<System[]> => {
+  const cacheKey = `${getAllVersions ? 'allVersions' : 'currentVersions'}-${enrichServices ? 'enriched' : 'simple'}`;
 
   if (memoryCache[cacheKey] && memoryCache[cacheKey].length > 0 && CACHE_ENABLED) {
     return memoryCache[cacheKey];
   }
 
-  const [allSystems, allServices, allFlows, allEntities, allContainers] = await Promise.all([
+  const [allSystems, allServices, allFlows, allEntities, allContainers, allEvents, allCommands, allQueries] = await Promise.all([
     getCollection('systems'),
     getCollection('services'),
     getCollection('flows'),
     getCollection('entities'),
     getCollection('containers'),
+    enrichServices ? getCollection('events') : Promise.resolve([]),
+    enrichServices ? getCollection('commands') : Promise.resolve([]),
+    enrichServices ? getCollection('queries') : Promise.resolve([]),
   ]);
 
   // Build optimized map of id -> versions (sorted latest first)
@@ -33,6 +38,7 @@ export const getSystems = async ({ getAllVersions = true }: Props = {}): Promise
   const flowMap = createVersionedMap(allFlows);
   const entityMap = createVersionedMap(allEntities);
   const containerMap = createVersionedMap(allContainers);
+  const messageMap = createVersionedMap([...allEvents, ...allCommands, ...allQueries]);
 
   // Filter systems
   const targetSystems = allSystems.filter((system) => {
@@ -47,10 +53,14 @@ export const getSystems = async ({ getAllVersions = true }: Props = {}): Promise
     const latestVersion = systemVersions[0]?.data.version || system.data.version;
     const versions = systemVersions.map((s) => s.data.version);
 
-    // Resolve service pointers to their full collection entries
-    const services = (system.data.services || [])
-      .map((service: { id: string; version?: string }) => findInMap(serviceMap, service.id, service.version))
-      .filter((s): s is NonNullable<typeof s> => !!s);
+    // Resolve service pointers to their full collection entries.
+    // Architecture grids need sends/receives hydrated so command/query links
+    // keep the correct collection instead of falling back to events.
+    const services = enrichServices
+      ? hydrateServices(system.data.services || [], serviceMap, messageMap, containerMap)
+      : (system.data.services || [])
+          .map((service: { id: string; version?: string }) => findInMap(serviceMap, service.id, service.version))
+          .filter((s): s is NonNullable<typeof s> => !!s);
 
     // Resolve flow pointers to their full collection entries
     const flows = (system.data.flows || [])

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.10.10",
+  "version": "4.10.11",
   "publishConfig": {
     "access": "public"
   },
@@ -118,9 +118,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^11.1.1",
     "zod": "^4.3.6",
+    "@eventcatalog/linter": "1.1.18",
     "@eventcatalog/sdk": "2.29.0",
-    "@eventcatalog/visualiser": "^4.1.4",
-    "@eventcatalog/linter": "1.1.18"
+    "@eventcatalog/visualiser": "^4.1.4"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",