feat: add extensions support to additional objects

Refs #16

Author: char0n

apidom/packages/apidom-parser-adapter-openapi3/src/parser/parsers/info.js

@@ -3,12 +3,12 @@
 const { partition } = require('ramda');
 const { addSourceMap } = require('../source-map');
 const { isOpenApiExtension } = require('../predicates');
-const parseOpenApiExtension = require('./open-api-extension');
+const { parseOpenApiExtension, parseOpenApiExtensions } = require('./open-api-extension');
 
 // parseContact :: (Options, JsonNode) -> Element
 const parseContact = ({ namespace, sourceMap }, node) => {
   const contactKeyElement = new namespace.elements.String('contact');
-  const contactElement = new namespace.elements.Object();
+  let contactElement = new namespace.elements.Object();
   const { MemberElement } = namespace.elements.Element.prototype;
   const [openApiExtensions, properties] = partition(isOpenApiExtension({}), node.value.properties);
 
@@ -22,9 +22,9 @@ const parseContact = ({ namespace, sourceMap }, node) => {
     ))
   });
 
-  openApiExtensions.forEach(propertyNode => {
-    contactElement.content.push(parseOpenApiExtension({ namespace, sourceMap }, propertyNode));
-  });
+  contactElement = contactElement.concat(
+    parseOpenApiExtensions({ namespace, sourceMap }, openApiExtensions)
+  );
 
   contactElement.classes.push('contact');
 
@@ -37,7 +37,7 @@ const parseContact = ({ namespace, sourceMap }, node) => {
 // parseLicense :: (Options, JsonNode) -> Element
 const parseLicense = ({ namespace, sourceMap }, node) => {
   const licenseKeyElement = new namespace.elements.String('license');
-  const licenseElement = new namespace.elements.Object();
+  let licenseElement = new namespace.elements.Object();
   const { MemberElement } = namespace.elements.Element.prototype;
   const [openApiExtensions, properties] = partition(isOpenApiExtension({}), node.value.properties);
 
@@ -51,9 +51,9 @@ const parseLicense = ({ namespace, sourceMap }, node) => {
     ))
   });
 
-  openApiExtensions.forEach(propertyNode => {
-    licenseElement.content.push(parseOpenApiExtension({ namespace, sourceMap }, propertyNode));
-  });
+  licenseElement = licenseElement.concat(
+    parseOpenApiExtensions({ namespace, sourceMap }, openApiExtensions)
+  );
 
   licenseElement.classes.push('license');
 

apidom/packages/apidom-parser-adapter-openapi3/src/parser/parsers/open-api-extension.js

@@ -26,4 +26,17 @@ const parseOpenApiExtension = ({ namespace, sourceMap }, node) => {
   return memberElement;
 };
 
-module.exports = parseOpenApiExtension;
+// parseOpenApiExtensions :: (Options, Array.<PropertyNode>) -> Element
+const parseOpenApiExtensions = ({ namespace, sourceMap, accumulator }, nodeList) => {
+  return nodeList
+    .filter(isOpenApiExtension({}))
+    .reduce((acc, node) => {
+      acc.push(parseOpenApiExtension({ namespace, sourceMap }, node));
+      return acc;
+    }, new namespace.elements.Array());
+};
+
+module.exports = {
+  parseOpenApiExtension,
+  parseOpenApiExtensions,
+};

apidom/packages/apidom-parser-adapter-openapi3/src/parser/parsers/open-api3.js

@@ -3,6 +3,8 @@
 const parseOpenapi = require('./openapi');
 const parseInfo = require('./info');
 const parseComponents = require('./components');
+const { parseOpenApiExtension } = require('./open-api-extension');
+const { isOpenApiExtension } = require('../predicates');
 
 // parseOpenApi3 :: (Options, JsonNode) -> Element
 const parseOpenApi3 = ({ namespace, sourceMap }, node) => {
@@ -16,6 +18,8 @@ const parseOpenApi3 = ({ namespace, sourceMap }, node) => {
       openApi3Element.content.push(parseInfo(state, propertyNode));
     } else if (propertyNode.key.value === 'components') {
       openApi3Element.content.push(parseComponents(state, propertyNode));
+    } else if (isOpenApiExtension({}, propertyNode)) {
+      openApi3Element.content.push(parseOpenApiExtension(state, propertyNode));
     }
   });
 

apidom/packages/apidom-parser-adapter-openapi3/src/parser/visitors/generics.js

@@ -4,6 +4,7 @@ const { last } = require('ramda');
 const { isNotNull } = require('ramda-adjunct');
 const { addSourceMap } = require('../source-map');
 const { visit, BREAK } = require('../visitor');
+const { isOpenApiExtension } = require('../predicates');
 
 const ArrayVisitor = () => {
   const stack = [];
@@ -117,16 +118,30 @@ const ObjectVisitor = () => {
       } else if (propertyNode.key.value === '$ref') { // $ref property key special handling
         valueElement = new this.namespace.elements.Ref(propertyNode.value.value);
         valueElement.path = propertyNode.value.value;
-      } else {
+      } else if (!isOpenApiExtension({}, propertyNode)) {
         valueElement = this.namespace.toElement(propertyNode.value.value);
       }
 
-      objElement.content.push(
-        new MemberElement(
-          this.sourceMap ? addSourceMap(propertyNode.key, keyElement) : keyElement,
-          this.sourceMap ? addSourceMap(propertyNode.value, valueElement): valueElement,
-        )
-      );
+      /**
+       * @todo([email protected]): we have a circular dependency here which needs to be eliminated in future.
+       */
+      if (isOpenApiExtension({}, propertyNode)) {
+        const { parseOpenApiExtension } = require('../parsers/open-api-extension');
+
+        objElement.content.push(
+          parseOpenApiExtension(
+            { namespace: this.namespace, sourceMap: this.sourceMap },
+            propertyNode
+          )
+        );
+      } else {
+        objElement.content.push(
+          new MemberElement(
+            this.sourceMap ? addSourceMap(propertyNode.key, keyElement) : keyElement,
+            this.sourceMap ? addSourceMap(propertyNode.value, valueElement): valueElement,
+          )
+        );
+      }
 
       return false;
     },

apidom/packages/apidom-parser-adapter-openapi3/test/fixtures/sample-api.json

@@ -1,5 +1,6 @@
 {
   "openapi": "3.0.0",
+  "x-top-level": "value",
   "info": {
     "title": "Sample API",
     "description": "Optional multiline or single-line description in [CommonMark](http://commonmark.org/help/) or HTML.",
@@ -20,6 +21,14 @@
   },
   "components": {
     "schemas": {
+      "x-model": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type:": "integer"
+          }
+        }
+      },
       "User": {
         "type": "object",
         "properties": {
@@ -38,7 +47,8 @@
         "type": "object",
         "properties": {
           "email": {
-            "type": "string"
+            "type": "string",
+            "x-nullable": true
           }
         }
       }