Merge pull request #65 from keldorus/allOf

Add a forEach to test each schema when there is an allOf

Author: mcollina

index.js

@@ -359,21 +359,7 @@ function refFinder (ref, schema, externalSchema) {
   return (new Function('schema', code))(schema)
 }
 
-function buildObject (schema, code, name, externalSchema, fullSchema) {
-  code += `
-    function ${name} (obj) {
-      var json = '{'
-      var addComma = false
-  `
-
-  if (schema.patternProperties) {
-    code += addPatternProperties(schema, externalSchema, fullSchema)
-  } else if (schema.additionalProperties && !schema.patternProperties) {
-    code += addAdditionalProperties(schema, externalSchema, fullSchema)
-  }
-
-  var laterCode = ''
-
+function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
   Object.keys(schema.properties || {}).forEach((key, i, a) => {
     // Using obj['key'] !== undefined instead of obj.hasOwnProperty(prop) for perf reasons,
     // see https://github.com/mcollina/fast-json-stringify/pull/3 for discussion.
@@ -404,6 +390,38 @@ function buildObject (schema, code, name, externalSchema, fullSchema) {
     `
   })
 
+  return { code: code, laterCode: laterCode }
+}
+
+function buildObject (schema, code, name, externalSchema, fullSchema) {
+  code += `
+    function ${name} (obj) {
+      var json = '{'
+      var addComma = false
+  `
+
+  if (schema.patternProperties) {
+    code += addPatternProperties(schema, externalSchema, fullSchema)
+  } else if (schema.additionalProperties && !schema.patternProperties) {
+    code += addAdditionalProperties(schema, externalSchema, fullSchema)
+  }
+
+  var laterCode = ''
+
+  if (schema.allOf) {
+    schema.allOf.forEach((ss) => {
+      var builtCode = buildCode(ss, code, laterCode, name, externalSchema, fullSchema)
+
+      code = builtCode.code
+      laterCode = builtCode.laterCode
+    })
+  } else {
+    var builtCode = buildCode(schema, code, laterCode, name, externalSchema, fullSchema)
+
+    code = builtCode.code
+    laterCode = builtCode.laterCode
+  }
+
   // Removes the comma if is the last element of the string (in case there are not properties)
   code += `
       json += '}'

test/allof.test.js

@@ -0,0 +1,127 @@
+'use strict'
+
+const test = require('tap').test
+const build = require('..')
+
+test('object with allOf and multiple schema on the allOf', (t) => {
+  t.plan(4)
+
+  const schema = {
+    title: 'object with allOf and multiple schema on the allOf',
+    type: 'object',
+    allOf: [
+      {
+        type: 'object',
+        required: [
+          'name'
+        ],
+        properties: {
+          name: {
+            type: 'string'
+          },
+          tag: {
+            type: 'string'
+          }
+        }
+      },
+      {
+        required: [
+          'id'
+        ],
+        type: 'object',
+        properties: {
+          id: {
+            type: 'integer'
+          }
+        }
+      }
+    ]
+  }
+  const stringify = build(schema)
+
+  try {
+    stringify({
+      id: 1
+    })
+  } catch (e) {
+    t.is(e.message, 'name is required!')
+  }
+
+  try {
+    stringify({
+      name: 'string'
+    })
+  } catch (e) {
+    t.is(e.message, 'id is required!')
+  }
+
+  try {
+    const value = stringify({
+      id: 1,
+      name: 'string'
+    })
+    t.is(value, '{"name":"string","id":1}')
+  } catch (e) {
+    t.fail()
+  }
+
+  try {
+    const value = stringify({
+      id: 1,
+      name: 'string',
+      tag: 'otherString'
+    })
+    t.is(value, '{"name":"string","tag":"otherString","id":1}')
+  } catch (e) {
+    t.fail()
+  }
+})
+
+test('object with allOf and one schema on the allOf', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'object with allOf and one schema on the allOf',
+    type: 'object',
+    allOf: [
+      {
+        required: [
+          'id'
+        ],
+        type: 'object',
+        properties: {
+          id: {
+            type: 'integer'
+          }
+        }
+      }
+    ]
+  }
+  const stringify = build(schema)
+
+  try {
+    const value = stringify({
+      id: 1
+    })
+    t.is(value, '{"id":1}')
+  } catch (e) {
+    t.fail()
+  }
+})
+
+test('object with allOf and no schema on the allOf', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'object with allOf and no schema on the allOf',
+    type: 'object',
+    allOf: []
+  }
+
+  try {
+    build(schema)
+    t.fail()
+  } catch (e) {
+    t.is(e.message, 'schema is invalid: data.allOf should NOT have less than 1 items')
+  }
+})