@eventcatalog/core 2.49.5 → 2.50.1

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-SRWBNIXA.js";
-import "../chunk-XHCERMFT.js";
+} from "../chunk-BTQCPTER.js";
+import "../chunk-SDBKZ3UM.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.49.5";
+var version = "2.50.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-BUPT4PSW.js";
-import "../chunk-SRWBNIXA.js";
-import "../chunk-XHCERMFT.js";
+} from "../chunk-UG5JRBOA.js";
+import "../chunk-BTQCPTER.js";
+import "../chunk-SDBKZ3UM.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-SRWBNIXA.js → chunk-BTQCPTER.js}

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

package/dist/{chunk-XHCERMFT.js → chunk-SDBKZ3UM.js}

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

package/dist/{chunk-BUPT4PSW.js → chunk-UG5JRBOA.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-SRWBNIXA.js";
+} from "./chunk-BTQCPTER.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.49.5";
+var version = "2.50.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-XHCERMFT.js";
+} from "./chunk-SDBKZ3UM.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.49.5";
+var version = "2.50.1";
 
 // 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-BUPT4PSW.js";
-import "./chunk-SRWBNIXA.js";
+} from "./chunk-UG5JRBOA.js";
+import "./chunk-BTQCPTER.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
@@ -15,7 +15,7 @@ import {
 import "./chunk-LDBRNJIL.js";
 import {
   VERSION
-} from "./chunk-XHCERMFT.js";
+} from "./chunk-SDBKZ3UM.js";
 import {
   isAuthEnabled,
   isBackstagePluginEnabled,

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

@@ -2,6 +2,7 @@
 import fs from 'fs';
 import path from 'path';
 import { Code } from 'astro-expressive-code/components';
+import { getAbsoluteFilePathForAstroFile } from '@utils/files';
 
 interface Props {
   file?: string;
@@ -17,9 +18,11 @@ const { file = 'schema.json', catalog, title, filePath, lang = 'json' } = Astro.
 
 let code: string | null = null;
 
-const exists = fs.existsSync(path.join(path.dirname(filePath), file));
+const absoluteFilePath = getAbsoluteFilePathForAstroFile(filePath, file);
+
+const exists = fs.existsSync(absoluteFilePath);
 if (exists) {
-  code = fs.readFileSync(path.join(path.dirname(filePath), file), 'utf-8');
+  code = fs.readFileSync(absoluteFilePath, 'utf-8');
 }
 ---
 

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

@@ -7,16 +7,18 @@ import path from 'path';
 import SchemaViewerClient from './SchemaViewer.astro';
 import Admonition from '../Admonition';
 import { getMDXComponentsByName } from '@utils/markdown';
+import { getAbsoluteFilePathForAstroFile } from '@utils/files';
 
 let schemas = [];
 
 try {
-  const file = await fs.readFile(filePath, 'utf-8');
+  const absoluteFilePath = getAbsoluteFilePathForAstroFile(filePath, filePath.split(path.sep).pop());
+  const file = await fs.readFile(absoluteFilePath, 'utf-8');
   const schemaViewers = getMDXComponentsByName(file, 'SchemaViewer');
 
   // Loop around all the possible SchemaViewers in the file.
   const getAllComponents = schemaViewers.map(async (schemaViewerProps: any, index: number) => {
-    const schemaPath = path.join(path.dirname(filePath), schemaViewerProps.file);
+    const schemaPath = getAbsoluteFilePathForAstroFile(filePath, schemaViewerProps.file);
     const exists = existsSync(schemaPath);
     let schema;
     let render = true;

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

@@ -12,6 +12,7 @@ import { AsyncApiComponentWP, type ConfigInterface } from '@asyncapi/react-compo
 import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
 import Config from '@utils/eventcatalog-config/catalog';
 import { Page } from './_[filename].data';
+import { getAbsoluteFilePathForAstroFile } from '@utils/files';
 
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
@@ -19,10 +20,8 @@ export const getStaticPaths = Page.getStaticPaths;
 // Get data
 const { collection, data, filePath, filename } = await Page.getData(Astro);
 
-// @ts-ignore
 const fileName = filename || 'asyncapi.yaml';
-const directory = path.dirname(filePath || '');
-const pathToSpec = path.join(directory, fileName);
+const pathToSpec = getAbsoluteFilePathForAstroFile(filePath, fileName);
 const fileExists = fs.existsSync(pathToSpec);
 let content = '';
 

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

@@ -1,17 +1,12 @@
 ---
-import type { CollectionEntry } from 'astro:content';
-import * as path from 'path';
 import fs from 'node:fs';
 import OpenAPISpec from './_OpenAPI.tsx';
 
-import type { CollectionTypes, PageTypes } from '@types';
 import { DocumentMinusIcon } from '@heroicons/react/24/outline';
-import { buildUrl } from '@utils/url-builder';
-import { pageDataLoader } from '@utils/page-loaders/page-data-loader';
 import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
-import { getSpecificationsForService } from '@utils/collections/services';
 import './_styles.css';
 import { Page } from './_[filename].data.ts';
+import { getAbsoluteFilePathForAstroFile } from '@utils/files';
 
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
@@ -23,8 +18,7 @@ const props = await Page.getData(Astro);
 const { collection, data, catalog, filePath, filename } = props;
 const fileName = filename || 'openapi.yml';
 
-const directory = path.dirname(filePath || '');
-const pathToSpec = path.join(directory, fileName);
+const pathToSpec = getAbsoluteFilePathForAstroFile(filePath, fileName);
 const fileExists = fs.existsSync(pathToSpec);
 
 let content = '';

package/eventcatalog/src/utils/files.ts

@@ -0,0 +1,43 @@
+import path from 'node:path';
+
+/**
+ * Using the Astro filePath, this returns the absolute path to the file
+ *
+ * The astro file path does not return the absolute path to the file, it returns the relative path to the file.
+ *
+ * This function will return the absolute path to the file, and it will also remove any overlapping path segments, issues seen with local development and also docker
+ *
+ * @param filePath
+ * @returns
+ */
+export const getAbsoluteFilePathForAstroFile = (filePath: string, fileName?: string) => {
+  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 || '');
+    return path.join(directory, fileName);
+  }
+
+  return path.join(PROJECT_DIR, filePath);
+};

package/package.json

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

package/eventcatalog/src/utils/example-remark-plugin.mjs

@@ -1,6 +0,0 @@
-export function exampleRemarkPlugin() {
-  // All remark and rehype plugins return a separate function
-  return function (tree, file) {
-    file.data.astro.frontmatter.customProperty = 'Generated property';
-  };
-}