@eventcatalog/generator-asyncapi 6.1.1 → 6.2.1

package/dist/index.mjs

@@ -1538,7 +1538,7 @@ import path3 from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-asyncapi",
-  version: "6.1.1",
+  version: "6.2.1",
   description: "AsyncAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -1576,7 +1576,7 @@ var package_default = {
   dependencies: {
     "@asyncapi/avro-schema-parser": "3.0.24",
     "@asyncapi/parser": "3.6.0",
-    "@eventcatalog/sdk": "2.17.4",
+    "@eventcatalog/sdk": "2.18.4",
     chalk: "4.1.2",
     "fs-extra": "^11.2.0",
     glob: "^12.0.0",
@@ -4205,6 +4205,7 @@ var index_default = async (config, options) => {
     addSchemaToQuery,
     addFileToService,
     versionDomain,
+    getResourcePath,
     getSpecificationFilesForService,
     writeChannel,
     getChannel,
@@ -4280,6 +4281,8 @@ var index_default = async (config, options) => {
     let badges = null;
     let attachments = null;
     let diagrams = null;
+    let flows = null;
+    let entities = null;
     let serviceSpecifications = {};
     let serviceSpecificationsFiles = [];
     let configuredWritesTo = service.writesTo || [];
@@ -4293,10 +4296,6 @@ var index_default = async (config, options) => {
       markdown: generatedMarkdownForService
     }) : generatedMarkdownForService;
     let styles2 = null;
-    let servicePath = options.domain ? path3.join("../", "domains", options.domain.id, "services", service.id) : path3.join("../", "services", service.id);
-    if (options.writeFilesToRoot) {
-      servicePath = service.id;
-    }
     if (options.domain) {
       const { id: domainId, name: domainName, version: domainVersion, owners: domainOwners } = options.domain;
       const domain = await getDomain(options.domain.id, domainVersion || "latest");
@@ -4326,6 +4325,18 @@ Processing domain: ${domainName} (v${domainVersion})`));
       }
       await addServiceToDomain(domainId, { id: serviceId, version }, domainVersion);
     }
+    let servicePath = path3.join("../", "services", service.id);
+    if (options.domain) {
+      const domainResource = await getResourcePath(process.env.PROJECT_DIR, options.domain.id, options.domain.version);
+      if (domainResource) {
+        servicePath = path3.join("../", domainResource.directory, "services", service.id);
+      } else {
+        servicePath = path3.join("../", "domains", options.domain.id, "services", service.id);
+      }
+    }
+    if (options.writeFilesToRoot) {
+      servicePath = service.id;
+    }
     if (parseChannels) {
       for (const channel of channels) {
         const channelAsJSON = channel.json();
@@ -4509,6 +4520,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
       badges = latestServiceInCatalog.badges || null;
       attachments = latestServiceInCatalog.attachments || null;
       diagrams = latestServiceInCatalog.diagrams || null;
+      flows = latestServiceInCatalog.flows || null;
+      entities = latestServiceInCatalog.entities || null;
       serviceWritesTo = latestServiceInCatalog.writesTo ? latestServiceInCatalog.writesTo : configuredWritesTo;
       serviceReadsFrom = latestServiceInCatalog.readsFrom ? latestServiceInCatalog.readsFrom : configuredReadsFrom;
       if (latestServiceInCatalog.version !== version) {
@@ -4542,6 +4555,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
         ...repository && { repository },
         ...styles2 && { styles: styles2 },
         ...diagrams && { diagrams },
+        ...flows && { flows },
+        ...entities && { entities },
         ...isServiceMarkedAsDraft && { draft: true },
         ...attachments && { attachments },
         ...serviceWritesTo.length > 0 ? { writesTo: serviceWritesTo } : {},