@eventcatalog/core 2.7.14 → 2.7.16

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eventcatalog/core
 
+## 2.7.16
+
+### Patch Changes
+
+- 4d15fdf: fix(core): fixed windows issue for fetching config files
+
+## 2.7.15
+
+### Patch Changes
+
+- 7e63592: fix(core): user ownership on resources within a team
+
 ## 2.7.14
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eventcatalog/core",
   "type": "module",
-  "version": "2.7.14",
+  "version": "2.7.16",
   "publishConfig": {
     "access": "public"
   },

package/scripts/eventcatalog-config-file-utils.js

@@ -2,8 +2,9 @@ import { readFile, writeFile, rm } from 'node:fs/promises';
 import { existsSync } from 'fs';
 import path from 'node:path';
 import { v4 as uuidV4 } from 'uuid';
+import { pathToFileURL } from 'url';
 
-// * Very strange behaviour when importing ESM files from catalogs into core.
+// * Very strange behavior when importing ESM files from catalogs into core.
 //  * Core (node) does not know how to handle ESM files, so we have to try and convert them.
 //  *
 //  * This needs sorting out! Sorry if you are reading this, but it unblocked me for now!
@@ -46,7 +47,9 @@ export const getEventCatalogConfigFile = async (projectDirectory) => {
 
     await writeFile(path.join(projectDirectory, 'eventcatalog.config.cjs'), configAsCommonJS);
 
-    const configAsCJS = await import(/* @vite-ignore */ path.join(projectDirectory, 'eventcatalog.config.cjs'));
+    const configFilePath = path.join(projectDirectory, 'eventcatalog.config.cjs');
+    const configFileURL = pathToFileURL(configFilePath).href;
+    const configAsCJS = await import(/* @vite-ignore */ configFileURL);
 
     //  Clean up?
     await writeFile(path.join(projectDirectory, 'eventcatalog.config.js'), rawFile);

package/src/utils/users.ts

@@ -27,25 +27,27 @@ export const getUsers = async (): Promise<User[]> => {
   });
 
   return users.map((user) => {
+    const associatedTeams = teams.filter((team) => {
+      return team.data.members?.some((member) => member.slug === user.data.id);
+    });
+
     const ownedDomains = domains.filter((domain) => {
       return domain.data.owners?.find((owner) => owner.slug === user.data.id);
     });
 
-    const ownedServices = services.filter((service) => {
-      return service.data.owners?.find((owner) => owner.slug === user.data.id);
-    });
+    const isOwnedByUserOrAssociatedTeam = () => {
+      const associatedTeamsSlug: string[] = associatedTeams.map((team) => team.slug);
 
-    const ownedEvents = events.filter((event) => {
-      return event.data.owners?.find((owner) => owner.slug === user.data.id);
-    });
+      return ({ data }: { data: { owners?: Array<{ slug: string }> } }) => {
+        return data.owners?.some((owner) => owner.slug === user.data.id || associatedTeamsSlug.includes(owner.slug));
+      };
+    };
 
-    const ownedCommands = commands.filter((command) => {
-      return command.data.owners?.find((owner) => owner.slug === user.data.id);
-    });
+    const ownedServices = services.filter(isOwnedByUserOrAssociatedTeam());
 
-    const associatedTeams = teams.filter((team) => {
-      return team.data.members?.find((member) => member.slug === user.data.id);
-    });
+    const ownedEvents = events.filter(isOwnedByUserOrAssociatedTeam());
+
+    const ownedCommands = commands.filter(isOwnedByUserOrAssociatedTeam());
 
     return {
       ...user,