@eventcatalog/core 3.12.9-beta.0 → 3.13.0-beta.2

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-WTCJKTEF.js";
-import "../chunk-2UUS3AQ2.js";
+} from "../chunk-GC6XBLGZ.js";
+import "../chunk-XIZQ27W3.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-V7YMKA4P.js";
-import "../chunk-WTCJKTEF.js";
+} from "../chunk-QCHSOWJP.js";
+import "../chunk-GC6XBLGZ.js";
 import "../chunk-4UVFXLPI.js";
-import "../chunk-2UUS3AQ2.js";
+import "../chunk-XIZQ27W3.js";
 import "../chunk-UPONRQSN.js";
 export {
   log_build_default as default

package/dist/{chunk-WTCJKTEF.js → chunk-GC6XBLGZ.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-2UUS3AQ2.js";
+} from "./chunk-XIZQ27W3.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/{chunk-RJOB6XEC.js → chunk-PBMJ6OIP.js}

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

package/dist/{chunk-V7YMKA4P.js → chunk-QCHSOWJP.js}

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

package/dist/{chunk-EDX2LGRV.js → chunk-VQJRAI3N.js}

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

package/dist/{chunk-2UUS3AQ2.js → chunk-XIZQ27W3.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-2UUS3AQ2.js";
+} from "./chunk-XIZQ27W3.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -109,7 +109,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,8 +6,8 @@ import {
 } from "./chunk-PLNJC7NZ.js";
 import {
   log_build_default
-} from "./chunk-V7YMKA4P.js";
-import "./chunk-WTCJKTEF.js";
+} from "./chunk-QCHSOWJP.js";
+import "./chunk-GC6XBLGZ.js";
 import "./chunk-4UVFXLPI.js";
 import {
   runMigrations
@@ -22,13 +22,13 @@ import {
 } from "./chunk-5VBIXL6C.js";
 import {
   generate
-} from "./chunk-RJOB6XEC.js";
+} from "./chunk-PBMJ6OIP.js";
 import {
   logger
-} from "./chunk-EDX2LGRV.js";
+} from "./chunk-VQJRAI3N.js";
 import {
   VERSION
-} from "./chunk-2UUS3AQ2.js";
+} from "./chunk-XIZQ27W3.js";
 import {
   verifyRequiredFieldsAreInCatalogConfigFile
 } from "./chunk-UPONRQSN.js";

package/dist/generate.cjs

@@ -73,7 +73,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-RJOB6XEC.js";
-import "./chunk-EDX2LGRV.js";
-import "./chunk-2UUS3AQ2.js";
+} from "./chunk-PBMJ6OIP.js";
+import "./chunk-VQJRAI3N.js";
+import "./chunk-XIZQ27W3.js";
 import "./chunk-UPONRQSN.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 = "3.12.9-beta.0";
+var version = "3.13.0-beta.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-EDX2LGRV.js";
-import "../chunk-2UUS3AQ2.js";
+} from "../chunk-VQJRAI3N.js";
+import "../chunk-XIZQ27W3.js";
 export {
   logger
 };

package/eventcatalog/src/components/Header.astro

@@ -89,7 +89,7 @@ const repositoryUrl = catalog?.repositoryUrl || 'https://github.com/event-catalo
                 </button>
                 <div
                   id="profile-dropdown"
-                  class="hidden absolute right-0 mt-2 w-48 bg-[rgb(var(--ec-dropdown-bg))] rounded-lg shadow-md py-1 z-50 border-2 border-[rgb(var(--ec-dropdown-border))] overflow-hidden"
+                  class="ec-hidden absolute right-0 mt-2 w-48 bg-[rgb(var(--ec-dropdown-bg))] rounded-lg shadow-md py-1 z-50 border-2 border-[rgb(var(--ec-dropdown-border))] overflow-hidden"
                 >
                   <div class="px-4 py-2 text-sm text-[rgb(var(--ec-dropdown-text))] border-b border-[rgb(var(--ec-dropdown-border))]">
                     <div class="font-semibold">{session.user?.name || 'User'}</div>
@@ -194,7 +194,7 @@ const repositoryUrl = catalog?.repositoryUrl || 'https://github.com/event-catalo
       </div>
     </div>
 
-    <div id="mobile-menu" class="md:hidden hidden mt-4">
+    <div id="mobile-menu" class="md:hidden ec-hidden mt-4">
       <ul class="flex flex-col space-y-8 my-4 mb-8">
         <!-- {
           navItems.map((item) => {
@@ -215,51 +215,65 @@ const repositoryUrl = catalog?.repositoryUrl || 'https://github.com/event-catalo
 <!-- Spacer to prevent content from being hidden under the fixed header -->
 
 <script>
-  const menuToggle = document.getElementById('menu-toggle');
-  const mobileMenu = document.getElementById('mobile-menu');
   import { signOut } from 'auth-astro/client';
 
-  if (menuToggle && mobileMenu) {
-    menuToggle.addEventListener('click', () => {
-      mobileMenu.classList.toggle('hidden');
-    });
-  }
+  function initializeHeader() {
+    const menuToggle = document.getElementById('menu-toggle');
+    const mobileMenu = document.getElementById('mobile-menu');
 
-  // Profile dropdown functionality
-  const profileButton = document.getElementById('profile-menu-button');
-  const profileDropdown = document.getElementById('profile-dropdown');
+    if (menuToggle && mobileMenu) {
+      menuToggle.addEventListener('click', () => {
+        mobileMenu.classList.toggle('ec-hidden');
+      });
+    }
 
-  if (profileButton && profileDropdown) {
-    profileButton.addEventListener('click', (e) => {
-      e.stopPropagation();
-      profileDropdown.classList.toggle('hidden');
-      profileButton.setAttribute('aria-expanded', !profileDropdown.classList.contains('hidden') ? 'true' : 'false');
-    });
+    // Profile dropdown functionality
+    const profileButton = document.getElementById('profile-menu-button');
+    const profileDropdown = document.getElementById('profile-dropdown');
 
-    // Close dropdown when clicking outside
-    document.addEventListener('click', (e) => {
-      if (!profileButton.contains(e.target as Node) && !profileDropdown.contains(e.target as Node)) {
-        profileDropdown.classList.add('hidden');
-        profileButton.setAttribute('aria-expanded', 'false');
-      }
-    });
+    if (profileButton && profileDropdown) {
+      profileButton.addEventListener('click', (e) => {
+        e.stopPropagation();
+        profileDropdown.classList.toggle('ec-hidden');
+        profileButton.setAttribute('aria-expanded', !profileDropdown.classList.contains('ec-hidden') ? 'true' : 'false');
+      });
 
-    // Close dropdown on escape key
-    document.addEventListener('keydown', (e) => {
-      if (e.key === 'Escape' && !profileDropdown.classList.contains('hidden')) {
-        profileDropdown.classList.add('hidden');
-        profileButton.setAttribute('aria-expanded', 'false');
-        profileButton.focus();
-      }
-    });
+      // Close dropdown when clicking outside
+      document.addEventListener('click', (e) => {
+        if (!profileButton.contains(e.target as Node) && !profileDropdown.contains(e.target as Node)) {
+          profileDropdown.classList.add('ec-hidden');
+          profileButton.setAttribute('aria-expanded', 'false');
+        }
+      });
+
+      // Close dropdown on escape key
+      document.addEventListener('keydown', (e) => {
+        if (e.key === 'Escape' && !profileDropdown.classList.contains('ec-hidden')) {
+          profileDropdown.classList.add('ec-hidden');
+          profileButton.setAttribute('aria-expanded', 'false');
+          profileButton.focus();
+        }
+      });
 
-    document.getElementById('signout-btn')?.addEventListener('click', async () => {
-      await signOut();
-    });
+      document.getElementById('signout-btn')?.addEventListener('click', async () => {
+        await signOut();
+      });
+    }
   }
+
+  // Initialize on first load
+  initializeHeader();
+
+  // Re-initialize after Astro view transitions (needed because of transition:persist on header)
+  document.addEventListener('astro:page-load', initializeHeader);
 </script>
 
 <style>
+  /* Custom class for toggling dropdowns/menus */
+  .ec-hidden {
+    display: none !important;
+  }
+
   @media (max-width: 768px) {
     nav {
       transition: all 0.3s ease-out;
@@ -271,7 +285,7 @@ const repositoryUrl = catalog?.repositoryUrl || 'https://github.com/event-catalo
       overflow: hidden;
     }
 
-    #mobile-menu:not(.hidden) {
+    #mobile-menu:not(.ec-hidden) {
       max-height: 500px; /* Adjust this value as needed */
     }
   }

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

@@ -1,12 +1,12 @@
-import fs from 'fs';
-import path from 'path';
+import { resourceFileExists, readResourceFile, getResourceFilePath } from '@utils/resource-files';
 
-const File = ({ file, catalog, title }: any) => {
+const File = ({ file, filePath, title }: any) => {
   try {
-    const exists = fs.existsSync(path.join(catalog.filePath, file));
+    const item = { filePath };
+    const exists = resourceFileExists(item, file);
 
     if (exists) {
-      const text = fs.readFileSync(path.join(catalog.filePath, file), 'utf-8');
+      const text = readResourceFile(item, file);
       return (
         <div className="not-prose">
           <pre className="expressive-code" data-language="json">
@@ -23,7 +23,7 @@ const File = ({ file, catalog, title }: any) => {
                 </code>
               </pre>
               <div className="copy">
-                <button title="Copy to clipboard" data-copied="Copied!" data-code={text}>
+                <button title="Copy to clipboard" data-copied="Copied!" data-code={text ?? ''}>
                   <div></div>
                 </button>
               </div>
@@ -32,7 +32,7 @@ const File = ({ file, catalog, title }: any) => {
         </div>
       );
     } else {
-      return <div className="italic">Tried to load file from {path.join(catalog.filePath, file)}, but no file can be found</div>;
+      return <div className="italic">Tried to load file from {getResourceFilePath(item, file)}, but no file can be found</div>;
     }
   } catch (error) {
     console.log('Failed to load file', error);

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

@@ -1,20 +1,17 @@
 ---
 import fs from 'fs';
-import path from 'path';
 import { Code } from 'astro-expressive-code/components';
 import { getAbsoluteFilePathForAstroFile } from '@utils/files';
+import { getResourceFilePath } from '@utils/resource-files';
 
 interface Props {
   file?: string;
-  catalog: {
-    filePath: string;
-  };
   title?: string;
   filePath: string;
   lang?: string;
 }
 
-const { file = 'schema.json', catalog, title, filePath, lang = 'json' } = Astro.props;
+const { file = 'schema.json', title, filePath, lang = 'json' } = Astro.props;
 
 let code: string | null = null;
 
@@ -32,6 +29,6 @@ if (exists) {
       <Code code={code} title={title || file} lang={lang} />
     </div>
   ) : (
-    <div class="italic">Tried to load schema from {path.join(catalog.filePath, file)}, but no schema can be found</div>
+    <div class="italic">Tried to load schema from {getResourceFilePath({ filePath }, file)}, but no schema can be found</div>
   )
 }

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

@@ -564,13 +564,8 @@ nodeGraphs.push({
       }
     </style>
 
-    <script define:vars={{ props, config }}>
-      // Fix to pass information to componets that are client side only
-      // and require catalog information
+    <script define:vars={{ config }}>
       window.eventcatalog = {};
-      // @ts-ignore
-      window.eventcatalog[`${props.collection}-${props.data.id}`] = props.catalog;
-
       window.eventcatalog.mermaid = config.mermaid;
     </script>
 

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

@@ -17,7 +17,7 @@ export const getStaticPaths = Page.getStaticPaths;
 const props = await Page.getData(Astro);
 
 // @ts-ignore
-const { collection, data, catalog, filePath, filename, path: relativeSpecPath } = props;
+const { collection, data, filePath, filename, path: relativeSpecPath } = props;
 const fileName = filename || 'openapi.yml';
 
 const pathToSpec = getAbsoluteFilePathForAstroFile(filePath, fileName);
@@ -59,7 +59,7 @@ if (isRemote) {
         <DocumentMinusIcon className="mx-auto h-12 w-12 text-gray-400" />
         <h3 class="mt-2 text-sm font-semibold text-gray-900">No OpenAPI spec file found</h3>
         <p class="mt-1 text-xs text-gray-400">
-          Could not find OpenAPI file for {data.name} in {`/${catalog.path}`}
+          Could not find OpenAPI file for {data.name} in {`/${collection}/${data.id}`}
         </p>
       </div>
     ) : (

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

@@ -1,21 +1,11 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
-import path from 'path';
 import { getItemsFromCollectionByIdAndSemverOrLatest, createVersionedMap, satisfies } from './util';
 import type { CollectionMessageTypes } from '@types';
-import utils from '@eventcatalog/sdk';
 
-const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 const CACHE_ENABLED = process.env.DISABLE_EVENTCATALOG_CACHE !== 'true';
 
-type Channel = CollectionEntry<'channels'> & {
-  catalog: {
-    path: string;
-    filePath: string;
-    type: string;
-    publicPath: string;
-  };
-};
+type Channel = CollectionEntry<'channels'>;
 
 interface Props {
   getAllVersions?: boolean;
@@ -74,8 +64,6 @@ export const getChannels = async ({ getAllVersions = true }: Props = {}): Promis
     return true;
   });
 
-  const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
-
   // 5. Enrich channels
   const processedChannels = await Promise.all(
     targetChannels.map(async (channel) => {
@@ -105,13 +93,6 @@ export const getChannels = async ({ getAllVersions = true }: Props = {}): Promis
         };
       });
 
-      const folderName = await getResourceFolderName(
-        process.env.PROJECT_DIR ?? '',
-        channel.data.id,
-        channel.data.version.toString()
-      );
-      const channelFolderName = folderName ?? channel.id.replace(`-${channel.data.version}`, '');
-
       return {
         ...channel,
         data: {
@@ -120,12 +101,6 @@ export const getChannels = async ({ getAllVersions = true }: Props = {}): Promis
           latestVersion,
           messages,
         },
-        catalog: {
-          path: path.join(channel.collection, channel.id.replace('/index.mdx', '')),
-          filePath: path.join(process.cwd(), 'src', 'catalog-files', channel.collection, channel.id.replace('/index.mdx', '')),
-          publicPath: path.join('/generated', channel.collection, channelFolderName),
-          type: 'event',
-        },
       };
     })
   );

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

@@ -1,21 +1,11 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
-import path from 'path';
 import { createVersionedMap } from './util';
-import { hydrateProducersAndConsumers } from './messages';
-import utils from '@eventcatalog/sdk';
+import { buildProducerConsumerIndex, lookupProducersAndConsumers } from './messages';
 
-const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 const CACHE_ENABLED = process.env.DISABLE_EVENTCATALOG_CACHE !== 'true';
 
-type Command = CollectionEntry<'commands'> & {
-  catalog: {
-    path: string;
-    filePath: string;
-    type: string;
-    publicPath: string;
-  };
-};
+type Command = CollectionEntry<'commands'>;
 
 interface Props {
   getAllVersions?: boolean;
@@ -45,6 +35,18 @@ export const getCommands = async ({ getAllVersions = true, hydrateServices = tru
 
   // 2. Build optimized maps
   const commandMap = createVersionedMap(allCommands);
+  const pcIndex = buildProducerConsumerIndex(allServices, allDataProducts);
+
+  // Build channel lookup map: channelId → channel entries
+  const channelById = new Map<string, typeof allChannels>();
+  for (const ch of allChannels) {
+    let list = channelById.get(ch.data.id);
+    if (!list) {
+      list = [];
+      channelById.set(ch.data.id, list);
+    }
+    list.push(ch);
+  }
 
   // 3. Filter commands
   const targetCommands = allCommands.filter((command) => {
@@ -53,8 +55,6 @@ export const getCommands = async ({ getAllVersions = true, hydrateServices = tru
     return true;
   });
 
-  const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
-
   // 4. Enrich commands
   const processedCommands = await Promise.all(
     targetCommands.map(async (command) => {
@@ -63,41 +63,27 @@ export const getCommands = async ({ getAllVersions = true, hydrateServices = tru
       const latestVersion = commandVersions[0]?.data.version || command.data.version;
       const versions = commandVersions.map((e) => e.data.version);
 
-      // Find producers and consumers (services + data products)
-      const { producers, consumers } = hydrateProducersAndConsumers({
+      // Find producers and consumers via reverse index
+      const { producers, consumers } = lookupProducersAndConsumers({
         message: { data: { ...command.data, latestVersion } },
-        services: allServices,
-        dataProducts: allDataProducts,
+        index: pcIndex,
         hydrate: hydrateServices,
       });
 
-      // Find Channels
+      // Find Channels via map lookup
       const messageChannels = command.data.channels || [];
-      const channelsForCommand = allChannels.filter((c) => messageChannels.some((channel) => c.data.id === channel.id));
-
-      const folderName = await getResourceFolderName(
-        process.env.PROJECT_DIR ?? '',
-        command.data.id,
-        command.data.version.toString()
-      );
-      const commandFolderName = folderName ?? command.id.replace(`-${command.data.version}`, '');
+      const channelsForCommand = messageChannels.flatMap((channel) => channelById.get(channel.id) || []);
 
       return {
         ...command,
         data: {
           ...command.data,
           messageChannels: channelsForCommand,
-          producers: producers as any, // Cast for hydration flexibility
+          producers: producers as any,
           consumers: consumers as any,
           versions,
           latestVersion,
         },
-        catalog: {
-          path: path.join(command.collection, command.id.replace('/index.mdx', '')),
-          filePath: path.join(process.cwd(), 'src', 'catalog-files', command.collection, command.id.replace('/index.mdx', '')),
-          publicPath: path.join('/generated', command.collection, commandFolderName),
-          type: 'command',
-        },
       };
     })
   );

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

@@ -1,19 +1,9 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
-import path from 'path';
 import { createVersionedMap, satisfies } from './util';
-import utils from '@eventcatalog/sdk';
 
-const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 const CACHE_ENABLED = process.env.DISABLE_EVENTCATALOG_CACHE !== 'true';
-export type Entity = CollectionEntry<'containers'> & {
-  catalog: {
-    path: string;
-    filePath: string;
-    type: string;
-    publicPath: string;
-  };
-};
+export type Entity = CollectionEntry<'containers'>;
 
 interface Props {
   getAllVersions?: boolean;
@@ -48,8 +38,6 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
     return true;
   });
 
-  const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
-
   // 4. Enrich containers
   const processedContainers = await Promise.all(
     targetContainers.map(async (container) => {
@@ -97,13 +85,6 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
       // Combine references
       const servicesThatReferenceContainer = [...new Set([...servicesThatWriteToContainer, ...servicesThatReadFromContainer])];
 
-      const folderName = await getResourceFolderName(
-        process.env.PROJECT_DIR ?? '',
-        container.data.id,
-        container.data.version.toString()
-      );
-      const containerFolderName = folderName ?? container.id.replace(`-${container.data.version}`, '');
-
       return {
         ...container,
         data: {
@@ -116,18 +97,6 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
           dataProductsThatWriteToContainer,
           dataProductsThatReadFromContainer,
         },
-        catalog: {
-          path: path.join(container.collection, container.id.replace('/index.mdx', '')),
-          filePath: path.join(
-            process.cwd(),
-            'src',
-            'catalog-files',
-            container.collection,
-            container.id.replace('/index.mdx', '')
-          ),
-          publicPath: path.join('/generated', container.collection, containerFolderName),
-          type: 'container',
-        },
       };
     })
   );