@eventcatalog/sdk 2.1.2 → 2.2.0

package/dist/index.mjs

@@ -106,7 +106,7 @@ var versionResource = async (catalogDir, id) => {
   const files = await getFiles(`${catalogDir}/**/index.{md,mdx}`);
   const matchedFiles = await searchFilesForId(files, id);
   if (matchedFiles.length === 0) {
-    throw new Error(`No event found with id: ${id}`);
+    throw new Error(`No resource found with id: ${id}`);
   }
   const file = matchedFiles[0];
   const sourceDirectory = dirname(file);
@@ -176,6 +176,15 @@ var getResource = async (catalogDir, id, version, options) => {
     markdown: content.trim()
   };
 };
+var getResourcePath = async (catalogDir, id, version) => {
+  const file = await findFileById(catalogDir, id, version);
+  if (!file) return;
+  return {
+    fullPath: file,
+    relativePath: file.replace(catalogDir, ""),
+    directory: dirname(file.replace(catalogDir, ""))
+  };
+};
 var getResources = async (catalogDir, {
   type,
   latestOnly = false,
@@ -236,7 +245,11 @@ var getEvent = (directory) => async (id, version) => getResource(directory, id,
 var getEvents = (directory) => async (options) => getResources(directory, { type: "events", ...options });
 var writeEvent = (directory) => async (event, options = { path: "", override: false }) => writeResource(directory, { ...event }, { ...options, type: "event" });
 var writeEventToService = (directory) => async (event, service, options = { path: "" }) => {
-  let pathForEvent = service.version && service.version !== "latest" ? `/${service.id}/versioned/${service.version}/events` : `/${service.id}/events`;
+  const resourcePath = await getResourcePath(directory, service.id, service.version);
+  if (!resourcePath) {
+    throw new Error("Service not found");
+  }
+  let pathForEvent = service.version && service.version !== "latest" ? `${resourcePath.directory}/versioned/${service.version}/events` : `${resourcePath.directory}/events`;
   pathForEvent = join3(pathForEvent, event.id);
   await writeResource(directory, { ...event }, { ...options, path: pathForEvent, type: "event" });
 };
@@ -263,9 +276,13 @@ var getCommand = (directory) => async (id, version) => getResource(directory, id
 var getCommands = (directory) => async (options) => getResources(directory, { type: "commands", ...options });
 var writeCommand = (directory) => async (command, options = { path: "" }) => writeResource(directory, { ...command }, { ...options, type: "command" });
 var writeCommandToService = (directory) => async (command, service, options = { path: "" }) => {
-  let pathForEvent = service.version && service.version !== "latest" ? `/${service.id}/versioned/${service.version}/commands` : `/${service.id}/commands`;
-  pathForEvent = join4(pathForEvent, command.id);
-  await writeResource(directory, { ...command }, { ...options, path: pathForEvent, type: "command" });
+  const resourcePath = await getResourcePath(directory, service.id, service.version);
+  if (!resourcePath) {
+    throw new Error("Service not found");
+  }
+  let pathForCommand = service.version && service.version !== "latest" ? `${resourcePath.directory}/versioned/${service.version}/commands` : `${resourcePath.directory}/commands`;
+  pathForCommand = join4(pathForCommand, command.id);
+  await writeResource(directory, { ...command }, { ...options, path: pathForCommand, type: "command" });
 };
 var rmCommand = (directory) => async (path3) => {
   await fs3.rm(join4(directory, path3), { recursive: true });
@@ -288,7 +305,11 @@ var getQuery = (directory) => async (id, version) => getResource(directory, id,
 var writeQuery = (directory) => async (query, options = { path: "" }) => writeResource(directory, { ...query }, { ...options, type: "query" });
 var getQueries = (directory) => async (options) => getResources(directory, { type: "queries", ...options });
 var writeQueryToService = (directory) => async (query, service, options = { path: "" }) => {
-  let pathForQuery = service.version && service.version !== "latest" ? `/${service.id}/versioned/${service.version}/queries` : `/${service.id}/queries`;
+  const resourcePath = await getResourcePath(directory, service.id, service.version);
+  if (!resourcePath) {
+    throw new Error("Service not found");
+  }
+  let pathForQuery = service.version && service.version !== "latest" ? `${resourcePath.directory}/versioned/${service.version}/queries` : `${resourcePath.directory}/queries`;
   pathForQuery = join5(pathForQuery, query.id);
   await writeResource(directory, { ...query }, { ...options, path: pathForQuery, type: "query" });
 };
@@ -310,7 +331,7 @@ var queryHasVersion = (directory) => async (id, version) => {
 
 // src/services.ts
 import fs5 from "node:fs/promises";
-import { join as join6, dirname as dirname2 } from "node:path";
+import { join as join6, dirname as dirname3 } from "node:path";
 var getService = (directory) => async (id, version) => getResource(directory, id, version, { type: "service" });
 var getServices = (directory) => async (options) => getResources(directory, {
   type: "services",
@@ -357,7 +378,7 @@ var getSpecificationFilesForService = (directory) => async (id, version) => {
         throw new Error(`Specification file name for ${specFile} is undefined`);
       }
       const rawFile = await getFileFromResource(directory, id, { fileName }, version);
-      return { key: specFile, content: rawFile, fileName, path: join6(dirname2(filePathToService), fileName) };
+      return { key: specFile, content: rawFile, fileName, path: join6(dirname3(filePathToService), fileName) };
     });
     specs = await Promise.all(getSpecs);
   }
@@ -673,7 +694,7 @@ var index_default = (path3) => {
      * @param options - Optional options to write the event
      *
      */
-    writeEventToService: writeEventToService(join12(path3, "services")),
+    writeEventToService: writeEventToService(join12(path3)),
     /**
      * Remove an event to EventCatalog (modeled on the standard POSIX rm utility)
      *
@@ -750,7 +771,7 @@ var index_default = (path3) => {
      * @param options - Optional options to write the command
      *
      */
-    writeCommandToService: writeCommandToService(join12(path3, "services")),
+    writeCommandToService: writeCommandToService(join12(path3)),
     /**
      * Remove an command to EventCatalog (modeled on the standard POSIX rm utility)
      *
@@ -827,7 +848,7 @@ var index_default = (path3) => {
      * @param options - Optional options to write the query
      *
      */
-    writeQueryToService: writeQueryToService(join12(path3, "services")),
+    writeQueryToService: writeQueryToService(join12(path3)),
     /**
      * Remove an query to EventCatalog (modeled on the standard POSIX rm utility)
      *