@eventcatalog/core 2.8.6 → 2.8.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eventcatalog/core
 
+## 2.8.7
+
+### Patch Changes
+
+- ce04693: fix(core): fixed visualization node graph for domains, reduced overlapping
+
 ## 2.8.6
 
 ### Patch Changes

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "publishConfig": {
     "access": "public"
   },

package/src/utils/domains/node-graph.ts

@@ -1,19 +1,11 @@
 import { getCollection } from 'astro:content';
-import dagre from 'dagre';
+import { createDagreGraph, calculatedNodes } from '@utils/node-graph-utils/utils';
 import { getNodesAndEdges as getServicesNodeAndEdges } from '../services/node-graph';
 import merge from 'lodash.merge';
 import { getItemsFromCollectionByIdAndSemverOrLatest } from '@utils/collections/util';
 
 type DagreGraph = any;
 
-// Creates a new dagre graph
-export const getDagreGraph = () => {
-  const graph = new dagre.graphlib.Graph({ compound: true });
-  graph.setGraph({ rankdir: 'LR', ranksep: 200, nodesep: 100 });
-  graph.setDefaultEdgeLabel(() => ({}));
-  return graph;
-};
-
 interface Props {
   id: string;
   version: string;
@@ -22,7 +14,7 @@ interface Props {
 }
 
 export const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simple' }: Props) => {
-  const flow = defaultFlow || getDagreGraph();
+  const flow = defaultFlow || createDagreGraph({ ranksep: 360, nodesep: 50, edgesep: 50 });
   let nodes = new Map(),
     edges = new Map();
 
@@ -73,7 +65,7 @@ export const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simpl
   }
 
   return {
-    nodes: [...nodes.values()],
+    nodes: calculatedNodes(flow, Array.from(nodes.values())),
     edges: [...edges.values()],
   };
 };

package/src/utils/node-graph-utils/utils.ts

@@ -2,8 +2,6 @@ import type { CollectionEntry } from 'astro:content';
 import type { Node } from 'reactflow';
 import dagre from 'dagre';
 
-type DagreGraph = any;
-
 export const generateIdForNode = (node: CollectionEntry<'events' | 'services' | 'commands'>) => {
   return `${node.data.id}-${node.data.version}`;
 };
@@ -23,9 +21,9 @@ export const calculatedNodes = (flow: dagre.graphlib.Graph, nodes: Node[]) => {
 };
 
 // Creates a new dagre graph
-export const createDagreGraph = ({ ranksep = 180, nodesep = 50 }: any) => {
+export const createDagreGraph = ({ ranksep = 180, nodesep = 50, ...rest }: any) => {
   const graph = new dagre.graphlib.Graph({ compound: true });
-  graph.setGraph({ rankdir: 'LR', ranksep, nodesep });
+  graph.setGraph({ rankdir: 'LR', ranksep, nodesep, ...rest });
   graph.setDefaultEdgeLabel(() => ({}));
   return graph;
 };