@eventcatalog/core 2.19.3 → 2.19.4

package/README.md

@@ -32,7 +32,7 @@
 <h4>Features: Documentation generator for Event Driven Architectures, Markdown driven, Document Domains/Services/Messages/Schemas and more, Content versioning, Assign Owners, Schemas, OpenAPI, MDX Components and more...</h4>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-46-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-47-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [Read the Docs](https://eventcatalog.dev/) | [Edit the Docs](https://github.com/event-catalog/docs) | [View Demo](https://demo.eventcatalog.dev/docs)
@@ -251,6 +251,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/d-o-h"><img src="https://avatars.githubusercontent.com/u/23699653?v=4?s=100" width="100px;" alt="d-o-h"/><br /><sub><b>d-o-h</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=d-o-h" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://pallares.io"><img src="https://avatars.githubusercontent.com/u/1077520?v=4?s=100" width="100px;" alt="Cristian Pallarés"/><br /><sub><b>Cristian Pallarés</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=skyrpex" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SebasRendon12"><img src="https://avatars.githubusercontent.com/u/69688183?v=4?s=100" width="100px;" alt="Sebastian Rendon"/><br /><sub><b>Sebastian Rendon</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=SebasRendon12" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://craig0990.co.uk"><img src="https://avatars.githubusercontent.com/u/461897?v=4?s=100" width="100px;" alt="Craig Roberts"/><br /><sub><b>Craig Roberts</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=craig0990" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

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 = "2.19.3";
+var version = "2.19.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-XVQA6PHI.js";
-import "../chunk-GOZSBK4C.js";
+} from "../chunk-I6MZFFLJ.js";
+import "../chunk-YCAXXE3T.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

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

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-QWOWEO4Q.js";
-import "../chunk-XVQA6PHI.js";
-import "../chunk-GOZSBK4C.js";
+} from "../chunk-FUEL2H2M.js";
+import "../chunk-I6MZFFLJ.js";
+import "../chunk-YCAXXE3T.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-HKXWXCBU.js → chunk-BLDONK5J.js}

@@ -5,6 +5,7 @@ import {
 // src/resolve-catalog-dependencies.js
 import path from "node:path";
 import fs from "node:fs";
+import matter from "gray-matter";
 var resolve_catalog_dependencies_default = async (catalogDir, core) => {
   const catalogConfig = await getEventCatalogConfigFile(catalogDir);
   const dependencies = catalogConfig?.dependencies ?? null;
@@ -19,25 +20,23 @@ var resolve_catalog_dependencies_default = async (catalogDir, core) => {
   const resourceTypes = Object.keys(dependencies);
   for (const resourceType of resourceTypes) {
     for (const dependency of dependencies[resourceType]) {
-      const resource = {
+      const frontmatter = {
         id: dependency.id,
+        name: dependency.id,
         version: dependency.version || "1.0.0"
       };
-      const markdown = `---
-id: ${resource.id}
-name: ${resource.id}
-version: ${resource.version}
----
-
-:::warning
-
-You are running EventCatalog with dependencies enabled.
-
-This resource is mocked and is a dependency. This means that the resource is managed and owned by another catalog.
-:::
-
-`;
-      const resourceFile = path.join(dependenciesDir, resourceType, resource.id, `index.md`);
+      const markdown = matter.stringify(
+        {
+          content: [
+            ":::warning",
+            "You are running EventCatalog with dependencies enabled.",
+            "This resource is mocked and is a dependency. This means that the resource is managed and owned by another catalog.",
+            ":::"
+          ].join("\n\n")
+        },
+        frontmatter
+      );
+      const resourceFile = path.join(dependenciesDir, resourceType, dependency.id, `index.md`);
       fs.mkdirSync(path.dirname(resourceFile), { recursive: true });
       fs.writeFileSync(resourceFile, markdown);
     }

package/dist/{chunk-QWOWEO4Q.js → chunk-FUEL2H2M.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-XVQA6PHI.js";
+} from "./chunk-I6MZFFLJ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-XVQA6PHI.js → chunk-I6MZFFLJ.js}

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

package/dist/{chunk-GOZSBK4C.js → chunk-YCAXXE3T.js}

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

package/dist/constants.js

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

package/dist/eventcatalog.cjs

@@ -161,7 +161,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.19.3";
+var version = "2.19.4";
 
 // src/constants.ts
 var VERSION = version;
@@ -469,6 +469,7 @@ var catalogToAstro = async (source, astroDir) => {
 // src/resolve-catalog-dependencies.js
 var import_node_path4 = __toESM(require("path"), 1);
 var import_node_fs3 = __toESM(require("fs"), 1);
+var import_gray_matter2 = __toESM(require("gray-matter"), 1);
 var resolve_catalog_dependencies_default = async (catalogDir, core2) => {
   const catalogConfig = await getEventCatalogConfigFile(catalogDir);
   const dependencies = catalogConfig?.dependencies ?? null;
@@ -483,25 +484,23 @@ var resolve_catalog_dependencies_default = async (catalogDir, core2) => {
   const resourceTypes = Object.keys(dependencies);
   for (const resourceType of resourceTypes) {
     for (const dependency of dependencies[resourceType]) {
-      const resource = {
+      const frontmatter = {
         id: dependency.id,
+        name: dependency.id,
         version: dependency.version || "1.0.0"
       };
-      const markdown = `---
-id: ${resource.id}
-name: ${resource.id}
-version: ${resource.version}
----
-
-:::warning
-
-You are running EventCatalog with dependencies enabled.
-
-This resource is mocked and is a dependency. This means that the resource is managed and owned by another catalog.
-:::
-
-`;
-      const resourceFile = import_node_path4.default.join(dependenciesDir, resourceType, resource.id, `index.md`);
+      const markdown = import_gray_matter2.default.stringify(
+        {
+          content: [
+            ":::warning",
+            "You are running EventCatalog with dependencies enabled.",
+            "This resource is mocked and is a dependency. This means that the resource is managed and owned by another catalog.",
+            ":::"
+          ].join("\n\n")
+        },
+        frontmatter
+      );
+      const resourceFile = import_node_path4.default.join(dependenciesDir, resourceType, dependency.id, `index.md`);
       import_node_fs3.default.mkdirSync(import_node_path4.default.dirname(resourceFile), { recursive: true });
       import_node_fs3.default.writeFileSync(resourceFile, markdown);
     }

package/dist/eventcatalog.js

@@ -3,21 +3,21 @@ import {
 } from "./chunk-SHCMAL37.js";
 import {
   log_build_default
-} from "./chunk-QWOWEO4Q.js";
-import "./chunk-XVQA6PHI.js";
+} from "./chunk-FUEL2H2M.js";
+import "./chunk-I6MZFFLJ.js";
 import {
   catalogToAstro
 } from "./chunk-WF34R5UT.js";
 import {
   VERSION
-} from "./chunk-GOZSBK4C.js";
+} from "./chunk-YCAXXE3T.js";
 import {
   generate
 } from "./chunk-YEQVKHST.js";
 import "./chunk-7JDTB3U5.js";
 import {
   resolve_catalog_dependencies_default
-} from "./chunk-HKXWXCBU.js";
+} from "./chunk-BLDONK5J.js";
 import "./chunk-E7TXTI7G.js";
 
 // src/eventcatalog.ts

package/dist/resolve-catalog-dependencies.cjs

@@ -71,6 +71,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 // src/resolve-catalog-dependencies.js
 var import_node_path2 = __toESM(require("path"), 1);
 var import_node_fs2 = __toESM(require("fs"), 1);
+var import_gray_matter2 = __toESM(require("gray-matter"), 1);
 var resolve_catalog_dependencies_default = async (catalogDir, core) => {
   const catalogConfig = await getEventCatalogConfigFile(catalogDir);
   const dependencies = catalogConfig?.dependencies ?? null;
@@ -85,25 +86,23 @@ var resolve_catalog_dependencies_default = async (catalogDir, core) => {
   const resourceTypes = Object.keys(dependencies);
   for (const resourceType of resourceTypes) {
     for (const dependency of dependencies[resourceType]) {
-      const resource = {
+      const frontmatter = {
         id: dependency.id,
+        name: dependency.id,
         version: dependency.version || "1.0.0"
       };
-      const markdown = `---
-id: ${resource.id}
-name: ${resource.id}
-version: ${resource.version}
----
-
-:::warning
-
-You are running EventCatalog with dependencies enabled.
-
-This resource is mocked and is a dependency. This means that the resource is managed and owned by another catalog.
-:::
-
-`;
-      const resourceFile = import_node_path2.default.join(dependenciesDir, resourceType, resource.id, `index.md`);
+      const markdown = import_gray_matter2.default.stringify(
+        {
+          content: [
+            ":::warning",
+            "You are running EventCatalog with dependencies enabled.",
+            "This resource is mocked and is a dependency. This means that the resource is managed and owned by another catalog.",
+            ":::"
+          ].join("\n\n")
+        },
+        frontmatter
+      );
+      const resourceFile = import_node_path2.default.join(dependenciesDir, resourceType, dependency.id, `index.md`);
       import_node_fs2.default.mkdirSync(import_node_path2.default.dirname(resourceFile), { recursive: true });
       import_node_fs2.default.writeFileSync(resourceFile, markdown);
     }

package/dist/resolve-catalog-dependencies.js

@@ -1,6 +1,6 @@
 import {
   resolve_catalog_dependencies_default
-} from "./chunk-HKXWXCBU.js";
+} from "./chunk-BLDONK5J.js";
 import "./chunk-E7TXTI7G.js";
 export {
   resolve_catalog_dependencies_default as default

package/eventcatalog/package.json

@@ -33,7 +33,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "astro": "^5.1.5",
-    "astro-expressive-code": "^0.38.3",
+    "astro-expressive-code": "^0.40.1",
     "astro-pagefind": "^1.7.0",
     "astro-seo": "^0.8.4",
     "dagre": "^0.8.5",

package/eventcatalog/src/components/Checkbox.astro

@@ -0,0 +1,38 @@
+---
+import type { HTMLAttributes } from 'astro/types';
+
+export type Props = HTMLAttributes<'input'> & {
+  id: string;
+  name: string;
+  label: string;
+};
+
+const { id, name, label, class: className, ...attrs } = Astro.props;
+---
+
+<label for={id} class="relative block cursor-pointer select-none pl-5">
+  <input id={id} name={name} type="checkbox" class="h-0 w-0 cursor-pointer appearance-none group" {...attrs} />
+  <span class="text-md text-gray-700">{label}</span>
+</label>
+
+<style>
+  input::before {
+    @apply absolute left-0 top-1/2 block h-4 w-4 -translate-y-1/2 rounded-[4px] border border-gray-300;
+    content: '';
+  }
+
+  input:checked::before {
+    @apply bg-purple-600;
+  }
+
+  input:focus::before {
+    @apply outline outline-purple-300;
+  }
+
+  input:checked::after {
+    @apply absolute left-0 top-1/2 block h-4 w-4 -translate-y-1/2 bg-center bg-no-repeat;
+    content: '';
+    /** inline unicons checkmark SVG */
+    background-image: url("data:image/svg+xml;utf-8,<svg width='10' height='8' viewBox='0 0 10 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path fill-rule='evenodd' clip-rule='evenodd' d='M9.04731 1.01279C9.34958 1.296 9.36503 1.77062 9.08182 2.07289L4.19342 7.29032C3.77774 7.73398 3.07363 7.73398 2.65795 7.29032L1.01279 5.53443C0.729585 5.23216 0.745038 4.75754 1.04731 4.47433C1.34958 4.19112 1.8242 4.20658 2.1074 4.50884L3.42568 5.91586L7.98721 1.04731C8.27042 0.745037 8.74504 0.729585 9.04731 1.01279Z' fill='white'/></svg>");
+  }
+</style>

package/eventcatalog/src/components/Tables/Table.tsx

@@ -15,8 +15,9 @@ import type { CollectionEntry } from 'astro:content';
 import DebouncedInput from './DebouncedInput';
 
 import { getColumnsByCollection } from './columns';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState, type EventHandler } from 'react';
 import type { CollectionTypes } from '@types';
+import { isSameVersion } from '@utils/collections/util';
 
 declare module '@tanstack/react-table' {
   // @ts-ignore
@@ -32,10 +33,12 @@ export const Table = ({
   data: initialData,
   collection,
   mode = 'simple',
+  checkboxLatestId,
 }: {
   data: CollectionEntry<'events'>[];
   collection: string;
-  mode: 'simple' | 'full';
+  checkboxLatestId: string;
+  mode?: 'simple' | 'full';
 }) => {
   const [data, _setData] = useState(initialData);
   const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
@@ -48,6 +51,20 @@ export const Table = ({
     }
   }, []);
 
+  const [showOnlyLatest, setShowOnlyLatest] = useState(true);
+
+  useEffect(() => {
+    const checkbox = document.getElementById(checkboxLatestId);
+
+    function handleChange(evt: Event) {
+      setShowOnlyLatest((evt.target as HTMLInputElement).checked);
+    }
+
+    checkbox?.addEventListener('change', handleChange);
+
+    return () => checkbox?.removeEventListener('change', handleChange);
+  }, [checkboxLatestId]);
+
   const columns = useMemo(() => getColumnsByCollection(collection), [collection]);
 
   const table = useReactTable({
@@ -63,6 +80,15 @@ export const Table = ({
     getPaginationRowModel: getPaginationRowModel(),
     state: {
       columnFilters,
+      globalFilter: showOnlyLatest,
+    },
+    onGlobalFilterChange: setShowOnlyLatest,
+    globalFilterFn: (row, _columnId, showOnlyLatest: boolean) => {
+      if (showOnlyLatest) {
+        return isSameVersion(row.original.data.version, row.original.data.latestVersion);
+      }
+
+      return true;
     },
   });
 

package/eventcatalog/src/layouts/DiscoverLayout.astro

@@ -11,6 +11,7 @@ import { buildUrl } from '@utils/url-builder';
 import { getQueries } from '@utils/queries';
 import { MagnifyingGlassIcon } from '@heroicons/react/20/solid';
 import VerticalSideBarLayout from './VerticalSideBarLayout.astro';
+import Checkbox from '@components/Checkbox.astro';
 
 const events = await getEvents();
 const queries = await getQueries();
@@ -22,6 +23,8 @@ const flows = await getFlows();
 const { title, subtitle, data, type } = Astro.props;
 const currentPath = Astro.url.pathname;
 
+const checkboxLatestId = 'latest-only';
+
 const tabs = [
   {
     label: `Events (${events.length})`,
@@ -102,17 +105,19 @@ const tabs = [
     <!-- Table -->
     <div class="pb-20 ml-6 md:pr-10">
       <div>
-        <div class="sm:flex sm:items-center py-4 pb-4" id="discover-title">
+        <div class="sm:flex sm:items-end py-4 pb-4" id="discover-title">
           <div class="sm:flex-auto space-y-2">
             <h1 class="text-4xl font-semibold text-gray-900 capitalize">{title}</h1>
             <p class="text-md text-gray-700">{subtitle}</p>
           </div>
+          <div class="p-4 border border-gray-200 rounded-md">
+            <Checkbox id={checkboxLatestId} name={checkboxLatestId} label="Show latest version only" checked />
+          </div>
         </div>
         <div class="mt-4 flow-root">
           <div class="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
             <div class="inline-block min-w-full align-middle sm:px-6 lg:px-8">
-              <!-- @ts-ignore -->
-              <Table data={data} collection={type} client:load />
+              <Table checkboxLatestId={checkboxLatestId} data={data} collection={type} client:load />
             </div>
           </div>
         </div>

package/eventcatalog/src/utils/collections/file-diffs.ts

@@ -1,6 +1,6 @@
 import { readdir, readFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
-import { diffLines, type Change } from 'diff';
+import { formatPatch, structuredPatch } from 'diff';
 import { html, parse } from 'diff2html';
 import { getItemsFromCollectionByIdAndSemverOrLatest } from './util';
 import type { CollectionEntry } from 'astro:content';
@@ -16,29 +16,8 @@ const FILE_EXTENSIONS_TO_INCLUDE = ['.json', '.avro', '.yaml', '.yml', '.proto',
  * @returns A string representing the diff in unified format
  */
 function generateDiffString(fileName: string, oldStr: string, newStr: string): string {
-  const diff = diffLines(oldStr, newStr);
-
-  // Check if there are any changes
-  const hasChanges = diff.some((part) => part.added || part.removed);
-
-  if (!hasChanges) return '';
-
-  let diffString = `diff --git a/${fileName} b/${fileName}\n`;
-  diffString += `--- a/${fileName}\n`;
-  diffString += `+++ b/${fileName}\n`;
-
-  diff.forEach((part: Change) => {
-    const prefix = part.added ? '+' : part.removed ? '-' : ' ';
-    const lines = part.value.split('\n');
-    // Remove the last element if it's an empty string (which happens if the last line ends with a newline)
-    if (lines[lines.length - 1] === '') lines.pop();
-
-    lines.forEach((line: string) => {
-      diffString += `${prefix}${line}\n`;
-    });
-  });
-
-  return diffString;
+  const jsonPatch = structuredPatch(fileName, fileName, oldStr, newStr);
+  return jsonPatch.hunks.length == 0 ? '' : formatPatch(jsonPatch);
 }
 
 /**

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

@@ -1,6 +1,6 @@
 import type { CollectionTypes } from '@types';
 import type { CollectionEntry } from 'astro:content';
-import { coerce, compare, satisfies as satisfiesRange } from 'semver';
+import { coerce, compare, eq, satisfies as satisfiesRange } from 'semver';
 
 export const getPreviousVersion = (version: string, versions: string[]) => {
   const index = versions.indexOf(version);
@@ -13,6 +13,17 @@ export const getVersions = (data: CollectionEntry<CollectionTypes>[]) => {
   return sortStringVersions(versions);
 };
 
+export function isSameVersion(v1: string | undefined, v2: string | undefined) {
+  const semverV1 = coerce(v1);
+  const semverV2 = coerce(v2);
+
+  if (semverV1 != null && semverV2 != null) {
+    return eq(semverV1, semverV2);
+  }
+
+  return v1 === v2;
+}
+
 /**
  * Sorts versioned items. Latest version first.
  */

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.19.3",
+  "version": "2.19.4",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "astro": "^5.1.5",
-    "astro-expressive-code": "^0.38.3",
+    "astro-expressive-code": "^0.40.1",
     "astro-pagefind": "^1.6.0",
     "astro-seo": "^0.8.4",
     "axios": "^1.7.7",