@eventcatalog/core 2.26.0 → 2.26.1

package/README.md

@@ -32,7 +32,7 @@
 <h4>Features: Documentation generator for Event Driven Architectures, Integration with any broker, 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-48-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-49-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [Read the Docs](https://www.eventcatalog.dev/product/documentation) | [View Demo](https://demo.eventcatalog.dev/docs)
@@ -128,9 +128,12 @@ Thank you to our project  sponsors.
 </div> -->
 
 <div align="center">
-  <img alt="hookdeck" src="./images/sponsors/gravitee-logo-black.svg" width="50%" />
+  <picture>
+    <source srcset="./images/sponsors/gravitee-logo-white.webp" media="(prefers-color-scheme: dark)" />
+    <img alt="hookdeck" src="./images/sponsors/gravitee-logo-black.svg" width="50%" />
+  </picture>
   <p style="margin: 0; padding: 0;">Manage, secure, and govern every API in your organization</p>
-  <a href="https://gravitee.io?utm_source=eventcatalog&utm_medium=web&utm_campaign=sponsorship" target="_blank" >Learn more</a>
+  <a href="https://gravitee.io?utm_source=eventcatalog&utm_medium=web&utm_campaign=sponsorship" target="_blank">Learn more</a>
 </div>
 
 <hr />
@@ -252,6 +255,7 @@ 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/SebasRendon12"><img src="https://avatars.githubusercontent.com/u/69688183?v=4?s=100" width="100px;" alt="Sebastian Rendon"/><br /><sub><b>Sebastian Rendon</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=SebasRendon12" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://craig0990.co.uk"><img src="https://avatars.githubusercontent.com/u/461897?v=4?s=100" width="100px;" alt="Craig Roberts"/><br /><sub><b>Craig Roberts</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=craig0990" title="Code">💻</a></td>
       <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>
   </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.26.0";
+var version = "2.26.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-3EOBEGSB.js";
-import "../chunk-IY5HYH2G.js";
+} from "../chunk-M7ERKXSB.js";
+import "../chunk-TOTPAQ4C.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.26.0";
+var version = "2.26.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-TFBAK5C5.js";
-import "../chunk-3EOBEGSB.js";
-import "../chunk-IY5HYH2G.js";
+} from "../chunk-JCGLXXSE.js";
+import "../chunk-M7ERKXSB.js";
+import "../chunk-TOTPAQ4C.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/catalog-to-astro-content-directory.cjs

@@ -122,8 +122,6 @@ var COLLECTION_KEYS = [
   "events",
   "commands",
   "services",
-  "users",
-  "teams",
   "domains",
   "flows",
   "pages",
@@ -243,8 +241,6 @@ var ensureAstroCollectionNotEmpty = async (astroDir) => {
     "events",
     "commands",
     "services",
-    "users",
-    "teams",
     "domains",
     "flows",
     "changelogs",
@@ -272,10 +268,8 @@ var ensureAstroCollectionNotEmpty = async (astroDir) => {
 };
 var catalogToAstro = async (source, astroDir) => {
   const astroContentDir = path3.join(astroDir, "src/content/");
-  const astroConfigFile = import_fs.default.readFileSync(path3.join(astroContentDir, "config.ts"));
-  import_fs.default.rmSync(astroContentDir, { recursive: true });
+  if (import_fs.default.existsSync(astroContentDir)) import_fs.default.rmSync(astroContentDir, { recursive: true });
   import_fs.default.mkdirSync(astroContentDir);
-  import_fs.default.writeFileSync(path3.join(astroContentDir, "config.ts"), astroConfigFile);
   await verifyRequiredFieldsAreInCatalogConfigFile(source);
   await copyFiles(source, astroDir);
   await ensureAstroCollectionNotEmpty(astroDir);

package/dist/catalog-to-astro-content-directory.js

@@ -1,8 +1,8 @@
 import {
   catalogToAstro
-} from "./chunk-VCR3LHZR.js";
+} from "./chunk-R2NILSWL.js";
 import "./chunk-E7TXTI7G.js";
-import "./chunk-7JDTB3U5.js";
+import "./chunk-FIY5JLSQ.js";
 export {
   catalogToAstro
 };

package/dist/{chunk-7JDTB3U5.js → chunk-FIY5JLSQ.js}

@@ -4,8 +4,6 @@ var COLLECTION_KEYS = [
   "events",
   "commands",
   "services",
-  "users",
-  "teams",
   "domains",
   "flows",
   "pages",

package/dist/{chunk-TFBAK5C5.js → chunk-JCGLXXSE.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-3EOBEGSB.js";
+} from "./chunk-M7ERKXSB.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-3EOBEGSB.js → chunk-M7ERKXSB.js}

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

package/dist/{chunk-VCR3LHZR.js → chunk-R2NILSWL.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-E7TXTI7G.js";
 import {
   mapCatalogToAstro
-} from "./chunk-7JDTB3U5.js";
+} from "./chunk-FIY5JLSQ.js";
 
 // src/catalog-to-astro-content-directory.js
 import { glob } from "glob";
@@ -43,8 +43,6 @@ var ensureAstroCollectionNotEmpty = async (astroDir) => {
     "events",
     "commands",
     "services",
-    "users",
-    "teams",
     "domains",
     "flows",
     "changelogs",
@@ -72,10 +70,8 @@ var ensureAstroCollectionNotEmpty = async (astroDir) => {
 };
 var catalogToAstro = async (source, astroDir) => {
   const astroContentDir = path.join(astroDir, "src/content/");
-  const astroConfigFile = fs.readFileSync(path.join(astroContentDir, "config.ts"));
-  fs.rmSync(astroContentDir, { recursive: true });
+  if (fs.existsSync(astroContentDir)) fs.rmSync(astroContentDir, { recursive: true });
   fs.mkdirSync(astroContentDir);
-  fs.writeFileSync(path.join(astroContentDir, "config.ts"), astroConfigFile);
   await verifyRequiredFieldsAreInCatalogConfigFile(source);
   await copyFiles(source, astroDir);
   await ensureAstroCollectionNotEmpty(astroDir);

package/dist/{chunk-IY5HYH2G.js → chunk-TOTPAQ4C.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.26.0";
+var version = "2.26.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-OW2FQPYP.js → chunk-WUCY3QHK.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-E7TXTI7G.js";
 import {
   mapCatalogToAstro
-} from "./chunk-7JDTB3U5.js";
+} from "./chunk-FIY5JLSQ.js";
 
 // src/watcher.js
 import watcher from "@parcel/watcher";

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-IY5HYH2G.js";
+} from "./chunk-TOTPAQ4C.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.26.0";
+var version = "2.26.1";
 
 // src/constants.ts
 var VERSION = version;
@@ -219,8 +219,6 @@ var COLLECTION_KEYS = [
   "events",
   "commands",
   "services",
-  "users",
-  "teams",
   "domains",
   "flows",
   "pages",
@@ -431,8 +429,6 @@ var ensureAstroCollectionNotEmpty = async (astroDir) => {
     "events",
     "commands",
     "services",
-    "users",
-    "teams",
     "domains",
     "flows",
     "changelogs",
@@ -460,10 +456,8 @@ var ensureAstroCollectionNotEmpty = async (astroDir) => {
 };
 var catalogToAstro = async (source, astroDir) => {
   const astroContentDir = path5.join(astroDir, "src/content/");
-  const astroConfigFile = import_fs.default.readFileSync(path5.join(astroContentDir, "config.ts"));
-  import_fs.default.rmSync(astroContentDir, { recursive: true });
+  if (import_fs.default.existsSync(astroContentDir)) import_fs.default.rmSync(astroContentDir, { recursive: true });
   import_fs.default.mkdirSync(astroContentDir);
-  import_fs.default.writeFileSync(path5.join(astroContentDir, "config.ts"), astroConfigFile);
   await verifyRequiredFieldsAreInCatalogConfigFile(source);
   await copyFiles(source, astroDir);
   await ensureAstroCollectionNotEmpty(astroDir);

package/dist/eventcatalog.js

@@ -3,17 +3,17 @@ import {
 } from "./chunk-BLDONK5J.js";
 import {
   watch
-} from "./chunk-OW2FQPYP.js";
+} from "./chunk-WUCY3QHK.js";
 import {
   log_build_default
-} from "./chunk-TFBAK5C5.js";
-import "./chunk-3EOBEGSB.js";
+} from "./chunk-JCGLXXSE.js";
+import "./chunk-M7ERKXSB.js";
 import {
   catalogToAstro
-} from "./chunk-VCR3LHZR.js";
+} from "./chunk-R2NILSWL.js";
 import {
   VERSION
-} from "./chunk-IY5HYH2G.js";
+} from "./chunk-TOTPAQ4C.js";
 import {
   isBackstagePluginEnabled
 } from "./chunk-XMDPVKIJ.js";
@@ -21,7 +21,7 @@ import {
   generate
 } from "./chunk-YEQVKHST.js";
 import "./chunk-E7TXTI7G.js";
-import "./chunk-7JDTB3U5.js";
+import "./chunk-FIY5JLSQ.js";
 
 // src/eventcatalog.ts
 import { Command } from "commander";

package/dist/map-catalog-to-astro.cjs

@@ -38,8 +38,6 @@ var COLLECTION_KEYS = [
   "events",
   "commands",
   "services",
-  "users",
-  "teams",
   "domains",
   "flows",
   "pages",

package/dist/map-catalog-to-astro.js

@@ -1,6 +1,6 @@
 import {
   mapCatalogToAstro
-} from "./chunk-7JDTB3U5.js";
+} from "./chunk-FIY5JLSQ.js";
 export {
   mapCatalogToAstro
 };

package/dist/watcher.cjs

@@ -42,8 +42,6 @@ var COLLECTION_KEYS = [
   "events",
   "commands",
   "services",
-  "users",
-  "teams",
   "domains",
   "flows",
   "pages",

package/dist/watcher.js

@@ -1,8 +1,8 @@
 import {
   watch
-} from "./chunk-OW2FQPYP.js";
+} from "./chunk-WUCY3QHK.js";
 import "./chunk-E7TXTI7G.js";
-import "./chunk-7JDTB3U5.js";
+import "./chunk-FIY5JLSQ.js";
 export {
   watch
 };

package/eventcatalog/src/{content/config.ts → content.config.ts}

@@ -1,4 +1,6 @@
 import { z, defineCollection, reference } from 'astro:content';
+import { glob } from 'astro/loaders';
+import { join } from 'node:path';
 
 const badge = z.object({
   content: z.string(),
@@ -252,8 +254,16 @@ const ubiquitousLanguages = defineCollection({
   }),
 });
 
+const projectDirBase = (() => {
+  if (process.platform === 'win32') {
+    const projectDirPath = process.env.PROJECT_DIR!.replace(/\\/g, '/');
+    return projectDirPath.startsWith('/') ? projectDirPath : `/${projectDirPath}`;
+  }
+  return process.env.PROJECT_DIR;
+})();
+
 const users = defineCollection({
-  type: 'content',
+  loader: glob({ pattern: 'users/*.md', base: projectDirBase, generateId: ({ data }) => data.id as string }),
   schema: z.object({
     id: z.string(),
     name: z.string(),
@@ -274,7 +284,7 @@ const users = defineCollection({
 });
 
 const teams = defineCollection({
-  type: 'content',
+  loader: glob({ pattern: 'teams/*.md', base: projectDirBase, generateId: ({ data }) => data.id as string }),
   schema: z.object({
     id: z.string(),
     name: z.string(),

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

@@ -108,7 +108,7 @@ const generatorConfig = `
                 <h3 class="text-lg text-white font-semibold mb-3">Quick Setup</h3>
                 <Code code={`npm install @eventcatalog/generator-ai`} lang="bash" frame="none" />
                 <a
-                  href="https://www.eventcatalog.dev/feature/ai-assistant"
+                  href="https://www.eventcatalog.dev/features/ai-assistant"
                   class="inline-flex items-center text-sm text-white mt-4"
                 >
                   Learn more about setup →

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

@@ -3,7 +3,7 @@ import components from '@components/MDX/components';
 
 // SideBars
 import { getTeams } from '@utils/teams';
-import { getEntry } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import OwnersList from '@components/Lists/OwnersList';
 import PillListFlat from '@components/Lists/PillListFlat';
@@ -15,23 +15,16 @@ export async function getStaticPaths() {
   const teams = await getTeams();
 
   return teams.map((team) => ({
-    params: {
-      type: 'teams',
-      id: team.data.id,
-    },
-    props: {
-      type: 'team',
-      ...team,
-    },
+    params: { id: team.data.id },
+    props: team,
   }));
 }
 
-const { render, ...props } = Astro.props;
-
-const { Content } = await render();
+const props = Astro.props;
+const { Content } = await render(props);
 
 const membersRaw = props.data.members || [];
-const members = await Promise.all(membersRaw.map((m) => getEntry(m)));
+const members = (await Promise.all(membersRaw.map((m) => getEntry(m)))).filter(Boolean);
 
 const domains = props.data.ownedDomains as CollectionEntry<'domains'>[];
 const services = props.data.ownedServices as CollectionEntry<'services'>[];

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

@@ -2,6 +2,7 @@
 import components from '@components/MDX/components';
 
 // SideBars
+import { render } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import OwnersList from '@components/Lists/OwnersList';
 import PillListFlat from '@components/Lists/PillListFlat';
@@ -11,23 +12,16 @@ import { buildUrl } from '@utils/url-builder';
 import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
 
 export async function getStaticPaths() {
-  const teams = await getUsers();
+  const users = await getUsers();
 
-  return teams.map((team) => ({
-    params: {
-      type: team.collection,
-      id: team.data.id,
-    },
-    props: {
-      type: 'team',
-      ...team,
-    },
+  return users.map((user) => ({
+    params: { id: user.data.id },
+    props: user,
   }));
 }
 
-const { render, ...props } = Astro.props;
-
-const { Content } = await render();
+const props = Astro.props;
+const { Content } = await render(props);
 
 const domains = props.data.ownedDomains as CollectionEntry<'domains'>[];
 const services = props.data.ownedServices as CollectionEntry<'services'>[];

package/eventcatalog/src/utils/users.ts

@@ -32,8 +32,8 @@ export const getUsers = async (): Promise<User[]> => {
     });
 
     const isOwnedByUserOrAssociatedTeam = (item: CollectionEntry<CollectionTypes>) => {
-      const associatedTeamsSlug: string[] = associatedTeams.map((team) => team.slug);
-      return item.data.owners?.some((owner) => owner.id === user.data.id || associatedTeamsSlug.includes(owner.id));
+      const associatedTeamsId: string[] = associatedTeams.map((team) => team.data.id);
+      return item.data.owners?.some((owner) => owner.id === user.data.id || associatedTeamsId.includes(owner.id));
     };
 
     const ownedServices = services.filter(isOwnedByUserOrAssociatedTeam);

package/package.json

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

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

@@ -1,11 +0,0 @@
----
-id: dboyne
-name: David Boyne
-avatarUrl: "https://pbs.twimg.com/profile_images/1262283153563140096/DYRDqKg6_400x400.png"
-role: Lead developer
-email: test@test.com
-hidden: true
-slackDirectMessageUrl: https://yourteam.slack.com/channels/boyney123
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->

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

@@ -1,11 +0,0 @@
----
-id: dboyne
-name: David Boyne
-avatarUrl: "https://pbs.twimg.com/profile_images/1262283153563140096/DYRDqKg6_400x400.png"
-role: Lead developer
-email: test@test.com
-hidden: true
-slackDirectMessageUrl: https://yourteam.slack.com/channels/boyney123
----
-
-<!-- Do not delete this file, required for EC, you an ignore this file -->