Merge pull request #26 from fastify/nested-additional-properties

Optional properties support

Author: delvedor

index.js

@@ -11,7 +11,7 @@ function build (schema, options) {
   // used to support patternProperties and additionalProperties
   // they need to check if a field belongs to the properties in the schema
   code += `
-    const properties = ${JSON.stringify(schema.properties)}
+    const properties = ${JSON.stringify(schema.properties)} || {}
   `
   code += `
     ${$asString.toString()}
@@ -264,7 +264,7 @@ function buildObject (schema, code, name, externalSchema, fullSchema) {
 
   var laterCode = ''
 
-  Object.keys(schema.properties).forEach((key, i, a) => {
+  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.
     code += `

test/additionalProperties.test.js

@@ -180,3 +180,60 @@ test('additionalProperties - throw on unknown type', (t) => {
     t.pass()
   }
 })
+
+test('nested additionalProperties', (t) => {
+  t.plan(1)
+  const stringify = build({
+    title: 'additionalProperties',
+    type: 'array',
+    items: {
+      type: 'object',
+      properties: {
+        ap: {
+          type: 'object',
+          additionalProperties: { type: 'string' }
+        }
+      }
+    }
+  })
+
+  let obj = [{ ap: { value: 'string' } }]
+  t.equal('[{"ap":{"value":"string"}}]', stringify(obj))
+})
+
+test('very nested additionalProperties', (t) => {
+  t.plan(1)
+  const stringify = build({
+    title: 'additionalProperties',
+    type: 'array',
+    items: {
+      type: 'object',
+      properties: {
+        ap: {
+          type: 'object',
+          properties: {
+            nested: {
+              type: 'object',
+              properties: {
+                moarNested: {
+                  type: 'object',
+                  properties: {
+                    finally: {
+                      type: 'object',
+                      additionalProperties: {
+                        type: 'string'
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  })
+
+  let obj = [{ ap: { nested: { moarNested: { finally: { value: 'str' } } } } }]
+  t.equal('[{"ap":{"nested":{"moarNested":{"finally":{"value":"str"}}}}}]', stringify(obj))
+})