@eventcatalog/core 2.18.7 → 2.19.1

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

@@ -1,6 +1,6 @@
 import type { CollectionTypes } from '@types';
 import type { CollectionEntry } from 'astro:content';
-import { coerce, satisfies as satisfiesRange, compare } from 'semver';
+import { coerce, compare, satisfies as satisfiesRange } from 'semver';
 
 export const getPreviousVersion = (version: string, versions: string[]) => {
   const index = versions.indexOf(version);
@@ -8,33 +8,43 @@ export const getPreviousVersion = (version: string, versions: string[]) => {
 };
 
 export const getVersions = (data: CollectionEntry<CollectionTypes>[]) => {
-  const allVersions = data.map((item) => item.data.version).sort();
-  const versions = [...new Set(allVersions)].reverse();
-  const latestVersion = versions[0];
-  return { versions, latestVersion };
+  const allVersions = data.map((item) => item.data.version);
+  const versions = [...new Set(allVersions)];
+  return sortStringVersions(versions);
 };
 
+/**
+ * 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)) }));
+
+  // 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!));
+
+    return sorted.map((v) => v.original);
+  } else {
+    // fallback to default sort
+    return versioned.sort((a, b) => versionExtractor(b).localeCompare(versionExtractor(a)));
+  }
+}
+
 export const getVersionForCollectionItem = (
   item: CollectionEntry<CollectionTypes>,
   collection: CollectionEntry<CollectionTypes>[]
 ) => {
-  const allVersionsForItem = collection
-    .filter((i) => i.data.id === item.data.id)
-    .map((i) => i.data.version)
-    .sort();
+  const allVersionsForItem = collection.filter((i) => i.data.id === item.data.id);
 
-  // unique versions
-  const versions = [...new Set(allVersionsForItem)];
+  return getVersions(allVersionsForItem);
+};
 
-  // Use semver to order the versions
-  const orderedVersions = versions.sort((a, b) => {
-    return compare(b, a);
-  });
+export function sortStringVersions(versions: string[]) {
+  const sorted = sortVersioned(versions, (v) => v);
 
-  const latestVersion = orderedVersions[0];
-
-  return { versions, latestVersion };
-};
+  return { latestVersion: sorted[0], versions: sorted };
+}
 
 /**
  * @param {string} version A valid version (number | v{\d+} | semver)
@@ -59,12 +69,10 @@ export const getItemsFromCollectionByIdAndSemverOrLatest = <T extends { data: {
   }
 
   // Order by version
-  const sorted = filteredCollection.sort((a, b) => {
-    return a.data.version.localeCompare(b.data.version);
-  });
+  const sorted = sortVersioned(filteredCollection, (item) => item.data.version);
 
   // latest version
-  return sorted.length > 0 ? [sorted[sorted.length - 1]] : [];
+  return sorted[0] != null ? [sorted[0]] : [];
 };
 
 export const findMatchingNodes = (

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.18.7",
+  "version": "2.19.1",
   "publishConfig": {
     "access": "public"
   },
@@ -42,9 +42,9 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^6.0.1",
-    "@astrojs/mdx": "^4.0.2",
-    "@astrojs/react": "^4.1.0",
-    "@astrojs/tailwind": "^5.1.3",
+    "@astrojs/mdx": "^4.0.5",
+    "@astrojs/react": "^4.1.3",
+    "@astrojs/tailwind": "^5.1.4",
     "@asyncapi/avro-schema-parser": "^3.0.24",
     "@asyncapi/react-component": "^2.4.3",
     "@headlessui/react": "^2.0.3",
@@ -56,7 +56,7 @@
     "@tailwindcss/typography": "^0.5.13",
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
-    "astro": "^5.1.2",
+    "astro": "^5.1.5",
     "astro-expressive-code": "^0.38.3",
     "astro-pagefind": "^1.6.0",
     "astro-seo": "^0.8.4",
@@ -74,6 +74,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "4.6.2",
     "lucide-react": "^0.453.0",
+    "marked": "^15.0.6",
     "mermaid": "^11.4.1",
     "rapidoc": "^9.3.4",
     "react": "^18.3.1",