@eventcatalog/core 4.0.0-beta.2 → 4.0.0-beta.4

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-24K6JJV5.js";
-import "../chunk-FLLYUYF2.js";
+} from "../chunk-UEHTKW2J.js";
+import "../chunk-MXQU7LIK.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-7NOXTLJP.js";
-import "../chunk-24K6JJV5.js";
+} from "../chunk-XBTX7MAH.js";
+import "../chunk-UEHTKW2J.js";
 import "../chunk-DAOXTQVS.js";
-import "../chunk-FLLYUYF2.js";
+import "../chunk-MXQU7LIK.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-FLLYUYF2.js → chunk-MXQU7LIK.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-IK6AW6IC.js → chunk-Q5VOFKXM.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-JRCXVY3E.js";
+} from "./chunk-VV55P2IC.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-24K6JJV5.js → chunk-UEHTKW2J.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-FLLYUYF2.js";
+} from "./chunk-MXQU7LIK.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-JRCXVY3E.js → chunk-VV55P2IC.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-FLLYUYF2.js";
+} from "./chunk-MXQU7LIK.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-7NOXTLJP.js → chunk-XBTX7MAH.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-24K6JJV5.js";
+} from "./chunk-UEHTKW2J.js";
 import {
   countResources,
   serializeCounts

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

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

package/dist/eventcatalog.cjs

@@ -144,7 +144,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,16 +1,14 @@
 import {
   log_build_default
-} from "./chunk-7NOXTLJP.js";
-import {
-  runMigrations
-} from "./chunk-XUAF2H54.js";
-import "./chunk-CA4U2JP7.js";
+} from "./chunk-XBTX7MAH.js";
+import "./chunk-UEHTKW2J.js";
+import "./chunk-DAOXTQVS.js";
 import {
   generate
-} from "./chunk-IK6AW6IC.js";
+} from "./chunk-Q5VOFKXM.js";
 import {
   logger
-} from "./chunk-JRCXVY3E.js";
+} from "./chunk-VV55P2IC.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -20,15 +18,17 @@ import {
 import {
   watch
 } from "./chunk-O3Y2G6CY.js";
-import "./chunk-24K6JJV5.js";
-import "./chunk-DAOXTQVS.js";
+import {
+  runMigrations
+} from "./chunk-XUAF2H54.js";
+import "./chunk-CA4U2JP7.js";
 import {
   catalogToAstro
 } from "./chunk-WQNKHIDM.js";
 import "./chunk-VC6VUJIX.js";
 import {
   VERSION
-} from "./chunk-FLLYUYF2.js";
+} from "./chunk-MXQU7LIK.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/generate.cjs

@@ -108,7 +108,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-IK6AW6IC.js";
-import "./chunk-JRCXVY3E.js";
-import "./chunk-FLLYUYF2.js";
+} from "./chunk-Q5VOFKXM.js";
+import "./chunk-VV55P2IC.js";
+import "./chunk-MXQU7LIK.js";
 import "./chunk-6QENHZZP.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.0.0-beta.2";
+var version = "4.0.0-beta.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-JRCXVY3E.js";
-import "../chunk-FLLYUYF2.js";
+} from "../chunk-VV55P2IC.js";
+import "../chunk-MXQU7LIK.js";
 export {
   logger
 };

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/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/utils/collections/glob-loader.ts

@@ -0,0 +1,70 @@
+import { glob } from 'astro/loaders';
+import picomatch from 'picomatch';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+export type GlobOptions = Parameters<typeof glob>[0];
+
+export 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 toPatterns = (patterns: string | string[]) => (Array.isArray(patterns) ? patterns : [patterns]);
+
+const matchesGlobPattern = (entry: string, patterns: string | string[]) => {
+  const patternList = toPatterns(patterns);
+  const positivePatterns = patternList.filter((pattern) => !pattern.startsWith('!'));
+  const negativePatterns = patternList.filter((pattern) => pattern.startsWith('!')).map((pattern) => pattern.slice(1));
+
+  return picomatch.isMatch(entry, positivePatterns) && !picomatch.isMatch(entry, negativePatterns);
+};
+
+export const globWithSafeWatcher = (options: GlobOptions) => {
+  const loader = glob(options);
+
+  return {
+    ...loader,
+    load: async (context: Parameters<typeof loader.load>[0]) => {
+      if (process.env.EVENTCATALOG_DEV_MODE !== 'true' || !context.watcher) {
+        return loader.load(context);
+      }
+
+      let baseDir = options.base ? new URL(options.base, context.config.root) : context.config.root;
+      if (!baseDir.pathname.endsWith('/')) {
+        baseDir = new URL(`${baseDir.pathname}/`, baseDir);
+      }
+
+      const basePath = fileURLToPath(baseDir);
+      const watcher = new Proxy(context.watcher, {
+        get(target, property, receiver) {
+          if (property !== 'on') {
+            const value = Reflect.get(target, property, receiver);
+            return typeof value === 'function' ? value.bind(target) : value;
+          }
+
+          return (event: string, callback: (changedPath: string) => void) => {
+            if (!['add', 'change', 'unlink'].includes(event)) {
+              return target.on(event, callback);
+            }
+
+            return target.on(event, (changedPath: string) => {
+              const entry = path.relative(basePath, changedPath).split(path.sep).join('/');
+              if (!entry.startsWith('../') && matchesGlobPattern(entry, options.pattern)) {
+                callback(changedPath);
+              }
+            });
+          };
+        },
+      });
+
+      return loader.load({
+        ...context,
+        watcher,
+      });
+    },
+  };
+};

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.4",
   "publishConfig": {
     "access": "public"
   },
@@ -91,6 +91,7 @@
     "pagefind": "^1.5.2",
     "pako": "^2.1.0",
     "picocolors": "^1.1.1",
+    "picomatch": "^4.0.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-markdown": "^10.1.0",
@@ -114,9 +115,9 @@
     "update-notifier": "^7.3.1",
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
-    "@eventcatalog/linter": "1.1.2-beta.0",
+    "@eventcatalog/linter": "1.1.2-beta.1",
     "@eventcatalog/visualiser": "^4.0.0-beta.0",
-    "@eventcatalog/sdk": "2.25.0-beta.0"
+    "@eventcatalog/sdk": "2.25.0-beta.1"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.9",