fix test

Author: jonaslagoni

docs/generators/channels.md

@@ -12,7 +12,7 @@ export default {
       preset: 'channels',
       outputPath: './src/__gen__/', 
       language: 'typescript',
-      protocols: ['nats', 'kafka']
+      protocols: ['nats']
     }
   ]
 };
@@ -26,7 +26,7 @@ This is supported through the following inputs: [`asyncapi`](#inputs)
 
 It supports the following languages; [`typescript`](#typescript)
 
-It supports the following protocols; [`nats`](../protocols/nats.md), [`kafka`](../protocols/kafka.md), [`mqtt`](../protocols/mqtt.md)
+It supports the following protocols; [`nats`](../protocols/nats.md), [`kafka`](../protocols/kafka.md), [`mqtt`](../protocols/mqtt.md), [`amqp`](../protocols/amqp.md)
 
 ## Options
 These are the available options for the `channels` generator; 
@@ -43,12 +43,13 @@ Depending on which protocol, these are the dependencies:
 - `NATS`: https://github.com/nats-io/nats.js v2
 - `Kafka`: https://github.com/tulios/kafkajs v2
 - `MQTT`: https://github.com/mqttjs/MQTT.js v5
+- `AMQP`: https://github.com/amqp-node/amqplib v0
 
 For TypeScript what is generated is a single file that include functions to help easier interact with AsyncAPI channels. For example;
 
 ```ts
 import { Protocols } from 'src/__gen__/index';
-const { nats, kafka, mqtt, ... } = Protocols;
+const { nats, kafka, mqtt, amqp ... } = Protocols;
 const { jetStreamPublishTo..., jetStreamPullSubscribeTo..., jetStreamPushSubscriptionFrom..., publishTo..., subscribeTo... } = nats;
 ```
 

docs/protocols/amqp.md

@@ -0,0 +1,91 @@
+---
+sidebar_position: 99
+---
+
+# AMQP
+`AMQP` is currently available through the generators ([channels](#channels)):
+
+| **Languages** | publish exchange | publish queue | subscribe |
+|---|---|---|
+| TypeScript | ✔️ | ✔️ |  |
+
+All of this is available through [AsyncAPI](../inputs/asyncapi.md).
+
+## Channels
+Read more about the [channels](../generators/channels.md) generator here before continuing.
+
+This generator provides support functions for each resource ensuring you the right payload and parameter are used. 
+
+<table>
+<thead>
+  <tr>
+    <th>Input (AsyncAPI)</th>
+    <th>Using the code</th>
+  </tr>
+</thead>
+<tbody>
+  <tr>
+    <td>
+
+```yaml
+asyncapi: 3.0.0
+info:
+  title: Account Service
+  version: 1.0.0
+  description: This service is in charge of processing user signups
+channels:
+  userSignups:
+    address: user/signedup
+    messages:
+      userSignedup:
+        $ref: '#/components/messages/UserSignedUp'
+operations:
+  publishUserSignups:
+    action: send
+    channel:
+      $ref: '#/channels/userSignups'
+  consumeUserSignups:
+    action: receive
+    channel:
+      $ref: '#/channels/userSignups'
+components:
+  messages:
+    UserSignedUp:
+      payload:
+        type: object
+        properties:
+          displayName:
+            type: string
+            description: Name of the user
+          email:
+            type: string
+            format: email
+            description: Email of the user
+
+```
+</td>
+    <td>
+
+```ts
+import * as Amqp from 'amqplib';
+// Location depends on the payload generator configurations
+import { UserSignedup } from './__gen__/payloads/UserSignedup';
+// Location depends on the channel generator configurations
+import { Protocols } from './__gen__/channels';
+const { amqp } = Protocols;
+const { publishToPublishUserSignupsExchange, publishToPublishUserSignupsQueue } = mqtt;
+
+/**
+ * Setup the regular client
+ */
+const client = await amqplib.connect('amqp://localhost');
+
+const myPayload = new UserSignedup({displayName: 'test', email: 'test@test.dk'});
+// Produce the messages with the generated channel function
+await publishToPublishUserSignupsExchange(myPayload, client);
+await publishToPublishUserSignupsQueue(myPayload, client);
+```	
+</td>
+  </tr>
+</tbody>
+</table>

docs/protocols/kafka.md

@@ -83,7 +83,6 @@ const kafkaClient = new Kafka({
 });
 
 const myPayload = new UserSignedup({displayName: 'test', email: 'test@test.dk'});
-const myParameters = new UserSignedUpParameters({userId: 'test'});
 
 // Consume the messages with the generated channel function
 const consumerCallback = async (
@@ -105,7 +104,7 @@ const consumer = await consumeFromConsumeUserSignups(
 );
 
 // Produce the messages with the generated channel function
-const producer = await produceToPublishUserSignups(myPayload, myParameters, kafkaClient);
+const producer = await produceToPublishUserSignups(myPayload, kafkaClient);
 ```	
 </td>
   </tr>

docs/protocols/mqtt.md

@@ -81,10 +81,9 @@ const { publishToUserSignedup } = mqtt;
 const client = await MqttClient.connectAsync("mqtt://0.0.0.0:1883");
 
 const myPayload = new UserSignedup({displayName: 'test', email: 'test@test.dk'});
-const myParameters = new UserSignedUpParameters({userId: 'test'});
 
 // Produce the messages with the generated channel function
-const producer = await publishToUserSignedup(myPayload, myParameters, kafkaClient);
+const producer = await publishToUserSignedup(myPayload, client);
 ```	
 </td>
   </tr>

src/codegen/generators/typescript/channels/index.ts

@@ -556,7 +556,7 @@ export async function generateTypeScriptChannels(
 
         case 'amqp': {
           const topic = simpleContext.topic;
-          let natsContext: RenderRegularParameters = {
+          let amqpContext: RenderRegularParameters = {
             ...simpleContext,
             topic,
             messageType: ''
@@ -575,8 +575,8 @@ export async function generateTypeScriptChannels(
               }
               const {messageModule, messageType} =
                 getMessageTypeAndModule(payload);
-              natsContext = {
-                ...natsContext,
+              amqpContext = {
+                ...amqpContext,
                 messageType,
                 messageModule,
                 subName: findNameFromOperation(operation, channel)
@@ -590,7 +590,7 @@ export async function generateTypeScriptChannels(
                   generator.asyncapiReverseOperations
                 )
               ) {
-                renders.push(AmqpRenderer.renderPublishExchange({...natsContext, additionalProperties: {exchange: exchangeName}}));
+                renders.push(AmqpRenderer.renderPublishExchange({...amqpContext, additionalProperties: {exchange: exchangeName}}));
               }
               if (
                 shouldRenderFunctionType(
@@ -600,7 +600,7 @@ export async function generateTypeScriptChannels(
                   generator.asyncapiReverseOperations
                 )
               ) {
-                renders.push(AmqpRenderer.renderPublishQueue(natsContext));
+                renders.push(AmqpRenderer.renderPublishQueue(amqpContext));
               }
             }
           } else {
@@ -612,7 +612,7 @@ export async function generateTypeScriptChannels(
             }
             const {messageModule, messageType} =
               getMessageTypeAndModule(payload);
-            natsContext = {...natsContext, messageType, messageModule};
+            amqpContext = {...amqpContext, messageType, messageModule};
 
             if (
               shouldRenderFunctionType(
@@ -622,7 +622,7 @@ export async function generateTypeScriptChannels(
                 generator.asyncapiReverseOperations
               )
             ) {
-              renders.push(AmqpRenderer.renderPublishExchange({...natsContext, additionalProperties: {exchange: exchangeName}}));
+              renders.push(AmqpRenderer.renderPublishExchange({...amqpContext, additionalProperties: {exchange: exchangeName}}));
             }
             if (
               shouldRenderFunctionType(
@@ -632,7 +632,7 @@ export async function generateTypeScriptChannels(
                 generator.asyncapiReverseOperations
               )
             ) {
-              renders.push(AmqpRenderer.renderPublishQueue(natsContext));
+              renders.push(AmqpRenderer.renderPublishQueue(amqpContext));
             }
           }
           protocolCodeFunctions[protocol].push(

src/codegen/generators/typescript/channels/protocols/amqp/publishExchange.ts

@@ -24,7 +24,7 @@ export function renderPublishExchange({
   const publishOperation = `let dataToSend: any = ${messageType === 'null' ? 'null' : messageMarshalling};
 const channel = await amqp.createChannel();
 const routingKey = ${addressToUse};
-channel.publish(exchange, routingKey, Buffer.from(dataToSend));`;
+channel.publish(exchange, routingKey, Buffer.from(dataToSend), options);`;
 
   const functionParameters = [
     {
@@ -44,7 +44,7 @@ channel.publish(exchange, routingKey, Buffer.from(dataToSend));`;
       jsDoc: ' * @param amqp the AMQP connection to send over'
     },
     {
-      parameter: `options?: {exchange: string | undefined} extends Amqp.Options.Publish`
+      parameter: `options?: {exchange: string | undefined} & Amqp.Options.Publish`
     }
   ];
 
@@ -57,9 +57,9 @@ ${functionName}: (
   ${functionParameters.map((param) => param.parameter).join(', ')}
 ): Promise<void> => {
   return new Promise<void>(async (resolve, reject) => {    
-    const exchange = options.exchange ?? '${additionalProperties?.exchange}';
+    const exchange = options?.exchange ?? '${additionalProperties?.exchange}';
     if(!exchange) {
-      return reject('No exchange value found, please provide one to call publishToSendUserSignedupExchange')
+      return reject('No exchange value found, please provide one')
     }
     try {
       ${publishOperation}

src/codegen/generators/typescript/channels/protocols/amqp/publishQueue.ts

@@ -23,7 +23,7 @@ export function renderPublishQueue({
   const publishOperation = `let dataToSend: any = ${messageType === 'null' ? 'null' : messageMarshalling};
 const channel = await amqp.createChannel();
 const queue = ${addressToUse};
-channel.sendToQueue(queue, Buffer.from(dataToSend));`;
+channel.sendToQueue(queue, Buffer.from(dataToSend), options);`;
 
   const functionParameters = [
     {
@@ -41,6 +41,9 @@ channel.sendToQueue(queue, Buffer.from(dataToSend));`;
     {
       parameter: 'amqp: Amqp.Connection',
       jsDoc: ' * @param amqp the AMQP connection to send over'
+    },
+    {
+      parameter: `options?: Amqp.Options.Publish`
     }
   ];
 

test/blackbox/test_files.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 
 // Select a specific file to test
-const TEST_SPECIFIC_FILE: any = '';
+const TEST_SPECIFIC_FILE: any = 'documentation';
 // Select a specific config to test
 const TEST_SPECIFIC_CONFIG: any = '';