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

package/lib/umd/services/jsonSelectionRanges.js

@@ -1,75 +1,75 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../jsonLanguageTypes", "jsonc-parser"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getSelectionRanges = void 0;
-    var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
-    var jsonc_parser_1 = require("jsonc-parser");
-    function getSelectionRanges(document, positions, doc) {
-        function getSelectionRange(position) {
-            var offset = document.offsetAt(position);
-            var node = doc.getNodeFromOffset(offset, true);
-            var 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;
-                        if (cStart < cEnd && offset >= cStart && offset <= cEnd) {
-                            result.push(newRange(cStart, cEnd));
-                        }
-                        result.push(newRange(node.offset, node.offset + node.length));
-                        break;
-                    case 'number':
-                    case 'boolean':
-                    case 'null':
-                    case 'property':
-                        result.push(newRange(node.offset, node.offset + node.length));
-                        break;
-                }
-                if (node.type === 'property' || node.parent && node.parent.type === 'array') {
-                    var afterCommaOffset = getOffsetAfterNextToken(node.offset + node.length, 5 /* 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--) {
-                current = jsonLanguageTypes_1.SelectionRange.create(result[index], current);
-            }
-            if (!current) {
-                current = jsonLanguageTypes_1.SelectionRange.create(jsonLanguageTypes_1.Range.create(position, position));
-            }
-            return current;
-        }
-        function newRange(start, end) {
-            return jsonLanguageTypes_1.Range.create(document.positionAt(start), document.positionAt(end));
-        }
-        var scanner = (0, jsonc_parser_1.createScanner)(document.getText(), true);
-        function getOffsetAfterNextToken(offset, expectedToken) {
-            scanner.setPosition(offset);
-            var token = scanner.scan();
-            if (token === expectedToken) {
-                return scanner.getTokenOffset() + scanner.getTokenLength();
-            }
-            return -1;
-        }
-        return positions.map(getSelectionRange);
-    }
-    exports.getSelectionRanges = getSelectionRanges;
-});
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../jsonLanguageTypes", "jsonc-parser"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getSelectionRanges = void 0;
+    const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
+    const jsonc_parser_1 = require("jsonc-parser");
+    function getSelectionRanges(document, positions, doc) {
+        function getSelectionRange(position) {
+            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 {
+                        const cStart = node.offset + 1, cEnd = node.offset + node.length - 1;
+                        if (cStart < cEnd && offset >= cStart && offset <= cEnd) {
+                            result.push(newRange(cStart, cEnd));
+                        }
+                        result.push(newRange(node.offset, node.offset + node.length));
+                        break;
+                    case 'number':
+                    case 'boolean':
+                    case 'null':
+                    case 'property':
+                        result.push(newRange(node.offset, node.offset + node.length));
+                        break;
+                }
+                if (node.type === 'property' || node.parent && node.parent.type === 'array') {
+                    const afterCommaOffset = getOffsetAfterNextToken(node.offset + node.length, 5 /* CommaToken */);
+                    if (afterCommaOffset !== -1) {
+                        result.push(newRange(node.offset, afterCommaOffset));
+                    }
+                }
+                node = node.parent;
+            }
+            let current = undefined;
+            for (let index = result.length - 1; index >= 0; index--) {
+                current = jsonLanguageTypes_1.SelectionRange.create(result[index], current);
+            }
+            if (!current) {
+                current = jsonLanguageTypes_1.SelectionRange.create(jsonLanguageTypes_1.Range.create(position, position));
+            }
+            return current;
+        }
+        function newRange(start, end) {
+            return jsonLanguageTypes_1.Range.create(document.positionAt(start), document.positionAt(end));
+        }
+        const scanner = (0, jsonc_parser_1.createScanner)(document.getText(), true);
+        function getOffsetAfterNextToken(offset, expectedToken) {
+            scanner.setPosition(offset);
+            let token = scanner.scan();
+            if (token === expectedToken) {
+                return scanner.getTokenOffset() + scanner.getTokenLength();
+            }
+            return -1;
+        }
+        return positions.map(getSelectionRange);
+    }
+    exports.getSelectionRanges = getSelectionRanges;
+});

package/lib/umd/services/jsonValidation.js

@@ -1,162 +1,165 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        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 jsonLanguageTypes_1 = require("../jsonLanguageTypes");
-    var nls = require("vscode-nls");
-    var objects_1 = require("../utils/objects");
-    var localize = nls.loadMessageBundle();
-    var JSONValidation = /** @class */ (function () {
-        function JSONValidation(jsonSchemaService, promiseConstructor) {
-            this.jsonSchemaService = jsonSchemaService;
-            this.promise = promiseConstructor;
-            this.validationEnabled = true;
-        }
-        JSONValidation.prototype.configure = function (raw) {
-            if (raw) {
-                this.validationEnabled = raw.validate !== false;
-                this.commentSeverity = raw.allowComments ? undefined : jsonLanguageTypes_1.DiagnosticSeverity.Error;
-            }
-        };
-        JSONValidation.prototype.doValidation = function (textDocument, jsonDocument, documentSettings, schema) {
-            var _this = this;
-            if (!this.validationEnabled) {
-                return this.promise.resolve([]);
-            }
-            var diagnostics = [];
-            var added = {};
-            var addProblem = function (problem) {
-                // remove duplicated messages
-                var 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) : jsonLanguageTypes_1.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) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
-                var schemaRequest = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaRequest) ? toDiagnosticSeverity(documentSettings.schemaRequest) : jsonLanguageTypes_1.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 = jsonLanguageTypes_1.Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
-                            addProblem(jsonLanguageTypes_1.Diagnostic.create(range, schema.errors[0], schemaRequest, jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
-                        }
-                        else {
-                            var range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
-                            addProblem(jsonLanguageTypes_1.Diagnostic.create(range, schema.errors[0], schemaRequest, jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
-                        }
-                    }
-                    else if (schemaValidation) {
-                        var semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
-                        if (semanticErrors) {
-                            semanticErrors.forEach(addProblem);
-                        }
-                    }
-                    if (schemaAllowsComments(schema.schema)) {
-                        commentSeverity = undefined;
-                    }
-                    if (schemaAllowsTrailingCommas(schema.schema)) {
-                        trailingCommaSeverity = undefined;
-                    }
-                }
-                for (var _i = 0, _a = jsonDocument.syntaxErrors; _i < _a.length; _i++) {
-                    var p = _a[_i];
-                    if (p.code === jsonLanguageTypes_1.ErrorCode.TrailingComma) {
-                        if (typeof trailingCommaSeverity !== 'number') {
-                            continue;
-                        }
-                        p.severity = trailingCommaSeverity;
-                    }
-                    addProblem(p);
-                }
-                if (typeof commentSeverity === 'number') {
-                    var message_1 = localize('InvalidCommentToken', 'Comments are not permitted in JSON.');
-                    jsonDocument.comments.forEach(function (c) {
-                        addProblem(jsonLanguageTypes_1.Diagnostic.create(c, message_1, commentSeverity, jsonLanguageTypes_1.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) {
-                    return getDiagnostics(resolvedSchema);
-                });
-            }
-            return this.jsonSchemaService.getSchemaForResource(textDocument.uri, jsonDocument).then(function (schema) {
-                return getDiagnostics(schema);
-            });
-        };
-        JSONValidation.prototype.getLanguageStatus = function (textDocument, jsonDocument) {
-            return { schemas: this.jsonSchemaService.getSchemaURIsForResource(textDocument.uri, jsonDocument) };
-        };
-        return JSONValidation;
-    }());
-    exports.JSONValidation = JSONValidation;
-    var idCounter = 0;
-    function schemaAllowsComments(schemaRef) {
-        if (schemaRef && typeof schemaRef === 'object') {
-            if ((0, objects_1.isBoolean)(schemaRef.allowComments)) {
-                return schemaRef.allowComments;
-            }
-            if (schemaRef.allOf) {
-                for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
-                    var schema = _a[_i];
-                    var allow = schemaAllowsComments(schema);
-                    if ((0, objects_1.isBoolean)(allow)) {
-                        return allow;
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    function schemaAllowsTrailingCommas(schemaRef) {
-        if (schemaRef && typeof schemaRef === 'object') {
-            if ((0, objects_1.isBoolean)(schemaRef.allowTrailingCommas)) {
-                return schemaRef.allowTrailingCommas;
-            }
-            var deprSchemaRef = schemaRef;
-            if ((0, objects_1.isBoolean)(deprSchemaRef['allowsTrailingCommas'])) { // deprecated
-                return deprSchemaRef['allowsTrailingCommas'];
-            }
-            if (schemaRef.allOf) {
-                for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
-                    var schema = _a[_i];
-                    var allow = schemaAllowsTrailingCommas(schema);
-                    if ((0, objects_1.isBoolean)(allow)) {
-                        return allow;
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    function toDiagnosticSeverity(severityLevel) {
-        switch (severityLevel) {
-            case 'error': return jsonLanguageTypes_1.DiagnosticSeverity.Error;
-            case 'warning': return jsonLanguageTypes_1.DiagnosticSeverity.Warning;
-            case 'ignore': return undefined;
-        }
-        return undefined;
-    }
-});
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../jsonLanguageTypes", "vscode-nls", "../utils/objects"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.JSONValidation = void 0;
+    const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
+    const nls = require("vscode-nls");
+    const objects_1 = require("../utils/objects");
+    const localize = nls.loadMessageBundle();
+    class JSONValidation {
+        constructor(jsonSchemaService, promiseConstructor) {
+            this.jsonSchemaService = jsonSchemaService;
+            this.promise = promiseConstructor;
+            this.validationEnabled = true;
+        }
+        configure(raw) {
+            if (raw) {
+                this.validationEnabled = raw.validate !== false;
+                this.commentSeverity = raw.allowComments ? undefined : jsonLanguageTypes_1.DiagnosticSeverity.Error;
+            }
+        }
+        doValidation(textDocument, jsonDocument, documentSettings, schema) {
+            if (!this.validationEnabled) {
+                return this.promise.resolve([]);
+            }
+            const diagnostics = [];
+            const added = {};
+            const addProblem = (problem) => {
+                // remove duplicated messages
+                const signature = problem.range.start.line + ' ' + problem.range.start.character + ' ' + problem.message;
+                if (!added[signature]) {
+                    added[signature] = true;
+                    diagnostics.push(problem);
+                }
+            };
+            const getDiagnostics = (schema) => {
+                let trailingCommaSeverity = documentSettings?.trailingCommas ? toDiagnosticSeverity(documentSettings.trailingCommas) : jsonLanguageTypes_1.DiagnosticSeverity.Error;
+                let commentSeverity = documentSettings?.comments ? toDiagnosticSeverity(documentSettings.comments) : this.commentSeverity;
+                let schemaValidation = documentSettings?.schemaValidation ? toDiagnosticSeverity(documentSettings.schemaValidation) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
+                let schemaRequest = documentSettings?.schemaRequest ? toDiagnosticSeverity(documentSettings.schemaRequest) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
+                if (schema) {
+                    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 = jsonLanguageTypes_1.Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
+                                addProblem(jsonLanguageTypes_1.Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                            }
+                            else {
+                                const range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
+                                addProblem(jsonLanguageTypes_1.Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                            }
+                        }
+                    };
+                    if (schema.errors.length) {
+                        addSchemaProblem(schema.errors[0], jsonLanguageTypes_1.ErrorCode.SchemaResolveError);
+                    }
+                    else if (schemaValidation) {
+                        for (const warning of schema.warnings) {
+                            addSchemaProblem(warning, jsonLanguageTypes_1.ErrorCode.SchemaUnsupportedFeature);
+                        }
+                        const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
+                        if (semanticErrors) {
+                            semanticErrors.forEach(addProblem);
+                        }
+                    }
+                    if (schemaAllowsComments(schema.schema)) {
+                        commentSeverity = undefined;
+                    }
+                    if (schemaAllowsTrailingCommas(schema.schema)) {
+                        trailingCommaSeverity = undefined;
+                    }
+                }
+                for (const p of jsonDocument.syntaxErrors) {
+                    if (p.code === jsonLanguageTypes_1.ErrorCode.TrailingComma) {
+                        if (typeof trailingCommaSeverity !== 'number') {
+                            continue;
+                        }
+                        p.severity = trailingCommaSeverity;
+                    }
+                    addProblem(p);
+                }
+                if (typeof commentSeverity === 'number') {
+                    const message = localize('InvalidCommentToken', 'Comments are not permitted in JSON.');
+                    jsonDocument.comments.forEach(c => {
+                        addProblem(jsonLanguageTypes_1.Diagnostic.create(c, message, commentSeverity, jsonLanguageTypes_1.ErrorCode.CommentNotPermitted));
+                    });
+                }
+                return diagnostics;
+            };
+            if (schema) {
+                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(schema => {
+                return getDiagnostics(schema);
+            });
+        }
+        getLanguageStatus(textDocument, jsonDocument) {
+            return { schemas: this.jsonSchemaService.getSchemaURIsForResource(textDocument.uri, jsonDocument) };
+        }
+    }
+    exports.JSONValidation = JSONValidation;
+    let idCounter = 0;
+    function schemaAllowsComments(schemaRef) {
+        if (schemaRef && typeof schemaRef === 'object') {
+            if ((0, objects_1.isBoolean)(schemaRef.allowComments)) {
+                return schemaRef.allowComments;
+            }
+            if (schemaRef.allOf) {
+                for (const schema of schemaRef.allOf) {
+                    const allow = schemaAllowsComments(schema);
+                    if ((0, objects_1.isBoolean)(allow)) {
+                        return allow;
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+    function schemaAllowsTrailingCommas(schemaRef) {
+        if (schemaRef && typeof schemaRef === 'object') {
+            if ((0, objects_1.isBoolean)(schemaRef.allowTrailingCommas)) {
+                return schemaRef.allowTrailingCommas;
+            }
+            const deprSchemaRef = schemaRef;
+            if ((0, objects_1.isBoolean)(deprSchemaRef['allowsTrailingCommas'])) { // deprecated
+                return deprSchemaRef['allowsTrailingCommas'];
+            }
+            if (schemaRef.allOf) {
+                for (const schema of schemaRef.allOf) {
+                    const allow = schemaAllowsTrailingCommas(schema);
+                    if ((0, objects_1.isBoolean)(allow)) {
+                        return allow;
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+    function toDiagnosticSeverity(severityLevel) {
+        switch (severityLevel) {
+            case 'error': return jsonLanguageTypes_1.DiagnosticSeverity.Error;
+            case 'warning': return jsonLanguageTypes_1.DiagnosticSeverity.Warning;
+            case 'ignore': return undefined;
+        }
+        return undefined;
+    }
+});