Issue #208 making else non mandatory (#210)

* assigns a default value to else

* adds test cases

Author: agarwalkartik

index.js

@@ -704,7 +704,7 @@ function addIfThenElse (schema, name, externalSchema, fullSchema) {
   const copy = merge({}, schema)
   const i = copy.if
   const then = copy.then
-  const e = copy.else
+  const e = copy.else ? copy.else : { additionalProperties: true }
   delete copy.if
   delete copy.then
   delete copy.else
@@ -727,27 +727,25 @@ function addIfThenElse (schema, name, externalSchema, fullSchema) {
   code += `
     }
   `
-  if (e) {
-    merged = merge(copy, e)
+  merged = merge(copy, e)
 
-    code += `
+  code += `
       else {
     `
 
-    if (merged.if && merged.then) {
-      innerR = addIfThenElse(merged, name + 'Else', externalSchema, fullSchema)
-      code += innerR.code
-      laterCode += innerR.laterCode
-    }
+  if (merged.if && merged.then) {
+    innerR = addIfThenElse(merged, name + 'Else', externalSchema, fullSchema)
+    code += innerR.code
+    laterCode += innerR.laterCode
+  }
 
-    r = buildInnerObject(merged, name + 'Else', externalSchema, fullSchema)
-    code += r.code
-    laterCode += r.laterCode
+  r = buildInnerObject(merged, name + 'Else', externalSchema, fullSchema)
+  code += r.code
+  laterCode += r.laterCode
 
-    code += `
+  code += `
       }
     `
-  }
   return { code: code, laterCode: laterCode }
 }
 

test/if-then-else.test.js

@@ -149,6 +149,33 @@ const nestedDeepElseSchema = {
   additionalProperties: schema
 }
 
+const noElseSchema = {
+  type: 'object',
+  properties: {
+  },
+  if: {
+    properties: {
+      kind: { type: 'string', enum: ['foobar'] }
+    }
+  },
+  then: {
+    properties: {
+      kind: { type: 'string', enum: ['foobar'] },
+      foo: { type: 'string' },
+      bar: { type: 'number' },
+      list: {
+        type: 'array',
+        items: {
+          type: 'object',
+          properties: {
+            name: { type: 'string' },
+            value: { type: 'string' }
+          }
+        }
+      }
+    }
+  }
+}
 const fooBarInput = {
   kind: 'foobar',
   foo: 'FOO',
@@ -205,6 +232,15 @@ const alphabetOutput = JSON.stringify({
 const deepFoobarOutput = JSON.stringify({
   foobar: JSON.parse(foobarOutput)
 })
+const noElseGreetingOutput = JSON.stringify({
+  kind: 'greeting',
+  foo: 'FOO',
+  bar: 42,
+  hi: 'HI',
+  hello: 45,
+  a: 'A',
+  b: 35
+})
 
 t.test('if-then-else', t => {
   const tests = [
@@ -261,6 +297,12 @@ t.test('if-then-else', t => {
       schema: nestedDeepElseSchema,
       input: deepFoobarInput,
       expected: deepFoobarOutput
+    },
+    {
+      name: 'no else',
+      schema: noElseSchema,
+      input: greetingInput,
+      expected: noElseGreetingOutput
     }
   ]