@eventcatalog/core 2.61.8 → 2.62.0

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-FJTZJDTP.js";
-import "../chunk-WXXNY7YM.js";
+} from "../chunk-O46GCWLU.js";
+import "../chunk-5XCX54DV.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.61.8";
+var version = "2.62.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-USUBTL4C.js";
-import "../chunk-FJTZJDTP.js";
-import "../chunk-WXXNY7YM.js";
+} from "../chunk-QFX5AZFO.js";
+import "../chunk-O46GCWLU.js";
+import "../chunk-5XCX54DV.js";
 import "../chunk-UPONRQSN.js";
 export {
   log_build_default as default

package/dist/{chunk-WXXNY7YM.js → chunk-5XCX54DV.js}

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

package/dist/{chunk-FJTZJDTP.js → chunk-O46GCWLU.js}

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

package/dist/{chunk-USUBTL4C.js → chunk-QFX5AZFO.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-WXXNY7YM.js";
+} from "./chunk-5XCX54DV.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.61.8";
+var version = "2.62.0";
 
 // 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-USUBTL4C.js";
-import "./chunk-FJTZJDTP.js";
+} from "./chunk-QFX5AZFO.js";
+import "./chunk-O46GCWLU.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
@@ -15,7 +15,7 @@ import {
 import "./chunk-55D645EH.js";
 import {
   VERSION
-} from "./chunk-WXXNY7YM.js";
+} from "./chunk-5XCX54DV.js";
 import {
   getProjectOutDir,
   isAuthEnabled,

package/eventcatalog/astro.config.mjs

@@ -24,7 +24,7 @@ import ecstudioWatcher from './integrations/ecstudio-watcher.mjs';
 const projectDirectory = process.env.PROJECT_DIR || process.cwd();
 const base = config.base || '/';
 const host = config.host || false;
-const compress = config.compress ?? true;
+const compress = config.compress ?? false;
 
 const expressiveCodeConfig = {
   themes: ['andromeeda'],

package/eventcatalog/src/pages/docs/llm/llms-services.txt.ts

@@ -16,41 +16,64 @@ export const GET: APIRoute = async ({ params, request }) => {
     const readsFrom = service.data.readsFrom as unknown as CollectionEntry<'containers'>[];
 
     const sendsList =
-      sends
-        .map(
-          (send) =>
-            `    - [${send.data.name} - ${send.data.version}](${baseUrl}/docs/events/${send.data.id}/${send.data.version}.mdx) - ${send.data.summary}`
-        )
-        .join('') || '    - Does not send any messages';
+      sends.length > 0
+        ? sends
+            .map(
+              (send) =>
+                `- [${send.data.name} - ${send.data.version}](${baseUrl}/docs/events/${send.data.id}/${send.data.version}.mdx) - ${send.data.summary?.trim() || ''}`
+            )
+            .join('\n')
+        : '- Does not send any messages';
 
     const receivesList =
-      receives
-        .map(
-          (receive) =>
-            `    - [${receive.data.name} - ${receive.data.version}](${baseUrl}/docs/events/${receive.data.id}/${receive.data.version}.mdx) - ${receive.data.summary}`
-        )
-        .join('') || '    - Does not receive any messages';
+      receives.length > 0
+        ? receives
+            .map(
+              (receive) =>
+                `- [${receive.data.name} - ${receive.data.version}](${baseUrl}/docs/events/${receive.data.id}/${receive.data.version}.mdx) - ${receive.data.summary?.trim() || ''}`
+            )
+            .join('\n')
+        : '- Does not receive any messages';
 
     const writesToList =
-      writesTo
-        .map(
-          (write) =>
-            `    - [${write.data.name} - ${write.data.version}](${baseUrl}/docs/containers/${write.data.id}/${write.data.version}.mdx) - ${write.data.summary}`
-        )
-        .join('') || '    - Does not write to any containers';
+      writesTo.length > 0
+        ? writesTo
+            .map(
+              (write) =>
+                `- [${write.data.name} - ${write.data.version}](${baseUrl}/docs/containers/${write.data.id}/${write.data.version}.mdx) - ${write.data.summary?.trim() || ''}`
+            )
+            .join('\n')
+        : '- Does not write to any containers';
 
     const readsFromList =
-      readsFrom
-        .map(
-          (read) =>
-            `    - [${read.data.name} - ${read.data.version}](${baseUrl}/docs/containers/${read.data.id}/${read.data.version}.mdx) - ${read.data.summary}`
-        )
-        .join('') || '    - Does not read from any containers';
-
-    return `## [${service.data.name} - ${service.data.version}](${baseUrl}/docs/services/${service.data.id}/${service.data.version}.mdx) - ${service.data.summary}\n  ## Sends\n${sendsList}\n  ## Receives\n${receivesList}\n  ## Writes to\n${writesToList}\n  ## Reads from\n${readsFromList} \n`;
+      readsFrom.length > 0
+        ? readsFrom
+            .map(
+              (read) =>
+                `- [${read.data.name} - ${read.data.version}](${baseUrl}/docs/containers/${read.data.id}/${read.data.version}.mdx) - ${read.data.summary?.trim() || ''}`
+            )
+            .join('\n')
+        : '- Does not read from any containers';
+
+    return `## [${service.data.name} - ${service.data.version}](${baseUrl}/docs/services/${service.data.id}/${service.data.version}.mdx)
+
+${service.data.summary?.trim() || ''}
+
+### Sends
+${sendsList}
+
+### Receives
+${receivesList}
+
+### Writes to
+${writesToList}
+
+### Reads from
+${readsFromList}
+`;
   };
 
-  const content = ['# Services \n\n', services.map((item) => formatServiceWithLinks(item)).join('\n')].join('\n');
+  const content = ['# Services\n', services.map((item) => formatServiceWithLinks(item)).join('\n')].join('\n');
 
   return new Response(content, {
     headers: { 'Content-Type': 'text/plain; charset=utf-8' },

package/eventcatalog/src/utils/channels.ts

@@ -4,6 +4,7 @@ import path from 'path';
 import { getVersionForCollectionItem, satisfies } from './collections/util';
 import { getMessages } from './messages';
 import type { CollectionMessageTypes } from '@types';
+import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -39,40 +40,50 @@ export const getChannels = async ({ getAllVersions = true }: Props = {}): Promis
   const { commands, events, queries } = await getMessages();
   const allMessages = [...commands, ...events, ...queries];
 
-  cachedChannels[cacheKey] = channels.map((channel) => {
-    const { latestVersion, versions } = getVersionForCollectionItem(channel, channels);
+  cachedChannels[cacheKey] = await Promise.all(
+    channels.map(async (channel) => {
+      const { latestVersion, versions } = getVersionForCollectionItem(channel, channels);
 
-    const messagesForChannel = allMessages.filter((message) => {
-      return message.data.channels?.some((messageChannel) => {
-        if (messageChannel.id != channel.data.id) return false;
-        if (messageChannel.version == 'latest' || messageChannel.version == undefined)
-          return channel.data.version == latestVersion;
-        return satisfies(channel.data.version, messageChannel.version);
+      const messagesForChannel = allMessages.filter((message) => {
+        return message.data.channels?.some((messageChannel) => {
+          if (messageChannel.id != channel.data.id) return false;
+          if (messageChannel.version == 'latest' || messageChannel.version == undefined)
+            return channel.data.version == latestVersion;
+          return satisfies(channel.data.version, messageChannel.version);
+        });
       });
-    });
 
-    const messages = messagesForChannel.map((message: CollectionEntry<CollectionMessageTypes>) => {
-      return { id: message.data.id, name: message.data.name, version: message.data.version, collection: message.collection };
-    });
+      const messages = messagesForChannel.map((message: CollectionEntry<CollectionMessageTypes>) => {
+        return { id: message.data.id, name: message.data.name, version: message.data.version, collection: message.collection };
+      });
 
-    return {
-      ...channel,
-      data: {
-        ...channel.data,
-        versions,
-        latestVersion,
-        messages,
-      },
-      catalog: {
-        path: path.join(channel.collection, channel.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, channel.collection, channel.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', channel.collection, channel.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', channel.collection, channel.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', channel.collection, channel.id.replace(`-${channel.data.version}`, '')),
-        type: 'event',
-      },
-    };
-  });
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(
+        process.env.PROJECT_DIR ?? '',
+        channel.data.id,
+        channel.data.version.toString()
+      );
+      const channelFolderName = folderName ?? channel.id.replace(`-${channel.data.version}`, '');
+
+      return {
+        ...channel,
+        data: {
+          ...channel.data,
+          versions,
+          latestVersion,
+          messages,
+        },
+        catalog: {
+          path: path.join(channel.collection, channel.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, channel.collection, channel.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', channel.collection, channel.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', channel.collection, channel.id.replace('/index.mdx', '')),
+          publicPath: path.join('/generated', channel.collection, channelFolderName),
+          type: 'event',
+        },
+      };
+    })
+  );
 
   // order them by the name of the channel
   cachedChannels[cacheKey].sort((a, b) => {

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

@@ -2,6 +2,7 @@ import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
 import { getVersionForCollectionItem, satisfies } from './util';
+import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -36,54 +37,70 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
 
   const services = await getCollection('services');
 
-  cachedEntities[cacheKey] = containers.map((container) => {
-    const { latestVersion, versions } = getVersionForCollectionItem(container, containers);
+  cachedEntities[cacheKey] = await Promise.all(
+    containers.map(async (container) => {
+      const { latestVersion, versions } = getVersionForCollectionItem(container, containers);
 
-    const servicesThatReferenceContainer = services.filter((service) => {
-      const references = [...(service.data.writesTo || []), ...(service.data.readsFrom || [])];
-      return references.some((item) => {
-        if (item.id != container.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return container.data.version == latestVersion;
-        return satisfies(container.data.version, item.version);
+      const servicesThatReferenceContainer = services.filter((service) => {
+        const references = [...(service.data.writesTo || []), ...(service.data.readsFrom || [])];
+        return references.some((item) => {
+          if (item.id != container.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return container.data.version == latestVersion;
+          return satisfies(container.data.version, item.version);
+        });
       });
-    });
 
-    const servicesThatWriteToContainer = services.filter((service) => {
-      return service.data?.writesTo?.some((item) => {
-        if (item.id != container.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return container.data.version == latestVersion;
-        return satisfies(container.data.version, item.version);
+      const servicesThatWriteToContainer = services.filter((service) => {
+        return service.data?.writesTo?.some((item) => {
+          if (item.id != container.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return container.data.version == latestVersion;
+          return satisfies(container.data.version, item.version);
+        });
       });
-    });
 
-    const servicesThatReadFromContainer = services.filter((service) => {
-      return service.data?.readsFrom?.some((item) => {
-        if (item.id != container.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return container.data.version == latestVersion;
-        return satisfies(container.data.version, item.version);
+      const servicesThatReadFromContainer = services.filter((service) => {
+        return service.data?.readsFrom?.some((item) => {
+          if (item.id != container.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return container.data.version == latestVersion;
+          return satisfies(container.data.version, item.version);
+        });
       });
-    });
-
-    return {
-      ...container,
-      data: {
-        ...container.data,
-        versions,
-        latestVersion,
-        services: servicesThatReferenceContainer,
-        servicesThatWriteToContainer,
-        servicesThatReadFromContainer,
-      },
-      catalog: {
-        path: path.join(container.collection, container.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, container.collection, container.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', container.collection, container.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', container.collection, container.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', container.collection, container.id.replace(`-${container.data.version}`, '')),
-        type: 'container',
-      },
-    };
-  });
+
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(
+        process.env.PROJECT_DIR ?? '',
+        container.data.id,
+        container.data.version.toString()
+      );
+      const containerFolderName = folderName ?? container.id.replace(`-${container.data.version}`, '');
+
+      return {
+        ...container,
+        data: {
+          ...container.data,
+          versions,
+          latestVersion,
+          services: servicesThatReferenceContainer,
+          servicesThatWriteToContainer,
+          servicesThatReadFromContainer,
+        },
+        catalog: {
+          path: path.join(container.collection, container.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, container.collection, container.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', container.collection, container.id),
+          filePath: path.join(
+            process.cwd(),
+            'src',
+            'catalog-files',
+            container.collection,
+            container.id.replace('/index.mdx', '')
+          ),
+          publicPath: path.join('/generated', container.collection, containerFolderName),
+          type: 'container',
+        },
+      };
+    })
+  );
 
   // order them by the name of the event
   cachedEntities[cacheKey].sort((a, b) => {

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

@@ -4,6 +4,7 @@ import type { CollectionEntry } from 'astro:content';
 import path from 'path';
 import type { CollectionMessageTypes } from '@types';
 import type { Service } from './services';
+import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -37,56 +38,66 @@ export const getDomains = async ({ getAllVersions = true }: Props = {}): Promise
   const entitiesCollection = await getCollection('entities');
 
   // @ts-ignore // TODO: Fix this type
-  cachedDomains[cacheKey] = domains.map((domain) => {
-    const { latestVersion, versions } = getVersionForCollectionItem(domain, domains);
-
-    // const receives = service.data.receives || [];
-    const servicesInDomain = domain.data.services || [];
-    const subDomainsInDomain = domain.data.domains || [];
-    const entitiesInDomain = domain.data.entities || [];
-    const subDomains = subDomainsInDomain
-      .map((_subDomain: { id: string; version: string | undefined }) =>
-        getItemsFromCollectionByIdAndSemverOrLatest(domains, _subDomain.id, _subDomain.version)
-      )
-      .flat()
-      // Stop circular references
-      .filter((subDomain) => subDomain.data.id !== domain.data.id);
-
-    // Services in the sub domains
-    const subdomainServices = subDomains.flatMap((subDomain) => subDomain.data.services || []);
-
-    const services = [...servicesInDomain, ...subdomainServices]
-      .map((_service: { id: string; version: string | undefined }) =>
-        getItemsFromCollectionByIdAndSemverOrLatest(servicesCollection, _service.id, _service.version)
-      )
-      .flat();
-
-    const entities = [...entitiesInDomain]
-      .map((_entity: { id: string; version: string | undefined }) =>
-        getItemsFromCollectionByIdAndSemverOrLatest(entitiesCollection, _entity.id, _entity.version)
-      )
-      .flat();
-
-    return {
-      ...domain,
-      data: {
-        ...domain.data,
-        services: services,
-        domains: subDomains,
-        entities: entities,
-        latestVersion,
-        versions,
-      },
-      catalog: {
-        path: path.join(domain.collection, domain.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, domain.collection, domain.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', domain.collection, domain.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', domain.collection, domain.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', domain.collection, domain.id.replace(`-${domain.data.version}`, '')),
-        type: 'service',
-      },
-    };
-  });
+  cachedDomains[cacheKey] = await Promise.all(
+    domains.map(async (domain) => {
+      const { latestVersion, versions } = getVersionForCollectionItem(domain, domains);
+
+      // const receives = service.data.receives || [];
+      const servicesInDomain = domain.data.services || [];
+      const subDomainsInDomain = domain.data.domains || [];
+      const entitiesInDomain = domain.data.entities || [];
+      const subDomains = subDomainsInDomain
+        .map((_subDomain: { id: string; version: string | undefined }) =>
+          getItemsFromCollectionByIdAndSemverOrLatest(domains, _subDomain.id, _subDomain.version)
+        )
+        .flat()
+        // Stop circular references
+        .filter((subDomain) => subDomain.data.id !== domain.data.id);
+
+      // Services in the sub domains
+      const subdomainServices = subDomains.flatMap((subDomain) => subDomain.data.services || []);
+
+      const services = [...servicesInDomain, ...subdomainServices]
+        .map((_service: { id: string; version: string | undefined }) =>
+          getItemsFromCollectionByIdAndSemverOrLatest(servicesCollection, _service.id, _service.version)
+        )
+        .flat();
+
+      const entities = [...entitiesInDomain]
+        .map((_entity: { id: string; version: string | undefined }) =>
+          getItemsFromCollectionByIdAndSemverOrLatest(entitiesCollection, _entity.id, _entity.version)
+        )
+        .flat();
+
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(
+        process.env.PROJECT_DIR ?? '',
+        domain.data.id,
+        domain.data.version.toString()
+      );
+      const domainFolderName = folderName ?? domain.id.replace(`-${domain.data.version}`, '');
+
+      return {
+        ...domain,
+        data: {
+          ...domain.data,
+          services: services,
+          domains: subDomains,
+          entities: entities,
+          latestVersion,
+          versions,
+        },
+        catalog: {
+          path: path.join(domain.collection, domain.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, domain.collection, domain.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', domain.collection, domain.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', domain.collection, domain.id.replace('/index.mdx', '')),
+          publicPath: path.join('/generated', domain.collection, domainFolderName),
+          type: 'service',
+        },
+      };
+    })
+  );
 
   // order them by the name of the domain
   cachedDomains[cacheKey].sort((a, b) => {

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

@@ -5,6 +5,7 @@ import path from 'path';
 import semver from 'semver';
 import type { CollectionTypes } from '@types';
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
+import utils from '@eventcatalog/sdk';
 
 export type Service = CollectionEntry<'services'>;
 
@@ -39,69 +40,79 @@ export const getServices = async ({ getAllVersions = true }: Props = {}): Promis
   const allMessages = [...events, ...commands, ...queries];
 
   // @ts-ignore // TODO: Fix this type
-  cachedServices[cacheKey] = services.map((service) => {
-    const { latestVersion, versions } = getVersionForCollectionItem(service, services);
-
-    const sendsMessages = service.data.sends || [];
-    const receivesMessages = service.data.receives || [];
-    const serviceEntities = service.data.entities || [];
-    const serviceWritesTo = service.data.writesTo || [];
-    const serviceReadsFrom = service.data.readsFrom || [];
-
-    const sends = sendsMessages
-      .map((message: any) => getItemsFromCollectionByIdAndSemverOrLatest(allMessages, message.id, message.version))
-      .flat()
-      .filter((e: any) => e !== undefined);
-
-    const receives = receivesMessages
-      .map((message: any) => getItemsFromCollectionByIdAndSemverOrLatest(allMessages, message.id, message.version))
-      .flat()
-      .filter((e: any) => e !== undefined);
-
-    const mappedEntities = serviceEntities
-      .map((entity: any) => getItemsFromCollectionByIdAndSemverOrLatest(entities, entity.id, entity.version))
-      .flat()
-      .filter((e: any) => e !== undefined);
-
-    const mappedWritesTo = serviceWritesTo
-      .map((container: any) => getItemsFromCollectionByIdAndSemverOrLatest(containers, container.id, container.version))
-      .flat()
-      .filter((e: any) => e !== undefined);
-
-    const mappedReadsFrom = serviceReadsFrom
-      .map((container: any) => getItemsFromCollectionByIdAndSemverOrLatest(containers, container.id, container.version))
-      .flat()
-      .filter((e: any) => e !== undefined);
-
-    return {
-      ...service,
-      data: {
-        ...service.data,
-        writesTo: mappedWritesTo,
-        readsFrom: mappedReadsFrom,
-        receives,
-        sends,
-        versions,
-        latestVersion,
-        entities: mappedEntities,
-      },
-      // TODO: verify if it could be deleted.
-      nodes: {
-        receives,
-        sends,
-      },
-      catalog: {
-        // TODO: avoid use string replace at path due to win32
-        path: path.join(service.collection, service.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, service.collection, service.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', service.collection, service.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', service.collection, service.id.replace('/index.mdx', '')),
-        // service will be MySerive-0.0.1 remove the version
-        publicPath: path.join('/generated', service.collection, service.id.replace(`-${service.data.version}`, '')),
-        type: 'service',
-      },
-    };
-  });
+  cachedServices[cacheKey] = await Promise.all(
+    services.map(async (service) => {
+      const { latestVersion, versions } = getVersionForCollectionItem(service, services);
+
+      const sendsMessages = service.data.sends || [];
+      const receivesMessages = service.data.receives || [];
+      const serviceEntities = service.data.entities || [];
+      const serviceWritesTo = service.data.writesTo || [];
+      const serviceReadsFrom = service.data.readsFrom || [];
+
+      const sends = sendsMessages
+        .map((message: any) => getItemsFromCollectionByIdAndSemverOrLatest(allMessages, message.id, message.version))
+        .flat()
+        .filter((e: any) => e !== undefined);
+
+      const receives = receivesMessages
+        .map((message: any) => getItemsFromCollectionByIdAndSemverOrLatest(allMessages, message.id, message.version))
+        .flat()
+        .filter((e: any) => e !== undefined);
+
+      const mappedEntities = serviceEntities
+        .map((entity: any) => getItemsFromCollectionByIdAndSemverOrLatest(entities, entity.id, entity.version))
+        .flat()
+        .filter((e: any) => e !== undefined);
+
+      const mappedWritesTo = serviceWritesTo
+        .map((container: any) => getItemsFromCollectionByIdAndSemverOrLatest(containers, container.id, container.version))
+        .flat()
+        .filter((e: any) => e !== undefined);
+
+      const mappedReadsFrom = serviceReadsFrom
+        .map((container: any) => getItemsFromCollectionByIdAndSemverOrLatest(containers, container.id, container.version))
+        .flat()
+        .filter((e: any) => e !== undefined);
+
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(
+        process.env.PROJECT_DIR ?? '',
+        service.data.id,
+        service.data.version.toString()
+      );
+      const serviceFolderName = folderName ?? service.id.replace(`-${service.data.version}`, '');
+
+      return {
+        ...service,
+        data: {
+          ...service.data,
+          writesTo: mappedWritesTo,
+          readsFrom: mappedReadsFrom,
+          receives,
+          sends,
+          versions,
+          latestVersion,
+          entities: mappedEntities,
+        },
+        // TODO: verify if it could be deleted.
+        nodes: {
+          receives,
+          sends,
+        },
+        catalog: {
+          // TODO: avoid use string replace at path due to win32
+          path: path.join(service.collection, service.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, service.collection, service.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', service.collection, service.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', service.collection, service.id.replace('/index.mdx', '')),
+          // service will be MySerive-0.0.1 remove the version
+          publicPath: path.join('/generated', service.collection, serviceFolderName),
+          type: 'service',
+        },
+      };
+    })
+  );
 
   // order them by the name of the service
   cachedServices[cacheKey].sort((a, b) => {

package/eventcatalog/src/utils/commands.ts

@@ -2,6 +2,7 @@ import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
 import { getVersionForCollectionItem, satisfies } from './collections/util';
+import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -39,58 +40,68 @@ export const getCommands = async ({ getAllVersions = true, hydrateServices = tru
   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);
+  cachedCommands[cacheKey] = await Promise.all(
+    commands.map(async (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);
+          });
+        })
+        .map((service) => {
+          if (!hydrateServices) return { id: service.data.id, version: service.data.version };
+          return service;
         });
-      })
-      .map((service) => {
-        if (!hydrateServices) return { id: service.data.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.data.id, version: service.data.version };
+          return service;
         });
-      })
-      .map((service) => {
-        if (!hydrateServices) return { id: service.data.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));
-
-    return {
-      ...command,
-      data: {
-        ...command.data,
-        messageChannels: channelsForCommand,
-        producers,
-        consumers,
-        versions,
-        latestVersion,
-      },
-      catalog: {
-        path: path.join(command.collection, command.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, command.collection, command.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', command.collection, command.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', command.collection, command.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', command.collection, command.id.replace(`-${command.data.version}`, '')),
-        type: 'command',
-      },
-    };
-  });
+
+      const messageChannels = command.data.channels || [];
+      const channelsForCommand = allChannels.filter((c) => messageChannels.some((channel) => c.data.id === channel.id));
+
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(
+        process.env.PROJECT_DIR ?? '',
+        command.data.id,
+        command.data.version.toString()
+      );
+      const commandFolderName = folderName ?? command.id.replace(`-${command.data.version}`, '');
+
+      return {
+        ...command,
+        data: {
+          ...command.data,
+          messageChannels: channelsForCommand,
+          producers,
+          consumers,
+          versions,
+          latestVersion,
+        },
+        catalog: {
+          path: path.join(command.collection, command.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, command.collection, command.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', command.collection, command.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', command.collection, command.id.replace('/index.mdx', '')),
+          publicPath: path.join('/generated', command.collection, commandFolderName),
+          type: 'command',
+        },
+      };
+    })
+  );
 
   // order them by the name of the command
   cachedCommands[cacheKey].sort((a, b) => {

package/eventcatalog/src/utils/entities.ts

@@ -2,6 +2,7 @@ import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
 import { getVersionForCollectionItem, satisfies } from './collections/util';
+import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -37,44 +38,54 @@ export const getEntities = async ({ getAllVersions = true }: Props = {}): Promis
   const services = await getCollection('services');
   const domains = await getCollection('domains');
 
-  cachedEntities[cacheKey] = entities.map((entity) => {
-    const { latestVersion, versions } = getVersionForCollectionItem(entity, entities);
+  cachedEntities[cacheKey] = await Promise.all(
+    entities.map(async (entity) => {
+      const { latestVersion, versions } = getVersionForCollectionItem(entity, entities);
 
-    const servicesThatReferenceEntity = services.filter((service) =>
-      service.data.entities?.some((item) => {
-        if (item.id != entity.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return entity.data.version == latestVersion;
-        return satisfies(entity.data.version, item.version);
-      })
-    );
+      const servicesThatReferenceEntity = services.filter((service) =>
+        service.data.entities?.some((item) => {
+          if (item.id != entity.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return entity.data.version == latestVersion;
+          return satisfies(entity.data.version, item.version);
+        })
+      );
 
-    const domainsThatReferenceEntity = domains.filter((domain) =>
-      domain.data.entities?.some((item) => {
-        if (item.id != entity.data.id) return false;
-        if (item.version == 'latest' || item.version == undefined) return entity.data.version == latestVersion;
-        return satisfies(entity.data.version, item.version);
-      })
-    );
+      const domainsThatReferenceEntity = domains.filter((domain) =>
+        domain.data.entities?.some((item) => {
+          if (item.id != entity.data.id) return false;
+          if (item.version == 'latest' || item.version == undefined) return entity.data.version == latestVersion;
+          return satisfies(entity.data.version, item.version);
+        })
+      );
 
-    return {
-      ...entity,
-      data: {
-        ...entity.data,
-        versions,
-        latestVersion,
-        services: servicesThatReferenceEntity,
-        domains: domainsThatReferenceEntity,
-      },
-      catalog: {
-        path: path.join(entity.collection, entity.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, entity.collection, entity.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', entity.collection, entity.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', entity.collection, entity.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', entity.collection, entity.id.replace(`-${entity.data.version}`, '')),
-        type: 'entity',
-      },
-    };
-  });
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(
+        process.env.PROJECT_DIR ?? '',
+        entity.data.id,
+        entity.data.version.toString()
+      );
+      const entityFolderName = folderName ?? entity.id.replace(`-${entity.data.version}`, '');
+
+      return {
+        ...entity,
+        data: {
+          ...entity.data,
+          versions,
+          latestVersion,
+          services: servicesThatReferenceEntity,
+          domains: domainsThatReferenceEntity,
+        },
+        catalog: {
+          path: path.join(entity.collection, entity.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, entity.collection, entity.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', entity.collection, entity.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', entity.collection, entity.id.replace('/index.mdx', '')),
+          publicPath: path.join('/generated', entity.collection, entityFolderName),
+          type: 'entity',
+        },
+      };
+    })
+  );
 
   // order them by the name of the event
   cachedEntities[cacheKey].sort((a, b) => {

package/eventcatalog/src/utils/events.ts

@@ -2,6 +2,7 @@ import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
 import { getVersionForCollectionItem, satisfies } from './collections/util';
+import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
 
@@ -39,58 +40,64 @@ export const getEvents = async ({ getAllVersions = true, hydrateServices = true
   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);
-        })
-      )
-      .map((service) => {
-        if (!hydrateServices) return { id: service.data.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);
-        })
-      )
-      .map((service) => {
-        if (!hydrateServices) return { id: service.data.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));
-
-    return {
-      ...event,
-      data: {
-        ...event.data,
-        messageChannels: channelsForEvent,
-        producers,
-        consumers,
-        versions,
-        latestVersion,
-      },
-      catalog: {
-        path: path.join(event.collection, event.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, event.collection, event.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', event.collection, event.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', event.collection, event.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', event.collection, event.id.replace(`-${event.data.version}`, '')),
-        type: 'event',
-      },
-    };
-  });
+  cachedEvents[cacheKey] = await Promise.all(
+    events.map(async (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);
+          })
+        )
+        .map((service) => {
+          if (!hydrateServices) return { id: service.data.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);
+          })
+        )
+        .map((service) => {
+          if (!hydrateServices) return { id: service.data.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));
+
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(process.env.PROJECT_DIR ?? '', event.data.id, event.data.version.toString());
+      const eventFolderName = folderName ?? event.id.replace(`-${event.data.version}`, '');
+
+      return {
+        ...event,
+        data: {
+          ...event.data,
+          messageChannels: channelsForEvent,
+          producers,
+          consumers,
+          versions,
+          latestVersion,
+        },
+        catalog: {
+          path: path.join(event.collection, event.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, event.collection, event.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', event.collection, event.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', event.collection, event.id.replace('/index.mdx', '')),
+          publicPath: path.join('/generated', event.collection, eventFolderName),
+          type: 'event',
+        },
+      };
+    })
+  );
 
   // order them by the name of the event
   cachedEvents[cacheKey].sort((a, b) => {

package/eventcatalog/src/utils/queries.ts

@@ -1,6 +1,7 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
+import utils from '@eventcatalog/sdk';
 import { getVersionForCollectionItem, satisfies } from './collections/util';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
@@ -39,58 +40,64 @@ export const getQueries = async ({ getAllVersions = true, hydrateServices = true
   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);
-        })
-      )
-      .map((service) => {
-        if (!hydrateServices) return { id: service.data.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);
-        })
-      )
-      .map((service) => {
-        if (!hydrateServices) return { id: service.data.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));
-
-    return {
-      ...query,
-      data: {
-        ...query.data,
-        messageChannels: channelsForQuery,
-        producers,
-        consumers,
-        versions,
-        latestVersion,
-      },
-      catalog: {
-        path: path.join(query.collection, query.id.replace('/index.mdx', '')),
-        absoluteFilePath: path.join(PROJECT_DIR, query.collection, query.id.replace('/index.mdx', '/index.md')),
-        astroContentFilePath: path.join(process.cwd(), 'src', 'content', query.collection, query.id),
-        filePath: path.join(process.cwd(), 'src', 'catalog-files', query.collection, query.id.replace('/index.mdx', '')),
-        publicPath: path.join('/generated', query.collection, query.id.replace(`-${query.data.version}`, '')),
-        type: 'event',
-      },
-    };
-  });
+  cachedQueries[cacheKey] = await Promise.all(
+    queries.map(async (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);
+          })
+        )
+        .map((service) => {
+          if (!hydrateServices) return { id: service.data.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);
+          })
+        )
+        .map((service) => {
+          if (!hydrateServices) return { id: service.data.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));
+
+      const { getResourceFolderName } = utils(process.env.PROJECT_DIR ?? '');
+      const folderName = await getResourceFolderName(process.env.PROJECT_DIR ?? '', query.data.id, query.data.version.toString());
+      const queryFolderName = folderName ?? query.id.replace(`-${query.data.version}`, '');
+
+      return {
+        ...query,
+        data: {
+          ...query.data,
+          messageChannels: channelsForQuery,
+          producers,
+          consumers,
+          versions,
+          latestVersion,
+        },
+        catalog: {
+          path: path.join(query.collection, query.id.replace('/index.mdx', '')),
+          absoluteFilePath: path.join(PROJECT_DIR, query.collection, query.id.replace('/index.mdx', '/index.md')),
+          astroContentFilePath: path.join(process.cwd(), 'src', 'content', query.collection, query.id),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', query.collection, query.id.replace('/index.mdx', '')),
+          publicPath: path.join('/generated', query.collection, queryFolderName),
+          type: 'event',
+        },
+      };
+    })
+  );
 
   // order them by the name of the query
   cachedQueries[cacheKey].sort((a, b) => {

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.61.8",
+  "version": "2.62.0",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "@eventcatalog/generator-ai": "^1.1.0",
     "@eventcatalog/license": "^0.0.6",
     "@eventcatalog/linter": "^0.0.2",
-    "@eventcatalog/sdk": "^2.2.7",
+    "@eventcatalog/sdk": "^2.8.4",
     "@eventcatalog/visualizer": "^0.0.6",
     "@fontsource/inter": "^5.2.5",
     "@headlessui/react": "^2.0.3",