fix: throw an error if none of types matches (#451)

Author: ivan-tymoshenko

index.js

@@ -1211,23 +1211,25 @@ function buildValue (laterCode, locationPath, input, location) {
       break
     default:
       if (Array.isArray(type)) {
-        const nullIndex = type.indexOf('null')
-        const sortedTypes = nullIndex !== -1 ? [type[nullIndex]].concat(type.slice(0, nullIndex)).concat(type.slice(nullIndex + 1)) : type
+        let sortedTypes = type
+        const nullable = schema.nullable === true || type.includes('null')
+
+        if (nullable) {
+          sortedTypes = sortedTypes.filter(type => type !== 'null')
+          code += `
+            if (${input} === null) {
+              json += null
+            } else {`
+        }
+
         sortedTypes.forEach((type, index) => {
           const statement = index === 0 ? 'if' : 'else if'
           const tempSchema = Object.assign({}, schema, { type })
           const nestedResult = buildValue(laterCode, locationPath, input, mergeLocation(location, { schema: tempSchema }))
           switch (type) {
             case 'string': {
               code += `
-                ${statement}(${input} === null || typeof ${input} === "${type}" || ${input} instanceof Date || typeof ${input}.toISOString === "function" || ${input} instanceof RegExp || (typeof ${input} === "object" && Object.hasOwnProperty.call(${input}, "toString")))
-                  ${nestedResult.code}
-              `
-              break
-            }
-            case 'null': {
-              code += `
-                ${statement}(${input} == null)
+                ${statement}(${input} === null || typeof ${input} === "${type}" || ${input} instanceof Date || ${input} instanceof RegExp || (typeof ${input} === "object" && Object.hasOwnProperty.call(${input}, "toString")))
                   ${nestedResult.code}
               `
               break
@@ -1246,16 +1248,9 @@ function buildValue (laterCode, locationPath, input, location) {
               `
               break
             }
-            case 'number': {
-              code += `
-                ${statement}(isNaN(${input}) === false)
-                  ${nestedResult.code}
-              `
-              break
-            }
             default: {
               code += `
-                ${statement}(typeof ${input} === "${type}")
+                ${statement}(typeof ${input} === "${type}" || ${input} === null)
                   ${nestedResult.code}
               `
               break
@@ -1264,8 +1259,14 @@ function buildValue (laterCode, locationPath, input, location) {
           laterCode = nestedResult.laterCode
         })
         code += `
-          else json+= null
+          else throw new Error(\`The value $\{JSON.stringify(${input})} does not match schema definition.\`)
         `
+
+        if (nullable) {
+          code += `
+            }
+          `
+        }
       } else {
         throw new Error(`${type} unsupported`)
       }

test/typesArray.test.js

@@ -87,6 +87,27 @@ test('possibly nullable number primitive alternative with null value', (t) => {
   t.equal(value, '{"data":0}')
 })
 
+test('possibly nullable number primitive alternative with null value', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'simple object with multi-type nullable primitive',
+    type: 'object',
+    properties: {
+      data: {
+        type: ['boolean']
+      }
+    }
+  }
+
+  const stringify = build(schema)
+
+  const value = stringify({
+    data: null
+  })
+  t.equal(value, '{"data":false}')
+})
+
 test('nullable integer primitive', (t) => {
   t.plan(1)
 
@@ -434,3 +455,20 @@ test('should throw an error when type is array and object is null', (t) => {
   const stringify = build(schema)
   t.throws(() => stringify({ arr: null }), new TypeError('The value \'null\' does not match schema definition.'))
 })
+
+test('throw an error if none of types matches', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'simple object with multi-type nullable primitive',
+    type: 'object',
+    properties: {
+      data: {
+        type: ['number', 'boolean']
+      }
+    }
+  }
+
+  const stringify = build(schema)
+  t.throws(() => stringify({ data: 'string' }), 'The value "string" does not match schema definition.')
+})