@eventcatalog/core 2.42.0 → 2.42.2

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.42.0";
+var version = "2.42.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-BYWZ6BFW.js";
-import "../chunk-M5NGWRPO.js";
+} from "../chunk-7UGAOGXQ.js";
+import "../chunk-JSNXGDYW.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.42.0";
+var version = "2.42.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-6XRQ4VOZ.js";
-import "../chunk-BYWZ6BFW.js";
-import "../chunk-M5NGWRPO.js";
+} from "../chunk-CJI2BJQN.js";
+import "../chunk-7UGAOGXQ.js";
+import "../chunk-JSNXGDYW.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-BYWZ6BFW.js → chunk-7UGAOGXQ.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-M5NGWRPO.js";
+} from "./chunk-JSNXGDYW.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/{chunk-6XRQ4VOZ.js → chunk-CJI2BJQN.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-BYWZ6BFW.js";
+} from "./chunk-7UGAOGXQ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-M5NGWRPO.js → chunk-JSNXGDYW.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.42.0";
+var version = "2.42.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.cjs

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

package/dist/constants.js

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

package/dist/eventcatalog.cjs

@@ -157,7 +157,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.42.0";
+var version = "2.42.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-DCLTVJDP.js";
 import {
   log_build_default
-} from "./chunk-6XRQ4VOZ.js";
-import "./chunk-BYWZ6BFW.js";
+} from "./chunk-CJI2BJQN.js";
+import "./chunk-7UGAOGXQ.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-SLEMYHTU.js";
 import {
   VERSION
-} from "./chunk-M5NGWRPO.js";
+} from "./chunk-JSNXGDYW.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogScaleEnabled,

package/eventcatalog/src/components/MDX/NodeGraph/NodeGraph.astro

@@ -14,6 +14,8 @@ import { getNodesAndEdges as getNodesAndEdgesForFlows } from '@utils/node-graphs
 import { buildUrl } from '@utils/url-builder';
 import { getVersionFromCollection } from '@utils/collections/versions';
 import { pageDataLoader } from '@utils/page-loaders/page-data-loader';
+import config from '@config';
+
 interface Props {
   id: string;
   collection: string;
@@ -51,6 +53,7 @@ if (collection in getNodesAndEdgesFunctions) {
     id,
     version,
     mode,
+    channelRenderMode: config.visualiser?.channels?.renderMode === 'single' ? 'single' : 'flat',
   });
 
   nodes = fetchedNodes;

package/eventcatalog/src/components/SideBars/ChannelSideBar.astro

@@ -8,7 +8,7 @@ import { buildUrl } from '@utils/url-builder';
 import { ScrollText } from 'lucide-react';
 import RepositoryList from '@components/Lists/RepositoryList.astro';
 import { getOwner } from '@utils/collections/owners';
-
+import { getProducersAndConsumersForChannel } from '@utils/collections/services';
 interface Props {
   channel: CollectionEntry<'channels'>;
 }
@@ -18,6 +18,7 @@ const { channel } = Astro.props;
 const ownersRaw = channel.data?.owners || [];
 const owners = await Promise.all<ReturnType<typeof getOwner>>(ownersRaw.map(getOwner));
 const filteredOwners = owners.filter((o) => o !== undefined);
+const { producers, consumers } = await getProducersAndConsumersForChannel(channel);
 
 const channelParameters: Record<string, { enum?: string[]; description?: string }> = channel.data.parameters || {};
 const parameters = Object.keys(channelParameters).map((key) => ({
@@ -55,10 +56,52 @@ const messageList = (channel.data.messages ?? []).map((p) => ({
   tag: `v${p.version}`,
   href: buildUrl(`/docs/${p.collection}/${p.id}/${p.version}`),
 }));
+
+const producersList = producers.map((p) => ({
+  label: p.data.name,
+  badge: p.collection,
+  color: 'pink',
+  collection: p.collection,
+  tag: `v${p.data.version}`,
+  href: buildUrl(`/docs/${p.collection}/${p.data.id}/${p.data.version}`),
+}));
+
+const consumersList = consumers.map((c) => ({
+  label: c.data.name,
+  badge: c.collection,
+  color: 'blue',
+  collection: c.collection,
+  tag: `v${c.data.version}`,
+  href: buildUrl(`/docs/${c.collection}/${c.data.id}/${c.data.version}`),
+}));
 ---
 
 <aside class="sticky top-28 left-0 space-y-8 h-full overflow-y-auto py-4">
   <div class="">
+    {
+      producersList.length > 0 && (
+        <PillListFlat
+          title={`Producers (${producersList.length})`}
+          pills={producersList}
+          emptyMessage={`This channel does not have any producers.`}
+          color="pink"
+          client:load
+        />
+      )
+    }
+
+    {
+      consumersList.length > 0 && (
+        <PillListFlat
+          title={`Consumers (${consumersList.length})`}
+          pills={consumersList}
+          emptyMessage={`This channel does not have any consumers.`}
+          color="blue"
+          client:load
+        />
+      )
+    }
+
     {
       messageList.length > 0 && (
         <PillListFlat

package/eventcatalog/src/utils/collections/services.ts

@@ -157,3 +157,30 @@ export const getSpecificationsForService = (service: CollectionEntry<CollectionT
     filenameWithoutExtension: path.basename(spec.path, path.extname(spec.path)),
   }));
 };
+
+// Get services for channel
+export const getProducersAndConsumersForChannel = async (channel: CollectionEntry<'channels'>) => {
+  const messages = channel.data.messages ?? [];
+  const services = await getServices({ getAllVersions: false });
+
+  const producers = services.filter((service) => {
+    const sends = service.data.sends ?? [];
+    return sends.some((send) => {
+      // @ts-ignore
+      return messages.some((m) => m.id === send.data.id);
+    });
+  });
+
+  const consumers = services.filter((service) => {
+    const receives = service.data.receives ?? [];
+    return receives.some((receive) => {
+      // @ts-ignore
+      return messages.some((m) => m.id === receive.data.id);
+    });
+  });
+
+  return {
+    producers: producers ?? [],
+    consumers: consumers ?? [],
+  };
+};

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

@@ -25,10 +25,18 @@ interface Props {
   version: string;
   defaultFlow?: DagreGraph;
   mode?: 'simple' | 'full';
+  channelRenderMode?: 'flat' | 'single';
   collection?: CollectionEntry<CollectionMessageTypes>[];
 }
 
-const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simple', collection = [] }: Props) => {
+const getNodesAndEdges = async ({
+  id,
+  version,
+  defaultFlow,
+  mode = 'simple',
+  channelRenderMode = 'flat',
+  collection = [],
+}: Props) => {
   const flow = defaultFlow || createDagreGraph({ ranksep: 300, nodesep: 50 });
   const nodes = [] as any,
     edges = [] as any;
@@ -73,6 +81,7 @@ const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simple', col
         channelToTargetLabel: getEdgeLabelForServiceAsTarget(message),
         mode,
         currentNodes: nodes,
+        channelRenderMode,
       });
       nodes.push(...channelNodes);
       edges.push(...channelEdges);
@@ -126,6 +135,7 @@ const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simple', col
         channelToTargetLabel: getEdgeLabelForMessageAsSource(message),
         mode,
         currentNodes: nodes,
+        channelRenderMode,
       });
 
       nodes.push(...channelNodes);
@@ -175,17 +185,35 @@ const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simple', col
   };
 };
 
-export const getNodesAndEdgesForQueries = async ({ id, version, defaultFlow, mode = 'simple' }: Props) => {
+export const getNodesAndEdgesForQueries = async ({
+  id,
+  version,
+  defaultFlow,
+  mode = 'simple',
+  channelRenderMode = 'flat',
+}: Props) => {
   const queries = await getQueries();
-  return getNodesAndEdges({ id, version, defaultFlow, mode, collection: queries });
+  return getNodesAndEdges({ id, version, defaultFlow, mode, channelRenderMode, collection: queries });
 };
 
-export const getNodesAndEdgesForCommands = async ({ id, version, defaultFlow, mode = 'simple' }: Props) => {
+export const getNodesAndEdgesForCommands = async ({
+  id,
+  version,
+  defaultFlow,
+  mode = 'simple',
+  channelRenderMode = 'flat',
+}: Props) => {
   const commands = await getCommands();
-  return getNodesAndEdges({ id, version, defaultFlow, mode, collection: commands });
+  return getNodesAndEdges({ id, version, defaultFlow, mode, channelRenderMode, collection: commands });
 };
 
-export const getNodesAndEdgesForEvents = async ({ id, version, defaultFlow, mode = 'simple' }: Props) => {
+export const getNodesAndEdgesForEvents = async ({
+  id,
+  version,
+  defaultFlow,
+  mode = 'simple',
+  channelRenderMode = 'flat',
+}: Props) => {
   const events = await getEvents();
-  return getNodesAndEdges({ id, version, defaultFlow, mode, collection: events });
+  return getNodesAndEdges({ id, version, defaultFlow, mode, channelRenderMode, collection: events });
 };

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

@@ -1,6 +1,5 @@
 // Can't use the CollectionEntry type from astro:content  because a client component is using this util
-// import { type CollectionEntry } from 'astro:content';
-import catalog from '@utils/eventcatalog-config/catalog';
+
 import { MarkerType, Position, type Edge, type Node } from '@xyflow/react';
 import dagre from 'dagre';
 import { getItemsFromCollectionByIdAndSemverOrLatest } from '@utils/collections/util';
@@ -103,6 +102,7 @@ export const getChannelNodesAndEdges = ({
   sourceToChannelLabel = 'sends to channel',
   mode = 'full',
   currentNodes = [],
+  channelRenderMode = 'flat',
 }: {
   channels: CollectionItem[];
   channelsToRender: { id: string; version: string }[];
@@ -112,6 +112,7 @@ export const getChannelNodesAndEdges = ({
   sourceToChannelLabel?: string;
   mode?: 'simple' | 'full';
   currentNodes?: Node[];
+  channelRenderMode?: 'flat' | 'single';
 }) => {
   const nodes: Node[] = [];
   const edges: Edge[] = [];
@@ -122,7 +123,7 @@ export const getChannelNodesAndEdges = ({
     .filter((channel) => channel !== undefined);
 
   channels.forEach((channel) => {
-    const singleChannel = catalog.visualiser?.channels?.renderMode === 'single'; // Only one node per channel, other wise one node per channel connection
+    const singleChannel = channelRenderMode === 'single'; // Only one node per channel, other wise one node per channel connection
     const channelId = singleChannel ? generateIdForNodes([channel]) : generateIdForNodes([source, channel, target]);
 
     // Need to check if the channel node is already in the graph

package/package.json

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