max_depth starts with 1. 0 is all

Author: Riccardo Di Benedetto

README.md

@@ -278,8 +278,8 @@ Here are all the available options:
   </tr>
   <tr>
     <td>max_depth</td>
-    <td>Max depth of the nested properties to be rendered of provided json schema. The missing of this option could cause "maximum call stack size exceeded" in case of object properties with circular references</td>
-    <td><code>undefined</code></td>
+    <td>Max depth of the nested properties to be rendered of provided json schema. The missing of this option could cause "maximum call stack size exceeded" in case of object properties with circular references. <code>0</code> value means "render all".</td>
+    <td><code>0</code></td>
   </tr>
   <tr>
     <td>use_default_values</td>

src/core.js

@@ -211,7 +211,7 @@ export class JSONEditor {
     return JSONEditor.defaults.editors[classname]
   }
 
-  createEditor (editorClass, options, depthCounter = 0) {
+  createEditor (editorClass, options, depthCounter = 1) {
     options = extend({}, editorClass.options || {}, options)
     // eslint-disable-next-line new-cap
     return new editorClass(options, JSONEditor.defaults, depthCounter)

src/defaults.js

@@ -284,7 +284,8 @@ function translate (key, variables) {
 const options = {
   upload,
   prompt_before_delete: true,
-  use_default_values: true
+  use_default_values: true,
+  max_depth: 0
 }
 
 /* This assignment was previously in index.js but makes more sense here */

src/editors/object.js

@@ -972,6 +972,11 @@ export class ObjectEditor extends AbstractEditor {
             ...acc,
             [key]: {}
           }
+        case 'additionalProperties':
+          return {
+            ...acc,
+            [key]: true
+          }
         default:
           return {
             ...acc,
@@ -1009,7 +1014,7 @@ export class ObjectEditor extends AbstractEditor {
 
       this.editors[name] = this.jsoneditor.createEditor(editor, {
         jsoneditor: this.jsoneditor,
-        schema: maxDepth !== undefined && this.currentDepth >= maxDepth ? this.getSchemaOnMaxDepth(schema) : schema,
+        schema: !!maxDepth && this.currentDepth >= maxDepth ? this.getSchemaOnMaxDepth(schema) : schema,
         path: `${this.path}.${name}`,
         parent: this
       }, this.currentDepth + 1)

tests/fixtures/nested_object.json

@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "foo1": {
+            "type": "object",
+            "properties": {
+                "foo2": {
+                    "type": "object",
+                    "properties": {
+                        "foo3": {
+                            "type": "object",
+                            "properties": {
+                                "foo4": {
+                                    "type": "object",
+                                    "properties": {
+                                        "bar": {"type": "string", "default": "end schema"}
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

tests/unit/core.spec.js

@@ -4,6 +4,7 @@ TODO: Write unit tests for all interfaces
 */
 import { JSONEditor } from '../../src/core'
 import someTypes from '../fixtures/some_types.json'
+import nestedObject from '../fixtures/nested_object.json'
 
 const schema = {
   type: 'object',
@@ -117,7 +118,7 @@ describe('JSONEditor', function () {
             }
           }
         },
-        max_depth: 3
+        max_depth: 4
       })
       expect(editor).toBeTruthy()
       expect(editor.getValue()).toEqual({
@@ -132,13 +133,13 @@ describe('JSONEditor', function () {
     })
 
     it('with max_depth that stops on level with enum as object property', () => {
-      const depthWithEnum = 1
+      const depthWithEnum = 2
 
       editor = new JSONEditor(element, {
         schema: {
           type: 'object',
           properties: {
-            field_on_level_zero: {
+            field_on_level_one: {
               type: 'object',
               properties: {
                 propertyWithEnum: {
@@ -163,12 +164,29 @@ describe('JSONEditor', function () {
       })
       expect(editor).toBeTruthy()
       expect(editor.getValue()).toEqual({
-        field_on_level_zero: {
+        field_on_level_one: {
           propertyWithEnum: 'bar',
           something_else: {}
         }
       })
     })
+
+    it('with max_depth equals to 0 renders all schema', () => {
+      editor = new JSONEditor(element, {
+        schema: nestedObject,
+        max_depth: 0
+      })
+      expect(editor).toBeTruthy()
+      expect(editor.getValue()).toEqual({ foo1: { foo2: { foo3: { foo4: { bar: 'end schema' } } } } })
+    })
+
+    it('renders all schema as default', () => {
+      editor = new JSONEditor(element, {
+        schema: nestedObject
+      })
+      expect(editor).toBeTruthy()
+      expect(editor.getValue()).toEqual({ foo1: { foo2: { foo3: { foo4: { bar: 'end schema' } } } } })
+    })
   })
 
   describe('use_default_values', () => {