Merge branch 'master' into fix_parameter_schema_ref

asyncapi · Nov 7, 2023 · d21dfe4 · d21dfe4
2 parents 8d455b3 + 7e91d4c
commit d21dfe4
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@asyncapi/converter",
-	"version": "1.3.3",
+	"version": "1.4.0",
 	"description": "Convert AsyncAPI documents from older to newer versions.",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",

diff --git a/src/third-version.ts b/src/third-version.ts
@@ -326,6 +326,7 @@ function convertMessages(data: ConvertMessagesObjectData): Record<string, any>{
   const messages = {...data.messages};
   // Convert schema formats to union schemas
   Object.entries(messages).forEach(([_, message]) => {
+    delete message.messageId;
     if(message.schemaFormat !== undefined) {
       const payloadSchema = message.payload;
       message.payload = {

diff --git a/test/output/3.0.0/from-2.6.0-with-deep-local-references.yml b/test/output/3.0.0/from-2.6.0-with-deep-local-references.yml
@@ -23,7 +23,6 @@ channels:
       subscribe.message.0:
         $ref: '#/components/messages/turnOnOff'
       customMessageId:
-        messageId: customMessageId
         payload:
           type: object
           properties:
@@ -61,7 +60,6 @@ components:
         subscribe.message.0:
           $ref: '#/components/messages/turnOnOff'
         customMessageId:
-          messageId: customMessageId
           payload:
             type: object
             properties:

diff --git a/test/output/3.0.0/from-2.6.0-with-servers-and-channels-components.yml b/test/output/3.0.0/from-2.6.0-with-servers-and-channels-components.yml
@@ -94,7 +94,6 @@ components:
         subscribe.message.0:
           $ref: '#/components/messages/turnOnOff'
         customMessageId:
-          messageId: customMessageId
           payload:
             type: object
         subscribe.message.2:

diff --git a/test/output/3.0.0/from-2.6.0.yml b/test/output/3.0.0/from-2.6.0.yml
@@ -96,7 +96,6 @@ channels:
       subscribe.message.0:
         $ref: '#/components/messages/turnOnOff'
       customMessageId:
-        messageId: customMessageId
         payload:
           type: object
       subscribe.message.2: