@eventcatalog/core 4.10.8 → 4.10.10

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-CDWE6WWB.js";
-import "../chunk-LB5EMDAY.js";
+} from "../chunk-QXANW76J.js";
+import "../chunk-PR77FB54.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.8";
+var version = "4.10.10";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-W6IMDOJJ.js";
-import "../chunk-CDWE6WWB.js";
+} from "../chunk-K45ABG6N.js";
+import "../chunk-QXANW76J.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-LB5EMDAY.js";
+import "../chunk-PR77FB54.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-W5C4K7F2.js";
+} from "./chunk-U6R6BFJ5.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.8";
+var version = "4.10.10";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-LB5EMDAY.js";
+} from "./chunk-PR77FB54.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.8";
+var version = "4.10.10";
 
 // 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-W6IMDOJJ.js";
-import "./chunk-CDWE6WWB.js";
+} from "./chunk-K45ABG6N.js";
+import "./chunk-QXANW76J.js";
 import "./chunk-ZAZHAVKB.js";
 import {
   FederationConflictError,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-DRK5QSQC.js";
+} from "./chunk-Y6VX2CGL.js";
 import {
   logger
-} from "./chunk-W5C4K7F2.js";
+} from "./chunk-U6R6BFJ5.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -54,7 +54,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-LB5EMDAY.js";
+} from "./chunk-PR77FB54.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.8";
+var version = "4.10.10";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-DRK5QSQC.js";
-import "./chunk-W5C4K7F2.js";
-import "./chunk-LB5EMDAY.js";
+} from "./chunk-Y6VX2CGL.js";
+import "./chunk-U6R6BFJ5.js";
+import "./chunk-PR77FB54.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.8";
+var version = "4.10.10";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

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

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

@@ -31,6 +31,7 @@ import { getNodesAndEdges as getNodesAndEdgesForChannel } from '@utils/node-grap
 import config from '@config';
 import { isEventCatalogChatEnabled, isDevMode } from '@utils/feature';
 import { loadSavedLayout, applyLayoutToNodes, buildResourceKey } from '@utils/node-graphs/layout-persistence';
+import { compactVisualiserGraph } from '@utils/node-graphs/compact-visualiser-graph';
 
 const isChatEnabled = isEventCatalogChatEnabled();
 
@@ -198,13 +199,16 @@ if (collection === 'services-containers') {
 const resourceKey = buildResourceKey(collection, id, version);
 const savedLayout = await loadSavedLayout(resourceKey);
 const nodesWithLayout = applyLayoutToNodes(nodes as any[], savedLayout);
+// Drop hydrated collection entries / markdown bodies before Astro serialises
+// the graph into the page. Visualiser components only need a small field set.
+const { nodes: clientNodes, edges: clientEdges } = compactVisualiserGraph(nodesWithLayout as any[], edges as any[]);
 ---
 
 <div>
   <AstroNodeGraph
     id={id}
-    nodes={nodesWithLayout}
-    edges={edges}
+    nodes={clientNodes}
+    edges={clientEdges}
     title={title}
     hrefLabel={href?.label}
     href={href?.url}

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];
 

package/eventcatalog/src/components/SchemaExplorer/types.ts

@@ -20,7 +20,7 @@ export interface Owner {
 }
 
 export interface SchemaItem {
-  collection: CollectionMessageTypes | 'services' | 'data-products';
+  collection: CollectionMessageTypes | 'services' | 'domains' | 'data-products';
   data: {
     id: string;
     name: string;
@@ -29,9 +29,12 @@ export interface SchemaItem {
     schemaPath?: string;
     producers?: Producer[];
     consumers?: Consumer[];
+    producerName?: string;
     owners?: Owner[];
   };
   schemaContent?: string;
+  /** Internal URL for loading this version's content without embedding it in the page. */
+  contentUrl?: string;
   schemaExtension?: string;
   specType?: string;
   specName?: string;
@@ -44,6 +47,12 @@ export interface SchemaItem {
   examples?: MessageExample[];
 }
 
+export interface SchemaDetails {
+  schemaContent: string;
+  examples: MessageExample[];
+  data?: Pick<SchemaItem['data'], 'producers' | 'consumers'>;
+}
+
 export interface VersionDiff {
   fromVersion: string;
   toVersion: string;

package/eventcatalog/src/components/SchemaExplorer/useSchemaDetails.ts

@@ -0,0 +1,69 @@
+import { useEffect, useMemo, useState } from 'react';
+import type { SchemaDetails, SchemaItem } from './types';
+
+// Scoped to the explorer component's lifetime by the caller. Also deduplicates
+// requests when the selected version is one of the comparison versions.
+export const createSchemaDetailsLoader = () => {
+  const requests = new Map<string, Promise<SchemaDetails>>();
+  const resolved = new Map<string, SchemaDetails>();
+  const load = (url: string): Promise<SchemaDetails> => {
+    const existing = requests.get(url);
+    if (existing) return existing;
+    const request = fetch(url)
+      .then(async (response) => {
+        if (!response.ok) throw new Error('Unable to load schema content. Please try again.');
+        const details = await response.json();
+        if (typeof details.schemaContent !== 'string' || !Array.isArray(details.examples)) {
+          throw new Error('Unable to load schema content. Please try again.');
+        }
+        resolved.set(url, details);
+        return details as SchemaDetails;
+      })
+      .catch((error) => {
+        requests.delete(url);
+        throw error;
+      });
+    requests.set(url, request);
+    return request;
+  };
+  return Object.assign(load, { peek: (url: string) => resolved.get(url) });
+};
+
+export function useSchemaDetails(
+  item: SchemaItem | undefined,
+  load: ReturnType<typeof createSchemaDetailsLoader>,
+  enabled = true
+) {
+  const url = enabled ? item?.contentUrl : undefined;
+  const [attempt, setAttempt] = useState(0);
+  const [state, setState] = useState<{ url: string; details?: SchemaDetails; error?: string }>();
+
+  useEffect(() => {
+    if (!url || load.peek(url)) return;
+    let current = true;
+    setState(undefined);
+    load(url).then(
+      (details) => current && setState({ url, details }),
+      () => current && setState({ url, error: 'Unable to load schema content. Please try again.' })
+    );
+    return () => {
+      current = false;
+    };
+  }, [url, load, attempt]);
+
+  const matchingState = state?.url === url ? state : undefined;
+  const details = url ? matchingState?.details || load.peek(url) : undefined;
+  const message = useMemo(
+    () => (item && details ? { ...item, ...details, data: { ...item.data, ...details.data } } : item),
+    [item, details]
+  );
+  return {
+    message,
+    loading: !!url && !details && !matchingState?.error,
+    error: details ? undefined : matchingState?.error,
+    retry: () => {
+      setState(undefined);
+      setAttempt((value) => value + 1);
+    },
+  };
+}

package/eventcatalog/src/components/SchemaExplorer/utils.ts

@@ -41,6 +41,18 @@ export function extractServiceName(refId: string): string {
   return match ? match[1] : refId;
 }
 
+/** Resolve both enriched collection entries and compact explorer references. */
+export function getSchemaRelationshipReference(reference: {
+  id: string;
+  version?: string;
+  data?: { id: string; version: string };
+}) {
+  return {
+    id: reference.data?.id ?? reference.id,
+    version: reference.data?.version ?? reference.version,
+  };
+}
+
 export const getLanguageForHighlight = (extension?: string): string => {
   if (!extension) return 'json';
   const ext = extension.toLowerCase();

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/field-lineage/_index.data.spec.ts

@@ -0,0 +1,52 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const getMessageIdsWithFieldUsage = vi.fn();
+const pageDataLoader = {
+  events: vi.fn(),
+  commands: vi.fn(),
+  queries: vi.fn(),
+};
+
+vi.mock('@utils/feature', () => ({
+  isSSR: () => false,
+}));
+
+vi.mock('@utils/collections/field-usage', () => ({
+  getMessageIdsWithFieldUsage: () => getMessageIdsWithFieldUsage(),
+}));
+
+vi.mock('@utils/page-loaders/page-data-loader', () => ({
+  pageDataLoader,
+}));
+
+import { Page } from './_index.data';
+
+const event = (id: string) => ({
+  collection: 'events',
+  data: { id, version: '1.0.0', name: id },
+});
+
+describe('field-lineage static paths', () => {
+  beforeEach(() => {
+    getMessageIdsWithFieldUsage.mockReset();
+    pageDataLoader.events.mockReset();
+    pageDataLoader.commands.mockReset();
+    pageDataLoader.queries.mockReset();
+  });
+
+  it('when we build a catalog, field usage pages are only created for messages that declare fields', async () => {
+    getMessageIdsWithFieldUsage.mockResolvedValue(new Set(['OrderCreated']));
+    pageDataLoader.events.mockResolvedValue([event('OrderCreated'), event('OrderCancelled')]);
+    pageDataLoader.commands.mockResolvedValue([]);
+    pageDataLoader.queries.mockResolvedValue([]);
+
+    const paths = await Page.getStaticPaths();
+
+    expect(paths).toEqual([
+      {
+        params: { type: 'events', id: 'OrderCreated', version: '1.0.0' },
+        props: { type: 'events', ...event('OrderCreated') },
+      },
+    ]);
+  });
+});

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/field-lineage/_index.data.ts

@@ -1,6 +1,7 @@
 import { isSSR } from '@utils/feature';
 import { HybridPage } from '@utils/page-loaders/hybrid-page';
 import type { PageTypes } from '@types';
+import { getMessageIdsWithFieldUsage } from '@utils/collections/field-usage';
 
 const MESSAGE_TYPES: PageTypes[] = ['events', 'commands', 'queries'];
 
@@ -15,21 +16,24 @@ export class Page extends HybridPage {
     }
 
     const { pageDataLoader } = await import('@utils/page-loaders/page-data-loader');
+    const messagesWithFieldUsage = await getMessageIdsWithFieldUsage();
 
     const allItems = await Promise.all(MESSAGE_TYPES.map((type) => pageDataLoader[type]()));
 
     return allItems.flatMap((items, index) =>
-      items.map((item) => ({
-        params: {
-          type: MESSAGE_TYPES[index],
-          id: item.data.id,
-          version: item.data.version,
-        },
-        props: {
-          type: MESSAGE_TYPES[index],
-          ...item,
-        },
-      }))
+      items
+        .filter((item) => messagesWithFieldUsage.has(item.data.id))
+        .map((item) => ({
+          params: {
+            type: MESSAGE_TYPES[index],
+            id: item.data.id,
+            version: item.data.version,
+          },
+          props: {
+            type: MESSAGE_TYPES[index],
+            ...item,
+          },
+        }))
     );
   }
 
@@ -40,6 +44,11 @@ export class Page extends HybridPage {
       return null;
     }
 
+    const messagesWithFieldUsage = await getMessageIdsWithFieldUsage();
+    if (!messagesWithFieldUsage.has(id)) {
+      return null;
+    }
+
     const { pageDataLoader } = await import('@utils/page-loaders/page-data-loader');
 
     const items = await pageDataLoader[type as PageTypes]();