@eventcatalog/generator-openapi 7.11.0 → 7.11.2

package/dist/index.mjs

@@ -4208,7 +4208,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.11.0",
+  version: "7.11.2",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4245,7 +4245,7 @@ var package_default = {
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@changesets/cli": "^2.27.7",
-    "@eventcatalog/sdk": "^2.18.2",
+    "@eventcatalog/sdk": "^2.18.4",
     chalk: "4.1.2",
     "js-yaml": "^4.1.0",
     "openapi-types": "^12.1.3",
@@ -4426,7 +4426,7 @@ var filterMessagesByRoutes = (allMessages, routes) => {
   }
   return Array.from(matched.values());
 };
-var mergeReceives = (existing, incoming) => {
+var mergeSends = (existing, incoming) => {
   const merged = /* @__PURE__ */ new Map();
   for (const entry of existing) {
     merged.set(entry.id, { ...entry });
@@ -4608,6 +4608,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
       let repository = null;
       let styles2 = null;
       let serviceDiagrams = null;
+      let serviceFlows = null;
+      let serviceEntities = null;
       let serviceWritesTo = configuredWritesTo;
       let serviceReadsFrom = configuredReadsFrom;
       const persistPreviousSpecificationFiles = Array.isArray(serviceSpec.path) === false;
@@ -4621,6 +4623,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
         serviceBadges = latestServiceInCatalog.badges || null;
         serviceAttachments = latestServiceInCatalog.attachments || null;
         serviceDiagrams = latestServiceInCatalog.diagrams || null;
+        serviceFlows = latestServiceInCatalog.flows || null;
+        serviceEntities = latestServiceInCatalog.entities || null;
         serviceWritesTo = latestServiceInCatalog.writesTo || [];
         serviceReadsFrom = latestServiceInCatalog.readsFrom || [];
         if (persistPreviousSpecificationFiles) {
@@ -4651,6 +4655,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
           ...repository ? { repository } : {},
           ...styles2 ? { styles: styles2 } : {},
           ...serviceDiagrams ? { diagrams: serviceDiagrams } : {},
+          ...serviceFlows ? { flows: serviceFlows } : {},
+          ...serviceEntities ? { entities: serviceEntities } : {},
           ...isServiceMarkedAsDraft ? { draft: true } : {},
           ...serviceAttachments ? { attachments: serviceAttachments } : {},
           ...serviceWritesTo.length > 0 ? { writesTo: serviceWritesTo } : {},
@@ -4680,16 +4686,16 @@ Processing domain: ${domainName} (v${domainVersion})`));
       const consumers = serviceSpec.consumers || [];
       for (const consumer of consumers) {
         const consumerVersion = consumer.version || "1.0.0";
-        const filteredReceives = filterMessagesByRoutes(allGeneratedMessages, consumer.routes);
+        const filteredSends = filterMessagesByRoutes(allGeneratedMessages, consumer.routes);
         const existingConsumer = await getService(consumer.id, consumerVersion);
         if (existingConsumer) {
-          const mergedReceives = mergeReceives(existingConsumer.receives || [], filteredReceives);
+          const mergedSends = mergeSends(existingConsumer.sends || [], filteredSends);
           const consumerResource = await getResourcePath(process.env.PROJECT_DIR, consumer.id, consumerVersion);
           const consumerWritePath = consumerResource ? join("../", consumerResource.directory) : consumer.id;
           await writeService(
             {
               ...existingConsumer,
-              ...mergedReceives.length > 0 ? { receives: mergedReceives } : {}
+              ...mergedSends.length > 0 ? { sends: mergedSends } : {}
             },
             { path: consumerWritePath, override: true }
           );
@@ -4702,9 +4708,9 @@ Processing domain: ${domainName} (v${domainVersion})`));
               options.domain.version
             );
             if (domainResource) {
-              consumerPath = join(domainResource.directory, "services", consumer.id);
+              consumerPath = join("../", domainResource.directory, "services", consumer.id);
             } else {
-              consumerPath = join("domains", options.domain.id, "services", consumer.id);
+              consumerPath = join("../", "domains", options.domain.id, "services", consumer.id);
             }
           }
           await writeService(
@@ -4713,7 +4719,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
               version: consumerVersion,
               name: consumer.id,
               markdown: "<NodeGraph />",
-              ...filteredReceives.length > 0 ? { receives: filteredReceives } : {}
+              ...filteredSends.length > 0 ? { sends: filteredSends } : {}
             },
             { path: consumerPath, override: true }
           );