convert camel cased keys

Author: JaredCE

src/Convertor.js

@@ -7,6 +7,26 @@ class Convertor {
     constructor(schema = {}) {
         this.schema = JSON.parse(JSON.stringify(schema))
 
+        this.camelCasedProperties = [
+            'allOf',
+            'oneOf',
+            'anyOf',
+            'additionalProperties',
+            'multipleOf',
+            'exclusiveMaximum',
+            'exclusiveMinimum',
+            'maxLength',
+            'minLength',
+            'maxItems',
+            'minItems',
+            'uniqueItems',
+            'maxProperties',
+            'minProperties',
+            'readOnly',
+            'writeOnly',
+            'externalDocs',
+        ]
+
         this.specialSchemaFields = [
             'type',
             'allOf',
@@ -85,6 +105,7 @@ class Convertor {
         this.convertArrays(schema)
         this.convertIfThenElse(schema)
         this.convertTypeArrays(schema)
+        this.dealWithCamelCase(schema)
         this.convertDependencies(schema)
         this.removeEmptyRequired(schema)
         this.convertNullProperty(schema)
@@ -314,6 +335,21 @@ class Convertor {
         delete schema.else
     }
 
+    dealWithCamelCase(schema) {
+        for (const key of Object.keys(schema)) {
+            const camelCasedKey = this.camelCasedProperties.filter(camelCasedKey => {
+                if (key.toLowerCase() === camelCasedKey.toLowerCase()) {
+                    return camelCasedKey
+                }
+            })
+
+            if (camelCasedKey.length && camelCasedKey[0] !== key) {
+                schema[camelCasedKey[0]] = schema[key]
+                delete schema[key]
+            }
+        }
+    }
+
     convertDependencies(schema) {
         if (schema.dependencies || schema.dependentSchemas || schema.dependentRequired) {
             const allOf = []

test/schemas/camelCasedKey/camelCasedKey.json

@@ -0,0 +1,18 @@
+{
+    "$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"
+                },
+                {
+                    "type": "number"
+                }
+            ]
+        }
+    }
+}

test/src/Convertor.spec.js

@@ -44,6 +44,8 @@ const dependenciesArray = require('../schemas/dependencies/dependenciesArray.jso
 const dependenciesSchema = require('../schemas/dependencies/dependenciesSchema.json')
 const dependentRequired = require('../schemas/dependencies/dependentRequired.json')
 const dependentSchemas = require('../schemas/dependencies/dependentSchemas.json')
+// camelcased keys
+const camelCased = require('../schemas/camelCasedKey/camelCasedKey.json')
 // External Schemas That I Cannot Currently Convert
 const listOfBannedSchemas = require('../schemas/SchemasThatCannotBeConverted/list.json')
 
@@ -566,6 +568,23 @@ describe('Convertor', () => {
             });
         });
 
+        describe('camelCased Keys', () => {
+            it('should convert camelCasedKey correctly', async function() {
+                const newConvertor = new Convertor(camelCased)
+                const result = newConvertor.convert('basic')
+                expect(result.schemas.basic.properties.name).to.not.have.property('oneof')
+                expect(result.schemas.basic.properties.name).to.have.property('oneOf')
+
+                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);