@eventcatalog/core 5.0.0-beta.2 → 5.0.0-beta.21

package/dist/eventcatalog.cjs

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.5.0_jiti@2.7.0_postcss@8.5.15_tsx@4.21.0_typescript@5.9.3_yaml@2.9.0/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.0_jiti@2.7.0_postcss@8.5.29_tsx@4.23.15_typescript@5.9.3_yaml@2.9.1/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -181,7 +181,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "5.0.0-beta.2";
+var version = "5.0.0-beta.21";
 
 // src/constants.ts
 var VERSION = version;
@@ -191,8 +191,8 @@ var getTimestamp = () => {
   const now = /* @__PURE__ */ new Date();
   return now.toLocaleTimeString("en-US", { hour12: false });
 };
-var formatMessage = (tag, message, tagColor) => {
-  return `${import_picocolors.default.dim(getTimestamp())} ${tagColor(`[${tag}]`)} ${message}`;
+var formatMessage = (tag, message2, tagColor) => {
+  return `${import_picocolors.default.dim(getTimestamp())} ${tagColor(`[${tag}]`)} ${message2}`;
 };
 var logger = {
   welcome: () => {
@@ -208,28 +208,28 @@ var logger = {
     );
     console.log();
   },
-  info: (message, tag = "info") => {
-    console.log(formatMessage(tag, message, import_picocolors.default.blue));
+  info: (message2, tag = "info") => {
+    console.log(formatMessage(tag, message2, import_picocolors.default.blue));
   },
-  success: (message, tag = "success") => {
-    console.log(formatMessage(tag, message, import_picocolors.default.green));
+  success: (message2, tag = "success") => {
+    console.log(formatMessage(tag, message2, import_picocolors.default.green));
   },
-  error: (message, tag = "error") => {
-    console.log(formatMessage(tag, message, import_picocolors.default.red));
+  error: (message2, tag = "error") => {
+    console.log(formatMessage(tag, message2, import_picocolors.default.red));
   },
-  warning: (message, tag = "warn") => {
-    console.log(formatMessage(tag, message, import_picocolors.default.yellow));
+  warning: (message2, tag = "warn") => {
+    console.log(formatMessage(tag, message2, import_picocolors.default.yellow));
   },
-  line: (message = "") => {
-    console.log(message);
+  line: (message2 = "") => {
+    console.log(message2);
   },
-  diagnostic: (severity, message, rule, attributes = []) => {
+  diagnostic: (severity, message2, rule, attributes = []) => {
     const isError = severity === "error";
     const color = isError ? import_picocolors.default.red : import_picocolors.default.yellow;
     const icon = isError ? "\u2716" : "\u26A0";
-    const label = `${icon} ${severity.padEnd(7)} ${message}`;
+    const label = `${icon} ${severity.padEnd(7)} ${message2}`;
     const ruleSpacing = " ".repeat(Math.max(2, 72 - label.length));
-    console.log(`  ${color(icon)} ${color(severity.padEnd(7))} ${message}${ruleSpacing}${import_picocolors.default.gray(rule)}`);
+    console.log(`  ${color(icon)} ${color(severity.padEnd(7))} ${message2}${ruleSpacing}${import_picocolors.default.gray(rule)}`);
     for (const attribute of attributes) {
       console.log(`             - ${import_picocolors.default.dim(`${attribute.label}:`)} ${attribute.value}`);
     }
@@ -243,8 +243,8 @@ var logger = {
     const warningCount = `${warnings} warning${warnings === 1 ? "" : "s"}`;
     console.log(color(`${icon} ${problems} (${errorCount}, ${warningCount})`));
   },
-  dim: (message) => {
-    console.log(import_picocolors.default.dim(message));
+  dim: (message2) => {
+    console.log(import_picocolors.default.dim(message2));
   }
 };
 
@@ -304,7 +304,23 @@ var generate = async (PROJECT_DIRECTORY) => {
 
 // src/analytics/analytics.js
 var import_os = __toESM(require("os"), 1);
-async function raiseEvent(eventData) {
+
+// 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;
+};
+
+// src/analytics/analytics.js
+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} (${import_os.default.platform()}; ${import_os.default.arch()}; Node/${process.version})`;
@@ -326,7 +342,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}`);
@@ -403,10 +420,11 @@ function serializeCounts(counts) {
 
 // src/utils/license-status.ts
 var import_boxen = __toESM(require("boxen"), 1);
+var import_picocolors2 = __toESM(require("picocolors"), 1);
 var import_license2 = require("@eventcatalog/license");
 
 // eventcatalog/src/utils/trial.ts
-var TRIAL_LENGTH_DAYS = 90;
+var TRIAL_LENGTH_DAYS = 60;
 var LICENSE_FAQ_URL = "https://www.eventcatalog.dev/license-faq";
 var LICENSE_RENEW_URL = "https://eventcatalog.cloud";
 var DAY_IN_MS = 24 * 60 * 60 * 1e3;
@@ -525,75 +543,100 @@ var getLicenseAnalytics = (license = { state: "none" }, tsd) => ({
 });
 var formatDate = (date) => date.toLocaleDateString(void 0, { dateStyle: "medium" });
 var formatDays = (days) => `${days} ${days === 1 ? "day" : "days"}`;
-var getTrialLine = (tsd, now) => {
+var PLAIN = { bold: (text) => text, dim: (text) => text, link: (text) => text };
+var COLOURS = { bold: import_picocolors2.default.bold, dim: import_picocolors2.default.dim, link: (text) => import_picocolors2.default.cyan(text) };
+var render = ({ headline, rows, links }, 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)]))] : []
+  ].join("\n");
+};
+var message = (content) => ({
+  ...content,
+  text: render(content, PLAIN)
+});
+var getTrialRow = (tsd, now) => {
   const trial = getTrialStatus(tsd, now);
   if (!trial) return;
-  return trial.ended ? `Your ${TRIAL_LENGTH_DAYS}-day EventCatalog trial ended on ${formatDate(trial.endsAt)}.` : `${formatDays(trial.daysLeft)} left of your ${TRIAL_LENGTH_DAYS}-day EventCatalog trial (ends ${formatDate(trial.endsAt)}).`;
+  return [
+    "Trial",
+    trial.ended ? `Ended ${formatDate(trial.endsAt)}` : `${formatDays(trial.daysLeft)} left of ${TRIAL_LENGTH_DAYS} (ends ${formatDate(trial.endsAt)})`
+  ];
 };
 var getLicenseStatusMessage = (license, tsd, now = Date.now()) => {
+  const licensing = ["Licensing", LICENSE_FAQ_URL];
+  const renew = ["Renew", LICENSE_RENEW_URL];
+  const licensedTo = "org" in license && license.org ? [["Licensed to", license.org]] : [];
   if (license.state === "licensed") {
     const daysLeft = Math.max(0, Math.ceil((license.expiresAt.getTime() - now) / DAY_IN_MS2));
-    const licensedTo = license.org ? `Licensed to ${license.org}` : "Licensed";
     if (daysLeft < LICENSE_REMINDER_DAYS) {
-      return {
-        title: "EventCatalog Commercial License",
+      return message({
+        title: "EventCatalog license",
         color: "yellow",
-        text: [
-          licensedTo,
-          `Your license expires in ${formatDays(daysLeft)}, on ${formatDate(license.expiresAt)}.`,
-          `Renew it to keep using EventCatalog commercially: ${LICENSE_RENEW_URL}`
-        ].join("\n")
-      };
+        headline: `Your commercial license expires in ${formatDays(daysLeft)}`,
+        rows: [...licensedTo, ["Expires", formatDate(license.expiresAt)]],
+        links: [renew]
+      });
     }
-    return {
-      title: "EventCatalog Commercial License",
+    return message({
+      title: "EventCatalog license",
       color: "green",
-      text: `${licensedTo}
-Valid until ${formatDate(license.expiresAt)} (${formatDays(daysLeft)} left)`
-    };
+      headline: "Commercial license active",
+      rows: [...licensedTo, ["Valid until", `${formatDate(license.expiresAt)} (${formatDays(daysLeft)} left)`]],
+      links: []
+    });
   }
   if (license.state === "plan") return;
-  const trialLine = getTrialLine(tsd, now);
+  const trialRow = getTrialRow(tsd, now);
+  const trialRows = trialRow ? [trialRow] : [];
   if (license.state === "none") {
-    if (!trialLine) return;
-    const ended = getTrialStatus(tsd, now)?.ended;
-    return {
+    const trial = getTrialStatus(tsd, now);
+    if (!trial || !trialRow) return;
+    return message({
       title: "EventCatalog trial",
-      color: ended ? "yellow" : "green",
-      text: `${trialLine}
-Learn about licensing: ${LICENSE_FAQ_URL}`
-    };
+      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]
+    });
   }
   if (license.state === "expired") {
-    const expiredOn = license.expiresAt ? `expired on ${formatDate(license.expiresAt)} (${formatDays(Math.floor((now - license.expiresAt.getTime()) / DAY_IN_MS2))} ago)` : "has expired";
-    return {
-      title: "EventCatalog License Expired",
+    const expiredOn = license.expiresAt ? [
+      [
+        "Expired",
+        `${formatDate(license.expiresAt)} (${formatDays(Math.floor((now - license.expiresAt.getTime()) / DAY_IN_MS2))} ago)`
+      ]
+    ] : [];
+    return message({
+      title: "EventCatalog license",
       color: "yellow",
-      text: [
-        `Your EventCatalog commercial license${license.org ? ` for ${license.org}` : ""} ${expiredOn}.`,
-        `Renew it to keep using EventCatalog commercially: ${LICENSE_RENEW_URL}`,
-        trialLine,
-        `Learn about licensing: ${LICENSE_FAQ_URL}`
-      ].filter(Boolean).join("\n")
-    };
+      headline: "Your commercial license has expired",
+      rows: [...licensedTo, ...expiredOn, ...trialRows],
+      links: [renew, licensing]
+    });
   }
-  return {
+  return message({
     title: "EventCatalog license",
     color: "yellow",
-    text: [`Your license.jwt could not be verified: ${license.reason}.`, trialLine, `Learn about licensing: ${LICENSE_FAQ_URL}`].filter(Boolean).join("\n")
-  };
+    headline: "Your license.jwt couldn't be verified",
+    rows: [["Reason", license.reason.charAt(0).toUpperCase() + license.reason.slice(1)], ...trialRows],
+    links: [licensing]
+  });
 };
 var printLicenseStatus = (license, tsd) => {
-  const message = getLicenseStatusMessage(license, tsd);
-  if (!message) return;
+  const status = getLicenseStatusMessage(license, tsd);
+  if (!status) return;
   console.log(
-    (0, import_boxen.default)(message.text, {
-      padding: 1,
+    (0, import_boxen.default)(render(status, COLOURS), {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
       margin: 1,
       borderStyle: "round",
-      borderColor: message.color,
-      title: message.title,
-      titleAlignment: "center"
+      borderColor: status.color,
+      title: status.title,
+      titleAlignment: "left"
     })
   );
 };
@@ -653,50 +696,69 @@ 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)
+      },
+      configFile
+    );
   } catch (error) {
   }
 };
@@ -836,13 +898,13 @@ var message_channels_to_service_channels_default = async (dir2) => {
       absolute: true
     }
   );
-  const messagesWithChannels = messages.reduce((acc, message) => {
-    const file = import_node_fs5.default.readFileSync(message, "utf8");
+  const messagesWithChannels = messages.reduce((acc, message2) => {
+    const file = import_node_fs5.default.readFileSync(message2, "utf8");
     const { data } = (0, import_gray_matter3.default)(file);
     if (data.channels?.length > 0) {
       acc.push({
         ...data,
-        path: message
+        path: message2
       });
     }
     return acc;
@@ -853,9 +915,9 @@ var message_channels_to_service_channels_default = async (dir2) => {
   const servicesWithChannels = services.reduce((acc, service) => {
     const file = import_node_fs5.default.readFileSync(service, "utf8");
     const { data } = (0, import_gray_matter3.default)(file);
-    const isSending = data.sends?.some((send) => messagesWithChannels.some((message) => message.id === send.id));
+    const isSending = data.sends?.some((send) => messagesWithChannels.some((message2) => message2.id === send.id));
     const isReceiving = data.receives?.some(
-      (receive) => messagesWithChannels.some((message) => message.id === receive.id)
+      (receive) => messagesWithChannels.some((message2) => message2.id === receive.id)
     );
     if (isSending || isReceiving) {
       acc.push({
@@ -868,16 +930,16 @@ var message_channels_to_service_channels_default = async (dir2) => {
   for (const service of servicesWithChannels) {
     const file = import_node_fs5.default.readFileSync(service.path, "utf8");
     const { data } = (0, import_gray_matter3.default)(file);
-    const messagesTheServiceSendsThatNeedUpdating = data.sends?.filter((send) => messagesWithChannels.some((message) => message.id === send.id)) ?? [];
-    const messagesTheServiceReceivesThatNeedUpdating = data.receives?.filter((receive) => messagesWithChannels.some((message) => message.id === receive.id)) ?? [];
+    const messagesTheServiceSendsThatNeedUpdating = data.sends?.filter((send) => messagesWithChannels.some((message2) => message2.id === send.id)) ?? [];
+    const messagesTheServiceReceivesThatNeedUpdating = data.receives?.filter((receive) => messagesWithChannels.some((message2) => message2.id === receive.id)) ?? [];
     if (messagesTheServiceSendsThatNeedUpdating.length > 0 || messagesTheServiceReceivesThatNeedUpdating.length > 0) {
       const newSends = (data.sends ?? []).map((send) => {
-        const match = messagesWithChannels.find((message) => message.id === send.id);
+        const match = messagesWithChannels.find((message2) => message2.id === send.id);
         if (!match) return send;
         return { ...send, to: (match.channels ?? []).filter((channel) => channel !== null) };
       });
       const newReceives = (data.receives ?? []).map((receive) => {
-        const match = messagesWithChannels.find((message) => message.id === receive.id);
+        const match = messagesWithChannels.find((message2) => message2.id === receive.id);
         if (!match) return receive;
         return { ...receive, from: (match.channels ?? []).filter((channel) => channel !== null) };
       });
@@ -889,11 +951,11 @@ var message_channels_to_service_channels_default = async (dir2) => {
       import_node_fs5.default.writeFileSync(service.path, import_gray_matter3.default.stringify(file, newData));
     }
   }
-  for (const message of messagesWithChannels) {
-    const file = import_node_fs5.default.readFileSync(message.path, "utf8");
+  for (const message2 of messagesWithChannels) {
+    const file = import_node_fs5.default.readFileSync(message2.path, "utf8");
     const parsed = (0, import_gray_matter3.default)(file);
     const { channels, ...newData } = parsed.data;
-    import_node_fs5.default.writeFileSync(message.path, import_gray_matter3.default.stringify(parsed.content, newData));
+    import_node_fs5.default.writeFileSync(message2.path, import_gray_matter3.default.stringify(parsed.content, newData));
   }
   console.log("\u2714 Channels migrated to new services API");
 };
@@ -903,6 +965,32 @@ var runMigrations = async (dir2) => {
   await message_channels_to_service_channels_default(dir2);
 };
 
+// src/utils/child-process-signals.ts
+var import_node_os3 = require("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 + import_node_os3.constants.signals[received]);
+      return true;
+    }
+  };
+};
+
 // eventcatalog/src/features/fields/field-indexer.ts
 var import_node_path10 = __toESM(require("path"), 1);
 var import_node_fs7 = __toESM(require("fs"), 1);
@@ -1055,7 +1143,7 @@ var FieldsDatabase = class _FieldsDatabase {
       format,
       type,
       messageType,
-      message,
+      message: message2,
       producer,
       consumer,
       required,
@@ -1089,9 +1177,9 @@ var FieldsDatabase = class _FieldsDatabase {
       conditions.push(`f.message_type IN (${types2.map(() => "?").join(", ")})`);
       bindings.push(...types2);
     }
-    if (message) {
+    if (message2) {
       conditions.push(`f.message_id = ?`);
-      bindings.push(message);
+      bindings.push(message2);
     }
     if (required) {
       conditions.push(`f.required = 1`);
@@ -1904,8 +1992,8 @@ var KNOWN_EVENTCATALOG_COLLECTIONS = /* @__PURE__ */ new Set([
 var EMPTY_COLLECTION_MESSAGE = /^The collection ("(?:\\.|[^"\\])*") does not exist or is empty\. Please check your content config file for errors\.$/;
 var ANSI_PATTERN = /\u001B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
 var ASTRO_CONTENT_WARN_PREFIX = /^[^[\]]*\[WARN\]\s+\[content\](?:\s+\[[^\]]+\])*\s*$/;
-function collectionNameFromEmptyWarning(message) {
-  const match = message.match(EMPTY_COLLECTION_MESSAGE);
+function collectionNameFromEmptyWarning(message2) {
+  const match = message2.match(EMPTY_COLLECTION_MESSAGE);
   if (!match) return null;
   try {
     const name = JSON.parse(match[1]);
@@ -1914,8 +2002,8 @@ function collectionNameFromEmptyWarning(message) {
     return null;
   }
 }
-function isIntentionalEmptyCollectionMessage(message) {
-  const name = collectionNameFromEmptyWarning(message);
+function isIntentionalEmptyCollectionMessage(message2) {
+  const name = collectionNameFromEmptyWarning(message2);
   return name !== null && KNOWN_EVENTCATALOG_COLLECTIONS.has(name);
 }
 function isIntentionalEmptyCollectionLine(line) {
@@ -1923,8 +2011,8 @@ function isIntentionalEmptyCollectionLine(line) {
   const marker = 'The collection "';
   const start = plain.indexOf(marker);
   if (start === -1) return false;
-  const message = plain.slice(start).trim();
-  if (!isIntentionalEmptyCollectionMessage(message)) return false;
+  const message2 = plain.slice(start).trim();
+  if (!isIntentionalEmptyCollectionMessage(message2)) return false;
   const before = plain.slice(0, start).trim();
   return before.length === 0 || ASTRO_CONTENT_WARN_PREFIX.test(before);
 }
@@ -2491,7 +2579,7 @@ var createFileSystemSourceProvider = (projectDirectory) => ({
 // src/federation/github-source-provider.ts
 var import_node_child_process = require("child_process");
 var import_promises9 = __toESM(require("fs/promises"), 1);
-var import_node_os3 = __toESM(require("os"), 1);
+var import_node_os4 = __toESM(require("os"), 1);
 var import_node_path18 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var import_sdk2 = __toESM(require("@eventcatalog/sdk"), 1);
@@ -2548,7 +2636,7 @@ var getGitEnvironment = (token) => {
 var createCheckout = (executeFile, token) => async (source, ref, callback) => {
   const { owner, repository } = parseGitHubSource(source);
   const catalogPath = import_node_path18.default.posix.normalize(source.path ?? ".");
-  const directory = await import_promises9.default.mkdtemp(import_node_path18.default.join(import_node_os3.default.tmpdir(), "eventcatalog-federation-"));
+  const directory = await import_promises9.default.mkdtemp(import_node_path18.default.join(import_node_os4.default.tmpdir(), "eventcatalog-federation-"));
   const env = getGitEnvironment(token);
   try {
     const git = (args) => executeFile("git", args, { cwd: directory, env, encoding: "utf8" });
@@ -2768,8 +2856,8 @@ var federateCatalog = async (projectDirectory, options = {}) => {
         generated: resolved.generated
       });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to federate source "${source.id}": ${message}`, { cause: error });
+      const message2 = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to federate source "${source.id}": ${message2}`, { cause: error });
     }
   }
   const outDir = import_node_path19.default.join(projectDirectory, "federated");
@@ -2918,7 +3006,7 @@ var resolveDevPort = async ({ projectDir }) => {
 };
 var startDevPrewarm = ({
   port = 3e3,
-  paths = ["/ping", "/"],
+  paths = ["/"],
   retries = 80,
   intervalMs = 250,
   initialDelayMs = 500
@@ -2927,10 +3015,13 @@ var startDevPrewarm = ({
   const hit = (requestPath) => new Promise((resolve2) => {
     const req = import_node_http.default.get(
       {
-        hostname: "127.0.0.1",
+        // Not 127.0.0.1: the dev server can listen on IPv6 only ([::1]), which refused
+        // every prewarm request
+        hostname: "localhost",
         port,
         path: requestPath,
-        timeout: 1200
+        // A refused connection fails at once; once connected, let the first render finish
+        timeout: 3e4
       },
       (res) => {
         res.resume();
@@ -3032,6 +3123,7 @@ var runCommandWithFilteredOutput = async ({
       },
       stdio: ["inherit", "pipe", "pipe"]
     });
+    const signals = stopChildWithParent(child);
     let stdoutBuffer = "";
     let stderrBuffer = "";
     const flush = (buffer, writer, isFinal = false) => {
@@ -3059,11 +3151,13 @@ var runCommandWithFilteredOutput = async ({
       stderrBuffer = flush(stderrBuffer, process.stderr);
     });
     child.on("error", (error) => {
+      signals.childClosed();
       reject(error);
     });
     child.on("close", (code) => {
       stdoutBuffer = flush(stdoutBuffer, process.stdout, true);
       stderrBuffer = flush(stderrBuffer, process.stderr, true);
+      if (signals.childClosed()) return;
       if (code === 0) {
         resolve2();
         return;
@@ -3114,10 +3208,10 @@ Upgrade now: npm i @eventcatalog/core@beta`;
   if (!installedVersion) return;
   const pkg = { name: "@eventcatalog/core", version: installedVersion };
   const notifier = (0, import_update_notifier.default)({ pkg, updateCheckInterval: 0 });
-  const message = getEventCatalogUpdateMessage(installedVersion, notifier.update?.latest);
-  if (message) {
+  const message2 = getEventCatalogUpdateMessage(installedVersion, notifier.update?.latest);
+  if (message2) {
     console.log(
-      (0, import_boxen2.default)(message, {
+      (0, import_boxen2.default)(message2, {
         padding: 1,
         margin: 1,
         align: "center",
@@ -3189,7 +3283,9 @@ program.command("dev").description("Run development server of EventCatalog").opt
       });
       startDevPrewarm({
         port: prewarmPort,
-        paths: ["/ping", "/"]
+        // Renders the homepage before anyone opens it. Requests stop at the first response,
+        // so a probe path like /ping first would leave the homepage cold.
+        paths: ["/"]
       });
     }
     await runCommandWithFilteredOutput({
@@ -3278,15 +3374,33 @@ var previewCatalog = async ({ command }) => {
     shouldFilterLine: createAstroLineFilter()
   });
 };
+var SERVER_BOOTSTRAP = `
+const entry = await import(process.argv[1]);
+const { server } = entry.startServer();
+globalThis[Symbol.for('eventcatalog.http-server')] = server.server;
+const start = process.env.EVENTCATALOG_START_PATH;
+if (start) {
+  server.server.once('listening', () => {
+    // Where the server listens (HOST can be one address only); loopback when it listens on every address
+    const { address, port } = server.server.address();
+    const host = ['0.0.0.0', '::'].includes(address) ? '127.0.0.1' : address.includes(':') ? '[' + address + ']' : address;
+    fetch('http://' + host + ':' + port + start).catch((error) => console.error('[eventcatalog] Could not start the server:', error.message));
+  });
+}
+`;
 var startServerCatalog = async () => {
   const serverEntryPath = import_node_path21.default.join(dir, "dist", "server", "entry.mjs");
+  const config = await getEventCatalogConfigFile(dir);
+  const base = (config?.base || "/").replace(/\/$/, "");
   await runCommandWithFilteredOutput({
     command: process.execPath,
-    args: [serverEntryPath],
+    args: ["--input-type=module", "-e", SERVER_BOOTSTRAP, (0, import_node_url2.pathToFileURL)(serverEntryPath).href],
     cwd: dir,
     env: {
       PROJECT_DIR: dir,
-      CATALOG_DIR: core
+      CATALOG_DIR: core,
+      ASTRO_NODE_AUTOSTART: "disabled",
+      EVENTCATALOG_START_PATH: `${base}/_eventcatalog/start`
     },
     shouldFilterLine: createAstroLineFilter()
   });