fix reply types

asyncapi · Nov 28, 2023 · 5ae5afe · 5ae5afe
1 parent d8d9c1a
commit 5ae5afe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/models/v3/operation-reply.ts b/src/models/v3/operation-reply.ts
@@ -41,7 +41,8 @@ export class OperationReply extends BaseModel<v3.OperationReplyObject, { id?: st
 
   messages(): MessagesInterface {
     return new Messages(
-      Object.entries(this._json.messages ?? {}).map(([messageId, message]) => {
+      Object.values(this._json.messages ?? {}).map((message) => {
+        const messageId = (message as any)[xParserObjectUniqueId];
         return this.createModel(Message, message as v3.MessageObject, { id: messageId, pointer: this.jsonPath(`messages/${messageId}`) });
       })
     );

diff --git a/src/spec-types/v3.ts b/src/spec-types/v3.ts
@@ -143,7 +143,7 @@ export interface OperationTraitObject extends SpecificationExtensions {
 
 export interface OperationReplyObject extends SpecificationExtensions {
   channel?: ChannelObject | ReferenceObject;
-  messages?: MessagesObject;
+  messages?: (MessageObject | ReferenceObject)[];
   address?: OperationReplyAddressObject | ReferenceObject;
 }
 

diff --git a/test/models/v3/operation-reply.spec.ts b/test/models/v3/operation-reply.spec.ts
@@ -64,20 +64,21 @@ describe('OperationReply model', function() {
 
   describe('.messages()', function() {
     it('should return collection of messages - single message', function() {
-      const d = new OperationReply({ messages: { someMessage: {} } });
+      const d = new OperationReply({ messages: [{'x-parser-unique-object-id': 'testMessage'}] });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
+      expect(d.messages().all()[0].id()).toEqual('testMessage');
     });
 
     it('should return collection of messages - more than one messages', function() {
-      const d = new OperationReply({ messages: { someMessage1: {}, someMessage2: {} } });
+      const d = new OperationReply({ messages: [{'x-parser-unique-object-id': 'testMessage1'}, {'x-parser-unique-object-id': 'testMessage2'}] });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(2);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].id()).toEqual('someMessage1');
+      expect(d.messages().all()[0].id()).toEqual('testMessage1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].id()).toEqual('someMessage2');
+      expect(d.messages().all()[1].id()).toEqual('testMessage2');
     });
 
     it('should return undefined if address is not present', function() {