Allow for nested definitions. Fixes #127

jdorn · jdorn · commit 14e8540bafbb · 2014-06-22T10:15:16.000-07:00
diff --git a/src/validator.js b/src/validator.js
@@ -30,17 +30,18 @@ JSONEditor.Validator = Class.extend({
       });
     });
   },
-  _getRefs: function(schema,callback) {
+  _getRefs: function(schema,callback,path,in_definitions) {
     var self = this;
     var is_root = schema === this.original_schema;
+    path = path || "#";
 
     var waiting, finished, check_if_finished, called;
 
     // Work on a deep copy of the schema
     schema = $extend({},schema);
 
     // First expand out any definition in the root node
-    if(is_root && schema.definitions) {
+    if(schema.definitions && (is_root || in_definitions)) {
       var defs = schema.definitions;
       delete schema.definitions;
 
@@ -49,7 +50,7 @@ JSONEditor.Validator = Class.extend({
         if(finished >= waiting) {
           if(called) return;
           called = true;
-          self._getRefs(schema,callback);
+          self._getRefs(schema,callback,path);
         }
       };
 
@@ -61,10 +62,10 @@ JSONEditor.Validator = Class.extend({
         $each(defs,function(i,definition) {
           // Expand the definition recursively
           self._getRefs(definition,function(def_schema) {
-            self.refs['#/definitions/'+i] = def_schema;
+            self.refs[path+'/definitions/'+i] = def_schema;
             finished++;
             check_if_finished(schema);
-          });
+          },path+'/definitions/'+i,true);
         });
       }
       else {
@@ -111,7 +112,7 @@ JSONEditor.Validator = Class.extend({
               $each(list,function(i,v) {
                 v();
               });
-            });
+            },path);
             return;
           }
           
@@ -159,7 +160,7 @@ JSONEditor.Validator = Class.extend({
 
                   finished++;
                   check_if_finished(schema);
-                });
+                },path+'/'+key+'/'+j);
               }
             });
           }
@@ -170,7 +171,7 @@ JSONEditor.Validator = Class.extend({
 
               finished++;
               check_if_finished(schema);
-            });
+            },path+'/'+key);
           }
         });
       }
diff --git a/tests/validation.html b/tests/validation.html
@@ -7,6 +7,7 @@
     <script src='../dist/jsoneditor.js'></script>
 </head>
 <body>
+  <div id='output'></div>
 <script>
     var tests = {
         required3: {
@@ -566,6 +567,56 @@
                 }
             ]
         },
+        definitions_nested: {
+            schema: {
+                type: "object",
+                properties: {
+                  id: {
+                    $ref: "#/definitions/app/definitions/id"
+                  },
+                  definitions: {
+                    type: "number"
+                  },
+                  test: {
+                    $ref: "#/definitions/test"
+                  }
+                },
+                definitions: {
+                    app: {
+                        definitions: {
+                          id: {
+                            type: "string"
+                          }
+                        }
+                    },
+                    test: {
+                      properties: {
+                        definitions: {
+                          type: "number"
+                        }
+                      }
+                    }
+                }
+            },
+            valid: [
+                {
+                    id: "test",
+                    definitions: 3,
+                    test: {definitions: 3}
+                }
+            ],
+            invalid: [
+                {
+                    id: 1
+                },
+                {
+                    definitions: "string"
+                },
+                {
+                  test: {definitions: "string"}
+                }
+            ]
+        },
         $ref: {
             schema: {
                 type: "object",
@@ -698,6 +749,7 @@
                         var result = self.validate(value);
                         if(result.length) {
                             console.error(num,'valid',j,JSON.stringify(result,null,2));
+                            $("#output").append("<div><strong>"+i+" test "+j+"</strong>:: Expected: [], Actual: "+JSON.stringify(result)+"</div>");
                         }
                         else {
                             console.log(num,'valid',j);
@@ -708,6 +760,8 @@
                         var result = self.validate(value);
                         if(!result.length) {
                             console.error(num,'invalid',j,JSON.stringify(result,null,2));
+                            $("#output").append("<div><strong>"+i+" test "+j+"</strong>:: Expected: errors, Actual: []</div>");
+
                         }
                         else {
                             var errors = [];
