deal weith fields that should be arrays

Author: JaredCE

src/Convertor.js

@@ -27,6 +27,14 @@ class Convertor {
             'externalDocs',
         ]
 
+        this.arrayFields = [
+            'allOf',
+            'oneOf',
+            'anyOf',
+            'enum',
+            'required',
+        ]
+
         this.specialSchemaFields = [
             'type',
             'allOf',
@@ -106,6 +114,7 @@ class Convertor {
         this.convertIfThenElse(schema)
         this.convertTypeArrays(schema)
         this.dealWithCamelCase(schema)
+        this.ensureArrayFields(schema)
         this.convertDependencies(schema)
         this.removeEmptyRequired(schema)
         this.convertNullProperty(schema)
@@ -350,6 +359,20 @@ class Convertor {
         }
     }
 
+    ensureArrayFields(schema) {
+        for (const key of Object.keys(schema)) {
+            const arrayField = this.arrayFields.filter(field => {
+                if (key.toLowerCase() === field.toLowerCase()) {
+                    return field
+                }
+            })
+
+            if (arrayField.length && Array.isArray(schema[key]) === false) {
+                schema[arrayField] = [schema[key]]
+            }
+        }
+    }
+
     convertDependencies(schema) {
         if (schema.dependencies || schema.dependentSchemas || schema.dependentRequired) {
             const allOf = []

test/schemas/arrayKeys/arrayKeyOneOf.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "JSON API Schema",
+    "description": "This is a schema for responses in the JSON API format. For more, see http://jsonapi.org",
+    "type": "object",
+    "properties": {
+        "name": {
+            "oneof": {
+                "type": "string"
+            }
+        }
+    }
+}

test/src/Convertor.spec.js

@@ -46,6 +46,8 @@ const dependentRequired = require('../schemas/dependencies/dependentRequired.jso
 const dependentSchemas = require('../schemas/dependencies/dependentSchemas.json')
 // camelcased keys
 const camelCased = require('../schemas/camelCasedKey/camelCasedKey.json')
+// array Keys
+const arrayKeyOneOf = require('../schemas/arrayKeys/arrayKeyOneOf.json')
 // External Schemas That I Cannot Currently Convert
 const listOfBannedSchemas = require('../schemas/SchemasThatCannotBeConverted/list.json')
 
@@ -585,6 +587,23 @@ describe('Convertor', () => {
             });
         });
 
+        describe('array keys', () => {
+            it('should make sure expected array keys are actually arrays', async function() {
+                const newConvertor = new Convertor(arrayKeyOneOf)
+                const result = newConvertor.convert('basic')
+                expect(result.schemas.basic.properties.name).to.have.property('oneOf')
+                expect(result.schemas.basic.properties.name.oneOf).to.be.an('array')
+
+                const cloned = JSON.parse(JSON.stringify(basicOpenAPI))
+                Object.assign(cloned, {components: result})
+                expect(cloned).to.have.property('components')
+                expect(cloned.components).to.have.property('schemas')
+                expect(cloned.components.schemas).to.have.property('basic')
+                let valid = await validator.validateInner(cloned, {})
+                expect(valid).to.be.true
+            });
+        });
+
         xdescribe('use a repo with lots of schemas to find failing ones', () => {
             it('should convert all schemas successfully', async function() {
                 this.timeout(1000000);