Merge pull request #4 from JaredAAT/deal-with-default-value-outside-of-ofProperty

Deal with default value outside of of property

Author: JaredAAT

src/Convertor.js

@@ -121,10 +121,28 @@ class Convertor {
                 }
             }
 
+            const defaultValuesForOfProperties = () => {
+                if (schema.type === undefined && this.ofProperties.some(element => Object.keys(schema).includes(element))) {
+                    if (Object.keys(schema).includes('default')) {
+                        for (const property of this.ofProperties) {
+                            if (Object.keys(schema).includes(property)) {
+                                for (const ofProperty of schema[property]) {
+                                    if (ofProperty.type !== 'null' || ofProperty.nullable) {
+                                        ofProperty.default = schema.default
+                                        delete schema.default
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
             convertNull()
             convertTypeArrays()
             bannedWordsRemoval()
             convertDefaultValues()
+            defaultValuesForOfProperties()
 
             if (this.specialProperties.indexOf(parentKeyword) !== -1) {
                 if (this.ofProperties.indexOf(parentKeyword) !== -1) {

test/schemas/complex-typeArray.json

@@ -44,6 +44,20 @@
         },
         "otherBooleanThing": {
             "type": "boolean"
+        },
+        "mode": {
+            "anyOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "type": "string",
+                    "enum": ["header", "parameter", "cookie"],
+                    "default": "header"
+                }
+            ],
+            "description": "From which part of the request the token should be extracted. Possible values are 'header', 'parameter', 'cookie'.",
+            "default": "header"
         }
     }
 }