@eventcatalog/generator-asyncapi 6.4.1 → 6.4.3

package/dist/index.mjs

@@ -1538,7 +1538,7 @@ import path3 from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-asyncapi",
-  version: "6.4.1",
+  version: "6.4.3",
   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"
@@ -1619,14 +1621,18 @@ function stripAnsi(string) {
   return string.replace(regex, "");
 }
 
-// ../../node_modules/.pnpm/get-east-asian-width@1.5.0/node_modules/get-east-asian-width/lookup-data.js
+// ../../node_modules/.pnpm/get-east-asian-width@1.6.0/node_modules/get-east-asian-width/lookup-data.js
+var ambiguousMinimalCodePoint = 161;
+var ambiguousMaximumCodePoint = 1114109;
 var ambiguousRanges = [161, 161, 164, 164, 167, 168, 170, 170, 173, 174, 176, 180, 182, 186, 188, 191, 198, 198, 208, 208, 215, 216, 222, 225, 230, 230, 232, 234, 236, 237, 240, 240, 242, 243, 247, 250, 252, 252, 254, 254, 257, 257, 273, 273, 275, 275, 283, 283, 294, 295, 299, 299, 305, 307, 312, 312, 319, 322, 324, 324, 328, 331, 333, 333, 338, 339, 358, 359, 363, 363, 462, 462, 464, 464, 466, 466, 468, 468, 470, 470, 472, 472, 474, 474, 476, 476, 593, 593, 609, 609, 708, 708, 711, 711, 713, 715, 717, 717, 720, 720, 728, 731, 733, 733, 735, 735, 768, 879, 913, 929, 931, 937, 945, 961, 963, 969, 1025, 1025, 1040, 1103, 1105, 1105, 8208, 8208, 8211, 8214, 8216, 8217, 8220, 8221, 8224, 8226, 8228, 8231, 8240, 8240, 8242, 8243, 8245, 8245, 8251, 8251, 8254, 8254, 8308, 8308, 8319, 8319, 8321, 8324, 8364, 8364, 8451, 8451, 8453, 8453, 8457, 8457, 8467, 8467, 8470, 8470, 8481, 8482, 8486, 8486, 8491, 8491, 8531, 8532, 8539, 8542, 8544, 8555, 8560, 8569, 8585, 8585, 8592, 8601, 8632, 8633, 8658, 8658, 8660, 8660, 8679, 8679, 8704, 8704, 8706, 8707, 8711, 8712, 8715, 8715, 8719, 8719, 8721, 8721, 8725, 8725, 8730, 8730, 8733, 8736, 8739, 8739, 8741, 8741, 8743, 8748, 8750, 8750, 8756, 8759, 8764, 8765, 8776, 8776, 8780, 8780, 8786, 8786, 8800, 8801, 8804, 8807, 8810, 8811, 8814, 8815, 8834, 8835, 8838, 8839, 8853, 8853, 8857, 8857, 8869, 8869, 8895, 8895, 8978, 8978, 9312, 9449, 9451, 9547, 9552, 9587, 9600, 9615, 9618, 9621, 9632, 9633, 9635, 9641, 9650, 9651, 9654, 9655, 9660, 9661, 9664, 9665, 9670, 9672, 9675, 9675, 9678, 9681, 9698, 9701, 9711, 9711, 9733, 9734, 9737, 9737, 9742, 9743, 9756, 9756, 9758, 9758, 9792, 9792, 9794, 9794, 9824, 9825, 9827, 9829, 9831, 9834, 9836, 9837, 9839, 9839, 9886, 9887, 9919, 9919, 9926, 9933, 9935, 9939, 9941, 9953, 9955, 9955, 9960, 9961, 9963, 9969, 9972, 9972, 9974, 9977, 9979, 9980, 9982, 9983, 10045, 10045, 10102, 10111, 11094, 11097, 12872, 12879, 57344, 63743, 65024, 65039, 65533, 65533, 127232, 127242, 127248, 127277, 127280, 127337, 127344, 127373, 127375, 127376, 127387, 127404, 917760, 917999, 983040, 1048573, 1048576, 1114109];
+var fullwidthMinimalCodePoint = 12288;
+var fullwidthMaximumCodePoint = 65510;
 var fullwidthRanges = [12288, 12288, 65281, 65376, 65504, 65510];
-var halfwidthRanges = [8361, 8361, 65377, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, 65512, 65518];
-var narrowRanges = [32, 126, 162, 163, 165, 166, 172, 172, 175, 175, 10214, 10221, 10629, 10630];
+var wideMinimalCodePoint = 4352;
+var wideMaximumCodePoint = 262141;
 var wideRanges = [4352, 4447, 8986, 8987, 9001, 9002, 9193, 9196, 9200, 9200, 9203, 9203, 9725, 9726, 9748, 9749, 9776, 9783, 9800, 9811, 9855, 9855, 9866, 9871, 9875, 9875, 9889, 9889, 9898, 9899, 9917, 9918, 9924, 9925, 9934, 9934, 9940, 9940, 9962, 9962, 9970, 9971, 9973, 9973, 9978, 9978, 9981, 9981, 9989, 9989, 9994, 9995, 10024, 10024, 10060, 10060, 10062, 10062, 10067, 10069, 10071, 10071, 10133, 10135, 10160, 10160, 10175, 10175, 11035, 11036, 11088, 11088, 11093, 11093, 11904, 11929, 11931, 12019, 12032, 12245, 12272, 12287, 12289, 12350, 12353, 12438, 12441, 12543, 12549, 12591, 12593, 12686, 12688, 12773, 12783, 12830, 12832, 12871, 12880, 42124, 42128, 42182, 43360, 43388, 44032, 55203, 63744, 64255, 65040, 65049, 65072, 65106, 65108, 65126, 65128, 65131, 94176, 94180, 94192, 94198, 94208, 101589, 101631, 101662, 101760, 101874, 110576, 110579, 110581, 110587, 110589, 110590, 110592, 110882, 110898, 110898, 110928, 110930, 110933, 110933, 110948, 110951, 110960, 111355, 119552, 119638, 119648, 119670, 126980, 126980, 127183, 127183, 127374, 127374, 127377, 127386, 127488, 127490, 127504, 127547, 127552, 127560, 127568, 127569, 127584, 127589, 127744, 127776, 127789, 127797, 127799, 127868, 127870, 127891, 127904, 127946, 127951, 127955, 127968, 127984, 127988, 127988, 127992, 128062, 128064, 128064, 128066, 128252, 128255, 128317, 128331, 128334, 128336, 128359, 128378, 128378, 128405, 128406, 128420, 128420, 128507, 128591, 128640, 128709, 128716, 128716, 128720, 128722, 128725, 128728, 128732, 128735, 128747, 128748, 128756, 128764, 128992, 129003, 129008, 129008, 129292, 129338, 129340, 129349, 129351, 129535, 129648, 129660, 129664, 129674, 129678, 129734, 129736, 129736, 129741, 129756, 129759, 129770, 129775, 129784, 131072, 196605, 196608, 262141];
 
-// ../../node_modules/.pnpm/get-east-asian-width@1.5.0/node_modules/get-east-asian-width/utilities.js
+// ../../node_modules/.pnpm/get-east-asian-width@1.6.0/node_modules/get-east-asian-width/utilities.js
 var isInRange = (ranges, codePoint) => {
   let low = 0;
   let high = Math.floor(ranges.length / 2) - 1;
@@ -1644,19 +1650,9 @@ var isInRange = (ranges, codePoint) => {
   return false;
 };
 
-// ../../node_modules/.pnpm/get-east-asian-width@1.5.0/node_modules/get-east-asian-width/lookup.js
-var minimumAmbiguousCodePoint = ambiguousRanges[0];
-var maximumAmbiguousCodePoint = ambiguousRanges.at(-1);
-var minimumFullWidthCodePoint = fullwidthRanges[0];
-var maximumFullWidthCodePoint = fullwidthRanges.at(-1);
-var minimumHalfWidthCodePoint = halfwidthRanges[0];
-var maximumHalfWidthCodePoint = halfwidthRanges.at(-1);
-var minimumNarrowCodePoint = narrowRanges[0];
-var maximumNarrowCodePoint = narrowRanges.at(-1);
-var minimumWideCodePoint = wideRanges[0];
-var maximumWideCodePoint = wideRanges.at(-1);
+// ../../node_modules/.pnpm/get-east-asian-width@1.6.0/node_modules/get-east-asian-width/lookup.js
 var commonCjkCodePoint = 19968;
-var [wideFastPathStart, wideFastPathEnd] = findWideFastPathRange(wideRanges);
+var [wideFastPathStart, wideFastPathEnd] = /* @__PURE__ */ findWideFastPathRange(wideRanges);
 function findWideFastPathRange(ranges) {
   let fastPathStart = ranges[0];
   let fastPathEnd = ranges[1];
@@ -1674,13 +1670,13 @@ function findWideFastPathRange(ranges) {
   return [fastPathStart, fastPathEnd];
 }
 var isAmbiguous = (codePoint) => {
-  if (codePoint < minimumAmbiguousCodePoint || codePoint > maximumAmbiguousCodePoint) {
+  if (codePoint < ambiguousMinimalCodePoint || codePoint > ambiguousMaximumCodePoint) {
     return false;
   }
   return isInRange(ambiguousRanges, codePoint);
 };
 var isFullWidth = (codePoint) => {
-  if (codePoint < minimumFullWidthCodePoint || codePoint > maximumFullWidthCodePoint) {
+  if (codePoint < fullwidthMinimalCodePoint || codePoint > fullwidthMaximumCodePoint) {
     return false;
   }
   return isInRange(fullwidthRanges, codePoint);
@@ -1689,13 +1685,13 @@ var isWide = (codePoint) => {
   if (codePoint >= wideFastPathStart && codePoint <= wideFastPathEnd) {
     return true;
   }
-  if (codePoint < minimumWideCodePoint || codePoint > maximumWideCodePoint) {
+  if (codePoint < wideMinimalCodePoint || codePoint > wideMaximumCodePoint) {
     return false;
   }
   return isInRange(wideRanges, codePoint);
 };
 
-// ../../node_modules/.pnpm/get-east-asian-width@1.5.0/node_modules/get-east-asian-width/index.js
+// ../../node_modules/.pnpm/get-east-asian-width@1.6.0/node_modules/get-east-asian-width/index.js
 function validate(codePoint) {
   if (!Number.isSafeInteger(codePoint)) {
     throw new TypeError(`Expected a code point, got \`${typeof codePoint}\`.`);
@@ -2719,6 +2715,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";
 
@@ -4026,6 +4046,19 @@ function isValidLicenseKeyFormat(key) {
 }
 
 // ../../node_modules/.pnpm/@eventcatalog+license@0.0.7/node_modules/@eventcatalog/license/dist/plans.js
+var isEventCatalogScaleEnabled = async () => {
+  const FEATURE = "@eventcatalog/eventcatalog-scale";
+  const LICENSE_KEY = process.env.EVENTCATALOG_SCALE_LICENSE_KEY || null;
+  if (hasOfflineLicenseKey()) {
+    await verifyOfflineLicense();
+    return isFeatureEnabled(FEATURE);
+  }
+  if (!LICENSE_KEY) {
+    return false;
+  }
+  console.log("Checking online license for", FEATURE);
+  return verifyOnlineLicense(LICENSE_KEY, FEATURE);
+};
 var isFeatureEnabled2 = async (feature, key) => {
   if (hasOfflineLicenseKey()) {
     await verifyOfflineLicense();
@@ -4038,29 +4071,61 @@ var isFeatureEnabled2 = async (feature, key) => {
 };
 
 // ../../shared/checkLicense.ts
-var checkLicense_default = async (pkgName, licenseKey) => {
-  if (!hasOfflineLicenseKey() && !licenseKey) {
-    console.log(chalk3.bgRed(`
-No license key provided for ${pkgName}`));
-    console.log(chalk3.redBright("You can get a free 14 day trial license at https://eventcatalog.cloud/"));
-    process.exit(1);
-  }
-  try {
-    const featureEnabled = await isFeatureEnabled2(pkgName, licenseKey);
-    if (!featureEnabled) {
+var hasLicenseKey = (licenseKey) => Boolean(licenseKey?.trim());
+var checkLicense_default = async (pkgName, licenseKey, options = {}) => {
+  let licenseCheckFailed = false;
+  if (hasOfflineLicenseKey()) {
+    try {
+      if (await isFeatureEnabled2(pkgName)) {
+        return Promise.resolve();
+      }
+      if (options.allowEventCatalogScaleLicense && await isEventCatalogScaleEnabled()) {
+        return Promise.resolve();
+      }
+    } catch (error) {
+      licenseCheckFailed = true;
+      console.log(error);
+    }
+  } else {
+    const hasPluginLicenseKey = hasLicenseKey(licenseKey);
+    const hasScaleLicenseKey = options.allowEventCatalogScaleLicense && hasLicenseKey(process.env.EVENTCATALOG_SCALE_LICENSE_KEY);
+    if (!hasPluginLicenseKey && !hasScaleLicenseKey) {
       console.log(chalk3.bgRed(`
-Invalid license key`));
-      console.log(chalk3.redBright("Please check your plugin license key or purchase a license at https://eventcatalog.cloud/"));
+No license key provided for ${pkgName}`));
+      console.log(chalk3.redBright("You can get a free 14 day trial license at https://eventcatalog.cloud/"));
       process.exit(1);
     }
-    return Promise.resolve();
-  } catch (error) {
-    console.log(error);
+    if (hasPluginLicenseKey) {
+      try {
+        if (await isFeatureEnabled2(pkgName, licenseKey)) {
+          return Promise.resolve();
+        }
+      } catch (error) {
+        licenseCheckFailed = true;
+        console.log(error);
+      }
+    }
+    if (hasScaleLicenseKey) {
+      try {
+        if (await isEventCatalogScaleEnabled()) {
+          return Promise.resolve();
+        }
+      } catch (error) {
+        licenseCheckFailed = true;
+        console.log(error);
+      }
+    }
+  }
+  if (licenseCheckFailed) {
     console.log(chalk3.bgRed(`
 Failed to verify license key`));
     console.log(chalk3.redBright("Please check your plugin license key or purchase a license at https://eventcatalog.cloud/"));
     process.exit(1);
   }
+  console.log(chalk3.bgRed(`
+Invalid license key`));
+  console.log(chalk3.redBright("Please check your plugin license key or purchase a license at https://eventcatalog.cloud/"));
+  process.exit(1);
 };
 
 // src/index.ts
@@ -4207,7 +4272,7 @@ var index_default = async (config, options) => {
     throw new Error("Please provide catalog url (env variable PROJECT_DIR)");
   }
   const LICENSE_KEY = process.env.EVENTCATALOG_LICENSE_KEY_ASYNCAPI || options.licenseKey || "";
-  await checkLicense_default(package_default.name, LICENSE_KEY);
+  await checkLicense_default(package_default.name, LICENSE_KEY, { allowEventCatalogScaleLicense: true });
   await checkForPackageUpdate(package_default.name);
   const {
     writeService,
@@ -4427,7 +4492,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;
@@ -4465,63 +4530,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 {