@eventcatalog/core 2.54.3 → 2.54.5

package/README.md

@@ -34,7 +34,7 @@
 <h4>Features: Documentation for Event Driven Architectures, Integration with any broker, Generator from your OpenAPI and AsyncAPI documents, Docs and Code, Markdown driven, Document Domains/Services/Messages/Schemas and more, Content versioning, Assign Owners, Schemas, OpenAPI, MDX Components and more...</h4>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-55-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-56-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [Read the Docs](https://www.eventcatalog.dev/docs/development/getting-started/introduction) | [View Demo](https://demo.eventcatalog.dev)
@@ -257,6 +257,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ababilone"><img src="https://avatars.githubusercontent.com/u/925013?v=4?s=100" width="100px;" alt="Arnaud Babilone"/><br /><sub><b>Arnaud Babilone</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=ababilone" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/alexanderhorner"><img src="https://avatars.githubusercontent.com/u/18349361?v=4?s=100" width="100px;" alt="Alexander Horner"/><br /><sub><b>Alexander Horner</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=alexanderhorner" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/simonwfarrow"><img src="https://avatars.githubusercontent.com/u/3245908?v=4?s=100" width="100px;" alt="simonwfarrow"/><br /><sub><b>simonwfarrow</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=simonwfarrow" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/augusto-romero-arango"><img src="https://avatars.githubusercontent.com/u/142316821?v=4?s=100" width="100px;" alt="Augusto Romero Arango"/><br /><sub><b>Augusto Romero Arango</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=augusto-romero-arango" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-YXXP2UQA.js";
-import "../chunk-VH23O4GO.js";
+} from "../chunk-SMAVC5E6.js";
+import "../chunk-KKHBA3ZL.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.3";
+var version = "2.54.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-JQS6ADYS.js";
-import "../chunk-YXXP2UQA.js";
-import "../chunk-VH23O4GO.js";
+} from "../chunk-4LDH2Z7T.js";
+import "../chunk-SMAVC5E6.js";
+import "../chunk-KKHBA3ZL.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-JQS6ADYS.js → chunk-4LDH2Z7T.js}

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

package/dist/{chunk-VH23O4GO.js → chunk-KKHBA3ZL.js}

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

package/dist/{chunk-YXXP2UQA.js → chunk-SMAVC5E6.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-VH23O4GO.js";
+} from "./chunk-KKHBA3ZL.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 = "2.54.3";
+var version = "2.54.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-VH23O4GO.js";
+} from "./chunk-KKHBA3ZL.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.3";
+var version = "2.54.5";
 
 // 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-JQS6ADYS.js";
-import "./chunk-YXXP2UQA.js";
+} from "./chunk-4LDH2Z7T.js";
+import "./chunk-SMAVC5E6.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
@@ -15,7 +15,7 @@ import {
 import "./chunk-LDBRNJIL.js";
 import {
   VERSION
-} from "./chunk-VH23O4GO.js";
+} from "./chunk-KKHBA3ZL.js";
 import {
   getProjectOutDir,
   isAuthEnabled,

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/utils/files.ts

@@ -1,5 +1,34 @@
 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));
+
+    // Normalize path separators for cross-platform compatibility
+    const normalizedPathAfterDotDot = pathAfterDotDot.replace(/[/\\]/g, path.sep);
+    const expectedPattern = `${projectParentName}${path.sep}${projectDirName}${path.sep}`;
+
+    if (normalizedPathAfterDotDot.startsWith(expectedPattern)) {
+      const remainingPath = normalizedPathAfterDotDot.substring(expectedPattern.length);
+      return path.join(projectDir, remainingPath);
+    } else {
+      // Instead of going to parent directory, resolve relative to current project directory
+      // This fixes the issue where ../ paths were incorrectly resolved outside the project
+      // Normalize the path separators before joining
+      return path.join(projectDir, normalizedPathAfterDotDot);
+    }
+  }
+  return path.join(projectDir, filePath);
+};
+
 /**
  * Using the Astro filePath, this returns the absolute path to the file
  *
@@ -14,30 +43,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/package.json

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