vscode-json-languageservice 4.2.0 → 5.1.0

package/lib/esm/services/jsonSelectionRanges.js

@@ -6,16 +6,16 @@ import { Range, SelectionRange } from '../jsonLanguageTypes';
 import { createScanner } from 'jsonc-parser';
 export function getSelectionRanges(document, positions, doc) {
     function getSelectionRange(position) {
-        var offset = document.offsetAt(position);
-        var node = doc.getNodeFromOffset(offset, true);
-        var result = [];
+        let offset = document.offsetAt(position);
+        let node = doc.getNodeFromOffset(offset, true);
+        const result = [];
         while (node) {
             switch (node.type) {
                 case 'string':
                 case 'object':
                 case 'array':
                     // range without ", [ or {
-                    var cStart = node.offset + 1, cEnd = node.offset + node.length - 1;
+                    const cStart = node.offset + 1, cEnd = node.offset + node.length - 1;
                     if (cStart < cEnd && offset >= cStart && offset <= cEnd) {
                         result.push(newRange(cStart, cEnd));
                     }
@@ -29,15 +29,15 @@ export function getSelectionRanges(document, positions, doc) {
                     break;
             }
             if (node.type === 'property' || node.parent && node.parent.type === 'array') {
-                var afterCommaOffset = getOffsetAfterNextToken(node.offset + node.length, 5 /* CommaToken */);
+                const afterCommaOffset = getOffsetAfterNextToken(node.offset + node.length, 5 /* SyntaxKind.CommaToken */);
                 if (afterCommaOffset !== -1) {
                     result.push(newRange(node.offset, afterCommaOffset));
                 }
             }
             node = node.parent;
         }
-        var current = undefined;
-        for (var index = result.length - 1; index >= 0; index--) {
+        let current = undefined;
+        for (let index = result.length - 1; index >= 0; index--) {
             current = SelectionRange.create(result[index], current);
         }
         if (!current) {
@@ -48,10 +48,10 @@ export function getSelectionRanges(document, positions, doc) {
     function newRange(start, end) {
         return Range.create(document.positionAt(start), document.positionAt(end));
     }
-    var scanner = createScanner(document.getText(), true);
+    const scanner = createScanner(document.getText(), true);
     function getOffsetAfterNextToken(offset, expectedToken) {
         scanner.setPosition(offset);
-        var token = scanner.scan();
+        let token = scanner.scan();
         if (token === expectedToken) {
             return scanner.getTokenOffset() + scanner.getTokenLength();
         }

package/lib/esm/services/jsonValidation.js

@@ -5,55 +5,62 @@
 import { ErrorCode, Diagnostic, DiagnosticSeverity, Range } from '../jsonLanguageTypes';
 import * as nls from 'vscode-nls';
 import { isBoolean } from '../utils/objects';
-var localize = nls.loadMessageBundle();
-var JSONValidation = /** @class */ (function () {
-    function JSONValidation(jsonSchemaService, promiseConstructor) {
+const localize = nls.loadMessageBundle();
+export class JSONValidation {
+    constructor(jsonSchemaService, promiseConstructor) {
         this.jsonSchemaService = jsonSchemaService;
         this.promise = promiseConstructor;
         this.validationEnabled = true;
     }
-    JSONValidation.prototype.configure = function (raw) {
+    configure(raw) {
         if (raw) {
             this.validationEnabled = raw.validate !== false;
             this.commentSeverity = raw.allowComments ? undefined : DiagnosticSeverity.Error;
         }
-    };
-    JSONValidation.prototype.doValidation = function (textDocument, jsonDocument, documentSettings, schema) {
-        var _this = this;
+    }
+    doValidation(textDocument, jsonDocument, documentSettings, schema) {
         if (!this.validationEnabled) {
             return this.promise.resolve([]);
         }
-        var diagnostics = [];
-        var added = {};
-        var addProblem = function (problem) {
+        const diagnostics = [];
+        const added = {};
+        const addProblem = (problem) => {
             // remove duplicated messages
-            var signature = problem.range.start.line + ' ' + problem.range.start.character + ' ' + problem.message;
+            const signature = problem.range.start.line + ' ' + problem.range.start.character + ' ' + problem.message;
             if (!added[signature]) {
                 added[signature] = true;
                 diagnostics.push(problem);
             }
         };
-        var getDiagnostics = function (schema) {
-            var trailingCommaSeverity = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.trailingCommas) ? toDiagnosticSeverity(documentSettings.trailingCommas) : DiagnosticSeverity.Error;
-            var commentSeverity = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.comments) ? toDiagnosticSeverity(documentSettings.comments) : _this.commentSeverity;
-            var schemaValidation = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaValidation) ? toDiagnosticSeverity(documentSettings.schemaValidation) : DiagnosticSeverity.Warning;
-            var schemaRequest = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaRequest) ? toDiagnosticSeverity(documentSettings.schemaRequest) : DiagnosticSeverity.Warning;
+        const getDiagnostics = (schema) => {
+            let trailingCommaSeverity = documentSettings?.trailingCommas ? toDiagnosticSeverity(documentSettings.trailingCommas) : DiagnosticSeverity.Error;
+            let commentSeverity = documentSettings?.comments ? toDiagnosticSeverity(documentSettings.comments) : this.commentSeverity;
+            let schemaValidation = documentSettings?.schemaValidation ? toDiagnosticSeverity(documentSettings.schemaValidation) : DiagnosticSeverity.Warning;
+            let schemaRequest = documentSettings?.schemaRequest ? toDiagnosticSeverity(documentSettings.schemaRequest) : DiagnosticSeverity.Warning;
             if (schema) {
-                if (schema.errors.length && jsonDocument.root && schemaRequest) {
-                    var astRoot = jsonDocument.root;
-                    var property = astRoot.type === 'object' ? astRoot.properties[0] : undefined;
-                    if (property && property.keyNode.value === '$schema') {
-                        var node = property.valueNode || property;
-                        var range = Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
-                        addProblem(Diagnostic.create(range, schema.errors[0], schemaRequest, ErrorCode.SchemaResolveError));
-                    }
-                    else {
-                        var range = Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
-                        addProblem(Diagnostic.create(range, schema.errors[0], schemaRequest, ErrorCode.SchemaResolveError));
+                const addSchemaProblem = (errorMessage, errorCode) => {
+                    if (jsonDocument.root && schemaRequest) {
+                        const astRoot = jsonDocument.root;
+                        const property = astRoot.type === 'object' ? astRoot.properties[0] : undefined;
+                        if (property && property.keyNode.value === '$schema') {
+                            const node = property.valueNode || property;
+                            const range = Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
+                            addProblem(Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                        }
+                        else {
+                            const range = Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
+                            addProblem(Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                        }
                     }
+                };
+                if (schema.errors.length) {
+                    addSchemaProblem(schema.errors[0], ErrorCode.SchemaResolveError);
                 }
                 else if (schemaValidation) {
-                    var semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
+                    for (const warning of schema.warnings) {
+                        addSchemaProblem(warning, ErrorCode.SchemaUnsupportedFeature);
+                    }
+                    const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
                     if (semanticErrors) {
                         semanticErrors.forEach(addProblem);
                     }
@@ -65,8 +72,7 @@ var JSONValidation = /** @class */ (function () {
                     trailingCommaSeverity = undefined;
                 }
             }
-            for (var _i = 0, _a = jsonDocument.syntaxErrors; _i < _a.length; _i++) {
-                var p = _a[_i];
+            for (const p of jsonDocument.syntaxErrors) {
                 if (p.code === ErrorCode.TrailingComma) {
                     if (typeof trailingCommaSeverity !== 'number') {
                         continue;
@@ -76,40 +82,37 @@ var JSONValidation = /** @class */ (function () {
                 addProblem(p);
             }
             if (typeof commentSeverity === 'number') {
-                var message_1 = localize('InvalidCommentToken', 'Comments are not permitted in JSON.');
-                jsonDocument.comments.forEach(function (c) {
-                    addProblem(Diagnostic.create(c, message_1, commentSeverity, ErrorCode.CommentNotPermitted));
+                const message = localize('InvalidCommentToken', 'Comments are not permitted in JSON.');
+                jsonDocument.comments.forEach(c => {
+                    addProblem(Diagnostic.create(c, message, commentSeverity, ErrorCode.CommentNotPermitted));
                 });
             }
             return diagnostics;
         };
         if (schema) {
-            var id = schema.id || ('schemaservice://untitled/' + idCounter++);
-            var handle = this.jsonSchemaService.registerExternalSchema(id, [], schema);
-            return handle.getResolvedSchema().then(function (resolvedSchema) {
+            const id = schema.id || ('schemaservice://untitled/' + idCounter++);
+            const handle = this.jsonSchemaService.registerExternalSchema(id, [], schema);
+            return handle.getResolvedSchema().then(resolvedSchema => {
                 return getDiagnostics(resolvedSchema);
             });
         }
-        return this.jsonSchemaService.getSchemaForResource(textDocument.uri, jsonDocument).then(function (schema) {
+        return this.jsonSchemaService.getSchemaForResource(textDocument.uri, jsonDocument).then(schema => {
             return getDiagnostics(schema);
         });
-    };
-    JSONValidation.prototype.getLanguageStatus = function (textDocument, jsonDocument) {
+    }
+    getLanguageStatus(textDocument, jsonDocument) {
         return { schemas: this.jsonSchemaService.getSchemaURIsForResource(textDocument.uri, jsonDocument) };
-    };
-    return JSONValidation;
-}());
-export { JSONValidation };
-var idCounter = 0;
+    }
+}
+let idCounter = 0;
 function schemaAllowsComments(schemaRef) {
     if (schemaRef && typeof schemaRef === 'object') {
         if (isBoolean(schemaRef.allowComments)) {
             return schemaRef.allowComments;
         }
         if (schemaRef.allOf) {
-            for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
-                var schema = _a[_i];
-                var allow = schemaAllowsComments(schema);
+            for (const schema of schemaRef.allOf) {
+                const allow = schemaAllowsComments(schema);
                 if (isBoolean(allow)) {
                     return allow;
                 }
@@ -123,14 +126,13 @@ function schemaAllowsTrailingCommas(schemaRef) {
         if (isBoolean(schemaRef.allowTrailingCommas)) {
             return schemaRef.allowTrailingCommas;
         }
-        var deprSchemaRef = schemaRef;
+        const deprSchemaRef = schemaRef;
         if (isBoolean(deprSchemaRef['allowsTrailingCommas'])) { // deprecated
             return deprSchemaRef['allowsTrailingCommas'];
         }
         if (schemaRef.allOf) {
-            for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
-                var schema = _a[_i];
-                var allow = schemaAllowsTrailingCommas(schema);
+            for (const schema of schemaRef.allOf) {
+                const allow = schemaAllowsTrailingCommas(schema);
                 if (isBoolean(allow)) {
                     return allow;
                 }

package/lib/esm/utils/colors.js

@@ -2,11 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var Digit0 = 48;
-var Digit9 = 57;
-var A = 65;
-var a = 97;
-var f = 102;
+const Digit0 = 48;
+const Digit9 = 57;
+const A = 65;
+const a = 97;
+const f = 102;
 export function hexDigit(charCode) {
     if (charCode < Digit0) {
         return 0;
@@ -58,12 +58,11 @@ export function colorFromHex(text) {
     }
     return undefined;
 }
-export function colorFrom256RGB(red, green, blue, alpha) {
-    if (alpha === void 0) { alpha = 1.0; }
+export function colorFrom256RGB(red, green, blue, alpha = 1.0) {
     return {
         red: red / 255.0,
         green: green / 255.0,
         blue: blue / 255.0,
-        alpha: alpha
+        alpha
     };
 }

package/lib/esm/utils/glob.js

@@ -7,13 +7,13 @@ export function createRegex(glob, opts) {
     if (typeof glob !== 'string') {
         throw new TypeError('Expected a string');
     }
-    var str = String(glob);
+    const str = String(glob);
     // The regexp we are building, as a string.
-    var reStr = "";
+    let reStr = "";
     // Whether we are matching so called "extended" globs (like bash) and should
     // support single character matching, matching ranges of characters, group
     // matching, etc.
-    var extended = opts ? !!opts.extended : false;
+    const extended = opts ? !!opts.extended : false;
     // When globstar is _false_ (default), '/foo/*' is translated a regexp like
     // '^\/foo\/.*$' which will match any string beginning with '/foo/'
     // When globstar is _true_, '/foo/*' is translated to regexp like
@@ -23,14 +23,14 @@ export function createRegex(glob, opts) {
     // these will not '/foo/bar/baz', '/foo/bar/baz.txt'
     // Lastely, when globstar is _true_, '/foo/**' is equivelant to '/foo/*' when
     // globstar is _false_
-    var globstar = opts ? !!opts.globstar : false;
+    const globstar = opts ? !!opts.globstar : false;
     // If we are doing extended matching, this boolean is true when we are inside
     // a group (eg {*.html,*.js}), and false otherwise.
-    var inGroup = false;
+    let inGroup = false;
     // RegExp flags (eg "i" ) to pass in to RegExp constructor.
-    var flags = opts && typeof (opts.flags) === "string" ? opts.flags : "";
-    var c;
-    for (var i = 0, len = str.length; i < len; i++) {
+    const flags = opts && typeof (opts.flags) === "string" ? opts.flags : "";
+    let c;
+    for (let i = 0, len = str.length; i < len; i++) {
         c = str[i];
         switch (c) {
             case "/":
@@ -78,20 +78,20 @@ export function createRegex(glob, opts) {
             case "*":
                 // Move over all consecutive "*"'s.
                 // Also store the previous and next characters
-                var prevChar = str[i - 1];
-                var starCount = 1;
+                const prevChar = str[i - 1];
+                let starCount = 1;
                 while (str[i + 1] === "*") {
                     starCount++;
                     i++;
                 }
-                var nextChar = str[i + 1];
+                const nextChar = str[i + 1];
                 if (!globstar) {
                     // globstar is disabled, so treat any number of "*" as one
                     reStr += ".*";
                 }
                 else {
                     // globstar is enabled, so determine if this is a globstar segment
-                    var isGlobstar = starCount > 1 // multiple "*"'s
+                    const isGlobstar = starCount > 1 // multiple "*"'s
                         && (prevChar === "/" || prevChar === undefined || prevChar === '{' || prevChar === ',') // from the start of the segment
                         && (nextChar === "/" || nextChar === undefined || nextChar === ',' || nextChar === '}'); // to the end of the segment
                     if (isGlobstar) {

package/lib/esm/utils/json.js

@@ -4,13 +4,13 @@
 *--------------------------------------------------------------------------------------------*/
 export function stringifyObject(obj, indent, stringifyLiteral) {
     if (obj !== null && typeof obj === 'object') {
-        var newIndent = indent + '\t';
+        const newIndent = indent + '\t';
         if (Array.isArray(obj)) {
             if (obj.length === 0) {
                 return '[]';
             }
-            var result = '[\n';
-            for (var i = 0; i < obj.length; i++) {
+            let result = '[\n';
+            for (let i = 0; i < obj.length; i++) {
                 result += newIndent + stringifyObject(obj[i], newIndent, stringifyLiteral);
                 if (i < obj.length - 1) {
                     result += ',';
@@ -21,13 +21,13 @@ export function stringifyObject(obj, indent, stringifyLiteral) {
             return result;
         }
         else {
-            var keys = Object.keys(obj);
+            const keys = Object.keys(obj);
             if (keys.length === 0) {
                 return '{}';
             }
-            var result = '{\n';
-            for (var i = 0; i < keys.length; i++) {
-                var key = keys[i];
+            let result = '{\n';
+            for (let i = 0; i < keys.length; i++) {
+                const key = keys[i];
                 result += newIndent + JSON.stringify(key) + ': ' + stringifyObject(obj[key], newIndent, stringifyLiteral);
                 if (i < keys.length - 1) {
                     result += ',';

package/lib/esm/utils/objects.js

@@ -63,3 +63,6 @@ export function isBoolean(val) {
 export function isString(val) {
     return typeof val === 'string';
 }
+export function isObject(val) {
+    return typeof val === 'object' && val !== null && !Array.isArray(val);
+}

package/lib/esm/utils/strings.js

@@ -6,7 +6,7 @@ export function startsWith(haystack, needle) {
     if (haystack.length < needle.length) {
         return false;
     }
-    for (var i = 0; i < needle.length; i++) {
+    for (let i = 0; i < needle.length; i++) {
         if (haystack[i] !== needle[i]) {
             return false;
         }
@@ -17,7 +17,7 @@ export function startsWith(haystack, needle) {
  * Determines if haystack ends with needle.
  */
 export function endsWith(haystack, needle) {
-    var diff = haystack.length - needle.length;
+    const diff = haystack.length - needle.length;
     if (diff > 0) {
         return haystack.lastIndexOf(needle) === diff;
     }
@@ -43,7 +43,7 @@ export function repeat(value, count) {
     return s;
 }
 export function extendedRegExp(pattern) {
-    var flags = '';
+    let flags = '';
     if (startsWith(pattern, '(?i)')) {
         pattern = pattern.substring(4);
         flags = 'i';

package/lib/umd/jsonLanguageService.js

@@ -4,7 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24,42 +28,42 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.getLanguageService = void 0;
-    var jsonCompletion_1 = require("./services/jsonCompletion");
-    var jsonHover_1 = require("./services/jsonHover");
-    var jsonValidation_1 = require("./services/jsonValidation");
-    var jsonDocumentSymbols_1 = require("./services/jsonDocumentSymbols");
-    var jsonParser_1 = require("./parser/jsonParser");
-    var configuration_1 = require("./services/configuration");
-    var jsonSchemaService_1 = require("./services/jsonSchemaService");
-    var jsonFolding_1 = require("./services/jsonFolding");
-    var jsonSelectionRanges_1 = require("./services/jsonSelectionRanges");
-    var jsonc_parser_1 = require("jsonc-parser");
-    var jsonLanguageTypes_1 = require("./jsonLanguageTypes");
-    var jsonLinks_1 = require("./services/jsonLinks");
+    const jsonCompletion_1 = require("./services/jsonCompletion");
+    const jsonHover_1 = require("./services/jsonHover");
+    const jsonValidation_1 = require("./services/jsonValidation");
+    const jsonDocumentSymbols_1 = require("./services/jsonDocumentSymbols");
+    const jsonParser_1 = require("./parser/jsonParser");
+    const configuration_1 = require("./services/configuration");
+    const jsonSchemaService_1 = require("./services/jsonSchemaService");
+    const jsonFolding_1 = require("./services/jsonFolding");
+    const jsonSelectionRanges_1 = require("./services/jsonSelectionRanges");
+    const jsonc_parser_1 = require("jsonc-parser");
+    const jsonLanguageTypes_1 = require("./jsonLanguageTypes");
+    const jsonLinks_1 = require("./services/jsonLinks");
     __exportStar(require("./jsonLanguageTypes"), exports);
     function getLanguageService(params) {
-        var promise = params.promiseConstructor || Promise;
-        var jsonSchemaService = new jsonSchemaService_1.JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
+        const promise = params.promiseConstructor || Promise;
+        const jsonSchemaService = new jsonSchemaService_1.JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
         jsonSchemaService.setSchemaContributions(configuration_1.schemaContributions);
-        var jsonCompletion = new jsonCompletion_1.JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
-        var jsonHover = new jsonHover_1.JSONHover(jsonSchemaService, params.contributions, promise);
-        var jsonDocumentSymbols = new jsonDocumentSymbols_1.JSONDocumentSymbols(jsonSchemaService);
-        var jsonValidation = new jsonValidation_1.JSONValidation(jsonSchemaService, promise);
+        const jsonCompletion = new jsonCompletion_1.JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
+        const jsonHover = new jsonHover_1.JSONHover(jsonSchemaService, params.contributions, promise);
+        const jsonDocumentSymbols = new jsonDocumentSymbols_1.JSONDocumentSymbols(jsonSchemaService);
+        const jsonValidation = new jsonValidation_1.JSONValidation(jsonSchemaService, promise);
         return {
-            configure: function (settings) {
+            configure: (settings) => {
                 jsonSchemaService.clearExternalSchemas();
                 if (settings.schemas) {
-                    settings.schemas.forEach(function (settings) {
+                    settings.schemas.forEach(settings => {
                         jsonSchemaService.registerExternalSchema(settings.uri, settings.fileMatch, settings.schema);
                     });
                 }
                 jsonValidation.configure(settings);
             },
-            resetSchema: function (uri) { return jsonSchemaService.onResourceChange(uri); },
+            resetSchema: (uri) => jsonSchemaService.onResourceChange(uri),
             doValidation: jsonValidation.doValidation.bind(jsonValidation),
             getLanguageStatus: jsonValidation.getLanguageStatus.bind(jsonValidation),
-            parseJSONDocument: function (document) { return (0, jsonParser_1.parse)(document, { collectComments: true }); },
-            newJSONDocument: function (root, diagnostics) { return (0, jsonParser_1.newJSONDocument)(root, diagnostics); },
+            parseJSONDocument: (document) => (0, jsonParser_1.parse)(document, { collectComments: true }),
+            newJSONDocument: (root, diagnostics) => (0, jsonParser_1.newJSONDocument)(root, diagnostics),
             getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
             doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
             doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
@@ -70,17 +74,17 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             doHover: jsonHover.doHover.bind(jsonHover),
             getFoldingRanges: jsonFolding_1.getFoldingRanges,
             getSelectionRanges: jsonSelectionRanges_1.getSelectionRanges,
-            findDefinition: function () { return Promise.resolve([]); },
+            findDefinition: () => Promise.resolve([]),
             findLinks: jsonLinks_1.findLinks,
-            format: function (d, r, o) {
-                var range = undefined;
+            format: (d, r, o) => {
+                let range = undefined;
                 if (r) {
-                    var offset = d.offsetAt(r.start);
-                    var length = d.offsetAt(r.end) - offset;
-                    range = { offset: offset, length: length };
+                    const offset = d.offsetAt(r.start);
+                    const length = d.offsetAt(r.end) - offset;
+                    range = { offset, length };
                 }
-                var options = { tabSize: o ? o.tabSize : 4, insertSpaces: (o === null || o === void 0 ? void 0 : o.insertSpaces) === true, insertFinalNewline: (o === null || o === void 0 ? void 0 : o.insertFinalNewline) === true, eol: '\n' };
-                return (0, jsonc_parser_1.format)(d.getText(), range, options).map(function (e) {
+                const options = { tabSize: o ? o.tabSize : 4, insertSpaces: o?.insertSpaces === true, insertFinalNewline: o?.insertFinalNewline === true, eol: '\n', keepLines: o?.keepLines === true };
+                return (0, jsonc_parser_1.format)(d.getText(), range, options).map(e => {
                     return jsonLanguageTypes_1.TextEdit.replace(jsonLanguageTypes_1.Range.create(d.positionAt(e.offset), d.positionAt(e.offset + e.length)), e.content);
                 });
             }

package/lib/umd/jsonLanguageTypes.d.ts

@@ -25,7 +25,8 @@ export declare enum ErrorCode {
     TrailingComma = 519,
     DuplicateKey = 520,
     CommentNotPermitted = 521,
-    SchemaResolveError = 768
+    SchemaResolveError = 768,
+    SchemaUnsupportedFeature = 769
 }
 export declare type ASTNode = ObjectASTNode | PropertyASTNode | ArrayASTNode | StringASTNode | NumberASTNode | BooleanASTNode | NullASTNode;
 export interface BaseASTNode {
@@ -275,4 +276,5 @@ export interface ColorInformationContext {
 }
 export interface FormattingOptions extends LSPFormattingOptions {
     insertFinalNewline?: boolean;
+    keepLines?: boolean;
 }

package/lib/umd/jsonLanguageTypes.js

@@ -13,10 +13,11 @@
 })(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.Position = exports.Range = exports.TextDocument = void 0;
-    var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+    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;
+    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; } });
+    Object.defineProperty(exports, "DocumentUri", { enumerable: true, get: function () { return vscode_languageserver_types_1.DocumentUri; } });
     Object.defineProperty(exports, "MarkupContent", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkupContent; } });
     Object.defineProperty(exports, "MarkupKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkupKind; } });
     Object.defineProperty(exports, "Color", { enumerable: true, get: function () { return vscode_languageserver_types_1.Color; } });
@@ -49,7 +50,7 @@
     Object.defineProperty(exports, "TextDocumentEdit", { enumerable: true, get: function () { return vscode_languageserver_types_1.TextDocumentEdit; } });
     Object.defineProperty(exports, "VersionedTextDocumentIdentifier", { enumerable: true, get: function () { return vscode_languageserver_types_1.VersionedTextDocumentIdentifier; } });
     Object.defineProperty(exports, "DocumentHighlightKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.DocumentHighlightKind; } });
-    var vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+    const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
     Object.defineProperty(exports, "TextDocument", { enumerable: true, get: function () { return vscode_languageserver_textdocument_1.TextDocument; } });
     /**
      * Error codes used by diagnostics
@@ -75,6 +76,7 @@
         ErrorCode[ErrorCode["DuplicateKey"] = 520] = "DuplicateKey";
         ErrorCode[ErrorCode["CommentNotPermitted"] = 521] = "CommentNotPermitted";
         ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
+        ErrorCode[ErrorCode["SchemaUnsupportedFeature"] = 769] = "SchemaUnsupportedFeature";
     })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
     var ClientCapabilities;
     (function (ClientCapabilities) {

package/lib/umd/jsonSchema.d.ts

@@ -12,7 +12,7 @@ export interface JSONSchema {
     description?: string;
     properties?: JSONSchemaMap;
     patternProperties?: JSONSchemaMap;
-    additionalProperties?: boolean | JSONSchemaRef;
+    additionalProperties?: JSONSchemaRef;
     minProperties?: number;
     maxProperties?: number;
     dependencies?: JSONSchemaMap | {
@@ -22,7 +22,7 @@ export interface JSONSchema {
     minItems?: number;
     maxItems?: number;
     uniqueItems?: boolean;
-    additionalItems?: boolean | JSONSchemaRef;
+    additionalItems?: JSONSchemaRef;
     pattern?: string;
     minLength?: number;
     maxLength?: number;
@@ -47,6 +47,25 @@ export interface JSONSchema {
     if?: JSONSchemaRef;
     then?: JSONSchemaRef;
     else?: JSONSchemaRef;
+    unevaluatedProperties?: boolean | JSONSchemaRef;
+    unevaluatedItems?: boolean | JSONSchemaRef;
+    minContains?: number;
+    maxContains?: number;
+    deprecated?: boolean;
+    dependentRequired?: {
+        [prop: string]: string[];
+    };
+    dependentSchemas?: JSONSchemaMap;
+    $defs?: {
+        [name: string]: JSONSchema;
+    };
+    $anchor?: string;
+    $recursiveRef?: string;
+    $recursiveAnchor?: string;
+    $vocabulary?: any;
+    prefixItems?: JSONSchemaRef[];
+    $dynamicRef?: string;
+    $dynamicAnchor?: string;
     defaultSnippets?: {
         label?: string;
         description?: string;