vscode-json-languageservice 5.1.0 → 5.1.1

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+5.2.0 / 2022-08/19
+================
+* new type `SchemaDraft`, representing the offical JSON schema draft versions
+* new property `DocumentLanguageSettings.schemaDraft` to specify the schema version to use, if the schema does not contain a `$schema` property
+
 5.1.0 / 2022-07-11
 ================
 * new API option `FormattingOptions.keepLines` to indicate the formatter should keep the initial line positions 

package/lib/esm/jsonLanguageTypes.d.ts

@@ -94,6 +94,14 @@ export interface LanguageSettings {
     schemas?: SchemaConfiguration[];
 }
 export declare type SeverityLevel = 'error' | 'warning' | 'ignore';
+export declare enum SchemaDraft {
+    v3 = 3,
+    v4 = 4,
+    v6 = 6,
+    v7 = 7,
+    v2019_09 = 19,
+    v2020_12 = 20
+}
 export interface DocumentLanguageSettings {
     /**
      * The severity of reported comments. If not set, 'LanguageSettings.allowComments' defines whether comments are ignored or reported as errors.
@@ -111,6 +119,10 @@ export interface DocumentLanguageSettings {
      * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used.
      */
     schemaRequest?: SeverityLevel;
+    /**
+     * The draft version of schema to use if the schema doesn't specify one at $schema
+     */
+    schemaDraft?: SchemaDraft;
 }
 export interface SchemaConfiguration {
     /**

package/lib/esm/jsonLanguageTypes.js

@@ -31,6 +31,15 @@ export var ErrorCode;
     ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
     ErrorCode[ErrorCode["SchemaUnsupportedFeature"] = 769] = "SchemaUnsupportedFeature";
 })(ErrorCode || (ErrorCode = {}));
+export var SchemaDraft;
+(function (SchemaDraft) {
+    SchemaDraft[SchemaDraft["v3"] = 3] = "v3";
+    SchemaDraft[SchemaDraft["v4"] = 4] = "v4";
+    SchemaDraft[SchemaDraft["v6"] = 6] = "v6";
+    SchemaDraft[SchemaDraft["v7"] = 7] = "v7";
+    SchemaDraft[SchemaDraft["v2019_09"] = 19] = "v2019_09";
+    SchemaDraft[SchemaDraft["v2020_12"] = 20] = "v2020_12";
+})(SchemaDraft || (SchemaDraft = {}));
 export var ClientCapabilities;
 (function (ClientCapabilities) {
     ClientCapabilities.LATEST = {

package/lib/esm/parser/jsonParser.js

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 import * as Json from 'jsonc-parser';
 import { isNumber, equals, isBoolean, isString, isDefined, isObject } from '../utils/objects';
-import { extendedRegExp } from '../utils/strings';
-import { ErrorCode, Diagnostic, DiagnosticSeverity, Range } from '../jsonLanguageTypes';
+import { extendedRegExp, stringLength } from '../utils/strings';
+import { ErrorCode, Diagnostic, DiagnosticSeverity, Range, SchemaDraft } from '../jsonLanguageTypes';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 const formats = {
@@ -102,6 +102,19 @@ export var EnumMatch;
     EnumMatch[EnumMatch["Key"] = 0] = "Key";
     EnumMatch[EnumMatch["Enum"] = 1] = "Enum";
 })(EnumMatch || (EnumMatch = {}));
+const schemaDraftFromId = {
+    'http://json-schema.org/draft-03/schema#': SchemaDraft.v3,
+    'http://json-schema.org/draft-04/schema#': SchemaDraft.v4,
+    'http://json-schema.org/draft-06/schema#': SchemaDraft.v6,
+    'http://json-schema.org/draft-07/schema#': SchemaDraft.v7,
+    'https://json-schema.org/draft/2019-09/schema': SchemaDraft.v2019_09,
+    'https://json-schema.org/draft/2020-12/schema': SchemaDraft.v2020_12
+};
+class EvaluationContext {
+    constructor(schemaDraft) {
+        this.schemaDraft = schemaDraft;
+    }
+}
 class SchemaCollector {
     constructor(focusOffset = -1, exclude) {
         this.focusOffset = focusOffset;
@@ -124,9 +137,9 @@ class SchemaCollector {
 class NoOpSchemaCollector {
     constructor() { }
     get schemas() { return []; }
-    add(schema) { }
-    merge(other) { }
-    include(node) { return true; }
+    add(_schema) { }
+    merge(_other) { }
+    include(_node) { return true; }
     newSub() { return this; }
 }
 NoOpSchemaCollector.instance = new NoOpSchemaCollector();
@@ -143,13 +156,11 @@ export class ValidationResult {
     hasProblems() {
         return !!this.problems.length;
     }
-    mergeAll(validationResults) {
-        for (const validationResult of validationResults) {
-            this.merge(validationResult);
-        }
-    }
     merge(validationResult) {
         this.problems = this.problems.concat(validationResult.problems);
+        this.propertiesMatches += validationResult.propertiesMatches;
+        this.propertiesValueMatches += validationResult.propertiesValueMatches;
+        this.mergeProcessedProperties(validationResult);
     }
     mergeEnumValues(validationResult) {
         if (!this.enumValueMatch && !validationResult.enumValueMatch && this.enumValues && validationResult.enumValues) {
@@ -162,7 +173,7 @@ export class ValidationResult {
         }
     }
     mergePropertyMatch(propertyValidationResult) {
-        this.merge(propertyValidationResult);
+        this.problems = this.problems.concat(propertyValidationResult.problems);
         this.propertiesMatches++;
         if (propertyValidationResult.enumValueMatch || !propertyValidationResult.hasProblems() && propertyValidationResult.propertiesMatches) {
             this.propertiesValueMatches++;
@@ -230,10 +241,10 @@ export class JSONDocument {
             doVisit(this.root);
         }
     }
-    validate(textDocument, schema, severity = DiagnosticSeverity.Warning) {
+    validate(textDocument, schema, severity = DiagnosticSeverity.Warning, schemaDraft) {
         if (this.root && schema) {
             const validationResult = new ValidationResult();
-            validate(this.root, schema, validationResult, NoOpSchemaCollector.instance);
+            validate(this.root, schema, validationResult, NoOpSchemaCollector.instance, new EvaluationContext(schemaDraft ?? getSchemaDraft(schema)));
             return validationResult.problems.map(p => {
                 const range = Range.create(textDocument.positionAt(p.location.offset), textDocument.positionAt(p.location.offset + p.location.length));
                 return Diagnostic.create(range, p.message, p.severity ?? severity, p.code);
@@ -242,19 +253,29 @@ export class JSONDocument {
         return undefined;
     }
     getMatchingSchemas(schema, focusOffset = -1, exclude) {
-        const matchingSchemas = new SchemaCollector(focusOffset, exclude);
         if (this.root && schema) {
-            validate(this.root, schema, new ValidationResult(), matchingSchemas);
+            const matchingSchemas = new SchemaCollector(focusOffset, exclude);
+            const schemaDraft = getSchemaDraft(schema);
+            const context = new EvaluationContext(schemaDraft);
+            validate(this.root, schema, new ValidationResult(), matchingSchemas, context);
+            return matchingSchemas.schemas;
         }
-        return matchingSchemas.schemas;
+        return [];
     }
 }
-function validate(n, schema, validationResult, matchingSchemas) {
+function getSchemaDraft(schema, fallBack = SchemaDraft.v2020_12) {
+    let schemaId = schema.$schema;
+    if (schemaId) {
+        return schemaDraftFromId[schemaId] ?? fallBack;
+    }
+    return fallBack;
+}
+function validate(n, schema, validationResult, matchingSchemas, context) {
     if (!n || !matchingSchemas.include(n)) {
         return;
     }
     if (n.type === 'property') {
-        return validate(n.valueNode, schema, validationResult, matchingSchemas);
+        return validate(n.valueNode, schema, validationResult, matchingSchemas, context);
     }
     const node = n;
     _validateNode();
@@ -295,14 +316,18 @@ function validate(n, schema, validationResult, matchingSchemas) {
         }
         if (Array.isArray(schema.allOf)) {
             for (const subSchemaRef of schema.allOf) {
-                validate(node, asSchema(subSchemaRef), validationResult, matchingSchemas);
+                const subValidationResult = new ValidationResult();
+                const subMatchingSchemas = matchingSchemas.newSub();
+                validate(node, asSchema(subSchemaRef), subValidationResult, subMatchingSchemas, context);
+                validationResult.merge(subValidationResult);
+                matchingSchemas.merge(subMatchingSchemas);
             }
         }
         const notSchema = asSchema(schema.not);
         if (notSchema) {
             const subValidationResult = new ValidationResult();
             const subMatchingSchemas = matchingSchemas.newSub();
-            validate(node, notSchema, subValidationResult, subMatchingSchemas);
+            validate(node, notSchema, subValidationResult, subMatchingSchemas, context);
             if (!subValidationResult.hasProblems()) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
@@ -322,7 +347,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                 const subSchema = asSchema(subSchemaRef);
                 const subValidationResult = new ValidationResult();
                 const subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, subSchema, subValidationResult, subMatchingSchemas);
+                validate(node, subSchema, subValidationResult, subMatchingSchemas, context);
                 if (!subValidationResult.hasProblems()) {
                     matches.push(subSchema);
                 }
@@ -359,9 +384,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             }
             if (bestMatch) {
                 validationResult.merge(bestMatch.validationResult);
-                validationResult.propertiesMatches += bestMatch.validationResult.propertiesMatches;
-                validationResult.propertiesValueMatches += bestMatch.validationResult.propertiesValueMatches;
-                validationResult.mergeProcessedProperties(bestMatch.validationResult);
                 matchingSchemas.merge(bestMatch.matchingSchemas);
             }
             return matches.length;
@@ -375,18 +397,15 @@ function validate(n, schema, validationResult, matchingSchemas) {
         const testBranch = (schema) => {
             const subValidationResult = new ValidationResult();
             const subMatchingSchemas = matchingSchemas.newSub();
-            validate(node, asSchema(schema), subValidationResult, subMatchingSchemas);
+            validate(node, asSchema(schema), subValidationResult, subMatchingSchemas, context);
             validationResult.merge(subValidationResult);
-            validationResult.propertiesMatches += subValidationResult.propertiesMatches;
-            validationResult.propertiesValueMatches += subValidationResult.propertiesValueMatches;
-            validationResult.mergeProcessedProperties(subValidationResult);
             matchingSchemas.merge(subMatchingSchemas);
         };
         const testCondition = (ifSchema, thenSchema, elseSchema) => {
             const subSchema = asSchema(ifSchema);
             const subValidationResult = new ValidationResult();
             const subMatchingSchemas = matchingSchemas.newSub();
-            validate(node, subSchema, subValidationResult, subMatchingSchemas);
+            validate(node, subSchema, subValidationResult, subMatchingSchemas, context);
             matchingSchemas.merge(subMatchingSchemas);
             validationResult.mergeProcessedProperties(subValidationResult);
             if (!subValidationResult.hasProblems()) {
@@ -528,13 +547,13 @@ function validate(n, schema, validationResult, matchingSchemas) {
         }
     }
     function _validateStringNode(node) {
-        if (isNumber(schema.minLength) && node.value.length < schema.minLength) {
+        if (isNumber(schema.minLength) && stringLength(node.value) < schema.minLength) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 message: localize('minLengthWarning', 'String is shorter than the minimum length of {0}.', schema.minLength)
             });
         }
-        if (isNumber(schema.maxLength) && node.value.length > schema.maxLength) {
+        if (isNumber(schema.maxLength) && stringLength(node.value) > schema.maxLength) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 message: localize('maxLengthWarning', 'String is longer than the maximum length of {0}.', schema.maxLength)
@@ -597,8 +616,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
     function _validateArrayNode(node) {
         let prefixItemsSchemas;
         let additionalItemSchema;
-        let isSchema_2020_12 = Array.isArray(schema.prefixItems) || (schema.items !== undefined && !Array.isArray(schema.items) && schema.additionalItems === undefined);
-        if (isSchema_2020_12) {
+        if (context.schemaDraft >= SchemaDraft.v2020_12) {
             prefixItemsSchemas = schema.prefixItems;
             additionalItemSchema = !Array.isArray(schema.items) ? schema.items : undefined;
         }
@@ -615,7 +633,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                 const itemValidationResult = new ValidationResult();
                 const item = node.items[index];
                 if (item) {
-                    validate(item, subSchema, itemValidationResult, matchingSchemas);
+                    validate(item, subSchema, itemValidationResult, matchingSchemas, context);
                     validationResult.mergePropertyMatch(itemValidationResult);
                 }
                 validationResult.processedProperties.add(String(index));
@@ -637,7 +655,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
             else {
                 for (; index < node.items.length; index++) {
                     const itemValidationResult = new ValidationResult();
-                    validate(node.items[index], additionalItemSchema, itemValidationResult, matchingSchemas);
+                    validate(node.items[index], additionalItemSchema, itemValidationResult, matchingSchemas, context);
                     validationResult.mergePropertyMatch(itemValidationResult);
                     validationResult.processedProperties.add(String(index));
                 }
@@ -649,10 +667,10 @@ function validate(n, schema, validationResult, matchingSchemas) {
             for (let index = 0; index < node.items.length; index++) {
                 const item = node.items[index];
                 const itemValidationResult = new ValidationResult();
-                validate(item, containsSchema, itemValidationResult, NoOpSchemaCollector.instance);
+                validate(item, containsSchema, itemValidationResult, NoOpSchemaCollector.instance, context);
                 if (!itemValidationResult.hasProblems()) {
                     containsCount++;
-                    if (isSchema_2020_12) {
+                    if (context.schemaDraft >= SchemaDraft.v2020_12) {
                         validationResult.processedProperties.add(String(index));
                     }
                 }
@@ -688,7 +706,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                     }
                     else {
                         const itemValidationResult = new ValidationResult();
-                        validate(node.items[i], schema.additionalItems, itemValidationResult, matchingSchemas);
+                        validate(node.items[i], schema.unevaluatedItems, itemValidationResult, matchingSchemas, context);
                         validationResult.mergePropertyMatch(itemValidationResult);
                     }
                 }
@@ -766,7 +784,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                     }
                     else {
                         const propertyValidationResult = new ValidationResult();
-                        validate(child, propertySchema, propertyValidationResult, matchingSchemas);
+                        validate(child, propertySchema, propertyValidationResult, matchingSchemas, context);
                         validationResult.mergePropertyMatch(propertyValidationResult);
                     }
                 }
@@ -798,7 +816,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                                 }
                                 else {
                                     const propertyValidationResult = new ValidationResult();
-                                    validate(child, propertySchema, propertyValidationResult, matchingSchemas);
+                                    validate(child, propertySchema, propertyValidationResult, matchingSchemas, context);
                                     validationResult.mergePropertyMatch(propertyValidationResult);
                                 }
                             }
@@ -809,7 +827,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
             }
         }
         const additionalProperties = schema.additionalProperties;
-        if (additionalProperties !== undefined && additionalProperties !== true) {
+        if (additionalProperties !== undefined) {
             for (const propertyName of unprocessedProperties) {
                 propertyProcessed(propertyName);
                 const child = seenKeys[propertyName];
@@ -821,16 +839,16 @@ function validate(n, schema, validationResult, matchingSchemas) {
                             message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                         });
                     }
-                    else {
+                    else if (additionalProperties !== true) {
                         const propertyValidationResult = new ValidationResult();
-                        validate(child, additionalProperties, propertyValidationResult, matchingSchemas);
+                        validate(child, additionalProperties, propertyValidationResult, matchingSchemas, context);
                         validationResult.mergePropertyMatch(propertyValidationResult);
                     }
                 }
             }
         }
         const unevaluatedProperties = schema.unevaluatedProperties;
-        if (unevaluatedProperties !== undefined && unevaluatedProperties !== true) {
+        if (unevaluatedProperties !== undefined) {
             const processed = [];
             for (const propertyName of unprocessedProperties) {
                 if (!validationResult.processedProperties.has(propertyName)) {
@@ -844,9 +862,9 @@ function validate(n, schema, validationResult, matchingSchemas) {
                                 message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                             });
                         }
-                        else {
+                        else if (unevaluatedProperties !== true) {
                             const propertyValidationResult = new ValidationResult();
-                            validate(child, unevaluatedProperties, propertyValidationResult, matchingSchemas);
+                            validate(child, unevaluatedProperties, propertyValidationResult, matchingSchemas, context);
                             validationResult.mergePropertyMatch(propertyValidationResult);
                         }
                     }
@@ -901,7 +919,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
             for (const f of node.properties) {
                 const key = f.keyNode;
                 if (key) {
-                    validate(key, propertyNames, validationResult, NoOpSchemaCollector.instance);
+                    validate(key, propertyNames, validationResult, NoOpSchemaCollector.instance, context);
                 }
             }
         }
@@ -923,7 +941,7 @@ function validate(n, schema, validationResult, matchingSchemas) {
                 const propertySchema = asSchema(propertyDep);
                 if (propertySchema) {
                     const propertyValidationResult = new ValidationResult();
-                    validate(node, propertySchema, propertyValidationResult, matchingSchemas);
+                    validate(node, propertySchema, propertyValidationResult, matchingSchemas, context);
                     validationResult.mergePropertyMatch(propertyValidationResult);
                 }
             }

package/lib/esm/services/jsonSchemaService.js

@@ -258,10 +258,17 @@ export class JSONSchemaService {
                 const errorMessage = localize('json.schema.nocontent', 'Unable to load schema from \'{0}\': No content.', toDisplayString(url));
                 return new UnresolvedSchema({}, [errorMessage]);
             }
+            const errors = [];
+            if (content.charCodeAt(0) === 65279) {
+                errors.push(localize('json.schema.encodingWithBOM', 'Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)));
+                content = content.trimStart();
+            }
             let schemaContent = {};
             const jsonErrors = [];
             schemaContent = Json.parse(content, jsonErrors);
-            const errors = jsonErrors.length ? [localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset)] : [];
+            if (jsonErrors.length) {
+                errors.push(localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset));
+            }
             return new UnresolvedSchema(schemaContent, errors);
         }, (error) => {
             let errorMessage = error.toString();
@@ -306,7 +313,7 @@ export class JSONSchemaService {
         };
         const merge = (target, section) => {
             for (const key in section) {
-                if (section.hasOwnProperty(key) && !target.hasOwnProperty(key) && key !== 'id' && key !== '$id') {
+                if (section.hasOwnProperty(key) && key !== 'id' && key !== '$id') {
                     target[key] = section[key];
                 }
             }

package/lib/esm/services/jsonValidation.js

@@ -60,7 +60,7 @@ export class JSONValidation {
                     for (const warning of schema.warnings) {
                         addSchemaProblem(warning, ErrorCode.SchemaUnsupportedFeature);
                     }
-                    const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
+                    const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation, documentSettings?.schemaDraft);
                     if (semanticErrors) {
                         semanticErrors.forEach(addProblem);
                     }

package/lib/esm/utils/strings.js

@@ -62,3 +62,18 @@ export function extendedRegExp(pattern) {
         }
     }
 }
+// from https://tanishiking.github.io/posts/count-unicode-codepoint/#work-hard-with-for-statements
+export function stringLength(str) {
+    let count = 0;
+    for (let i = 0; i < str.length; i++) {
+        count++;
+        // obtain the i-th 16-bit
+        const code = str.charCodeAt(i);
+        if (0xD800 <= code && code <= 0xDBFF) {
+            // if the i-th 16bit is an upper surrogate
+            // skip the next 16 bits (lower surrogate)
+            i++;
+        }
+    }
+    return count;
+}

package/lib/umd/jsonLanguageTypes.d.ts

@@ -94,6 +94,14 @@ export interface LanguageSettings {
     schemas?: SchemaConfiguration[];
 }
 export declare type SeverityLevel = 'error' | 'warning' | 'ignore';
+export declare enum SchemaDraft {
+    v3 = 3,
+    v4 = 4,
+    v6 = 6,
+    v7 = 7,
+    v2019_09 = 19,
+    v2020_12 = 20
+}
 export interface DocumentLanguageSettings {
     /**
      * The severity of reported comments. If not set, 'LanguageSettings.allowComments' defines whether comments are ignored or reported as errors.
@@ -111,6 +119,10 @@ export interface DocumentLanguageSettings {
      * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used.
      */
     schemaRequest?: SeverityLevel;
+    /**
+     * The draft version of schema to use if the schema doesn't specify one at $schema
+     */
+    schemaDraft?: SchemaDraft;
 }
 export interface SchemaConfiguration {
     /**

package/lib/umd/jsonLanguageTypes.js

@@ -13,7 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ClientCapabilities = exports.ErrorCode = exports.DocumentHighlightKind = exports.VersionedTextDocumentIdentifier = exports.TextDocumentEdit = exports.CodeActionKind = exports.TextEdit = exports.WorkspaceEdit = exports.DocumentLink = exports.DocumentHighlight = exports.CodeAction = exports.Command = exports.CodeActionContext = exports.MarkedString = exports.Hover = exports.Location = exports.DocumentSymbol = exports.SymbolKind = exports.SymbolInformation = exports.InsertTextFormat = exports.CompletionItemTag = exports.CompletionList = exports.CompletionItemKind = exports.CompletionItem = exports.DiagnosticSeverity = exports.Diagnostic = exports.SelectionRange = exports.FoldingRangeKind = exports.FoldingRange = exports.ColorPresentation = exports.ColorInformation = exports.Color = exports.MarkupKind = exports.MarkupContent = exports.DocumentUri = exports.Position = exports.Range = exports.TextDocument = void 0;
+    exports.ClientCapabilities = exports.SchemaDraft = exports.ErrorCode = exports.DocumentHighlightKind = exports.VersionedTextDocumentIdentifier = exports.TextDocumentEdit = exports.CodeActionKind = exports.TextEdit = exports.WorkspaceEdit = exports.DocumentLink = exports.DocumentHighlight = exports.CodeAction = exports.Command = exports.CodeActionContext = exports.MarkedString = exports.Hover = exports.Location = exports.DocumentSymbol = exports.SymbolKind = exports.SymbolInformation = exports.InsertTextFormat = exports.CompletionItemTag = exports.CompletionList = exports.CompletionItemKind = exports.CompletionItem = exports.DiagnosticSeverity = exports.Diagnostic = exports.SelectionRange = exports.FoldingRangeKind = exports.FoldingRange = exports.ColorPresentation = exports.ColorInformation = exports.Color = exports.MarkupKind = exports.MarkupContent = exports.DocumentUri = exports.Position = exports.Range = exports.TextDocument = void 0;
     const vscode_languageserver_types_1 = require("vscode-languageserver-types");
     Object.defineProperty(exports, "Range", { enumerable: true, get: function () { return vscode_languageserver_types_1.Range; } });
     Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return vscode_languageserver_types_1.Position; } });
@@ -78,6 +78,15 @@
         ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
         ErrorCode[ErrorCode["SchemaUnsupportedFeature"] = 769] = "SchemaUnsupportedFeature";
     })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
+    var SchemaDraft;
+    (function (SchemaDraft) {
+        SchemaDraft[SchemaDraft["v3"] = 3] = "v3";
+        SchemaDraft[SchemaDraft["v4"] = 4] = "v4";
+        SchemaDraft[SchemaDraft["v6"] = 6] = "v6";
+        SchemaDraft[SchemaDraft["v7"] = 7] = "v7";
+        SchemaDraft[SchemaDraft["v2019_09"] = 19] = "v2019_09";
+        SchemaDraft[SchemaDraft["v2020_12"] = 20] = "v2020_12";
+    })(SchemaDraft = exports.SchemaDraft || (exports.SchemaDraft = {}));
     var ClientCapabilities;
     (function (ClientCapabilities) {
         ClientCapabilities.LATEST = {

package/lib/umd/parser/jsonParser.js

@@ -123,6 +123,19 @@
         EnumMatch[EnumMatch["Key"] = 0] = "Key";
         EnumMatch[EnumMatch["Enum"] = 1] = "Enum";
     })(EnumMatch = exports.EnumMatch || (exports.EnumMatch = {}));
+    const schemaDraftFromId = {
+        'http://json-schema.org/draft-03/schema#': jsonLanguageTypes_1.SchemaDraft.v3,
+        'http://json-schema.org/draft-04/schema#': jsonLanguageTypes_1.SchemaDraft.v4,
+        'http://json-schema.org/draft-06/schema#': jsonLanguageTypes_1.SchemaDraft.v6,
+        'http://json-schema.org/draft-07/schema#': jsonLanguageTypes_1.SchemaDraft.v7,
+        'https://json-schema.org/draft/2019-09/schema': jsonLanguageTypes_1.SchemaDraft.v2019_09,
+        'https://json-schema.org/draft/2020-12/schema': jsonLanguageTypes_1.SchemaDraft.v2020_12
+    };
+    class EvaluationContext {
+        constructor(schemaDraft) {
+            this.schemaDraft = schemaDraft;
+        }
+    }
     class SchemaCollector {
         constructor(focusOffset = -1, exclude) {
             this.focusOffset = focusOffset;
@@ -145,9 +158,9 @@
     class NoOpSchemaCollector {
         constructor() { }
         get schemas() { return []; }
-        add(schema) { }
-        merge(other) { }
-        include(node) { return true; }
+        add(_schema) { }
+        merge(_other) { }
+        include(_node) { return true; }
         newSub() { return this; }
     }
     NoOpSchemaCollector.instance = new NoOpSchemaCollector();
@@ -164,13 +177,11 @@
         hasProblems() {
             return !!this.problems.length;
         }
-        mergeAll(validationResults) {
-            for (const validationResult of validationResults) {
-                this.merge(validationResult);
-            }
-        }
         merge(validationResult) {
             this.problems = this.problems.concat(validationResult.problems);
+            this.propertiesMatches += validationResult.propertiesMatches;
+            this.propertiesValueMatches += validationResult.propertiesValueMatches;
+            this.mergeProcessedProperties(validationResult);
         }
         mergeEnumValues(validationResult) {
             if (!this.enumValueMatch && !validationResult.enumValueMatch && this.enumValues && validationResult.enumValues) {
@@ -183,7 +194,7 @@
             }
         }
         mergePropertyMatch(propertyValidationResult) {
-            this.merge(propertyValidationResult);
+            this.problems = this.problems.concat(propertyValidationResult.problems);
             this.propertiesMatches++;
             if (propertyValidationResult.enumValueMatch || !propertyValidationResult.hasProblems() && propertyValidationResult.propertiesMatches) {
                 this.propertiesValueMatches++;
@@ -256,10 +267,10 @@
                 doVisit(this.root);
             }
         }
-        validate(textDocument, schema, severity = jsonLanguageTypes_1.DiagnosticSeverity.Warning) {
+        validate(textDocument, schema, severity = jsonLanguageTypes_1.DiagnosticSeverity.Warning, schemaDraft) {
             if (this.root && schema) {
                 const validationResult = new ValidationResult();
-                validate(this.root, schema, validationResult, NoOpSchemaCollector.instance);
+                validate(this.root, schema, validationResult, NoOpSchemaCollector.instance, new EvaluationContext(schemaDraft ?? getSchemaDraft(schema)));
                 return validationResult.problems.map(p => {
                     const range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(p.location.offset), textDocument.positionAt(p.location.offset + p.location.length));
                     return jsonLanguageTypes_1.Diagnostic.create(range, p.message, p.severity ?? severity, p.code);
@@ -268,20 +279,30 @@
             return undefined;
         }
         getMatchingSchemas(schema, focusOffset = -1, exclude) {
-            const matchingSchemas = new SchemaCollector(focusOffset, exclude);
             if (this.root && schema) {
-                validate(this.root, schema, new ValidationResult(), matchingSchemas);
+                const matchingSchemas = new SchemaCollector(focusOffset, exclude);
+                const schemaDraft = getSchemaDraft(schema);
+                const context = new EvaluationContext(schemaDraft);
+                validate(this.root, schema, new ValidationResult(), matchingSchemas, context);
+                return matchingSchemas.schemas;
             }
-            return matchingSchemas.schemas;
+            return [];
         }
     }
     exports.JSONDocument = JSONDocument;
-    function validate(n, schema, validationResult, matchingSchemas) {
+    function getSchemaDraft(schema, fallBack = jsonLanguageTypes_1.SchemaDraft.v2020_12) {
+        let schemaId = schema.$schema;
+        if (schemaId) {
+            return schemaDraftFromId[schemaId] ?? fallBack;
+        }
+        return fallBack;
+    }
+    function validate(n, schema, validationResult, matchingSchemas, context) {
         if (!n || !matchingSchemas.include(n)) {
             return;
         }
         if (n.type === 'property') {
-            return validate(n.valueNode, schema, validationResult, matchingSchemas);
+            return validate(n.valueNode, schema, validationResult, matchingSchemas, context);
         }
         const node = n;
         _validateNode();
@@ -322,14 +343,18 @@
             }
             if (Array.isArray(schema.allOf)) {
                 for (const subSchemaRef of schema.allOf) {
-                    validate(node, asSchema(subSchemaRef), validationResult, matchingSchemas);
+                    const subValidationResult = new ValidationResult();
+                    const subMatchingSchemas = matchingSchemas.newSub();
+                    validate(node, asSchema(subSchemaRef), subValidationResult, subMatchingSchemas, context);
+                    validationResult.merge(subValidationResult);
+                    matchingSchemas.merge(subMatchingSchemas);
                 }
             }
             const notSchema = asSchema(schema.not);
             if (notSchema) {
                 const subValidationResult = new ValidationResult();
                 const subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, notSchema, subValidationResult, subMatchingSchemas);
+                validate(node, notSchema, subValidationResult, subMatchingSchemas, context);
                 if (!subValidationResult.hasProblems()) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
@@ -349,7 +374,7 @@
                     const subSchema = asSchema(subSchemaRef);
                     const subValidationResult = new ValidationResult();
                     const subMatchingSchemas = matchingSchemas.newSub();
-                    validate(node, subSchema, subValidationResult, subMatchingSchemas);
+                    validate(node, subSchema, subValidationResult, subMatchingSchemas, context);
                     if (!subValidationResult.hasProblems()) {
                         matches.push(subSchema);
                     }
@@ -386,9 +411,6 @@
                 }
                 if (bestMatch) {
                     validationResult.merge(bestMatch.validationResult);
-                    validationResult.propertiesMatches += bestMatch.validationResult.propertiesMatches;
-                    validationResult.propertiesValueMatches += bestMatch.validationResult.propertiesValueMatches;
-                    validationResult.mergeProcessedProperties(bestMatch.validationResult);
                     matchingSchemas.merge(bestMatch.matchingSchemas);
                 }
                 return matches.length;
@@ -402,18 +424,15 @@
             const testBranch = (schema) => {
                 const subValidationResult = new ValidationResult();
                 const subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, asSchema(schema), subValidationResult, subMatchingSchemas);
+                validate(node, asSchema(schema), subValidationResult, subMatchingSchemas, context);
                 validationResult.merge(subValidationResult);
-                validationResult.propertiesMatches += subValidationResult.propertiesMatches;
-                validationResult.propertiesValueMatches += subValidationResult.propertiesValueMatches;
-                validationResult.mergeProcessedProperties(subValidationResult);
                 matchingSchemas.merge(subMatchingSchemas);
             };
             const testCondition = (ifSchema, thenSchema, elseSchema) => {
                 const subSchema = asSchema(ifSchema);
                 const subValidationResult = new ValidationResult();
                 const subMatchingSchemas = matchingSchemas.newSub();
-                validate(node, subSchema, subValidationResult, subMatchingSchemas);
+                validate(node, subSchema, subValidationResult, subMatchingSchemas, context);
                 matchingSchemas.merge(subMatchingSchemas);
                 validationResult.mergeProcessedProperties(subValidationResult);
                 if (!subValidationResult.hasProblems()) {
@@ -555,13 +574,13 @@
             }
         }
         function _validateStringNode(node) {
-            if ((0, objects_1.isNumber)(schema.minLength) && node.value.length < schema.minLength) {
+            if ((0, objects_1.isNumber)(schema.minLength) && (0, strings_1.stringLength)(node.value) < schema.minLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('minLengthWarning', 'String is shorter than the minimum length of {0}.', schema.minLength)
                 });
             }
-            if ((0, objects_1.isNumber)(schema.maxLength) && node.value.length > schema.maxLength) {
+            if ((0, objects_1.isNumber)(schema.maxLength) && (0, strings_1.stringLength)(node.value) > schema.maxLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     message: localize('maxLengthWarning', 'String is longer than the maximum length of {0}.', schema.maxLength)
@@ -624,8 +643,7 @@
         function _validateArrayNode(node) {
             let prefixItemsSchemas;
             let additionalItemSchema;
-            let isSchema_2020_12 = Array.isArray(schema.prefixItems) || (schema.items !== undefined && !Array.isArray(schema.items) && schema.additionalItems === undefined);
-            if (isSchema_2020_12) {
+            if (context.schemaDraft >= jsonLanguageTypes_1.SchemaDraft.v2020_12) {
                 prefixItemsSchemas = schema.prefixItems;
                 additionalItemSchema = !Array.isArray(schema.items) ? schema.items : undefined;
             }
@@ -642,7 +660,7 @@
                     const itemValidationResult = new ValidationResult();
                     const item = node.items[index];
                     if (item) {
-                        validate(item, subSchema, itemValidationResult, matchingSchemas);
+                        validate(item, subSchema, itemValidationResult, matchingSchemas, context);
                         validationResult.mergePropertyMatch(itemValidationResult);
                     }
                     validationResult.processedProperties.add(String(index));
@@ -664,7 +682,7 @@
                 else {
                     for (; index < node.items.length; index++) {
                         const itemValidationResult = new ValidationResult();
-                        validate(node.items[index], additionalItemSchema, itemValidationResult, matchingSchemas);
+                        validate(node.items[index], additionalItemSchema, itemValidationResult, matchingSchemas, context);
                         validationResult.mergePropertyMatch(itemValidationResult);
                         validationResult.processedProperties.add(String(index));
                     }
@@ -676,10 +694,10 @@
                 for (let index = 0; index < node.items.length; index++) {
                     const item = node.items[index];
                     const itemValidationResult = new ValidationResult();
-                    validate(item, containsSchema, itemValidationResult, NoOpSchemaCollector.instance);
+                    validate(item, containsSchema, itemValidationResult, NoOpSchemaCollector.instance, context);
                     if (!itemValidationResult.hasProblems()) {
                         containsCount++;
-                        if (isSchema_2020_12) {
+                        if (context.schemaDraft >= jsonLanguageTypes_1.SchemaDraft.v2020_12) {
                             validationResult.processedProperties.add(String(index));
                         }
                     }
@@ -715,7 +733,7 @@
                         }
                         else {
                             const itemValidationResult = new ValidationResult();
-                            validate(node.items[i], schema.additionalItems, itemValidationResult, matchingSchemas);
+                            validate(node.items[i], schema.unevaluatedItems, itemValidationResult, matchingSchemas, context);
                             validationResult.mergePropertyMatch(itemValidationResult);
                         }
                     }
@@ -793,7 +811,7 @@
                         }
                         else {
                             const propertyValidationResult = new ValidationResult();
-                            validate(child, propertySchema, propertyValidationResult, matchingSchemas);
+                            validate(child, propertySchema, propertyValidationResult, matchingSchemas, context);
                             validationResult.mergePropertyMatch(propertyValidationResult);
                         }
                     }
@@ -825,7 +843,7 @@
                                     }
                                     else {
                                         const propertyValidationResult = new ValidationResult();
-                                        validate(child, propertySchema, propertyValidationResult, matchingSchemas);
+                                        validate(child, propertySchema, propertyValidationResult, matchingSchemas, context);
                                         validationResult.mergePropertyMatch(propertyValidationResult);
                                     }
                                 }
@@ -836,7 +854,7 @@
                 }
             }
             const additionalProperties = schema.additionalProperties;
-            if (additionalProperties !== undefined && additionalProperties !== true) {
+            if (additionalProperties !== undefined) {
                 for (const propertyName of unprocessedProperties) {
                     propertyProcessed(propertyName);
                     const child = seenKeys[propertyName];
@@ -848,16 +866,16 @@
                                 message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                             });
                         }
-                        else {
+                        else if (additionalProperties !== true) {
                             const propertyValidationResult = new ValidationResult();
-                            validate(child, additionalProperties, propertyValidationResult, matchingSchemas);
+                            validate(child, additionalProperties, propertyValidationResult, matchingSchemas, context);
                             validationResult.mergePropertyMatch(propertyValidationResult);
                         }
                     }
                 }
             }
             const unevaluatedProperties = schema.unevaluatedProperties;
-            if (unevaluatedProperties !== undefined && unevaluatedProperties !== true) {
+            if (unevaluatedProperties !== undefined) {
                 const processed = [];
                 for (const propertyName of unprocessedProperties) {
                     if (!validationResult.processedProperties.has(propertyName)) {
@@ -871,9 +889,9 @@
                                     message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                                 });
                             }
-                            else {
+                            else if (unevaluatedProperties !== true) {
                                 const propertyValidationResult = new ValidationResult();
-                                validate(child, unevaluatedProperties, propertyValidationResult, matchingSchemas);
+                                validate(child, unevaluatedProperties, propertyValidationResult, matchingSchemas, context);
                                 validationResult.mergePropertyMatch(propertyValidationResult);
                             }
                         }
@@ -928,7 +946,7 @@
                 for (const f of node.properties) {
                     const key = f.keyNode;
                     if (key) {
-                        validate(key, propertyNames, validationResult, NoOpSchemaCollector.instance);
+                        validate(key, propertyNames, validationResult, NoOpSchemaCollector.instance, context);
                     }
                 }
             }
@@ -950,7 +968,7 @@
                     const propertySchema = asSchema(propertyDep);
                     if (propertySchema) {
                         const propertyValidationResult = new ValidationResult();
-                        validate(node, propertySchema, propertyValidationResult, matchingSchemas);
+                        validate(node, propertySchema, propertyValidationResult, matchingSchemas, context);
                         validationResult.mergePropertyMatch(propertyValidationResult);
                     }
                 }

package/lib/umd/services/jsonSchemaService.js

@@ -272,10 +272,17 @@
                     const errorMessage = localize('json.schema.nocontent', 'Unable to load schema from \'{0}\': No content.', toDisplayString(url));
                     return new UnresolvedSchema({}, [errorMessage]);
                 }
+                const errors = [];
+                if (content.charCodeAt(0) === 65279) {
+                    errors.push(localize('json.schema.encodingWithBOM', 'Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)));
+                    content = content.trimStart();
+                }
                 let schemaContent = {};
                 const jsonErrors = [];
                 schemaContent = Json.parse(content, jsonErrors);
-                const errors = jsonErrors.length ? [localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset)] : [];
+                if (jsonErrors.length) {
+                    errors.push(localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset));
+                }
                 return new UnresolvedSchema(schemaContent, errors);
             }, (error) => {
                 let errorMessage = error.toString();
@@ -320,7 +327,7 @@
             };
             const merge = (target, section) => {
                 for (const key in section) {
-                    if (section.hasOwnProperty(key) && !target.hasOwnProperty(key) && key !== 'id' && key !== '$id') {
+                    if (section.hasOwnProperty(key) && key !== 'id' && key !== '$id') {
                         target[key] = section[key];
                     }
                 }

package/lib/umd/services/jsonValidation.js

@@ -72,7 +72,7 @@
                         for (const warning of schema.warnings) {
                             addSchemaProblem(warning, jsonLanguageTypes_1.ErrorCode.SchemaUnsupportedFeature);
                         }
-                        const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
+                        const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation, documentSettings?.schemaDraft);
                         if (semanticErrors) {
                             semanticErrors.forEach(addProblem);
                         }

package/lib/umd/utils/strings.js

@@ -13,7 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.extendedRegExp = exports.repeat = exports.convertSimple2RegExpPattern = exports.endsWith = exports.startsWith = void 0;
+    exports.stringLength = exports.extendedRegExp = exports.repeat = exports.convertSimple2RegExpPattern = exports.endsWith = exports.startsWith = void 0;
     function startsWith(haystack, needle) {
         if (haystack.length < needle.length) {
             return false;
@@ -79,4 +79,20 @@
         }
     }
     exports.extendedRegExp = extendedRegExp;
+    // from https://tanishiking.github.io/posts/count-unicode-codepoint/#work-hard-with-for-statements
+    function stringLength(str) {
+        let count = 0;
+        for (let i = 0; i < str.length; i++) {
+            count++;
+            // obtain the i-th 16-bit
+            const code = str.charCodeAt(i);
+            if (0xD800 <= code && code <= 0xDBFF) {
+                // if the i-th 16bit is an upper surrogate
+                // skip the next 16 bits (lower surrogate)
+                i++;
+            }
+        }
+        return count;
+    }
+    exports.stringLength = stringLength;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -17,19 +17,20 @@
   "devDependencies": {
     "@types/mocha": "^9.1.1",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^5.30.6",
-    "@typescript-eslint/parser": "^5.30.6",
-    "eslint": "^8.19.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
+    "eslint": "^8.24.0",
     "mocha": "^10.0.0",
     "rimraf": "^3.0.2",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.3",
+    "json-schema-test-suite": "https://github.com/json-schema-org/JSON-Schema-Test-Suite.git#69acf52990b004240839ae19b4bec8fb01d50876"
   },
   "dependencies": {
-    "jsonc-parser": "^3.1.0",
-    "vscode-languageserver-textdocument": "^1.0.4",
-    "vscode-languageserver-types": "^3.17.1",
-    "vscode-nls": "^5.0.1",
-    "vscode-uri": "^3.0.3"
+    "jsonc-parser": "^3.2.0",
+    "vscode-languageserver-textdocument": "^1.0.7",
+    "vscode-languageserver-types": "^3.17.2",
+    "vscode-nls": "^5.2.0",
+    "vscode-uri": "^3.0.6"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile-esm && npm run test && npm run remove-sourcemap-refs",