@eventcatalog/core 4.12.3 → 5.0.0-beta.1

package/eventcatalog/src/utils/node-graphs/systems-node-graph.ts

@@ -1,22 +1,13 @@
 import { getCollection } from 'astro:content';
-import {
-  createDagreGraph,
-  calculatedNodes,
-  DEFAULT_NODE_WIDTH,
-  DEFAULT_NODE_HEIGHT,
-  layoutDagreGraph,
-} from '@utils/node-graphs/utils/utils';
+import { layoutNodeGraph } from '@utils/node-graphs/layout-node-graph';
 import { getNodesAndEdges as getServicesNodeAndEdges } from './services-node-graph';
 import { getNodesAndEdges as getContainerNodeAndEdges } from './container-node-graph';
 import merge from 'lodash.merge';
 import { createVersionedMap, findInMap } from '@utils/collections/util';
 
-type DagreGraph = any;
-
 interface NodesAndEdgesProps {
   id: string;
   version: string;
-  defaultFlow?: DagreGraph;
   mode?: 'simple' | 'full';
   group?: boolean;
   // When true, wraps the whole system graph in a single parent boundary node
@@ -29,14 +20,12 @@ interface NodesAndEdgesProps {
 export const getNodesAndEdges = async ({
   id,
   version,
-  defaultFlow,
   mode = 'simple',
   group = false,
   wrapInSystemGroup = false,
   channelRenderMode = 'flat',
   layout = true,
 }: NodesAndEdgesProps) => {
-  const flow = defaultFlow || createDagreGraph({ ranksep: 360, nodesep: 50, edgesep: 50 });
   let nodes = new Map(),
     edges = new Map();
 
@@ -80,7 +69,6 @@ export const getNodesAndEdges = async ({
     const { nodes: serviceNodes, edges: serviceEdges } = await getServicesNodeAndEdges({
       id: service.id,
       version: service.version,
-      defaultFlow: flow,
       mode,
       renderAllEdges: true,
       channelRenderMode,
@@ -105,7 +93,6 @@ export const getNodesAndEdges = async ({
     const { nodes: containerNodes, edges: containerEdges } = await getContainerNodeAndEdges({
       id: container.id,
       version: container.version,
-      defaultFlow: flow,
       mode,
       channelRenderMode,
       layout: false,
@@ -118,6 +105,12 @@ export const getNodesAndEdges = async ({
     containerEdges.forEach((e) => edges.set(e.id, e));
   }
 
+  // The graphs merged above each mark their own service / data store as the one
+  // being viewed, but here the system is (see the system group below)
+  nodes.forEach((n) => {
+    if (n.data?.isFocused) nodes.set(n.id, { ...n, data: { ...n.data, isFocused: false } });
+  });
+
   // Add group node to the graph (used when a system is rendered inside another view)
   if (group) {
     nodes.forEach((n) => {
@@ -125,89 +118,36 @@ export const getNodesAndEdges = async ({
     });
   }
 
-  if (layout) {
-    layoutDagreGraph(flow);
-  }
-
-  let laidOutNodes = calculatedNodes(flow, Array.from(nodes.values()));
-
   // Wrap everything inside a single parent "system group" boundary node, so all
-  // the services / data stores / messages visibly belong to one system. We only
-  // do this when this graph owns its own layout (`layout` true) — when it's
-  // being merged into a larger graph (e.g. a domain view) the host owns grouping.
-  if (wrapInSystemGroup && layout && laidOutNodes.length > 0) {
-    laidOutNodes = wrapNodesInSystemGroup(laidOutNodes, flow, system);
-  }
-
-  return {
-    nodes: laidOutNodes,
+  // the services / data stores / messages visibly belong to one system
+  const graph = {
+    nodes: wrapInSystemGroup && nodes.size > 0 ? wrapNodesInSystemGroup([...nodes.values()], system) : [...nodes.values()],
     edges: [...edges.values()],
   };
-};
 
-// Padding around the children inside the group box, and headroom for the header banner.
-const GROUP_PADDING_X = 100;
-const GROUP_PADDING_Y = 100;
-const GROUP_HEADER_HEIGHT = 64;
+  return layout ? layoutNodeGraph(graph) : graph;
+};
 
 /**
- * Wraps a set of already-laid-out nodes in one parent `system-group` node.
- *
- * The rest of the app uses dagre's node position directly as the ReactFlow
- * position, so we stay in that same coordinate space. Child nodes under a
- * `parentId` are positioned relative to the parent, so we:
- *   1. compute the bounding box of all nodes (using dagre position + size),
- *   2. create a parent group node at the box origin (minus padding/header),
- *   3. re-home every node as a child, offset by the group origin.
+ * Wraps a system's nodes in one parent `system-group` node (sized to fit them
+ * when the graph is laid out), so they visibly belong to the system.
  */
-const wrapNodesInSystemGroup = (laidOutNodes: any[], flow: DagreGraph, system: any) => {
-  let minX = Infinity;
-  let minY = Infinity;
-  let maxX = -Infinity;
-  let maxY = -Infinity;
-
-  for (const node of laidOutNodes) {
-    const dims = flow.node(node.id) || {};
-    const width = dims.width ?? DEFAULT_NODE_WIDTH;
-    const height = dims.height ?? DEFAULT_NODE_HEIGHT;
-
-    minX = Math.min(minX, node.position.x);
-    minY = Math.min(minY, node.position.y);
-    maxX = Math.max(maxX, node.position.x + width);
-    maxY = Math.max(maxY, node.position.y + height);
-  }
-
-  // Origin of the group box (room for padding + the header banner at the top).
-  const groupX = minX - GROUP_PADDING_X;
-  const groupY = minY - GROUP_PADDING_Y - GROUP_HEADER_HEIGHT;
-  const groupWidth = maxX - minX + GROUP_PADDING_X * 2;
-  const groupHeight = maxY - minY + GROUP_PADDING_Y * 2 + GROUP_HEADER_HEIGHT;
-
+const wrapNodesInSystemGroup = (systemNodes: any[], system: any) => {
   const groupId = `system-group-${system.data.id}-${system.data.version}`;
 
   const groupNode = {
     id: groupId,
     type: 'system-group',
-    position: { x: groupX, y: groupY },
+    position: { x: 0, y: 0 },
     draggable: false,
     selectable: false,
-    style: { width: groupWidth, height: groupHeight },
     data: {
       system: { name: system.data.name, version: system.data.version },
+      // The system is the resource being viewed on its own diagram
+      isFocused: true,
     },
   };
 
-  // Re-home each node as a child, with its position relative to the group origin.
-  const childNodes = laidOutNodes.map((node) => ({
-    ...node,
-    parentId: groupId,
-    extent: 'parent',
-    position: {
-      x: node.position.x - groupX,
-      y: node.position.y - groupY,
-    },
-  }));
-
-  // Parent must come before its children in the array for ReactFlow.
-  return [groupNode, ...childNodes];
+  // Parent must come before its children in the array for React Flow
+  return [groupNode, ...systemNodes.map((node) => ({ ...node, parentId: groupId, extent: 'parent' }))];
 };

package/eventcatalog/src/utils/node-graphs/utils/utils.ts

@@ -1,7 +1,6 @@
 // Can't use the CollectionEntry type from astro:content  because a client component is using this util
 
 import { MarkerType, Position, type Edge, type Node } from '@xyflow/react';
-import dagre from 'dagre';
 import { getItemsFromCollectionByIdAndSemverOrLatest, versionMatches as versionMatchesUtil } from '@utils/collections/util';
 import { buildUrl } from '@utils/url-builder';
 
@@ -91,52 +90,6 @@ export const getEdgeLabelForMessageAsSource = (data: MessageCollectionItem, thro
   }
 };
 
-export const calculatedNodes = (flow: dagre.graphlib.Graph, nodes: Node[]) => {
-  return nodes.map((node: any) => {
-    const { x, y } = flow.node(node.id);
-    return { ...node, position: { x, y } };
-  });
-};
-
-export const DEFAULT_NODE_WIDTH = 150;
-export const DEFAULT_NODE_HEIGHT = 120;
-
-// Creates a new dagre graph
-export const createDagreGraph = ({ ranksep = 180, nodesep = 50, ...rest }: any) => {
-  const graph = new dagre.graphlib.Graph({ compound: true });
-  graph.setGraph({ rankdir: 'LR', ranksep, nodesep, ...rest });
-  graph.setDefaultEdgeLabel(() => ({}));
-  return graph;
-};
-
-/**
- * network-simplex produces the nicest layered layout but is O(V·E) and hangs on
- * large architecture maps. tight-tree keeps the same LR layering with far less
- * work. Callers can still force a ranker via createDagreGraph({ ranker }).
- */
-export const LARGE_GRAPH_NODE_THRESHOLD = 80;
-export const LARGE_GRAPH_EDGE_THRESHOLD = 200;
-export const LARGE_GRAPH_RANKER = 'tight-tree';
-
-export const selectDagreRanker = (nodeCount: number, edgeCount: number, explicitRanker?: string) => {
-  if (explicitRanker) return explicitRanker;
-  if (nodeCount >= LARGE_GRAPH_NODE_THRESHOLD || edgeCount >= LARGE_GRAPH_EDGE_THRESHOLD) {
-    return LARGE_GRAPH_RANKER;
-  }
-  return undefined;
-};
-
-export const layoutDagreGraph = (flow: dagre.graphlib.Graph) => {
-  const label = (flow.graph() || {}) as { ranker?: string };
-  const nodeCount = flow.nodeCount();
-  const edgeCount = flow.edgeCount();
-  const ranker = selectDagreRanker(nodeCount, edgeCount, label.ranker);
-  if (ranker && label.ranker !== ranker) {
-    flow.setGraph({ ...label, ranker });
-  }
-  dagre.layout(flow);
-};
-
 export const createEdge = (edgeOptions: Edge) => {
   return {
     label: 'subscribed by',
@@ -167,8 +120,6 @@ export const createNode = (values: Node): Node => {
   };
 };
 
-type DagreGraph = any;
-
 type ContextMenuItem = {
   label: string;
   href: string;
@@ -370,7 +321,7 @@ export const buildContextMenuForSystem = ({ id, version }: { id: string; version
   return [
     { label: 'Read documentation', href: buildUrl(`/docs/systems/${id}/${version}`) },
     { label: 'Focus node', href: buildUrl(`/visualiser/systems/${id}/${version}`) },
-    { label: 'View context', href: buildUrl(`/visualiser/systems/${id}/${version}/context`) },
+    { label: 'View context', href: buildUrl(`/visualiser/systems/${id}/${version}?level=1`) },
   ];
 };
 
@@ -438,31 +389,3 @@ export const partitionMessagesByGroup = (
 
   return { grouped, ungrouped };
 };
-
-export const getNodesAndEdgesFromDagre = ({
-  nodes,
-  edges,
-  defaultFlow,
-}: {
-  nodes: Node[];
-  edges: Edge[];
-  defaultFlow?: DagreGraph;
-}) => {
-  const flow = defaultFlow || createDagreGraph({ ranksep: 300, nodesep: 50 });
-
-  nodes.forEach((node: any) => {
-    flow.setNode(node.id, { width: DEFAULT_NODE_WIDTH, height: DEFAULT_NODE_HEIGHT });
-  });
-
-  edges.forEach((edge: any) => {
-    flow.setEdge(edge.source, edge.target);
-  });
-
-  // Render the diagram in memory getting the X and Y
-  layoutDagreGraph(flow);
-
-  return {
-    nodes: calculatedNodes(flow, nodes),
-    edges,
-  };
-};

package/eventcatalog/src/utils/trial.ts

@@ -0,0 +1,36 @@
+export const TRIAL_LENGTH_DAYS = 90;
+
+export const LICENSE_FAQ_URL = 'https://www.eventcatalog.dev/license-faq';
+
+// Where a commercial license is renewed
+export const LICENSE_RENEW_URL = 'https://eventcatalog.cloud';
+
+const DAY_IN_MS = 24 * 60 * 60 * 1000;
+
+export type TrialStatus = {
+  daysLeft: number;
+  ended: boolean;
+  endsAt: Date;
+};
+
+/**
+ * The trial started at `tsd` (unix ms, written to eventcatalog.config.js when the catalog was
+ * created) and lasts TRIAL_LENGTH_DAYS. Undefined when there is no valid start date.
+ */
+export const getTrialStatus = (tsd: unknown, now = Date.now()): TrialStatus | undefined => {
+  if (typeof tsd !== 'number' || !Number.isFinite(tsd) || tsd <= 0) return;
+  const endsAt = tsd + TRIAL_LENGTH_DAYS * DAY_IN_MS;
+  const daysLeft = Math.max(0, Math.ceil((endsAt - now) / DAY_IN_MS));
+  return { daysLeft, ended: daysLeft === 0, endsAt: new Date(endsAt) };
+};
+
+// A licensed catalog only shows its license in the dev header when it's about to expire
+export const LICENSE_REMINDER_DAYS = 30;
+
+/**
+ * Days left on the license, once fewer than LICENSE_REMINDER_DAYS remain. Undefined before then.
+ */
+export const getLicenseDaysLeft = (licensedUntil: Date, now = Date.now()): number | undefined => {
+  const daysLeft = Math.max(0, Math.ceil((licensedUntil.getTime() - now) / DAY_IN_MS));
+  return daysLeft < LICENSE_REMINDER_DAYS ? daysLeft : undefined;
+};

package/eventcatalog/tsconfig.json

@@ -14,7 +14,7 @@
       "@types": ["src/types/index.ts"],
       "@utils/*": ["src/utils/*"],
       "@layouts/*": ["src/layouts/*"],
-      "@enterprise/*": ["src/enterprise/*"],
+      "@features/*": ["src/features/*"],
       "auth:config": ["./auth.config.ts"],
       "@stores/*": ["src/stores/*"]
     },

package/package.json

@@ -5,9 +5,9 @@
     "type": "git",
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "BUSL-1.1",
   "type": "module",
-  "version": "4.12.3",
+  "version": "5.0.0-beta.1",
   "publishConfig": {
     "access": "public"
   },
@@ -42,7 +42,8 @@
     "!eventcatalog/src/snippets/",
     "!eventcatalog/src/generated-ai/",
     "bin/",
-    "dist/"
+    "dist/",
+    "NOTICE"
   ],
   "dependencies": {
     "@ai-sdk/react": "^4.0.109",
@@ -55,13 +56,14 @@
     "@asyncapi/parser": "^3.6.0",
     "@asyncapi/react-component": "3.1.0",
     "@auth/core": "^0.41.3",
-    "@eventcatalog/license": "^0.0.8",
+    "@eventcatalog/license": "^0.0.9",
     "@fontsource/inter": "^5.2.5",
     "@headlessui/react": "^2.0.3",
     "@heroicons/react": "^2.1.3",
     "@iconify-json/logos": "^1.2.4",
     "@mermaid-js/layout-elk": "^0.2.0",
-    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@modelcontextprotocol/ext-apps": "^1.7.5",
+    "@modelcontextprotocol/sdk": "^1.30.0",
     "@nanostores/react": "^1.0.0",
     "@parcel/watcher": "^2.4.1",
     "@radix-ui/react-context-menu": "^2.2.6",
@@ -85,7 +87,6 @@
     "d3-force": "3.0.0",
     "d3-selection": "3.0.0",
     "d3-zoom": "3.0.0",
-    "dagre": "^0.8.5",
     "diff": "^8.0.3",
     "diff2html": "^3.4.56",
     "dotenv": "^16.5.0",
@@ -133,9 +134,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^11.1.1",
     "zod": "^4.3.6",
-    "@eventcatalog/linter": "1.1.21",
-    "@eventcatalog/sdk": "2.29.2",
-    "@eventcatalog/visualiser": "^4.1.5"
+    "@eventcatalog/linter": "1.2.0-beta.0",
+    "@eventcatalog/visualiser": "^5.0.0-beta.0",
+    "@eventcatalog/sdk": "2.30.0-beta.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",
@@ -143,7 +144,6 @@
     "@types/d3-force": "^3.0.10",
     "@types/d3-selection": "^3.0.11",
     "@types/d3-zoom": "^3.0.8",
-    "@types/dagre": "^0.7.52",
     "@types/diff": "^5.2.2",
     "@types/js-yaml": "^4.0.9",
     "@types/jsonwebtoken": "^9.0.10",
@@ -169,7 +169,7 @@
   },
   "scripts": {
     "dev": "astro dev",
-    "build:bin": "tsup && node scripts/build-runtime-dependencies.mjs && node scripts/copy-docs-to-dist.mjs",
+    "build:bin": "tsup && node scripts/build-runtime-dependencies.mjs && node scripts/copy-docs-to-dist.mjs && node scripts/build-mcp-apps.mjs",
     "test": "cross-env DISABLE_EVENTCATALOG_CACHE=true vitest",
     "test:ci": "node scripts/ci/test.js",
     "start": "astro dev",

package/dist/chunk-FV56YFM4.js

@@ -1,7 +0,0 @@
-// src/federation/entitlement.ts
-import { isEventCatalogEnterpriseEnabled } from "@eventcatalog/license";
-var isFederationEnabled = () => isEventCatalogEnterpriseEnabled();
-
-export {
-  isFederationEnabled
-};

package/dist/federation/entitlement.cjs

@@ -1,31 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/federation/entitlement.ts
-var entitlement_exports = {};
-__export(entitlement_exports, {
-  isFederationEnabled: () => isFederationEnabled
-});
-module.exports = __toCommonJS(entitlement_exports);
-var import_license = require("@eventcatalog/license");
-var isFederationEnabled = () => (0, import_license.isEventCatalogEnterpriseEnabled)();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  isFederationEnabled
-});

package/dist/federation/entitlement.d.cts

@@ -1,12 +0,0 @@
-/**
- * Licensed under the EventCatalog Commercial License.
- * See /packages/core/src/federation/LICENSE
- */
-/**
- * Federation is enabled through the Enterprise offline entitlement. Keep
- * callers plan-agnostic so licensing details remain isolated from the
- * federation workflow.
- */
-declare const isFederationEnabled: () => Promise<boolean>;
-
-export { isFederationEnabled };

package/dist/federation/entitlement.d.ts

@@ -1,12 +0,0 @@
-/**
- * Licensed under the EventCatalog Commercial License.
- * See /packages/core/src/federation/LICENSE
- */
-/**
- * Federation is enabled through the Enterprise offline entitlement. Keep
- * callers plan-agnostic so licensing details remain isolated from the
- * federation workflow.
- */
-declare const isFederationEnabled: () => Promise<boolean>;
-
-export { isFederationEnabled };

package/dist/federation/entitlement.js

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

package/dist/runtime-dependencies/dagre.mjs

@@ -1,3 +0,0 @@
-export * from "dagre";
-import * as dependency from "dagre";
-export default dependency.default;