@eventcatalog/generator-openapi 7.9.0 → 7.10.0

package/dist/index.mjs

@@ -1605,15 +1605,19 @@ async function getSchemasByOperationId(filePath, operationId, parsedDocument) {
           }
           if (typedOperation.requestBody && typedOperation.requestBody.content) {
             const contentType = Object.keys(typedOperation.requestBody.content)[0];
-            schemas.requestBody = typedOperation.requestBody.content[contentType].schema;
+            if (contentType) {
+              schemas.requestBody = typedOperation.requestBody.content[contentType].schema;
+            }
           }
           if (typedOperation.responses) {
             for (const [statusCode, response] of Object.entries(typedOperation.responses)) {
               if (response.content) {
                 const contentType = Object.keys(response.content)[0];
-                const schemaOrContent = response.content[contentType].schema || response.content[contentType];
-                schemas.responses[statusCode] = { ...schemaOrContent };
-                schemas.responses[statusCode].isSchema = !!response.content[contentType].schema;
+                if (contentType) {
+                  const schemaOrContent = response.content[contentType].schema || response.content[contentType];
+                  schemas.responses[statusCode] = { ...schemaOrContent };
+                  schemas.responses[statusCode].isSchema = !!response.content[contentType].schema;
+                }
               }
             }
           }
@@ -1636,14 +1640,16 @@ async function getExamplesByOperationId(filePath, operationId, parsedDocument) {
       if (typedOperation.operationId !== operationId) continue;
       if (typedOperation.requestBody?.content) {
         const contentType = Object.keys(typedOperation.requestBody.content)[0];
-        const mediaType = typedOperation.requestBody.content[contentType];
-        if (mediaType.example) {
-          examples.push({ fileName: "example.json", content: JSON.stringify(mediaType.example, null, 2) });
-        }
-        if (mediaType.examples) {
-          for (const [name, exampleObj] of Object.entries(mediaType.examples)) {
-            if (exampleObj.value) {
-              examples.push({ fileName: `${name}.json`, content: JSON.stringify(exampleObj.value, null, 2) });
+        if (contentType) {
+          const mediaType = typedOperation.requestBody.content[contentType];
+          if (mediaType.example) {
+            examples.push({ fileName: "example.json", content: JSON.stringify(mediaType.example, null, 2) });
+          }
+          if (mediaType.examples) {
+            for (const [name, exampleObj] of Object.entries(mediaType.examples)) {
+              if (exampleObj.value) {
+                examples.push({ fileName: `${name}.json`, content: JSON.stringify(exampleObj.value, null, 2) });
+              }
             }
           }
         }
@@ -1652,17 +1658,19 @@ async function getExamplesByOperationId(filePath, operationId, parsedDocument) {
         for (const [statusCode, response] of Object.entries(typedOperation.responses)) {
           if (response.content) {
             const contentType = Object.keys(response.content)[0];
-            const mediaType = response.content[contentType];
-            if (mediaType.example) {
-              examples.push({ fileName: `response-${statusCode}.json`, content: JSON.stringify(mediaType.example, null, 2) });
-            }
-            if (mediaType.examples) {
-              for (const [name, exampleObj] of Object.entries(mediaType.examples)) {
-                if (exampleObj.value) {
-                  examples.push({
-                    fileName: `response-${statusCode}-${name}.json`,
-                    content: JSON.stringify(exampleObj.value, null, 2)
-                  });
+            if (contentType) {
+              const mediaType = response.content[contentType];
+              if (mediaType.example) {
+                examples.push({ fileName: `response-${statusCode}.json`, content: JSON.stringify(mediaType.example, null, 2) });
+              }
+              if (mediaType.examples) {
+                for (const [name, exampleObj] of Object.entries(mediaType.examples)) {
+                  if (exampleObj.value) {
+                    examples.push({
+                      fileName: `response-${statusCode}-${name}.json`,
+                      content: JSON.stringify(exampleObj.value, null, 2)
+                    });
+                  }
                 }
               }
             }
@@ -4200,7 +4208,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.9.0",
+  version: "7.10.0",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4237,7 +4245,7 @@ var package_default = {
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@changesets/cli": "^2.27.7",
-    "@eventcatalog/sdk": "2.17.4",
+    "@eventcatalog/sdk": "^2.18.2",
     chalk: "4.1.2",
     "js-yaml": "^4.1.0",
     "openapi-types": "^12.1.3",
@@ -4418,7 +4426,8 @@ var index_default = async (_, options) => {
     getService,
     versionService,
     writeService,
-    addFileToService
+    addFileToService,
+    getResourcePath
   } = utils2(process.env.PROJECT_DIR);
   const { services = [], saveParsedSpecFile = false } = options;
   for (const serviceSpec of services) {
@@ -4475,10 +4484,6 @@ var index_default = async (_, options) => {
         // @ts-ignore
         isDomainMarkedAsDraft || document2.info?.["x-eventcatalog-draft"] || serviceSpec.draft || null
       );
-      let servicePath = options.domain ? join("../", "domains", options.domain.id, "services", service.id) : join("../", "services", service.id);
-      if (options.writeFilesToRoot) {
-        servicePath = service.id;
-      }
       if (options.domain) {
         const { id: domainId, name: domainName, version: domainVersion } = options.domain;
         const domain = await getDomain(options.domain.id, domainVersion || "latest");
@@ -4506,6 +4511,22 @@ Processing domain: ${domainName} (v${domainVersion})`));
         }
         await addServiceToDomain(domainId, { id: service.id, version: service.version }, domainVersion);
       }
+      let servicePath = join("../", "services", service.id);
+      if (options.domain) {
+        const domainResource = await getResourcePath(
+          process.env.PROJECT_DIR,
+          options.domain.id,
+          options.domain.version
+        );
+        if (domainResource) {
+          servicePath = join("../", domainResource.directory, "services", service.id);
+        } else {
+          servicePath = join("../", "domains", options.domain.id, "services", service.id);
+        }
+      }
+      if (options.writeFilesToRoot) {
+        servicePath = service.id;
+      }
       const latestServiceInCatalog = await getService(service.id, "latest");
       const versionTheService = latestServiceInCatalog && isVersionGreaterThan(version, latestServiceInCatalog.version);
       console.log(chalk4.blue(`Processing service: ${document2.info.title} (v${version})`));