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

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) {
@@ -617,7 +620,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
         }
         if (isString(schema.pattern)) {
             var regex = extendedRegExp(schema.pattern);
-            if (!regex.test(node.value)) {
+            if (!(regex === null || regex === void 0 ? void 0 : regex.test(node.value))) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: schema.patternErrorMessage || schema.errorMessage || localize('patternWarning', 'String does not match the pattern of "{0}".', schema.pattern)
@@ -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({
@@ -811,7 +817,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                 var regex = extendedRegExp(propertyPattern);
                 for (var _h = 0, _j = unprocessedProperties.slice(0); _h < _j.length; _h++) {
                     var propertyName = _j[_h];
-                    if (regex.test(propertyName)) {
+                    if (regex === null || regex === void 0 ? void 0 : regex.test(propertyName)) {
                         propertyProcessed(propertyName);
                         var child = seenKeys[propertyName];
                         if (child) {

package/lib/esm/services/jsonCompletion.js

@@ -440,7 +440,7 @@ var JSONCompletion = /** @class */ (function () {
                             for (var _a = 0, _b = Object.keys(s.schema.patternProperties); _a < _b.length; _a++) {
                                 var pattern = _b[_a];
                                 var regex = extendedRegExp(pattern);
-                                if (regex.test(parentKey)) {
+                                if (regex === null || regex === void 0 ? void 0 : regex.test(parentKey)) {
                                     propertyMatched = true;
                                     var propertySchema = s.schema.patternProperties[pattern];
                                     this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types);

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 = new Map();
         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.clear();
+        return hasChanges;
     };
     return SchemaHandle;
 }());
@@ -119,7 +123,7 @@ var ResolvedSchema = /** @class */ (function () {
             for (var _i = 0, _a = Object.keys(schema.patternProperties); _i < _a.length; _i++) {
                 var pattern = _a[_i];
                 var regex = Strings.extendedRegExp(pattern);
-                if (regex.test(next)) {
+                if (regex === null || regex === void 0 ? void 0 : regex.test(next)) {
                     return this.getSectionRecursive(path, schema.patternProperties[pattern]);
                 }
             }
@@ -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,6 +304,9 @@ 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) {
@@ -316,42 +324,90 @@ var JSONSchemaService = /** @class */ (function () {
             });
             return current;
         };
-        var merge = function (target, sourceRoot, sourceURI, refSegment) {
+        var merge = function (target, section) {
+            for (var key in section) {
+                if (section.hasOwnProperty(key) && !target.hasOwnProperty(key)) {
+                    target[key] = section[key];
+                }
+            }
+        };
+        var mergeByJsonPointer = 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];
-                    }
-                }
+                merge(target, section);
             }
             else {
                 resolveErrors.push(localize('json.schema.invalidref', '$ref \'{0}\' in \'{1}\' can not be resolved.', path, sourceURI));
             }
         };
-        var resolveExternalLink = function (node, uri, refSegment, parentSchemaURL, parentSchemaDependencies) {
+        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, 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);
+                // 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); });
             });
         };
-        var resolveRefs = function (node, parentSchema, parentSchemaURL, parentSchemaDependencies) {
+        var resolveRefs = function (node, parentSchema, parentHandle) {
             if (!node || typeof node !== 'object') {
                 return Promise.resolve(null);
             }
             var toWalk = [node];
-            var seen = [];
+            var seen = new Set();
             var openPromises = [];
             var collectEntries = function () {
                 var entries = [];
@@ -401,19 +457,27 @@ var JSONSchemaService = /** @class */ (function () {
                 }
             };
             var handleRef = function (next) {
-                var seenRefs = [];
+                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];
+                            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
+                            }
+                            seenRefs.add(ref);
                         }
                     }
                 }
@@ -421,39 +485,70 @@ var JSONSchemaService = /** @class */ (function () {
                 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
+                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
+                        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);
+                        }
+                        pendingSubSchemas.delete(fullId);
+                    }
+                }
+            };
             while (toWalk.length) {
                 var next = toWalk.pop();
-                if (seen.indexOf(next) >= 0) {
+                if (seen.has(next)) {
                     continue;
                 }
-                seen.push(next);
+                seen.add(next);
+                handleId(next);
                 handleRef(next);
             }
             return _this.promise.all(openPromises);
         };
-        return resolveRefs(schema, schema, schemaURL, dependencies).then(function (_) { return new ResolvedSchema(schema, resolveErrors); });
+        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));
+            }
+            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);
-                    }
-                    if (schemeId) {
-                        var id = normalizeId(schemeId);
-                        return this.getOrAddSchemaHandle(id).getResolvedSchema();
+    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;
                 }
             }
         }
-        if (this.cachedSchemaForResource && this.cachedSchemaForResource.resource === resource) {
-            return this.cachedSchemaForResource.resolvedSchema;
-        }
+        return undefined;
+    };
+    JSONSchemaService.prototype.getAssociatedSchemas = function (resource) {
         var seen = Object.create(null);
         var schemas = [];
         var normalizedResource = normalizeResourceForMatching(resource);
@@ -469,6 +564,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 +605,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/esm/utils/strings.js

@@ -43,10 +43,22 @@ export function repeat(value, count) {
     return s;
 }
 export function extendedRegExp(pattern) {
+    var flags = '';
     if (startsWith(pattern, '(?i)')) {
-        return new RegExp(pattern.substring(4), 'iu');
+        pattern = pattern.substring(4);
+        flags = 'i';
     }
-    else {
-        return new RegExp(pattern, 'u');
+    try {
+        return new RegExp(pattern, flags + 'u');
+    }
+    catch (e) {
+        // could be an exception due to the 'u ' flag
+        try {
+            return new RegExp(pattern, flags);
+        }
+        catch (e) {
+            // invalid pattern
+            return undefined;
+        }
     }
 }

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,6 +57,7 @@ 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); },
             getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),

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.

package/lib/umd/parser/jsonParser.js

@@ -40,7 +40,10 @@ var __extends = (this && this.__extends) || (function () {
         'date-time': { errorMessage: localize('dateTimeFormatWarning', 'String is not a RFC3339 date-time.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
         'date': { errorMessage: localize('dateFormatWarning', 'String is not a RFC3339 date.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/i },
         'time': { errorMessage: localize('timeFormatWarning', 'String is not a RFC3339 time.'), pattern: /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
-        'email': { errorMessage: localize('emailFormatWarning', 'String is not an e-mail address.'), pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ }
+        'email': { errorMessage: localize('emailFormatWarning', 'String is not an e-mail address.'), pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}))$/ },
+        'hostname': { errorMessage: localize('hostnameFormatWarning', 'String is not a hostname.'), pattern: /^(?=.{1,253}\.?$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*\.?$/i },
+        'ipv4': { errorMessage: localize('ipv4FormatWarning', 'String is not an IPv4 address.'), pattern: /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/ },
+        'ipv6': { errorMessage: localize('ipv6FormatWarning', 'String is not an IPv6 address.'), pattern: /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i },
     };
     var ASTNodeImpl = /** @class */ (function () {
         function ASTNodeImpl(parent, offset, length) {
@@ -634,7 +637,7 @@ var __extends = (this && this.__extends) || (function () {
             }
             if (objects_1.isString(schema.pattern)) {
                 var regex = strings_1.extendedRegExp(schema.pattern);
-                if (!regex.test(node.value)) {
+                if (!(regex === null || regex === void 0 ? void 0 : regex.test(node.value))) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
                         message: schema.patternErrorMessage || schema.errorMessage || localize('patternWarning', 'String does not match the pattern of "{0}".', schema.pattern)
@@ -672,6 +675,9 @@ var __extends = (this && this.__extends) || (function () {
                     case 'date':
                     case 'time':
                     case 'email':
+                    case 'hostname':
+                    case 'ipv4':
+                    case 'ipv6':
                         var format = formats[schema.format];
                         if (!node.value || !format.pattern.exec(node.value)) {
                             validationResult.problems.push({
@@ -828,7 +834,7 @@ var __extends = (this && this.__extends) || (function () {
                     var regex = strings_1.extendedRegExp(propertyPattern);
                     for (var _h = 0, _j = unprocessedProperties.slice(0); _h < _j.length; _h++) {
                         var propertyName = _j[_h];
-                        if (regex.test(propertyName)) {
+                        if (regex === null || regex === void 0 ? void 0 : regex.test(propertyName)) {
                             propertyProcessed(propertyName);
                             var child = seenKeys[propertyName];
                             if (child) {

package/lib/umd/services/jsonCompletion.js

@@ -452,7 +452,7 @@
                                 for (var _a = 0, _b = Object.keys(s.schema.patternProperties); _a < _b.length; _a++) {
                                     var pattern = _b[_a];
                                     var regex = strings_1.extendedRegExp(pattern);
-                                    if (regex.test(parentKey)) {
+                                    if (regex === null || regex === void 0 ? void 0 : regex.test(parentKey)) {
                                         propertyMatched = true;
                                         var propertySchema = s.schema.patternProperties[pattern];
                                         this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types);

package/lib/umd/services/jsonSchemaService.js

@@ -67,17 +67,18 @@
         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 = new Map();
             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;
         };
@@ -85,15 +86,18 @@
             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.clear();
+            return hasChanges;
         };
         return SchemaHandle;
     }());
@@ -131,7 +135,7 @@
                 for (var _i = 0, _a = Object.keys(schema.patternProperties); _i < _a.length; _i++) {
                     var pattern = _a[_i];
                     var regex = Strings.extendedRegExp(pattern);
-                    if (regex.test(next)) {
+                    if (regex === null || regex === void 0 ? void 0 : regex.test(next)) {
                         return this.getSectionRecursive(path, schema.patternProperties[pattern]);
                     }
                 }
@@ -197,13 +201,14 @@
                 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;
                     }
                 }
             }
@@ -299,7 +304,7 @@
                 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;
@@ -311,6 +316,9 @@
                 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) {
@@ -328,42 +336,90 @@
                 });
                 return current;
             };
-            var merge = function (target, sourceRoot, sourceURI, refSegment) {
+            var merge = function (target, section) {
+                for (var key in section) {
+                    if (section.hasOwnProperty(key) && !target.hasOwnProperty(key)) {
+                        target[key] = section[key];
+                    }
+                }
+            };
+            var mergeByJsonPointer = 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];
-                        }
-                    }
+                    merge(target, section);
                 }
                 else {
                     resolveErrors.push(localize('json.schema.invalidref', '$ref \'{0}\' in \'{1}\' can not be resolved.', path, sourceURI));
                 }
             };
-            var resolveExternalLink = function (node, uri, refSegment, parentSchemaURL, parentSchemaDependencies) {
+            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, 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);
+                    // 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); });
                 });
             };
-            var resolveRefs = function (node, parentSchema, parentSchemaURL, parentSchemaDependencies) {
+            var resolveRefs = function (node, parentSchema, parentHandle) {
                 if (!node || typeof node !== 'object') {
                     return Promise.resolve(null);
                 }
                 var toWalk = [node];
-                var seen = [];
+                var seen = new Set();
                 var openPromises = [];
                 var collectEntries = function () {
                     var entries = [];
@@ -413,19 +469,27 @@
                     }
                 };
                 var handleRef = function (next) {
-                    var seenRefs = [];
+                    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];
+                                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
+                                }
+                                seenRefs.add(ref);
                             }
                         }
                     }
@@ -433,39 +497,70 @@
                     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
+                    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
+                            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);
+                            }
+                            pendingSubSchemas.delete(fullId);
+                        }
+                    }
+                };
                 while (toWalk.length) {
                     var next = toWalk.pop();
-                    if (seen.indexOf(next) >= 0) {
+                    if (seen.has(next)) {
                         continue;
                     }
-                    seen.push(next);
+                    seen.add(next);
+                    handleId(next);
                     handleRef(next);
                 }
                 return _this.promise.all(openPromises);
             };
-            return resolveRefs(schema, schema, schemaURL, dependencies).then(function (_) { return new ResolvedSchema(schema, resolveErrors); });
+            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));
+                }
+                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);
-                        }
-                        if (schemeId) {
-                            var id = normalizeId(schemeId);
-                            return this.getOrAddSchemaHandle(id).getResolvedSchema();
+        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;
                     }
                 }
             }
-            if (this.cachedSchemaForResource && this.cachedSchemaForResource.resource === resource) {
-                return this.cachedSchemaForResource.resolvedSchema;
-            }
+            return undefined;
+        };
+        JSONSchemaService.prototype.getAssociatedSchemas = function (resource) {
             var seen = Object.create(null);
             var schemas = [];
             var normalizedResource = normalizeResourceForMatching(resource);
@@ -481,6 +576,28 @@
                     }
                 }
             }
+            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;
@@ -500,7 +617,8 @@
         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/umd/services/jsonValidation.js

@@ -8,13 +8,12 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./jsonSchemaService", "../jsonLanguageTypes", "vscode-nls", "../utils/objects"], factory);
+        define(["require", "exports", "../jsonLanguageTypes", "vscode-nls", "../utils/objects"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JSONValidation = void 0;
-    var jsonSchemaService_1 = require("./jsonSchemaService");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     var nls = require("vscode-nls");
     var objects_1 = require("../utils/objects");
@@ -98,7 +97,8 @@
             };
             if (schema) {
                 var id = schema.id || ('schemaservice://untitled/' + idCounter++);
-                return this.jsonSchemaService.resolveSchemaContent(new jsonSchemaService_1.UnresolvedSchema(schema), id, {}).then(function (resolvedSchema) {
+                var handle = this.jsonSchemaService.registerExternalSchema(id, [], schema);
+                return handle.getResolvedSchema().then(function (resolvedSchema) {
                     return getDiagnostics(resolvedSchema);
                 });
             }
@@ -106,6 +106,9 @@
                 return getDiagnostics(schema);
             });
         };
+        JSONValidation.prototype.getLanguageStatus = function (textDocument, jsonDocument) {
+            return { schemas: this.jsonSchemaService.getSchemaURIsForResource(textDocument.uri, jsonDocument) };
+        };
         return JSONValidation;
     }());
     exports.JSONValidation = JSONValidation;

package/lib/umd/utils/strings.js

@@ -59,11 +59,23 @@
     }
     exports.repeat = repeat;
     function extendedRegExp(pattern) {
+        var flags = '';
         if (startsWith(pattern, '(?i)')) {
-            return new RegExp(pattern.substring(4), 'iu');
+            pattern = pattern.substring(4);
+            flags = 'i';
         }
-        else {
-            return new RegExp(pattern, 'u');
+        try {
+            return new RegExp(pattern, flags + 'u');
+        }
+        catch (e) {
+            // could be an exception due to the 'u ' flag
+            try {
+                return new RegExp(pattern, flags);
+            }
+            catch (e) {
+                // invalid pattern
+                return undefined;
+            }
         }
     }
     exports.extendedRegExp = extendedRegExp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "4.1.9",
+  "version": "4.2.0-next.2",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -14,9 +14,6 @@
   "bugs": {
     "url": "https://github.com/Microsoft/vscode-json-languageservice"
   },
-  "engines": {
-    "npm": ">=7.0.0"
-  },
   "devDependencies": {
     "@types/mocha": "^9.0.0",
     "@types/node": "^10.12.21",