Nested if then else (#98)

* Nested if then else

* Implement if then else in if too

* Delete from copy

Author: allevo

README.md

@@ -295,7 +295,6 @@ Example:
 const stringify = fastJson({
   'type': 'object',
   'properties': {
-    'kind': { 'type': 'string', 'enum': ['foobar', 'greeting'] }
   },
   'if': {
     'properties': {
@@ -304,12 +303,14 @@ const stringify = fastJson({
   },
   'then': {
     'properties': {
+      'kind': { 'type': 'string', 'enum': ['foobar'] },
       'foo': { 'type': 'string' },
       'bar': { 'type': 'number' }
     }
   },
   'else': {
     'properties': {
+      'kind': { 'type': 'string', 'enum': ['greeting'] },
       'hi': { 'type': 'string' },
       'hello': { 'type': 'number' }
     }
@@ -332,6 +333,8 @@ console.log(stringify({
 })) // {"kind":"greeting","foo":"FOO","bar":42}
 ```
 
+**NB:** don't declare the properties twice or you'll print them twice!
+
 <a name="ref"></a>
 #### Reuse - $ref
 If you want to reuse a definition of a value, you can use the property `$ref`.  

index.js

@@ -51,6 +51,8 @@ function build (schema, options) {
     `
   }
 
+  var hasShemaSomeIf = hasIf(schema)
+
   var main
 
   switch (schema.type) {
@@ -92,7 +94,7 @@ function build (schema, options) {
 
   var dependencies = []
   var dependenciesName = []
-  if (hasAnyOf(schema) || hasArrayOfTypes(schema) || hasIf(schema)) {
+  if (hasAnyOf(schema) || hasArrayOfTypes(schema) || hasShemaSomeIf) {
     dependencies.push(new Ajv())
     dependenciesName.push('ajv')
   }
@@ -512,57 +514,83 @@ function buildInnerObject (schema, name, externalSchema, fullSchema) {
   return { code: code, laterCode: laterCode }
 }
 
-function buildObject (schema, code, name, externalSchema, fullSchema) {
+function addIfThenElse (schema, name, externalSchema, fullSchema) {
+  var code = ''
+  var r
+  var laterCode = ''
+  var innerR
+
+  const copy = merge({}, schema)
+  const i = copy.if
+  const then = copy.then
+  const e = copy.else
+  delete copy.if
+  delete copy.then
+  delete copy.else
+  var merged = merge(copy, then)
+
   code += `
-    function ${name} (obj) {
-      var json = '{'
-      var addComma = false
+    valid = ajv.validate(${require('util').inspect(i, {depth: null})}, obj)
+    if (valid) {
   `
+  if (merged.if && merged.then) {
+    innerR = addIfThenElse(merged, name, externalSchema, fullSchema)
+    code += innerR.code
+    laterCode = innerR.laterCode
+  }
 
-  var laterCode = ''
-  var r, merged
-  if (schema.if && schema.then) {
-    merged = merge(schema, schema.then)
-    delete merged.if
-    delete merged.then
-    delete merged.else
+  r = buildInnerObject(merged, name, externalSchema, fullSchema)
+  code += r.code
+  laterCode = r.laterCode
+
+  code += `
+    }
+  `
+  if (e) {
+    merged = merge(copy, e)
 
     code += `
-      var valid = ajv.validate(${require('util').inspect(schema.if, {depth: null})}, obj)
-      if (valid) {
+      else {
     `
 
+    if (merged.if && merged.then) {
+      innerR = addIfThenElse(merged, name, externalSchema, fullSchema)
+      code += innerR.code
+      laterCode = innerR.laterCode
+    }
+
     r = buildInnerObject(merged, name, externalSchema, fullSchema)
     code += r.code
     laterCode = r.laterCode
 
     code += `
       }
     `
-    if (schema.else) {
-      merged = merge(schema, schema.else)
-      delete merged.if
-      delete merged.then
-      delete merged.else
-
-      code += `
-        else {
-      `
+  }
+  return { code: code, laterCode: laterCode }
+}
 
-      r = buildInnerObject(merged, name, externalSchema, fullSchema)
-      code += r.code
-      laterCode = r.laterCode
+function buildObject (schema, code, name, externalSchema, fullSchema) {
+  code += `
+    function ${name} (obj) {
+      var json = '{'
+      var addComma = false
+  `
 
-      code += `
-        }
-      `
-    }
+  var laterCode = ''
+  var r
+  if (schema.if && schema.then) {
+    code += `
+      var valid
+    `
+    r = addIfThenElse(schema, name, externalSchema, fullSchema)
   } else {
     r = buildInnerObject(schema, name, externalSchema, fullSchema)
-    code += r.code
-    laterCode = r.laterCode
   }
 
+  code += r.code
+  laterCode = r.laterCode
+
   // Removes the comma if is the last element of the string (in case there are not properties)
   code += `
       json += '}'