@eventcatalog/core 4.10.10 → 4.10.12

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.12";
 
 // 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-Y5XU3YLT.js";
+import "../chunk-A53VCEEA.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.12";
 
 // 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-S4LLGOO4.js";
+import "../chunk-Y5XU3YLT.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-PR77FB54.js";
+import "../chunk-A53VCEEA.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-Y6VX2CGL.js → chunk-7URQ754Q.js}

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

package/dist/{chunk-PR77FB54.js → chunk-A53VCEEA.js}

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

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

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

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

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

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

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

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

package/dist/constants.js

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

package/dist/eventcatalog.config.d.cts

@@ -242,6 +242,15 @@ interface Config {
     host?: string | boolean;
     trailingSlash?: boolean;
     output?: 'server' | 'static';
+    /** Validate internal links and anchors after static builds. Set false to disable. */
+    linkValidation?: false | {
+        /** @default 'warn' */
+        onBrokenLinks?: 'warn' | 'error' | 'ignore';
+        /** @default 'warn' */
+        onBrokenAnchors?: 'warn' | 'error' | 'ignore';
+        /** Glob patterns for destination URL paths, relative to the catalog base (e.g. /api/**). */
+        ignore?: string[];
+    };
     server?: {
         allowedHosts?: string[] | true;
     };

package/dist/eventcatalog.config.d.ts

@@ -242,6 +242,15 @@ interface Config {
     host?: string | boolean;
     trailingSlash?: boolean;
     output?: 'server' | 'static';
+    /** Validate internal links and anchors after static builds. Set false to disable. */
+    linkValidation?: false | {
+        /** @default 'warn' */
+        onBrokenLinks?: 'warn' | 'error' | 'ignore';
+        /** @default 'warn' */
+        onBrokenAnchors?: 'warn' | 'error' | 'ignore';
+        /** Glob patterns for destination URL paths, relative to the catalog base (e.g. /api/**). */
+        ignore?: string[];
+    };
     server?: {
         allowedHosts?: string[] | true;
     };

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-S4LLGOO4.js";
+import "./chunk-Y5XU3YLT.js";
 import "./chunk-ZAZHAVKB.js";
 import {
   FederationConflictError,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-Y6VX2CGL.js";
+} from "./chunk-7URQ754Q.js";
 import {
   logger
-} from "./chunk-U6R6BFJ5.js";
+} from "./chunk-VFSEVDCQ.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-A53VCEEA.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.12";
 
 // 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-7URQ754Q.js";
+import "./chunk-VFSEVDCQ.js";
+import "./chunk-A53VCEEA.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.12";
 
 // 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-VFSEVDCQ.js";
+import "../chunk-A53VCEEA.js";
 export {
   logger
 };

package/eventcatalog/astro.config.mjs

@@ -17,6 +17,7 @@ import rehypeAutolinkHeadings from 'rehype-autolink-headings';
 import { eventCatalogLikeC4 } from './src/plugins/likec4';
 import { loadAstroCompressIntegration } from './src/plugins/astro-compress';
 import { astroTrailingSlashEndpointFix } from './src/plugins/astro-trailing-slash-endpoint-fix';
+import { linkValidation } from './src/plugins/link-validation';
 
 import rehypeExpressiveCode from 'rehype-expressive-code';
 
@@ -111,6 +112,7 @@ export default defineConfig({
     effectiveOutput !== 'server' && compress && (await loadAstroCompressIntegration(projectDirectory)),
     ecstudioWatcher(),
     eventCatalogIntegration(),
+    linkValidation(config.linkValidation),
   ].filter(Boolean),
   vite: {
     plugins: [

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/components/MDX/ResourceRef/ResourceRef.astro

@@ -16,6 +16,12 @@ import { getCollection } from 'astro:content';
 import { getServiceSpecifications, getSpecUrl, getSpecLabel } from '@components/Grids/specification-utils';
 import { getResourceReferenceStyle } from '@utils/resource-reference-colors';
 import { isIconPath, resolveIconUrl } from '@utils/icon';
+import {
+  getResourceReferenceUrl,
+  isVersionedReference,
+  resolveMessageReference,
+  resolveOwnerReference,
+} from '@utils/resource-reference-links';
 
 interface Props {
   type:
@@ -157,18 +163,16 @@ try {
     }
 
     const resourcesCollection = (await getCollection(collection as any)) as { data: { id: string; version: string } }[];
-    const resources = getItemsFromCollectionByIdAndSemverOrLatest(resourcesCollection, resourceId, version);
+    const resources = isVersionedReference(collection)
+      ? getItemsFromCollectionByIdAndSemverOrLatest(resourcesCollection, resourceId, version)
+      : resourcesCollection.filter((item) => item.data.id === resourceId);
 
     if (resources.length === 0) {
       throw new Error(`Resource not found: ${resourceId}`);
     }
 
     resource = resources[0];
-    // Diagrams use /diagrams/ path, other resources use /docs/{collection}/
-    href =
-      type === 'diagram'
-        ? buildUrl(`/diagrams/${resourceId}/${resource.data.version}`)
-        : buildUrl(`/docs/${collection}/${resourceId}/${resource.data.version}`);
+    href = getResourceReferenceUrl(collection, resourceId, resource.data.version);
   }
 } catch (error) {
   hasError = true;
@@ -180,7 +184,7 @@ const maxSummaryLength = 120;
 const summary = resource?.data?.summary || '';
 const truncatedSummary = summary.length > maxSummaryLength ? summary.slice(0, maxSummaryLength) + '...' : summary;
 
-const isVersionedResource = type !== 'doc';
+const isVersionedResource = type !== 'doc' && isVersionedReference(collection);
 
 // Only these types have visualizers
 const hasVisualizer = ['agent', 'domain', 'service', 'event', 'query', 'command', 'container', 'system'].includes(type);
@@ -191,7 +195,7 @@ const isDeprecated = deprecation?.isMarkedAsDeprecated || false;
 const resourceIconUrl = isIconPath(resource?.data?.styles?.icon) ? resolveIconUrl(resource.data.styles.icon) : null;
 
 // Get owners (first 2)
-const owners = resource?.data?.owners?.slice(0, 2) || [];
+const owners = await Promise.all((resource?.data?.owners?.slice(0, 2) || []).map(resolveOwnerReference));
 
 // Check if message type has a schema
 const isMessageType = ['event', 'command', 'query'].includes(type);
@@ -207,39 +211,16 @@ const receives = resource?.data?.receives || [];
 const isService = type === 'service' || type === 'agent';
 const supportsSpecifications = type === 'service';
 
-// Helper to resolve message version and collection - use specified version or fetch from collection
-const resolveMessage = async (msg: any): Promise<{ version: string | null; collection: string | null }> => {
-  // If version is specified and not "latest", use it (assume event as default collection)
-  if (msg.version && msg.version !== 'latest') {
-    return { version: msg.version, collection: 'events' };
-  }
-
-  // Try to find the message in events, commands, or queries collections
-  const collections = ['events', 'commands', 'queries'];
-  for (const col of collections) {
-    try {
-      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 };
-      }
-    } catch (e) {
-      // Collection might not exist or item not found, continue
-    }
-  }
-  return { version: null, collection: null };
-};
-
 // Resolve versions and collections for messages to show
 const sendsWithVersions = await Promise.all(
   sends.slice(0, maxMessages).map(async (msg: any) => {
-    const resolved = await resolveMessage(msg);
+    const resolved = await resolveMessageReference(msg);
     return { ...msg, resolvedVersion: resolved.version, resolvedCollection: resolved.collection };
   })
 );
 const receivesWithVersions = await Promise.all(
   receives.slice(0, maxMessages).map(async (msg: any) => {
-    const resolved = await resolveMessage(msg);
+    const resolved = await resolveMessageReference(msg);
     return { ...msg, resolvedVersion: resolved.version, resolvedCollection: resolved.collection };
   })
 );
@@ -422,15 +403,16 @@ const tooltipId = `ref-tooltip-${Math.random().toString(36).slice(2, 9)}`;
                     <span class="text-[rgb(var(--ec-page-text-muted))]">Owner</span>
                     <span class="font-mono text-[rgb(var(--ec-page-text))]">
                       {owners.map((o: any, idx: number) => {
-                        const ownerId = typeof o === 'string' ? o : o.id;
+                        const ownerId = o.id;
                         return (
                           <>
-                            <a
-                              href={buildUrl(`/docs/users/${ownerId}`)}
-                              class="hover:underline hover:text-[rgb(var(--ec-accent))]"
-                            >
-                              {ownerId}
-                            </a>
+                            {o.href ? (
+                              <a href={o.href} class="hover:underline hover:text-[rgb(var(--ec-accent))]">
+                                {ownerId}
+                              </a>
+                            ) : (
+                              <span>{ownerId}</span>
+                            )}
                             {idx < owners.length - 1 && ', '}
                           </>
                         );

package/eventcatalog/src/content.config.ts

@@ -1107,7 +1107,7 @@ const teams = defineCollection({
 
 const designs = defineCollection({
   loader: async () => {
-    const data = await globPackage('**/**/*.ecstudio', { cwd: projectDirBase, ignore: ['dist/**'] });
+    const data = await globPackage('**/**/*.ecstudio', { cwd: projectDirBase, ignore: ['dist/**', '**/node_modules/**'] });
     // File all the files in the designs folder
     // Limit 3 designs community edition?
     const files = data.reduce<{ id: string; name: string }[]>((acc, filePath) => {

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 });
+  });
+});