@eventcatalog/core 3.17.1 → 3.17.3

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-Q3ZRPTSY.js";
-import "../chunk-SR6JHVN3.js";
+} from "../chunk-Y42PMQ5L.js";
+import "../chunk-3NDVIDOJ.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -111,7 +111,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.17.1";
+var version = "3.17.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-AMNLO3F4.js";
-import "../chunk-Q3ZRPTSY.js";
+} from "../chunk-PO2MP3RE.js";
+import "../chunk-Y42PMQ5L.js";
 import "../chunk-4UVFXLPI.js";
-import "../chunk-SR6JHVN3.js";
+import "../chunk-3NDVIDOJ.js";
 import "../chunk-5T63CXKU.js";
 export {
   log_build_default as default

package/dist/{chunk-SR6JHVN3.js → chunk-3NDVIDOJ.js}

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

package/dist/{chunk-K6E76BU7.js → chunk-43IDYZCH.js}

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

package/dist/{chunk-7PAFE3DL.js → chunk-EZ23DY3F.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-K6E76BU7.js";
+} from "./chunk-43IDYZCH.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-AMNLO3F4.js → chunk-PO2MP3RE.js}

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

package/dist/{chunk-Q3ZRPTSY.js → chunk-Y42PMQ5L.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-SR6JHVN3.js";
+} from "./chunk-3NDVIDOJ.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-SR6JHVN3.js";
+} from "./chunk-3NDVIDOJ.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -114,7 +114,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.17.1";
+var version = "3.17.3";
 
 // 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-AMNLO3F4.js";
-import "./chunk-Q3ZRPTSY.js";
+} from "./chunk-PO2MP3RE.js";
+import "./chunk-Y42PMQ5L.js";
 import "./chunk-4UVFXLPI.js";
 import {
   runMigrations
@@ -22,13 +22,13 @@ import {
 } from "./chunk-3KXCGYET.js";
 import {
   generate
-} from "./chunk-7PAFE3DL.js";
+} from "./chunk-EZ23DY3F.js";
 import {
   logger
-} from "./chunk-K6E76BU7.js";
+} from "./chunk-43IDYZCH.js";
 import {
   VERSION
-} from "./chunk-SR6JHVN3.js";
+} from "./chunk-3NDVIDOJ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/generate.cjs

@@ -78,7 +78,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.17.1";
+var version = "3.17.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-7PAFE3DL.js";
-import "./chunk-K6E76BU7.js";
-import "./chunk-SR6JHVN3.js";
+} from "./chunk-EZ23DY3F.js";
+import "./chunk-43IDYZCH.js";
+import "./chunk-3NDVIDOJ.js";
 import "./chunk-5T63CXKU.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.17.1";
+var version = "3.17.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-K6E76BU7.js";
-import "../chunk-SR6JHVN3.js";
+} from "../chunk-43IDYZCH.js";
+import "../chunk-3NDVIDOJ.js";
 export {
   logger
 };

package/eventcatalog/src/content.config.ts

@@ -548,18 +548,14 @@ const resourceDocs = defineCollection({
 const resourceDocCategories = defineCollection({
   loader: glob({
     pattern: withIgnoredBuildArtifacts([
-      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/*/docs/**/category.json',
-      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/*/docs/**/_category_.json',
-      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/*/versioned/*/docs/**/category.json',
-      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/*/versioned/*/docs/**/_category_.json',
-      'domains/*/docs/**/category.json',
-      'domains/*/docs/**/_category_.json',
-      'domains/*/versioned/*/docs/**/category.json',
-      'domains/*/versioned/*/docs/**/_category_.json',
-      'domains/*/subdomains/*/docs/**/category.json',
-      'domains/*/subdomains/*/docs/**/_category_.json',
-      'domains/*/subdomains/*/versioned/*/docs/**/category.json',
-      'domains/*/subdomains/*/versioned/*/docs/**/_category_.json',
+      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/**/docs/**/category.json',
+      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/**/docs/**/_category_.json',
+      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/**/versioned/*/docs/**/category.json',
+      '{events,commands,queries,services,flows,containers,channels,entities,data-products}/**/versioned/*/docs/**/_category_.json',
+      'domains/**/docs/**/category.json',
+      'domains/**/docs/**/_category_.json',
+      'domains/**/docs/category.json',
+      'domains/**/docs/_category_.json',
     ]),
     base: projectDirBase,
   }),

package/eventcatalog/src/utils/collections/resource-docs.ts

@@ -1,4 +1,5 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
+import path from 'node:path';
 import { sortVersioned } from './util';
 import { isResourceDocsEnabled } from '@utils/feature';
 
@@ -52,6 +53,7 @@ export type ResourceDocGroup = {
 type ResourceLookup = {
   latestById: Map<string, string>;
   versionsById: Map<string, Set<string>>;
+  folderToId: Map<string, string>;
 };
 
 type InferredResource = {
@@ -200,12 +202,27 @@ const inferResourceFromFilePath = (filePath: string): InferredResource | null =>
   };
 };
 
+const getResourceFolderFromFilePath = (filePath: string): string | undefined => {
+  const normalized = normalizePath(filePath);
+  const versionedIndex = normalized.indexOf('/versioned/');
+  if (versionedIndex !== -1) {
+    // e.g. "domains/BoxOffice/versioned/1.0.0/index.mdx" → "domains/BoxOffice"
+    const beforeVersioned = normalized.slice(0, versionedIndex);
+    return path.basename(beforeVersioned) || undefined;
+  }
+  // e.g. "domains/BoxOffice/index.mdx" → "BoxOffice"
+  const dir = path.dirname(normalized);
+  return dir ? path.basename(dir) : undefined;
+};
+
 const buildLookup = (
   resources: Array<{
     data: { id: string; version: string; hidden?: boolean };
+    filePath?: string;
   }>
 ): ResourceLookup => {
   const groupedById = new Map<string, string[]>();
+  const folderToId = new Map<string, string>();
 
   for (const resource of resources) {
     if (resource.data.hidden === true) {
@@ -214,6 +231,13 @@ const buildLookup = (
     const list = groupedById.get(resource.data.id) || [];
     list.push(resource.data.version);
     groupedById.set(resource.data.id, list);
+
+    if (resource.filePath) {
+      const folderName = getResourceFolderFromFilePath(resource.filePath);
+      if (folderName && folderName !== resource.data.id) {
+        folderToId.set(folderName, resource.data.id);
+      }
+    }
   }
 
   const latestById = new Map<string, string>();
@@ -227,7 +251,7 @@ const buildLookup = (
     }
   }
 
-  return { latestById, versionsById };
+  return { latestById, versionsById, folderToId };
 };
 
 const getResourceLookups = async (): Promise<Record<ResourceCollection, ResourceLookup>> => {
@@ -295,15 +319,21 @@ const resolveResourceFromPath = (
     return null;
   }
 
-  const { resourceCollection, resourceId, resourceVersion } = inferredResource;
+  const { resourceCollection, resourceVersion } = inferredResource;
   const lookup = lookups[resourceCollection];
-  const knownVersions = lookup.versionsById.get(resourceId);
+
+  // The inferred resourceId is the folder name from the file path. It may differ
+  // from the actual frontmatter id, so fall back to the folderToId mapping.
+  const folderName = inferredResource.resourceId;
+  const resolvedId = lookup.versionsById.has(folderName) ? folderName : (lookup.folderToId.get(folderName) ?? folderName);
+
+  const knownVersions = lookup.versionsById.get(resolvedId);
 
   if (!knownVersions || knownVersions.size === 0) {
     return null;
   }
 
-  const resolvedResourceVersion = resourceVersion === 'latest' ? (lookup.latestById.get(resourceId) ?? null) : resourceVersion;
+  const resolvedResourceVersion = resourceVersion === 'latest' ? (lookup.latestById.get(resolvedId) ?? null) : resourceVersion;
 
   if (!resolvedResourceVersion || !knownVersions.has(resolvedResourceVersion)) {
     return null;
@@ -311,7 +341,7 @@ const resolveResourceFromPath = (
 
   return {
     resourceCollection,
-    resourceId,
+    resourceId: resolvedId,
     resourceVersion: resolvedResourceVersion,
   };
 };

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "3.17.1",
+  "version": "3.17.3",
   "publishConfig": {
     "access": "public"
   },