vscode-json-languageservice 4.2.0-next.0 → 4.2.0

package/lib/umd/parser/jsonParser.js

@@ -40,7 +40,10 @@ var __extends = (this && this.__extends) || (function () {
         'date-time': { errorMessage: localize('dateTimeFormatWarning', 'String is not a RFC3339 date-time.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
         'date': { errorMessage: localize('dateFormatWarning', 'String is not a RFC3339 date.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/i },
         'time': { errorMessage: localize('timeFormatWarning', 'String is not a RFC3339 time.'), pattern: /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
-        'email': { errorMessage: localize('emailFormatWarning', 'String is not an e-mail address.'), pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ }
+        'email': { errorMessage: localize('emailFormatWarning', 'String is not an e-mail address.'), pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}))$/ },
+        'hostname': { errorMessage: localize('hostnameFormatWarning', 'String is not a hostname.'), pattern: /^(?=.{1,253}\.?$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*\.?$/i },
+        'ipv4': { errorMessage: localize('ipv4FormatWarning', 'String is not an IPv4 address.'), pattern: /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/ },
+        'ipv6': { errorMessage: localize('ipv6FormatWarning', 'String is not an IPv6 address.'), pattern: /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i },
     };
     var ASTNodeImpl = /** @class */ (function () {
         function ASTNodeImpl(parent, offset, length) {
@@ -163,7 +166,7 @@ var __extends = (this && this.__extends) || (function () {
     }(ASTNodeImpl));
     exports.ObjectASTNodeImpl = ObjectASTNodeImpl;
     function asSchema(schema) {
-        if (objects_1.isBoolean(schema)) {
+        if ((0, objects_1.isBoolean)(schema)) {
             return schema ? {} : { "not": {} };
         }
         return schema;
@@ -499,7 +502,7 @@ var __extends = (this && this.__extends) || (function () {
                 var enumValueMatch = false;
                 for (var _d = 0, _e = schema.enum; _d < _e.length; _d++) {
                     var e = _e[_d];
-                    if (objects_1.equals(val, e)) {
+                    if ((0, objects_1.equals)(val, e)) {
                         enumValueMatch = true;
                         break;
                     }
@@ -514,9 +517,9 @@ var __extends = (this && this.__extends) || (function () {
                     });
                 }
             }
-            if (objects_1.isDefined(schema.const)) {
+            if ((0, objects_1.isDefined)(schema.const)) {
                 var val = getNodeValue(node);
-                if (!objects_1.equals(val, schema.const)) {
+                if (!(0, objects_1.equals)(val, schema.const)) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
                         code: jsonLanguageTypes_1.ErrorCode.EnumValueMismatch,
@@ -549,7 +552,7 @@ var __extends = (this && this.__extends) || (function () {
                 };
             }
             ;
-            if (objects_1.isNumber(schema.multipleOf)) {
+            if ((0, objects_1.isNumber)(schema.multipleOf)) {
                 var remainder = -1;
                 if (Number.isInteger(schema.multipleOf)) {
                     remainder = val % schema.multipleOf;
@@ -576,43 +579,43 @@ var __extends = (this && this.__extends) || (function () {
                 }
             }
             function getExclusiveLimit(limit, exclusive) {
-                if (objects_1.isNumber(exclusive)) {
+                if ((0, objects_1.isNumber)(exclusive)) {
                     return exclusive;
                 }
-                if (objects_1.isBoolean(exclusive) && exclusive) {
+                if ((0, objects_1.isBoolean)(exclusive) && exclusive) {
                     return limit;
                 }
                 return undefined;
             }
             function getLimit(limit, exclusive) {
-                if (!objects_1.isBoolean(exclusive) || !exclusive) {
+                if (!(0, objects_1.isBoolean)(exclusive) || !exclusive) {
                     return limit;
                 }
                 return undefined;
             }
             var exclusiveMinimum = getExclusiveLimit(schema.minimum, schema.exclusiveMinimum);
-            if (objects_1.isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
+            if ((0, objects_1.isNumber)(exclusiveMinimum) && val <= exclusiveMinimum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('exclusiveMinimumWarning', 'Value is below the exclusive minimum of {0}.', exclusiveMinimum)
                 });
             }
             var exclusiveMaximum = getExclusiveLimit(schema.maximum, schema.exclusiveMaximum);
-            if (objects_1.isNumber(exclusiveMaximum) && val >= exclusiveMaximum) {
+            if ((0, objects_1.isNumber)(exclusiveMaximum) && val >= exclusiveMaximum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('exclusiveMaximumWarning', 'Value is above the exclusive maximum of {0}.', exclusiveMaximum)
                 });
             }
             var minimum = getLimit(schema.minimum, schema.exclusiveMinimum);
-            if (objects_1.isNumber(minimum) && val < minimum) {
+            if ((0, objects_1.isNumber)(minimum) && val < minimum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('minimumWarning', 'Value is below the minimum of {0}.', minimum)
                 });
             }
             var maximum = getLimit(schema.maximum, schema.exclusiveMaximum);
-            if (objects_1.isNumber(maximum) && val > maximum) {
+            if ((0, objects_1.isNumber)(maximum) && val > maximum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('maximumWarning', 'Value is above the maximum of {0}.', maximum)
@@ -620,20 +623,20 @@ var __extends = (this && this.__extends) || (function () {
             }
         }
         function _validateStringNode(node, schema, validationResult, matchingSchemas) {
-            if (objects_1.isNumber(schema.minLength) && node.value.length < schema.minLength) {
+            if ((0, objects_1.isNumber)(schema.minLength) && node.value.length < schema.minLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('minLengthWarning', 'String is shorter than the minimum length of {0}.', schema.minLength)
                 });
             }
-            if (objects_1.isNumber(schema.maxLength) && node.value.length > schema.maxLength) {
+            if ((0, objects_1.isNumber)(schema.maxLength) && node.value.length > schema.maxLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('maxLengthWarning', 'String is longer than the maximum length of {0}.', schema.maxLength)
                 });
             }
-            if (objects_1.isString(schema.pattern)) {
-                var regex = strings_1.extendedRegExp(schema.pattern);
+            if ((0, objects_1.isString)(schema.pattern)) {
+                var regex = (0, strings_1.extendedRegExp)(schema.pattern);
                 if (!(regex === null || regex === void 0 ? void 0 : regex.test(node.value))) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -672,6 +675,9 @@ var __extends = (this && this.__extends) || (function () {
                     case 'date':
                     case 'time':
                     case 'email':
+                    case 'hostname':
+                    case 'ipv4':
+                    case 'ipv6':
                         var format = formats[schema.format];
                         if (!node.value || !format.pattern.exec(node.value)) {
                             validationResult.problems.push({
@@ -740,13 +746,13 @@ var __extends = (this && this.__extends) || (function () {
                     });
                 }
             }
-            if (objects_1.isNumber(schema.minItems) && node.items.length < schema.minItems) {
+            if ((0, objects_1.isNumber)(schema.minItems) && node.items.length < schema.minItems) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('minItemsWarning', 'Array has too few items. Expected {0} or more.', schema.minItems)
                 });
             }
-            if (objects_1.isNumber(schema.maxItems) && node.items.length > schema.maxItems) {
+            if ((0, objects_1.isNumber)(schema.maxItems) && node.items.length > schema.maxItems) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('maxItemsWarning', 'Array has too many items. Expected {0} or fewer.', schema.maxItems)
@@ -801,7 +807,7 @@ var __extends = (this && this.__extends) || (function () {
                     var propertySchema = schema.properties[propertyName];
                     var child = seenKeys[propertyName];
                     if (child) {
-                        if (objects_1.isBoolean(propertySchema)) {
+                        if ((0, objects_1.isBoolean)(propertySchema)) {
                             if (!propertySchema) {
                                 var propertyNode = child.parent;
                                 validationResult.problems.push({
@@ -825,7 +831,7 @@ var __extends = (this && this.__extends) || (function () {
             if (schema.patternProperties) {
                 for (var _f = 0, _g = Object.keys(schema.patternProperties); _f < _g.length; _f++) {
                     var propertyPattern = _g[_f];
-                    var regex = strings_1.extendedRegExp(propertyPattern);
+                    var regex = (0, strings_1.extendedRegExp)(propertyPattern);
                     for (var _h = 0, _j = unprocessedProperties.slice(0); _h < _j.length; _h++) {
                         var propertyName = _j[_h];
                         if (regex === null || regex === void 0 ? void 0 : regex.test(propertyName)) {
@@ -833,7 +839,7 @@ var __extends = (this && this.__extends) || (function () {
                             var child = seenKeys[propertyName];
                             if (child) {
                                 var propertySchema = schema.patternProperties[propertyPattern];
-                                if (objects_1.isBoolean(propertySchema)) {
+                                if ((0, objects_1.isBoolean)(propertySchema)) {
                                     if (!propertySchema) {
                                         var propertyNode = child.parent;
                                         validationResult.problems.push({
@@ -882,7 +888,7 @@ var __extends = (this && this.__extends) || (function () {
                     }
                 }
             }
-            if (objects_1.isNumber(schema.maxProperties)) {
+            if ((0, objects_1.isNumber)(schema.maxProperties)) {
                 if (node.properties.length > schema.maxProperties) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -890,7 +896,7 @@ var __extends = (this && this.__extends) || (function () {
                     });
                 }
             }
-            if (objects_1.isNumber(schema.minProperties)) {
+            if ((0, objects_1.isNumber)(schema.minProperties)) {
                 if (node.properties.length < schema.minProperties) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -1186,7 +1192,7 @@ var __extends = (this && this.__extends) || (function () {
                 var tokenValue = scanner.getTokenValue();
                 try {
                     var numberValue = JSON.parse(tokenValue);
-                    if (!objects_1.isNumber(numberValue)) {
+                    if (!(0, objects_1.isNumber)(numberValue)) {
                         return _error(localize('InvalidNumberFormat', 'Invalid number format.'), jsonLanguageTypes_1.ErrorCode.Undefined, node);
                     }
                     node.value = numberValue;

package/lib/umd/services/configuration.js

@@ -534,7 +534,7 @@
                 propertyObject['description'] = description;
             }
             else {
-                console.log(property + ": localize('schema.json." + property + "', \"\")");
+                console.log("".concat(property, ": localize('schema.json.").concat(property, "', \"\")"));
             }
         }
     }

package/lib/umd/services/jsonCompletion.js

@@ -230,7 +230,7 @@
                                 if (propertySchema.suggestSortText !== undefined) {
                                     proposal.sortText = propertySchema.suggestSortText;
                                 }
-                                if (proposal.insertText && strings_1.endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                                if (proposal.insertText && (0, strings_1.endsWith)(proposal.insertText, "$1".concat(separatorAfter))) {
                                     proposal.command = {
                                         title: 'Suggest',
                                         command: 'editor.action.triggerSuggest'
@@ -255,7 +255,7 @@
                             if (schemaPropertyNames_1.suggestSortText !== undefined) {
                                 proposal.sortText = schemaPropertyNames_1.suggestSortText;
                             }
-                            if (proposal.insertText && strings_1.endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                            if (proposal.insertText && (0, strings_1.endsWith)(proposal.insertText, "$1".concat(separatorAfter))) {
                                 proposal.command = {
                                     title: 'Suggest',
                                     command: 'editor.action.triggerSuggest'
@@ -451,7 +451,7 @@
                             if (s.schema.patternProperties && !propertyMatched) {
                                 for (var _a = 0, _b = Object.keys(s.schema.patternProperties); _a < _b.length; _a++) {
                                     var pattern = _b[_a];
-                                    var regex = strings_1.extendedRegExp(pattern);
+                                    var regex = (0, strings_1.extendedRegExp)(pattern);
                                     if (regex === null || regex === void 0 ? void 0 : regex.test(parentKey)) {
                                         propertyMatched = true;
                                         var propertySchema = s.schema.patternProperties[pattern];
@@ -527,7 +527,7 @@
             var _this = this;
             if (arrayDepth === void 0) { arrayDepth = 0; }
             var hasProposals = false;
-            if (objects_1.isDefined(schema.default)) {
+            if ((0, objects_1.isDefined)(schema.default)) {
                 var type = schema.type;
                 var value = schema.default;
                 for (var i = arrayDepth; i > 0; i--) {
@@ -567,7 +567,7 @@
                     var label = s.label;
                     var insertText;
                     var filterText;
-                    if (objects_1.isDefined(value)) {
+                    if ((0, objects_1.isDefined)(value)) {
                         var type_1 = schema.type;
                         for (var i = arrayDepth; i > 0; i--) {
                             value = [value];
@@ -608,7 +608,7 @@
             }
         };
         JSONCompletion.prototype.addEnumValueCompletions = function (schema, separatorAfter, collector) {
-            if (objects_1.isDefined(schema.const)) {
+            if ((0, objects_1.isDefined)(schema.const)) {
                 collector.add({
                     kind: this.getSuggestionKind(schema.type),
                     label: this.getLabelForValue(schema.const),
@@ -638,7 +638,7 @@
             }
         };
         JSONCompletion.prototype.collectTypes = function (schema, types) {
-            if (Array.isArray(schema.enum) || objects_1.isDefined(schema.const)) {
+            if (Array.isArray(schema.enum) || (0, objects_1.isDefined)(schema.const)) {
                 return;
             }
             var type = schema.type;
@@ -735,7 +735,7 @@
                 }
                 return JSON.stringify(value);
             };
-            return json_1.stringifyObject(value, '', replacer) + separatorAfter;
+            return (0, json_1.stringifyObject)(value, '', replacer) + separatorAfter;
         };
         JSONCompletion.prototype.getInsertTextForGuessedValue = function (value, separatorAfter) {
             switch (typeof value) {
@@ -804,7 +804,7 @@
                 if (Array.isArray(propertySchema.defaultSnippets)) {
                     if (propertySchema.defaultSnippets.length === 1) {
                         var body = propertySchema.defaultSnippets[0].body;
-                        if (objects_1.isDefined(body)) {
+                        if ((0, objects_1.isDefined)(body)) {
                             value = this.getInsertTextForSnippetValue(body, '');
                         }
                     }
@@ -816,7 +816,7 @@
                     }
                     nValueProposals += propertySchema.enum.length;
                 }
-                if (objects_1.isDefined(propertySchema.default)) {
+                if ((0, objects_1.isDefined)(propertySchema.default)) {
                     if (!value) {
                         value = this.getInsertTextForGuessedValue(propertySchema.default, '');
                     }
@@ -928,14 +928,14 @@
             return undefined;
         };
         JSONCompletion.prototype.doesSupportMarkdown = function () {
-            if (!objects_1.isDefined(this.supportsMarkdown)) {
+            if (!(0, objects_1.isDefined)(this.supportsMarkdown)) {
                 var completion = this.clientCapabilities.textDocument && this.clientCapabilities.textDocument.completion;
                 this.supportsMarkdown = completion && completion.completionItem && Array.isArray(completion.completionItem.documentationFormat) && completion.completionItem.documentationFormat.indexOf(jsonLanguageTypes_1.MarkupKind.Markdown) !== -1;
             }
             return this.supportsMarkdown;
         };
         JSONCompletion.prototype.doesSupportsCommitCharacters = function () {
-            if (!objects_1.isDefined(this.supportsCommitCharacters)) {
+            if (!(0, objects_1.isDefined)(this.supportsCommitCharacters)) {
                 var completion = this.clientCapabilities.textDocument && this.clientCapabilities.textDocument.completion;
                 this.supportsCommitCharacters = completion && completion.completionItem && !!completion.completionItem.commitCharactersSupport;
             }

package/lib/umd/services/jsonDocumentSymbols.js

@@ -214,7 +214,7 @@
             if (name && name.trim()) {
                 return name;
             }
-            return "\"" + name + "\"";
+            return "\"".concat(name, "\"");
         };
         JSONDocumentSymbols.prototype.getDetail = function (node) {
             if (!node) {
@@ -245,7 +245,7 @@
                         if (!s.inverted && s.schema && (s.schema.format === 'color' || s.schema.format === 'color-hex') && s.node && s.node.type === 'string') {
                             var nodeId = String(s.node.offset);
                             if (!visitedNode[nodeId]) {
-                                var color = colors_1.colorFromHex(Parser.getNodeValue(s.node));
+                                var color = (0, colors_1.colorFromHex)(Parser.getNodeValue(s.node));
                                 if (color) {
                                     var range = getRange(document, s.node);
                                     result.push({ color: color, range: range });
@@ -274,10 +274,10 @@
             }
             var label;
             if (color.alpha === 1) {
-                label = "#" + toTwoDigitHex(red256) + toTwoDigitHex(green256) + toTwoDigitHex(blue256);
+                label = "#".concat(toTwoDigitHex(red256)).concat(toTwoDigitHex(green256)).concat(toTwoDigitHex(blue256));
             }
             else {
-                label = "#" + toTwoDigitHex(red256) + toTwoDigitHex(green256) + toTwoDigitHex(blue256) + toTwoDigitHex(Math.round(color.alpha * 255));
+                label = "#".concat(toTwoDigitHex(red256)).concat(toTwoDigitHex(green256)).concat(toTwoDigitHex(blue256)).concat(toTwoDigitHex(Math.round(color.alpha * 255)));
             }
             result.push({ label: label, textEdit: jsonLanguageTypes_1.TextEdit.replace(range, JSON.stringify(label)) });
             return result;

package/lib/umd/services/jsonFolding.js

@@ -21,7 +21,7 @@
         var nestingLevels = [];
         var stack = [];
         var prevStart = -1;
-        var scanner = jsonc_parser_1.createScanner(document.getText(), false);
+        var scanner = (0, jsonc_parser_1.createScanner)(document.getText(), false);
         var token = scanner.scan();
         function addRange(range) {
             ranges.push(range);

package/lib/umd/services/jsonHover.js

@@ -98,7 +98,7 @@
                         if (result.length > 0) {
                             result += "\n\n";
                         }
-                        result += "`" + toMarkdownCodeBlock(enumValue_1) + "`: " + markdownEnumValueDescription_1;
+                        result += "`".concat(toMarkdownCodeBlock(enumValue_1), "`: ").concat(markdownEnumValueDescription_1);
                     }
                     return createHover([result]);
                 }

package/lib/umd/services/jsonLinks.js

@@ -25,7 +25,7 @@
                 if (targetNode) {
                     var targetPos = document.positionAt(targetNode.offset);
                     links.push({
-                        target: document.uri + "#" + (targetPos.line + 1) + "," + (targetPos.character + 1),
+                        target: "".concat(document.uri, "#").concat(targetPos.line + 1, ",").concat(targetPos.character + 1),
                         range: createRange(document, node.valueNode)
                     });
                 }