@eventcatalog/generator-openapi 7.9.1 → 7.10.0

package/dist/index.js

@@ -4213,7 +4213,7 @@ var import_node_path = require("path");
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.9.1",
+  version: "7.10.0",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4250,7 +4250,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",
@@ -4431,7 +4431,8 @@ var index_default = async (_, options) => {
     getService,
     versionService,
     writeService,
-    addFileToService
+    addFileToService,
+    getResourcePath
   } = (0, import_sdk2.default)(process.env.PROJECT_DIR);
   const { services = [], saveParsedSpecFile = false } = options;
   for (const serviceSpec of services) {
@@ -4488,10 +4489,6 @@ var index_default = async (_, options) => {
         // @ts-ignore
         isDomainMarkedAsDraft || document2.info?.["x-eventcatalog-draft"] || serviceSpec.draft || null
       );
-      let servicePath = options.domain ? (0, import_node_path.join)("../", "domains", options.domain.id, "services", service.id) : (0, import_node_path.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");
@@ -4519,6 +4516,22 @@ Processing domain: ${domainName} (v${domainVersion})`));
         }
         await addServiceToDomain(domainId, { id: service.id, version: service.version }, domainVersion);
       }
+      let servicePath = (0, import_node_path.join)("../", "services", service.id);
+      if (options.domain) {
+        const domainResource = await getResourcePath(
+          process.env.PROJECT_DIR,
+          options.domain.id,
+          options.domain.version
+        );
+        if (domainResource) {
+          servicePath = (0, import_node_path.join)("../", domainResource.directory, "services", service.id);
+        } else {
+          servicePath = (0, import_node_path.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(import_chalk4.default.blue(`Processing service: ${document2.info.title} (v${version})`));