@eventcatalog/core 2.54.2 → 2.54.4

package/README.md

@@ -140,15 +140,6 @@ Thank you to our project  sponsors.
 
 <hr />
 
-<div align="center">
-  <img alt="oso" src="./images/sponsors/oso-logo-green.png" width="30%" />
-  <p style="margin: 0; padding: 0;">Delivering Apache Kafka professional services to your business
-</p>
-  <a href="https://oso.sh/?utm_source=eventcatalog&utm_medium=web&utm_campaign=sponsorship" target="_blank" >Learn more</a>
-</div>
-
-<hr />
-
 _Sponsors help make EventCatalog sustainable, want to help the project? Get in touch! Or [visit our sponsor page](https://www.eventcatalog.dev/support)._
 
 # Enterprise support

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-LC46PXQR.js";
-import "../chunk-TFCOMD54.js";
+} from "../chunk-QTOY4HR4.js";
+import "../chunk-ILYNXPYT.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 = "2.54.2";
+var version = "2.54.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-6BODD7KM.js";
-import "../chunk-LC46PXQR.js";
-import "../chunk-TFCOMD54.js";
+} from "../chunk-RSPVRELK.js";
+import "../chunk-QTOY4HR4.js";
+import "../chunk-ILYNXPYT.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-TFCOMD54.js → chunk-ILYNXPYT.js}

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

package/dist/{chunk-LC46PXQR.js → chunk-QTOY4HR4.js}

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

package/dist/{chunk-6BODD7KM.js → chunk-RSPVRELK.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-LC46PXQR.js";
+} from "./chunk-QTOY4HR4.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-TFCOMD54.js";
+} from "./chunk-ILYNXPYT.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

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

package/dist/eventcatalog.js

@@ -6,8 +6,8 @@ import {
 } from "./chunk-XE6PFSH5.js";
 import {
   log_build_default
-} from "./chunk-6BODD7KM.js";
-import "./chunk-LC46PXQR.js";
+} from "./chunk-RSPVRELK.js";
+import "./chunk-QTOY4HR4.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
@@ -15,7 +15,7 @@ import {
 import "./chunk-LDBRNJIL.js";
 import {
   VERSION
-} from "./chunk-TFCOMD54.js";
+} from "./chunk-ILYNXPYT.js";
 import {
   getProjectOutDir,
   isAuthEnabled,

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

@@ -4,28 +4,47 @@ import { getNodesAndEdges } from '@utils/node-graphs/domain-entity-map.ts';
 import Admonition from '@components/MDX/Admonition';
 import NodeGraph from '../NodeGraph/NodeGraph';
 import { getVersionFromCollection } from '@utils/collections/versions';
+import { getServices } from '@utils/collections/services';
 
-const { id, version = 'latest', maxHeight, includeKey = true, entities } = Astro.props;
+const { id, version = 'latest', maxHeight, includeKey = true, entities, collection = 'domains', ...rest } = Astro.props;
+let resource = null;
 
-// Find the flow for the given id and version
-const domains = await getDomains();
-const domainCollection = getVersionFromCollection(domains, id, version) || [];
-const domain = domainCollection[0];
+let resourceId = id;
+
+// If the user did not provide an id, we need to use the id from the rest props (the collection)
+const isAstroGeneratedId = id.match(/-\d+\.\d+\.\d+$/);
+if (isAstroGeneratedId) {
+  resourceId = rest.data.id;
+}
+
+if (collection === 'domains') {
+  const domains = await getDomains();
+  const domainCollection = getVersionFromCollection(domains, resourceId, version) || [];
+  resource = domainCollection[0];
+} else if (collection === 'services') {
+  const services = await getServices();
+  const serviceCollection = getVersionFromCollection(services, resourceId, version) || [];
+  resource = serviceCollection[0];
+} else {
+  throw new Error(`Invalid collection: ${collection}`);
+}
 
 const { nodes, edges } = await getNodesAndEdges({
-  id: id,
-  version: domain?.data?.version,
+  id: resourceId,
+  version: resource?.data?.version,
   ...(entities ? { entities } : {}), // Pass entities if provided
+  type: collection,
 });
 ---
 
 {
-  !domain && (
+  !resource && (
     <Admonition type="warning">
       <div>
         <span class="block font-bold">{`<EntityMap/>`} failed to load</span>
         <span class="block">
-          Tried to load domain id: {id} with version {version}. Make sure you have this domain defined in your project.
+          Tried to load {collection} id: {id} with version {version}. Make sure you have this {collection} defined in your
+          project.
         </span>
       </div>
     </Admonition>
@@ -49,7 +68,7 @@ const { nodes, edges } = await getNodesAndEdges({
     linkTo={'visualiser'}
     mode="simple"
     includeKey={includeKey}
-    footerLabel=`Entity Map - ${domain?.data?.name} - v(${domain?.data?.version})`
+    footerLabel={`Entity Map - ${resource?.data?.name} - v(${resource?.data?.version})`}
     client:only="react"
     portalId={`${id}-entity-map-portal`}
   />

package/eventcatalog/src/components/MDX/SchemaViewer/SchemaViewerRoot.astro

@@ -7,12 +7,12 @@ import path from 'path';
 import SchemaViewerClient from './SchemaViewer.astro';
 import Admonition from '../Admonition';
 import { getMDXComponentsByName } from '@utils/markdown';
-import { getAbsoluteFilePathForAstroFile } from '@utils/files';
+import { getAbsoluteFilePathForAstroFile, resolveProjectPath } from '@utils/files';
 
 let schemas = [];
 
 try {
-  const absoluteFilePath = getAbsoluteFilePathForAstroFile(filePath, filePath.split(path.sep).pop());
+  const absoluteFilePath = resolveProjectPath(filePath);
   const file = await fs.readFile(absoluteFilePath, 'utf-8');
   const schemaViewers = getMDXComponentsByName(file, 'SchemaViewer');
 

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

@@ -44,7 +44,7 @@ const components = (props: any) => {
     MessageTable: (mdxProp: any) => jsx(MessageTable, { ...props, ...mdxProp }),
     EntityPropertiesTable: (mdxProp: any) => jsx(EntityPropertiesTable, { ...props, ...mdxProp }),
     NodeGraph: (mdxProp: any) => jsx(NodeGraphPortal, { ...props.data, ...mdxProp, props, mdxProp }),
-    EntityMap,
+    EntityMap: (mdxProp: any) => jsx(EntityMap, { ...props, ...mdxProp }),
     OpenAPI,
     ResourceGroupTable: (mdxProp: any) => jsx(ResourceGroupTable, { ...props, ...mdxProp }),
     ResourceLink: (mdxProp: any) => jsx(ResourceLink, { ...props, ...mdxProp }),

package/eventcatalog/src/utils/files.ts

@@ -1,5 +1,28 @@
 import path from 'node:path';
 
+/**
+ * Resolves a file path relative to PROJECT_DIR, handling ../ paths correctly
+ * @param filePath - The path to resolve
+ * @param projectDir - The project directory to resolve relative to
+ * @returns The resolved absolute path
+ */
+export const resolveProjectPath = (filePath: string, projectDir: string = process.env.PROJECT_DIR || process.cwd()): string => {
+  if (filePath.startsWith('../')) {
+    const pathAfterDotDot = filePath.substring(3);
+    const projectDirName = path.basename(projectDir);
+    const projectParentName = path.basename(path.dirname(projectDir));
+
+    if (pathAfterDotDot.startsWith(`${projectParentName}/${projectDirName}/`)) {
+      const remainingPath = pathAfterDotDot.substring(`${projectParentName}/${projectDirName}/`.length);
+      return path.join(projectDir, remainingPath);
+    } else {
+      const projectParent = path.dirname(projectDir);
+      return path.join(projectParent, pathAfterDotDot);
+    }
+  }
+  return path.join(projectDir, filePath);
+};
+
 /**
  * Using the Astro filePath, this returns the absolute path to the file
  *
@@ -14,30 +37,10 @@ export const getAbsoluteFilePathForAstroFile = (filePath: string, fileName?: str
   const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
   if (fileName) {
-    const safeRelativePath = path.posix.relative('/', path.resolve('/', filePath));
-
-    // Check for overlapping path segments
-    const projectDirSegments = PROJECT_DIR.split(path.sep);
-    const relativePathSegments = safeRelativePath.split(path.posix.sep);
-
-    // Find the longest matching suffix of PROJECT_DIR with prefix of relative path
-    let overlapLength = 0;
-    for (let i = 1; i <= Math.min(projectDirSegments.length, relativePathSegments.length); i++) {
-      const projectSuffix = projectDirSegments.slice(-i);
-      const relativPrefix = relativePathSegments.slice(0, i);
-
-      if (projectSuffix.join(path.sep) === relativPrefix.join(path.posix.sep)) {
-        overlapLength = i;
-      }
-    }
-
-    // Remove overlapping segments from the relative path
-    const cleanedRelativePath = relativePathSegments.slice(overlapLength).join(path.posix.sep);
-    const absoluteFilePath = path.join(PROJECT_DIR, cleanedRelativePath);
-
-    const directory = path.dirname(absoluteFilePath || '');
+    const resolvedFilePath = resolveProjectPath(filePath, PROJECT_DIR);
+    const directory = path.dirname(resolvedFilePath);
     return path.join(directory, fileName);
   }
 
-  return path.join(PROJECT_DIR, filePath);
+  return resolveProjectPath(filePath, PROJECT_DIR);
 };

package/eventcatalog/src/utils/node-graphs/domain-entity-map.ts

@@ -6,6 +6,7 @@ import { getItemsFromCollectionByIdAndSemverOrLatest } from '@utils/collections/
 import { getVersionFromCollection } from '@utils/collections/versions';
 import { getEntities, type Entity } from '@utils/entities';
 import { getDomains, type Domain } from '@utils/collections/domains';
+import { getServices, type Service } from '@utils/collections/services';
 
 const elk = new ELK();
 
@@ -13,36 +14,45 @@ interface Props {
   id: string;
   version: string;
   entities?: string[]; // Optional: array of entity IDs/names to include
+  type?: 'domains' | 'services';
 }
 
-export const getNodesAndEdges = async ({ id, version, entities }: Props) => {
+export const getNodesAndEdges = async ({ id, version, entities, type = 'domains' }: Props) => {
   let nodes = [] as any,
     edges = [] as any;
 
   const allDomains = await getDomains();
   const allEntities = await getEntities();
+  const allServices = await getServices();
 
-  const domain = getVersionFromCollection(allDomains, id, version)[0] as Domain;
-  let domainEntities = (domain?.data?.entities ?? []) as any;
+  let resource = null;
+
+  if (type === 'domains') {
+    resource = getVersionFromCollection(allDomains, id, version)[0] as Domain;
+  } else if (type === 'services') {
+    resource = getVersionFromCollection(allServices, id, version)[0] as Service;
+  }
+
+  let resourceEntities = (resource?.data?.entities ?? []) as any;
 
   // If entities filter is provided, filter domainEntities to only those specified
   if (entities && Array.isArray(entities) && entities.length > 0) {
-    domainEntities = domainEntities.filter(
+    resourceEntities = resourceEntities.filter(
       (entity: Entity) => entities.includes(entity.data.id) || entities.includes(entity.data.name)
     );
   }
 
-  const entitiesWithReferences = domainEntities.filter((entity: Entity) =>
+  const entitiesWithReferences = resourceEntities.filter((entity: Entity) =>
     entity.data.properties?.some((property: any) => property.references)
   );
   // Creates all the entity nodes for the domain
-  for (const entity of domainEntities) {
+  for (const entity of resourceEntities) {
     const nodeId = generateIdForNode(entity);
     nodes.push({
       id: nodeId,
       type: 'entities',
       position: { x: 0, y: 0 },
-      data: { label: entity.data.name, entity, domainName: domain?.data.name, domainId: domain?.data.id },
+      data: { label: entity.data.name, entity, domainName: resource?.data.name, domainId: resource?.data.id },
     });
   }
 
@@ -53,7 +63,7 @@ export const getNodesAndEdges = async ({ id, version, entities }: Props) => {
     .filter((ref: any) => ref !== undefined);
 
   const externalToDomain = Array.from(new Set<string>(listOfReferencedEntities as string[])) // Remove duplicates
-    .filter((entityId: any) => !domainEntities.some((domainEntity: any) => domainEntity.id === entityId));
+    .filter((entityId: any) => !resourceEntities.some((domainEntity: any) => domainEntity.id === entityId));
 
   // Helper function to find which domain an entity belongs to
   const findEntityDomain = (entityId: string) => {
@@ -98,7 +108,7 @@ export const getNodesAndEdges = async ({ id, version, entities }: Props) => {
   entitiesWithReferences.push(...addedExternalEntities);
 
   // Create complete list of entities for edge creation and layout
-  const allEntitiesInGraph = [...domainEntities, ...addedExternalEntities];
+  const allEntitiesInGraph = [...resourceEntities, ...addedExternalEntities];
 
   // Go through any entities that are related to other entities
   for (const entity of entitiesWithReferences) {

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.54.2",
+  "version": "2.54.4",
   "publishConfig": {
     "access": "public"
   },
@@ -26,7 +26,7 @@
     "@ai-sdk/openai": "^1.3.16",
     "@astrojs/markdown-remark": "^6.3.3",
     "@astrojs/mdx": "^4.3.1",
-    "@astrojs/node": "^9.3.0",
+    "@astrojs/node": "^9.3.1",
     "@astrojs/react": "^4.3.0",
     "@astrojs/rss": "^4.0.12",
     "@astrojs/tailwind": "^6.0.2",
@@ -56,7 +56,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "ai": "^4.3.9",
-    "astro": "^5.12.0",
+    "astro": "^5.12.5",
     "astro-compress": "^2.3.8",
     "astro-expressive-code": "^0.40.1",
     "astro-seo": "^0.8.4",