@eventcatalog/core 5.0.0-beta.26 → 5.0.0-beta.28

package/eventcatalog/integrations/config-loader.mjs

@@ -1,8 +1,8 @@
-import { readFile, rm, copyFile, mkdtemp, symlink } from 'node:fs/promises';
+import { readFile, rm } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { tmpdir } from 'node:os';
+import { register } from 'node:module';
 
 export async function cleanup(projectDirectory) {
   const filePath = path.join(projectDirectory, 'eventcatalog.config.mjs');
@@ -11,75 +11,73 @@ export async function cleanup(projectDirectory) {
   }
 }
 
-const findNodeModulesDirectory = (directory) => {
-  let currentDirectory = directory;
-
-  while (true) {
-    const nodeModulesDirectory = path.join(currentDirectory, 'node_modules');
-
-    if (existsSync(nodeModulesDirectory)) {
-      return nodeModulesDirectory;
-    }
-
-    const parentDirectory = path.dirname(currentDirectory);
-
-    if (parentDirectory === currentDirectory) {
-      return undefined;
-    }
-
-    currentDirectory = parentDirectory;
-  }
+let hidesConfigModuleTypeWarning = false;
+let loads = 0;
+
+/**
+ * Node loads an eventcatalog.config.js that uses import/export as an ES module even when the catalog's
+ * package.json has no "type": "module" (a new catalog's doesn't), and warns that it had to detect it.
+ * That warning, for the config file only, is hidden: the catalog doesn't need to change anything.
+ */
+const hideConfigModuleTypeWarning = () => {
+  if (hidesConfigModuleTypeWarning) return;
+  hidesConfigModuleTypeWarning = true;
+
+  const emitWarning = process.emitWarning;
+  process.emitWarning = function (warning, ...args) {
+    const code = typeof args[0] === 'object' ? args[0]?.code : args[1];
+    const message = typeof warning === 'string' ? warning : warning?.message;
+    if (code === 'MODULE_TYPELESS_PACKAGE_JSON' && message?.includes('eventcatalog.config.js')) return;
+    return emitWarning.call(this, warning, ...args);
+  };
 };
 
-const linkNodeModulesIntoTempDirectory = async ({ projectDirectory, tempDir }) => {
-  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
-
-  if (!nodeModulesDirectory) {
-    return;
-  }
-
-  await symlink(nodeModulesDirectory, path.join(tempDir, 'node_modules'), 'dir');
+// Marks a config URL Node should load as an ES module, whatever the catalog's package.json says
+const AS_MODULE_QUERY = 'eventcatalog-config-as-module';
+let loadsMarkedConfigsAsModules = false;
+
+/**
+ * Node won't load a config written with import/export in a catalog whose package.json has
+ * "type": "commonjs". A loader hook loads that config file (and only it) as an ES module.
+ */
+const loadMarkedConfigsAsModules = () => {
+  if (loadsMarkedConfigsAsModules) return;
+  loadsMarkedConfigsAsModules = true;
+  const hook = `export async function load(url, context, nextLoad) {
+    return nextLoad(url, url.includes('${AS_MODULE_QUERY}=') ? { ...context, format: 'module' } : context);
+  }`;
+  register(`data:text/javascript,${encodeURIComponent(hook)}`);
 };
 
-const createTemporaryConfigDirectory = async (projectDirectory) => {
-  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
-
-  if (nodeModulesDirectory) {
-    return mkdtemp(path.join(nodeModulesDirectory, '.eventcatalog-config-'));
+/**
+ * Loads the catalog's eventcatalog.config.js from where it is, so paths it builds from its own location
+ * (`import.meta.url`, `import.meta.dirname`) and its relative imports point into the catalog. It was
+ * loaded from a copy in a temporary folder before, which broke them (e.g. the paths to a generator's specs).
+ */
+const isCommonJSPackage = async (projectDirectory) => {
+  try {
+    const packageJson = JSON.parse(await readFile(path.join(projectDirectory, 'package.json'), 'utf-8'));
+    return packageJson?.type === 'commonjs';
+  } catch {
+    return false;
   }
-
-  const tempDir = await mkdtemp(path.join(tmpdir(), 'eventcatalog-config-'));
-  await linkNodeModulesIntoTempDirectory({ projectDirectory, tempDir });
-  return tempDir;
 };
 
 export const getEventCatalogConfigFile = async (projectDirectory) => {
-  let tempDir;
-
   try {
-    let configFilePath = path.join(projectDirectory, 'eventcatalog.config.js');
-
-    const filePath = path.join(projectDirectory, 'package.json');
-    const packageJson = JSON.parse(await readFile(filePath, 'utf-8'));
+    hideConfigModuleTypeWarning();
+    // A catalog's config is an ES module, as it always was (with "type": "commonjs" it was loaded from an .mjs copy)
+    const asModule = await isCommonJSPackage(projectDirectory);
+    if (asModule) loadMarkedConfigsAsModules();
 
-    if (packageJson?.type !== 'module') {
-      // Importing CommonJS config via ESM import requires an .mjs file.
-      // Keep this temp copy outside the project directory so Astro/Vite
-      // file watchers do not trigger a dev-server restart during startup.
-      tempDir = await createTemporaryConfigDirectory(projectDirectory);
-      configFilePath = path.join(tempDir, 'eventcatalog.config.mjs');
-      await copyFile(path.join(projectDirectory, 'eventcatalog.config.js'), configFilePath);
-    }
-
-    const configFileURL = `${pathToFileURL(configFilePath).href}?t=${Date.now()}`;
-    const config = await import(/* @vite-ignore */ configFileURL);
+    const configFileURL = pathToFileURL(path.join(projectDirectory, 'eventcatalog.config.js')).href;
+    // A new URL each time, so a changed config is loaded again (not `?t=`: Vite drops it as its own timestamp)
+    const query = `${asModule ? AS_MODULE_QUERY : 'loaded'}=${Date.now()}-${loads++}`;
+    const config = await import(/* @vite-ignore */ `${configFileURL}?${query}`);
 
     return config.default;
   } finally {
+    // Earlier versions loaded a copy from eventcatalog.config.mjs in the catalog: remove one left behind
     await cleanup(projectDirectory);
-
-    if (tempDir) {
-      await rm(tempDir, { recursive: true, force: true });
-    }
   }
 };

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "BUSL-1.1",
   "type": "module",
-  "version": "5.0.0-beta.26",
+  "version": "5.0.0-beta.28",
   "publishConfig": {
     "access": "public"
   },
@@ -142,8 +142,8 @@
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
     "@eventcatalog/linter": "1.2.0-beta.4",
-    "@eventcatalog/visualiser": "^5.0.0-beta.6",
-    "@eventcatalog/sdk": "2.30.0-beta.1"
+    "@eventcatalog/sdk": "2.30.0-beta.1",
+    "@eventcatalog/visualiser": "^5.0.0-beta.6"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",

package/dist/{chunk-A2RZR3U4.js → chunk-6K7XZAYI.js}

@@ -1,9 +1,9 @@
-import {
-  createFileSystemSourceProvider
-} from "./chunk-SDZQJTJW.js";
 import {
   createGitHubSourceProvider
 } from "./chunk-352FGP6W.js";
+import {
+  createFileSystemSourceProvider
+} from "./chunk-SDZQJTJW.js";
 
 // src/federation/source-provider.ts
 var createFederationSourceProvider = (projectDirectory, providers = {}) => {