@eventcatalog/core 2.21.0 → 2.21.1

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-5S57Z3LK.js";
-import "../chunk-BPHBVY4J.js";
+} from "../chunk-6UDSGYH7.js";
+import "../chunk-KC3LZQXV.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.21.0";
+var version = "2.21.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-7R3BVREH.js";
-import "../chunk-5S57Z3LK.js";
-import "../chunk-BPHBVY4J.js";
+} from "../chunk-4CHHTLUN.js";
+import "../chunk-6UDSGYH7.js";
+import "../chunk-KC3LZQXV.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-7R3BVREH.js → chunk-4CHHTLUN.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-5S57Z3LK.js";
+} from "./chunk-6UDSGYH7.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-5S57Z3LK.js → chunk-6UDSGYH7.js}

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

package/dist/{chunk-BPHBVY4J.js → chunk-KC3LZQXV.js}

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-BPHBVY4J.js";
+} from "./chunk-KC3LZQXV.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.21.0";
+var version = "2.21.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -3,14 +3,14 @@ import {
 } from "./chunk-FSKZU5FH.js";
 import {
   log_build_default
-} from "./chunk-7R3BVREH.js";
-import "./chunk-5S57Z3LK.js";
+} from "./chunk-4CHHTLUN.js";
+import "./chunk-6UDSGYH7.js";
 import {
   catalogToAstro
 } from "./chunk-WF34R5UT.js";
 import {
   VERSION
-} from "./chunk-BPHBVY4J.js";
+} from "./chunk-KC3LZQXV.js";
 import {
   generate
 } from "./chunk-YEQVKHST.js";

package/eventcatalog/public/rss.xsl

@@ -17,7 +17,7 @@
             <strong>This is a web feed,</strong> also known as an RSS feed. <strong>Subscribe</strong> by copying the URL from the address bar into your newsreader.
           </p>
           <!-- <p class="text-gray">
-            Visit <a href="https://aboutfeeds.com">About Feeds</a> to get started with newsreaders and subscribing. It’s free.
+            Visit <a href="https://aboutfeeds.com">About Feeds</a> to get started with newsreaders and subscribing. It's free.
           </p> -->
         </nav>
         <div class="container-md px-3 py-3 markdown-body">
@@ -50,7 +50,10 @@
                 <xsl:value-of select="description"/>
               </p>
               <small class="text-gray">
-                Published: <xsl:value-of select="pubDate" />
+                Last updated on: <xsl:value-of select="pubDate" />
+                <xsl:if test="author">
+                    by <xsl:value-of select="author" />
+                </xsl:if>
               </small>
             </div>
           </xsl:for-each>

package/eventcatalog/src/pages/rss/[resource]/rss.xml.js

@@ -3,11 +3,12 @@ import { getCollection } from 'astro:content';
 import { statSync } from 'fs';
 import { buildUrl } from '@utils/url-builder';
 import config from '@config';
+import { getGitHistory } from '@utils/git';
 
 const isRSSEnabled = config.rss?.enabled;
 const rssLimit = config.rss?.limit || 15;
 
-const collections = ['events', 'services', 'domains', 'commands', 'flows', 'all'];
+const collections = ['events', 'services', 'domains', 'commands', 'queries', 'flows', 'all'];
 
 export function getStaticPaths() {
   return collections.map((collection) => ({
@@ -34,17 +35,32 @@ export async function GET(context) {
     items = await getCollection(collection);
   }
 
-  // console.log(events);
-
   const rssItems = items
     .map((event) => {
       const pathToFile = event.data.pathToFile;
 
-      // Get file stats to access modified date
-      const stats = statSync(pathToFile);
+      let modifiedDate;
+      let modifiedAuthor;
+
+      try {
+        const gitHistory = getGitHistory(pathToFile, {
+          includeAuthor: true,
+          age: 'newest',
+        });
+
+        modifiedDate = gitHistory.date;
+        modifiedAuthor = gitHistory.author;
+      } catch (error) {
+        // Failed to get git history, use the file stats
+        const stats = statSync(pathToFile);
+        modifiedDate = stats.mtime;
+        modifiedAuthor = undefined;
+      }
+
       return {
         ...event,
-        modifiedDate: stats.mtime,
+        modifiedDate: modifiedDate,
+        modifiedAuthor: modifiedAuthor,
       };
     })
     .sort((a, b) => b.modifiedDate - a.modifiedDate) // Sort in descending order (newest first)
@@ -71,6 +87,7 @@ export async function GET(context) {
       description: event.data.summary,
       // Optional: Include modified date in the RSS feed
       lastBuildDate: items.find((item) => item.id === event.id)?.modifiedDate,
+      author: event.modifiedAuthor,
       // categories: event.data.badges,
     })),
     // (optional) inject custom xml

package/eventcatalog/src/utils/git.ts

@@ -0,0 +1,58 @@
+import shell from 'shelljs';
+
+export function hasGit() {
+  return !!shell.which('git');
+}
+
+export function getGitHistory(
+  filePath: string,
+  {
+    includeAuthor = true,
+    age = 'newest',
+  }: {
+    includeAuthor?: boolean;
+    age?: 'newest' | 'oldest';
+    maxCount?: number;
+  }
+): {
+  timestamp: number;
+  date: Date;
+  author: string | undefined;
+} {
+  if (!hasGit()) {
+    throw new Error('Git is not installed');
+  }
+
+  const resultFormat = includeAuthor ? 'RESULT:%ct,%an' : 'RESULT:%ct';
+
+  const args = [`--format=${resultFormat}`, '--max-count=1', age === 'oldest' ? '--follow --diff-filter=A' : undefined]
+    .filter(Boolean)
+    .join(' ');
+
+  const command = `git -c log.showSignature=false log ${args} -- "${filePath}"`;
+
+  const result = shell.exec(command, { silent: true });
+
+  const regex = includeAuthor
+    ? /(?:^|\n)RESULT:(?<timestamp>\d+),(?<author>.+)(?:$|\n)/
+    : /(?:^|\n)RESULT:(?<timestamp>\d+)(?:$|\n)/;
+
+  const output = result.stdout.trim();
+
+  const match = output.match(regex);
+
+  if (!match) {
+    throw new Error(`Failed to retrieve the git history for file "${filePath}" with unexpected output: ${output}`);
+  }
+
+  const timestampInSeconds = Number(match.groups?.timestamp);
+  const timestamp = timestampInSeconds * 1_000;
+  const date = new Date(timestamp);
+  const author = match.groups?.author;
+
+  return {
+    timestamp,
+    date,
+    author,
+  };
+}

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "publishConfig": {
     "access": "public"
   },
@@ -67,6 +67,7 @@
     "remark-gfm": "^3.0.1",
     "rimraf": "^5.0.7",
     "semver": "7.6.3",
+    "shelljs": "^0.8.5",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.4.5",
     "unist-util-visit": "^5.0.0",
@@ -85,6 +86,7 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@types/semver": "^7.5.8",
+    "@types/shelljs": "^0.8.15",
     "prettier": "^3.3.3",
     "prettier-plugin-astro": "^0.14.1",
     "tsup": "^8.1.0",