fix: apply if/then/else check for any schema (#533)

* fix: apply if/then/else check for any schema

* Update test/if-then-else.test.js

Co-authored-by: Manuel Spigolon <[email protected]>

Co-authored-by: Manuel Spigolon <[email protected]>

Author: ivan-tymoshenko

index.js

@@ -483,7 +483,7 @@ function buildInnerObject (location) {
   return code
 }
 
-function addIfThenElse (location) {
+function addIfThenElse (location, input) {
   const schema = merge({}, location.schema)
   const thenSchema = schema.then
   const elseSchema = schema.else || { additionalProperties: true }
@@ -495,38 +495,19 @@ function addIfThenElse (location) {
   const ifLocation = mergeLocation(location, 'if')
   const ifSchemaRef = ifLocation.schemaId + ifLocation.jsonPointer
 
-  let code = `
-    if (validator.validate("${ifSchemaRef}", obj)) {
-  `
-
   const thenLocation = mergeLocation(location, 'then')
   thenLocation.schema = merge(schema, thenSchema)
 
-  if (thenSchema.if && thenSchema.then) {
-    code += addIfThenElse(thenLocation)
-  } else {
-    code += buildInnerObject(thenLocation)
-  }
-  code += `
-    }
-  `
-
   const elseLocation = mergeLocation(location, 'else')
   elseLocation.schema = merge(schema, elseSchema)
 
-  code += `
-      else {
-    `
-
-  if (elseSchema.if && elseSchema.then) {
-    code += addIfThenElse(elseLocation)
-  } else {
-    code += buildInnerObject(elseLocation)
-  }
-  code += `
-      }
-    `
-  return code
+  return `
+    if (validator.validate("${ifSchemaRef}", ${input})) {
+      ${buildValue(thenLocation, input)}
+    } else {
+      ${buildValue(elseLocation, input)}
+    }
+  `
 }
 
 function toJSON (variableName) {
@@ -558,12 +539,7 @@ function buildObject (location) {
       var addComma = false
   `
 
-  if (schema.if && schema.then) {
-    functionCode += addIfThenElse(location)
-  } else {
-    functionCode += buildInnerObject(location)
-  }
-
+  functionCode += buildInnerObject(location)
   functionCode += `
       json += '}'
       return json
@@ -869,6 +845,10 @@ function buildValue (location, input) {
     }
   }
 
+  if (schema.if && schema.then) {
+    return addIfThenElse(location, input)
+  }
+
   if (schema.allOf) {
     const mergedSchema = clone(schema)
     mergeAllOfSchema(location, schema, mergedSchema)

test/if-then-else.test.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const t = require('tap')
+const { DateTime } = require('luxon')
 const build = require('..')
 
 const schema = {
@@ -368,3 +369,52 @@ t.test('nested if/then', t => {
     JSON.stringify({ a: 'A', bar: 'bar', bar1: 'bar1' })
   )
 })
+
+t.test('if/else with string format', (t) => {
+  t.plan(2)
+
+  const schema = {
+    if: { type: 'string' },
+    then: { type: 'string', format: 'date' },
+    else: { const: 'Invalid' }
+  }
+
+  const stringify = build(schema)
+
+  const date = new Date()
+
+  t.equal(stringify(date), `"${DateTime.fromJSDate(date).toISODate()}"`)
+  t.equal(stringify('Invalid'), '"Invalid"')
+})
+
+t.test('if/else with const integers', (t) => {
+  t.plan(2)
+
+  const schema = {
+    type: 'integer',
+    if: { minimum: 42 },
+    then: { const: 66 },
+    else: { const: 33 }
+  }
+
+  const stringify = build(schema)
+
+  t.equal(stringify(100.32), '66')
+  t.equal(stringify(10.12), '33')
+})
+
+t.test('if/else with array', (t) => {
+  t.plan(2)
+
+  const schema = {
+    type: 'array',
+    if: { maxItems: 1 },
+    then: { items: { type: 'string' } },
+    else: { items: { type: 'number' } }
+  }
+
+  const stringify = build(schema)
+
+  t.equal(stringify(['1']), JSON.stringify(['1']))
+  t.equal(stringify(['1', '2']), JSON.stringify([1, 2]))
+})