@eventcatalog/core 3.15.6 → 3.16.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 = "3.15.6";
+var version = "3.16.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-R3VWE46X.js";
-import "../chunk-EDUMKUXT.js";
+} from "../chunk-VRSJESSG.js";
+import "../chunk-J7UJSNZY.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

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

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-KAXHYQAC.js";
-import "../chunk-R3VWE46X.js";
+} from "../chunk-XIZ63AL2.js";
+import "../chunk-VRSJESSG.js";
 import "../chunk-4UVFXLPI.js";
-import "../chunk-EDUMKUXT.js";
+import "../chunk-J7UJSNZY.js";
 import "../chunk-5T63CXKU.js";
 export {
   log_build_default as default

package/dist/{chunk-EDUMKUXT.js → chunk-J7UJSNZY.js}

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

package/dist/{chunk-45P7X2RA.js → chunk-VGFOJWSL.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-OUV7ZAEA.js";
+} from "./chunk-VNI36JCS.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-OUV7ZAEA.js → chunk-VNI36JCS.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-EDUMKUXT.js";
+} from "./chunk-J7UJSNZY.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-R3VWE46X.js → chunk-VRSJESSG.js}

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

package/dist/{chunk-KAXHYQAC.js → chunk-XIZ63AL2.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-R3VWE46X.js";
+} from "./chunk-VRSJESSG.js";
 import {
   countResources,
   serializeCounts

package/dist/constants.cjs

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

package/dist/constants.js

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

package/dist/eventcatalog.cjs

@@ -114,7 +114,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.15.6";
+var version = "3.16.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,18 +1,18 @@
+import {
+  log_build_default
+} from "./chunk-XIZ63AL2.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-WAJIJEI3.js";
 import {
   watch
 } from "./chunk-PLNJC7NZ.js";
-import {
-  log_build_default
-} from "./chunk-KAXHYQAC.js";
-import "./chunk-R3VWE46X.js";
-import "./chunk-4UVFXLPI.js";
 import {
   runMigrations
 } from "./chunk-BH3JMNAV.js";
 import "./chunk-622JYJWG.js";
+import "./chunk-VRSJESSG.js";
+import "./chunk-4UVFXLPI.js";
 import {
   catalogToAstro
 } from "./chunk-YDXB3BD2.js";
@@ -22,13 +22,13 @@ import {
 } from "./chunk-3KXCGYET.js";
 import {
   generate
-} from "./chunk-45P7X2RA.js";
+} from "./chunk-VGFOJWSL.js";
 import {
   logger
-} from "./chunk-OUV7ZAEA.js";
+} from "./chunk-VNI36JCS.js";
 import {
   VERSION
-} from "./chunk-EDUMKUXT.js";
+} from "./chunk-J7UJSNZY.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/generate.cjs

@@ -78,7 +78,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.15.6";
+var version = "3.16.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-45P7X2RA.js";
-import "./chunk-OUV7ZAEA.js";
-import "./chunk-EDUMKUXT.js";
+} from "./chunk-VGFOJWSL.js";
+import "./chunk-VNI36JCS.js";
+import "./chunk-J7UJSNZY.js";
 import "./chunk-5T63CXKU.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.15.6";
+var version = "3.16.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-OUV7ZAEA.js";
-import "../chunk-EDUMKUXT.js";
+} from "../chunk-VNI36JCS.js";
+import "../chunk-J7UJSNZY.js";
 export {
   logger
 };

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

@@ -3,7 +3,7 @@ import type { CollectionEntry } from 'astro:content';
 import semver from 'semver';
 import type { CollectionMessageTypes, CollectionTypes } from '@types';
 import { getDomains, getDomainsForService } from './domains';
-import { createVersionedMap, findInMap, processSpecifications } from '@utils/collections/util';
+import { createVersionedMap, findInMap, versionMatches, processSpecifications } from '@utils/collections/util';
 
 export type Service = CollectionEntry<'services'>;
 
@@ -130,8 +130,8 @@ export const getProducersOfMessage = (services: Service[], message: CollectionEn
       // If version is 'latest', match any version
       if (send.version === 'latest') return idMatch;
 
-      // Use semver to compare versions
-      return idMatch && semver.satisfies(message.data.version, send.version);
+      // Use versionMatches to support semver ranges and x-patterns
+      return idMatch && versionMatches(message.data.version, send.version);
     });
   });
 };
@@ -141,14 +141,14 @@ export const getConsumersOfMessage = (services: Service[], message: CollectionEn
     return service.data.receives?.some((receive) => {
       const idMatch = receive.id === message.data.id;
 
-      // If no version specified in send, treat as 'latest'
+      // If no version specified in receive, treat as 'latest'
       if (!receive.version) return idMatch;
 
       // If version is 'latest', match any version
       if (receive.version === 'latest') return idMatch;
 
-      // Use semver to compare versions
-      return idMatch && semver.satisfies(message.data.version, receive.version);
+      // Use versionMatches to support semver ranges and x-patterns
+      return idMatch && versionMatches(message.data.version, receive.version);
     });
   });
 };

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

@@ -298,3 +298,41 @@ export const findInMap = <T extends { data: { version?: string } }>(
 
   return undefined;
 };
+
+/**
+ * Matches a specific version against a version range pattern.
+ * Supports exact versions, semver ranges, x-patterns, and 'latest'.
+ *
+ * @param version - The specific version to check (e.g., "1.2.3")
+ * @param rangePattern - The pattern to match against (e.g., "^1.0.0", "1.x", "latest")
+ * @returns true if version matches the rangePattern
+ */
+export const versionMatches = (version: string, rangePattern: string): boolean => {
+  // Handle 'latest' keyword
+  if (rangePattern === 'latest') return true;
+
+  // Try exact match first
+  if (version === rangePattern) return true;
+
+  // Try semver range matching
+  try {
+    if (semver.validRange(rangePattern)) {
+      return semver.satisfies(version, rangePattern);
+    }
+  } catch (error) {
+    // Invalid semver, fall through
+  }
+
+  // Handle x-patterns like 1.x, 1.2.x
+  if (rangePattern.includes('.x')) {
+    const prefix = rangePattern.replace(/\.x/g, '');
+    // Check if version starts with the prefix and has a valid boundary
+    // (next character must be '.' or end of string)
+    if (version.startsWith(prefix)) {
+      const nextChar = version[prefix.length];
+      return nextChar === '.' || nextChar === undefined;
+    }
+  }
+
+  return false;
+};

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

@@ -11,6 +11,7 @@ import {
   getColorFromString,
   getEdgeLabelForMessageAsSource,
   getEdgeLabelForServiceAsTarget,
+  versionMatches,
 } from './utils/utils';
 import { MarkerType, type Node, type Edge } from '@xyflow/react';
 import {
@@ -150,7 +151,9 @@ const getNodesAndEdges = async ({
     const serviceProducer = producer as CollectionEntry<'services'>;
 
     // Is the producer sending this message to a channel?
-    const producerConfigurationForMessage = serviceProducer.data.sends?.find((send) => send.id === message.data.id);
+    const producerConfigurationForMessage = serviceProducer.data.sends?.find(
+      (send) => send.id === message.data.id && versionMatches(send.version, message.data.version)
+    );
     const producerChannelConfiguration = producerConfigurationForMessage?.to ?? [];
 
     const producerHasChannels = producerChannelConfiguration?.length > 0;
@@ -286,7 +289,9 @@ const getNodesAndEdges = async ({
     const serviceConsumer = consumer as CollectionEntry<'services'>;
 
     // Is the consumer receiving this message from a channel?
-    const consumerConfigurationForMessage = serviceConsumer.data.receives?.find((receive) => receive.id === message.data.id);
+    const consumerConfigurationForMessage = serviceConsumer.data.receives?.find(
+      (receive) => receive.id === message.data.id && versionMatches(receive.version, message.data.version)
+    );
     const consumerChannelConfiguration = consumerConfigurationForMessage?.from ?? [];
 
     const consumerHasChannels = consumerChannelConfiguration.length > 0;
@@ -330,9 +335,17 @@ const getNodesAndEdges = async ({
       // Can any of the consumer channels be linked to any of the producer channels?
       // Only consider service producers for channel linking (data products don't have sends/receives)
       const producerChannels = serviceProducers
-        .map((producer) => producer.data.sends?.find((send) => send.id === message.data.id)?.to ?? [])
+        .map((producer) => {
+          const config = producer.data.sends?.find(
+            (send) => send.id === message.data.id && versionMatches(send.version, message.data.version)
+          );
+          return config?.to ?? [];
+        })
         .flat();
-      const consumerChannels = serviceConsumer.data.receives?.find((receive) => receive.id === message.data.id)?.from ?? [];
+      const consumerChannels =
+        serviceConsumer.data.receives?.find(
+          (receive) => receive.id === message.data.id && versionMatches(receive.version, message.data.version)
+        )?.from ?? [];
 
       for (const producerChannel of producerChannels) {
         const producerChannelValue = findInMap(
@@ -565,7 +578,9 @@ export const getNodesAndEdgesForConsumedMessage = ({
     })
   );
 
-  const targetMessageConfiguration = target.data.receives?.find((receive) => receive.id === message.data.id);
+  const targetMessageConfiguration = target.data.receives?.find(
+    (receive) => receive.id === message.data.id && versionMatches(receive.version, message.data.version)
+  );
   const channelsFromMessageToTarget = targetMessageConfiguration?.from ?? [];
   const hydratedChannelsFromMessageToTarget = channelsFromMessageToTarget
     .map((channel) => findInMap(map, channel.id, channel.version))
@@ -690,7 +705,9 @@ export const getNodesAndEdgesForConsumedMessage = ({
     );
 
     // Check if the producer is sending the message to a channel
-    const producerConfigurationForMessage = producer.data.sends?.find((send) => send.id === message.data.id);
+    const producerConfigurationForMessage = producer.data.sends?.find(
+      (send) => send.id === message.data.id && versionMatches(send.version, message.data.version)
+    );
     const producerChannelConfiguration = producerConfigurationForMessage?.to ?? [];
 
     const producerHasChannels = producerChannelConfiguration.length > 0;
@@ -919,7 +936,9 @@ export const getNodesAndEdgesForProducedMessage = ({
     })
   );
 
-  const sourceMessageConfiguration = source.data.sends?.find((send) => send.id === message.data.id);
+  const sourceMessageConfiguration = source.data.sends?.find(
+    (send) => send.id === message.data.id && versionMatches(send.version, message.data.version)
+  );
   const channelsFromSourceToMessage = sourceMessageConfiguration?.to ?? [];
 
   const hydratedChannelsFromSourceToMessage = channelsFromSourceToMessage
@@ -1010,7 +1029,9 @@ export const getNodesAndEdgesForProducedMessage = ({
     );
 
     // Check if the consumer is consuming the message from a channel
-    const consumerConfigurationForMessage = consumer.data.receives?.find((receive) => receive.id === message.data.id);
+    const consumerConfigurationForMessage = consumer.data.receives?.find(
+      (receive) => receive.id === message.data.id && versionMatches(receive.version, message.data.version)
+    );
     const consumerChannelConfiguration = consumerConfigurationForMessage?.from ?? [];
 
     const consumerHasChannels = consumerChannelConfiguration.length > 0;

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

@@ -8,6 +8,7 @@ import {
   createEdge,
   buildContextMenuForService,
   buildContextMenuForResource,
+  versionMatches,
 } from '@utils/node-graphs/utils/utils';
 
 import { findMatchingNodes, findInMap, createVersionedMap } from '@utils/collections/util';
@@ -124,7 +125,9 @@ export const getNodesAndEdges = async ({
   if (renderMessages) {
     // All the messages the service receives
     receives.forEach((receive) => {
-      const targetChannels = receivesRaw.find((receiveRaw) => receiveRaw.id === receive.data.id)?.from;
+      const targetChannels = receivesRaw.find(
+        (receiveRaw) => receiveRaw.id === receive.data.id && versionMatches(receiveRaw.version, receive.data.version)
+      )?.from;
 
       const { nodes: consumedMessageNodes, edges: consumedMessageEdges } = getNodesAndEdgesForConsumedMessage({
         message: receive,
@@ -235,7 +238,9 @@ export const getNodesAndEdges = async ({
 
   if (renderMessages) {
     sends.forEach((send) => {
-      const sourceChannels = sendsRaw.find((sendRaw) => sendRaw.id === send.data.id)?.to;
+      const sourceChannels = sendsRaw.find(
+        (sendRaw) => sendRaw.id === send.data.id && versionMatches(sendRaw.version, send.data.version)
+      )?.to;
 
       const { nodes: producedMessageNodes, edges: producedMessageEdges } = getNodesAndEdgesForProducedMessage({
         message: send,

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

@@ -2,8 +2,9 @@
 
 import { MarkerType, Position, type Edge, type Node } from '@xyflow/react';
 import dagre from 'dagre';
-import { getItemsFromCollectionByIdAndSemverOrLatest } from '@utils/collections/util';
+import { getItemsFromCollectionByIdAndSemverOrLatest, versionMatches as versionMatchesUtil } from '@utils/collections/util';
 import { buildUrl } from '@utils/url-builder';
+
 interface BaseCollectionData {
   id: string;
   version: string;
@@ -18,6 +19,23 @@ interface MessageCollectionItem extends CollectionItem {
   collection: 'commands' | 'events' | 'queries';
 }
 
+/**
+ * Determines if a service's accepted version pattern matches an actual message version.
+ *
+ * @param acceptedVersion - The version pattern a service declares (in sends/receives config)
+ * @param actualMessageVersion - The specific version of the actual catalogued message
+ * @returns true if the actual message version satisfies the accepted version pattern
+ */
+export const versionMatches = (acceptedVersion: string | undefined, actualMessageVersion: string | undefined): boolean => {
+  if (!acceptedVersion || acceptedVersion === 'latest') return true;
+
+  if (!actualMessageVersion || actualMessageVersion === 'latest') {
+    return !acceptedVersion || acceptedVersion === 'latest';
+  }
+
+  return versionMatchesUtil(actualMessageVersion, acceptedVersion);
+};
+
 export const generateIdForNode = (node: CollectionItem) => {
   return `${node.data.id}-${node.data.version}`;
 };

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "3.15.6",
+  "version": "3.16.0",
   "publishConfig": {
     "access": "public"
   },
@@ -101,9 +101,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^10.0.0",
     "zod": "^3.25.0",
-    "@eventcatalog/visualiser": "^3.14.0",
     "@eventcatalog/sdk": "2.14.3",
-    "@eventcatalog/linter": "1.0.7"
+    "@eventcatalog/linter": "1.0.7",
+    "@eventcatalog/visualiser": "^3.14.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.6",