@eventcatalog/core 2.41.1 → 2.42.1

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.41.1";
+var version = "2.42.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-ZOHANGSK.js";
-import "../chunk-ZTIHRJ5F.js";
+} from "../chunk-V4HWGD4W.js";
+import "../chunk-TRONGJTE.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.41.1";
+var version = "2.42.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-LJRN3X6I.js";
-import "../chunk-ZOHANGSK.js";
-import "../chunk-ZTIHRJ5F.js";
+} from "../chunk-BMQTJBZQ.js";
+import "../chunk-V4HWGD4W.js";
+import "../chunk-TRONGJTE.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-LJRN3X6I.js → chunk-BMQTJBZQ.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-ZOHANGSK.js";
+} from "./chunk-V4HWGD4W.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-ZTIHRJ5F.js → chunk-TRONGJTE.js}

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

package/dist/{chunk-ZOHANGSK.js → chunk-V4HWGD4W.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-ZTIHRJ5F.js";
+} from "./chunk-TRONGJTE.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.41.1";
+var version = "2.42.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.config.d.cts

@@ -91,6 +91,11 @@ interface Config {
     api?: {
         fullCatalogAPIEnabled?: boolean;
     };
+    visualiser?: {
+        channels?: {
+            renderMode?: 'flat' | 'single';
+        };
+    };
 }
 
 export type { Config, SideBarConfig };

package/dist/eventcatalog.config.d.ts

@@ -91,6 +91,11 @@ interface Config {
     api?: {
         fullCatalogAPIEnabled?: boolean;
     };
+    visualiser?: {
+        channels?: {
+            renderMode?: 'flat' | 'single';
+        };
+    };
 }
 
 export type { Config, SideBarConfig };

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-DCLTVJDP.js";
 import {
   log_build_default
-} from "./chunk-LJRN3X6I.js";
-import "./chunk-ZOHANGSK.js";
+} from "./chunk-BMQTJBZQ.js";
+import "./chunk-V4HWGD4W.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-SLEMYHTU.js";
 import {
   VERSION
-} from "./chunk-ZTIHRJ5F.js";
+} from "./chunk-TRONGJTE.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogScaleEnabled,

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/pages/docs/llm/llms.txt.ts

@@ -18,7 +18,7 @@ const customDocs = await getCollection('customPages');
 
 export const GET: APIRoute = async ({ params, request }) => {
   const url = new URL(request.url);
-  const baseUrl = `${url.origin}`;
+  const baseUrl = process.env.LLMS_TXT_BASE_URL || `${url.origin}`;
 
   const formatVersionedItem = (item: any, type: string) =>
     `- [${item.data.name} - ${item.data.id} - ${item.data.version}](${baseUrl}/docs/${type}/${item.data.id}/${item.data.version}.mdx) - ${item.data.summary}`;

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/utils/utils.ts

@@ -1,5 +1,6 @@
 // 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';
@@ -121,19 +122,20 @@ export const getChannelNodesAndEdges = ({
     .filter((channel) => channel !== undefined);
 
   channels.forEach((channel) => {
-    const channelId = generateIdForNodes([source, channel, target]);
+    const singleChannel = catalog.visualiser?.channels?.renderMode === '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
-    // if (!currentNodes.find((node) => node.id === channelId)) {
-    nodes.push(
-      createNode({
-        id: channelId,
-        data: { title: channel?.data.id, mode, channel, source, target },
-        position: { x: 0, y: 0 },
-        type: channel?.collection,
-      })
-    );
-    // }
+    if (!currentNodes.find((node) => node.id === channelId)) {
+      nodes.push(
+        createNode({
+          id: channelId,
+          data: { title: channel?.data.id, mode, channel, source, target },
+          position: { x: 0, y: 0 },
+          type: channel?.collection,
+        })
+      );
+    }
 
     // if the source (left node) is a service, use the target as the edge message
     const edgeMessage = source.collection === 'services' ? target : source;

package/package.json

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