@eventcatalog/core 3.0.0-beta.9 → 3.1.0

package/eventcatalog/src/utils/feature.ts

@@ -11,9 +11,9 @@
  * 3. Follow the official activation instructions
  */
 
-import config from '@config';
 import fs from 'fs';
 import { join } from 'path';
+import config from '../../eventcatalog.config.js';
 
 // These functions check for valid, legally obtained access to premium features
 export const isEventCatalogStarterEnabled = () => process.env.EVENTCATALOG_STARTER === 'true';
@@ -39,23 +39,31 @@ export const showCustomBranding = () => {
 export const isChangelogEnabled = () => config?.changelog?.enabled ?? false;
 
 export const isCustomDocsEnabled = () => isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
+
 export const isEventCatalogChatEnabled = () => {
   const isFeatureEnabledFromPlan = isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
-  return isFeatureEnabledFromPlan && config?.chat?.enabled && isSSR();
+  const directory = process.env.PROJECT_DIR || process.cwd();
+  const hasChatConfigurationFile = fs.existsSync(join(directory, 'eventcatalog.chat.js'));
+  return isFeatureEnabledFromPlan && hasChatConfigurationFile && isSSR();
 };
 
 export const isEventCatalogUpgradeEnabled = () => !isEventCatalogStarterEnabled() && !isEventCatalogScaleEnabled();
 export const isCustomLandingPageEnabled = () => isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
 
 export const isMarkdownDownloadEnabled = () => config?.llmsTxt?.enabled ?? false;
-export const isLLMSTxtEnabled = () => (config?.llmsTxt?.enabled || isEventCatalogChatEnabled()) ?? false;
+export const isLLMSTxtEnabled = () => (config?.llmsTxt?.enabled || isEventCatalogChatEnabled()) ?? true;
 
 export const isAuthEnabled = () => {
+  const isAuthEnabledInCatalog = config?.auth?.enabled ?? false;
   const directory = process.env.PROJECT_DIR || process.cwd();
-  const hasAuthConfig = fs.existsSync(join(directory, 'eventcatalog.auth.js'));
-  return (hasAuthConfig && isSSR() && isEventCatalogScaleEnabled()) || false;
+  const hasAuthConfigurationFile = fs.existsSync(join(directory, 'eventcatalog.auth.js'));
+  return (isAuthEnabledInCatalog && hasAuthConfigurationFile && isSSR() && isEventCatalogScaleEnabled()) || false;
 };
 
 export const isSSR = () => config?.output === 'server';
 export const isRSSEnabled = () => config?.rss?.enabled ?? false;
 export const isVisualiserEnabled = () => config?.visualiser?.enabled ?? true;
+
+export const isCustomStylesEnabled = () => {
+  return isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
+};

package/eventcatalog/src/utils/node-graphs/services-node-graph.ts

@@ -292,7 +292,7 @@ export const getNodesAndEdges = async ({
   const uniqueEdges = edges.reduce((acc: any[], edge: any) => {
     const existingEdge = acc.find((e: any) => e.id === edge.id);
     if (existingEdge) {
-      existingEdge.label = `${existingEdge.label} & ${edge.label}`;
+      // existingEdge.label = `${existingEdge.label} & ${edge.label}`;
       // Add the custom colors to the existing edge which can be an array of strings
       const value = Array.isArray(edge.data.customColor) ? edge.data.customColor : [edge.data.customColor];
       const existingValue = Array.isArray(existingEdge.data.customColor)

package/eventcatalog/src/utils/resource-files.ts

@@ -0,0 +1,86 @@
+import fs from 'fs';
+import path from 'path';
+import { isSSR } from '@utils/feature';
+
+/**
+ * Get the absolute base path for a resource item.
+ *
+ * In SSR mode, filePath is relative to the Astro core directory (e.g., "../examples/default/domains/...").
+ * We need to resolve it using PROJECT_DIR to get the correct absolute path.
+ *
+ * In static mode, filePath is resolved correctly by Astro's build context.
+ *
+ * @param item - The resource item with a filePath property
+ * @returns The absolute path to the directory containing the resource
+ */
+export function getResourceBasePath(item: { filePath?: string }): string {
+  if (!item.filePath) {
+    return '';
+  }
+
+  const filePath = item.filePath;
+
+  // In SSR mode, we need to resolve the relative path using PROJECT_DIR
+  if (isSSR()) {
+    const PROJECT_DIR = process.env.PROJECT_DIR || '';
+
+    if (PROJECT_DIR) {
+      // Get the project folder name from PROJECT_DIR (e.g., "default" from ".../examples/default")
+      const projectFolderName = path.basename(PROJECT_DIR);
+
+      // Find the project folder in the relative path and extract everything after it
+      // Pattern: ../examples/default/domains/... -> domains/...
+      const regex = new RegExp(`.*?${projectFolderName}/(.+)$`);
+      const match = filePath.match(regex);
+
+      if (match && match[1]) {
+        // Join PROJECT_DIR with the relative path within the project
+        return path.join(PROJECT_DIR, path.dirname(match[1]));
+      }
+    }
+  }
+
+  // Static mode: resolve directly using Astro's build context
+  return path.dirname(path.resolve(filePath));
+}
+
+/**
+ * Get the absolute path to a file within a resource directory.
+ *
+ * @param item - The resource item with a filePath property
+ * @param relativePath - The relative path to the file (e.g., "schema.json")
+ * @returns The absolute path to the file
+ */
+export function getResourceFilePath(item: { filePath?: string }, relativePath: string): string {
+  const basePath = getResourceBasePath(item);
+  return path.join(basePath, relativePath);
+}
+
+/**
+ * Check if a file exists within a resource directory.
+ *
+ * @param item - The resource item with a filePath property
+ * @param relativePath - The relative path to the file (e.g., "schema.json")
+ * @returns True if the file exists, false otherwise
+ */
+export function resourceFileExists(item: { filePath?: string }, relativePath: string): boolean {
+  const filePath = getResourceFilePath(item, relativePath);
+  return fs.existsSync(filePath);
+}
+
+/**
+ * Read a file from a resource directory.
+ *
+ * @param item - The resource item with a filePath property
+ * @param relativePath - The relative path to the file (e.g., "schema.json")
+ * @returns The file content as a string, or null if the file doesn't exist
+ */
+export function readResourceFile(item: { filePath?: string }, relativePath: string): string | null {
+  const filePath = getResourceFilePath(item, relativePath);
+
+  if (!fs.existsSync(filePath)) {
+    return null;
+  }
+
+  return fs.readFileSync(filePath, 'utf-8');
+}

package/eventcatalog/tailwind.config.mjs

@@ -6,6 +6,7 @@ const theme = config.theme || {};
 
 /** @type {import('tailwindcss').Config} */
 export default {
+  darkMode: ['selector', '[data-theme="dark"]'],
   content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
   theme: {
     extend: {
@@ -51,11 +52,13 @@ export default {
     },
   },
   safelist: [
-    { pattern: /border-.*-(200|400|500)/ },
-    { pattern: /bg-.*-(100|200|400|500)/ },
+    { pattern: /border-.*-(200|400|500)/, variants: ['dark', 'hover', 'dark:hover'] },
+    { pattern: /bg-.*-(100|200|400|500)/, variants: ['dark'] },
+    { pattern: /bg-.*-500\/(10|20)/, variants: ['dark'] },
     { pattern: /from-.*-(100|200|300|400|500|600|700)/ },
     { pattern: /to-.*-(100|200|300|400|500|600|700)/ },
-    { pattern: /text-.*-(400|500|800)/ },
+    { pattern: /text-.*-(300|400|500|800)/, variants: ['dark', 'group-hover', 'dark:group-hover'] },
+    { pattern: /ring-.*-500\/30/, variants: ['dark'] },
     'border-blue-200',
     'border-green-300',
     'bg-blue-600',

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "3.0.0-beta.9",
+  "version": "3.1.0",
   "publishConfig": {
     "access": "public"
   },
@@ -17,16 +17,12 @@
     "eventcatalog/",
     "!eventcatalog/**/__tests__/",
     "bin/",
-    "dist/",
-    "default-files-for-collections/"
+    "dist/"
   ],
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.23",
-    "@ai-sdk/google": "^2.0.17",
-    "@ai-sdk/openai": "^2.0.42",
     "@ai-sdk/react": "^2.0.60",
-    "@astrojs/markdown-remark": "^6.3.9",
-    "@astrojs/mdx": "^4.3.12",
+    "@astrojs/markdown-remark": "^6.3.10",
+    "@astrojs/mdx": "^4.3.13",
     "@astrojs/node": "^9.5.1",
     "@astrojs/react": "^4.4.2",
     "@astrojs/rss": "^4.0.14",
@@ -38,7 +34,7 @@
     "@eventcatalog/generator-ai": "^1.1.0",
     "@eventcatalog/license": "^0.0.7",
     "@eventcatalog/linter": "^0.0.2",
-    "@eventcatalog/sdk": "^2.9.2",
+    "@eventcatalog/sdk": "^2.9.9",
     "@eventcatalog/visualizer": "^0.0.6",
     "@fontsource/inter": "^5.2.5",
     "@headlessui/react": "^2.0.3",
@@ -50,6 +46,7 @@
     "@radix-ui/react-context-menu": "^2.2.6",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-dropdown-menu": "^2.1.12",
+    "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-tooltip": "^1.1.8",
     "@scalar/api-reference-react": "^0.4.37",
     "@tailwindcss/typography": "^0.5.13",
@@ -57,7 +54,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "ai": "^5.0.60",
-    "astro": "^5.16.4",
+    "astro": "^5.16.6",
     "astro-compress": "^2.3.8",
     "astro-expressive-code": "^0.41.3",
     "astro-seo": "^0.8.4",
@@ -76,16 +73,15 @@
     "glob": "^10.5.0",
     "gray-matter": "^4.0.3",
     "html-to-image": "^1.11.11",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "jsonpath": "^1.1.1",
     "jsonwebtoken": "^9.0.2",
     "lodash.debounce": "^4.0.8",
     "lodash.merge": "4.6.2",
     "lucide-react": "^0.453.0",
     "marked": "^15.0.6",
-    "mermaid": "^11.4.1",
+    "mermaid": "^11.12.1",
     "nanostores": "^1.1.0",
-    "pagefind": "^1.3.0",
     "pako": "^2.1.0",
     "picocolors": "^1.1.1",
     "react": "^18.3.1",
@@ -94,13 +90,14 @@
     "react-syntax-highlighter": "^16.1.0",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-expressive-code": "^0.41.3",
+    "rehype-raw": "^7.0.0",
     "rehype-slug": "^6.0.0",
     "remark-comment": "^1.0.0",
     "remark-directive": "^3.0.0",
     "remark-gfm": "^3.0.1",
     "rimraf": "^5.0.7",
     "semver": "7.6.3",
-    "shelljs": "^0.8.5",
+    "shelljs": "^0.9.0",
     "tailwindcss": "^3.4.3",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.4.5",
@@ -147,7 +144,7 @@
     "preview": "astro preview",
     "astro": "astro",
     "start:catalog": "node scripts/start-catalog-locally.js",
-    "pagefind": "node scripts/pagefind.js",
+    "start:catalog:server": "node scripts/start-server-locally.js",
     "preview:catalog": "node scripts/preview-catalog-locally.js",
     "generate:catalog": "node scripts/generate-catalog-locally.js",
     "verify-build:catalog": "rimraf dist && pnpm run build:cd",

package/default-files-for-collections/changelogs.md

@@ -1,5 +0,0 @@
----
-id: empty
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/channels.md

@@ -1,8 +0,0 @@
----
-id: empty
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/commands.md

@@ -1,8 +0,0 @@
----
-id: empty
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/domains.md

@@ -1,8 +0,0 @@
----
-id: empty
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/events.md

@@ -1,8 +0,0 @@
----
-id: empty
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/flows.md

@@ -1,11 +0,0 @@
----
-id: empty
-steps:
-    - id: "empty"
-      title: "empty"
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/queries.md

@@ -1,8 +0,0 @@
----
-id: empty
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/services.md

@@ -1,8 +0,0 @@
----
-id: empty
-name: empty
-version: 0.0.1
-hidden: true
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/default-files-for-collections/ubiquitousLanguages.md

@@ -1,7 +0,0 @@
----
-id: ubiquitous-language
-name: Ubiquitous Language
-summary: A shared language used by all team members to communicate about the system.
-description: A shared language used by all team members to communicate about the system.
----
-<!-- Do not delete this file, required for EC, you an ignore this file -->

package/eventcatalog/src/enterprise/collections/chat-prompts.ts

@@ -1,32 +0,0 @@
-import { z } from 'astro:content';
-
-export const chatPromptsSchema = z.object({
-  title: z.string(),
-  type: z.enum(['text', 'code']).default('text'),
-  inputs: z
-    .array(
-      z.object({
-        id: z.string(),
-        label: z.string(),
-        type: z
-          .enum([
-            'text',
-            'resource-list-events',
-            'resource-list-services',
-            'resource-list-commands',
-            'resource-list-queries',
-            'code',
-            'text-area',
-            'select',
-          ])
-          .default('text'),
-        options: z.array(z.string()).optional(),
-      })
-    )
-    .optional(),
-  category: z.object({
-    id: z.string(),
-    label: z.string(),
-    icon: z.string().optional(),
-  }),
-});

package/eventcatalog/src/enterprise/eventcatalog-chat/components/Chat.tsx

@@ -1,60 +0,0 @@
-import Sidebar from './ChatSidebar';
-import { ChatProvider } from './hooks/ChatProvider';
-import ChatWindowServer from './windows/ChatWindow.server';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import type { ChatPromptCategoryGroup } from '@enterprise/eventcatalog-chat/utils/chat-prompts';
-interface Resource {
-  id: string;
-  type: string;
-  name: string;
-}
-
-/**
- * Chat component has two modes:
- * - Server: ChatWindow.server.tsx (uses server-side code, bring your own API key)
- *
- * The mode is determined by the config.output property in the eventcatalog.config.js file.
- */
-
-const Chat = ({
-  chatConfig,
-  resources,
-  chatPrompts,
-  output,
-}: {
-  chatConfig: any;
-  resources: Resource[];
-  chatPrompts: ChatPromptCategoryGroup[];
-  output: 'static' | 'server';
-}) => {
-  const queryClient = new QueryClient();
-
-  if (output !== 'server') {
-    return (
-      // Message to turn on server side
-      <div className="flex justify-center items-center h-full bg-gray-100 p-4 rounded-lg text-center">
-        <div className="space-y-4">
-          <h1 className="text-3xl font-semibold text-gray-800">Chat is only supported on server side</h1>
-          <p className="text-sm text-gray-500">
-            Please switch to server side by setting the <code className="font-mono bg-gray-100 p-0.5 rounded">output</code>{' '}
-            property to <code className="font-mono bg-gray-100 p-0.5 rounded">server</code> in your{' '}
-            <code className="font-mono bg-gray-100 p-0.5 rounded">eventcatalog.config.js</code> file.
-          </p>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <ChatProvider>
-      <div className="flex overflow-hidden w-full">
-        <Sidebar />
-        <QueryClientProvider client={queryClient}>
-          <ChatWindowServer {...chatConfig} resources={resources} chatPrompts={chatPrompts} />
-        </QueryClientProvider>
-      </div>
-    </ChatProvider>
-  );
-};
-
-export default Chat;