@eventcatalog/generator-openapi 7.6.3 → 7.6.5

package/dist/index.mjs

@@ -1163,7 +1163,7 @@ var require_dist = __commonJS({
     var http2 = __importStar(__require("http"));
     var https_1 = __require("https");
     __exportStar(require_helpers(), exports);
-    var INTERNAL = Symbol("AgentBaseInternalState");
+    var INTERNAL = /* @__PURE__ */ Symbol("AgentBaseInternalState");
     var Agent = class extends http2.Agent {
       constructor(opts) {
         super(opts);
@@ -4067,7 +4067,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.6.3",
+  version: "7.6.5",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4104,7 +4104,7 @@ var package_default = {
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@changesets/cli": "^2.27.7",
-    "@eventcatalog/sdk": "^2.9.2",
+    "@eventcatalog/sdk": "^2.9.6",
     chalk: "4.1.2",
     "js-yaml": "^4.1.0",
     "openapi-types": "^12.1.3",
@@ -4180,6 +4180,13 @@ var isVersionLessThan = (version, givenVersion) => {
 var toUniqueArray = (array) => {
   return array.filter((item, index, self) => index === self.findIndex((t) => t.id === item.id && t.version === item.version));
 };
+var mergeOpenApiIntoSpecifications = (existingSpecs, openapiFileName) => {
+  if (Array.isArray(existingSpecs)) {
+    return [...existingSpecs.filter((spec) => spec.type !== "openapi"), { type: "openapi", path: openapiFileName }];
+  }
+  const { openapiPath: _, ...rest } = existingSpecs || {};
+  return { openapiPath: openapiFileName, ...rest };
+};
 var index_default = async (_, options) => {
   if (!process.env.PROJECT_DIR) {
     process.env.PROJECT_DIR = process.cwd();
@@ -4318,10 +4325,9 @@ Processing domain: ${domainName} (v${domainVersion})`));
         serviceAttachments = latestServiceInCatalog.attachments || null;
         serviceWritesTo = latestServiceInCatalog.writesTo || [];
         serviceReadsFrom = latestServiceInCatalog.readsFrom || [];
-        serviceSpecifications = {
-          ...serviceSpecifications,
-          ...persistPreviousSpecificationFiles ? latestServiceInCatalog.specifications : {}
-        };
+        if (persistPreviousSpecificationFiles && latestServiceInCatalog.specifications) {
+          serviceSpecifications = mergeOpenApiIntoSpecifications(latestServiceInCatalog.specifications, service.schemaPath);
+        }
         if (latestServiceInCatalog.version === version) {
           receives = latestServiceInCatalog.receives ? (
             // @ts-ignore