@eventcatalog/core 4.10.2 → 4.10.3

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-E5JJSOMA.js";
-import "../chunk-C73V4K3S.js";
+} from "../chunk-EMG2UMRO.js";
+import "../chunk-IXQNMM6D.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.2";
+var version = "4.10.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-SB2TMVVX.js";
-import "../chunk-E5JJSOMA.js";
+} from "../chunk-CHJFPDIO.js";
+import "../chunk-EMG2UMRO.js";
 import "../chunk-K2XIENVT.js";
-import "../chunk-C73V4K3S.js";
+import "../chunk-IXQNMM6D.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-SB2TMVVX.js → chunk-CHJFPDIO.js}

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

package/dist/{chunk-MGK66RUH.js → chunk-EHN2WS7S.js}

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

package/dist/{chunk-E5JJSOMA.js → chunk-EMG2UMRO.js}

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

package/dist/{chunk-C73V4K3S.js → chunk-IXQNMM6D.js}

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

package/dist/{chunk-NOD5BM45.js → chunk-J5IBDCGW.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-C73V4K3S.js";
+} from "./chunk-IXQNMM6D.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.2";
+var version = "4.10.3";
 
 // 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-SB2TMVVX.js";
-import "./chunk-E5JJSOMA.js";
+} from "./chunk-CHJFPDIO.js";
+import "./chunk-EMG2UMRO.js";
 import "./chunk-K2XIENVT.js";
 import {
   FederationConflictError,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-MGK66RUH.js";
+} from "./chunk-EHN2WS7S.js";
 import {
   logger
-} from "./chunk-NOD5BM45.js";
+} from "./chunk-J5IBDCGW.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -54,7 +54,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-C73V4K3S.js";
+} from "./chunk-IXQNMM6D.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.2";
+var version = "4.10.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-MGK66RUH.js";
-import "./chunk-NOD5BM45.js";
-import "./chunk-C73V4K3S.js";
+} from "./chunk-EHN2WS7S.js";
+import "./chunk-J5IBDCGW.js";
+import "./chunk-IXQNMM6D.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.2";
+var version = "4.10.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-NOD5BM45.js";
-import "../chunk-C73V4K3S.js";
+} from "../chunk-J5IBDCGW.js";
+import "../chunk-IXQNMM6D.js";
 export {
   logger
 };

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

@@ -15,9 +15,9 @@ interface Props {
   showLegend?: boolean;
   /** Off by default — embedded graphs pin a lens rather than offer the picker */
   showLensPicker?: boolean;
-  // Override the DOM portal the graph mounts into. Defaults to
-  // `${id}-architecture-graph-portal` (or `catalog-architecture-graph-portal`).
-  portalId?: string;
+  // Position of this embed among the page's <ArchitectureGraph/> tags — pairs
+  // the island with its placeholder div by document order.
+  occurrenceIndex?: number;
   href?: {
     label: string;
     url: string;
@@ -32,7 +32,7 @@ const {
   showSearch = true,
   showLegend = true,
   showLensPicker = false,
-  portalId,
+  occurrenceIndex = 0,
   href,
 } = Astro.props;
 
@@ -47,7 +47,7 @@ const focusKey =
 
 <AstroArchitectureGraph
   client:only="react"
-  portalId={portalId ?? `${id ?? 'catalog'}-architecture-graph-portal`}
+  occurrenceIndex={occurrenceIndex}
   nodes={wire.nodes}
   links={wire.links}
   linkLabels={wire.linkLabels}

package/eventcatalog/src/components/MDX/ArchitectureGraph/ArchitectureGraphPortal.tsx

@@ -1,17 +1,18 @@
-// The portal id pairs each scanner-rendered island with its MDX placeholder.
-// The occurrence index keeps multiple no-id embeds on one page from colliding
-// (the first occurrence keeps the unsuffixed id).
-export const architectureGraphPortalId = (id: string | undefined, occurrenceIndex: number) =>
-  `${id ?? 'catalog'}-architecture-graph-portal${occurrenceIndex > 0 ? `-${occurrenceIndex}` : ''}`;
+// Placeholders are matched to their islands positionally (nth placeholder in
+// document order ↔ nth <ArchitectureGraph/> tag in the host page's body scan).
+// The pairing must not rely on a render-time counter in the element id — Astro
+// can invoke MDX component functions more than once per tag (renderer probing),
+// which drifts such a counter out of sync with the body scan.
+export const ARCHITECTURE_GRAPH_PORTAL_SELECTOR = '[data-architecture-graph-portal]';
 
 // Empty placeholder rendered by the MDX component map. The real graph is
 // rendered by ArchitectureGraph.astro (which builds the data server-side) and
-// portals itself into this div by id — same pattern as NodeGraphPortal.
+// portals itself into this div — same pattern as NodeGraphPortal.
 const ArchitectureGraphPortal = (props: any) => {
   return (
     <div
       className="not-prose h-[30em] my-6 mb-12 w-full relative border! border-[rgb(var(--ec-page-border))]! rounded-md overflow-hidden"
-      id={architectureGraphPortalId(props.id, props.occurrenceIndex ?? 0)}
+      data-architecture-graph-portal={props.id ?? 'catalog'}
       style={{
         maxHeight: props.maxHeight ? `${props.maxHeight}em` : `30em`,
       }}

package/eventcatalog/src/components/MDX/ArchitectureGraph/AstroArchitectureGraph.tsx

@@ -1,11 +1,13 @@
 import { useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
 import CatalogForceGraph from '@components/CatalogGraph/CatalogForceGraph';
+import { ARCHITECTURE_GRAPH_PORTAL_SELECTOR } from '@components/MDX/ArchitectureGraph/ArchitectureGraphPortal';
 import type { CatalogGraphWireLink, CatalogGraphWireNode } from '@utils/node-graphs/catalog-force-graph';
 
 interface Props {
-  /** DOM id of the placeholder div ArchitectureGraphPortal rendered into the MDX content */
-  portalId: string;
+  /** Position of this island among the page's <ArchitectureGraph/> embeds — it
+   * mounts into the placeholder div at the same position in document order */
+  occurrenceIndex?: number;
   nodes: CatalogGraphWireNode[];
   links: CatalogGraphWireLink[];
   linkLabels: string[];
@@ -24,12 +26,13 @@ interface Props {
 // The island mounts outside the MDX content, finds the placeholder div the MDX
 // component map emitted, and portals the graph into it — same pattern as the
 // visualiser's NodeGraph.
-const AstroArchitectureGraph = ({ portalId, href, hrefLabel, ...graphProps }: Props) => {
+const AstroArchitectureGraph = ({ occurrenceIndex = 0, href, hrefLabel, ...graphProps }: Props) => {
   const [container, setContainer] = useState<HTMLElement | null>(null);
 
   useEffect(() => {
-    setContainer(document.getElementById(portalId));
-  }, [portalId]);
+    const portals = document.querySelectorAll<HTMLElement>(ARCHITECTURE_GRAPH_PORTAL_SELECTOR);
+    setContainer(portals[occurrenceIndex] ?? null);
+  }, [occurrenceIndex]);
 
   if (!container) return null;
 

package/eventcatalog/src/components/MDX/components.tsx

@@ -51,10 +51,6 @@ const getEntityMapCollection = (props: any, mdxProp: any) => {
 };
 
 const components = (props: any) => {
-  // Occurrence counter so multiple <ArchitectureGraph/> tags on one page each get
-  // their own portal — MDX renders in document order, matching the body scan order
-  // the host pages use to render the islands.
-  let architectureGraphOccurrence = 0;
   return {
     Attachments: (mdxProp: any) => jsx(Attachments, { ...props, ...mdxProp }),
     CustomProperties: (mdxProp: any) => jsx(CustomProperties, { ...props, ...mdxProp }),
@@ -74,14 +70,7 @@ const components = (props: any) => {
     ADRTable: (mdxProp: any) => jsx(ADRTable, { ...props, ...mdxProp }),
     EntityPropertiesTable: (mdxProp: any) => jsx(EntityPropertiesTable, { ...props, ...mdxProp }),
     NodeGraph: (mdxProp: any) => jsx(NodeGraphPortal, { ...props.data, ...mdxProp, props, mdxProp }),
-    ArchitectureGraph: (mdxProp: any) =>
-      jsx(ArchitectureGraphPortal, {
-        ...props.data,
-        ...mdxProp,
-        occurrenceIndex: architectureGraphOccurrence++,
-        props,
-        mdxProp,
-      }),
+    ArchitectureGraph: (mdxProp: any) => jsx(ArchitectureGraphPortal, { ...props.data, ...mdxProp, props, mdxProp }),
     ComponentDiagram: (mdxProp: any) => jsx(NodeGraphPortal, { ...props.data, ...mdxProp, props, mdxProp }),
     ContextDiagram: (mdxProp: any) => jsx(ContextDiagramPortal, { ...props.data, ...mdxProp, props, mdxProp }),
     SystemContextMap: (mdxProp: any) => jsx(SystemContextMapPortal, { ...mdxProp }),

package/eventcatalog/src/enterprise/custom-documentation/pages/docs/custom/index.astro

@@ -15,7 +15,6 @@ import { getAdjacentPages, getNavigationItems } from '@enterprise/custom-documen
 import CustomDocsNav from '@enterprise/custom-documentation/components/CustomDocsNav/CustomDocsNav.astro';
 import NodeGraph from '@components/MDX/NodeGraph/NodeGraph.astro';
 import ArchitectureGraph from '@components/MDX/ArchitectureGraph/ArchitectureGraph.astro';
-import { architectureGraphPortalId } from '@components/MDX/ArchitectureGraph/ArchitectureGraphPortal';
 import CopyAsMarkdown from '@components/CopyAsMarkdown';
 
 import {
@@ -202,7 +201,7 @@ const editUrl =
                   showSearch={graph.search}
                   showLegend={graph.legend}
                   showLensPicker={graph.lensPicker}
-                  portalId={architectureGraphPortalId(graph.id ?? (doc as any).id, occurrenceIndex)}
+                  occurrenceIndex={occurrenceIndex}
                   href={
                     isArchitectureGraphEnabled()
                       ? {

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/index.astro

@@ -11,7 +11,6 @@ import Footer from '@layouts/Footer.astro';
 import components from '@components/MDX/components';
 import NodeGraph from '@components/MDX/NodeGraph/NodeGraph.astro';
 import ArchitectureGraph from '@components/MDX/ArchitectureGraph/ArchitectureGraph.astro';
-import { architectureGraphPortalId } from '@components/MDX/ArchitectureGraph/ArchitectureGraphPortal';
 import SchemaViewer from '@components/MDX/SchemaViewer/SchemaViewerRoot.astro';
 import Admonition from '@components/MDX/Admonition';
 import VersionList from '@components/Lists/VersionList.astro';
@@ -681,7 +680,7 @@ if (!isAdrPage && !hasCurrentFlowEmbed && !hasCurrentPageNodeGraph) {
                   showSearch={graph.search}
                   showLegend={graph.legend}
                   showLensPicker={graph.lensPicker}
-                  portalId={architectureGraphPortalId(graph.id, occurrenceIndex)}
+                  occurrenceIndex={occurrenceIndex}
                   href={
                     isArchitectureGraphEnabled()
                       ? {

package/eventcatalog/src/pages/index.astro

@@ -1,7 +1,6 @@
 ---
 import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
 import { getMDXComponentsByName, parseMdxBooleanProp } from '@utils/markdown';
-import { architectureGraphPortalId } from '@components/MDX/ArchitectureGraph/ArchitectureGraphPortal';
 import { resourceToCollectionMap } from '@utils/collections/util';
 import { buildUrl } from '@utils/url-builder';
 import { isCustomLandingPageEnabled, isVisualiserEnabled, isArchitectureGraphEnabled } from '@utils/feature';
@@ -125,7 +124,7 @@ if (config.landingPage) {
               showSearch={parseMdxBooleanProp(graph.search, true)}
               showLegend={parseMdxBooleanProp(graph.legend, true)}
               showLensPicker={parseMdxBooleanProp(graph.lensPicker, false)}
-              portalId={architectureGraphPortalId(graph.id, occurrenceIndex)}
+              occurrenceIndex={occurrenceIndex}
               href={
                 isArchitectureGraphEnabled()
                   ? {

package/eventcatalog/src/pages/visualiser/domains/[id]/[version]/systems-context/_index.data.ts

@@ -1,26 +1,21 @@
 import { HybridPage } from '@utils/page-loaders/hybrid-page';
 import { isAuthEnabled, isVisualiserEnabled } from '@utils/feature';
 import { getDomains } from '@utils/collections/domains';
-import { getSystems } from '@utils/collections/systems';
 
 /**
  * A domain gets a System Diagram when it has systems and at least one of those
  * systems takes part in a context graph — i.e. it declares relationships or actors. A
  * domain whose systems have neither has nothing to show, so we don't generate a page.
+ * `getDomains` hydrates `data.systems` into full system entries, so read each
+ * system's data directly — this must stay in sync with the sidebar's
+ * `hasSystemContext` guard so we never link to a page that wasn't generated.
  */
-const domainHasSystemContext = (
-  domain: Awaited<ReturnType<typeof getDomains>>[number],
-  systemMap: Map<string, { data: { relationships?: unknown[]; actors?: unknown[] } }>
-) => {
-  const systemRefs = (domain.data.systems || []) as { id: string }[];
-  if (systemRefs.length === 0) return false;
+const domainHasSystemContext = (domain: Awaited<ReturnType<typeof getDomains>>[number]) => {
+  const systems = (domain.data.systems || []) as any[];
 
-  return systemRefs.some((ref) => {
-    const system = systemMap.get(ref.id);
-    if (!system) return false;
-    const relationships = (system.data.relationships || []) as unknown[];
-    const actors = (system.data.actors || []) as unknown[];
-    return relationships.length > 0 || actors.length > 0;
+  return systems.some((system) => {
+    const data = system?.data ?? system;
+    return ((data?.relationships as unknown[]) || []).length > 0 || ((data?.actors as unknown[]) || []).length > 0;
   });
 };
 
@@ -30,11 +25,10 @@ export class Page extends HybridPage {
       return [];
     }
 
-    const [domains, systems] = await Promise.all([getDomains({ getAllVersions: false }), getSystems()]);
-    const systemMap = new Map(systems.map((system) => [system.data.id, system]));
+    const domains = await getDomains({ getAllVersions: false });
 
     return domains
-      .filter((domain) => domainHasSystemContext(domain, systemMap))
+      .filter((domain) => domainHasSystemContext(domain))
       .map((domain) => ({
         params: {
           id: domain.data.id,

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.10.2",
+  "version": "4.10.3",
   "publishConfig": {
     "access": "public"
   },