@eventcatalog/core 4.2.0 → 4.2.1

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.2.0";
+var version = "4.2.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-J7T5HUHY.js";
-import "../chunk-4FWALA6J.js";
+} from "../chunk-RQ36O7QA.js";
+import "../chunk-PUTZR6SV.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.2.0";
+var version = "4.2.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-47LY7DY2.js";
-import "../chunk-J7T5HUHY.js";
+} from "../chunk-V6UMVNX4.js";
+import "../chunk-RQ36O7QA.js";
 import "../chunk-K2XIENVT.js";
-import "../chunk-4FWALA6J.js";
+import "../chunk-PUTZR6SV.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-QKPPJU43.js → chunk-A6SWOPJ4.js}

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

package/dist/{chunk-KPDU47YJ.js → chunk-DTQ2MXRB.js}

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

package/dist/{chunk-4FWALA6J.js → chunk-PUTZR6SV.js}

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

package/dist/{chunk-J7T5HUHY.js → chunk-RQ36O7QA.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-4FWALA6J.js";
+} from "./chunk-PUTZR6SV.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-47LY7DY2.js → chunk-V6UMVNX4.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-4FWALA6J.js";
+} from "./chunk-PUTZR6SV.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -144,7 +144,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.2.0";
+var version = "4.2.1";
 
 // src/constants.ts
 var VERSION = version;
@@ -1905,7 +1905,7 @@ var startDevPrewarm = ({
 };
 var createAstroLineFilter = () => {
   return (line) => {
-    return line.includes("[glob-loader]") || /The collection.*does not exist/.test(line);
+    return line.includes("[glob-loader]") || /^\s*The collection ".*" does not exist or is empty\. Please check your content config file for errors\.\s*$/.test(line);
   };
 };
 var createAstroDevLineFilter = () => {
@@ -2244,34 +2244,43 @@ program.command("build").description("Run build of EventCatalog").action(async (
     logger.info(`Indexed ${result.records} page(s) into ${import_node_path11.default.relative(dir, result.outputPath)}`, "search");
   }
 });
-var previewCatalog = ({
+var previewCatalog = async ({
   command,
   canEmbedPages = false,
   isEventCatalogStarter = false,
   isEventCatalogScale = false
 }) => {
-  (0, import_node_child_process.execSync)(
-    `cross-env PROJECT_DIR='${dir}' CATALOG_DIR='${core}' ENABLE_EMBED=${canEmbedPages} EVENTCATALOG_STARTER=${isEventCatalogStarter} EVENTCATALOG_SCALE=${isEventCatalogScale} npx astro preview ${command.args.join(" ").trim()}`,
-    {
-      cwd: core,
-      stdio: "inherit"
-    }
-  );
+  await runCommandWithFilteredOutput({
+    command: `npx astro preview ${command.args.join(" ").trim()}`,
+    cwd: core,
+    env: {
+      PROJECT_DIR: dir,
+      CATALOG_DIR: core,
+      ENABLE_EMBED: String(canEmbedPages),
+      EVENTCATALOG_STARTER: String(isEventCatalogStarter),
+      EVENTCATALOG_SCALE: String(isEventCatalogScale)
+    },
+    shouldFilterLine: createAstroLineFilter()
+  });
 };
-var startServerCatalog = ({
-  command,
+var startServerCatalog = async ({
   canEmbedPages = false,
   isEventCatalogStarter = false,
   isEventCatalogScale = false
 }) => {
   const serverEntryPath = import_node_path11.default.join(dir, "dist", "server", "entry.mjs");
-  (0, import_node_child_process.execSync)(
-    `cross-env PROJECT_DIR='${dir}' CATALOG_DIR='${core}' ENABLE_EMBED=${canEmbedPages} EVENTCATALOG_STARTER=${isEventCatalogStarter} EVENTCATALOG_SCALE=${isEventCatalogScale} node "${serverEntryPath}"`,
-    {
-      cwd: core,
-      stdio: "inherit"
-    }
-  );
+  await runCommandWithFilteredOutput({
+    command: `node "${serverEntryPath}"`,
+    cwd: core,
+    env: {
+      PROJECT_DIR: dir,
+      CATALOG_DIR: core,
+      ENABLE_EMBED: String(canEmbedPages),
+      EVENTCATALOG_STARTER: String(isEventCatalogStarter),
+      EVENTCATALOG_SCALE: String(isEventCatalogScale)
+    },
+    shouldFilterLine: createAstroLineFilter()
+  });
 };
 program.command("preview").description("Serves the contents of your eventcatalog build directory").action(async (options, command) => {
   logger.welcome();
@@ -2285,7 +2294,12 @@ program.command("preview").description("Serves the contents of your eventcatalog
   );
   const isEventCatalogStarter = await (0, import_license.isEventCatalogStarterEnabled)();
   const isEventCatalogScale = await (0, import_license.isEventCatalogScaleEnabled)();
-  previewCatalog({ command, canEmbedPages: canEmbedPages || isEventCatalogScale, isEventCatalogStarter, isEventCatalogScale });
+  await previewCatalog({
+    command,
+    canEmbedPages: canEmbedPages || isEventCatalogScale,
+    isEventCatalogStarter,
+    isEventCatalogScale
+  });
 });
 program.command("start").description("Serves the contents of your eventcatalog build directory").action(async (options, command) => {
   logger.welcome();
@@ -2301,14 +2315,13 @@ program.command("start").description("Serves the contents of your eventcatalog b
   const isEventCatalogScale = await (0, import_license.isEventCatalogScaleEnabled)();
   const isServerOutput = await isOutputServer();
   if (isServerOutput) {
-    startServerCatalog({
-      command,
+    await startServerCatalog({
       canEmbedPages: canEmbedPages || isEventCatalogScale,
       isEventCatalogStarter,
       isEventCatalogScale
     });
   } else {
-    previewCatalog({
+    await previewCatalog({
       command,
       canEmbedPages: canEmbedPages || isEventCatalogScale,
       isEventCatalogStarter,

package/dist/eventcatalog.js

@@ -1,16 +1,16 @@
 import {
   log_build_default
-} from "./chunk-47LY7DY2.js";
+} from "./chunk-V6UMVNX4.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
 import {
   generate
-} from "./chunk-QKPPJU43.js";
+} from "./chunk-A6SWOPJ4.js";
 import {
   logger
-} from "./chunk-KPDU47YJ.js";
+} from "./chunk-DTQ2MXRB.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -20,7 +20,7 @@ import {
 import {
   watch
 } from "./chunk-CAJUIMDJ.js";
-import "./chunk-J7T5HUHY.js";
+import "./chunk-RQ36O7QA.js";
 import "./chunk-K2XIENVT.js";
 import {
   catalogToAstro
@@ -28,7 +28,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-4FWALA6J.js";
+} from "./chunk-PUTZR6SV.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules
@@ -46,7 +46,7 @@ import {
 
 // src/eventcatalog.ts
 import { Command } from "commander";
-import { execSync, spawn } from "child_process";
+import { spawn } from "child_process";
 import { join } from "path";
 import http from "http";
 import fs3 from "fs";
@@ -679,7 +679,7 @@ var startDevPrewarm = ({
 };
 var createAstroLineFilter = () => {
   return (line) => {
-    return line.includes("[glob-loader]") || /The collection.*does not exist/.test(line);
+    return line.includes("[glob-loader]") || /^\s*The collection ".*" does not exist or is empty\. Please check your content config file for errors\.\s*$/.test(line);
   };
 };
 var createAstroDevLineFilter = () => {
@@ -1018,34 +1018,43 @@ program.command("build").description("Run build of EventCatalog").action(async (
     logger.info(`Indexed ${result.records} page(s) into ${path2.relative(dir, result.outputPath)}`, "search");
   }
 });
-var previewCatalog = ({
+var previewCatalog = async ({
   command,
   canEmbedPages = false,
   isEventCatalogStarter = false,
   isEventCatalogScale = false
 }) => {
-  execSync(
-    `cross-env PROJECT_DIR='${dir}' CATALOG_DIR='${core}' ENABLE_EMBED=${canEmbedPages} EVENTCATALOG_STARTER=${isEventCatalogStarter} EVENTCATALOG_SCALE=${isEventCatalogScale} npx astro preview ${command.args.join(" ").trim()}`,
-    {
-      cwd: core,
-      stdio: "inherit"
-    }
-  );
+  await runCommandWithFilteredOutput({
+    command: `npx astro preview ${command.args.join(" ").trim()}`,
+    cwd: core,
+    env: {
+      PROJECT_DIR: dir,
+      CATALOG_DIR: core,
+      ENABLE_EMBED: String(canEmbedPages),
+      EVENTCATALOG_STARTER: String(isEventCatalogStarter),
+      EVENTCATALOG_SCALE: String(isEventCatalogScale)
+    },
+    shouldFilterLine: createAstroLineFilter()
+  });
 };
-var startServerCatalog = ({
-  command,
+var startServerCatalog = async ({
   canEmbedPages = false,
   isEventCatalogStarter = false,
   isEventCatalogScale = false
 }) => {
   const serverEntryPath = path2.join(dir, "dist", "server", "entry.mjs");
-  execSync(
-    `cross-env PROJECT_DIR='${dir}' CATALOG_DIR='${core}' ENABLE_EMBED=${canEmbedPages} EVENTCATALOG_STARTER=${isEventCatalogStarter} EVENTCATALOG_SCALE=${isEventCatalogScale} node "${serverEntryPath}"`,
-    {
-      cwd: core,
-      stdio: "inherit"
-    }
-  );
+  await runCommandWithFilteredOutput({
+    command: `node "${serverEntryPath}"`,
+    cwd: core,
+    env: {
+      PROJECT_DIR: dir,
+      CATALOG_DIR: core,
+      ENABLE_EMBED: String(canEmbedPages),
+      EVENTCATALOG_STARTER: String(isEventCatalogStarter),
+      EVENTCATALOG_SCALE: String(isEventCatalogScale)
+    },
+    shouldFilterLine: createAstroLineFilter()
+  });
 };
 program.command("preview").description("Serves the contents of your eventcatalog build directory").action(async (options, command) => {
   logger.welcome();
@@ -1059,7 +1068,12 @@ program.command("preview").description("Serves the contents of your eventcatalog
   );
   const isEventCatalogStarter = await isEventCatalogStarterEnabled();
   const isEventCatalogScale = await isEventCatalogScaleEnabled();
-  previewCatalog({ command, canEmbedPages: canEmbedPages || isEventCatalogScale, isEventCatalogStarter, isEventCatalogScale });
+  await previewCatalog({
+    command,
+    canEmbedPages: canEmbedPages || isEventCatalogScale,
+    isEventCatalogStarter,
+    isEventCatalogScale
+  });
 });
 program.command("start").description("Serves the contents of your eventcatalog build directory").action(async (options, command) => {
   logger.welcome();
@@ -1075,14 +1089,13 @@ program.command("start").description("Serves the contents of your eventcatalog b
   const isEventCatalogScale = await isEventCatalogScaleEnabled();
   const isServerOutput = await isOutputServer();
   if (isServerOutput) {
-    startServerCatalog({
-      command,
+    await startServerCatalog({
       canEmbedPages: canEmbedPages || isEventCatalogScale,
       isEventCatalogStarter,
       isEventCatalogScale
     });
   } else {
-    previewCatalog({
+    await previewCatalog({
       command,
       canEmbedPages: canEmbedPages || isEventCatalogScale,
       isEventCatalogStarter,

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-QKPPJU43.js";
-import "./chunk-KPDU47YJ.js";
-import "./chunk-4FWALA6J.js";
+} from "./chunk-A6SWOPJ4.js";
+import "./chunk-DTQ2MXRB.js";
+import "./chunk-PUTZR6SV.js";
 import "./chunk-6QENHZZP.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 = "4.2.0";
+var version = "4.2.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-KPDU47YJ.js";
-import "../chunk-4FWALA6J.js";
+} from "../chunk-DTQ2MXRB.js";
+import "../chunk-PUTZR6SV.js";
 export {
   logger
 };

package/eventcatalog/src/pages/docs/[type]/[id]/[version].md.ts

@@ -9,6 +9,7 @@ import config from '@config';
 import fs from 'fs';
 import { isLLMSTxtEnabled } from '@utils/feature';
 import { filterMarkdownForAgents } from '@utils/llms';
+import { getAbsoluteFilePathForAstroFile } from '@utils/files';
 
 const events = await getCollection('events');
 const agents = await getCollection('agents');
@@ -67,7 +68,8 @@ export const GET: APIRoute = async ({ params, props }) => {
 
   const content = props?.content ?? findContent(params);
   if (content?.filePath) {
-    const file = filterMarkdownForAgents(fs.readFileSync(content.filePath, 'utf8'));
+    const absoluteFilePath = getAbsoluteFilePathForAstroFile(content.filePath);
+    const file = filterMarkdownForAgents(fs.readFileSync(absoluteFilePath, 'utf8'));
     return new Response(file, { status: 200 });
   }
 

package/eventcatalog/src/pages/docs/[type]/[id]/[version].mdx.ts

@@ -8,6 +8,7 @@ import config from '@config';
 import fs from 'fs';
 import { addSchemaToMarkdown, filterMarkdownForAgents } from '@utils/llms';
 import { isLLMSTxtEnabled, isSSR } from '@utils/feature';
+import { getAbsoluteFilePathForAstroFile } from '@utils/files';
 const events = await getCollection('events');
 const agents = await getCollection('agents');
 const commands = await getCollection('commands');
@@ -67,10 +68,11 @@ export const GET: APIRoute = async ({ params, props }) => {
 
   const content = props?.content ?? findContent(params);
   if (content?.filePath) {
-    let file = fs.readFileSync(content.filePath, 'utf8');
+    const absoluteFilePath = getAbsoluteFilePathForAstroFile(content.filePath);
+    let file = fs.readFileSync(absoluteFilePath, 'utf8');
 
     try {
-      file = addSchemaToMarkdown(content, file);
+      file = addSchemaToMarkdown({ ...content, filePath: absoluteFilePath }, file);
     } catch (error) {
       console.log('Warning: Cant find the schema for', content.data.id, content.data.version);
     }

package/eventcatalog/src/utils/file-diffs.ts

@@ -1,8 +1,9 @@
 import { readdir, readFile } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
+import { dirname, isAbsolute, join } from 'node:path';
 import { formatPatch, structuredPatch } from 'diff';
 import { html, parse } from 'diff2html';
 import { getItemsFromCollectionByIdAndSemverOrLatest } from './collections/util';
+import { getAbsoluteFilePathForAstroFile } from './files';
 import type { CollectionEntry } from 'astro:content';
 import type { CollectionTypes } from '@types';
 
@@ -32,7 +33,8 @@ export async function getFilesForDiffInCollection(
   const pathToFolder = collection.filePath;
   if (!pathToFolder) return [];
 
-  const dir = dirname(pathToFolder);
+  const absolutePathToFolder = isAbsolute(pathToFolder) ? pathToFolder : getAbsoluteFilePathForAstroFile(pathToFolder);
+  const dir = dirname(absolutePathToFolder);
   const allFilesInDirectory = await readdir(dir);
 
   return allFilesInDirectory

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "publishConfig": {
     "access": "public"
   },
@@ -116,9 +116,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
-    "@eventcatalog/linter": "1.1.5",
     "@eventcatalog/sdk": "2.26.0",
-    "@eventcatalog/visualiser": "^4.1.0"
+    "@eventcatalog/visualiser": "^4.1.0",
+    "@eventcatalog/linter": "1.1.5"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.9",