vscode-json-languageservice 4.2.0-next.2 → 4.2.1

package/lib/esm/services/configuration.js

@@ -522,7 +522,7 @@ for (var schemaName in schemaContributions.schemas) {
             propertyObject['description'] = description;
         }
         else {
-            console.log(property + ": localize('schema.json." + property + "', \"\")");
+            console.log("".concat(property, ": localize('schema.json.").concat(property, "', \"\")"));
         }
     }
 }

package/lib/esm/services/jsonCompletion.js

@@ -218,7 +218,7 @@ var JSONCompletion = /** @class */ (function () {
                             if (propertySchema.suggestSortText !== undefined) {
                                 proposal.sortText = propertySchema.suggestSortText;
                             }
-                            if (proposal.insertText && endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                            if (proposal.insertText && endsWith(proposal.insertText, "$1".concat(separatorAfter))) {
                                 proposal.command = {
                                     title: 'Suggest',
                                     command: 'editor.action.triggerSuggest'
@@ -243,7 +243,7 @@ var JSONCompletion = /** @class */ (function () {
                         if (schemaPropertyNames_1.suggestSortText !== undefined) {
                             proposal.sortText = schemaPropertyNames_1.suggestSortText;
                         }
-                        if (proposal.insertText && endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                        if (proposal.insertText && endsWith(proposal.insertText, "$1".concat(separatorAfter))) {
                             proposal.command = {
                                 title: 'Suggest',
                                 command: 'editor.action.triggerSuggest'

package/lib/esm/services/jsonDocumentSymbols.js

@@ -202,7 +202,7 @@ var JSONDocumentSymbols = /** @class */ (function () {
         if (name && name.trim()) {
             return name;
         }
-        return "\"" + name + "\"";
+        return "\"".concat(name, "\"");
     };
     JSONDocumentSymbols.prototype.getDetail = function (node) {
         if (!node) {
@@ -262,10 +262,10 @@ var JSONDocumentSymbols = /** @class */ (function () {
         }
         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: TextEdit.replace(range, JSON.stringify(label)) });
         return result;

package/lib/esm/services/jsonHover.js

@@ -86,7 +86,7 @@ var JSONHover = /** @class */ (function () {
                     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/esm/services/jsonLinks.js

@@ -13,7 +13,7 @@ export function findLinks(document, doc) {
             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)
                 });
             }

package/lib/esm/services/jsonSchemaService.js

@@ -59,7 +59,7 @@ var SchemaHandle = /** @class */ (function () {
         this.service = service;
         this.uri = uri;
         this.dependencies = new Set();
-        this.anchors = new Map();
+        this.anchors = undefined;
         if (unresolvedSchemaContent) {
             this.unresolvedSchema = this.service.promise.resolve(new UnresolvedSchema(unresolvedSchemaContent));
         }
@@ -84,7 +84,7 @@ var SchemaHandle = /** @class */ (function () {
         this.resolvedSchema = undefined;
         this.unresolvedSchema = undefined;
         this.dependencies.clear();
-        this.anchors.clear();
+        this.anchors = undefined;
         return hasChanges;
     };
     return SchemaHandle;
@@ -309,13 +309,11 @@ var JSONSchemaService = /** @class */ (function () {
             }
         }
         var contextService = this.contextService;
-        var findSection = function (schema, path) {
-            if (!path) {
-                return schema;
-            }
+        var findSectionByJSONPointer = function (schema, path) {
+            path = decodeURIComponent(path);
             var current = schema;
             if (path[0] === '/') {
-                path = path.substr(1);
+                path = path.substring(1);
             }
             path.split('/').some(function (part) {
                 part = part.replace(/~1/g, '/').replace(/~0/g, '~');
@@ -324,54 +322,39 @@ var JSONSchemaService = /** @class */ (function () {
             });
             return current;
         };
+        var findSchemaById = function (schema, handle, id) {
+            if (!handle.anchors) {
+                handle.anchors = collectAnchors(schema);
+            }
+            return handle.anchors.get(id);
+        };
         var merge = function (target, section) {
             for (var key in section) {
-                if (section.hasOwnProperty(key) && !target.hasOwnProperty(key)) {
+                if (section.hasOwnProperty(key) && !target.hasOwnProperty(key) && key !== 'id' && key !== '$id') {
                     target[key] = section[key];
                 }
             }
         };
-        var mergeByJsonPointer = function (target, sourceRoot, sourceURI, refSegment) {
-            var path = refSegment ? decodeURIComponent(refSegment) : undefined;
-            var section = findSection(sourceRoot, path);
+        var mergeRef = function (target, sourceRoot, sourceHandle, refSegment) {
+            var section;
+            if (refSegment === undefined || refSegment.length === 0) {
+                section = sourceRoot;
+            }
+            else if (refSegment.charAt(0) === '/') {
+                // A $ref to a JSON Pointer (i.e #/definitions/foo)
+                section = findSectionByJSONPointer(sourceRoot, refSegment);
+            }
+            else {
+                // A $ref to a sub-schema with an $id (i.e #hello)
+                section = findSchemaById(sourceRoot, sourceHandle, refSegment);
+            }
             if (section) {
                 merge(target, section);
             }
             else {
-                resolveErrors.push(localize('json.schema.invalidref', '$ref \'{0}\' in \'{1}\' can not be resolved.', path, sourceURI));
+                resolveErrors.push(localize('json.schema.invalidid', '$ref \'{0}\' in \'{1}\' can not be resolved.', refSegment, sourceHandle.uri));
             }
         };
-        var isSubSchemaRef = function (refSegment) {
-            // Check if the first character is not '/' to determine whether it's a sub schema reference or a JSON Pointer
-            return !!refSegment && refSegment.charAt(0) !== '/';
-        };
-        var reconstructRefURI = function (uri, fragment, separator) {
-            if (separator === void 0) { separator = '#'; }
-            return normalizeId("" + uri + separator + fragment);
-        };
-        // To find which $refs point to which $ids we keep two maps:
-        // pendingSubSchemas '$id' we expect to encounter (if they exist)
-        // handle.anchors for the ones we have encountered
-        var pendingSubSchemas = new Map();
-        var tryMergeSubSchema = function (target, id, handle) {
-            // Get the full URI for the current schema to avoid matching schema1#hello and schema2#hello to the same
-            // reference by accident
-            var fullId = reconstructRefURI(handle.uri, id);
-            var resolved = handle.anchors.get(fullId);
-            if (resolved) {
-                merge(target, resolved);
-                return true; // return success
-            }
-            // This subschema has not been resolved yet
-            // Remember the target to merge later once resolved
-            var pending = pendingSubSchemas.get(fullId);
-            if (!pending) {
-                pending = [];
-                pendingSubSchemas.set(fullId, pending);
-            }
-            pending.push(target);
-            return false; // return failure - merge didn't occur
-        };
         var resolveExternalLink = function (node, uri, refSegment, parentHandle) {
             if (contextService && !/^[A-Za-z][A-Za-z0-9+\-.+]*:\/\/.*/.test(uri)) {
                 uri = contextService.resolveRelativePath(uri, parentHandle.uri);
@@ -384,79 +367,13 @@ var JSONSchemaService = /** @class */ (function () {
                     var loc = refSegment ? uri + '#' + refSegment : uri;
                     resolveErrors.push(localize('json.schema.problemloadingref', 'Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0]));
                 }
-                // A placeholder promise that might execute later a ref resolution for the newly resolved schema
-                var externalLinkPromise = Promise.resolve(true);
-                if (refSegment === undefined || !isSubSchemaRef(refSegment)) {
-                    // This is not a sub schema, merge the regular way
-                    mergeByJsonPointer(node, unresolvedSchema.schema, uri, refSegment);
-                }
-                else {
-                    // This is a reference to a subschema
-                    if (!tryMergeSubSchema(node, refSegment, referencedHandle)) {
-                        // We weren't able to merge currently so we'll try to resolve this schema first to obtain subschemas
-                        // that could be missed
-                        // to improve: it would be enough to find the nodes, no need to resolve the full schema
-                        externalLinkPromise = resolveRefs(unresolvedSchema.schema, unresolvedSchema.schema, referencedHandle);
-                    }
-                }
-                return externalLinkPromise.then(function () { return resolveRefs(node, unresolvedSchema.schema, referencedHandle); });
+                mergeRef(node, unresolvedSchema.schema, referencedHandle, refSegment);
+                return resolveRefs(node, unresolvedSchema.schema, referencedHandle);
             });
         };
         var resolveRefs = function (node, parentSchema, parentHandle) {
-            if (!node || typeof node !== 'object') {
-                return Promise.resolve(null);
-            }
-            var toWalk = [node];
-            var seen = new Set();
             var openPromises = [];
-            var collectEntries = function () {
-                var entries = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    entries[_i] = arguments[_i];
-                }
-                for (var _a = 0, entries_1 = entries; _a < entries_1.length; _a++) {
-                    var entry = entries_1[_a];
-                    if (typeof entry === 'object') {
-                        toWalk.push(entry);
-                    }
-                }
-            };
-            var collectMapEntries = function () {
-                var maps = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    maps[_i] = arguments[_i];
-                }
-                for (var _a = 0, maps_1 = maps; _a < maps_1.length; _a++) {
-                    var map = maps_1[_a];
-                    if (typeof map === 'object') {
-                        for (var k in map) {
-                            var key = k;
-                            var entry = map[key];
-                            if (typeof entry === 'object') {
-                                toWalk.push(entry);
-                            }
-                        }
-                    }
-                }
-            };
-            var collectArrayEntries = function () {
-                var arrays = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    arrays[_i] = arguments[_i];
-                }
-                for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) {
-                    var array = arrays_1[_a];
-                    if (Array.isArray(array)) {
-                        for (var _b = 0, array_1 = array; _b < array_1.length; _b++) {
-                            var entry = array_1[_b];
-                            if (typeof entry === 'object') {
-                                toWalk.push(entry);
-                            }
-                        }
-                    }
-                }
-            };
-            var handleRef = function (next) {
+            _this.traverseNodes(node, function (next) {
                 var seenRefs = new Set();
                 while (next.$ref) {
                     var ref = next.$ref;
@@ -471,67 +388,102 @@ var JSONSchemaService = /** @class */ (function () {
                         // This is a reference inside the current schema
                         if (!seenRefs.has(ref)) {
                             var id = segments[1];
-                            if (id !== undefined && isSubSchemaRef(id)) { // A $ref to a sub-schema with an $id (i.e #hello)
-                                tryMergeSubSchema(next, id, handle);
-                            }
-                            else { // A $ref to a JSON Pointer (i.e #/definitions/foo)
-                                mergeByJsonPointer(next, parentSchema, parentHandle.uri, id); // can set next.$ref again, use seenRefs to avoid circle
-                            }
+                            mergeRef(next, parentSchema, parentHandle, id);
                             seenRefs.add(ref);
                         }
                     }
                 }
-                collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
-                collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
-                collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
-            };
-            var handleId = function (next) {
-                // TODO figure out should loops be preventse
+            });
+            return _this.promise.all(openPromises);
+        };
+        var collectAnchors = function (root) {
+            var result = new Map();
+            _this.traverseNodes(root, function (next) {
                 var id = next.$id || next.id;
                 if (typeof id === 'string' && id.charAt(0) === '#') {
-                    delete next.$id;
-                    delete next.id;
-                    // Use a blank separator, as the $id already has the '#'
-                    var fullId = reconstructRefURI(parentHandle.uri, id, '');
-                    var resolved = parentHandle.anchors.get(fullId);
-                    if (!resolved) {
-                        // it's resolved now
-                        parentHandle.anchors.set(fullId, next);
-                    }
-                    else if (resolved !== next) {
-                        // Duplicate may occur in recursive $refs, but as long as they are the same object
-                        // it's ok, otherwise report and error
+                    // delete next.$id;
+                    // delete next.id;
+                    var anchor = id.substring(1);
+                    if (result.has(anchor)) {
                         resolveErrors.push(localize('json.schema.duplicateid', 'Duplicate id declaration: \'{0}\'', id));
                     }
-                    // Resolve all pending requests and cleanup the queue list
-                    var pending = pendingSubSchemas.get(fullId);
-                    if (pending) {
-                        for (var _i = 0, pending_1 = pending; _i < pending_1.length; _i++) {
-                            var target = pending_1[_i];
-                            merge(target, next);
+                    else {
+                        result.set(anchor, next);
+                    }
+                }
+            });
+            return result;
+        };
+        return resolveRefs(schema, schema, handle).then(function (_) {
+            return new ResolvedSchema(schema, resolveErrors);
+        });
+    };
+    JSONSchemaService.prototype.traverseNodes = function (root, handle) {
+        if (!root || typeof root !== 'object') {
+            return Promise.resolve(null);
+        }
+        var seen = new Set();
+        var collectEntries = function () {
+            var entries = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                entries[_i] = arguments[_i];
+            }
+            for (var _a = 0, entries_1 = entries; _a < entries_1.length; _a++) {
+                var entry = entries_1[_a];
+                if (typeof entry === 'object') {
+                    toWalk.push(entry);
+                }
+            }
+        };
+        var collectMapEntries = function () {
+            var maps = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                maps[_i] = arguments[_i];
+            }
+            for (var _a = 0, maps_1 = maps; _a < maps_1.length; _a++) {
+                var map = maps_1[_a];
+                if (typeof map === 'object') {
+                    for (var k in map) {
+                        var key = k;
+                        var entry = map[key];
+                        if (typeof entry === 'object') {
+                            toWalk.push(entry);
                         }
-                        pendingSubSchemas.delete(fullId);
                     }
                 }
-            };
-            while (toWalk.length) {
-                var next = toWalk.pop();
-                if (seen.has(next)) {
-                    continue;
+            }
+        };
+        var collectArrayEntries = function () {
+            var arrays = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                arrays[_i] = arguments[_i];
+            }
+            for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) {
+                var array = arrays_1[_a];
+                if (Array.isArray(array)) {
+                    for (var _b = 0, array_1 = array; _b < array_1.length; _b++) {
+                        var entry = array_1[_b];
+                        if (typeof entry === 'object') {
+                            toWalk.push(entry);
+                        }
+                    }
                 }
-                seen.add(next);
-                handleId(next);
-                handleRef(next);
             }
-            return _this.promise.all(openPromises);
         };
-        return resolveRefs(schema, schema, handle).then(function (_) {
-            for (var unresolvedSubschemaId in pendingSubSchemas) {
-                resolveErrors.push(localize('json.schema.idnotfound', 'Subschema with id \'{0}\' was not found', unresolvedSubschemaId));
+        var toWalk = [root];
+        var next = toWalk.pop();
+        while (next) {
+            if (!seen.has(next)) {
+                seen.add(next);
+                handle(next);
+                collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
+                collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
+                collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
             }
-            return new ResolvedSchema(schema, resolveErrors);
-        });
+            next = toWalk.pop();
+        }
     };
+    ;
     JSONSchemaService.prototype.getSchemaFromProperty = function (resource, document) {
         var _a, _b;
         if (((_a = document.root) === null || _a === void 0 ? void 0 : _a.type) === 'object') {
@@ -624,7 +576,7 @@ var idCounter = 0;
 function normalizeId(id) {
     // remove trailing '#', normalize drive capitalization
     try {
-        return URI.parse(id).toString();
+        return URI.parse(id).toString(true);
     }
     catch (e) {
         return id;
@@ -633,7 +585,7 @@ function normalizeId(id) {
 function normalizeResourceForMatching(resource) {
     // remove queries and fragments, normalize drive capitalization
     try {
-        return URI.parse(resource).with({ fragment: null, query: null }).toString();
+        return URI.parse(resource).with({ fragment: null, query: null }).toString(true);
     }
     catch (e) {
         return resource;

package/lib/umd/jsonLanguageService.js

@@ -58,8 +58,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             resetSchema: function (uri) { return jsonSchemaService.onResourceChange(uri); },
             doValidation: jsonValidation.doValidation.bind(jsonValidation),
             getLanguageStatus: jsonValidation.getLanguageStatus.bind(jsonValidation),
-            parseJSONDocument: function (document) { return jsonParser_1.parse(document, { collectComments: true }); },
-            newJSONDocument: function (root, diagnostics) { return jsonParser_1.newJSONDocument(root, diagnostics); },
+            parseJSONDocument: function (document) { return (0, jsonParser_1.parse)(document, { collectComments: true }); },
+            newJSONDocument: function (root, diagnostics) { return (0, jsonParser_1.newJSONDocument)(root, diagnostics); },
             getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
             doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
             doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
@@ -80,7 +80,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
                     range = { offset: offset, length: length };
                 }
                 var options = { tabSize: o ? o.tabSize : 4, insertSpaces: (o === null || o === void 0 ? void 0 : o.insertSpaces) === true, insertFinalNewline: (o === null || o === void 0 ? void 0 : o.insertFinalNewline) === true, eol: '\n' };
-                return jsonc_parser_1.format(d.getText(), range, options).map(function (e) {
+                return (0, jsonc_parser_1.format)(d.getText(), range, options).map(function (e) {
                     return jsonLanguageTypes_1.TextEdit.replace(jsonLanguageTypes_1.Range.create(d.positionAt(e.offset), d.positionAt(e.offset + e.length)), e.content);
                 });
             }

package/lib/umd/parser/jsonParser.js

@@ -166,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;
@@ -502,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;
                     }
@@ -517,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,
@@ -552,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;
@@ -579,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)
@@ -623,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 },
@@ -746,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)
@@ -807,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({
@@ -831,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)) {
@@ -839,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({
@@ -888,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 },
@@ -896,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 },
@@ -1192,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)
                     });
                 }

package/lib/umd/services/jsonSchemaService.js

@@ -38,7 +38,7 @@
                             patternString = patternString.substring(1);
                         }
                         this.globWrappers.push({
-                            regexp: glob_1.createRegex('**/' + patternString, { extended: true, globstar: true }),
+                            regexp: (0, glob_1.createRegex)('**/' + patternString, { extended: true, globstar: true }),
                             include: include,
                         });
                     }
@@ -71,7 +71,7 @@
             this.service = service;
             this.uri = uri;
             this.dependencies = new Set();
-            this.anchors = new Map();
+            this.anchors = undefined;
             if (unresolvedSchemaContent) {
                 this.unresolvedSchema = this.service.promise.resolve(new UnresolvedSchema(unresolvedSchemaContent));
             }
@@ -96,7 +96,7 @@
             this.resolvedSchema = undefined;
             this.unresolvedSchema = undefined;
             this.dependencies.clear();
-            this.anchors.clear();
+            this.anchors = undefined;
             return hasChanges;
         };
         return SchemaHandle;
@@ -321,13 +321,11 @@
                 }
             }
             var contextService = this.contextService;
-            var findSection = function (schema, path) {
-                if (!path) {
-                    return schema;
-                }
+            var findSectionByJSONPointer = function (schema, path) {
+                path = decodeURIComponent(path);
                 var current = schema;
                 if (path[0] === '/') {
-                    path = path.substr(1);
+                    path = path.substring(1);
                 }
                 path.split('/').some(function (part) {
                     part = part.replace(/~1/g, '/').replace(/~0/g, '~');
@@ -336,54 +334,39 @@
                 });
                 return current;
             };
+            var findSchemaById = function (schema, handle, id) {
+                if (!handle.anchors) {
+                    handle.anchors = collectAnchors(schema);
+                }
+                return handle.anchors.get(id);
+            };
             var merge = function (target, section) {
                 for (var key in section) {
-                    if (section.hasOwnProperty(key) && !target.hasOwnProperty(key)) {
+                    if (section.hasOwnProperty(key) && !target.hasOwnProperty(key) && key !== 'id' && key !== '$id') {
                         target[key] = section[key];
                     }
                 }
             };
-            var mergeByJsonPointer = function (target, sourceRoot, sourceURI, refSegment) {
-                var path = refSegment ? decodeURIComponent(refSegment) : undefined;
-                var section = findSection(sourceRoot, path);
+            var mergeRef = function (target, sourceRoot, sourceHandle, refSegment) {
+                var section;
+                if (refSegment === undefined || refSegment.length === 0) {
+                    section = sourceRoot;
+                }
+                else if (refSegment.charAt(0) === '/') {
+                    // A $ref to a JSON Pointer (i.e #/definitions/foo)
+                    section = findSectionByJSONPointer(sourceRoot, refSegment);
+                }
+                else {
+                    // A $ref to a sub-schema with an $id (i.e #hello)
+                    section = findSchemaById(sourceRoot, sourceHandle, refSegment);
+                }
                 if (section) {
                     merge(target, section);
                 }
                 else {
-                    resolveErrors.push(localize('json.schema.invalidref', '$ref \'{0}\' in \'{1}\' can not be resolved.', path, sourceURI));
+                    resolveErrors.push(localize('json.schema.invalidid', '$ref \'{0}\' in \'{1}\' can not be resolved.', refSegment, sourceHandle.uri));
                 }
             };
-            var isSubSchemaRef = function (refSegment) {
-                // Check if the first character is not '/' to determine whether it's a sub schema reference or a JSON Pointer
-                return !!refSegment && refSegment.charAt(0) !== '/';
-            };
-            var reconstructRefURI = function (uri, fragment, separator) {
-                if (separator === void 0) { separator = '#'; }
-                return normalizeId("" + uri + separator + fragment);
-            };
-            // To find which $refs point to which $ids we keep two maps:
-            // pendingSubSchemas '$id' we expect to encounter (if they exist)
-            // handle.anchors for the ones we have encountered
-            var pendingSubSchemas = new Map();
-            var tryMergeSubSchema = function (target, id, handle) {
-                // Get the full URI for the current schema to avoid matching schema1#hello and schema2#hello to the same
-                // reference by accident
-                var fullId = reconstructRefURI(handle.uri, id);
-                var resolved = handle.anchors.get(fullId);
-                if (resolved) {
-                    merge(target, resolved);
-                    return true; // return success
-                }
-                // This subschema has not been resolved yet
-                // Remember the target to merge later once resolved
-                var pending = pendingSubSchemas.get(fullId);
-                if (!pending) {
-                    pending = [];
-                    pendingSubSchemas.set(fullId, pending);
-                }
-                pending.push(target);
-                return false; // return failure - merge didn't occur
-            };
             var resolveExternalLink = function (node, uri, refSegment, parentHandle) {
                 if (contextService && !/^[A-Za-z][A-Za-z0-9+\-.+]*:\/\/.*/.test(uri)) {
                     uri = contextService.resolveRelativePath(uri, parentHandle.uri);
@@ -396,79 +379,13 @@
                         var loc = refSegment ? uri + '#' + refSegment : uri;
                         resolveErrors.push(localize('json.schema.problemloadingref', 'Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0]));
                     }
-                    // A placeholder promise that might execute later a ref resolution for the newly resolved schema
-                    var externalLinkPromise = Promise.resolve(true);
-                    if (refSegment === undefined || !isSubSchemaRef(refSegment)) {
-                        // This is not a sub schema, merge the regular way
-                        mergeByJsonPointer(node, unresolvedSchema.schema, uri, refSegment);
-                    }
-                    else {
-                        // This is a reference to a subschema
-                        if (!tryMergeSubSchema(node, refSegment, referencedHandle)) {
-                            // We weren't able to merge currently so we'll try to resolve this schema first to obtain subschemas
-                            // that could be missed
-                            // to improve: it would be enough to find the nodes, no need to resolve the full schema
-                            externalLinkPromise = resolveRefs(unresolvedSchema.schema, unresolvedSchema.schema, referencedHandle);
-                        }
-                    }
-                    return externalLinkPromise.then(function () { return resolveRefs(node, unresolvedSchema.schema, referencedHandle); });
+                    mergeRef(node, unresolvedSchema.schema, referencedHandle, refSegment);
+                    return resolveRefs(node, unresolvedSchema.schema, referencedHandle);
                 });
             };
             var resolveRefs = function (node, parentSchema, parentHandle) {
-                if (!node || typeof node !== 'object') {
-                    return Promise.resolve(null);
-                }
-                var toWalk = [node];
-                var seen = new Set();
                 var openPromises = [];
-                var collectEntries = function () {
-                    var entries = [];
-                    for (var _i = 0; _i < arguments.length; _i++) {
-                        entries[_i] = arguments[_i];
-                    }
-                    for (var _a = 0, entries_1 = entries; _a < entries_1.length; _a++) {
-                        var entry = entries_1[_a];
-                        if (typeof entry === 'object') {
-                            toWalk.push(entry);
-                        }
-                    }
-                };
-                var collectMapEntries = function () {
-                    var maps = [];
-                    for (var _i = 0; _i < arguments.length; _i++) {
-                        maps[_i] = arguments[_i];
-                    }
-                    for (var _a = 0, maps_1 = maps; _a < maps_1.length; _a++) {
-                        var map = maps_1[_a];
-                        if (typeof map === 'object') {
-                            for (var k in map) {
-                                var key = k;
-                                var entry = map[key];
-                                if (typeof entry === 'object') {
-                                    toWalk.push(entry);
-                                }
-                            }
-                        }
-                    }
-                };
-                var collectArrayEntries = function () {
-                    var arrays = [];
-                    for (var _i = 0; _i < arguments.length; _i++) {
-                        arrays[_i] = arguments[_i];
-                    }
-                    for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) {
-                        var array = arrays_1[_a];
-                        if (Array.isArray(array)) {
-                            for (var _b = 0, array_1 = array; _b < array_1.length; _b++) {
-                                var entry = array_1[_b];
-                                if (typeof entry === 'object') {
-                                    toWalk.push(entry);
-                                }
-                            }
-                        }
-                    }
-                };
-                var handleRef = function (next) {
+                _this.traverseNodes(node, function (next) {
                     var seenRefs = new Set();
                     while (next.$ref) {
                         var ref = next.$ref;
@@ -483,67 +400,102 @@
                             // This is a reference inside the current schema
                             if (!seenRefs.has(ref)) {
                                 var id = segments[1];
-                                if (id !== undefined && isSubSchemaRef(id)) { // A $ref to a sub-schema with an $id (i.e #hello)
-                                    tryMergeSubSchema(next, id, handle);
-                                }
-                                else { // A $ref to a JSON Pointer (i.e #/definitions/foo)
-                                    mergeByJsonPointer(next, parentSchema, parentHandle.uri, id); // can set next.$ref again, use seenRefs to avoid circle
-                                }
+                                mergeRef(next, parentSchema, parentHandle, id);
                                 seenRefs.add(ref);
                             }
                         }
                     }
-                    collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
-                    collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
-                    collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
-                };
-                var handleId = function (next) {
-                    // TODO figure out should loops be preventse
+                });
+                return _this.promise.all(openPromises);
+            };
+            var collectAnchors = function (root) {
+                var result = new Map();
+                _this.traverseNodes(root, function (next) {
                     var id = next.$id || next.id;
                     if (typeof id === 'string' && id.charAt(0) === '#') {
-                        delete next.$id;
-                        delete next.id;
-                        // Use a blank separator, as the $id already has the '#'
-                        var fullId = reconstructRefURI(parentHandle.uri, id, '');
-                        var resolved = parentHandle.anchors.get(fullId);
-                        if (!resolved) {
-                            // it's resolved now
-                            parentHandle.anchors.set(fullId, next);
-                        }
-                        else if (resolved !== next) {
-                            // Duplicate may occur in recursive $refs, but as long as they are the same object
-                            // it's ok, otherwise report and error
+                        // delete next.$id;
+                        // delete next.id;
+                        var anchor = id.substring(1);
+                        if (result.has(anchor)) {
                             resolveErrors.push(localize('json.schema.duplicateid', 'Duplicate id declaration: \'{0}\'', id));
                         }
-                        // Resolve all pending requests and cleanup the queue list
-                        var pending = pendingSubSchemas.get(fullId);
-                        if (pending) {
-                            for (var _i = 0, pending_1 = pending; _i < pending_1.length; _i++) {
-                                var target = pending_1[_i];
-                                merge(target, next);
+                        else {
+                            result.set(anchor, next);
+                        }
+                    }
+                });
+                return result;
+            };
+            return resolveRefs(schema, schema, handle).then(function (_) {
+                return new ResolvedSchema(schema, resolveErrors);
+            });
+        };
+        JSONSchemaService.prototype.traverseNodes = function (root, handle) {
+            if (!root || typeof root !== 'object') {
+                return Promise.resolve(null);
+            }
+            var seen = new Set();
+            var collectEntries = function () {
+                var entries = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    entries[_i] = arguments[_i];
+                }
+                for (var _a = 0, entries_1 = entries; _a < entries_1.length; _a++) {
+                    var entry = entries_1[_a];
+                    if (typeof entry === 'object') {
+                        toWalk.push(entry);
+                    }
+                }
+            };
+            var collectMapEntries = function () {
+                var maps = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    maps[_i] = arguments[_i];
+                }
+                for (var _a = 0, maps_1 = maps; _a < maps_1.length; _a++) {
+                    var map = maps_1[_a];
+                    if (typeof map === 'object') {
+                        for (var k in map) {
+                            var key = k;
+                            var entry = map[key];
+                            if (typeof entry === 'object') {
+                                toWalk.push(entry);
                             }
-                            pendingSubSchemas.delete(fullId);
                         }
                     }
-                };
-                while (toWalk.length) {
-                    var next = toWalk.pop();
-                    if (seen.has(next)) {
-                        continue;
+                }
+            };
+            var collectArrayEntries = function () {
+                var arrays = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    arrays[_i] = arguments[_i];
+                }
+                for (var _a = 0, arrays_1 = arrays; _a < arrays_1.length; _a++) {
+                    var array = arrays_1[_a];
+                    if (Array.isArray(array)) {
+                        for (var _b = 0, array_1 = array; _b < array_1.length; _b++) {
+                            var entry = array_1[_b];
+                            if (typeof entry === 'object') {
+                                toWalk.push(entry);
+                            }
+                        }
                     }
-                    seen.add(next);
-                    handleId(next);
-                    handleRef(next);
                 }
-                return _this.promise.all(openPromises);
             };
-            return resolveRefs(schema, schema, handle).then(function (_) {
-                for (var unresolvedSubschemaId in pendingSubSchemas) {
-                    resolveErrors.push(localize('json.schema.idnotfound', 'Subschema with id \'{0}\' was not found', unresolvedSubschemaId));
+            var toWalk = [root];
+            var next = toWalk.pop();
+            while (next) {
+                if (!seen.has(next)) {
+                    seen.add(next);
+                    handle(next);
+                    collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
+                    collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
+                    collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
                 }
-                return new ResolvedSchema(schema, resolveErrors);
-            });
+                next = toWalk.pop();
+            }
         };
+        ;
         JSONSchemaService.prototype.getSchemaFromProperty = function (resource, document) {
             var _a, _b;
             if (((_a = document.root) === null || _a === void 0 ? void 0 : _a.type) === 'object') {
@@ -636,7 +588,7 @@
     function normalizeId(id) {
         // remove trailing '#', normalize drive capitalization
         try {
-            return vscode_uri_1.URI.parse(id).toString();
+            return vscode_uri_1.URI.parse(id).toString(true);
         }
         catch (e) {
             return id;
@@ -645,7 +597,7 @@
     function normalizeResourceForMatching(resource) {
         // remove queries and fragments, normalize drive capitalization
         try {
-            return vscode_uri_1.URI.parse(resource).with({ fragment: null, query: null }).toString();
+            return vscode_uri_1.URI.parse(resource).with({ fragment: null, query: null }).toString(true);
         }
         catch (e) {
             return resource;

package/lib/umd/services/jsonSelectionRanges.js

@@ -60,7 +60,7 @@
         function newRange(start, end) {
             return jsonLanguageTypes_1.Range.create(document.positionAt(start), document.positionAt(end));
         }
-        var scanner = jsonc_parser_1.createScanner(document.getText(), true);
+        var scanner = (0, jsonc_parser_1.createScanner)(document.getText(), true);
         function getOffsetAfterNextToken(offset, expectedToken) {
             scanner.setPosition(offset);
             var token = scanner.scan();

package/lib/umd/services/jsonValidation.js

@@ -115,14 +115,14 @@
     var idCounter = 0;
     function schemaAllowsComments(schemaRef) {
         if (schemaRef && typeof schemaRef === 'object') {
-            if (objects_1.isBoolean(schemaRef.allowComments)) {
+            if ((0, objects_1.isBoolean)(schemaRef.allowComments)) {
                 return schemaRef.allowComments;
             }
             if (schemaRef.allOf) {
                 for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
                     var schema = _a[_i];
                     var allow = schemaAllowsComments(schema);
-                    if (objects_1.isBoolean(allow)) {
+                    if ((0, objects_1.isBoolean)(allow)) {
                         return allow;
                     }
                 }
@@ -132,18 +132,18 @@
     }
     function schemaAllowsTrailingCommas(schemaRef) {
         if (schemaRef && typeof schemaRef === 'object') {
-            if (objects_1.isBoolean(schemaRef.allowTrailingCommas)) {
+            if ((0, objects_1.isBoolean)(schemaRef.allowTrailingCommas)) {
                 return schemaRef.allowTrailingCommas;
             }
             var deprSchemaRef = schemaRef;
-            if (objects_1.isBoolean(deprSchemaRef['allowsTrailingCommas'])) { // deprecated
+            if ((0, objects_1.isBoolean)(deprSchemaRef['allowsTrailingCommas'])) { // deprecated
                 return deprSchemaRef['allowsTrailingCommas'];
             }
             if (schemaRef.allOf) {
                 for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
                     var schema = _a[_i];
                     var allow = schemaAllowsTrailingCommas(schema);
-                    if (objects_1.isBoolean(allow)) {
+                    if ((0, objects_1.isBoolean)(allow)) {
                         return allow;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "4.2.0-next.2",
+  "version": "4.2.1",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -15,21 +15,21 @@
     "url": "https://github.com/Microsoft/vscode-json-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^9.1.0",
     "@types/node": "^10.12.21",
-    "@typescript-eslint/eslint-plugin": "^4.32.0",
-    "@typescript-eslint/parser": "^4.32.0",
-    "eslint": "^7.32.0",
-    "mocha": "^9.1.2",
+    "@typescript-eslint/eslint-plugin": "^5.15.0",
+    "@typescript-eslint/parser": "^5.15.0",
+    "eslint": "^8.11.0",
+    "mocha": "^9.2.2",
     "rimraf": "^3.0.2",
-    "typescript": "^4.1.3"
+    "typescript": "^4.5.5"
   },
   "dependencies": {
     "jsonc-parser": "^3.0.0",
-    "vscode-languageserver-textdocument": "^1.0.1",
+    "vscode-languageserver-textdocument": "^1.0.3",
     "vscode-languageserver-types": "^3.16.0",
     "vscode-nls": "^5.0.0",
-    "vscode-uri": "^3.0.2"
+    "vscode-uri": "^3.0.3"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile-esm && npm run test && npm run remove-sourcemap-refs",