during recursion, shallow clone the config

instead of manually creating a new sub-config each time

Author: natesilva

lib/jayschema.js

@@ -169,6 +169,14 @@ JaySchema.prototype._validateImpl = function(instance, schema, resolutionScope,
 
   // run the tests
   var config = {
+    clone: function() {
+      var result = {};
+      var keys = Object.keys(this);
+      for (var index = 0, len = keys.length; index !== len; ++index) {
+        result[keys[index]] = this[keys[index]];
+      }
+      return result;
+    },
     inst: instance,
     schema: schema,
     resolutionScope: resolutionScope,

lib/suites/draft-04/keywords/_propertiesImpl.js

@@ -35,27 +35,25 @@ module.exports = function(config) {
     var applyAdditionalProperties = true;
 
     if (Object.prototype.hasOwnProperty.call(p, m)) {
-      subTestConfig = {
-        inst: config.inst[m],
-        schema: p[m],
-        resolutionScope: config.resolutionScope + '/properties/' + m,
-        instanceContext: context,
-        schemaRegistry: config.schemaRegistry
-      };
+      subTestConfig = config.clone();
+      subTestConfig.inst = config.inst[m];
+      subTestConfig.schema = p[m];
+      subTestConfig.resolutionScope =
+        config.resolutionScope + '/properties/' + m;
+      subTestConfig.instanceContext = context;
       errors = errors.concat(testRunner(subTestConfig));
       applyAdditionalProperties = false;
     }
 
     for (var y = 0; y < pp.length; ++y) {
       var rx = pp[y][0];
       if (m.match(rx)) {
-        subTestConfig = {
-          inst: config.inst[m],
-          schema: pp[y][1],
-          resolutionScope: config.resolutionScope + '/patternProperties/' + m,
-          instanceContext: context,
-          schemaRegistry: config.schemaRegistry
-        };
+        subTestConfig = config.clone();
+        subTestConfig.inst = config.inst[m];
+        subTestConfig.schema = pp[y][1];
+        subTestConfig.resolutionScope =
+          config.resolutionScope + '/patternProperties/' + m;
+        subTestConfig.instanceContext = context;
         errors = errors.concat(testRunner(subTestConfig));
         applyAdditionalProperties = false;
       }
@@ -68,13 +66,12 @@ module.exports = function(config) {
         errors.push(new Errors.ObjectValidationError(config.resolutionScope,
           config.instanceContext, 'additionalProperties', undefined, m, desc));
       } else if (additionalProperties !== true) {
-        subTestConfig = {
-          inst: config.inst[m],
-          schema: additionalProperties,
-          resolutionScope: config.resolutionScope + '/additionalProperties',
-          instanceContext: context,
-          schemaRegistry: config.schemaRegistry
-        };
+        subTestConfig = config.clone();
+        subTestConfig.inst = config.inst[m];
+        subTestConfig.schema = additionalProperties;
+        subTestConfig.resolutionScope =
+          config.resolutionScope + '/additionalProperties';
+        subTestConfig.instanceContext = context;
         errors = errors.concat(testRunner(subTestConfig));
       }
     }

lib/suites/draft-04/keywords/allOf.js

@@ -10,13 +10,9 @@ module.exports = function(config) {
   for (var index = 0; index < config.schema.allOf.length; ++index) {
     var schema = config.schema.allOf[index];
 
-    var subTestConfig = {
-      inst: config.inst,
-      schema: schema,
-      resolutionScope: config.resolutionScope + '/allOf/' + index,
-      instanceContext: config.instanceContext,
-      schemaRegistry: config.schemaRegistry
-    };
+    var subTestConfig = config.clone();
+    subTestConfig.schema = schema;
+    subTestConfig.resolutionScope = config.resolutionScope + '/allOf/' + index;
 
     errors = errors.concat(testRunner(subTestConfig));
   }

lib/suites/draft-04/keywords/anyOf.js

@@ -13,13 +13,9 @@ module.exports = function(config) {
 
   for (var index = 0, len = config.schema.anyOf.length; index !== len; ++index)
   {
-    var subTestConfig = {
-      inst: config.inst,
-      schema: config.schema.anyOf[index],
-      resolutionScope: config.resolutionScope + '/anyOf/' + index,
-      instanceContext: config.instanceContext,
-      schemaRegistry: config.schemaRegistry
-    };
+    var subTestConfig = config.clone();
+    subTestConfig.schema = config.schema.anyOf[index];
+    subTestConfig.resolutionScope = config.resolutionScope + '/anyOf/' + index;
 
     var nestedErrors = testRunner(subTestConfig);
 

lib/suites/draft-04/keywords/dependencies.js

@@ -42,13 +42,11 @@ module.exports = function(config) {
     } else {
       // schema dependency: validates the *instance*, not the value
       // associated with the property name.
-      var subTestConfig = {
-        inst: config.inst,
-        schema: dep,
-        resolutionScope: config.resolutionScope + '/dependencies/' + index,
-        instanceContext: config.instanceContext + '/' + key,
-        schemaRegistry: config.schemaRegistry
-      };
+      var subTestConfig = config.clone();
+      subTestConfig.schema = dep;
+      subTestConfig.resolutionScope =
+        config.resolutionScope + '/dependencies/' + index;
+      subTestConfig.instanceContext = config.instanceContext + '/' + key;
       errors = errors.concat(testRunner(subTestConfig));
     }
   }

lib/suites/draft-04/keywords/items.js

@@ -16,13 +16,12 @@ module.exports = function(config) {
       var item = config.inst[index];
       var itemSchema = config.schema.items[index];
 
-      subTestConfig = {
-        inst: item,
-        schema: itemSchema,
-        resolutionScope: config.resolutionScope + '/items/' + index,
-        instanceContext: config.instanceContext + '/' + index,
-        schemaRegistry: config.schemaRegistry
-      };
+      subTestConfig = config.clone();
+      subTestConfig.inst = item;
+      subTestConfig.schema = itemSchema;
+      subTestConfig.resolutionScope =
+        config.resolutionScope + '/items/' + index;
+      subTestConfig.instanceContext = config.instanceContext + '/' + index;
 
       errors = errors.concat(testRunner(subTestConfig));
     }
@@ -39,13 +38,12 @@ module.exports = function(config) {
              index < config.inst.length;
              ++index)
         {
-          subTestConfig = {
-            inst: config.inst[index],
-            schema: config.schema.additionalItems,
-            resolutionScope: config.resolutionScope + '/items/' + index,
-            instanceContext: config.instanceContext + '/' + index,
-            schemaRegistry: config.schemaRegistry
-          };
+          subTestConfig = config.clone();
+          subTestConfig.inst = config.inst[index];
+          subTestConfig.schema = config.schema.additionalItems;
+          subTestConfig.resolutionScope =
+            config.resolutionScope + '/items/' + index;
+          subTestConfig.instanceContext = config.instanceContext + '/' + index;
 
           errors = errors.concat(testRunner(subTestConfig));
         }
@@ -55,13 +53,11 @@ module.exports = function(config) {
   } else {
     // one schema for all items in the array
     for (index = 0; index < config.inst.length; ++index) {
-      subTestConfig = {
-        inst: config.inst[index],
-        schema: config.schema.items,
-        resolutionScope: config.resolutionScope + '/items',
-        instanceContext: config.instanceContext + '/' + index,
-        schemaRegistry: config.schemaRegistry
-      };
+      subTestConfig = config.clone();
+      subTestConfig.inst = config.inst[index];
+      subTestConfig.schema = config.schema.items;
+      subTestConfig.resolutionScope = config.resolutionScope + '/items';
+      subTestConfig.instanceContext = config.instanceContext + '/' + index;
 
       errors = errors.concat(testRunner(subTestConfig));
     }

lib/suites/draft-04/keywords/not.js

@@ -9,13 +9,9 @@ var Errors = require('../../../errors.js')
 module.exports = function(config) {
   var errors = [];
 
-  var subTestConfig = {
-    inst: config.inst,
-    schema: config.schema.not,
-    resolutionScope: config.resolutionScope + '/not',
-    instanceContext: config.instanceContext,
-    schemaRegistry: config.schemaRegistry
-  };
+  var subTestConfig = config.clone();
+  subTestConfig.schema = config.schema.not;
+  subTestConfig.resolutionScope = config.resolutionScope + '/not';
 
   if (testRunner(subTestConfig).length === 0) {
     var desc = 'validates against this schema; must NOT validate against ' +

lib/suites/draft-04/keywords/oneOf.js

@@ -12,13 +12,9 @@ module.exports = function(config) {
   var subSchemaErrors = {};
 
   for (var index = 0; index < config.schema.oneOf.length; ++index) {
-    var subTestConfig = {
-      inst: config.inst,
-      schema: config.schema.oneOf[index],
-      resolutionScope: config.resolutionScope + '/oneOf/' + index,
-      instanceContext: config.instanceContext,
-      schemaRegistry: config.schemaRegistry
-    };
+    var subTestConfig = config.clone();
+    subTestConfig.schema = config.schema.oneOf[index];
+    subTestConfig.resolutionScope = config.resolutionScope + '/oneOf/' + index;
 
     var nestedErrors = testRunner(subTestConfig);
     if (nestedErrors.length === 0) {