@eventcatalog/core 4.0.0-beta.1 → 4.0.0-beta.3

package/eventcatalog/src/content.config.ts

@@ -1,6 +1,5 @@
 import { defineCollection, reference } from 'astro:content';
 import { z } from 'astro/zod';
-import { glob } from 'astro/loaders';
 import { glob as globPackage } from 'glob';
 import { v4 as uuidv4 } from 'uuid';
 import { badge, ownerReference } from './content.config-shared-collections';
@@ -10,6 +9,7 @@ import path from 'path';
 import { userTeamDirectoryLoader } from './enterprise/directory/user-team-directory';
 import config from '@config';
 import { schemaLoader } from './utils/collections/schema-loader';
+import { globWithSafeWatcher, withIgnoredBuildArtifacts } from './utils/collections/glob-loader';
 
 // Enterprise Collections
 import { customPagesSchema, resourceDocsSchema, resourceDocCategoriesSchema } from './enterprise/collections';
@@ -34,16 +34,8 @@ export const projectDirBase = (() => {
   return projectDir;
 })();
 
-const withIgnoredBuildArtifacts = (patterns: string | string[]) => {
-  if (process.env.IGNORE_BUILD_ARTIFACTS === 'true') {
-    const ignoredArtifacts = ['!dist/**', '!**/dist/**'];
-    return Array.isArray(patterns) ? [...patterns, ...ignoredArtifacts] : [patterns, ...ignoredArtifacts];
-  }
-  return patterns;
-};
-
 const pages = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/pages/*.(md|mdx)']),
     base: projectDirBase,
   }),
@@ -123,7 +115,7 @@ const directoryEntrySource = z.object({
 });
 
 const changelogs = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/changelog.(md|mdx)']),
     base: projectDirBase,
   }),
@@ -264,7 +256,7 @@ const flowStep = z
   .optional();
 
 const flows = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/flows/**/index.(md|mdx)', '**/flows/**/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -372,7 +364,7 @@ const messageDetailsPanelPropertySchema = z.object({
 });
 
 const events = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/events/*/index.(md|mdx)', '**/events/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data, ...rest }) => {
@@ -395,7 +387,7 @@ const events = defineCollection({
 });
 
 const commands = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/commands/*/index.(md|mdx)', '**/commands/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -418,7 +410,7 @@ const commands = defineCollection({
 });
 
 const queries = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/queries/*/index.(md|mdx)', '**/queries/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -453,7 +445,7 @@ const dataProductOutputPointer = z.object({
 });
 
 const dataProducts = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/data-products/*/index.(md|mdx)', '**/data-products/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -481,7 +473,7 @@ const dataProducts = defineCollection({
 });
 
 const services = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts([
       'domains/*/services/*/index.(md|mdx)',
       'domains/*/services/*/versioned/*/index.(md|mdx)',
@@ -546,7 +538,7 @@ const agentModel = z.object({
 });
 
 const agents = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/agents/*/index.(md|mdx)', '**/agents/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -608,7 +600,7 @@ const adrResourcePointer = adrPointer.extend({
 });
 
 const adrs = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/adrs/*/index.(md|mdx)', '**/adrs/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => `${data.id}-${data.version}`,
@@ -658,7 +650,7 @@ const accessModeEnum = z.enum(['read', 'write', 'readWrite', 'appendOnly']);
 const dataClassificationEnum = z.enum(['public', 'internal', 'confidential', 'regulated']);
 
 const containers = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/containers/**/index.(md|mdx)', '**/containers/**/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -697,7 +689,7 @@ const containers = defineCollection({
 });
 
 const customPages = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     // any number of child folders
     pattern: withIgnoredBuildArtifacts(['docs/*.(md|mdx)', 'docs/**/*.@(md|mdx)']),
     base: projectDirBase,
@@ -706,7 +698,7 @@ const customPages = defineCollection({
 });
 
 const resourceDocs = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     // Resource-level docs are restricted to known resource paths.
     // This avoids scanning external docs such as node_modules/**/docs.
     pattern: withIgnoredBuildArtifacts([
@@ -723,7 +715,7 @@ const resourceDocs = defineCollection({
 });
 
 const resourceDocCategories = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts([
       '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/category.json',
       '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/_category_.json',
@@ -740,7 +732,7 @@ const resourceDocCategories = defineCollection({
 });
 
 const domains = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts([
       // ✅ Strictly include only index.md at the expected levels
       'domains/*/index.(md|mdx)',
@@ -808,7 +800,7 @@ const systemActorRelationship = z.object({
 });
 
 const systems = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts([
       '**/systems/**/index.(md|mdx)',
       '**/systems/**/versioned/*/index.(md|mdx)',
@@ -865,7 +857,7 @@ const systems = defineCollection({
 });
 
 const channels = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/channels/**/index.(md|mdx)', '**/channels/**/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => {
@@ -910,7 +902,7 @@ const channels = defineCollection({
 });
 
 const ubiquitousLanguages = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts([
       'domains/*/ubiquitous-language.(md|mdx)',
       'domains/*/subdomains/*/ubiquitous-language.(md|mdx)',
@@ -937,7 +929,7 @@ const ubiquitousLanguages = defineCollection({
 });
 
 const entities = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/entities/*/index.(md|mdx)', '**/entities/*/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data, ...rest }) => {
@@ -1078,7 +1070,7 @@ const designs = defineCollection({
 });
 
 const diagrams = defineCollection({
-  loader: glob({
+  loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/diagrams/**/index.(md|mdx)', '**/diagrams/**/versioned/*/index.(md|mdx)']),
     base: projectDirBase,
     generateId: ({ data }) => `${data.id}-${data.version}`,

package/eventcatalog/src/enterprise/ai/chat-api.ts

@@ -61,7 +61,7 @@ try {
 const builtInToolsMetadata = [
   {
     name: 'getResources',
-    description: 'Get events, services, commands, queries, flows, domains, channels, entities from EventCatalog',
+    description: 'Get events, services, commands, queries, flows, domains, systems, channels, entities from EventCatalog',
   },
   { name: 'getResource', description: 'Get a specific resource by its id and version' },
   { name: 'getProducersAndConsumersFromSchema', description: 'Get the producers and consumers for a schema' },
@@ -101,6 +101,8 @@ There are many different resource types in EventCatalog, including:
   - example docs url: /docs/services/MyService/1.0.0
 - Domains (collection name 'domains') (business capabilities or functional areas)
   - example docs url: /docs/domains/MyDomain/1.0.0
+- Systems (collection name 'systems') (business capabilities or functional areas)
+  - example docs url: /docs/systems/MySystem/1.0.0
 - Flows (collection name 'flows') (state machines)
   - example docs url: /docs/flows/MyFlow/1.0.0
 - Channels (collection name 'channels') (communication channels)
@@ -340,7 +342,7 @@ export const POST = async ({ request }: APIContext<{ question: string; messages:
             resourceVersion: z.string().describe('The version of the resource to get the architecture diagram for'),
             resourceCollection: visualiserCollectionSchema
               .describe(
-                'The collection of the resource (events, commands, queries, services, domains, flows, containers, data-products)'
+                'The collection of the resource (events, commands, queries, services, domains, systems, flows, containers, data-products)'
               )
               .default('services'),
           }),

package/eventcatalog/src/enterprise/custom-documentation/pages/docs/custom/index.astro

@@ -1,6 +1,6 @@
 ---
 import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
-import { render } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import config from '@config';
 import { AlignLeftIcon, UserIcon, UsersIcon } from 'lucide-react';
 
@@ -28,6 +28,26 @@ const nodeGraphs =
     return nodeGraph.id && nodeGraph.version && nodeGraph.type;
   }) || [];
 
+const resolvedNodeGraphs = await Promise.all(
+  nodeGraphs.map(async (nodeGraph: any) => {
+    const collection = resourceToCollectionMap[nodeGraph.type as keyof typeof resourceToCollectionMap];
+    const domain = collection === 'domains' ? await getEntry('domains', `${nodeGraph.id}-${nodeGraph.version}`) : undefined;
+    const hasSystems = ((domain?.data as any)?.systems || []).length > 0;
+    const graphCollection = hasSystems ? 'domains-systems-context' : collection;
+
+    return {
+      ...nodeGraph,
+      collection,
+      graphCollection,
+      title: nodeGraph.title ?? (hasSystems ? 'System Context Map' : undefined),
+      hrefLabel: hasSystems ? 'Open System Context Map' : 'Open in Visualiser',
+      visualiserUrl: hasSystems
+        ? buildUrl(`/visualiser/domains/${nodeGraph.id}/${nodeGraph.version}/systems-context`)
+        : buildUrl(`/visualiser/${collection}/${nodeGraph.id}/${nodeGraph.version}`),
+    };
+  })
+);
+
 const { prev, next } = await getAdjacentPages(currentSlug);
 
 const ownersRaw = doc?.owners || [];
@@ -129,14 +149,13 @@ const editUrl =
           </div>
 
           {
-            nodeGraphs.length > 0 &&
-              nodeGraphs.map((nodeGraph: any) => {
-                const collection = resourceToCollectionMap[nodeGraph.type as keyof typeof resourceToCollectionMap];
+            resolvedNodeGraphs.length > 0 &&
+              resolvedNodeGraphs.map((nodeGraph: any) => {
                 return (
                   <NodeGraph
                     id={nodeGraph.id}
                     version={nodeGraph.version}
-                    collection={collection}
+                    collection={nodeGraph.graphCollection}
                     title={nodeGraph.title}
                     mode={nodeGraph.mode || 'simple'}
                     linksToVisualiser={true}
@@ -145,8 +164,8 @@ const editUrl =
                     href={
                       isVisualiserEnabled()
                         ? {
-                            label: 'Open in Visualiser',
-                            url: buildUrl(`/visualiser/${collection}/${nodeGraph.id}/${nodeGraph.version}`),
+                            label: nodeGraph.hrefLabel,
+                            url: nodeGraph.visualiserUrl,
                           }
                         : undefined
                     }

package/eventcatalog/src/enterprise/directory/user-team-directory.ts

@@ -1,12 +1,12 @@
-import { glob, type Loader } from 'astro/loaders';
+import type { Loader } from 'astro/loaders';
 import pc from 'picocolors';
 import { isEventCatalogScaleEnabled } from '../feature';
 import { EventCatalogStore } from '../../stores/eventcatalog-store';
+import { globWithSafeWatcher, type GlobOptions } from '../../utils/collections/glob-loader';
 
 const colors = pc.createColors(true);
 
 type UserTeamCollection = 'users' | 'teams';
-type GlobOptions = Parameters<typeof glob>[0];
 
 type DirectoryEntry = {
   id: string;
@@ -58,7 +58,7 @@ export const userTeamDirectoryLoader = ({
   conflictStrategy = 'local-wins',
   storePath,
 }: UserTeamDirectoryLoaderOptions): Loader => {
-  const localLoader = glob(local);
+  const localLoader = globWithSafeWatcher(local);
   const directoryStore = createDirectoryStore({ base: local.base, storePath });
 
   return {

package/eventcatalog/src/enterprise/feature.ts

@@ -64,12 +64,8 @@ export const isCustomStylesEnabled = () => {
   return isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
 };
 
-export const isDiagramComparisonEnabled = () => isEventCatalogScaleEnabled();
-
 export const isEventCatalogMCPEnabled = () => isEventCatalogScaleEnabled() && isSSR();
 
 export const isEventCatalogMCPAuthEnabled = () => isEventCatalogMCPEnabled() && (config?.mcp?.auth?.enabled ?? false);
 
 export const isIntegrationsEnabled = () => isEventCatalogScaleEnabled();
-
-export const isExportPDFEnabled = () => true;

package/eventcatalog/src/enterprise/integrations/eventcatalog-features.ts

@@ -16,7 +16,6 @@ import {
   isFullCatalogAPIEnabled,
   isDevMode,
   isIntegrationsEnabled,
-  isExportPDFEnabled,
   isCustomDocsEnabled,
   isSSR,
 } from '../../utils/feature';
@@ -137,14 +136,6 @@ export default function eventCatalogIntegration(): AstroIntegration {
           });
         }
 
-        // Export to PDF print pages (Scale plan)
-        if (isExportPDFEnabled()) {
-          params.injectRoute({
-            pattern: '/docs/print/[type]/[id]/[version]',
-            entrypoint: path.join(catalogDirectory, 'src/enterprise/print/message.astro'),
-          });
-        }
-
         // Fields Explorer (requires SSR — pages live outside src/pages to avoid static-mode auto-discovery)
         if (isSSR()) {
           params.injectRoute({

package/eventcatalog/src/enterprise/tools/catalog-tools.ts

@@ -25,6 +25,7 @@ import { getNodesAndEdges as getNodesAndEdgesForDomain } from '@utils/node-graph
 import { getNodesAndEdges as getNodesAndEdgesForFlows } from '@utils/node-graphs/flows-node-graph';
 import { getNodesAndEdges as getNodesAndEdgesForDataProduct } from '@utils/node-graphs/data-products-node-graph';
 import { getNodesAndEdges as getNodesAndEdgesForContainer } from '@utils/node-graphs/container-node-graph';
+import { getNodesAndEdges as getNodesAndEdgesForSystem } from '@utils/node-graphs/systems-node-graph';
 import { convertToMermaid } from '@utils/node-graphs/export-mermaid';
 import config from '@config';
 import { glob } from 'glob';
@@ -178,6 +179,7 @@ export const collectionSchema = z.enum([
   'queries',
   'flows',
   'domains',
+  'systems',
   'channels',
   'entities',
   'containers',
@@ -196,6 +198,7 @@ export const resourceCollectionSchema = z.enum([
   'queries',
   'flows',
   'domains',
+  'systems',
   'channels',
   'entities',
   'data-products',
@@ -208,6 +211,7 @@ export const visualiserCollectionSchema = z.enum([
   'agents',
   'services',
   'domains',
+  'systems',
   'flows',
   'containers',
   'data-products',
@@ -1028,6 +1032,7 @@ const getNodesAndEdgesFunctions = {
   flows: getNodesAndEdgesForFlows,
   containers: getNodesAndEdgesForContainer,
   'data-products': getNodesAndEdgesForDataProduct,
+  systems: getNodesAndEdgesForSystem,
 };
 
 /**
@@ -1125,5 +1130,5 @@ export const toolDescriptions = {
   getDataProductOutputs:
     'Use this tool to get the outputs (resources produced) for a data product. Returns fully hydrated output resources with their id, version, name, summary, collection type, and data contracts (if defined). Data contracts include the contract name, path, format, type, and content.',
   getArchitectureDiagramAsMermaid:
-    'Use this tool to get the architecture diagram for a resource as Mermaid flowchart code. This shows how the resource connects to other resources (agents, services, events, channels, etc.) in the architecture. The mermaid code can be rendered to visualize the architecture or used to understand relationships. Supported collections: events, commands, queries, agents, services, domains, flows, containers, data-products.',
+    'Use this tool to get the architecture diagram for a resource as Mermaid flowchart code. This shows how the resource connects to other resources (agents, services, systems, events, channels, etc.) in the architecture. The mermaid code can be rendered to visualize the architecture or used to understand relationships. Supported collections: events, commands, queries, agents, services, domains, systems, flows, containers, data-products.',
 };