fix(asyncapi-2-1): fix parsing of Operation.message field

apidom/packages/apidom-ls/test/openapi-json-async.ts → apidom/packages/apidom-ls/test/asyncapi-json.ts

@@ -394,8 +394,8 @@ describe('apidom-ls-async', function () {
         1,
         10,
         9,
-        35,
-        64,
+        22,
+        0,
         1,
         12,
         6,

apidom/packages/apidom-ls/test/openapi-yaml-async.ts → apidom/packages/apidom-ls/test/asyncapi-yaml.ts

@@ -350,8 +350,8 @@ describe('apidom-ls-async-yaml', function () {
         1,
         8,
         7,
-        35,
-        64,
+        22,
+        0,
         1,
         10,
         4,

apidom/packages/apidom-ns-asyncapi-2/src/elements/Operation.ts

@@ -4,6 +4,7 @@ import { ObjectElement, StringElement, ArrayElement } from 'apidom';
 import TagsElement from './Tags';
 import ExternalDocumentationElement from './ExternalDocumentation';
 import OperationBindingsElement from './OperationBindings';
+import MessageElement from './Message';
 import ReferenceElement from './Reference';
 
 class Operation extends ObjectElement {
@@ -68,11 +69,11 @@ class Operation extends ObjectElement {
     this.set('traits', traits);
   }
 
-  get message(): ArrayElement | undefined {
+  get message(): MessageElement | ReferenceElement | ObjectElement | undefined {
     return this.get('message');
   }
 
-  set message(message: ArrayElement | undefined) {
+  set message(message: MessageElement | ReferenceElement | ObjectElement | undefined) {
     this.set('message', message);
   }
 }

apidom/packages/apidom-ns-asyncapi-2/src/refractor/visitors/async-api-2/operation/MessageVisitor.ts

@@ -1,31 +1,35 @@
 import stampit from 'stampit';
-import { ArrayElement, Element, BREAK } from 'apidom';
+import { ObjectElement, ArrayElement, isArrayElement, BREAK } from 'apidom';
 
 import SpecificationVisitor from '../../SpecificationVisitor';
 import FallbackVisitor from '../../FallbackVisitor';
 import { isReferenceLikeElement } from '../../../predicates';
 
 const MessageVisitor = stampit(SpecificationVisitor, FallbackVisitor, {
-  init() {
-    this.element = new ArrayElement();
-    this.element.classes.push('operation-message');
-  },
   methods: {
-    ArrayElement(arrayElement: ArrayElement) {
-      arrayElement.forEach((item: Element) => {
-        let element;
+    ObjectElement(objectElement: ObjectElement) {
+      if (isReferenceLikeElement(objectElement)) {
+        this.element = this.toRefractedElement(['document', 'objects', 'Reference'], objectElement);
+      } else if (isArrayElement(objectElement.get('oneOf'))) {
+        this.element = new ArrayElement();
+        this.element.classes.push('operation-message');
+
+        objectElement.get('oneOf').forEach((item: ObjectElement) => {
+          let element;
 
-        if (isReferenceLikeElement(item)) {
-          element = this.toRefractedElement(['document', 'objects', 'Reference'], item);
-          element.setMetaProperty('referenced-element', 'message');
-        } else {
-          element = this.toRefractedElement(['document', 'objects', 'Message'], item);
-        }
+          if (isReferenceLikeElement(item)) {
+            element = this.toRefractedElement(['document', 'objects', 'Reference'], item);
+          } else {
+            element = this.toRefractedElement(['document', 'objects', 'Message'], item);
+          }
 
-        this.element.push(element);
-      });
+          this.element.push(element);
+        });
+      } else {
+        this.element = this.toRefractedElement(['document', 'objects', 'Message'], objectElement);
+      }
 
-      this.copyMetaAndAttributes(arrayElement, this.element);
+      this.copyMetaAndAttributes(objectElement, this.element);
 
       return BREAK;
     },

apidom/packages/apidom-ns-asyncapi-2/test/refractor/elements/Operation/__snapshots__/index.ts.snap

@@ -17,23 +17,33 @@ exports[`refractor elements OperationElement given bindings field of type Refere
         (StringElement)))))
 `;
 
-exports[`refractor elements OperationElement given message field contains list of type MessageElement should refract to semantic ApiDOM tree 1`] = `
+exports[`refractor elements OperationElement given message field of \`oneOf\` shape should refract to semantic ApiDOM tree 1`] = `
 (OperationElement
   (MemberElement
     (StringElement)
     (ArrayElement
-      (MessageElement))))
+      (MessageElement)
+      (ReferenceElement
+        (MemberElement
+          (StringElement)
+          (StringElement))))))
 `;
 
-exports[`refractor elements OperationElement given message field contains list of type ReferenceElement should refract to semantic ApiDOM tree 1`] = `
+exports[`refractor elements OperationElement given message field of type MessageElement should refract to semantic ApiDOM tree 1`] = `
 (OperationElement
   (MemberElement
     (StringElement)
-    (ArrayElement
-      (ReferenceElement
-        (MemberElement
-          (StringElement)
-          (StringElement))))))
+    (MessageElement)))
+`;
+
+exports[`refractor elements OperationElement given message field of type ReferenceElement should refract to semantic ApiDOM tree 1`] = `
+(OperationElement
+  (MemberElement
+    (StringElement)
+    (ReferenceElement
+      (MemberElement
+        (StringElement)
+        (StringElement)))))
 `;
 
 exports[`refractor elements OperationElement given traits field contains list of type OperationTraitElement should refract to semantic ApiDOM tree 1`] = `

apidom/packages/apidom-ns-asyncapi-2/test/refractor/elements/Operation/index.ts

@@ -64,24 +64,32 @@ describe('refractor', function () {
         });
       });
 
-      context('given message field contains list of type MessageElement', function () {
+      context('given message field of type MessageElement', function () {
         specify('should refract to semantic ApiDOM tree', function () {
           const operationElement = OperationElement.refract({
-            message: [{}],
+            message: {},
           });
 
           expect(sexprs(operationElement)).toMatchSnapshot();
         });
       });
 
-      context('given message field contains list of type ReferenceElement', function () {
+      context('given message field of type ReferenceElement', function () {
         specify('should refract to semantic ApiDOM tree', function () {
           const operationElement = OperationElement.refract({
-            message: [
-              {
-                $ref: '#/path/to/message',
-              },
-            ],
+            message: { $ref: '#/path/to/message' },
+          });
+
+          expect(sexprs(operationElement)).toMatchSnapshot();
+        });
+      });
+
+      context('given message field of `oneOf` shape', function () {
+        specify('should refract to semantic ApiDOM tree', function () {
+          const operationElement = OperationElement.refract({
+            message: {
+              oneOf: [{}, { $ref: '#/path/to/message' }],
+            },
           });
 
           expect(sexprs(operationElement)).toMatchSnapshot();