vscode-json-languageservice 3.1.7 → 3.2.1

package/lib/umd/parser/jsonParser.js

@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
     var Json = require("jsonc-parser");
-    var objects = require("../utils/objects");
+    var objects_1 = require("../utils/objects");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     var nls = require("vscode-nls");
     var vscode_uri_1 = require("vscode-uri");
@@ -154,7 +154,7 @@ var __extends = (this && this.__extends) || (function () {
     }(ASTNodeImpl));
     exports.ObjectASTNodeImpl = ObjectASTNodeImpl;
     function asSchema(schema) {
-        if (typeof schema === 'boolean') {
+        if (objects_1.isBoolean(schema)) {
             return schema ? {} : { "not": {} };
         }
         return schema;
@@ -216,10 +216,10 @@ var __extends = (this && this.__extends) || (function () {
             return !!this.problems.length;
         };
         ValidationResult.prototype.mergeAll = function (validationResults) {
-            var _this = this;
-            validationResults.forEach(function (validationResult) {
-                _this.merge(validationResult);
-            });
+            for (var _i = 0, validationResults_1 = validationResults; _i < validationResults_1.length; _i++) {
+                var validationResult = validationResults_1[_i];
+                this.merge(validationResult);
+            }
         };
         ValidationResult.prototype.merge = function (validationResult) {
             this.problems = this.problems.concat(validationResult.problems);
@@ -380,9 +380,10 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             if (Array.isArray(schema.allOf)) {
-                schema.allOf.forEach(function (subSchemaRef) {
+                for (var _i = 0, _a = schema.allOf; _i < _a.length; _i++) {
+                    var subSchemaRef = _a[_i];
                     validate(node, asSchema(subSchemaRef), validationResult, matchingSchemas);
-                });
+                }
             }
             var notSchema = asSchema(schema.not);
             if (notSchema) {
@@ -396,16 +397,18 @@ var __extends = (this && this.__extends) || (function () {
                         message: localize('notSchemaWarning', "Matches a schema that is not allowed.")
                     });
                 }
-                subMatchingSchemas.schemas.forEach(function (ms) {
+                for (var _b = 0, _c = subMatchingSchemas.schemas; _b < _c.length; _b++) {
+                    var ms = _c[_b];
                     ms.inverted = !ms.inverted;
                     matchingSchemas.add(ms);
-                });
+                }
             }
             var testAlternatives = function (alternatives, maxOneMatch) {
                 var matches = [];
                 // remember the best match that is used for error messages
                 var bestMatch = null;
-                alternatives.forEach(function (subSchemaRef) {
+                for (var _i = 0, alternatives_1 = alternatives; _i < alternatives_1.length; _i++) {
+                    var subSchemaRef = alternatives_1[_i];
                     var subSchema = asSchema(subSchemaRef);
                     var subValidationResult = new ValidationResult();
                     var subMatchingSchemas = matchingSchemas.newSub();
@@ -436,7 +439,7 @@ var __extends = (this && this.__extends) || (function () {
                             }
                         }
                     }
-                });
+                }
                 if (matches.length > 1 && maxOneMatch) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: 1 },
@@ -459,10 +462,9 @@ var __extends = (this && this.__extends) || (function () {
                 testAlternatives(schema.oneOf, true);
             }
             var testBranch = function (schema) {
-                var subSchema = asSchema(schema);
                 var subValidationResult = new ValidationResult();
                 var subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, subSchema, subValidationResult, subMatchingSchemas);
+                validate(node, asSchema(schema), subValidationResult, subMatchingSchemas);
                 validationResult.merge(subValidationResult);
                 validationResult.propertiesMatches += subValidationResult.propertiesMatches;
                 validationResult.propertiesValueMatches += subValidationResult.propertiesValueMatches;
@@ -473,6 +475,7 @@ var __extends = (this && this.__extends) || (function () {
                 var subValidationResult = new ValidationResult();
                 var subMatchingSchemas = matchingSchemas.newSub();
                 validate(node, subSchema, subValidationResult, subMatchingSchemas);
+                matchingSchemas.merge(subMatchingSchemas);
                 if (!subValidationResult.hasProblems()) {
                     if (thenSchema) {
                         testBranch(thenSchema);
@@ -482,15 +485,16 @@ var __extends = (this && this.__extends) || (function () {
                     testBranch(elseSchema);
                 }
             };
-            if (schema.if) {
-                testCondition(schema.if, schema.then, schema.else);
+            var ifSchema = asSchema(schema.if);
+            if (ifSchema) {
+                testCondition(ifSchema, asSchema(schema.then), asSchema(schema.else));
             }
             if (Array.isArray(schema.enum)) {
                 var val = getNodeValue(node);
                 var enumValueMatch = false;
-                for (var _i = 0, _a = schema.enum; _i < _a.length; _i++) {
-                    var e = _a[_i];
-                    if (objects.equals(val, e)) {
+                for (var _d = 0, _e = schema.enum; _d < _e.length; _d++) {
+                    var e = _e[_d];
+                    if (objects_1.equals(val, e)) {
                         enumValueMatch = true;
                         break;
                     }
@@ -506,9 +510,9 @@ var __extends = (this && this.__extends) || (function () {
                     });
                 }
             }
-            if (schema.const) {
+            if (objects_1.isDefined(schema.const)) {
                 var val = getNodeValue(node);
-                if (!objects.equals(val, schema.const)) {
+                if (!objects_1.equals(val, schema.const)) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
                         severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
@@ -532,7 +536,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _validateNumberNode(node, schema, validationResult, matchingSchemas) {
             var val = node.value;
-            if (typeof schema.multipleOf === 'number') {
+            if (objects_1.isNumber(schema.multipleOf)) {
                 if (val % schema.multipleOf !== 0) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -542,22 +546,22 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             function getExclusiveLimit(limit, exclusive) {
-                if (typeof exclusive === 'number') {
+                if (objects_1.isNumber(exclusive)) {
                     return exclusive;
                 }
-                if (typeof exclusive === 'boolean' && exclusive) {
+                if (objects_1.isBoolean(exclusive) && exclusive) {
                     return limit;
                 }
                 return void 0;
             }
             function getLimit(limit, exclusive) {
-                if (typeof exclusive !== 'boolean' || !exclusive) {
+                if (!objects_1.isBoolean(exclusive) || !exclusive) {
                     return limit;
                 }
                 return void 0;
             }
             var exclusiveMinimum = getExclusiveLimit(schema.minimum, schema.exclusiveMinimum);
-            if (typeof exclusiveMinimum === 'number' && val <= exclusiveMinimum) {
+            if (objects_1.isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
@@ -565,7 +569,7 @@ var __extends = (this && this.__extends) || (function () {
                 });
             }
             var exclusiveMaximum = getExclusiveLimit(schema.maximum, schema.exclusiveMaximum);
-            if (typeof exclusiveMaximum === 'number' && val >= exclusiveMaximum) {
+            if (objects_1.isNumber(exclusiveMaximum) && val >= exclusiveMaximum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
@@ -573,7 +577,7 @@ var __extends = (this && this.__extends) || (function () {
                 });
             }
             var minimum = getLimit(schema.minimum, schema.exclusiveMinimum);
-            if (typeof minimum === 'number' && val < minimum) {
+            if (objects_1.isNumber(minimum) && val < minimum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
@@ -581,7 +585,7 @@ var __extends = (this && this.__extends) || (function () {
                 });
             }
             var maximum = getLimit(schema.maximum, schema.exclusiveMaximum);
-            if (typeof maximum === 'number' && val > maximum) {
+            if (objects_1.isNumber(maximum) && val > maximum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
@@ -590,21 +594,21 @@ var __extends = (this && this.__extends) || (function () {
             }
         }
         function _validateStringNode(node, schema, validationResult, matchingSchemas) {
-            if (schema.minLength && node.value.length < schema.minLength) {
+            if (objects_1.isNumber(schema.minLength) && node.value.length < schema.minLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
                     message: localize('minLengthWarning', 'String is shorter than the minimum length of {0}.', schema.minLength)
                 });
             }
-            if (schema.maxLength && node.value.length > schema.maxLength) {
+            if (objects_1.isNumber(schema.maxLength) && node.value.length > schema.maxLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
                     message: localize('maxLengthWarning', 'String is longer than the maximum length of {0}.', schema.maxLength)
                 });
             }
-            if (schema.pattern) {
+            if (objects_1.isString(schema.pattern)) {
                 var regex = new RegExp(schema.pattern);
                 if (!regex.test(node.value)) {
                     validationResult.problems.push({
@@ -671,8 +675,9 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _validateArrayNode(node, schema, validationResult, matchingSchemas) {
             if (Array.isArray(schema.items)) {
-                var subSchemas_1 = schema.items;
-                subSchemas_1.forEach(function (subSchemaRef, index) {
+                var subSchemas = schema.items;
+                for (var index = 0; index < subSchemas.length; index++) {
+                    var subSchemaRef = subSchemas[index];
                     var subSchema = asSchema(subSchemaRef);
                     var itemValidationResult = new ValidationResult();
                     var item = node.items[index];
@@ -680,13 +685,13 @@ var __extends = (this && this.__extends) || (function () {
                         validate(item, subSchema, itemValidationResult, matchingSchemas);
                         validationResult.mergePropertyMatch(itemValidationResult);
                     }
-                    else if (node.items.length >= subSchemas_1.length) {
+                    else if (node.items.length >= subSchemas.length) {
                         validationResult.propertiesValueMatches++;
                     }
-                });
-                if (node.items.length > subSchemas_1.length) {
+                }
+                if (node.items.length > subSchemas.length) {
                     if (typeof schema.additionalItems === 'object') {
-                        for (var i = subSchemas_1.length; i < node.items.length; i++) {
+                        for (var i = subSchemas.length; i < node.items.length; i++) {
                             var itemValidationResult = new ValidationResult();
                             validate(node.items[i], schema.additionalItems, itemValidationResult, matchingSchemas);
                             validationResult.mergePropertyMatch(itemValidationResult);
@@ -696,19 +701,20 @@ var __extends = (this && this.__extends) || (function () {
                         validationResult.problems.push({
                             location: { offset: node.offset, length: node.length },
                             severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
-                            message: localize('additionalItemsWarning', 'Array has too many items according to schema. Expected {0} or fewer.', subSchemas_1.length)
+                            message: localize('additionalItemsWarning', 'Array has too many items according to schema. Expected {0} or fewer.', subSchemas.length)
                         });
                     }
                 }
             }
             else {
-                var itemSchema_1 = asSchema(schema.items);
-                if (itemSchema_1) {
-                    node.items.forEach(function (item) {
+                var itemSchema = asSchema(schema.items);
+                if (itemSchema) {
+                    for (var _i = 0, _a = node.items; _i < _a.length; _i++) {
+                        var item = _a[_i];
                         var itemValidationResult = new ValidationResult();
-                        validate(item, itemSchema_1, itemValidationResult, matchingSchemas);
+                        validate(item, itemSchema, itemValidationResult, matchingSchemas);
                         validationResult.mergePropertyMatch(itemValidationResult);
-                    });
+                    }
                 }
             }
             var containsSchema = asSchema(schema.contains);
@@ -726,14 +732,14 @@ var __extends = (this && this.__extends) || (function () {
                     });
                 }
             }
-            if (schema.minItems && node.items.length < schema.minItems) {
+            if (objects_1.isNumber(schema.minItems) && node.items.length < schema.minItems) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
                     message: localize('minItemsWarning', 'Array has too few items. Expected {0} or more.', schema.minItems)
                 });
             }
-            if (schema.maxItems && node.items.length > schema.maxItems) {
+            if (objects_1.isNumber(schema.maxItems) && node.items.length > schema.maxItems) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
@@ -757,13 +763,15 @@ var __extends = (this && this.__extends) || (function () {
         function _validateObjectNode(node, schema, validationResult, matchingSchemas) {
             var seenKeys = Object.create(null);
             var unprocessedProperties = [];
-            node.properties.forEach(function (node) {
-                var key = node.keyNode.value;
-                seenKeys[key] = node.valueNode;
+            for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                var propertyNode = _a[_i];
+                var key = propertyNode.keyNode.value;
+                seenKeys[key] = propertyNode.valueNode;
                 unprocessedProperties.push(key);
-            });
+            }
             if (Array.isArray(schema.required)) {
-                schema.required.forEach(function (propertyName) {
+                for (var _b = 0, _c = schema.required; _b < _c.length; _b++) {
+                    var propertyName = _c[_b];
                     if (!seenKeys[propertyName]) {
                         var keyNode = node.parent && node.parent.type === 'property' && node.parent.keyNode;
                         var location = keyNode ? { offset: keyNode.offset, length: keyNode.length } : { offset: node.offset, length: 1 };
@@ -773,7 +781,7 @@ var __extends = (this && this.__extends) || (function () {
                             message: localize('MissingRequiredPropWarning', 'Missing property "{0}".', propertyName)
                         });
                     }
-                });
+                }
             }
             var propertyProcessed = function (prop) {
                 var index = unprocessedProperties.indexOf(prop);
@@ -783,12 +791,13 @@ var __extends = (this && this.__extends) || (function () {
                 }
             };
             if (schema.properties) {
-                Object.keys(schema.properties).forEach(function (propertyName) {
+                for (var _d = 0, _e = Object.keys(schema.properties); _d < _e.length; _d++) {
+                    var propertyName = _e[_d];
                     propertyProcessed(propertyName);
                     var propertySchema = schema.properties[propertyName];
                     var child = seenKeys[propertyName];
                     if (child) {
-                        if (typeof propertySchema === 'boolean') {
+                        if (objects_1.isBoolean(propertySchema)) {
                             if (!propertySchema) {
                                 var propertyNode = child.parent;
                                 validationResult.problems.push({
@@ -808,18 +817,20 @@ var __extends = (this && this.__extends) || (function () {
                             validationResult.mergePropertyMatch(propertyValidationResult);
                         }
                     }
-                });
+                }
             }
             if (schema.patternProperties) {
-                Object.keys(schema.patternProperties).forEach(function (propertyPattern) {
+                for (var _f = 0, _g = Object.keys(schema.patternProperties); _f < _g.length; _f++) {
+                    var propertyPattern = _g[_f];
                     var regex = new RegExp(propertyPattern);
-                    unprocessedProperties.slice(0).forEach(function (propertyName) {
+                    for (var _h = 0, _j = unprocessedProperties.slice(0); _h < _j.length; _h++) {
+                        var propertyName = _j[_h];
                         if (regex.test(propertyName)) {
                             propertyProcessed(propertyName);
                             var child = seenKeys[propertyName];
                             if (child) {
                                 var propertySchema = schema.patternProperties[propertyPattern];
-                                if (typeof propertySchema === 'boolean') {
+                                if (objects_1.isBoolean(propertySchema)) {
                                     if (!propertySchema) {
                                         var propertyNode = child.parent;
                                         validationResult.problems.push({
@@ -840,22 +851,24 @@ var __extends = (this && this.__extends) || (function () {
                                 }
                             }
                         }
-                    });
-                });
+                    }
+                }
             }
             if (typeof schema.additionalProperties === 'object') {
-                unprocessedProperties.forEach(function (propertyName) {
+                for (var _k = 0, unprocessedProperties_1 = unprocessedProperties; _k < unprocessedProperties_1.length; _k++) {
+                    var propertyName = unprocessedProperties_1[_k];
                     var child = seenKeys[propertyName];
                     if (child) {
                         var propertyValidationResult = new ValidationResult();
                         validate(child, schema.additionalProperties, propertyValidationResult, matchingSchemas);
                         validationResult.mergePropertyMatch(propertyValidationResult);
                     }
-                });
+                }
             }
             else if (schema.additionalProperties === false) {
                 if (unprocessedProperties.length > 0) {
-                    unprocessedProperties.forEach(function (propertyName) {
+                    for (var _l = 0, unprocessedProperties_2 = unprocessedProperties; _l < unprocessedProperties_2.length; _l++) {
+                        var propertyName = unprocessedProperties_2[_l];
                         var child = seenKeys[propertyName];
                         if (child) {
                             var propertyNode = child.parent;
@@ -865,10 +878,10 @@ var __extends = (this && this.__extends) || (function () {
                                 message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                             });
                         }
-                    });
+                    }
                 }
             }
-            if (schema.maxProperties) {
+            if (objects_1.isNumber(schema.maxProperties)) {
                 if (node.properties.length > schema.maxProperties) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -877,7 +890,7 @@ var __extends = (this && this.__extends) || (function () {
                     });
                 }
             }
-            if (schema.minProperties) {
+            if (objects_1.isNumber(schema.minProperties)) {
                 if (node.properties.length < schema.minProperties) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -887,12 +900,14 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             if (schema.dependencies) {
-                Object.keys(schema.dependencies).forEach(function (key) {
+                for (var _m = 0, _o = Object.keys(schema.dependencies); _m < _o.length; _m++) {
+                    var key = _o[_m];
                     var prop = seenKeys[key];
                     if (prop) {
                         var propertyDep = schema.dependencies[key];
                         if (Array.isArray(propertyDep)) {
-                            propertyDep.forEach(function (requiredProp) {
+                            for (var _p = 0, propertyDep_1 = propertyDep; _p < propertyDep_1.length; _p++) {
+                                var requiredProp = propertyDep_1[_p];
                                 if (!seenKeys[requiredProp]) {
                                     validationResult.problems.push({
                                         location: { offset: node.offset, length: node.length },
@@ -903,7 +918,7 @@ var __extends = (this && this.__extends) || (function () {
                                 else {
                                     validationResult.propertiesValueMatches++;
                                 }
-                            });
+                            }
                         }
                         else {
                             var propertySchema = asSchema(propertyDep);
@@ -914,16 +929,17 @@ var __extends = (this && this.__extends) || (function () {
                             }
                         }
                     }
-                });
+                }
             }
             var propertyNames = asSchema(schema.propertyNames);
             if (propertyNames) {
-                node.properties.forEach(function (f) {
+                for (var _q = 0, _r = node.properties; _q < _r.length; _q++) {
+                    var f = _r[_q];
                     var key = f.keyNode;
                     if (key) {
                         validate(key, propertyNames, validationResult, NoOpSchemaCollector.instance);
                     }
-                });
+                }
             }
         }
     }
@@ -1171,7 +1187,7 @@ var __extends = (this && this.__extends) || (function () {
                 var tokenValue = scanner.getTokenValue();
                 try {
                     var numberValue = JSON.parse(tokenValue);
-                    if (typeof numberValue !== 'number') {
+                    if (!objects_1.isNumber(numberValue)) {
                         return _error(localize('InvalidNumberFormat', 'Invalid number format.'), jsonLanguageTypes_1.ErrorCode.Undefined, node);
                     }
                     node.value = numberValue;