@eventcatalog/sdk 2.27.4 → 2.28.1

package/dist/index.mjs

@@ -3,21 +3,37 @@ import { join as join22 } from "path";
 
 // src/dsl/utils.ts
 import { globSync } from "glob";
-import { satisfies, validRange } from "semver";
+
+// src/internal/versions.ts
+import { coerce, compare, satisfies, valid, validRange } from "semver";
+var NUMERIC_VERSION_PATTERN = /^[vV]?\d+(?:\.\d+){0,2}$/;
+var toComparableVersion = (version) => {
+  const strictVersion = valid(version);
+  if (strictVersion) return strictVersion;
+  if (!NUMERIC_VERSION_PATTERN.test(version)) return void 0;
+  return coerce(version) ?? void 0;
+};
+var compareVersions = (left, right) => {
+  const leftVersion = toComparableVersion(left);
+  const rightVersion = toComparableVersion(right);
+  if (!leftVersion || !rightVersion) return void 0;
+  return compare(leftVersion, rightVersion);
+};
+var isVersionGreaterThan = (candidate, current) => compareVersions(candidate, current) === 1;
+var versionSatisfiesRange = (version, range) => {
+  const comparableVersion = toComparableVersion(version);
+  const comparableRange = validRange(range) ?? validRange(range.replace(/V(?=\d)/g, "v"));
+  if (!comparableVersion || !comparableRange) return false;
+  return satisfies(comparableVersion, comparableRange);
+};
+
+// src/dsl/utils.ts
 function msgVersionMatches(pointerVersion, messageVersion) {
   if (!pointerVersion) return true;
   if (!messageVersion) return false;
   if (pointerVersion === messageVersion) return true;
-  try {
-    if (validRange(pointerVersion)) {
-      if (satisfies(messageVersion, pointerVersion)) return true;
-    }
-    if (validRange(messageVersion)) {
-      if (satisfies(pointerVersion, messageVersion)) return true;
-    }
-  } catch {
-  }
-  return false;
+  if (versionSatisfiesRange(messageVersion, pointerVersion)) return true;
+  return versionSatisfiesRange(pointerVersion, messageVersion);
 }
 function serializeBaseFields(resource, indent = "  ") {
   const lines = [];
@@ -623,7 +639,6 @@ import fsSync from "fs";
 import { copy } from "fs-extra";
 import { join, dirname, normalize, sep as pathSeparator, resolve, relative } from "path";
 import matter from "gray-matter";
-import { satisfies as satisfies2, validRange as validRange2 } from "semver";
 var _fileIndexCache = null;
 var _fileIndexCatalogDir = null;
 var _matterCache = null;
@@ -755,18 +770,12 @@ var findFileById = async (catalogDir, id, version) => {
   }
   const exactMatch = entries.find((e) => e.version === version);
   if (exactMatch) return exactMatch.path;
-  const semverRange = validRange2(version);
-  if (semverRange) {
-    const match = entries.find((e) => {
-      try {
-        return satisfies2(e.version, semverRange);
-      } catch {
-        return false;
-      }
-    });
-    return match?.path;
+  let match;
+  for (const entry of entries) {
+    if (!versionSatisfiesRange(entry.version, version)) continue;
+    if (!match || isVersionGreaterThan(entry.version, match.version)) match = entry;
   }
-  return void 0;
+  return match?.path;
 };
 var getFiles = async (pattern, ignore2 = "") => {
   try {
@@ -857,7 +866,6 @@ import { dirname as dirname2, join as join2 } from "path";
 import matter2 from "gray-matter";
 import fs from "fs/promises";
 import fsSync2 from "fs";
-import { satisfies as satisfies3 } from "semver";
 import { lock, unlock } from "proper-lockfile";
 import { basename as basename2 } from "path";
 import path from "path";
@@ -925,7 +933,7 @@ var writeResource = async (catalogDir, resource, options = {
     if (options.versionExistingContent && !exists) {
       const currentResource = await getResource(catalogDir, resource.id);
       if (currentResource) {
-        if (satisfies3(resource.version, `>${currentResource.version}`)) {
+        if (isVersionGreaterThan(resource.version, currentResource.version)) {
           await versionResource(catalogDir, resource.id);
         } else {
           throw new Error(`New version ${resource.version} is not greater than current version ${currentResource.version}`);
@@ -2007,7 +2015,6 @@ var addMessageToChannel = (directory, collection) => async (id, _message, versio
 import { dirname as dirname5, join as join11 } from "path";
 import fsSync4 from "fs";
 import matter4 from "gray-matter";
-import { satisfies as satisfies4, validRange as validRange3 } from "semver";
 var getMessageBySchemaPath = (directory) => async (path11, options) => {
   const pathToMessage = dirname5(path11);
   try {
@@ -2048,34 +2055,17 @@ var getProducersAndConsumersForMessage = (directory) => async (id, version, opti
   const producers = [];
   const consumers = [];
   for (const participant of [...services, ...agents, ...domains]) {
-    const participantPublishesMessage = participant.sends?.some((_message) => {
+    const matchesMessage = (_message) => {
       if (_message.version) {
-        const isParticipantUsingSemverRange = validRange3(_message.version);
-        if (isParticipantUsingSemverRange) {
-          return _message.id === message.id && satisfies4(message.version, _message.version);
-        } else {
-          return _message.id === message.id && message.version === _message.version;
-        }
+        return _message.id === message.id && (message.version === _message.version || versionSatisfiesRange(message.version, _message.version));
       }
       if (isMessageLatestVersion && _message.id === message.id) {
         return true;
       }
       return false;
-    });
-    const participantSubscribesToMessage = participant.receives?.some((_message) => {
-      if (_message.version) {
-        const isParticipantUsingSemverRange = validRange3(_message.version);
-        if (isParticipantUsingSemverRange) {
-          return _message.id === message.id && satisfies4(message.version, _message.version);
-        } else {
-          return _message.id === message.id && message.version === _message.version;
-        }
-      }
-      if (isMessageLatestVersion && _message.id === message.id) {
-        return true;
-      }
-      return false;
-    });
+    };
+    const participantPublishesMessage = participant.sends?.some(matchesMessage);
+    const participantSubscribesToMessage = participant.receives?.some(matchesMessage);
     if (participantPublishesMessage) {
       producers.push(participant);
     }
@@ -2441,9 +2431,6 @@ var dumpCatalog = (directory) => async (options) => {
   };
 };
 
-// src/graph.ts
-import { maxSatisfying, validRange as validRange4 } from "semver";
-
 // src/adrs.ts
 import fs14 from "fs/promises";
 import { join as join16 } from "path";
@@ -3249,14 +3236,13 @@ var getGraph = (directory) => {
       const allVersionsIndex = await loadAllVersionsIndex(type);
       const exactMatch = allVersionsIndex.byVersion.get(`${pointer.id}:${pointer.version}`);
       if (exactMatch) return exactMatch;
-      const range = validRange4(pointer.version);
-      if (!range) return void 0;
       const candidates = allVersionsIndex.byId.get(pointer.id) || [];
-      const version = maxSatisfying(
-        candidates.map((resource) => resource.version),
-        range
-      );
-      return candidates.find((resource) => resource.version === version);
+      let match;
+      for (const candidate of candidates) {
+        if (!versionSatisfiesRange(candidate.version, pointer.version)) continue;
+        if (!match || isVersionGreaterThan(candidate.version, match.version)) match = candidate;
+      }
+      return match;
     };
     const resolvePointer = async (pointer, candidateTypes) => {
       const explicitType = normalizeResourceType(pointer.type);
@@ -3298,8 +3284,7 @@ var getGraph = (directory) => {
     const pointerMatchesVersion = (pointer, version) => {
       if (!pointer.version || pointer.version === "latest") return true;
       if (pointer.version === version) return true;
-      const range = validRange4(pointer.version);
-      return range ? maxSatisfying([version], range) === version : false;
+      return versionSatisfiesRange(version, pointer.version);
     };
     const getAdrsForResource = async (type, resource) => {
       if (type === "adr") return [];
@@ -3437,7 +3422,6 @@ import fs19 from "fs";
 import path7 from "path";
 import { createHash } from "crypto";
 import { execSync } from "child_process";
-import { compare } from "semver";
 
 // src/snapshot-diff.ts
 var stableStringify = (value) => {
@@ -3631,11 +3615,16 @@ var pickCoreFields = (resource) => {
   if (resource.schemaHash) picked.schemaHash = resource.schemaHash;
   return picked;
 };
+var isNewerVersion = (candidate, current) => {
+  const comparison = compareVersions(candidate, current);
+  if (comparison !== void 0) return comparison > 0;
+  return candidate.localeCompare(current) > 0;
+};
 var deduplicateByLatestVersion = (resources) => {
   const seen = /* @__PURE__ */ new Map();
   for (const r of resources) {
     const existing = seen.get(r.id);
-    if (!existing || compare(r.version, existing.version) > 0) {
+    if (!existing || isNewerVersion(r.version, existing.version)) {
       seen.set(r.id, r);
     }
   }
@@ -3771,7 +3760,6 @@ import fs21 from "fs/promises";
 import path8 from "path";
 import matter8 from "gray-matter";
 import ignore from "ignore";
-import { rcompare, valid as valid2 } from "semver";
 
 // src/diagrams.ts
 import fs20 from "fs/promises";
@@ -3823,14 +3811,15 @@ var getFlowReferences = (steps) => steps.flatMap((step) => [
   ...step.flow ? [{ kind: "flow", ...step.flow }] : []
 ]);
 var compareText = (left, right) => left < right ? -1 : left > right ? 1 : 0;
-var compareVersions = (left, right) => {
+var compareVersions2 = (left, right) => {
   if (left === right) return 0;
   if (left === void 0) return 1;
   if (right === void 0) return -1;
-  if (valid2(left) && valid2(right)) return rcompare(left, right);
+  const comparison = compareVersions(left, right);
+  if (comparison !== void 0) return -comparison;
   return compareText(right, left);
 };
-var compareIndexResources = (left, right) => compareText(left.type, right.type) || compareText(left.id, right.id) || compareVersions(left.version, right.version);
+var compareIndexResources = (left, right) => compareText(left.type, right.type) || compareText(left.id, right.id) || compareVersions2(left.version, right.version);
 var toCatalogPath = (directory, filePath) => path8.relative(directory, filePath).split(path8.sep).join("/");
 var isFederatedPath = (directory, filePath) => toCatalogPath(directory, filePath).startsWith("federated/");
 var loadIgnoreRules = async (directory) => {
@@ -4192,12 +4181,12 @@ var rmChangelog = (catalogDir) => async (id, options = {}) => {
 };
 
 // src/resolve.ts
-import { gt, satisfies as satisfies5, valid as valid3, validRange as validRange5 } from "semver";
 var compareText2 = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 var isHigherVersion = (candidate, current) => {
   if (candidate === current || candidate === void 0) return false;
   if (current === void 0) return true;
-  if (valid3(candidate) && valid3(current)) return gt(candidate, current);
+  const comparison = compareVersions(candidate, current);
+  if (comparison !== void 0) return comparison > 0;
   return compareText2(candidate, current) > 0;
 };
 var selectTarget = (candidates, pointerVersion) => {
@@ -4207,10 +4196,8 @@ var selectTarget = (candidates, pointerVersion) => {
   }
   const exactMatch = candidates.find((candidate) => candidate.version === pointerVersion);
   if (exactMatch) return exactMatch;
-  const range = validRange5(pointerVersion);
-  if (!range) return void 0;
   return candidates.reduce((latest, candidate) => {
-    if (candidate.version === void 0 || !valid3(candidate.version) || !satisfies5(candidate.version, range)) return latest;
+    if (candidate.version === void 0 || !versionSatisfiesRange(candidate.version, pointerVersion)) return latest;
     if (latest === void 0 || isHigherVersion(candidate.version, latest.version)) return candidate;
     return latest;
   }, void 0);