@eventcatalog/core 2.55.2 → 2.55.3

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-IDIX2ZKS.js";
-import "../chunk-GVFJKTWB.js";
+} from "../chunk-T5TRFXGX.js";
+import "../chunk-WYTPPCGQ.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.55.2";
+var version = "2.55.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-5LLK3UBP.js";
-import "../chunk-IDIX2ZKS.js";
-import "../chunk-GVFJKTWB.js";
+} from "../chunk-6MWKM7BG.js";
+import "../chunk-T5TRFXGX.js";
+import "../chunk-WYTPPCGQ.js";
 import "../chunk-UPONRQSN.js";
 export {
   log_build_default as default

package/dist/{chunk-5LLK3UBP.js → chunk-6MWKM7BG.js}

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

package/dist/{chunk-IDIX2ZKS.js → chunk-T5TRFXGX.js}

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

package/dist/{chunk-GVFJKTWB.js → chunk-WYTPPCGQ.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.55.2";
+var version = "2.55.3";
 
 // 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.55.2";
+var version = "2.55.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-GVFJKTWB.js";
+} from "./chunk-WYTPPCGQ.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.55.2";
+var version = "2.55.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,8 +6,8 @@ import {
 } from "./chunk-PLNJC7NZ.js";
 import {
   log_build_default
-} from "./chunk-5LLK3UBP.js";
-import "./chunk-IDIX2ZKS.js";
+} from "./chunk-6MWKM7BG.js";
+import "./chunk-T5TRFXGX.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
@@ -15,7 +15,7 @@ import {
 import "./chunk-55D645EH.js";
 import {
   VERSION
-} from "./chunk-GVFJKTWB.js";
+} from "./chunk-WYTPPCGQ.js";
 import {
   getProjectOutDir,
   isAuthEnabled,

package/eventcatalog/src/pages/architecture/architecture.astro

@@ -7,6 +7,7 @@ import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
 import DomainGrid from '@components/Grids/DomainGrid';
 import ServiceGrid from '@components/Grids/ServiceGrid';
 import MessageGrid from '@components/Grids/MessageGrid';
+import { removeContentFromCollection } from '@utils/collections/util';
 
 import type { CollectionEntry } from 'astro:content';
 import type { CollectionMessageTypes } from '@types';
@@ -64,13 +65,9 @@ if (type === 'services') {
   }) as unknown as Service[];
   items = filteredServices;
 } else if (type === 'messages') {
-  const { events, commands, queries } = await getMessages({ getAllVersions: false });
+  const { events, commands, queries } = await getMessages({ getAllVersions: false, hydrateServices: false });
   const messages = [...events, ...commands, ...queries];
-  items = messages.map((m) => ({
-    ...m,
-    body: undefined,
-    catalog: undefined,
-  })) as unknown as CollectionEntry<CollectionMessageTypes>[];
+  items = removeContentFromCollection(messages) as unknown as CollectionEntry<CollectionMessageTypes>[];
 }
 ---
 

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

@@ -148,3 +148,11 @@ export const getDeprecatedDetails = (item: CollectionEntry<CollectionTypes>) =>
 
   return options;
 };
+
+export const removeContentFromCollection = (collection: CollectionEntry<CollectionTypes>[]) => {
+  return collection.map((item) => ({
+    ...item,
+    body: undefined,
+    catalog: undefined,
+  }));
+};

package/eventcatalog/src/utils/commands.ts

@@ -15,6 +15,7 @@ type Command = CollectionEntry<'commands'> & {
 
 interface Props {
   getAllVersions?: boolean;
+  hydrateServices?: boolean;
 }
 
 // cache for build time
@@ -23,10 +24,10 @@ let cachedCommands: Record<string, Command[]> = {
   currentVersions: [],
 };
 
-export const getCommands = async ({ getAllVersions = true }: Props = {}): Promise<Command[]> => {
+export const getCommands = async ({ getAllVersions = true, hydrateServices = true }: Props = {}): Promise<Command[]> => {
   const cacheKey = getAllVersions ? 'allVersions' : 'currentVersions';
 
-  if (cachedCommands[cacheKey].length > 0) {
+  if (cachedCommands[cacheKey].length > 0 && hydrateServices) {
     return cachedCommands[cacheKey];
   }
 
@@ -37,24 +38,35 @@ export const getCommands = async ({ getAllVersions = true }: Props = {}): Promis
   const services = await getCollection('services');
   const allChannels = await getCollection('channels');
 
+  // @ts-ignore
   cachedCommands[cacheKey] = commands.map((command) => {
     const { latestVersion, versions } = getVersionForCollectionItem(command, commands);
 
-    const producers = services.filter((service) => {
-      return service.data.sends?.some((item) => {
-        if (item.id != command.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return command.data.version == latestVersion;
-        return satisfies(command.data.version, item.version);
+    const producers = services
+      .filter((service) => {
+        return service.data.sends?.some((item) => {
+          if (item.id != command.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return command.data.version == latestVersion;
+          return satisfies(command.data.version, item.version);
+        });
+      })
+      .map((service) => {
+        if (!hydrateServices) return { id: service.id, version: service.data.version };
+        return service;
       });
-    });
 
-    const consumers = services.filter((service) => {
-      return service.data.receives?.some((item) => {
-        if (item.id != command.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return command.data.version == latestVersion;
-        return satisfies(command.data.version, item.version);
+    const consumers = services
+      .filter((service) => {
+        return service.data.receives?.some((item) => {
+          if (item.id != command.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return command.data.version == latestVersion;
+          return satisfies(command.data.version, item.version);
+        });
+      })
+      .map((service) => {
+        if (!hydrateServices) return { id: service.id, version: service.data.version };
+        return service;
       });
-    });
 
     const messageChannels = command.data.channels || [];
     const channelsForCommand = allChannels.filter((c) => messageChannels.some((channel) => c.data.id === channel.id));

package/eventcatalog/src/utils/events.ts

@@ -15,6 +15,7 @@ type Event = CollectionEntry<'events'> & {
 
 interface Props {
   getAllVersions?: boolean;
+  hydrateServices?: boolean;
 }
 
 // cache for build time
@@ -23,10 +24,10 @@ let cachedEvents: Record<string, Event[]> = {
   currentVersions: [],
 };
 
-export const getEvents = async ({ getAllVersions = true }: Props = {}): Promise<Event[]> => {
+export const getEvents = async ({ getAllVersions = true, hydrateServices = true }: Props = {}): Promise<Event[]> => {
   const cacheKey = getAllVersions ? 'allVersions' : 'currentVersions';
 
-  if (cachedEvents[cacheKey].length > 0) {
+  if (cachedEvents[cacheKey].length > 0 && hydrateServices) {
     return cachedEvents[cacheKey];
   }
 
@@ -37,24 +38,35 @@ export const getEvents = async ({ getAllVersions = true }: Props = {}): Promise<
   const services = await getCollection('services');
   const allChannels = await getCollection('channels');
 
+  // @ts-ignore
   cachedEvents[cacheKey] = events.map((event) => {
     const { latestVersion, versions } = getVersionForCollectionItem(event, events);
 
-    const producers = services.filter((service) =>
-      service.data.sends?.some((item) => {
-        if (item.id != event.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return event.data.version == latestVersion;
-        return satisfies(event.data.version, item.version);
-      })
-    );
+    const producers = services
+      .filter((service) =>
+        service.data.sends?.some((item) => {
+          if (item.id != event.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return event.data.version == latestVersion;
+          return satisfies(event.data.version, item.version);
+        })
+      )
+      .map((service) => {
+        if (!hydrateServices) return { id: service.id, version: service.data.version };
+        return service;
+      });
 
-    const consumers = services.filter((service) =>
-      service.data.receives?.some((item) => {
-        if (item.id != event.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return event.data.version == latestVersion;
-        return satisfies(event.data.version, item.version);
-      })
-    );
+    const consumers = services
+      .filter((service) =>
+        service.data.receives?.some((item) => {
+          if (item.id != event.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return event.data.version == latestVersion;
+          return satisfies(event.data.version, item.version);
+        })
+      )
+      .map((service) => {
+        if (!hydrateServices) return { id: service.id, version: service.data.version };
+        return service;
+      });
 
     const messageChannels = event.data.channels || [];
     const channelsForEvent = allChannels.filter((c) => messageChannels.some((channel) => c.data.id === channel.id));

package/eventcatalog/src/utils/messages.ts

@@ -8,6 +8,7 @@ export { getEvents } from '@utils/events';
 
 interface Props {
   getAllVersions?: boolean;
+  hydrateServices?: boolean;
 }
 
 type Messages = {
@@ -17,11 +18,11 @@ type Messages = {
 };
 
 // Main function that uses the imported functions
-export const getMessages = async ({ getAllVersions = true }: Props = {}): Promise<Messages> => {
+export const getMessages = async ({ getAllVersions = true, hydrateServices = true }: Props = {}): Promise<Messages> => {
   const [commands, events, queries] = await Promise.all([
-    getCommands({ getAllVersions }),
-    getEvents({ getAllVersions }),
-    getQueries({ getAllVersions }),
+    getCommands({ getAllVersions, hydrateServices }),
+    getEvents({ getAllVersions, hydrateServices }),
+    getQueries({ getAllVersions, hydrateServices }),
   ]);
 
   return {

package/eventcatalog/src/utils/queries.ts

@@ -15,6 +15,7 @@ type Query = CollectionEntry<'queries'> & {
 
 interface Props {
   getAllVersions?: boolean;
+  hydrateServices?: boolean;
 }
 
 // Cache for build time
@@ -23,10 +24,10 @@ let cachedQueries: Record<string, Query[]> = {
   currentVersions: [],
 };
 
-export const getQueries = async ({ getAllVersions = true }: Props = {}): Promise<Query[]> => {
+export const getQueries = async ({ getAllVersions = true, hydrateServices = true }: Props = {}): Promise<Query[]> => {
   const cacheKey = getAllVersions ? 'allVersions' : 'currentVersions';
 
-  if (cachedQueries[cacheKey].length > 0) {
+  if (cachedQueries[cacheKey].length > 0 && hydrateServices) {
     return cachedQueries[cacheKey];
   }
 
@@ -37,24 +38,35 @@ export const getQueries = async ({ getAllVersions = true }: Props = {}): Promise
   const services = await getCollection('services');
   const allChannels = await getCollection('channels');
 
+  // @ts-ignore
   cachedQueries[cacheKey] = queries.map((query) => {
     const { latestVersion, versions } = getVersionForCollectionItem(query, queries);
 
-    const producers = services.filter((service) =>
-      service.data.sends?.some((item) => {
-        if (item.id != query.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return query.data.version == latestVersion;
-        return satisfies(query.data.version, item.version);
-      })
-    );
+    const producers = services
+      .filter((service) =>
+        service.data.sends?.some((item) => {
+          if (item.id != query.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return query.data.version == latestVersion;
+          return satisfies(query.data.version, item.version);
+        })
+      )
+      .map((service) => {
+        if (!hydrateServices) return { id: service.id, version: service.data.version };
+        return service;
+      });
 
-    const consumers = services.filter((service) =>
-      service.data.receives?.some((item) => {
-        if (item.id != query.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return query.data.version == latestVersion;
-        return satisfies(query.data.version, item.version);
-      })
-    );
+    const consumers = services
+      .filter((service) =>
+        service.data.receives?.some((item) => {
+          if (item.id != query.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return query.data.version == latestVersion;
+          return satisfies(query.data.version, item.version);
+        })
+      )
+      .map((service) => {
+        if (!hydrateServices) return { id: service.id, version: service.data.version };
+        return service;
+      });
 
     const messageChannels = query.data.channels || [];
     const channelsForQuery = allChannels.filter((c) => messageChannels.some((channel) => c.data.id === channel.id));

package/package.json

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