@eventcatalog/core 4.7.12 → 4.8.0

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.7.12";
+var version = "4.8.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-H6NJQGDB.js";
-import "../chunk-BZAT6KWG.js";
+} from "../chunk-EDMVOV4H.js";
+import "../chunk-XDKU675D.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.7.12";
+var version = "4.8.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-MEP55EFY.js";
-import "../chunk-H6NJQGDB.js";
+} from "../chunk-TRDXMFBW.js";
+import "../chunk-EDMVOV4H.js";
 import "../chunk-K2XIENVT.js";
-import "../chunk-BZAT6KWG.js";
+import "../chunk-XDKU675D.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-H6NJQGDB.js → chunk-EDMVOV4H.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-BZAT6KWG.js";
+} from "./chunk-XDKU675D.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-GU5QRUIL.js → chunk-JCJYBRLL.js}

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

package/dist/{chunk-ITXVGX5B.js → chunk-OGZMUG75.js}

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

package/dist/{chunk-MEP55EFY.js → chunk-TRDXMFBW.js}

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

package/dist/{chunk-BZAT6KWG.js → chunk-XDKU675D.js}

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

package/dist/constants.js

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

package/dist/eventcatalog.cjs

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

package/dist/eventcatalog.js

@@ -4,8 +4,8 @@ import {
 import "./chunk-CA4U2JP7.js";
 import {
   log_build_default
-} from "./chunk-MEP55EFY.js";
-import "./chunk-H6NJQGDB.js";
+} from "./chunk-TRDXMFBW.js";
+import "./chunk-EDMVOV4H.js";
 import "./chunk-K2XIENVT.js";
 import {
   FederationConflictError,
@@ -31,10 +31,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-GU5QRUIL.js";
+} from "./chunk-JCJYBRLL.js";
 import {
   logger
-} from "./chunk-ITXVGX5B.js";
+} from "./chunk-OGZMUG75.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -54,7 +54,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-BZAT6KWG.js";
+} from "./chunk-XDKU675D.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-GU5QRUIL.js";
-import "./chunk-ITXVGX5B.js";
-import "./chunk-BZAT6KWG.js";
+} from "./chunk-JCJYBRLL.js";
+import "./chunk-OGZMUG75.js";
+import "./chunk-XDKU675D.js";
 import "./chunk-6QENHZZP.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 = "4.7.12";
+var version = "4.8.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-ITXVGX5B.js";
-import "../chunk-BZAT6KWG.js";
+} from "../chunk-OGZMUG75.js";
+import "../chunk-XDKU675D.js";
 export {
   logger
 };

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

@@ -25,15 +25,15 @@ const flow = flowCollection[0];
 
 const { nodes, edges } = await getNodesAndEdges({
   id: id,
-  version: flow.data.version,
+  version: flow?.data.version,
   mode: mode,
 });
 
 // Load and apply saved layout if it exists
-const resourceKey = buildResourceKey('flows', id, flow.data.version);
+const resourceKey = buildResourceKey('flows', id, flow?.data.version);
 const savedLayout = await loadSavedLayout(resourceKey);
 const nodesWithLayout = applyLayoutToNodes(nodes, savedLayout);
-const portalId = `${id}-${flow.data.version}-flow-${randomUUID()}-portal`;
+const portalId = `${id}-${flow?.data.version}-flow-${randomUUID()}-portal`;
 ---
 
 {

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

@@ -1,6 +1,5 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
-import semver from 'semver';
 import type { CollectionMessageTypes, CollectionTypes } from '@types';
 import { getDomains, getDomainsForService } from './domains';
 import {

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

@@ -1,7 +1,7 @@
 import type { CollectionTypes } from '@types';
 import type { CollectionEntry } from 'astro:content';
-import semver, { coerce, compare, satisfies as satisfiesRange } from 'semver';
 import path from 'node:path';
+import { compareVersions, toComparableVersion, versionSatisfiesRange } from './version-compare';
 
 // --- FILE PATH HELPERS ---
 
@@ -95,12 +95,11 @@ export { isSameVersion } from './version-compare';
  * Sorts versioned items. Latest version first.
  */
 export function sortVersioned<T>(versioned: T[], versionExtractor: (e: T) => string): T[] {
-  // try to coerce semver versions from input version
-  const semverVersions = versioned.map((v) => ({ original: v, semver: coerce(versionExtractor(v)) }));
+  const versions = versioned.map((original) => ({ original, version: versionExtractor(original) }));
 
   // if all versions are semver'ish, use semver to sort them
-  if (semverVersions.every((v) => v.semver != null)) {
-    const sorted = semverVersions.sort((a, b) => compare(b.semver!, a.semver!));
+  if (versions.every(({ version }) => toComparableVersion(version) !== undefined)) {
+    const sorted = versions.sort((a, b) => compareVersions(b.version, a.version)!);
 
     return sorted.map((v) => v.original);
   } else {
@@ -137,9 +136,8 @@ export function sortStringVersions(versions: string[]) {
  * @returns {boolean} Returns true if the version satisfies the range.
  */
 export const satisfies = (version: string, range: string): boolean => {
-  const coercedVersion = coerce(version);
-  if (!coercedVersion) return false;
-  return satisfiesRange(coercedVersion, range);
+  if (version === range) return true;
+  return versionSatisfiesRange(version, range);
 };
 
 export const getItemsFromCollectionByIdAndSemverOrLatest = <T extends { data: { id: string; version: string } }>(
@@ -150,6 +148,9 @@ export const getItemsFromCollectionByIdAndSemverOrLatest = <T extends { data: {
   const filteredCollection = collection.filter((c) => c.data.id == id);
 
   if (version && version != 'latest') {
+    const exactMatches = filteredCollection.filter((item) => item.data.version === version);
+    if (exactMatches.length > 0) return exactMatches;
+
     return filteredCollection.filter((c) => satisfies(c.data.version, version));
   }
 
@@ -282,12 +283,10 @@ export const createVersionedMap = <T extends { data: { id: string; version?: str
 
   // Sort every entry so index [0] is always the latest version
   for (const [key, list] of map.entries()) {
-    list.sort((a, b) => {
-      // specific version sorting logic (fallback to string compare if not valid semver)
-      const vA = a.data.version || '0.0.0';
-      const vB = b.data.version || '0.0.0';
-      return semver.valid(vB) && semver.valid(vA) ? semver.rcompare(vA, vB) : vB.localeCompare(vA);
-    });
+    map.set(
+      key,
+      sortVersioned(list, (item) => item.data.version || '0.0.0')
+    );
   }
   return map;
 };
@@ -319,11 +318,7 @@ export const findInMap = <T extends { data: { version?: string } }>(
   if (exactMatch) return exactMatch;
 
   // Try semver match if not exact
-  if (semver.validRange(version)) {
-    return items.find((i) => semver.satisfies(i.data.version || '0.0.0', version));
-  }
-
-  return undefined;
+  return items.find((i) => satisfies(i.data.version || '0.0.0', version));
 };
 
 /**
@@ -342,13 +337,7 @@ export const versionMatches = (version: string, rangePattern: string): boolean =
   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
-  }
+  if (satisfies(version, rangePattern)) return true;
 
   // Handle x-patterns like 1.x, 1.2.x
   if (rangePattern.includes('.x')) {

package/eventcatalog/src/utils/collections/version-compare.ts

@@ -1,12 +1,41 @@
-import { coerce, eq } from 'semver';
+import { coerce, compare, satisfies, valid, validRange } from 'semver';
+
+// Keep in sync with packages/sdk/src/internal/versions.ts
+const NUMERIC_VERSION_PATTERN = /^[vV]?\d+(?:\.\d+){0,2}$/;
+
+export function toComparableVersion(version: string | undefined) {
+  if (!version) return undefined;
+
+  const strictVersion = valid(version);
+  if (strictVersion) return strictVersion;
+
+  if (!NUMERIC_VERSION_PATTERN.test(version)) return undefined;
+
+  return coerce(version) ?? undefined;
+}
+
+export function compareVersions(v1: string | undefined, v2: string | undefined): number | undefined {
+  const semverV1 = toComparableVersion(v1);
+  const semverV2 = toComparableVersion(v2);
+
+  if (!semverV1 || !semverV2) return undefined;
+
+  return compare(semverV1, semverV2);
+}
+
+export function versionSatisfiesRange(version: string, range: string) {
+  const comparableVersion = toComparableVersion(version);
+  const comparableRange = validRange(range) ?? validRange(range.replace(/V(?=\d)/g, 'v'));
+
+  if (!comparableVersion || !comparableRange) return false;
+
+  return satisfies(comparableVersion, comparableRange);
+}
 
 export function isSameVersion(v1: string | undefined, v2: string | undefined) {
-  const semverV1 = coerce(v1);
-  const semverV2 = coerce(v2);
+  const comparison = compareVersions(v1, v2);
 
-  if (semverV1 != null && semverV2 != null) {
-    return eq(semverV1, semverV2);
-  }
+  if (comparison !== undefined) return comparison === 0;
 
   return v1 === v2;
 }

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

@@ -1,31 +1,11 @@
 import type { CollectionTypes } from '@types';
 import type { CollectionEntry } from 'astro:content';
-import { coerce, compare, satisfies, validRange } from 'semver';
+import { getItemsFromCollectionByIdAndSemverOrLatest } from './util';
 
 export const getVersionFromCollection = (
   collection: CollectionEntry<CollectionTypes>[],
   id: string,
   version?: string
 ): CollectionEntry<CollectionTypes>[] => {
-  const data = collection;
-  const semverRange = validRange(version);
-
-  if (semverRange) {
-    return data.filter((msg) => msg.data.id == id).filter((msg) => satisfies(msg.data.version, semverRange));
-  }
-
-  const filteredEvents = data.filter((event) => event.data.id === id);
-
-  // Order by semver
-  const sorted = filteredEvents.sort((a, b) => {
-    const semverA = coerce(a.data.version);
-    const semverB = coerce(b.data.version);
-    if (semverA && semverB) {
-      return compare(semverA, semverB);
-    }
-    return a.data.version.localeCompare(b.data.version);
-  });
-
-  // latest version
-  return [sorted[sorted.length - 1]];
+  return getItemsFromCollectionByIdAndSemverOrLatest(collection, id, version);
 };

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.7.12",
+  "version": "4.8.0",
   "publishConfig": {
     "access": "public"
   },
@@ -119,8 +119,8 @@
     "update-notifier": "^7.3.1",
     "uuid": "^11.1.1",
     "zod": "^4.3.6",
-    "@eventcatalog/linter": "1.1.14",
-    "@eventcatalog/sdk": "2.27.4",
+    "@eventcatalog/sdk": "2.28.0",
+    "@eventcatalog/linter": "1.1.15",
     "@eventcatalog/visualiser": "^4.1.3"
   },
   "devDependencies": {