@eventcatalog/core 3.43.0 → 3.44.0

package/dist/features.cjs

@@ -51,6 +51,36 @@ async function cleanup(projectDirectory) {
     await (0, import_promises.rm)(filePath);
   }
 }
+var findNodeModulesDirectory = (directory) => {
+  let currentDirectory = directory;
+  while (true) {
+    const nodeModulesDirectory = import_node_path.default.join(currentDirectory, "node_modules");
+    if ((0, import_node_fs.existsSync)(nodeModulesDirectory)) {
+      return nodeModulesDirectory;
+    }
+    const parentDirectory = import_node_path.default.dirname(currentDirectory);
+    if (parentDirectory === currentDirectory) {
+      return void 0;
+    }
+    currentDirectory = parentDirectory;
+  }
+};
+var linkNodeModulesIntoTempDirectory = async ({ projectDirectory, tempDir }) => {
+  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
+  if (!nodeModulesDirectory) {
+    return;
+  }
+  await (0, import_promises.symlink)(nodeModulesDirectory, import_node_path.default.join(tempDir, "node_modules"), "dir");
+};
+var createTemporaryConfigDirectory = async (projectDirectory) => {
+  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
+  if (nodeModulesDirectory) {
+    return (0, import_promises.mkdtemp)(import_node_path.default.join(nodeModulesDirectory, ".eventcatalog-config-"));
+  }
+  const tempDir = await (0, import_promises.mkdtemp)(import_node_path.default.join((0, import_node_os.tmpdir)(), "eventcatalog-config-"));
+  await linkNodeModulesIntoTempDirectory({ projectDirectory, tempDir });
+  return tempDir;
+};
 var getEventCatalogConfigFile = async (projectDirectory) => {
   let tempDir;
   try {
@@ -58,7 +88,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
     const filePath = import_node_path.default.join(projectDirectory, "package.json");
     const packageJson = JSON.parse(await (0, import_promises.readFile)(filePath, "utf-8"));
     if (packageJson?.type !== "module") {
-      tempDir = await (0, import_promises.mkdtemp)(import_node_path.default.join((0, import_node_os.tmpdir)(), "eventcatalog-config-"));
+      tempDir = await createTemporaryConfigDirectory(projectDirectory);
       configFilePath = import_node_path.default.join(tempDir, "eventcatalog.config.mjs");
       await (0, import_promises.copyFile)(import_node_path.default.join(projectDirectory, "eventcatalog.config.js"), configFilePath);
     }

package/dist/features.js

@@ -3,8 +3,8 @@ import {
   isAuthEnabled,
   isIndexedSearchEnabled,
   isOutputServer
-} from "./chunk-ULZYHF3V.js";
-import "./chunk-5T63CXKU.js";
+} from "./chunk-B7HCX5HM.js";
+import "./chunk-6QENHZZP.js";
 export {
   getProjectOutDir,
   isAuthEnabled,

package/dist/generate.cjs

@@ -49,6 +49,36 @@ async function cleanup(projectDirectory) {
     await (0, import_promises.rm)(filePath);
   }
 }
+var findNodeModulesDirectory = (directory) => {
+  let currentDirectory = directory;
+  while (true) {
+    const nodeModulesDirectory = import_node_path.default.join(currentDirectory, "node_modules");
+    if ((0, import_node_fs.existsSync)(nodeModulesDirectory)) {
+      return nodeModulesDirectory;
+    }
+    const parentDirectory = import_node_path.default.dirname(currentDirectory);
+    if (parentDirectory === currentDirectory) {
+      return void 0;
+    }
+    currentDirectory = parentDirectory;
+  }
+};
+var linkNodeModulesIntoTempDirectory = async ({ projectDirectory, tempDir }) => {
+  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
+  if (!nodeModulesDirectory) {
+    return;
+  }
+  await (0, import_promises.symlink)(nodeModulesDirectory, import_node_path.default.join(tempDir, "node_modules"), "dir");
+};
+var createTemporaryConfigDirectory = async (projectDirectory) => {
+  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
+  if (nodeModulesDirectory) {
+    return (0, import_promises.mkdtemp)(import_node_path.default.join(nodeModulesDirectory, ".eventcatalog-config-"));
+  }
+  const tempDir = await (0, import_promises.mkdtemp)(import_node_path.default.join((0, import_node_os.tmpdir)(), "eventcatalog-config-"));
+  await linkNodeModulesIntoTempDirectory({ projectDirectory, tempDir });
+  return tempDir;
+};
 var getEventCatalogConfigFile = async (projectDirectory) => {
   let tempDir;
   try {
@@ -56,7 +86,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
     const filePath = import_node_path.default.join(projectDirectory, "package.json");
     const packageJson = JSON.parse(await (0, import_promises.readFile)(filePath, "utf-8"));
     if (packageJson?.type !== "module") {
-      tempDir = await (0, import_promises.mkdtemp)(import_node_path.default.join((0, import_node_os.tmpdir)(), "eventcatalog-config-"));
+      tempDir = await createTemporaryConfigDirectory(projectDirectory);
       configFilePath = import_node_path.default.join(tempDir, "eventcatalog.config.mjs");
       await (0, import_promises.copyFile)(import_node_path.default.join(projectDirectory, "eventcatalog.config.js"), configFilePath);
     }
@@ -78,7 +108,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.43.0";
+var version = "3.44.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,9 +1,9 @@
 import {
   generate
-} from "./chunk-ZQHBDPIY.js";
-import "./chunk-7M5IQL3J.js";
-import "./chunk-KY74BE42.js";
-import "./chunk-5T63CXKU.js";
+} from "./chunk-A7WJATRV.js";
+import "./chunk-L2JZBH6K.js";
+import "./chunk-W7UIDHNR.js";
+import "./chunk-6QENHZZP.js";
 export {
   generate
 };

package/dist/resolve-catalog-dependencies.cjs

@@ -48,6 +48,36 @@ async function cleanup(projectDirectory) {
     await (0, import_promises.rm)(filePath);
   }
 }
+var findNodeModulesDirectory = (directory) => {
+  let currentDirectory = directory;
+  while (true) {
+    const nodeModulesDirectory = import_node_path.default.join(currentDirectory, "node_modules");
+    if ((0, import_node_fs.existsSync)(nodeModulesDirectory)) {
+      return nodeModulesDirectory;
+    }
+    const parentDirectory = import_node_path.default.dirname(currentDirectory);
+    if (parentDirectory === currentDirectory) {
+      return void 0;
+    }
+    currentDirectory = parentDirectory;
+  }
+};
+var linkNodeModulesIntoTempDirectory = async ({ projectDirectory, tempDir }) => {
+  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
+  if (!nodeModulesDirectory) {
+    return;
+  }
+  await (0, import_promises.symlink)(nodeModulesDirectory, import_node_path.default.join(tempDir, "node_modules"), "dir");
+};
+var createTemporaryConfigDirectory = async (projectDirectory) => {
+  const nodeModulesDirectory = findNodeModulesDirectory(projectDirectory);
+  if (nodeModulesDirectory) {
+    return (0, import_promises.mkdtemp)(import_node_path.default.join(nodeModulesDirectory, ".eventcatalog-config-"));
+  }
+  const tempDir = await (0, import_promises.mkdtemp)(import_node_path.default.join((0, import_node_os.tmpdir)(), "eventcatalog-config-"));
+  await linkNodeModulesIntoTempDirectory({ projectDirectory, tempDir });
+  return tempDir;
+};
 var getEventCatalogConfigFile = async (projectDirectory) => {
   let tempDir;
   try {
@@ -55,7 +85,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
     const filePath = import_node_path.default.join(projectDirectory, "package.json");
     const packageJson = JSON.parse(await (0, import_promises.readFile)(filePath, "utf-8"));
     if (packageJson?.type !== "module") {
-      tempDir = await (0, import_promises.mkdtemp)(import_node_path.default.join((0, import_node_os.tmpdir)(), "eventcatalog-config-"));
+      tempDir = await createTemporaryConfigDirectory(projectDirectory);
       configFilePath = import_node_path.default.join(tempDir, "eventcatalog.config.mjs");
       await (0, import_promises.copyFile)(import_node_path.default.join(projectDirectory, "eventcatalog.config.js"), configFilePath);
     }

package/dist/resolve-catalog-dependencies.js

@@ -1,7 +1,7 @@
 import {
   resolve_catalog_dependencies_default
-} from "./chunk-WAJIJEI3.js";
-import "./chunk-5T63CXKU.js";
+} from "./chunk-LHR4G2UO.js";
+import "./chunk-6QENHZZP.js";
 export {
   resolve_catalog_dependencies_default as default
 };

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

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-7M5IQL3J.js";
-import "../chunk-KY74BE42.js";
+} from "../chunk-L2JZBH6K.js";
+import "../chunk-W7UIDHNR.js";
 export {
   logger
 };

package/eventcatalog/astro.config.mjs

@@ -37,6 +37,9 @@ const expressiveCodeConfig = {
   },
 };
 
+const markdownRemarkPlugins = [remarkDirective, remarkDirectives, remarkComment, mermaid, plantuml];
+const mdxRemarkPlugins = [...markdownRemarkPlugins, remarkResourceRef];
+
 // https://astro.build/config
 export default defineConfig({
   base,
@@ -66,6 +69,11 @@ export default defineConfig({
   // https://docs.astro.build/en/reference/configuration-reference/#trailingslash
   trailingSlash: config.trailingSlash === true ? 'always' : 'ignore',
 
+  markdown: {
+    remarkPlugins: markdownRemarkPlugins,
+    gfm: true,
+  },
+
   // just turn this off for all users (for now...)
   devToolbar: { enabled: false },
   integrations: [
@@ -76,7 +84,7 @@ export default defineConfig({
     mdx({
       // https://docs.astro.build/en/guides/integrations-guide/mdx/#optimize
       optimize: config.mdxOptimize || false,
-      remarkPlugins: [remarkDirective, remarkDirectives, remarkComment, mermaid, plantuml, remarkResourceRef],
+      remarkPlugins: mdxRemarkPlugins,
       rehypePlugins: [
         [
           rehypeExpressiveCode,

package/eventcatalog/src/components/FieldsExplorer/FieldNodeGraph.tsx

@@ -15,8 +15,8 @@ import {
   Event as EventNodeComponent,
   Command as CommandNodeComponent,
   Query as QueryNodeComponent,
-  Service as ServiceNodeComponent,
   Field as FieldNodeComponent,
+  nodeComponents,
 } from '@eventcatalog/visualiser';
 import { X, ChevronDown, ChevronRight, Search, AlertTriangle } from 'lucide-react';
 import { BoltIcon, ChatBubbleLeftIcon, MagnifyingGlassIcon, ServerIcon } from '@heroicons/react/24/solid';
@@ -88,7 +88,7 @@ function wrapWithContextMenu(Component: React.ComponentType<any>) {
 // and the catalog means these MemoExoticComponents don't match ComponentType<any>
 // unless we widen once here.
 const nodeTypes = {
-  service: wrapWithContextMenu(ServiceNodeComponent as unknown as React.ComponentType<any>),
+  service: wrapWithContextMenu(nodeComponents.service as unknown as React.ComponentType<any>),
   event: wrapWithContextMenu(EventNodeComponent as unknown as React.ComponentType<any>),
   command: wrapWithContextMenu(CommandNodeComponent as unknown as React.ComponentType<any>),
   query: wrapWithContextMenu(QueryNodeComponent as unknown as React.ComponentType<any>),

package/eventcatalog/src/components/Tables/Table.tsx

@@ -51,6 +51,10 @@ export type TData<T extends TCollectionTypes> = {
     name: string;
     summary: string;
     version: string;
+    source?: {
+      provider: string;
+      url?: string;
+    };
     latestVersion?: string; // Defined on getter collection utility
     draft?: boolean | { title?: string; message: string }; // Draft property from base schema
     badges?: Array<{

package/eventcatalog/src/components/Tables/columns/DirectorySourceColumn.tsx

@@ -0,0 +1,49 @@
+import { FileText, Github } from 'lucide-react';
+
+type DirectorySource = {
+  provider: string;
+  url?: string;
+};
+
+export const DirectorySourceCell = ({ source }: { source?: DirectorySource }) => {
+  if (source?.provider === 'github') {
+    const icon = (
+      <Github className="h-4 w-4 text-[rgb(var(--ec-icon-color))] transition-colors group-hover/source:text-[rgb(var(--ec-page-text))]" />
+    );
+
+    if (source.url) {
+      return (
+        <a
+          href={source.url}
+          target="_blank"
+          rel="noreferrer"
+          className="group/source inline-flex h-7 w-7 items-center justify-center rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.35)] transition-colors hover:bg-[rgb(var(--ec-content-hover))]"
+          title="Synced from GitHub"
+          aria-label="Synced from GitHub"
+        >
+          {icon}
+        </a>
+      );
+    }
+
+    return (
+      <span
+        className="inline-flex h-7 w-7 items-center justify-center rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.35)]"
+        title="Synced from GitHub"
+        aria-label="Synced from GitHub"
+      >
+        {icon}
+      </span>
+    );
+  }
+
+  return (
+    <span
+      className="inline-flex h-7 w-7 items-center justify-center rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.35)] text-[rgb(var(--ec-icon-color))]"
+      title="Synced to local file"
+      aria-label="Synced to local file"
+    >
+      <FileText className="h-4 w-4" />
+    </span>
+  );
+};

package/eventcatalog/src/components/Tables/columns/TeamsTableColumns.tsx

@@ -7,6 +7,7 @@ import type { CollectionUserTypes } from '@types';
 import type { TableConfiguration } from '@types';
 import { getColorAndIconForCollection } from '@utils/collections/icons';
 import { getCollectionTextColorClass } from '@utils/collection-colors';
+import { DirectorySourceCell } from './DirectorySourceColumn';
 const columnHelper = createColumnHelper<TData<CollectionUserTypes>>();
 
 const CollectionListCell = ({
@@ -81,6 +82,16 @@ export const columns = (tableConfiguration: TableConfiguration) => [
     filterFn: filterByName,
   }),
 
+  columnHelper.accessor('data.source', {
+    id: 'source',
+    header: () => <span>{tableConfiguration.columns?.source?.label || 'Source'}</span>,
+    cell: (info) => <DirectorySourceCell source={info.getValue() as { provider: string; url?: string } | undefined} />,
+    meta: {
+      showFilter: false,
+      className: 'w-[96px]',
+    },
+  }),
+
   columnHelper.accessor(
     (row) => {
       const events = row.data.ownedEvents || [];

package/eventcatalog/src/components/Tables/columns/UserTableColumns.tsx

@@ -7,6 +7,7 @@ import type { CollectionUserTypes } from '@types';
 import type { TableConfiguration } from '@types';
 import { getColorAndIconForCollection } from '@utils/collections/icons';
 import { getCollectionTextColorClass } from '@utils/collection-colors';
+import { DirectorySourceCell } from './DirectorySourceColumn';
 const columnHelper = createColumnHelper<TData<CollectionUserTypes>>();
 
 const CollectionListCell = ({
@@ -84,6 +85,16 @@ export const columns = (tableConfiguration: TableConfiguration) => [
     filterFn: filterByName,
   }),
 
+  columnHelper.accessor('data.source', {
+    id: 'source',
+    header: () => <span>{tableConfiguration.columns?.source?.label || 'Source'}</span>,
+    cell: (info) => <DirectorySourceCell source={info.getValue() as { provider: string; url?: string } | undefined} />,
+    meta: {
+      showFilter: false,
+      className: 'w-[96px]',
+    },
+  }),
+
   columnHelper.accessor('data.role', {
     id: 'role',
     header: () => <span>{tableConfiguration.columns?.role?.label || 'Role'}</span>,

package/eventcatalog/src/content.config.ts

@@ -7,6 +7,8 @@ import { badge, ownerReference } from './content.config-shared-collections';
 import { ADR_STATUS_VALUES } from './utils/collections/adr-constants';
 import fs from 'fs';
 import path from 'path';
+import { userTeamDirectoryLoader } from './enterprise/directory/user-team-directory';
+import config from '@config';
 
 // Enterprise Collections
 import { customPagesSchema, resourceDocsSchema, resourceDocCategoriesSchema } from './enterprise/collections';
@@ -102,6 +104,11 @@ const resourcePointer = z.object({
   type: z.enum(['agent', 'service', 'event', 'command', 'query', 'flow', 'channel', 'domain', 'user', 'team', 'container']),
 });
 
+const directoryEntrySource = z.object({
+  provider: z.string(),
+  url: z.string().optional(),
+});
+
 const changelogs = defineCollection({
   loader: glob({
     pattern: withIgnoredBuildArtifacts(['**/changelog.(md|mdx)']),
@@ -876,10 +883,15 @@ const entities = defineCollection({
 });
 
 const users = defineCollection({
-  loader: glob({
-    pattern: withIgnoredBuildArtifacts('users/*.(md|mdx)'),
-    base: projectDirBase,
-    generateId: ({ data }) => data.id as string,
+  loader: userTeamDirectoryLoader({
+    collection: 'users',
+    sources: config.directory?.sources,
+    conflictStrategy: config.directory?.conflictStrategy,
+    local: {
+      pattern: withIgnoredBuildArtifacts('users/*.(md|mdx)'),
+      base: projectDirBase,
+      generateId: ({ data }) => data.id as string,
+    },
   }),
   schema: z.object({
     id: z.string(),
@@ -887,6 +899,8 @@ const users = defineCollection({
     avatarUrl: z.string(),
     role: z.string().optional(),
     hidden: z.boolean().optional(),
+    source: directoryEntrySource.optional(),
+    readOnly: z.boolean().optional(),
     email: z.string().optional(),
     slackDirectMessageUrl: z.string().optional(),
     msTeamsDirectMessageUrl: z.string().optional(),
@@ -901,10 +915,15 @@ const users = defineCollection({
 });
 
 const teams = defineCollection({
-  loader: glob({
-    pattern: withIgnoredBuildArtifacts('teams/*.(md|mdx)'),
-    base: projectDirBase,
-    generateId: ({ data }) => data.id as string,
+  loader: userTeamDirectoryLoader({
+    collection: 'teams',
+    sources: config.directory?.sources,
+    conflictStrategy: config.directory?.conflictStrategy,
+    local: {
+      pattern: withIgnoredBuildArtifacts('teams/*.(md|mdx)'),
+      base: projectDirBase,
+      generateId: ({ data }) => data.id as string,
+    },
   }),
   schema: z.object({
     id: z.string(),
@@ -912,6 +931,8 @@ const teams = defineCollection({
     summary: z.string().optional(),
     email: z.string().optional(),
     hidden: z.boolean().optional(),
+    source: directoryEntrySource.optional(),
+    readOnly: z.boolean().optional(),
     slackDirectMessageUrl: z.string().optional(),
     msTeamsDirectMessageUrl: z.string().optional(),
     members: z.array(reference('users')).optional(),