@eventcatalog/sdk 2.7.5 → 2.8.0

package/dist/eventcatalog.mjs

@@ -124,6 +124,7 @@ import fs from "fs/promises";
 import fsSync2 from "fs";
 import { satisfies as satisfies2 } from "semver";
 import { lock, unlock } from "proper-lockfile";
+import { basename as basename2 } from "path";
 var versionResource = async (catalogDir, id) => {
   const files = await getFiles(`${catalogDir}/**/index.{md,mdx}`);
   const matchedFiles = await searchFilesForId(files, id);
@@ -131,16 +132,24 @@ var versionResource = async (catalogDir, id) => {
     throw new Error(`No resource found with id: ${id}`);
   }
   const file = matchedFiles[0];
-  const sourceDirectory = dirname2(file);
+  const sourceDirectory = dirname2(file).replace(/\/versioned?\/[^/]+\//, "/");
   const { data: { version = "0.0.1" } = {} } = matter2.read(file);
   const targetDirectory = getVersionedDirectory(sourceDirectory, version);
   fsSync2.mkdirSync(targetDirectory, { recursive: true });
+  const ignoreListToCopy = ["events", "commands", "queries", "versioned"];
   await copyDir(catalogDir, sourceDirectory, targetDirectory, (src) => {
-    return !src.includes("versioned");
+    const folderName = basename2(src);
+    if (ignoreListToCopy.includes(folderName)) {
+      return false;
+    }
+    return true;
   });
   await fs.readdir(sourceDirectory).then(async (resourceFiles) => {
     await Promise.all(
       resourceFiles.map(async (file2) => {
+        if (ignoreListToCopy.includes(file2)) {
+          return;
+        }
         if (file2 !== "versioned") {
           fsSync2.rmSync(join2(sourceDirectory, file2), { recursive: true });
         }
@@ -477,14 +486,21 @@ var getSpecificationFilesForService = (directory) => async (id, version) => {
   let specs = [];
   if (service.specifications) {
     const serviceSpecifications = service.specifications;
-    const specificationFiles = Object.keys(serviceSpecifications);
-    const getSpecs = specificationFiles.map(async (specFile) => {
-      const fileName = serviceSpecifications[specFile];
+    let specificationFiles;
+    if (Array.isArray(serviceSpecifications)) {
+      specificationFiles = serviceSpecifications.map((spec) => ({ key: spec.type, path: spec.path }));
+    } else {
+      specificationFiles = Object.keys(serviceSpecifications).map((spec) => ({
+        key: spec,
+        path: serviceSpecifications[spec]
+      }));
+    }
+    const getSpecs = specificationFiles.map(async ({ key, path: fileName }) => {
       if (!fileName) {
-        throw new Error(`Specification file name for ${specFile} is undefined`);
+        throw new Error(`Specification file name for ${fileName} is undefined`);
       }
       const rawFile = await getFileFromResource(directory, id, { fileName }, version);
-      return { key: specFile, content: rawFile, fileName, path: join6(dirname4(filePathToService), fileName) };
+      return { key, content: rawFile, fileName, path: join6(dirname4(filePathToService), fileName) };
     });
     specs = await Promise.all(getSpecs);
   }