@eventcatalog/core 4.11.2 → 4.12.0-beta.2

package/dist/eventcatalog.js

@@ -1,77 +1,72 @@
-import {
-  FederationConflictError,
-  FederationDiagnosticError,
-  federateCatalog
-} from "./chunk-2YJRF4ZX.js";
-import "./chunk-WRNH5C3U.js";
-import "./chunk-5EPNFDT5.js";
-import "./chunk-A2RZR3U4.js";
-import "./chunk-SDZQJTJW.js";
-import "./chunk-352FGP6W.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
-import {
-  watch
-} from "./chunk-KLOHNCNF.js";
 import {
   log_build_default
-} from "./chunk-EGH3ALRY.js";
-import "./chunk-AFPH6ERZ.js";
+} from "./chunk-ZER6HESL.js";
 import "./chunk-ZAZHAVKB.js";
+import {
+  FederationConflictError,
+  FederationDiagnosticError,
+  federateCatalog
+} from "./chunk-RYPZGCRN.js";
+import "./chunk-WRNH5C3U.js";
+import "./chunk-5EPNFDT5.js";
+import "./chunk-A2RZR3U4.js";
 import "./chunk-R7Z5ALYI.js";
 import {
   getFederationDiagnosticCounts,
   getVisibleFederationDiagnostics
 } from "./chunk-JJPB6EOZ.js";
 import "./chunk-FV56YFM4.js";
+import "./chunk-SDZQJTJW.js";
+import "./chunk-352FGP6W.js";
 import {
   getProjectOutDir,
   isAuthEnabled,
   isIndexedSearchEnabled,
   isOutputServer
-} from "./chunk-B7HCX5HM.js";
+} from "./chunk-3SJDIENM.js";
 import {
   generate
-} from "./chunk-Z6OKCHWL.js";
+} from "./chunk-C326DCDM.js";
 import {
   logger
-} from "./chunk-XMRPNDXB.js";
+} from "./chunk-FZEJ62MJ.js";
 import {
   resolve_catalog_dependencies_default
-} from "./chunk-LHR4G2UO.js";
+} from "./chunk-EEZXGNF6.js";
 import {
   buildSearchIndex
-} from "./chunk-6U72KINX.js";
+} from "./chunk-DJCOJ77J.js";
 import {
   getEventCatalogUpdateMessage,
   resolveInstalledCoreVersion
 } from "./chunk-FWXEV4LF.js";
+import {
+  watch
+} from "./chunk-U63GDPPY.js";
+import "./chunk-TI3Y63NZ.js";
+import {
+  getAstroConfigPath
+} from "./chunk-VIJJ7JKH.js";
 import {
   createAstroDevLineFilter,
   createAstroLineFilter
 } from "./chunk-634NFV5U.js";
 import {
-  catalogToAstro
-} from "./chunk-T4RVWPIQ.js";
-import "./chunk-W5JQON7Z.js";
+  clearCatalogCache,
+  getRuntimePaths,
+  prepareCatalogRuntime
+} from "./chunk-SAN4U2WU.js";
 import {
   VERSION
-} from "./chunk-LAWEGSJH.js";
-import {
-  pruneExcludedCoreEntries,
-  shouldCopyCoreEntry
-} from "./chunk-DHH5U5PF.js";
-import {
-  linkCoreNodeModules,
-  resolveInstalledCoreNodeModules
-} from "./chunk-BWN544LB.js";
-import "./chunk-T5IUG523.js";
+} from "./chunk-SETCQKS3.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile
-} from "./chunk-6QENHZZP.js";
+} from "./chunk-JE6RX7SJ.js";
 
 // src/eventcatalog.ts
 import { Command } from "commander";
@@ -81,6 +76,7 @@ import http from "http";
 import fs3 from "fs";
 import path2 from "path";
 import { fileURLToPath } from "url";
+import { createRequire } from "module";
 import boxen from "boxen";
 import updateNotifier from "update-notifier";
 import dotenv from "dotenv";
@@ -549,8 +545,8 @@ function detectFormat(fileName) {
 async function buildFieldsIndex(catalogDir, outputDir) {
   const sdkModule = await import("@eventcatalog/sdk");
   const sdk = sdkModule.default(catalogDir);
-  const dbDir = path.join(outputDir || catalogDir, ".eventcatalog");
-  const dbPath = path.join(dbDir, "fields.db");
+  const { fieldsDatabasePath: dbPath } = getRuntimePaths(catalogDir, outputDir || catalogDir);
+  const dbDir = path.dirname(dbPath);
   if (!fs2.existsSync(dbDir)) {
     fs2.mkdirSync(dbDir, { recursive: true });
   }
@@ -637,10 +633,12 @@ async function buildFieldsIndex(catalogDir, outputDir) {
 // src/eventcatalog.ts
 import { isEventCatalogStarterEnabled, isEventCatalogScaleEnabled, isFeatureEnabled } from "@eventcatalog/license";
 var currentDir = path2.dirname(fileURLToPath(import.meta.url));
+var astroCli = path2.join(path2.dirname(createRequire(import.meta.url).resolve("astro/package.json")), "bin/astro.mjs");
 var program = new Command().version(VERSION);
 var dir = path2.resolve(process.env.PROJECT_DIR || process.cwd());
-var core = path2.resolve(process.env.CATALOG_DIR || join(dir, ".eventcatalog-core"));
 var eventCatalogDir = path2.resolve(join(currentDir, "../eventcatalog/"));
+var astroConfigPath = () => getAstroConfigPath(dir, join(eventCatalogDir, "astro.config.mjs"));
+var { runtimeDirectory: core } = getRuntimePaths(dir);
 var getInstalledEventCatalogVersion = () => {
   try {
     const pkg = fs3.readFileSync(join(dir, "package.json"), "utf8");
@@ -766,19 +764,19 @@ var replaceAstroReadyVersionLine = (line) => {
 };
 var runCommandWithFilteredOutput = async ({
   command,
+  args = [],
   cwd,
   env,
   shouldFilterLine,
   transformLine = (line) => line
 }) => {
   await new Promise((resolve, reject) => {
-    const child = spawn(command, {
+    const child = spawn(command, args, {
       cwd,
       env: {
         ...process.env,
         ...env
       },
-      shell: true,
       stdio: ["inherit", "pipe", "pipe"]
     });
     let stdoutBuffer = "";
@@ -817,26 +815,17 @@ var runCommandWithFilteredOutput = async ({
         resolve();
         return;
       }
-      reject(new Error(`Command failed with exit code ${code}: ${command}`));
+      reject(new Error(`Command failed with exit code ${code}: ${command} ${args.join(" ")}`));
     });
   });
 };
-var copyCore = () => {
-  ensureDir(core);
-  if (eventCatalogDir === core) {
-    return;
-  }
-  fs3.cpSync(eventCatalogDir, core, {
-    recursive: true,
-    filter: (src) => shouldCopyCoreEntry(eventCatalogDir, src)
-  });
-  pruneExcludedCoreEntries(core);
-  const coreNodeModules = path2.join(core, "node_modules");
-  const installedCoreNodeModules = resolveInstalledCoreNodeModules(currentDir);
-  linkCoreNodeModules({ coreNodeModules, installedCoreNodeModules });
-};
+var prepareCore = () => prepareCatalogRuntime({
+  projectDirectory: dir,
+  catalogDirectory: core,
+  packageDirectory: eventCatalogDir
+});
 var clearCore = () => {
-  if (fs3.existsSync(core)) fs3.rmSync(core, { recursive: true });
+  clearCatalogCache(dir);
 };
 var checkForUpdate = () => {
   const declaredVersion = getInstalledEventCatalogVersion();
@@ -886,7 +875,7 @@ Upgrade now: npm i @eventcatalog/core@beta`;
     );
   }
 };
-program.command("dev").description("Run development server of EventCatalog").option("-d, --debug", "Output EventCatalog application information into your terminal").option("--force-recreate", "Recreate the eventcatalog-core directory", false).option("--no-prewarm", "Disable automatic dev prewarm request").action(async (options, command) => {
+program.command("dev").description("Run development server of EventCatalog").option("-d, --debug", "Output EventCatalog application information into your terminal").option("--force-recreate", "Clear and regenerate the entire .astro cache, including content and metadata", false).option("--no-prewarm", "Disable automatic dev prewarm request").action(async (options, command) => {
   logger.welcome();
   logger.info("Setting up EventCatalog...", "eventcatalog");
   const isServer = await isOutputServer();
@@ -901,10 +890,9 @@ program.command("dev").description("Run development server of EventCatalog").opt
   }
   if (options.forceRecreate) clearCore();
   await verifyRequiredFieldsAreInCatalogConfigFile(dir);
-  copyCore();
+  prepareCore();
   await resolve_catalog_dependencies_default(dir, core);
   await runMigrations(dir);
-  await catalogToAstro(dir, core);
   const config = await getEventCatalogConfigFile(dir);
   const canEmbedPages = await isFeatureEnabled(
     "@eventcatalog/backstage-plugin-eventcatalog",
@@ -940,8 +928,9 @@ program.command("dev").description("Run development server of EventCatalog").opt
   checkForUpdate();
   let watchUnsub;
   try {
-    watchUnsub = await watch(dir, core, shouldBuildIndexedSearch ? createDevSearchIndexWatcher({ config }) : void 0);
-    const args = command.args.join(" ").trim();
+    if (shouldBuildIndexedSearch) {
+      watchUnsub = await watch(dir, core, createDevSearchIndexWatcher({ config }));
+    }
     if (options.prewarm) {
       const prewarmPort = await resolveDevPort({
         projectDir: dir
@@ -952,8 +941,9 @@ program.command("dev").description("Run development server of EventCatalog").opt
       });
     }
     await runCommandWithFilteredOutput({
-      command: `npx astro dev ${args}`,
-      cwd: core,
+      command: process.execPath,
+      args: [astroCli, "dev", "--config", astroConfigPath(), ...command.args],
+      cwd: dir,
       env: {
         PROJECT_DIR: dir,
         CATALOG_DIR: core,
@@ -982,7 +972,7 @@ program.command("build").description("Run build of EventCatalog").action(async (
     dotenv.config({ path: path2.join(dir, ".env") });
   }
   await verifyRequiredFieldsAreInCatalogConfigFile(dir);
-  copyCore();
+  prepareCore();
   const isBackstagePluginEnabled = await isFeatureEnabled(
     "@eventcatalog/backstage-plugin-eventcatalog",
     process.env.EVENTCATALOG_LICENSE_KEY_BACKSTAGE
@@ -998,7 +988,6 @@ program.command("build").description("Run build of EventCatalog").action(async (
   });
   await resolve_catalog_dependencies_default(dir, core);
   await runMigrations(dir);
-  await catalogToAstro(dir, core);
   if (isServer) {
     try {
       logger.info("Building fields index...", "fields");
@@ -1013,10 +1002,10 @@ program.command("build").description("Run build of EventCatalog").action(async (
     }
   }
   checkForUpdate();
-  const args = command.args.join(" ").trim();
   await runCommandWithFilteredOutput({
-    command: `npx astro build ${args}`,
-    cwd: core,
+    command: process.execPath,
+    args: [astroCli, "build", "--config", astroConfigPath(), ...command.args],
+    cwd: dir,
     env: {
       PROJECT_DIR: dir,
       CATALOG_DIR: core,
@@ -1048,8 +1037,9 @@ var previewCatalog = async ({
   isEventCatalogScale = false
 }) => {
   await runCommandWithFilteredOutput({
-    command: `npx astro preview ${command.args.join(" ").trim()}`,
-    cwd: core,
+    command: process.execPath,
+    args: [astroCli, "preview", "--config", astroConfigPath(), ...command.args],
+    cwd: dir,
     env: {
       PROJECT_DIR: dir,
       CATALOG_DIR: core,
@@ -1067,8 +1057,9 @@ var startServerCatalog = async ({
 }) => {
   const serverEntryPath = path2.join(dir, "dist", "server", "entry.mjs");
   await runCommandWithFilteredOutput({
-    command: `node "${serverEntryPath}"`,
-    cwd: core,
+    command: process.execPath,
+    args: [serverEntryPath],
+    cwd: dir,
     env: {
       PROJECT_DIR: dir,
       CATALOG_DIR: core,

package/dist/features.cjs

@@ -38,13 +38,17 @@ __export(features_exports, {
 module.exports = __toCommonJS(features_exports);
 
 // src/eventcatalog-config-file-utils.js
+var import_promises2 = require("fs/promises");
+var import_node_path2 = __toESM(require("path"), 1);
+var import_uuid = require("uuid");
+var import_gray_matter = __toESM(require("gray-matter"), 1);
+
+// eventcatalog/integrations/config-loader.mjs
 var import_promises = require("fs/promises");
 var import_node_fs = require("fs");
 var import_node_path = __toESM(require("path"), 1);
-var import_uuid = require("uuid");
-var import_url = require("url");
+var import_node_url = require("url");
 var import_node_os = require("os");
-var import_gray_matter = __toESM(require("gray-matter"), 1);
 async function cleanup(projectDirectory) {
   const filePath = import_node_path.default.join(projectDirectory, "eventcatalog.config.mjs");
   if ((0, import_node_fs.existsSync)(filePath)) {
@@ -92,7 +96,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
       configFilePath = import_node_path.default.join(tempDir, "eventcatalog.config.mjs");
       await (0, import_promises.copyFile)(import_node_path.default.join(projectDirectory, "eventcatalog.config.js"), configFilePath);
     }
-    const configFileURL = `${(0, import_url.pathToFileURL)(configFilePath).href}?t=${Date.now()}`;
+    const configFileURL = `${(0, import_node_url.pathToFileURL)(configFilePath).href}?t=${Date.now()}`;
     const config = await import(
       /* @vite-ignore */
       configFileURL
@@ -107,7 +111,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 };
 
 // src/features.ts
-var import_node_path2 = require("path");
+var import_node_path3 = require("path");
 var import_node_fs2 = __toESM(require("fs"), 1);
 var getProjectOutDir = async () => {
   const config = await getEventCatalogConfigFile(process.env.PROJECT_DIR || "");
@@ -123,7 +127,7 @@ var isIndexedSearchEnabled = async () => {
 };
 var isAuthEnabled = async () => {
   const directory = process.env.PROJECT_DIR || process.cwd();
-  const hasAuthConfig = import_node_fs2.default.existsSync((0, import_node_path2.join)(directory, "eventcatalog.auth.js"));
+  const hasAuthConfig = import_node_fs2.default.existsSync((0, import_node_path3.join)(directory, "eventcatalog.auth.js"));
   return hasAuthConfig;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features.js

@@ -3,8 +3,8 @@ import {
   isAuthEnabled,
   isIndexedSearchEnabled,
   isOutputServer
-} from "./chunk-B7HCX5HM.js";
-import "./chunk-6QENHZZP.js";
+} from "./chunk-3SJDIENM.js";
+import "./chunk-JE6RX7SJ.js";
 export {
   getProjectOutDir,
   isAuthEnabled,