fix: do not add UNRESOLVABLE_REFERENCE when REMOTE_NOT_VALID is present

Author: zaggino

Diff for: .jscs.json

@@ -9,7 +9,6 @@
     "requireSpacesInAnonymousFunctionExpression":   { "beforeOpeningRoundBrace": true },
     "disallowSpacesInNamedFunctionExpression":      { "beforeOpeningRoundBrace": true },
     "requireBlocksOnNewline":                       1,
-    "disallowEmptyBlocks":                          true,
     "disallowSpacesInsideArrayBrackets":            "all",
     "disallowSpacesInsideParentheses":              true,
     "requireSpacesInsideObjectBrackets":            "all",

Diff for: .jshintrc

@@ -11,7 +11,7 @@
     "latedef": true,
     "newcap": false,
     "noarg": true,
-    "noempty": true,
+    "noempty": false,
     "nonbsp": true,
     "nonew": true,
     "plusplus": false,

Diff for: src/Report.js

@@ -97,6 +97,28 @@ Report.prototype.getPath = function () {
     return path;
 };
 
+Report.prototype.hasError = function (errorCode, params) {
+    var idx = this.errors.length;
+    while (idx--) {
+        if (this.errors[idx].code === errorCode) {
+            // assume match
+            var match = true;
+
+            // check the params too
+            var idx2 = this.errors[idx].params.length;
+            while (idx2--) {
+                if (this.errors[idx].params[idx2] !== params[idx2]) {
+                    match = false;
+                }
+            }
+
+            // if match, return true
+            if (match) { return match; }
+        }
+    }
+    return false;
+};
+
 Report.prototype.addError = function (errorCode, params, subReports, schemaDescription) {
     if (this.errors.length >= this.reportOptions.maxErrors) {
         return;

Diff for: src/SchemaCache.js

@@ -137,7 +137,7 @@ exports.getSchemaByUri = function (report, uri, root) {
 
     if (result && queryPath) {
         var parts = queryPath.split("/");
-        for (var idx = 0, lim = parts.length; idx < lim; idx++) {
+        for (var idx = 0, lim = parts.length; result && idx < lim; idx++) {
             var key = decodeJSONPointer(parts[idx]);
             if (idx === 0) { // it's an id
                 result = findId(result, key);

Diff for: src/SchemaCompilation.js

@@ -239,6 +239,7 @@ exports.compileSchema = function (report, schema) {
 
         if (!response) {
 
+            var hasNotValid = report.hasError("REMOTE_NOT_VALID", [refObj.ref]);
             var isAbsolute = Utils.isAbsoluteUri(refObj.ref);
             var isDownloaded = false;
             var ignoreUnresolvableRemotes = this.options.ignoreUnresolvableReferences === true;
@@ -249,7 +250,13 @@ exports.compileSchema = function (report, schema) {
                 isDownloaded = SchemaCache.checkCacheForUri.call(this, refObj.ref);
             }
 
-            if (!isAbsolute || !isDownloaded && !ignoreUnresolvableRemotes) {
+            if (hasNotValid) {
+                // already has REMOTE_NOT_VALID error for this one
+            } else if (ignoreUnresolvableRemotes && isAbsolute) {
+                // ignoreUnresolvableRemotes is on and remote isAbsolute
+            } else if (isDownloaded) {
+                // remote is downloaded, so no UNRESOLVABLE_REFERENCE
+            } else {
                 Array.prototype.push.apply(report.path, refObj.path);
                 report.addError("UNRESOLVABLE_REFERENCE", [refObj.ref]);
                 report.path.slice(0, -refObj.path.length);

Diff for: test/ZSchemaTestSuite/Issue126.js

@@ -0,0 +1,44 @@
+"use strict";
+
+var REF_NAME = "int.json";
+
+module.exports = {
+    description: "Issue #126 - do not add UNRESOLVABLE_REFERENCE error when set through setRemoteReference",
+    tests: [
+        {
+            description: "should fail compilation with unresolvable reference",
+            setup: function (validator) {
+                validator.setRemoteReference(REF_NAME, {
+                    "$schema": "http://json-schema.org/draft-04/schema#",
+                    "id": REF_NAME,
+                    "type": "object",
+                    "required": [
+                        "number"
+                    ],
+                    "properties": {
+                        "number": {
+                            "$ref": "data-types.json#/definitions/number"
+                        }
+                    }
+                });
+            },
+            schema: {
+                "$schema": "http://json-schema.org/draft-04/schema#",
+                "id": "ints.json",
+                "type": "array",
+                "items": {
+                    "$ref": REF_NAME
+                }
+            },
+            validateSchemaOnly: true,
+            valid: false,
+            after: function (err) {
+                err.forEach(function (e) {
+                    if (e.params.indexOf(REF_NAME) !== -1) {
+                        expect(e.code).not.toBe("UNRESOLVABLE_REFERENCE");
+                    }
+                });
+            }
+        }
+    ]
+};

Diff for: test/spec/ZSchemaTestSuiteSpec.js

@@ -61,6 +61,7 @@ var testSuiteFiles = [
     require("../ZSchemaTestSuite/Issue103.js"),
     require("../ZSchemaTestSuite/Issue106.js"),
     require("../ZSchemaTestSuite/Issue107.js"),
+    require("../ZSchemaTestSuite/Issue126.js"),
     undefined
 ];
 
@@ -73,8 +74,8 @@ describe("ZSchemaTestSuite", function () {
         }
     }
 
-    it("should contain 55 files", function () {
-        expect(testSuiteFiles.length).toBe(55);
+    it("should contain 56 files", function () {
+        expect(testSuiteFiles.length).toBe(56);
     });
 
     testSuiteFiles.forEach(function (testSuite) {