z-schema 3.18.4 → 3.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "z-schema",
-  "version": "3.18.4",
+  "version": "3.19.0",
   "description": "JSON schema validator",
   "homepage": "https://github.com/zaggino/z-schema",
   "authors": [
@@ -60,26 +60,26 @@
   "dependencies": {
     "lodash.get": "^4.0.0",
     "lodash.isequal": "^4.0.0",
-    "validator": "^8.0.0"
+    "validator": "^9.0.0"
   },
   "optionalDependencies": {
     "commander": "^2.7.1"
   },
   "devDependencies": {
-    "coveralls": "latest",
+    "coveralls": "^3.0.0",
     "grunt": "^1.0.1",
-    "grunt-cli": "latest",
     "grunt-browserify": "^5.2.0",
-    "grunt-contrib-copy": "latest",
-    "grunt-contrib-jasmine": "latest",
-    "grunt-contrib-jshint": "latest",
-    "grunt-contrib-uglify": "latest",
-    "grunt-jasmine-node": "latest",
-    "grunt-jasmine-node-coverage": "^1.2.0",
-    "grunt-jscs": "latest",
-    "grunt-lineending": "latest",
-    "jasmine-node": "latest",
-    "jasmine-reporters": "latest",
-    "remapify": "latest"
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-jasmine": "^1.1.0",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-uglify": "^3.1.0",
+    "grunt-jasmine-node": "^0.3.1",
+    "grunt-jasmine-node-coverage": "^2.0.1",
+    "grunt-jscs": "^3.0.1",
+    "grunt-lineending": "^1.0.0",
+    "jasmine-node": "^1.14.5",
+    "jasmine-reporters": "^2.2.1",
+    "remapify": "^2.1.0"
   }
 }

package/src/SchemaCache.js

@@ -121,7 +121,15 @@ exports.getSchemaByUri = function (report, uri, root) {
 
             var remoteReport = new Report(report);
             if (SchemaCompilation.compileSchema.call(this, remoteReport, result)) {
-                SchemaValidation.validateSchema.call(this, remoteReport, result);
+                var savedOptions = this.options;
+                try {
+                    // If custom validationOptions were provided to setRemoteReference(),
+                    // use them instead of the default options
+                    this.options = result.__$validationOptions || this.options;
+                    SchemaValidation.validateSchema.call(this, remoteReport, result);
+                } finally {
+                    this.options = savedOptions;
+                }
             }
             var remoteReportIsValid = remoteReport.isValid();
             if (!remoteReportIsValid) {

package/src/ZSchema.js

@@ -60,15 +60,8 @@ var defaultOptions = {
     customValidator: null
 };
 
-/*
-    constructor
-*/
-function ZSchema(options) {
-    this.cache = {};
-    this.referenceCache = [];
-
-    this.setRemoteReference("http://json-schema.org/draft-04/schema", Draft4Schema);
-    this.setRemoteReference("http://json-schema.org/draft-04/hyper-schema", Draft4HyperSchema);
+function normalizeOptions(options) {
+    var normalized;
 
     // options
     if (typeof options === "object") {
@@ -94,22 +87,39 @@ function ZSchema(options) {
             }
         }
 
-        this.options = options;
+        normalized = options;
     } else {
-        this.options = Utils.clone(defaultOptions);
+        normalized = Utils.clone(defaultOptions);
     }
 
-    if (this.options.strictMode === true) {
-        this.options.forceAdditional  = true;
-        this.options.forceItems       = true;
-        this.options.forceMaxLength   = true;
-        this.options.forceProperties  = true;
-        this.options.noExtraKeywords  = true;
-        this.options.noTypeless       = true;
-        this.options.noEmptyStrings   = true;
-        this.options.noEmptyArrays    = true;
+    if (normalized.strictMode === true) {
+        normalized.forceAdditional  = true;
+        normalized.forceItems       = true;
+        normalized.forceMaxLength   = true;
+        normalized.forceProperties  = true;
+        normalized.noExtraKeywords  = true;
+        normalized.noTypeless       = true;
+        normalized.noEmptyStrings   = true;
+        normalized.noEmptyArrays    = true;
     }
 
+    return normalized;
+}
+
+/*
+    constructor
+*/
+function ZSchema(options) {
+    this.cache = {};
+    this.referenceCache = [];
+
+    this.options = normalizeOptions(options);
+
+    // Disable strict validation for the built-in schemas
+    var metaschemaOptions = normalizeOptions({ });
+
+    this.setRemoteReference("http://json-schema.org/draft-04/schema", Draft4Schema, metaschemaOptions);
+    this.setRemoteReference("http://json-schema.org/draft-04/hyper-schema", Draft4HyperSchema, metaschemaOptions);
 }
 
 /*
@@ -257,12 +267,17 @@ ZSchema.prototype.getMissingRemoteReferences = function () {
     }
     return missingRemoteReferences;
 };
-ZSchema.prototype.setRemoteReference = function (uri, schema) {
+ZSchema.prototype.setRemoteReference = function (uri, schema, validationOptions) {
     if (typeof schema === "string") {
         schema = JSON.parse(schema);
     } else {
         schema = Utils.cloneDeep(schema);
     }
+
+    if (validationOptions) {
+        schema.__$validationOptions = normalizeOptions(validationOptions);
+    }
+
     SchemaCache.cacheSchemaByUri.call(this, uri, schema);
 };
 ZSchema.prototype.getResolvedSchema = function (schema) {