@eventcatalog/core 4.10.9 → 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.9";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-5WB6CXZH.js";
-import "../chunk-3EEFSHHW.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.9";
+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-ONRJA5DX.js";
-import "../chunk-5WB6CXZH.js";
+} from "../chunk-N6U5CNT7.js";
+import "../chunk-TWZKZIRW.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-3EEFSHHW.js";
+import "../chunk-3XTFNVGA.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

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

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

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

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

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

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

package/dist/{chunk-5WB6CXZH.js → chunk-TWZKZIRW.js}

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

package/dist/{chunk-EG62NTWS.js → chunk-U52FCZQ6.js}

@@ -1,6 +1,12 @@
+import {
+  withFederationOutputTransaction
+} from "./chunk-WRNH5C3U.js";
+import {
+  composePublicAssets
+} from "./chunk-5EPNFDT5.js";
 import {
   createFederationSourceProvider
-} from "./chunk-A2RZR3U4.js";
+} from "./chunk-6K7XZAYI.js";
 import {
   createFederationContentCache
 } from "./chunk-R7Z5ALYI.js";
@@ -11,12 +17,6 @@ import {
 import {
   isFederationEnabled
 } from "./chunk-FV56YFM4.js";
-import {
-  withFederationOutputTransaction
-} from "./chunk-WRNH5C3U.js";
-import {
-  composePublicAssets
-} from "./chunk-5EPNFDT5.js";
 import {
   getEventCatalogConfigFile
 } from "./chunk-6QENHZZP.js";

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

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-BYPWHDX6.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.9";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-3EEFSHHW.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.9";
+var version = "4.10.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,18 +1,21 @@
-import {
-  log_build_default
-} from "./chunk-ONRJA5DX.js";
-import "./chunk-5WB6CXZH.js";
-import "./chunk-ZAZHAVKB.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
+import {
+  log_build_default
+} from "./chunk-N6U5CNT7.js";
+import "./chunk-TWZKZIRW.js";
+import "./chunk-ZAZHAVKB.js";
 import {
   FederationConflictError,
   FederationDiagnosticError,
   federateCatalog
-} from "./chunk-EG62NTWS.js";
-import "./chunk-A2RZR3U4.js";
+} from "./chunk-U52FCZQ6.js";
+import "./chunk-WRNH5C3U.js";
+import "./chunk-5EPNFDT5.js";
+import "./chunk-6K7XZAYI.js";
+import "./chunk-352FGP6W.js";
 import "./chunk-R7Z5ALYI.js";
 import {
   getFederationDiagnosticCounts,
@@ -20,9 +23,6 @@ import {
 } from "./chunk-JJPB6EOZ.js";
 import "./chunk-FV56YFM4.js";
 import "./chunk-SDZQJTJW.js";
-import "./chunk-352FGP6W.js";
-import "./chunk-WRNH5C3U.js";
-import "./chunk-5EPNFDT5.js";
 import {
   getProjectOutDir,
   isAuthEnabled,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-WD5UW4A4.js";
+} from "./chunk-VFRR3M72.js";
 import {
   logger
-} from "./chunk-BYPWHDX6.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-3EEFSHHW.js";
+} from "./chunk-3XTFNVGA.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/federation/federate.js

@@ -2,15 +2,15 @@ import {
   FederationConflictError,
   FederationDiagnosticError,
   federateCatalog
-} from "../chunk-EG62NTWS.js";
-import "../chunk-A2RZR3U4.js";
+} from "../chunk-U52FCZQ6.js";
+import "../chunk-WRNH5C3U.js";
+import "../chunk-5EPNFDT5.js";
+import "../chunk-6K7XZAYI.js";
+import "../chunk-352FGP6W.js";
 import "../chunk-R7Z5ALYI.js";
 import "../chunk-JJPB6EOZ.js";
 import "../chunk-FV56YFM4.js";
 import "../chunk-SDZQJTJW.js";
-import "../chunk-352FGP6W.js";
-import "../chunk-WRNH5C3U.js";
-import "../chunk-5EPNFDT5.js";
 import "../chunk-6QENHZZP.js";
 export {
   FederationConflictError,

package/dist/federation/source-provider.js

@@ -1,8 +1,8 @@
 import {
   createFederationSourceProvider
-} from "../chunk-A2RZR3U4.js";
-import "../chunk-SDZQJTJW.js";
+} from "../chunk-6K7XZAYI.js";
 import "../chunk-352FGP6W.js";
+import "../chunk-SDZQJTJW.js";
 export {
   createFederationSourceProvider
 };

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-WD5UW4A4.js";
-import "./chunk-BYPWHDX6.js";
-import "./chunk-3EEFSHHW.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.9";
+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-BYPWHDX6.js";
-import "../chunk-3EEFSHHW.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/components/SchemaExplorer/SchemaDetailsPanel.tsx

@@ -24,7 +24,8 @@ import ExamplesViewer from './ExamplesViewer';
 import VersionHistoryModal from './VersionHistoryModal';
 import SchemaCodeModal from './SchemaCodeModal';
 import SchemaViewerModal from './SchemaViewerModal';
-import { copyToClipboard, downloadSchema, getSchemaTypeLabel, ICON_SPECS, extractServiceName } from './utils';
+import { copyToClipboard, downloadSchema, getSchemaTypeLabel, ICON_SPECS, getSchemaRelationshipReference } from './utils';
+import { createSchemaDetailsLoader, useSchemaDetails } from './useSchemaDetails';
 import { parseProtobufSchema } from '@utils/protobuf-schema';
 import type { SchemaItem, VersionDiff, Owner, Producer, Consumer } from './types';
 
@@ -39,7 +40,7 @@ interface SchemaDetailsPanelProps {
 }
 
 export default function SchemaDetailsPanel({
-  message,
+  message: metadataMessage,
   availableVersions,
   selectedVersion,
   onVersionChange,
@@ -47,6 +48,9 @@ export default function SchemaDetailsPanel({
   showOwners = true,
   showProducersConsumers = true,
 }: SchemaDetailsPanelProps) {
+  const [loadDetails] = useState(createSchemaDetailsLoader);
+  const content = useSchemaDetails(metadataMessage, loadDetails);
+  const message = content.message!;
   const [copiedId, setCopiedId] = useState<string | null>(null);
   const [activeTab, setActiveTab] = useState<'code' | 'schema' | 'diff' | 'api' | 'examples'>('code');
   const [isDiffModalOpen, setIsDiffModalOpen] = useState(false);
@@ -88,18 +92,23 @@ export default function SchemaDetailsPanel({
     setIsDiffModalOpen(false);
   }, [schemaResourceKey, defaultFromVersion, defaultToVersion]);
 
-  const diffFromItem = useMemo(
+  const diffFromMetadata = useMemo(
     () => uniqueAvailableVersions.find((version) => version.data.version === diffFromVersion),
     [diffFromVersion, uniqueAvailableVersions]
   );
-  const diffToItem = useMemo(
+  const diffToMetadata = useMemo(
     () => uniqueAvailableVersions.find((version) => version.data.version === diffToVersion),
     [diffToVersion, uniqueAvailableVersions]
   );
+  const comparing = activeTab === 'diff' || isDiffModalOpen;
+  const fromContent = useSchemaDetails(diffFromMetadata, loadDetails, comparing);
+  const toContent = useSchemaDetails(diffToMetadata, loadDetails, comparing);
+  const diffFromItem = fromContent.message;
+  const diffToItem = toContent.message;
   const hasDiffFromContent = !!diffFromItem?.schemaContent?.trim();
   const hasDiffToContent = !!diffToItem?.schemaContent?.trim();
   const selectedDiff: VersionDiff | null = useMemo(() => {
-    if (!diffFromItem || !diffToItem) return null;
+    if (!comparing || !diffFromItem || !diffToItem) return null;
     if (diffFromItem.data.version === diffToItem.data.version) return null;
     if (!diffFromItem.schemaContent?.trim() || !diffToItem.schemaContent?.trim()) return null;
 
@@ -126,7 +135,7 @@ export default function SchemaDetailsPanel({
       fromContent: diffFromItem.schemaContent,
       toContent: diffToItem.schemaContent,
     };
-  }, [diffFromItem, diffToItem]);
+  }, [comparing, diffFromItem, diffToItem]);
   const selectedDiffs = selectedDiff ? [selectedDiff] : [];
 
   // Check if this is a JSON schema
@@ -359,7 +368,9 @@ export default function SchemaDetailsPanel({
 
         {/* Tab content */}
         <div className="flex-1 min-h-0 overflow-hidden p-6">
-          {activeTab === 'examples' && examples.length > 0 ? (
+          {content.loading || content.error ? (
+            <SchemaLoadingState loading={content.loading} error={content.error} retry={content.retry} />
+          ) : activeTab === 'examples' && examples.length > 0 ? (
             <ExamplesViewer examples={examples} />
           ) : activeTab === 'api' ? (
             <ApiContentViewer
@@ -416,7 +427,16 @@ export default function SchemaDetailsPanel({
                 </button>
               </div>
               <div className="min-h-0 flex-1 overflow-hidden">
-                {diffFromVersion === diffToVersion ? (
+                {fromContent.loading || toContent.loading || fromContent.error || toContent.error ? (
+                  <SchemaLoadingState
+                    loading={fromContent.loading || toContent.loading}
+                    error={fromContent.error || toContent.error}
+                    retry={() => {
+                      fromContent.retry();
+                      toContent.retry();
+                    }}
+                  />
+                ) : diffFromVersion === diffToVersion ? (
                   <div className="flex h-full items-center justify-center text-[rgb(var(--ec-page-text-muted))]">
                     <p className="text-sm">Select two different versions</p>
                   </div>
@@ -525,11 +545,11 @@ export default function SchemaDetailsPanel({
               </div>
               <div className="space-y-1">
                 {producers.map((producer: Producer, idx: number) => {
-                  const serviceName = extractServiceName(producer.id);
+                  const { id: serviceName, version } = getSchemaRelationshipReference(producer);
                   return (
                     <a
                       key={`${producer.id}-${idx}`}
-                      href={buildUrl(`/docs/services/${serviceName}/${producer.version}`)}
+                      href={buildUrl(`/docs/services/${serviceName}/${version}`)}
                       className="flex items-center gap-2 rounded-lg px-2 py-1.5 text-xs font-medium text-[rgb(var(--ec-page-text-muted))] transition-colors hover:bg-[rgb(var(--ec-page-bg)/0.55)] hover:text-[rgb(var(--ec-accent))]"
                     >
                       <ServerIcon className="h-3.5 w-3.5 flex-shrink-0 text-[rgb(var(--ec-page-text-muted))]" />
@@ -551,11 +571,11 @@ export default function SchemaDetailsPanel({
               </div>
               <div className="space-y-1">
                 {consumers.map((consumer: Consumer, idx: number) => {
-                  const serviceName = extractServiceName(consumer.id);
+                  const { id: serviceName, version } = getSchemaRelationshipReference(consumer);
                   return (
                     <a
                       key={`${consumer.id}-${idx}`}
-                      href={buildUrl(`/docs/services/${serviceName}/${consumer.version}`)}
+                      href={buildUrl(`/docs/services/${serviceName}/${version}`)}
                       className="flex items-center gap-2 rounded-lg px-2 py-1.5 text-xs font-medium text-[rgb(var(--ec-page-text-muted))] transition-colors hover:bg-[rgb(var(--ec-page-bg)/0.55)] hover:text-[rgb(var(--ec-accent))]"
                     >
                       <ServerIcon className="h-3.5 w-3.5 flex-shrink-0 text-[rgb(var(--ec-page-text-muted))]" />
@@ -615,3 +635,29 @@ export default function SchemaDetailsPanel({
     </div>
   );
 }
+
+function SchemaLoadingState({ loading, error, retry }: { loading: boolean; error?: string; retry: () => void }) {
+  if (!error) {
+    if (!loading) return null;
+    return (
+      <div role="status" className="flex h-full items-center justify-center gap-2 text-sm text-[rgb(var(--ec-page-text-muted))]">
+        <span
+          aria-hidden="true"
+          className="h-4 w-4 rounded-full border-2 border-[rgb(var(--ec-page-border))] border-t-[rgb(var(--ec-page-text-muted))] motion-safe:animate-spin"
+        />
+        <span>Loading schema…</span>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full flex-col items-center justify-center gap-3 text-[rgb(var(--ec-page-text-muted))]" role="alert">
+      <p>{error}</p>
+      {error && (
+        <button type="button" onClick={retry} className="text-[rgb(var(--ec-accent))] hover:underline">
+          Try again
+        </button>
+      )}
+    </div>
+  );
+}

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

@@ -36,10 +36,10 @@ function getSpecFile(item: SchemaItem): string {
  * multiple specs of the same type (e.g. two OpenAPI specs).
  */
 function getGroupKey(item: SchemaItem): string {
-  if (item.collection === 'services') {
-    return `${item.data.id}__${item.specType || 'unknown'}__${getSpecFile(item)}`;
+  if (item.collection === 'services' || item.collection === 'domains') {
+    return `${item.collection}__${item.data.id}__${item.specType || 'unknown'}__${getSpecFile(item)}`;
   }
-  return item.data.id;
+  return `${item.collection}__${item.data.id}`;
 }
 
 interface SchemaExplorerProps {
@@ -110,7 +110,7 @@ export default function SchemaExplorer({ schemas, apiAccessEnabled = false }: Sc
     params.set('version', message.data.version);
     params.set('collection', message.collection);
 
-    if (message.collection === 'services') {
+    if (message.collection === 'services' || message.collection === 'domains') {
       params.set('specType', message.specType || 'unknown');
       const specFile = getSpecFile(message);
       if (specFile) {
@@ -242,7 +242,7 @@ export default function SchemaExplorer({ schemas, apiAccessEnabled = false }: Sc
         const versionMatch = msg.data.version === version;
         const collectionMatch = !collection || msg.collection === collection;
 
-        if (msg.collection === 'services') {
+        if (msg.collection === 'services' || msg.collection === 'domains') {
           const specTypeMatch = !specType || msg.specType === specType;
           const msgSpecFile = getSpecFile(msg);
           const specFilenameMatch = !specFilename || msgSpecFile === specFilename;

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

@@ -11,6 +11,8 @@ interface SchemaListItemProps {
 }
 
 function getNamespace(message: SchemaItem): string | null {
+  if (message.data.producerName) return message.data.producerName;
+
   const producers = message.data.producers || [];
   const firstProducer = producers[0];