@eventcatalog/core 2.29.1 → 2.29.3

package/README.md

@@ -34,7 +34,7 @@
 <h4>Features: Documentation for Event Driven Architectures, Integration with any broker, Generator from your OpenAPI and AsyncAPI documents, Docs and Code, 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-49-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-50-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [Read the Docs](https://www.eventcatalog.dev/docs/development/getting-started/introduction) | [View Demo](https://demo.eventcatalog.dev)
@@ -259,6 +259,9 @@ 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/Vertygo"><img src="https://avatars.githubusercontent.com/u/1658326?v=4?s=100" width="100px;" alt="Ivan Milosavljevic"/><br /><sub><b>Ivan Milosavljevic</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=Vertygo" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mezzle"><img src="https://avatars.githubusercontent.com/u/570639?v=4?s=100" width="100px;" alt="Martin Meredith"/><br /><sub><b>Martin Meredith</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=Mezzle" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/ruudwelling/"><img src="https://avatars.githubusercontent.com/u/4014179?v=4?s=100" width="100px;" alt="Ruud Welling"/><br /><sub><b>Ruud Welling</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=WellingR" 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.29.1";
+var version = "2.29.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-UMSVZL34.js";
-import "../chunk-OXENAILQ.js";
+} from "../chunk-7LKTKQLT.js";
+import "../chunk-KCR7LC5R.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.29.1";
+var version = "2.29.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-YKQAIHRX.js";
-import "../chunk-UMSVZL34.js";
-import "../chunk-OXENAILQ.js";
+} from "../chunk-BA6XXQEM.js";
+import "../chunk-7LKTKQLT.js";
+import "../chunk-KCR7LC5R.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-UMSVZL34.js → chunk-7LKTKQLT.js}

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

package/dist/{chunk-YKQAIHRX.js → chunk-BA6XXQEM.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-UMSVZL34.js";
+} from "./chunk-7LKTKQLT.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-OXENAILQ.js → chunk-KCR7LC5R.js}

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-OXENAILQ.js";
+} from "./chunk-KCR7LC5R.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.29.1";
+var version = "2.29.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,14 +6,14 @@ import {
 } from "./chunk-WUCY3QHK.js";
 import {
   log_build_default
-} from "./chunk-YKQAIHRX.js";
-import "./chunk-UMSVZL34.js";
+} from "./chunk-BA6XXQEM.js";
+import "./chunk-7LKTKQLT.js";
 import {
   catalogToAstro
 } from "./chunk-R2NILSWL.js";
 import {
   VERSION
-} from "./chunk-OXENAILQ.js";
+} from "./chunk-KCR7LC5R.js";
 import {
   isBackstagePluginEnabled
 } from "./chunk-XMDPVKIJ.js";

package/eventcatalog/src/components/SideNav/ListViewSideBar/components/MessageList.tsx

@@ -5,6 +5,26 @@ interface MessageListProps {
   decodedCurrentPath: string;
 }
 
+const getMessageColorByLabelOrCollection = (collection: string, badge?: string) => {
+  if (!badge) {
+    return getMessageColorByCollection(collection);
+  }
+
+  // Will try and match the label against HTTP verbs
+  const httpVerbs = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT'];
+  if (badge && httpVerbs.includes(badge.toUpperCase())) {
+    if (badge.toUpperCase() === 'GET') return 'bg-blue-50 text-blue-600';
+    if (badge.toUpperCase() === 'POST') return 'bg-green-50 text-green-600';
+    if (badge.toUpperCase() === 'PUT') return 'bg-yellow-50 text-yellow-600';
+    if (badge.toUpperCase() === 'DELETE') return 'bg-red-50 text-red-600';
+    if (badge.toUpperCase() === 'PATCH') return 'bg-purple-50 text-purple-600';
+    if (badge.toUpperCase() === 'HEAD') return 'bg-gray-50 text-gray-600';
+    if (badge.toUpperCase() === 'OPTIONS') return 'bg-orange-50 text-orange-600';
+  }
+
+  return getMessageColorByCollection(collection);
+};
+
 const MessageList: React.FC<MessageListProps> = ({ messages, decodedCurrentPath }) => (
   <ul className="space-y-0.5 border-l border-gray-200/80 ml-[9px] pl-4">
     {messages.map((message: any) => (
@@ -15,11 +35,11 @@ const MessageList: React.FC<MessageListProps> = ({ messages, decodedCurrentPath
             decodedCurrentPath.includes(message.href) ? 'bg-purple-100 ' : 'hover:bg-purple-100'
           }`}
         >
-          <span className="truncate">{message.data.name}</span>
+          <span className="truncate">{message.data?.sidebar?.label || message.data.name}</span>
           <span
-            className={`ml-2 text-[10px] flex items-center gap-1 font-medium px-2 uppercase py-0.5 rounded ${getMessageColorByCollection(message.collection)}`}
+            className={`ml-2 text-[10px]  flex items-center gap-1 font-medium px-2 uppercase py-0.5 rounded ${getMessageColorByLabelOrCollection(message.collection, message.data?.sidebar?.badge)}`}
           >
-            {getMessageCollectionName(message.collection)}
+            {message.data?.sidebar?.badge || getMessageCollectionName(message.collection)}
           </span>
         </a>
       </li>

package/eventcatalog/src/components/SideNav/ListViewSideBar/utils.ts

@@ -68,6 +68,7 @@ export async function getResourcesForNavigation({ currentPath }: { currentPath:
       sends: sendsWithHref,
       receives: receivesWithHref,
       specifications: item.collection === 'services' ? item.data.specifications : null,
+      sidebar: item.data?.sidebar,
     };
 
     group.push(navigationItem);

package/eventcatalog/src/content.config.ts

@@ -73,6 +73,12 @@ const baseSchema = z.object({
   badges: z.array(badge).optional(),
   owners: z.array(ownerReference).optional(),
   schemaPath: z.string().optional(),
+  sidebar: z
+    .object({
+      label: z.string().optional(),
+      badge: z.string().optional(),
+    })
+    .optional(),
   repository: z
     .object({
       language: z.string().optional(),

package/eventcatalog/src/enterprise/ai-assistant/components/Chat.tsx

@@ -2,12 +2,12 @@ import Sidebar from './ChatSidebar';
 import { ChatProvider } from './hooks/ChatProvider';
 import ChatWindow from './ChatWindow';
 
-const Chat = () => {
+const Chat = ({ chatConfig }: { chatConfig: any }) => {
   return (
     <ChatProvider>
       <div className="flex overflow-hidden w-full">
         <Sidebar />
-        <ChatWindow />
+        <ChatWindow {...chatConfig} />
       </div>
     </ChatProvider>
   );

package/eventcatalog/src/enterprise/ai-assistant/components/ChatWindow.tsx

@@ -2,7 +2,6 @@ import { useEffect, useState, useRef, useCallback, useMemo } from 'react';
 import { BookOpen, Send } from 'lucide-react';
 import { CreateWebWorkerMLCEngine, type InitProgressReport } from '@mlc-ai/web-llm';
 import { useChat, type Message } from './hooks/ChatProvider';
-import config from '@config';
 import React from 'react';
 
 // Update Message type to include resources
@@ -102,7 +101,17 @@ const ChatMessage = React.memo(({ message }: { message: Message }) => (
 
 ChatMessage.displayName = 'ChatMessage';
 
-const ChatWindow = () => {
+interface ChatWindowProps {
+  model?: string;
+  max_tokens?: number;
+  similarityResults?: number;
+}
+
+const ChatWindow = ({
+  model = 'Hermes-3-Llama-3.2-3B-q4f16_1-MLC',
+  max_tokens = 4096,
+  similarityResults = 50,
+}: ChatWindowProps) => {
   const [loading, setLoading] = useState(true);
   const [loadingProgress, setLoadingProgress] = useState(0);
   const [engine, setEngine] = useState<any>(null);
@@ -114,10 +123,7 @@ const ChatWindow = () => {
   const completionRef = useRef<any>(null);
   const outputRef = useRef<HTMLDivElement>(null);
 
-  // LLM configuration from eventcatalog.config.js file
-  const model = config.chat?.model || 'Hermes-3-Llama-3.2-3B-q4f16_1-MLC';
-  const max_tokens = config.chat?.max_tokens || 4096;
-  const similarityResults = config.chat?.similarityResults || 50;
+  console.log('model', model);
 
   const { currentSession, storeMessagesToSession, updateSession, isStreaming, setIsStreaming } = useChat();
 

package/eventcatalog/src/pages/chat/index.astro

@@ -8,6 +8,7 @@ import fs from 'node:fs';
 import { Code } from 'astro-expressive-code/components';
 
 const isEnabled = config.chat?.enabled || false;
+const chatConfig = config.chat || {};
 
 const PROJECT_DIR = path.resolve(process.env.PROJECT_DIR || process.cwd());
 const GENERATED_AI_DIR = path.resolve(PROJECT_DIR, 'public/ai');
@@ -46,7 +47,7 @@ const generatorConfig = `
               </div>
             </div>
             <div id="chatContainer" class="w-full">
-              <Chat client:only="react" />
+              <Chat client:only="react" chatConfig={chatConfig} />
             </div>
           </>
         ) : (

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/spec/index.astro

@@ -2,7 +2,7 @@
 import type { CollectionEntry } from 'astro:content';
 import * as path from 'path';
 import fs from 'node:fs';
-import OpenAPISpec from './OpenAPI.tsx';
+import OpenAPISpec from './_OpenAPI.tsx';
 
 import type { CollectionTypes, PageTypes } from '@types';
 import { DocumentMinusIcon } from '@heroicons/react/24/outline';

package/eventcatalog/src/pages/docs/[type]/[id]/index.astro

@@ -44,7 +44,7 @@ const props = Astro.props;
 const pageTitle = `${props.collection} | ${props.data.name}`.replace(/^\w/, (c) => c.toUpperCase());
 
 const { pathname } = Astro.url;
-const redirectUrl = buildUrl(pathname + '/' + props.data.latestVersion);
+const redirectUrl = buildUrl(pathname + '/' + props.data.latestVersion, false, true);
 ---
 
 <!doctype html>

package/eventcatalog/src/pages/visualiser/[type]/[id]/index.astro

@@ -32,8 +32,7 @@ const pageTitle = `${props.collection} | ${props.data.name}`.replace(/^\w/, (c)
 
 const { pathname } = Astro.url;
 
-// redirect with any search params too
-const redirectUrl = buildUrl(pathname + '/' + props.data.latestVersion);
+const redirectUrl = buildUrl(pathname + '/' + props.data.latestVersion, false, true);
 ---
 
 <!doctype html>
@@ -48,6 +47,7 @@ const redirectUrl = buildUrl(pathname + '/' + props.data.latestVersion);
 
 <script define:vars={{ redirectUrl }}>
   document.addEventListener('DOMContentLoaded', () => {
+    // redirect with any search params too
     const searchParams = window.location.search;
     const fullRedirectUrl = redirectUrl + searchParams;
     window.location.href = fullRedirectUrl;

package/eventcatalog/src/utils/url-builder.ts

@@ -3,14 +3,14 @@ const cleanUrl = (url: string) => {
 };
 
 // Custom URL builder as Astro does not support this stuff out the box
-export const buildUrl = (url: string, ignoreTrailingSlash = false) => {
+export const buildUrl = (url: string, ignoreTrailingSlash = false, urlAlreadyIncludesBaseUrl = false) => {
   // Should a trailingSlash be added to urls?
   const trailingSlash = __EC_TRAILING_SLASH__;
 
   let newUrl = url;
 
   // If the base URL is not the root, we need to append it
-  if (import.meta.env.BASE_URL !== '/') {
+  if (import.meta.env.BASE_URL !== '/' && !urlAlreadyIncludesBaseUrl) {
     newUrl = `${import.meta.env.BASE_URL}${url}`;
   }
 

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.29.1",
+  "version": "2.29.3",
   "publishConfig": {
     "access": "public"
   },