@eventcatalog/generator-asyncapi 6.4.0 → 6.4.2

package/dist/index.mjs

@@ -1538,7 +1538,7 @@ import path3 from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-asyncapi",
-  version: "6.4.0",
+  version: "6.4.2",
   description: "AsyncAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -1561,6 +1561,7 @@ var package_default = {
     "@types/lodash": "^4.17.7",
     "@types/minimist": "^1.2.5",
     "@types/node": "^20.16.1",
+    "@types/semver": "^7.7.0",
     prettier: "^3.3.3",
     tsup: "^8.1.0",
     typescript: "^5.5.3",
@@ -1584,6 +1585,7 @@ var package_default = {
     "js-yaml": "^4.1.0",
     lodash: "^4.17.23",
     minimist: "^1.2.8",
+    semver: "^7.7.2",
     slugify: "^1.6.6",
     "update-notifier": "^7.3.1",
     zod: "^3.23.8"
@@ -2719,6 +2721,30 @@ var defaultMarkdown4 = (_document, channel) => {
   `;
 };
 
+// src/utils/versions.ts
+import { valid as semverValid, gt as semverGt, eq as semverEq, coerce as semverCoerce } from "semver";
+var tryCoerceToSemver = (version) => {
+  if (semverValid(version)) return version;
+  const coerced = semverCoerce(version);
+  return coerced ? coerced.version : null;
+};
+var isNewerVersion = (incoming, existing) => {
+  if (!incoming || !existing) return false;
+  if (incoming === existing) return false;
+  const incomingSemver = tryCoerceToSemver(incoming);
+  const existingSemver = tryCoerceToSemver(existing);
+  if (!incomingSemver || !existingSemver) return false;
+  return semverGt(incomingSemver, existingSemver);
+};
+var isSameVersion = (a, b) => {
+  if (!a || !b) return false;
+  if (a === b) return true;
+  const aSemver = tryCoerceToSemver(a);
+  const bSemver = tryCoerceToSemver(b);
+  if (!aSemver || !bSemver) return false;
+  return semverEq(aSemver, bSemver);
+};
+
 // ../../shared/checkLicense.ts
 import chalk3 from "chalk";
 
@@ -4358,6 +4384,18 @@ Processing domain: ${domainName} (v${domainVersion})`));
       } else {
         servicePath = path3.join("../", "domains", options.domain.id, "services", service.id);
       }
+    } else {
+      const existingService = await getService(serviceId, "latest");
+      if (existingService) {
+        const existingServiceResource = await getResourcePath(
+          process.env.PROJECT_DIR,
+          serviceId,
+          existingService.version
+        );
+        if (existingServiceResource) {
+          servicePath = path3.join("../", existingServiceResource.directory);
+        }
+      }
     }
     if (options.writeFilesToRoot) {
       servicePath = service.id;
@@ -4415,7 +4453,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
     for (const operation of operations) {
       for (const message2 of operation.messages()) {
         const eventType = message2.extensions().get("x-eventcatalog-message-type")?.value() || "event";
-        const messageVersion = message2.extensions().get("x-eventcatalog-message-version")?.value() || version;
+        let messageVersion = message2.extensions().get("x-eventcatalog-message-version")?.value() || version;
         const deprecatedDate = message2.extensions().get("x-eventcatalog-deprecated-date")?.value() || null;
         const deprecatedMessage = message2.extensions().get("x-eventcatalog-deprecated-message")?.value() || null;
         const isMessageMarkedAsDraft = isDomainMarkedAsDraft || isServiceMarkedAsDraft || message2.extensions().get("x-eventcatalog-draft")?.value() || null;
@@ -4453,63 +4491,76 @@ Processing domain: ${domainName} (v${domainVersion})`));
         }
         if (serviceOwnsMessageContract) {
           const catalogedMessage = await getMessage(messageId, "latest");
+          let shouldWriteMessage = true;
           if (catalogedMessage) {
             messageMarkdown = catalogedMessage.markdown;
             messageBadges = catalogedMessage.badges || null;
             messageAttachments = catalogedMessage.attachments || null;
-            if (catalogedMessage.version !== messageVersion) {
+            const catalogedVersion = catalogedMessage.version ?? "";
+            if (isSameVersion(catalogedVersion, messageVersion)) {
+            } else if (isNewerVersion(messageVersion, catalogedVersion)) {
               await versionMessage(messageId);
               console.log(chalk4.cyan(` - Versioned previous message: (v${catalogedMessage.version})`));
+            } else {
+              console.log(
+                chalk4.yellow(
+                  ` - Skipping ${messageId} (v${messageVersion}) - catalog already has a newer version (v${catalogedVersion})`
+                )
+              );
+              messageVersion = catalogedVersion;
+              shouldWriteMessage = false;
             }
           }
-          await writeMessage(
-            {
-              id: messageId,
-              version: messageVersion,
-              name: getMessageName(message2),
-              summary: getSummary(message2),
-              markdown: messageMarkdown,
-              badges: messageBadges || badges2.map((badge) => ({ content: badge.name(), textColor: "blue", backgroundColor: "blue" })),
-              ...messageHasSchema(message2) && { schemaPath: getSchemaFileName(message2) },
-              ...owners && { owners },
-              ...messageAttachments && { attachments: messageAttachments },
-              ...deprecatedDate && {
-                deprecated: { date: deprecatedDate, ...deprecatedMessage && { message: deprecatedMessage } }
-              },
-              ...isMessageMarkedAsDraft && { draft: true }
-            },
-            {
-              override: true,
-              path: messagePath
-            }
-          );
-          console.log(chalk4.cyan(` - Message (v${messageVersion}) created`));
-          if (messageHasSchema(message2)) {
-            const schema = getSchemaForMessage(message2, attachHeadersToSchema);
-            const cleanedMessagePath = messagePath.replace(/\\/g, "/").replace(/^(\.\.\/|\.\/)+/g, "");
-            await addSchemaToMessage(
-              messageId,
+          if (shouldWriteMessage) {
+            await writeMessage(
               {
-                fileName: getSchemaFileName(message2),
-                schema: safeStringify(schema, 4)
+                id: messageId,
+                version: messageVersion,
+                name: getMessageName(message2),
+                summary: getSummary(message2),
+                markdown: messageMarkdown,
+                badges: messageBadges || badges2.map((badge) => ({ content: badge.name(), textColor: "blue", backgroundColor: "blue" })),
+                ...messageHasSchema(message2) && { schemaPath: getSchemaFileName(message2) },
+                ...owners && { owners },
+                ...messageAttachments && { attachments: messageAttachments },
+                ...deprecatedDate && {
+                  deprecated: { date: deprecatedDate, ...deprecatedMessage && { message: deprecatedMessage } }
+                },
+                ...isMessageMarkedAsDraft && { draft: true }
               },
-              messageVersion,
-              { path: cleanedMessagePath }
-            );
-            console.log(chalk4.cyan(` - Schema added to message (v${messageVersion})`));
-          }
-          if (parseExamples) {
-            const messageExamples = message2.examples().all();
-            for (let i = 0; i < messageExamples.length; i++) {
-              const example = messageExamples[i];
-              const payload = example.payload();
-              if (payload) {
-                const fileName2 = example.hasName() ? `${example.name()}.json` : `example-${i}.json`;
-                await addExampleToMessage(messageId, { content: JSON.stringify(payload, null, 2), fileName: fileName2 }, messageVersion);
+              {
+                override: true,
+                path: messagePath
               }
+            );
+            console.log(chalk4.cyan(` - Message (v${messageVersion}) created`));
+            if (messageHasSchema(message2)) {
+              const schema = getSchemaForMessage(message2, attachHeadersToSchema);
+              const cleanedMessagePath = messagePath.replace(/\\/g, "/").replace(/^(\.\.\/|\.\/)+/g, "");
+              await addSchemaToMessage(
+                messageId,
+                {
+                  fileName: getSchemaFileName(message2),
+                  schema: safeStringify(schema, 4)
+                },
+                messageVersion,
+                { path: cleanedMessagePath }
+              );
+              console.log(chalk4.cyan(` - Schema added to message (v${messageVersion})`));
             }
-            if (messageExamples.length > 0) {
-              console.log(chalk4.cyan(` - ${messageExamples.length} example(s) added to message (v${messageVersion})`));
+            if (parseExamples) {
+              const messageExamples = message2.examples().all();
+              for (let i = 0; i < messageExamples.length; i++) {
+                const example = messageExamples[i];
+                const payload = example.payload();
+                if (payload) {
+                  const fileName2 = example.hasName() ? `${example.name()}.json` : `example-${i}.json`;
+                  await addExampleToMessage(messageId, { content: JSON.stringify(payload, null, 2), fileName: fileName2 }, messageVersion);
+                }
+              }
+              if (messageExamples.length > 0) {
+                console.log(chalk4.cyan(` - ${messageExamples.length} example(s) added to message (v${messageVersion})`));
+              }
             }
           }
         } else {