@eventcatalog/sdk 2.27.4 → 2.28.1

package/LICENSE

@@ -22,7 +22,10 @@ SOFTWARE.
 
 ---
 
-Note: Source code within `packages/core/eventcatalog/src/enterprise/` is
-licensed under the EventCatalog Commercial License and is NOT covered by the
-MIT License above. See `packages/core/eventcatalog/src/enterprise/LICENSE`
-for the full terms.
+Note: Source code within the following directories is licensed under the
+EventCatalog Commercial License and is NOT covered by the MIT License above:
+
+- `packages/core/eventcatalog/src/enterprise/`
+- `packages/core/src/federation/`
+
+See the `LICENSE` file in each directory for the full terms.

package/dist/index.d.mts

@@ -439,10 +439,12 @@ interface UbiquitousLanguage {
   summary?: string;
   description?: string;
   icon?: string;
+  editUrl?: string;
 }
 
 interface UbiquitousLanguageDictionary {
   dictionary: UbiquitousLanguage[];
+  editUrl?: string;
 }
 
 interface DetailPanelProperty {

package/dist/index.d.ts

@@ -439,10 +439,12 @@ interface UbiquitousLanguage {
   summary?: string;
   description?: string;
   icon?: string;
+  editUrl?: string;
 }
 
 interface UbiquitousLanguageDictionary {
   dictionary: UbiquitousLanguage[];
+  editUrl?: string;
 }
 
 interface DetailPanelProperty {

package/dist/index.js

@@ -43,21 +43,37 @@ var import_node_path29 = require("path");
 
 // src/dsl/utils.ts
 var import_glob = require("glob");
+
+// src/internal/versions.ts
 var import_semver = require("semver");
+var NUMERIC_VERSION_PATTERN = /^[vV]?\d+(?:\.\d+){0,2}$/;
+var toComparableVersion = (version) => {
+  const strictVersion = (0, import_semver.valid)(version);
+  if (strictVersion) return strictVersion;
+  if (!NUMERIC_VERSION_PATTERN.test(version)) return void 0;
+  return (0, import_semver.coerce)(version) ?? void 0;
+};
+var compareVersions = (left, right) => {
+  const leftVersion = toComparableVersion(left);
+  const rightVersion = toComparableVersion(right);
+  if (!leftVersion || !rightVersion) return void 0;
+  return (0, import_semver.compare)(leftVersion, rightVersion);
+};
+var isVersionGreaterThan = (candidate, current) => compareVersions(candidate, current) === 1;
+var versionSatisfiesRange = (version, range) => {
+  const comparableVersion = toComparableVersion(version);
+  const comparableRange = (0, import_semver.validRange)(range) ?? (0, import_semver.validRange)(range.replace(/V(?=\d)/g, "v"));
+  if (!comparableVersion || !comparableRange) return false;
+  return (0, import_semver.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 ((0, import_semver.validRange)(pointerVersion)) {
-      if ((0, import_semver.satisfies)(messageVersion, pointerVersion)) return true;
-    }
-    if ((0, import_semver.validRange)(messageVersion)) {
-      if ((0, import_semver.satisfies)(pointerVersion, messageVersion)) return true;
-    }
-  } catch {
-  }
-  return false;
+  if (versionSatisfiesRange(messageVersion, pointerVersion)) return true;
+  return versionSatisfiesRange(pointerVersion, messageVersion);
 }
 function serializeBaseFields(resource, indent = "  ") {
   const lines = [];
@@ -663,7 +679,6 @@ var import_node_fs = __toESM(require("fs"));
 var import_fs_extra = require("fs-extra");
 var import_node_path = require("path");
 var import_gray_matter = __toESM(require("gray-matter"));
-var import_semver3 = require("semver");
 var _fileIndexCache = null;
 var _fileIndexCatalogDir = null;
 var _matterCache = null;
@@ -795,18 +810,12 @@ var findFileById = async (catalogDir, id, version) => {
   }
   const exactMatch = entries.find((e) => e.version === version);
   if (exactMatch) return exactMatch.path;
-  const semverRange = (0, import_semver3.validRange)(version);
-  if (semverRange) {
-    const match = entries.find((e) => {
-      try {
-        return (0, import_semver3.satisfies)(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 {
@@ -897,7 +906,6 @@ var import_path = require("path");
 var import_gray_matter2 = __toESM(require("gray-matter"));
 var import_promises = __toESM(require("fs/promises"));
 var import_node_fs2 = __toESM(require("fs"));
-var import_semver4 = require("semver");
 var import_proper_lockfile = require("proper-lockfile");
 var import_node_path2 = require("path");
 var import_node_path3 = __toESM(require("path"));
@@ -965,7 +973,7 @@ var writeResource = async (catalogDir, resource, options = {
     if (options.versionExistingContent && !exists) {
       const currentResource = await getResource(catalogDir, resource.id);
       if (currentResource) {
-        if ((0, import_semver4.satisfies)(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}`);
@@ -2047,7 +2055,6 @@ var addMessageToChannel = (directory, collection) => async (id, _message, versio
 var import_node_path12 = require("path");
 var import_node_fs4 = __toESM(require("fs"));
 var import_gray_matter4 = __toESM(require("gray-matter"));
-var import_semver5 = require("semver");
 var getMessageBySchemaPath = (directory) => async (path11, options) => {
   const pathToMessage = (0, import_node_path12.dirname)(path11);
   try {
@@ -2088,34 +2095,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 = (0, import_semver5.validRange)(_message.version);
-        if (isParticipantUsingSemverRange) {
-          return _message.id === message.id && (0, import_semver5.satisfies)(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 = (0, import_semver5.validRange)(_message.version);
-        if (isParticipantUsingSemverRange) {
-          return _message.id === message.id && (0, import_semver5.satisfies)(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);
     }
@@ -2481,9 +2471,6 @@ var dumpCatalog = (directory) => async (options) => {
   };
 };
 
-// src/graph.ts
-var import_semver6 = require("semver");
-
 // src/adrs.ts
 var import_promises12 = __toESM(require("fs/promises"));
 var import_node_path19 = require("path");
@@ -3289,14 +3276,13 @@ var getGraph = (directory) => {
       const allVersionsIndex = await loadAllVersionsIndex(type);
       const exactMatch = allVersionsIndex.byVersion.get(`${pointer.id}:${pointer.version}`);
       if (exactMatch) return exactMatch;
-      const range = (0, import_semver6.validRange)(pointer.version);
-      if (!range) return void 0;
       const candidates = allVersionsIndex.byId.get(pointer.id) || [];
-      const version = (0, import_semver6.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);
@@ -3338,8 +3324,7 @@ var getGraph = (directory) => {
     const pointerMatchesVersion = (pointer, version) => {
       if (!pointer.version || pointer.version === "latest") return true;
       if (pointer.version === version) return true;
-      const range = (0, import_semver6.validRange)(pointer.version);
-      return range ? (0, import_semver6.maxSatisfying)([version], range) === version : false;
+      return versionSatisfiesRange(version, pointer.version);
     };
     const getAdrsForResource = async (type, resource) => {
       if (type === "adr") return [];
@@ -3477,7 +3462,6 @@ var import_node_fs9 = __toESM(require("fs"));
 var import_node_path24 = __toESM(require("path"));
 var import_node_crypto = require("crypto");
 var import_node_child_process = require("child_process");
-var import_semver7 = require("semver");
 
 // src/snapshot-diff.ts
 var stableStringify = (value) => {
@@ -3671,11 +3655,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 || (0, import_semver7.compare)(r.version, existing.version) > 0) {
+    if (!existing || isNewerVersion(r.version, existing.version)) {
       seen.set(r.id, r);
     }
   }
@@ -3811,7 +3800,6 @@ var import_promises18 = __toESM(require("fs/promises"));
 var import_node_path26 = __toESM(require("path"));
 var import_gray_matter8 = __toESM(require("gray-matter"));
 var import_ignore = __toESM(require("ignore"));
-var import_semver8 = require("semver");
 
 // src/diagrams.ts
 var import_promises17 = __toESM(require("fs/promises"));
@@ -3863,14 +3851,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 ((0, import_semver8.valid)(left) && (0, import_semver8.valid)(right)) return (0, import_semver8.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) => import_node_path26.default.relative(directory, filePath).split(import_node_path26.default.sep).join("/");
 var isFederatedPath = (directory, filePath) => toCatalogPath(directory, filePath).startsWith("federated/");
 var loadIgnoreRules = async (directory) => {
@@ -4232,12 +4221,12 @@ var rmChangelog = (catalogDir) => async (id, options = {}) => {
 };
 
 // src/resolve.ts
-var import_semver9 = require("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 ((0, import_semver9.valid)(candidate) && (0, import_semver9.valid)(current)) return (0, import_semver9.gt)(candidate, current);
+  const comparison = compareVersions(candidate, current);
+  if (comparison !== void 0) return comparison > 0;
   return compareText2(candidate, current) > 0;
 };
 var selectTarget = (candidates, pointerVersion) => {
@@ -4247,10 +4236,8 @@ var selectTarget = (candidates, pointerVersion) => {
   }
   const exactMatch = candidates.find((candidate) => candidate.version === pointerVersion);
   if (exactMatch) return exactMatch;
-  const range = (0, import_semver9.validRange)(pointerVersion);
-  if (!range) return void 0;
   return candidates.reduce((latest, candidate) => {
-    if (candidate.version === void 0 || !(0, import_semver9.valid)(candidate.version) || !(0, import_semver9.satisfies)(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);