@eventcatalog/core 4.7.4 → 4.7.5

package/dist/federation/federate.d.cts

@@ -1,5 +1,6 @@
 import { ResolvedGraph, HydrateResult, Conflict } from '@eventcatalog/sdk';
 import { FederationSourceConfig } from '../eventcatalog.config.cjs';
+import { FederationDiagnostic } from './diagnostics.cjs';
 import { PublicAssetCompositionResult } from './public-assets.cjs';
 import { FederationSourceProvider } from './types.cjs';
 
@@ -38,6 +39,7 @@ type FederationProgressEvent = {
 } | {
     type: 'resolved';
     graph: ResolvedGraph;
+    diagnostics: FederationDiagnostic[];
 } | {
     type: 'hydrating';
     outDir: string;
@@ -60,6 +62,7 @@ type FederateCatalogResult = {
     sources: number;
     resources: number;
     graph: ResolvedGraph;
+    diagnostics: FederationDiagnostic[];
     hydrate: HydrateResult;
     public: PublicAssetCompositionResult;
     outDir: string;
@@ -76,6 +79,10 @@ declare class FederationConflictError extends Error {
     conflicts: Conflict[];
     constructor(conflicts: Conflict[]);
 }
+declare class FederationDiagnosticError extends Error {
+    diagnostics: FederationDiagnostic[];
+    constructor(diagnostics: FederationDiagnostic[]);
+}
 declare const federateCatalog: (projectDirectory: string, options?: FederateCatalogOptions) => Promise<FederateCatalogResult | null>;
 
-export { type FederateCatalogResult, FederationConflictError, type FederationProgressEvent, federateCatalog };
+export { type FederateCatalogResult, FederationConflictError, FederationDiagnosticError, type FederationProgressEvent, federateCatalog };

package/dist/federation/federate.d.ts

@@ -1,5 +1,6 @@
 import { ResolvedGraph, HydrateResult, Conflict } from '@eventcatalog/sdk';
 import { FederationSourceConfig } from '../eventcatalog.config.js';
+import { FederationDiagnostic } from './diagnostics.js';
 import { PublicAssetCompositionResult } from './public-assets.js';
 import { FederationSourceProvider } from './types.js';
 
@@ -38,6 +39,7 @@ type FederationProgressEvent = {
 } | {
     type: 'resolved';
     graph: ResolvedGraph;
+    diagnostics: FederationDiagnostic[];
 } | {
     type: 'hydrating';
     outDir: string;
@@ -60,6 +62,7 @@ type FederateCatalogResult = {
     sources: number;
     resources: number;
     graph: ResolvedGraph;
+    diagnostics: FederationDiagnostic[];
     hydrate: HydrateResult;
     public: PublicAssetCompositionResult;
     outDir: string;
@@ -76,6 +79,10 @@ declare class FederationConflictError extends Error {
     conflicts: Conflict[];
     constructor(conflicts: Conflict[]);
 }
+declare class FederationDiagnosticError extends Error {
+    diagnostics: FederationDiagnostic[];
+    constructor(diagnostics: FederationDiagnostic[]);
+}
 declare const federateCatalog: (projectDirectory: string, options?: FederateCatalogOptions) => Promise<FederateCatalogResult | null>;
 
-export { type FederateCatalogResult, FederationConflictError, type FederationProgressEvent, federateCatalog };
+export { type FederateCatalogResult, FederationConflictError, FederationDiagnosticError, type FederationProgressEvent, federateCatalog };

package/dist/federation/federate.js

@@ -1,14 +1,18 @@
 import {
   FederationConflictError,
+  FederationDiagnosticError,
   federateCatalog
-} from "../chunk-RIUHZZRA.js";
+} from "../chunk-GYYYAUJD.js";
+import "../chunk-WRNH5C3U.js";
+import "../chunk-5EPNFDT5.js";
 import "../chunk-A2RZR3U4.js";
 import "../chunk-R7Z5ALYI.js";
+import "../chunk-JJPB6EOZ.js";
 import "../chunk-SDZQJTJW.js";
 import "../chunk-352FGP6W.js";
-import "../chunk-5EPNFDT5.js";
 import "../chunk-6QENHZZP.js";
 export {
   FederationConflictError,
+  FederationDiagnosticError,
   federateCatalog
 };

package/dist/federation/output-transaction.cjs

@@ -0,0 +1,152 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/federation/output-transaction.ts
+var output_transaction_exports = {};
+__export(output_transaction_exports, {
+  withFederationOutputTransaction: () => withFederationOutputTransaction
+});
+module.exports = __toCommonJS(output_transaction_exports);
+var import_promises = __toESM(require("fs/promises"), 1);
+var import_node_path = __toESM(require("path"), 1);
+var getSafePublicPath = (publicDirectory, relativePath) => {
+  const normalizedPath = import_node_path.default.posix.normalize(relativePath);
+  const unsafe = relativePath.length === 0 || relativePath.includes("\0") || relativePath.includes("\\") || import_node_path.default.posix.isAbsolute(relativePath) || /^[a-zA-Z]:\//.test(relativePath) || normalizedPath !== relativePath || normalizedPath === ".." || normalizedPath.startsWith("../");
+  if (unsafe) return void 0;
+  const destinationPath = import_node_path.default.resolve(publicDirectory, relativePath);
+  const relativeDestinationPath = import_node_path.default.relative(publicDirectory, destinationPath);
+  return relativeDestinationPath !== "" && relativeDestinationPath !== ".." && !relativeDestinationPath.startsWith(`..${import_node_path.default.sep}`) && !import_node_path.default.isAbsolute(relativeDestinationPath) ? destinationPath : void 0;
+};
+var beginFederationOutputTransaction = async (projectDirectory, outDir, relativePublicPaths) => {
+  const transactionDirectory = await import_promises.default.mkdtemp(import_node_path.default.join(projectDirectory, ".eventcatalog-federation-transaction-"));
+  const previousOutDir = import_node_path.default.join(transactionDirectory, "federated");
+  const publicBackupDirectory = import_node_path.default.join(transactionDirectory, "public");
+  const publicDirectory = import_node_path.default.resolve(projectDirectory, "public");
+  const publicSnapshots = [];
+  const missingPublicDirectories = /* @__PURE__ */ new Set();
+  let hadPreviousOutDir = false;
+  try {
+    for (const relativePath of new Set(relativePublicPaths)) {
+      const destinationPath = getSafePublicPath(publicDirectory, relativePath);
+      if (!destinationPath) continue;
+      try {
+        const stat = await import_promises.default.lstat(destinationPath);
+        if (!stat.isFile()) continue;
+        const backupPath = import_node_path.default.join(publicBackupDirectory, `${publicSnapshots.length}`);
+        await import_promises.default.mkdir(import_node_path.default.dirname(backupPath), { recursive: true });
+        await import_promises.default.copyFile(destinationPath, backupPath);
+        publicSnapshots.push({ backupPath, destinationPath, state: "file" });
+      } catch (error) {
+        const code = error.code;
+        if (code === "ENOTDIR") continue;
+        if (code !== "ENOENT") throw error;
+        publicSnapshots.push({ destinationPath, state: "missing" });
+        let directory = import_node_path.default.dirname(destinationPath);
+        while (directory !== publicDirectory) {
+          try {
+            await import_promises.default.lstat(directory);
+            break;
+          } catch (directoryError) {
+            const directoryCode = directoryError.code;
+            if (directoryCode === "ENOTDIR") break;
+            if (directoryCode !== "ENOENT") throw directoryError;
+            missingPublicDirectories.add(directory);
+            directory = import_node_path.default.dirname(directory);
+          }
+        }
+      }
+    }
+    try {
+      await import_promises.default.rename(outDir, previousOutDir);
+      hadPreviousOutDir = true;
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+  } catch (error) {
+    await import_promises.default.rm(transactionDirectory, { recursive: true, force: true });
+    throw error;
+  }
+  return {
+    commit: async () => {
+      await import_promises.default.rm(transactionDirectory, { recursive: true, force: true }).catch(() => void 0);
+    },
+    rollback: async () => {
+      const rollbackErrors = [];
+      const attempt = async (operation) => {
+        try {
+          await operation();
+        } catch (error) {
+          rollbackErrors.push(error);
+        }
+      };
+      await attempt(() => import_promises.default.rm(outDir, { recursive: true, force: true }));
+      if (hadPreviousOutDir) await attempt(() => import_promises.default.rename(previousOutDir, outDir));
+      for (const snapshot of publicSnapshots) {
+        if (snapshot.state === "missing") {
+          await attempt(() => import_promises.default.rm(snapshot.destinationPath, { force: true }));
+          continue;
+        }
+        await attempt(async () => {
+          await import_promises.default.mkdir(import_node_path.default.dirname(snapshot.destinationPath), { recursive: true });
+          await import_promises.default.copyFile(snapshot.backupPath, snapshot.destinationPath);
+        });
+      }
+      for (const directory of [...missingPublicDirectories].sort((left, right) => right.length - left.length)) {
+        await attempt(async () => {
+          try {
+            await import_promises.default.rmdir(directory);
+          } catch (error) {
+            if (!["ENOENT", "ENOTEMPTY"].includes(error.code ?? "")) throw error;
+          }
+        });
+      }
+      await attempt(() => import_promises.default.rm(transactionDirectory, { recursive: true, force: true }));
+      if (rollbackErrors.length > 0) throw new AggregateError(rollbackErrors, "Failed to restore the previous federation output");
+    }
+  };
+};
+var withFederationOutputTransaction = async (projectDirectory, outDir, relativePublicPaths, update) => {
+  const transaction = await beginFederationOutputTransaction(projectDirectory, outDir, relativePublicPaths);
+  try {
+    const result = await update();
+    await transaction.commit();
+    return result;
+  } catch (error) {
+    try {
+      await transaction.rollback();
+    } catch (rollbackError) {
+      throw new AggregateError([error, rollbackError], "Federation failed and the previous output could not be restored");
+    }
+    throw error;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  withFederationOutputTransaction
+});

package/dist/federation/output-transaction.d.cts

@@ -0,0 +1,3 @@
+declare const withFederationOutputTransaction: <Result>(projectDirectory: string, outDir: string, relativePublicPaths: Iterable<string>, update: () => Promise<Result>) => Promise<Result>;
+
+export { withFederationOutputTransaction };

package/dist/federation/output-transaction.d.ts

@@ -0,0 +1,3 @@
+declare const withFederationOutputTransaction: <Result>(projectDirectory: string, outDir: string, relativePublicPaths: Iterable<string>, update: () => Promise<Result>) => Promise<Result>;
+
+export { withFederationOutputTransaction };

package/dist/federation/output-transaction.js

@@ -0,0 +1,6 @@
+import {
+  withFederationOutputTransaction
+} from "../chunk-WRNH5C3U.js";
+export {
+  withFederationOutputTransaction
+};

package/dist/generate.cjs

@@ -108,7 +108,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.7.4";
+var version = "4.7.5";
 
 // src/constants.ts
 var VERSION = version;
@@ -147,6 +147,29 @@ var logger = {
   warning: (message, tag = "warn") => {
     console.log(formatMessage(tag, message, import_picocolors.default.yellow));
   },
+  line: (message = "") => {
+    console.log(message);
+  },
+  diagnostic: (severity, message, 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 ruleSpacing = " ".repeat(Math.max(2, 72 - label.length));
+    console.log(`  ${color(icon)} ${color(severity.padEnd(7))} ${message}${ruleSpacing}${import_picocolors.default.gray(rule)}`);
+    for (const attribute of attributes) {
+      console.log(`             - ${import_picocolors.default.dim(`${attribute.label}:`)} ${attribute.value}`);
+    }
+  },
+  diagnosticSummary: (errors, warnings) => {
+    const total = errors + warnings;
+    const color = errors > 0 ? import_picocolors.default.red : import_picocolors.default.yellow;
+    const icon = errors > 0 ? "\u2716" : "\u26A0";
+    const problems = `${total} problem${total === 1 ? "" : "s"}`;
+    const errorCount = `${errors} error${errors === 1 ? "" : "s"}`;
+    const warningCount = `${warnings} warning${warnings === 1 ? "" : "s"}`;
+    console.log(color(`${icon} ${problems} (${errorCount}, ${warningCount})`));
+  },
   dim: (message) => {
     console.log(import_picocolors.default.dim(message));
   }

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-7QTCSRAC.js";
-import "./chunk-ZXVQXBTT.js";
-import "./chunk-TLWM7WRZ.js";
+} from "./chunk-EUZT4RKY.js";
+import "./chunk-QQPH6RCB.js";
+import "./chunk-ZBPMCEXS.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.7.4";
+var version = "4.7.5";
 
 // src/constants.ts
 var VERSION = version;
@@ -75,6 +75,29 @@ var logger = {
   warning: (message, tag = "warn") => {
     console.log(formatMessage(tag, message, import_picocolors.default.yellow));
   },
+  line: (message = "") => {
+    console.log(message);
+  },
+  diagnostic: (severity, message, 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 ruleSpacing = " ".repeat(Math.max(2, 72 - label.length));
+    console.log(`  ${color(icon)} ${color(severity.padEnd(7))} ${message}${ruleSpacing}${import_picocolors.default.gray(rule)}`);
+    for (const attribute of attributes) {
+      console.log(`             - ${import_picocolors.default.dim(`${attribute.label}:`)} ${attribute.value}`);
+    }
+  },
+  diagnosticSummary: (errors, warnings) => {
+    const total = errors + warnings;
+    const color = errors > 0 ? import_picocolors.default.red : import_picocolors.default.yellow;
+    const icon = errors > 0 ? "\u2716" : "\u26A0";
+    const problems = `${total} problem${total === 1 ? "" : "s"}`;
+    const errorCount = `${errors} error${errors === 1 ? "" : "s"}`;
+    const warningCount = `${warnings} warning${warnings === 1 ? "" : "s"}`;
+    console.log(color(`${icon} ${problems} (${errorCount}, ${warningCount})`));
+  },
   dim: (message) => {
     console.log(import_picocolors.default.dim(message));
   }

package/dist/utils/cli-logger.d.cts

@@ -4,6 +4,12 @@ declare const logger: {
     success: (message: string, tag?: string) => void;
     error: (message: string, tag?: string) => void;
     warning: (message: string, tag?: string) => void;
+    line: (message?: string) => void;
+    diagnostic: (severity: "error" | "warning", message: string, rule: string, attributes?: {
+        label: string;
+        value: string;
+    }[]) => void;
+    diagnosticSummary: (errors: number, warnings: number) => void;
     dim: (message: string) => void;
 };
 

package/dist/utils/cli-logger.d.ts

@@ -4,6 +4,12 @@ declare const logger: {
     success: (message: string, tag?: string) => void;
     error: (message: string, tag?: string) => void;
     warning: (message: string, tag?: string) => void;
+    line: (message?: string) => void;
+    diagnostic: (severity: "error" | "warning", message: string, rule: string, attributes?: {
+        label: string;
+        value: string;
+    }[]) => void;
+    diagnosticSummary: (errors: number, warnings: number) => void;
     dim: (message: string) => void;
 };
 

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-ZXVQXBTT.js";
-import "../chunk-TLWM7WRZ.js";
+} from "../chunk-QQPH6RCB.js";
+import "../chunk-ZBPMCEXS.js";
 export {
   logger
 };

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "publishConfig": {
     "access": "public"
   },
@@ -119,8 +119,8 @@
     "update-notifier": "^7.3.1",
     "uuid": "^11.1.1",
     "zod": "^4.3.6",
-    "@eventcatalog/linter": "1.1.13",
-    "@eventcatalog/sdk": "2.27.3",
+    "@eventcatalog/linter": "1.1.14",
+    "@eventcatalog/sdk": "2.27.4",
     "@eventcatalog/visualiser": "^4.1.3"
   },
   "devDependencies": {