@eventcatalog/generator-openapi 7.5.5 → 7.6.1

package/dist/index.mjs

@@ -1570,7 +1570,7 @@ var buildService = (serviceOptions, document2, generateMarkdown) => {
   const generatedMarkdownForService = defaultMarkdown2(document2, schemaPath);
   return {
     id: serviceId,
-    version: document2.info.version,
+    version: serviceOptions.version || document2.info.version,
     name: document2.info.title,
     summary: getSummary(document2),
     schemaPath,
@@ -1809,7 +1809,7 @@ var getSummary2 = (message2) => {
   }
   return escapeSpecialCharactersThatBreakMarkdown(eventCatalogMessageSummary);
 };
-var buildMessage = async (pathToFile, document2, operation, generateMarkdown, messageIdConfig, serviceId) => {
+var buildMessage = async (pathToFile, document2, operation, generateMarkdown, messageIdConfig, serviceId, serviceVersion) => {
   const requestBodiesAndResponses = await getSchemasByOperationId(pathToFile, operation.operationId);
   const extensions = operation.extensions || {};
   const operationTags = operation.tags.map((badge) => ({
@@ -1831,13 +1831,14 @@ var buildMessage = async (pathToFile, document2, operation, generateMarkdown, me
     uniqueIdentifier = [messageIdConfig.prefix, uniqueIdentifier].join(separator);
   }
   const messageName = extensions["x-eventcatalog-message-id"] || uniqueIdentifier;
+  const messageVersion = extensions["x-eventcatalog-message-version"] || serviceVersion || document2.info.version;
   if (messageIdConfig?.prefixWithServiceId) {
     const separator = messageIdConfig.separator || "-";
     uniqueIdentifier = [serviceId, uniqueIdentifier].join(separator);
   }
   return {
     id: extensions["x-eventcatalog-message-id"] || uniqueIdentifier,
-    version: extensions["x-eventcatalog-message-version"] || document2.info.version,
+    version: messageVersion,
     name: extensions["x-eventcatalog-message-name"] || messageName,
     summary: getSummary2(operation),
     markdown: generateMarkdown ? generateMarkdown({ operation, markdown: generatedMarkdownForMessage }) : generatedMarkdownForMessage,
@@ -4066,7 +4067,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.5.5",
+  version: "7.6.1",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4103,7 +4104,7 @@ var package_default = {
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@changesets/cli": "^2.27.7",
-    "@eventcatalog/sdk": "^2.8.3",
+    "@eventcatalog/sdk": "^2.9.2",
     chalk: "4.1.2",
     "js-yaml": "^4.1.0",
     "openapi-types": "^12.1.3",
@@ -4201,7 +4202,8 @@ var index_default = async (_, options) => {
         const document2 = await SwaggerParser2.dereference(specFile);
         return {
           document: document2,
-          path: specFile
+          path: specFile,
+          version: serviceSpec.version || document2.info.version
         };
       } catch (error) {
         console.error(chalk4.red(`Failed to parse OpenAPI file: ${specFile}`));
@@ -4212,15 +4214,19 @@ var index_default = async (_, options) => {
     const validSpecs = await Promise.all(specs);
     const validSpecFiles = validSpecs.filter((v) => v !== null);
     const orderedSpecs = validSpecFiles.sort((a, b) => {
-      const versionA = a?.document.info.version ?? "";
-      const versionB = b?.document.info.version ?? "";
+      const versionA = a?.version ?? "";
+      const versionB = b?.version ?? "";
       return versionA.localeCompare(versionB);
     });
     for (const specification of orderedSpecs) {
       const document2 = specification.document;
-      const version = document2.info.version;
+      const version = specification.version;
       const specPath = specification.path;
-      const service = buildService({ ...serviceSpec, path: specPath }, document2, serviceSpec.generateMarkdown);
+      const service = buildService(
+        { ...serviceSpec, path: specPath, version: specification.version },
+        document2,
+        serviceSpec.generateMarkdown
+      );
       let serviceMarkdown = service.markdown;
       let serviceSpecificationsFiles = [];
       let serviceSpecifications = service.specifications;
@@ -4265,6 +4271,11 @@ Processing domain: ${domainName} (v${domainVersion})`));
         await addServiceToDomain(domainId, { id: service.id, version: service.version }, domainVersion);
       }
       const latestServiceInCatalog = await getService(service.id, "latest");
+      let latestVersionSpecificationFiles = [];
+      try {
+        latestVersionSpecificationFiles = await getSpecificationFilesForService(service.id, "latest");
+      } catch (error) {
+      }
       const versionTheService = latestServiceInCatalog && isVersionGreaterThan(version, latestServiceInCatalog.version);
       console.log(chalk4.blue(`Processing service: ${document2.info.title} (v${version})`));
       if (latestServiceInCatalog && isVersionLessThan(version, latestServiceInCatalog.version)) {
@@ -4279,7 +4290,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
         owners: service.setMessageOwnersToServiceOwners ? service.owners : [],
         serviceHasMultipleSpecFiles: Array.isArray(serviceSpec.path),
         isDraft: isServiceMarkedAsDraft,
-        serviceId: service.id
+        serviceId: service.id,
+        serviceVersion: service.version
       });
       let owners = service.owners || [];
       let repository = null;
@@ -4287,7 +4299,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
       const persistPreviousSpecificationFiles = Array.isArray(serviceSpec.path) === false;
       if (latestServiceInCatalog) {
         serviceMarkdown = latestServiceInCatalog.markdown;
-        serviceSpecificationsFiles = await getSpecificationFilesForService(service.id, "latest");
+        serviceSpecificationsFiles = latestVersionSpecificationFiles;
         sends = latestServiceInCatalog.sends || [];
         owners = latestServiceInCatalog.owners || [];
         repository = latestServiceInCatalog.repository || null;
@@ -4349,7 +4361,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
 var processMessagesForOpenAPISpec = async (pathToSpec, document2, servicePath, options) => {
   const operations = await getOperationsByType(pathToSpec, options.httpMethodsToMessages);
   const sidebarBadgeType = options.sidebarBadgeType || "HTTP_METHOD";
-  const version = document2.info.version;
+  const version = options.serviceVersion || document2.info.version;
   const preserveExistingMessages = options.preserveExistingMessages ?? true;
   const isDraft = options.isDraft ?? null;
   let receives = [], sends = [];
@@ -4360,7 +4372,8 @@ var processMessagesForOpenAPISpec = async (pathToSpec, document2, servicePath, o
       operation,
       options.messages?.generateMarkdown,
       options.messages?.id,
-      options.serviceId
+      options.serviceId,
+      version
     );
     let messageMarkdown = message2.markdown;
     const messageType = operation.type;
@@ -4382,7 +4395,7 @@ var processMessagesForOpenAPISpec = async (pathToSpec, document2, servicePath, o
       if (preserveExistingMessages) {
         messageMarkdown = catalogedMessage.markdown;
       }
-      if (catalogedMessage.version !== version) {
+      if (catalogedMessage.version !== message2.version) {
         console.log("versioning message", message2.id);
         await versionMessage(message2.id);
         console.log(chalk4.cyan(` - Versioned previous message: ${message2.id} (v${catalogedMessage.version})`));