@eventcatalog/core 5.0.0-beta.8 → 5.0.0

package/dist/{chunk-RFIXKATC.js → chunk-4G7FSRPN.js}

@@ -5,69 +5,62 @@ import { v4 as uuidV4 } from "uuid";
 import matter from "gray-matter";
 
 // eventcatalog/integrations/config-loader.mjs
-import { readFile, rm, copyFile, mkdtemp, symlink } from "fs/promises";
+import { readFile, rm } from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
 import { pathToFileURL } from "url";
-import { tmpdir } from "os";
+import { register } from "module";
 async function cleanup(projectDirectory) {
   const filePath = path.join(projectDirectory, "eventcatalog.config.mjs");
   if (existsSync(filePath)) {
     await rm(filePath);
   }
 }
-var 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 void 0;
-    }
-    currentDirectory = parentDirectory;
-  }
+var hidesConfigModuleTypeWarning = false;
+var loads = 0;
+var 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);
+  };
 };
-var linkNodeModulesIntoTempDirectory = async ({ projectDirectory, tempDir }) => {
-  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
-  if (!nodeModulesDirectory) {
-    return;
-  }
-  await symlink(nodeModulesDirectory, path.join(tempDir, "node_modules"), "dir");
+var AS_MODULE_QUERY = "eventcatalog-config-as-module";
+var loadsMarkedConfigsAsModules = false;
+var 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)}`);
 };
-var createTemporaryConfigDirectory = async (projectDirectory) => {
-  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
-  if (nodeModulesDirectory) {
-    return mkdtemp(path.join(nodeModulesDirectory, ".eventcatalog-config-"));
+var 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;
 };
 var 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"));
-    if (packageJson?.type !== "module") {
-      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()}`;
+    hideConfigModuleTypeWarning();
+    const asModule = await isCommonJSPackage(projectDirectory);
+    if (asModule) loadMarkedConfigsAsModules();
+    const configFileURL = pathToFileURL(path.join(projectDirectory, "eventcatalog.config.js")).href;
+    const query = `${asModule ? AS_MODULE_QUERY : "loaded"}=${Date.now()}-${loads++}`;
     const config = await import(
       /* @vite-ignore */
-      configFileURL
+      `${configFileURL}?${query}`
     );
     return config.default;
   } finally {
     await cleanup(projectDirectory);
-    if (tempDir) {
-      await rm(tempDir, { recursive: true, force: true });
-    }
   }
 };
 

package/dist/{chunk-AWOO63ME.js → chunk-AD7CL772.js}

@@ -7,6 +7,9 @@ import { isEventCatalogScaleEnabled, isEventCatalogStarterEnabled } from "@event
 var TRIAL_LENGTH_DAYS = 60;
 var LICENSE_FAQ_URL = "https://www.eventcatalog.dev/license-faq";
 var LICENSE_RENEW_URL = "https://eventcatalog.cloud";
+var BUY_BUSINESS_URL = "https://www.eventcatalog.dev/buy?source=cli";
+var PRICING_URL = "https://www.eventcatalog.dev/pricing";
+var FREE_USE_NOTE = "Under $10M revenue and $10M raised, an individual or an open-source project? You qualify for Free Use; get a free key at eventcatalog.cloud.";
 var DAY_IN_MS = 24 * 60 * 60 * 1e3;
 var getTrialStatus = (tsd, now = Date.now()) => {
   if (typeof tsd !== "number" || !Number.isFinite(tsd) || tsd <= 0) return;
@@ -125,15 +128,17 @@ var formatDate = (date) => date.toLocaleDateString(void 0, { dateStyle: "medium"
 var formatDays = (days) => `${days} ${days === 1 ? "day" : "days"}`;
 var PLAIN = { bold: (text) => text, dim: (text) => text, link: (text) => text };
 var COLOURS = { bold: pc.bold, dim: pc.dim, link: (text) => pc.cyan(text) };
-var render = ({ headline, rows, links }, colours) => {
+var render = ({ headline, rows, links, note }, colours) => {
   const width = Math.max(0, ...[...rows, ...links].map(([label]) => label.length));
   const row = ([label, value]) => `${colours.dim(label.padEnd(width))}  ${value}`;
   return [
     colours.bold(headline),
     ...rows.length ? ["", ...rows.map(row)] : [],
-    ...links.length ? ["", ...links.map(([label, url]) => row([label, colours.link(url)]))] : []
+    ...links.length ? ["", ...links.map(([label, url]) => row([label, colours.link(url)]))] : [],
+    ...note?.length ? ["", ...note.map(colours.dim)] : []
   ].join("\n");
 };
+var FREE_USE_LINES = FREE_USE_NOTE.split(/(?<=\?) /);
 var message = (content) => ({
   ...content,
   text: render(content, PLAIN)
@@ -180,7 +185,8 @@ var getLicenseStatusMessage = (license, tsd, now = Date.now()) => {
       color: trial.ended ? "yellow" : "green",
       headline: trial.ended ? "Your EventCatalog trial has ended" : `You're on the ${TRIAL_LENGTH_DAYS}-day EventCatalog trial`,
       rows: trialRows,
-      links: trial.ended ? [["Get a license", LICENSE_RENEW_URL], licensing] : [licensing]
+      links: trial.ended ? [["Get a license", LICENSE_RENEW_URL], ["Buy Business", BUY_BUSINESS_URL], licensing] : [["Buy a license", PRICING_URL], licensing],
+      note: trial.ended ? FREE_USE_LINES : void 0
     });
   }
   if (license.state === "expired") {
@@ -194,7 +200,8 @@ var getLicenseStatusMessage = (license, tsd, now = Date.now()) => {
       title: "EventCatalog license",
       color: "yellow",
       headline: "Your commercial license has expired",
-      rows: [...licensedTo, ...expiredOn, ...trialRows],
+      // A catalog has a license or is on the trial: an expired license is renewed, not replaced by the trial
+      rows: [...licensedTo, ...expiredOn],
       links: [renew, licensing]
     });
   }

package/dist/chunk-CA6WCQ2T.js

@@ -0,0 +1,54 @@
+// src/analytics/studio-usage.js
+import fs from "fs";
+import path from "path";
+var DAY_IN_MS = 24 * 60 * 60 * 1e3;
+var DEFAULT_DATABASE_PATH = ".eventcatalog/eventcatalog.db";
+var getStudioMode = (configFile) => {
+  const enabled = configFile.studio?.enabled;
+  if (enabled === false) return "off";
+  return configFile.output === "server" && enabled === true ? "server" : "dev";
+};
+var getStorageType = (configFile) => configFile.storage?.type || "memory";
+var loadSqlite = () => {
+  const emitWarning = process.emitWarning;
+  process.emitWarning = function(warning, ...args) {
+    const type = typeof args[0] === "object" ? args[0]?.type : args[0];
+    const message = typeof warning === "string" ? warning : warning?.message;
+    if (type === "ExperimentalWarning" && message?.startsWith("SQLite")) return;
+    return emitWarning.call(this, warning, ...args);
+  };
+  try {
+    return process.getBuiltinModule?.("node:sqlite");
+  } catch {
+    return void 0;
+  } finally {
+    process.emitWarning = emitWarning;
+  }
+};
+var UNKNOWN = "canvases:unknown";
+var serializeStudioUsage = (projectDirectory, configFile, now = Date.now()) => {
+  if (getStudioMode(configFile) === "off" || getStorageType(configFile) !== "sqlite") return UNKNOWN;
+  const file = path.resolve(projectDirectory, configFile.storage.path ?? DEFAULT_DATABASE_PATH);
+  if (!fs.existsSync(file)) return "canvases:0,changed7d:0,changed30d:0,deleted:0";
+  let database;
+  try {
+    const sqlite = loadSqlite();
+    if (!sqlite?.DatabaseSync) return UNKNOWN;
+    database = new sqlite.DatabaseSync(file, { readOnly: true });
+    const canvases = database.prepare(
+      "SELECT COUNT(*) AS total, SUM(updated_at >= ?) AS changed7d, SUM(updated_at >= ?) AS changed30d FROM studio_canvases"
+    ).get(now - 7 * DAY_IN_MS, now - 30 * DAY_IN_MS);
+    const { deleted } = database.prepare("SELECT COUNT(*) AS deleted FROM studio_deleted_canvases").get();
+    return `canvases:${canvases.total},changed7d:${canvases.changed7d ?? 0},changed30d:${canvases.changed30d ?? 0},deleted:${deleted}`;
+  } catch {
+    return UNKNOWN;
+  } finally {
+    database?.close();
+  }
+};
+
+export {
+  getStudioMode,
+  getStorageType,
+  serializeStudioUsage
+};

package/dist/chunk-CPW6G62V.js

@@ -0,0 +1,17 @@
+// src/analytics/telemetry.ts
+var TELEMETRY_REQUEST_TIMEOUT_MS = 2e3;
+var isOptOutEnvValue = (value) => {
+  if (typeof value !== "string") return false;
+  const normalized = value.trim().toLowerCase();
+  return normalized === "1" || normalized === "true";
+};
+var isTelemetryDisabled = (config, env) => {
+  if (isOptOutEnvValue(env.EVENTCATALOG_TELEMETRY_DISABLED)) return true;
+  if (isOptOutEnvValue(env.DO_NOT_TRACK)) return true;
+  return config?.telemetry === false;
+};
+
+export {
+  TELEMETRY_REQUEST_TIMEOUT_MS,
+  isTelemetryDisabled
+};

package/dist/{chunk-PU25TOOJ.js → chunk-JZN4RSMF.js}

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

package/dist/{chunk-4W55ZOOS.js → chunk-NEAVAFSJ.js}

@@ -1,18 +1,27 @@
 import {
   getLicenseAnalytics
-} from "./chunk-AWOO63ME.js";
+} from "./chunk-AD7CL772.js";
 import {
   countResources,
   hashCatalogContent,
   serializeCounts
 } from "./chunk-ZAZHAVKB.js";
+import {
+  getStorageType,
+  getStudioMode,
+  serializeStudioUsage
+} from "./chunk-CA6WCQ2T.js";
 import {
   raiseEvent
-} from "./chunk-C6T2AAFR.js";
+} from "./chunk-NIVST4WY.js";
+import {
+  TELEMETRY_REQUEST_TIMEOUT_MS,
+  isTelemetryDisabled
+} from "./chunk-CPW6G62V.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile
-} from "./chunk-RFIXKATC.js";
+} from "./chunk-4G7FSRPN.js";
 
 // src/analytics/log-build.js
 var isMCPEnabled = (configFile) => configFile.output === "server" && (configFile.mcp?.enabled ?? true);
@@ -27,7 +36,9 @@ var getFeatures = async (configFile) => {
     environments: Array.isArray(configFile.environments) && configFile.environments.length > 0,
     output: configFile.output || "static",
     mcp,
-    mcpAuth: mcp && (configFile.mcp?.auth?.enabled ?? false)
+    mcpAuth: mcp && (configFile.mcp?.auth?.enabled ?? false),
+    studio: getStudioMode(configFile),
+    storage: getStorageType(configFile)
   };
 };
 var getDirectoryProvider = (source) => {
@@ -69,50 +80,70 @@ var toCloudResourceCounts = (counts) => ({
   customPages: counts.customPages || 0,
   customApis: counts.customApis || 0
 });
-var reportCloudResourceInventory = async (configFile, resourceCounts) => {
+var getEnabledCloudAnalytics = (configFile) => {
   const analytics = configFile.cloud?.analytics;
-  if (!analytics?.enabled || !analytics.trackingId || !analytics.writeKey) return;
+  if (!analytics?.enabled || !analytics.trackingId || !analytics.writeKey) return null;
+  return analytics;
+};
+var reportCloudResourceInventory = async (configFile, resourceCounts) => {
+  const analytics = getEnabledCloudAnalytics(configFile);
+  if (!analytics) return;
   const endpoint = analytics.endpoint || CLOUD_ANALYTICS_ENDPOINT;
-  await fetch(endpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "X-EventCatalog-Analytics-Key": analytics.writeKey
-    },
-    body: JSON.stringify({
-      trackingId: analytics.trackingId,
-      event: "catalog.resource_inventory_reported",
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      counts: toCloudResourceCounts(resourceCounts)
-    })
-  });
+  try {
+    await fetch(endpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-EventCatalog-Analytics-Key": analytics.writeKey
+      },
+      body: JSON.stringify({
+        trackingId: analytics.trackingId,
+        event: "catalog.resource_inventory_reported",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        counts: toCloudResourceCounts(resourceCounts)
+      }),
+      signal: AbortSignal.timeout(TELEMETRY_REQUEST_TIMEOUT_MS)
+    });
+  } catch {
+  }
 };
 var main = async (projectDir, { command = "build", license } = {}) => {
   try {
     await verifyRequiredFieldsAreInCatalogConfigFile(projectDir);
     const configFile = await getEventCatalogConfigFile(projectDir);
+    if (isTelemetryDisabled(configFile, process.env)) {
+      if (getEnabledCloudAnalytics(configFile)) {
+        const resourceCounts2 = await countResources(projectDir);
+        await reportCloudResourceInventory(configFile, resourceCounts2);
+      }
+      return;
+    }
     const { cId, tsd, organizationName, generators = [] } = configFile;
     const generatorNames = generators.length > 0 ? generators.map((generator) => generator[0]) : ["none"];
     const features = await getFeatures(configFile);
     const resourceCounts = await countResources(projectDir);
     const contentHash = await hashCatalogContent(projectDir);
     await reportCloudResourceInventory(configFile, resourceCounts);
-    await raiseEvent({
-      command,
-      org: organizationName,
-      cId,
-      // Trial start date (unix ms) from eventcatalog.config.js
-      tsd,
-      // Commercial license or trial, and when each expires (unix ms)
-      ...getLicenseAnalytics(license, tsd),
-      // CI redeploys and human-run builds are different signals; tag rather than suppress
-      ci: process.env.CI ? "true" : "false",
-      contentHash,
-      generators: generatorNames.toString(),
-      features: Object.keys(features).map((feature) => `${feature}:${features[feature]}`).join(","),
-      directorySources: serializeDirectorySources(configFile),
-      resources: serializeCounts(resourceCounts)
-    });
+    await raiseEvent(
+      {
+        command,
+        org: organizationName,
+        cId,
+        // Trial start date (unix ms) from eventcatalog.config.js
+        tsd,
+        // Commercial license or trial, and when each expires (unix ms)
+        ...getLicenseAnalytics(license, tsd),
+        // CI redeploys and human-run builds are different signals; tag rather than suppress
+        ci: process.env.CI ? "true" : "false",
+        contentHash,
+        generators: generatorNames.toString(),
+        features: Object.keys(features).map((feature) => `${feature}:${features[feature]}`).join(","),
+        directorySources: serializeDirectorySources(configFile),
+        resources: serializeCounts(resourceCounts),
+        studio: serializeStudioUsage(projectDir, configFile)
+      },
+      configFile
+    );
   } catch (error) {
   }
 };

package/dist/{chunk-C6T2AAFR.js → chunk-NIVST4WY.js}

@@ -1,10 +1,15 @@
+import {
+  TELEMETRY_REQUEST_TIMEOUT_MS,
+  isTelemetryDisabled
+} from "./chunk-CPW6G62V.js";
 import {
   VERSION
-} from "./chunk-RDIZJ7UT.js";
+} from "./chunk-RE7UTPWH.js";
 
 // src/analytics/analytics.js
 import os from "os";
-async function raiseEvent(eventData) {
+async function raiseEvent(eventData, config) {
+  if (isTelemetryDisabled(config, process.env)) return;
   if (typeof eventData?.command !== "string" || typeof eventData?.cId !== "string") return;
   const url = "https://queue.simpleanalyticscdn.com/events";
   const userAgent = `@eventcatalog/eventcatalog@${VERSION} (${os.platform()}; ${os.arch()}; Node/${process.version})`;
@@ -26,7 +31,8 @@ async function raiseEvent(eventData) {
     const response = await fetch(url, {
       method: "POST",
       headers,
-      body: JSON.stringify(payload)
+      body: JSON.stringify(payload),
+      signal: AbortSignal.timeout(TELEMETRY_REQUEST_TIMEOUT_MS)
     });
     if (!response.ok) {
       throw new Error(`Failed to raise analytics event: ${response.status}`);

package/dist/{chunk-ENAG6UH7.js → chunk-NKNOXQ62.js}

@@ -1,6 +1,6 @@
 import {
   getEventCatalogConfigFile
-} from "./chunk-RFIXKATC.js";
+} from "./chunk-4G7FSRPN.js";
 
 // src/features.ts
 import { join } from "path";
@@ -13,10 +13,6 @@ var isOutputServer = async () => {
   const config = await getEventCatalogConfigFile(process.env.PROJECT_DIR || "");
   return config?.output === "server";
 };
-var isStudioEnabled = async () => {
-  const config = await getEventCatalogConfigFile(process.env.PROJECT_DIR || "");
-  return config?.output === "server" && config?.studio?.enabled === true;
-};
 var isIndexedSearchEnabled = async () => {
   const config = await getEventCatalogConfigFile(process.env.PROJECT_DIR || "");
   return config?.search?.type === "indexed";
@@ -30,7 +26,6 @@ var isAuthEnabled = async () => {
 export {
   getProjectOutDir,
   isOutputServer,
-  isStudioEnabled,
   isIndexedSearchEnabled,
   isAuthEnabled
 };

package/dist/{chunk-AYNZXUB5.js → chunk-OX6TSVHY.js}

@@ -1,9 +1,12 @@
+import {
+  withFederationOutputTransaction
+} from "./chunk-WRNH5C3U.js";
 import {
   composePublicAssets
 } from "./chunk-5EPNFDT5.js";
 import {
   createFederationSourceProvider
-} from "./chunk-A2RZR3U4.js";
+} from "./chunk-6K7XZAYI.js";
 import {
   createFederationContentCache
 } from "./chunk-R7Z5ALYI.js";
@@ -11,12 +14,9 @@ import {
   getFederationDiagnostics,
   resolveFederationRules
 } from "./chunk-JJPB6EOZ.js";
-import {
-  withFederationOutputTransaction
-} from "./chunk-WRNH5C3U.js";
 import {
   getEventCatalogConfigFile
-} from "./chunk-RFIXKATC.js";
+} from "./chunk-4G7FSRPN.js";
 
 // src/federation/federate.ts
 import { createHash } from "crypto";

package/dist/{chunk-36RYTYT5.js → chunk-PD7KTSYN.js}

@@ -1,6 +1,6 @@
 import {
   getEventCatalogConfigFile
-} from "./chunk-RFIXKATC.js";
+} from "./chunk-4G7FSRPN.js";
 
 // src/resolve-catalog-dependencies.js
 import path from "path";

package/dist/{chunk-RDIZJ7UT.js → chunk-RE7UTPWH.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "5.0.0-beta.8";
+var version = "5.0.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/chunk-S5GWAUG5.js

@@ -0,0 +1,29 @@
+// src/utils/child-process-signals.ts
+import { constants } from "os";
+var FORWARDED_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+var isRunning = (child) => child.exitCode === null && child.signalCode === null;
+var stopChildWithParent = (child, parent = process) => {
+  let received;
+  const onSignal = (signal) => {
+    received = signal;
+    if (isRunning(child)) child.kill(signal);
+  };
+  const onExit = () => {
+    if (isRunning(child)) child.kill("SIGTERM");
+  };
+  for (const signal of FORWARDED_SIGNALS) parent.on(signal, onSignal);
+  parent.on("exit", onExit);
+  return {
+    childClosed: () => {
+      for (const signal of FORWARDED_SIGNALS) parent.off(signal, onSignal);
+      parent.off("exit", onExit);
+      if (!received) return false;
+      parent.exit(128 + constants.signals[received]);
+      return true;
+    }
+  };
+};
+
+export {
+  stopChildWithParent
+};

package/dist/{chunk-T4G3VVZ4.js → chunk-YQGRMDRB.js}

@@ -1,10 +1,10 @@
 import {
   logger
-} from "./chunk-PU25TOOJ.js";
+} from "./chunk-JZN4RSMF.js";
 import {
   cleanup,
   getEventCatalogConfigFile
-} from "./chunk-RFIXKATC.js";
+} from "./chunk-4G7FSRPN.js";
 
 // src/generate.js
 import path from "path";
@@ -54,10 +54,12 @@ var generate = async (PROJECT_DIRECTORY) => {
       for (const { plugin } of errors) {
         logger.error(`  - ${plugin}`, "generator");
       }
+      process.exitCode = 1;
     }
   } catch (error) {
     console.error(error);
     await cleanup(PROJECT_DIRECTORY);
+    process.exitCode = 1;
   }
 };
 

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-RDIZJ7UT.js";
+} from "./chunk-RE7UTPWH.js";
 export {
   VERSION
 };