vscode-json-languageservice 4.1.10 → 4.2.0-next.3

package/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+
+4.2.0 / 
+================
+ * new API `LanguageService.getLanguageStatus`
+ * support for $ref with $id
+
 4.1.6 / 2021-07-16
 ================
  * Replace minimatch with glob-to-regexp

package/lib/esm/jsonLanguageService.d.ts

@@ -1,4 +1,4 @@
-import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema } from './jsonLanguageTypes';
+import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema, JSONLanguageStatus } from './jsonLanguageTypes';
 import { DocumentLink } from 'vscode-languageserver-types';
 export declare type JSONDocument = {
     root: ASTNode | undefined;
@@ -12,6 +12,7 @@ export interface LanguageService {
     newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
     resetSchema(uri: string): boolean;
     getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
+    getLanguageStatus(document: TextDocument, jsonDocument: JSONDocument): JSONLanguageStatus;
     doResolve(item: CompletionItem): Thenable<CompletionItem>;
     doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
     findDocumentSymbols(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): SymbolInformation[];

package/lib/esm/jsonLanguageService.js

@@ -35,6 +35,7 @@ export function getLanguageService(params) {
         },
         resetSchema: function (uri) { return jsonSchemaService.onResourceChange(uri); },
         doValidation: jsonValidation.doValidation.bind(jsonValidation),
+        getLanguageStatus: jsonValidation.getLanguageStatus.bind(jsonValidation),
         parseJSONDocument: function (document) { return parseJSON(document, { collectComments: true }); },
         newJSONDocument: function (root, diagnostics) { return newJSONDocument(root, diagnostics); },
         getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),

package/lib/esm/jsonLanguageTypes.d.ts

@@ -74,6 +74,9 @@ export interface MatchingSchema {
     node: ASTNode;
     schema: JSONSchema;
 }
+export interface JSONLanguageStatus {
+    schemas: string[];
+}
 export interface LanguageSettings {
     /**
      * If set, the validator will return syntax and semantic errors.

package/lib/esm/parser/jsonParser.js

@@ -28,7 +28,10 @@ var formats = {
     '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) {
@@ -655,6 +658,9 @@ function validate(n, schema, validationResult, matchingSchemas) {
                 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({

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

@@ -55,17 +55,18 @@ var FilePatternAssociation = /** @class */ (function () {
     return FilePatternAssociation;
 }());
 var SchemaHandle = /** @class */ (function () {
-    function SchemaHandle(service, url, unresolvedSchemaContent) {
+    function SchemaHandle(service, uri, unresolvedSchemaContent) {
         this.service = service;
-        this.url = url;
-        this.dependencies = {};
+        this.uri = uri;
+        this.dependencies = new Set();
+        this.anchors = undefined;
         if (unresolvedSchemaContent) {
             this.unresolvedSchema = this.service.promise.resolve(new UnresolvedSchema(unresolvedSchemaContent));
         }
     }
     SchemaHandle.prototype.getUnresolvedSchema = function () {
         if (!this.unresolvedSchema) {
-            this.unresolvedSchema = this.service.loadSchema(this.url);
+            this.unresolvedSchema = this.service.loadSchema(this.uri);
         }
         return this.unresolvedSchema;
     };
@@ -73,15 +74,18 @@ var SchemaHandle = /** @class */ (function () {
         var _this = this;
         if (!this.resolvedSchema) {
             this.resolvedSchema = this.getUnresolvedSchema().then(function (unresolved) {
-                return _this.service.resolveSchemaContent(unresolved, _this.url, _this.dependencies);
+                return _this.service.resolveSchemaContent(unresolved, _this);
             });
         }
         return this.resolvedSchema;
     };
     SchemaHandle.prototype.clearSchema = function () {
+        var hasChanges = !!this.unresolvedSchema;
         this.resolvedSchema = undefined;
         this.unresolvedSchema = undefined;
-        this.dependencies = {};
+        this.dependencies.clear();
+        this.anchors = undefined;
+        return hasChanges;
     };
     return SchemaHandle;
 }());
@@ -185,13 +189,14 @@ var JSONSchemaService = /** @class */ (function () {
             var curr = toWalk.pop();
             for (var i = 0; i < all.length; i++) {
                 var handle = all[i];
-                if (handle && (handle.url === curr || handle.dependencies[curr])) {
-                    if (handle.url !== curr) {
-                        toWalk.push(handle.url);
+                if (handle && (handle.uri === curr || handle.dependencies.has(curr))) {
+                    if (handle.uri !== curr) {
+                        toWalk.push(handle.uri);
+                    }
+                    if (handle.clearSchema()) {
+                        hasChanges = true;
                     }
-                    handle.clearSchema();
                     all[i] = undefined;
-                    hasChanges = true;
                 }
             }
         }
@@ -287,7 +292,7 @@ var JSONSchemaService = /** @class */ (function () {
             return new UnresolvedSchema({}, [localize('json.schema.nocontent', 'Unable to load schema from \'{0}\': {1}.', toDisplayString(url), errorMessage)]);
         });
     };
-    JSONSchemaService.prototype.resolveSchemaContent = function (schemaToResolve, schemaURL, dependencies) {
+    JSONSchemaService.prototype.resolveSchemaContent = function (schemaToResolve, handle) {
         var _this = this;
         var resolveErrors = schemaToResolve.errors.slice(0);
         var schema = schemaToResolve.schema;
@@ -299,15 +304,16 @@ var JSONSchemaService = /** @class */ (function () {
             else if (id === 'https://json-schema.org/draft/2019-09/schema') {
                 resolveErrors.push(localize('json.schema.draft201909.notsupported', "Draft 2019-09 schemas are not yet fully supported."));
             }
+            else if (id === 'https://json-schema.org/draft/2020-12/schema') {
+                resolveErrors.push(localize('json.schema.draft202012.notsupported', "Draft 2020-12 schemas are not yet fully supported."));
+            }
         }
         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, '~');
@@ -316,144 +322,185 @@ var JSONSchemaService = /** @class */ (function () {
             });
             return current;
         };
-        var merge = function (target, sourceRoot, sourceURI, refSegment) {
-            var path = refSegment ? decodeURIComponent(refSegment) : undefined;
-            var section = findSection(sourceRoot, path);
-            if (section) {
-                for (var key in section) {
-                    if (section.hasOwnProperty(key) && !target.hasOwnProperty(key)) {
-                        target[key] = section[key];
-                    }
+        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) && key !== 'id' && key !== '$id') {
+                    target[key] = section[key];
                 }
             }
+        };
+        var mergeRef = function (target, sourceRoot, sourceHandle, refSegment) {
+            var section;
+            if (refSegment === undefined) {
+                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 resolveExternalLink = function (node, uri, refSegment, parentSchemaURL, parentSchemaDependencies) {
+        var resolveExternalLink = function (node, uri, refSegment, parentHandle) {
             if (contextService && !/^[A-Za-z][A-Za-z0-9+\-.+]*:\/\/.*/.test(uri)) {
-                uri = contextService.resolveRelativePath(uri, parentSchemaURL);
+                uri = contextService.resolveRelativePath(uri, parentHandle.uri);
             }
             uri = normalizeId(uri);
             var referencedHandle = _this.getOrAddSchemaHandle(uri);
             return referencedHandle.getUnresolvedSchema().then(function (unresolvedSchema) {
-                parentSchemaDependencies[uri] = true;
+                parentHandle.dependencies.add(uri);
                 if (unresolvedSchema.errors.length) {
                     var loc = refSegment ? uri + '#' + refSegment : uri;
                     resolveErrors.push(localize('json.schema.problemloadingref', 'Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0]));
                 }
-                merge(node, unresolvedSchema.schema, uri, refSegment);
-                return resolveRefs(node, unresolvedSchema.schema, uri, referencedHandle.dependencies);
+                mergeRef(node, unresolvedSchema.schema, referencedHandle, refSegment);
+                return resolveRefs(node, unresolvedSchema.schema, referencedHandle);
             });
         };
-        var resolveRefs = function (node, parentSchema, parentSchemaURL, parentSchemaDependencies) {
-            if (!node || typeof node !== 'object') {
-                return Promise.resolve(null);
-            }
-            var toWalk = [node];
-            var seen = [];
+        var resolveRefs = function (node, parentSchema, parentHandle) {
             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) {
-                var seenRefs = [];
+            _this.traverseNodes(node, function (next) {
+                var seenRefs = new Set();
                 while (next.$ref) {
                     var ref = next.$ref;
                     var segments = ref.split('#', 2);
                     delete next.$ref;
                     if (segments[0].length > 0) {
-                        openPromises.push(resolveExternalLink(next, segments[0], segments[1], parentSchemaURL, parentSchemaDependencies));
+                        // This is a reference to an external schema
+                        openPromises.push(resolveExternalLink(next, segments[0], segments[1], parentHandle));
                         return;
                     }
                     else {
-                        if (seenRefs.indexOf(ref) === -1) {
-                            merge(next, parentSchema, parentSchemaURL, segments[1]); // can set next.$ref again, use seenRefs to avoid circle
-                            seenRefs.push(ref);
+                        // This is a reference inside the current schema
+                        if (!seenRefs.has(ref)) {
+                            var id = segments[1];
+                            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);
-            };
-            while (toWalk.length) {
-                var next = toWalk.pop();
-                if (seen.indexOf(next) >= 0) {
-                    continue;
-                }
-                seen.push(next);
-                handleRef(next);
-            }
+            });
             return _this.promise.all(openPromises);
         };
-        return resolveRefs(schema, schema, schemaURL, dependencies).then(function (_) { return new ResolvedSchema(schema, resolveErrors); });
+        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;
+                    var anchor = id.substring(1);
+                    if (result.has(anchor)) {
+                        resolveErrors.push(localize('json.schema.duplicateid', 'Duplicate id declaration: \'{0}\'', id));
+                    }
+                    else {
+                        result.set(anchor, next);
+                    }
+                }
+            });
+            return result;
+        };
+        return resolveRefs(schema, schema, handle).then(function (_) {
+            return new ResolvedSchema(schema, resolveErrors);
+        });
     };
-    JSONSchemaService.prototype.getSchemaForResource = function (resource, document) {
-        // first use $schema if present
-        if (document && document.root && document.root.type === 'object') {
-            var schemaProperties = document.root.properties.filter(function (p) { return (p.keyNode.value === '$schema') && p.valueNode && p.valueNode.type === 'string'; });
-            if (schemaProperties.length > 0) {
-                var valueNode = schemaProperties[0].valueNode;
-                if (valueNode && valueNode.type === 'string') {
-                    var schemeId = Parser.getNodeValue(valueNode);
-                    if (schemeId && Strings.startsWith(schemeId, '.') && this.contextService) {
-                        schemeId = this.contextService.resolveRelativePath(schemeId, resource);
+    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);
+                        }
                     }
-                    if (schemeId) {
-                        var id = normalizeId(schemeId);
-                        return this.getOrAddSchemaHandle(id).getResolvedSchema();
+                }
+            }
+        };
+        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 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);
+            }
+            next = toWalk.pop();
         }
-        if (this.cachedSchemaForResource && this.cachedSchemaForResource.resource === resource) {
-            return this.cachedSchemaForResource.resolvedSchema;
+    };
+    ;
+    JSONSchemaService.prototype.getSchemaFromProperty = function (resource, document) {
+        var _a, _b;
+        if (((_a = document.root) === null || _a === void 0 ? void 0 : _a.type) === 'object') {
+            for (var _i = 0, _c = document.root.properties; _i < _c.length; _i++) {
+                var p = _c[_i];
+                if (p.keyNode.value === '$schema' && ((_b = p.valueNode) === null || _b === void 0 ? void 0 : _b.type) === 'string') {
+                    var schemaId = p.valueNode.value;
+                    if (this.contextService && !/^\w[\w\d+.-]*:/.test(schemaId)) { // has scheme
+                        schemaId = this.contextService.resolveRelativePath(schemaId, resource);
+                    }
+                    return schemaId;
+                }
+            }
         }
+        return undefined;
+    };
+    JSONSchemaService.prototype.getAssociatedSchemas = function (resource) {
         var seen = Object.create(null);
         var schemas = [];
         var normalizedResource = normalizeResourceForMatching(resource);
@@ -469,6 +516,28 @@ var JSONSchemaService = /** @class */ (function () {
                 }
             }
         }
+        return schemas;
+    };
+    JSONSchemaService.prototype.getSchemaURIsForResource = function (resource, document) {
+        var schemeId = document && this.getSchemaFromProperty(resource, document);
+        if (schemeId) {
+            return [schemeId];
+        }
+        return this.getAssociatedSchemas(resource);
+    };
+    JSONSchemaService.prototype.getSchemaForResource = function (resource, document) {
+        if (document) {
+            // first use $schema if present
+            var schemeId = this.getSchemaFromProperty(resource, document);
+            if (schemeId) {
+                var id = normalizeId(schemeId);
+                return this.getOrAddSchemaHandle(id).getResolvedSchema();
+            }
+        }
+        if (this.cachedSchemaForResource && this.cachedSchemaForResource.resource === resource) {
+            return this.cachedSchemaForResource.resolvedSchema;
+        }
+        var schemas = this.getAssociatedSchemas(resource);
         var resolvedSchema = schemas.length > 0 ? this.createCombinedSchema(resource, schemas).getResolvedSchema() : this.promise.resolve(undefined);
         this.cachedSchemaForResource = { resource: resource, resolvedSchema: resolvedSchema };
         return resolvedSchema;
@@ -488,7 +557,8 @@ var JSONSchemaService = /** @class */ (function () {
     JSONSchemaService.prototype.getMatchingSchemas = function (document, jsonDocument, schema) {
         if (schema) {
             var id = schema.id || ('schemaservice://untitled/matchingSchemas/' + idCounter++);
-            return this.resolveSchemaContent(new UnresolvedSchema(schema), id, {}).then(function (resolvedSchema) {
+            var handle = this.addSchemaHandle(id, schema);
+            return handle.getResolvedSchema().then(function (resolvedSchema) {
                 return jsonDocument.getMatchingSchemas(resolvedSchema.schema).filter(function (s) { return !s.inverted; });
             });
         }

package/lib/esm/services/jsonValidation.js

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { UnresolvedSchema } from './jsonSchemaService';
 import { ErrorCode, Diagnostic, DiagnosticSeverity, Range } from '../jsonLanguageTypes';
 import * as nls from 'vscode-nls';
 import { isBoolean } from '../utils/objects';
@@ -86,7 +85,8 @@ var JSONValidation = /** @class */ (function () {
         };
         if (schema) {
             var id = schema.id || ('schemaservice://untitled/' + idCounter++);
-            return this.jsonSchemaService.resolveSchemaContent(new UnresolvedSchema(schema), id, {}).then(function (resolvedSchema) {
+            var handle = this.jsonSchemaService.registerExternalSchema(id, [], schema);
+            return handle.getResolvedSchema().then(function (resolvedSchema) {
                 return getDiagnostics(resolvedSchema);
             });
         }
@@ -94,6 +94,9 @@ var JSONValidation = /** @class */ (function () {
             return getDiagnostics(schema);
         });
     };
+    JSONValidation.prototype.getLanguageStatus = function (textDocument, jsonDocument) {
+        return { schemas: this.jsonSchemaService.getSchemaURIsForResource(textDocument.uri, jsonDocument) };
+    };
     return JSONValidation;
 }());
 export { JSONValidation };

package/lib/umd/jsonLanguageService.d.ts

@@ -1,4 +1,4 @@
-import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema } from './jsonLanguageTypes';
+import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema, JSONLanguageStatus } from './jsonLanguageTypes';
 import { DocumentLink } from 'vscode-languageserver-types';
 export declare type JSONDocument = {
     root: ASTNode | undefined;
@@ -12,6 +12,7 @@ export interface LanguageService {
     newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
     resetSchema(uri: string): boolean;
     getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
+    getLanguageStatus(document: TextDocument, jsonDocument: JSONDocument): JSONLanguageStatus;
     doResolve(item: CompletionItem): Thenable<CompletionItem>;
     doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
     findDocumentSymbols(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): SymbolInformation[];

package/lib/umd/jsonLanguageService.js

@@ -57,8 +57,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             },
             resetSchema: function (uri) { return jsonSchemaService.onResourceChange(uri); },
             doValidation: jsonValidation.doValidation.bind(jsonValidation),
-            parseJSONDocument: function (document) { return jsonParser_1.parse(document, { collectComments: true }); },
-            newJSONDocument: function (root, diagnostics) { return jsonParser_1.newJSONDocument(root, diagnostics); },
+            getLanguageStatus: jsonValidation.getLanguageStatus.bind(jsonValidation),
+            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),
@@ -79,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/jsonLanguageTypes.d.ts

@@ -74,6 +74,9 @@ export interface MatchingSchema {
     node: ASTNode;
     schema: JSONSchema;
 }
+export interface JSONLanguageStatus {
+    schemas: string[];
+}
 export interface LanguageSettings {
     /**
      * If set, the validator will return syntax and semantic errors.