@eventcatalog/generator-asyncapi 5.5.0 → 6.0.0

package/dist/index.d.mts

@@ -241,6 +241,7 @@ declare const optionsSchema: z.ZodObject<{
     debug: z.ZodOptional<z.ZodBoolean>;
     parseSchemas: z.ZodOptional<z.ZodBoolean>;
     parseChannels: z.ZodOptional<z.ZodBoolean>;
+    attachHeadersToSchema: z.ZodOptional<z.ZodBoolean>;
     saveParsedSpecFile: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     services: {
@@ -303,6 +304,7 @@ declare const optionsSchema: z.ZodObject<{
     debug?: boolean | undefined;
     parseSchemas?: boolean | undefined;
     parseChannels?: boolean | undefined;
+    attachHeadersToSchema?: boolean | undefined;
     saveParsedSpecFile?: boolean | undefined;
 }, {
     services: {
@@ -365,6 +367,7 @@ declare const optionsSchema: z.ZodObject<{
     debug?: boolean | undefined;
     parseSchemas?: boolean | undefined;
     parseChannels?: boolean | undefined;
+    attachHeadersToSchema?: boolean | undefined;
     saveParsedSpecFile?: boolean | undefined;
 }>;
 type Props = z.infer<typeof optionsSchema>;

package/dist/index.d.ts

@@ -241,6 +241,7 @@ declare const optionsSchema: z.ZodObject<{
     debug: z.ZodOptional<z.ZodBoolean>;
     parseSchemas: z.ZodOptional<z.ZodBoolean>;
     parseChannels: z.ZodOptional<z.ZodBoolean>;
+    attachHeadersToSchema: z.ZodOptional<z.ZodBoolean>;
     saveParsedSpecFile: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     services: {
@@ -303,6 +304,7 @@ declare const optionsSchema: z.ZodObject<{
     debug?: boolean | undefined;
     parseSchemas?: boolean | undefined;
     parseChannels?: boolean | undefined;
+    attachHeadersToSchema?: boolean | undefined;
     saveParsedSpecFile?: boolean | undefined;
 }, {
     services: {
@@ -365,6 +367,7 @@ declare const optionsSchema: z.ZodObject<{
     debug?: boolean | undefined;
     parseSchemas?: boolean | undefined;
     parseChannels?: boolean | undefined;
+    attachHeadersToSchema?: boolean | undefined;
     saveParsedSpecFile?: boolean | undefined;
 }>;
 type Props = z.infer<typeof optionsSchema>;

package/dist/index.js

@@ -1543,7 +1543,7 @@ var import_path3 = __toESM(require("path"));
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-asyncapi",
-  version: "5.5.0",
+  version: "6.0.0",
   description: "AsyncAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -2651,30 +2651,6 @@ var getSchemaFileName = (message2) => {
 var getMessageName = (message2) => {
   return message2.hasTitle() && message2.title() ? message2.title() : message2.id();
 };
-var getChannelsForMessage = (message2, channels, document2) => {
-  let channelsForMessage = [];
-  const globalVersion = document2.info().version();
-  for (const channel of channels) {
-    for (const channelMessage of channel.messages()) {
-      if (channelMessage.id() === message2.id()) {
-        channelsForMessage.push(channel);
-      }
-    }
-  }
-  for (const messageChannel of message2.channels()) {
-    channelsForMessage.push(messageChannel);
-  }
-  const uniqueChannels = channelsForMessage.filter(
-    (channel, index, self) => index === self.findIndex((t) => t.id() === channel.id())
-  );
-  return uniqueChannels.map((channel) => {
-    const channelVersion = channel.extensions().get("x-eventcatalog-channel-version")?.value() || globalVersion;
-    return {
-      id: channel.id(),
-      version: channelVersion
-    };
-  });
-};
 
 // src/utils/services.ts
 var defaultMarkdown2 = (document2) => {
@@ -4163,6 +4139,7 @@ var optionsSchema = import_zod.z.object({
   debug: import_zod.z.boolean().optional(),
   parseSchemas: import_zod.z.boolean().optional(),
   parseChannels: import_zod.z.boolean().optional(),
+  attachHeadersToSchema: import_zod.z.boolean().optional(),
   saveParsedSpecFile: import_zod.z.boolean({ invalid_type_error: "The saveParsedSpecFile is not a boolean in options" }).optional()
 });
 var toUniqueArray = (array) => {
@@ -4241,7 +4218,13 @@ var index_default = async (config, options) => {
     }
   };
   validateOptions(options);
-  const { services, saveParsedSpecFile = false, parseSchemas = true, parseChannels = false } = options;
+  const {
+    services,
+    saveParsedSpecFile = false,
+    parseSchemas = true,
+    parseChannels = false,
+    attachHeadersToSchema = false
+  } = options;
   console.log(import_chalk4.default.green(`Processing ${services.length} AsyncAPI files...`));
   for (const service of services) {
     console.log(import_chalk4.default.gray(`Processing ${service.path}`));
@@ -4419,7 +4402,6 @@ Processing domain: ${domainName} (v${domainVersion})`));
               console.log(import_chalk4.default.cyan(` - Versioned previous message: (v${catalogedMessage.version})`));
             }
           }
-          const channelsForMessage = parseChannels ? getChannelsForMessage(message2, channels, document2) : [];
           await writeMessage(
             {
               id: messageId,
@@ -4431,7 +4413,6 @@ Processing domain: ${domainName} (v${domainVersion})`));
               ...messageHasSchema(message2) && { schemaPath: getSchemaFileName(message2) },
               ...owners && { owners },
               ...messageAttachments && { attachments: messageAttachments },
-              ...channelsForMessage.length > 0 && { channels: channelsForMessage },
               ...deprecatedDate && {
                 deprecated: { date: deprecatedDate, ...deprecatedMessage && { message: deprecatedMessage } }
               },
@@ -4444,10 +4425,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
           );
           console.log(import_chalk4.default.cyan(` - Message (v${messageVersion}) created`));
           if (messageHasSchema(message2)) {
-            let schema = message2.payload()?.extensions()?.get("x-parser-original-payload")?.json() || message2.payload()?.json();
-            if (schema?.schema) {
-              schema = schema.schema;
-            }
+            const schema = getSchemaForMessage(message2, attachHeadersToSchema);
             const cleanedMessagePath = messagePath.replace(/\\/g, "/").replace(/^(\.\.\/|\.\/)+/g, "");
             await addSchemaToMessage(
               messageId,
@@ -4463,8 +4441,24 @@ Processing domain: ${domainName} (v${domainVersion})`));
         } else {
           console.log(import_chalk4.default.yellow(` - Skipping external message: ${getMessageName(message2)}(v${messageVersion})`));
         }
-        if (isSent) sends.push({ id: messageId, version: messageVersion });
-        if (isReceived) receives.push({ id: messageId, version: messageVersion });
+        if (parseChannels) {
+          const operationChannels = operation.channels().all();
+          const channelPointers = operationChannels.map((channel) => {
+            const explicitVersion = channel.extensions().get("x-eventcatalog-channel-version")?.value();
+            return { id: channel.id(), ...explicitVersion && { version: explicitVersion } };
+          });
+          if (isSent)
+            sends.push({ id: messageId, version: messageVersion, ...channelPointers.length > 0 && { to: channelPointers } });
+          if (isReceived)
+            receives.push({
+              id: messageId,
+              version: messageVersion,
+              ...channelPointers.length > 0 && { from: channelPointers }
+            });
+        } else {
+          if (isSent) sends.push({ id: messageId, version: messageVersion });
+          if (isReceived) receives.push({ id: messageId, version: messageVersion });
+        }
       }
     }
     const latestServiceInCatalog = await getService(serviceId, "latest");
@@ -4568,6 +4562,36 @@ Failed to request AsyncAPI file from ${service.path}`));
     return await (0, import_promises.readFile)(service.path, "utf8");
   }
 };
+var getSchemaForMessage = (message2, attachHeadersToSchema) => {
+  const payloadSchema = getSchemaFromMessagePart(
+    message2.payload()?.extensions()?.get("x-parser-original-payload")?.json() || message2.payload()?.json()
+  );
+  if (!attachHeadersToSchema || !message2.hasHeaders() || !isJSONSchemaMessage(message2)) {
+    return payloadSchema;
+  }
+  const headersSchema = getSchemaFromMessagePart(
+    message2.headers()?.extensions()?.get("x-parser-original-payload")?.json() || message2.headers()?.json()
+  );
+  if (!headersSchema) {
+    return payloadSchema;
+  }
+  return {
+    type: "object",
+    properties: {
+      headers: headersSchema,
+      payload: payloadSchema
+    }
+  };
+};
+var getSchemaFromMessagePart = (schema) => {
+  if (schema?.schema) {
+    return schema.schema;
+  }
+  return schema;
+};
+var isJSONSchemaMessage = (message2) => {
+  return getSchemaFileName(message2).endsWith(".json");
+};
 var isServiceMessageOwner = (message2, operation) => {
   const operationRole = operation?.extensions?.().get?.("x-eventcatalog-role")?.value?.();
   const messageRole = message2.extensions().get("x-eventcatalog-role")?.value();