vscode-json-languageservice 4.2.0 → 5.1.0

package/CHANGELOG.md

@@ -1,6 +1,15 @@
+5.1.0 / 2022-07-11
+================
+* new API option `FormattingOptions.keepLines` to indicate the formatter should keep the initial line positions 
 
+5.0.0 / 2022-05-17
+================
+ * Update to `vscode-languageserver-types@3.17`
+ * Add more schema support 
+   * Schema 2019-09: unevaluatedProperties, unevaluatedItems, minContains, maxContains, deprecated, dependentRequired, dependentSchemas, $defs, $anchor
+   * Schema 2020-12: prefixItem
 
-4.2.0 / 
+4.2.0 / 2022-01-25
 ================
  * new API `LanguageService.getLanguageStatus`
  * support for $ref with $id

package/SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/lib/esm/jsonLanguageService.js

@@ -16,28 +16,28 @@ import { Range, TextEdit } from './jsonLanguageTypes';
 import { findLinks } from './services/jsonLinks';
 export * from './jsonLanguageTypes';
 export function getLanguageService(params) {
-    var promise = params.promiseConstructor || Promise;
-    var jsonSchemaService = new JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
+    const promise = params.promiseConstructor || Promise;
+    const jsonSchemaService = new JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
     jsonSchemaService.setSchemaContributions(schemaContributions);
-    var jsonCompletion = new JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
-    var jsonHover = new JSONHover(jsonSchemaService, params.contributions, promise);
-    var jsonDocumentSymbols = new JSONDocumentSymbols(jsonSchemaService);
-    var jsonValidation = new JSONValidation(jsonSchemaService, promise);
+    const jsonCompletion = new JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
+    const jsonHover = new JSONHover(jsonSchemaService, params.contributions, promise);
+    const jsonDocumentSymbols = new JSONDocumentSymbols(jsonSchemaService);
+    const jsonValidation = new 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 parseJSON(document, { collectComments: true }); },
-        newJSONDocument: function (root, diagnostics) { return newJSONDocument(root, diagnostics); },
+        parseJSONDocument: (document) => parseJSON(document, { collectComments: true }),
+        newJSONDocument: (root, diagnostics) => newJSONDocument(root, diagnostics),
         getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
         doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
         doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
@@ -46,19 +46,19 @@ export function getLanguageService(params) {
         findDocumentColors: jsonDocumentSymbols.findDocumentColors.bind(jsonDocumentSymbols),
         getColorPresentations: jsonDocumentSymbols.getColorPresentations.bind(jsonDocumentSymbols),
         doHover: jsonHover.doHover.bind(jsonHover),
-        getFoldingRanges: getFoldingRanges,
-        getSelectionRanges: getSelectionRanges,
-        findDefinition: function () { return Promise.resolve([]); },
-        findLinks: findLinks,
-        format: function (d, r, o) {
-            var range = undefined;
+        getFoldingRanges,
+        getSelectionRanges,
+        findDefinition: () => Promise.resolve([]),
+        findLinks,
+        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 formatJSON(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 formatJSON(d.getText(), range, options).map(e => {
                 return TextEdit.replace(Range.create(d.positionAt(e.offset), d.positionAt(e.offset + e.length)), e.content);
             });
         }

package/lib/esm/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/esm/jsonLanguageTypes.js

@@ -2,9 +2,9 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Range, Position, MarkupContent, MarkupKind, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind } from 'vscode-languageserver-types';
+import { Range, Position, DocumentUri, MarkupContent, MarkupKind, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind } from 'vscode-languageserver-types';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-export { TextDocument, Range, Position, MarkupContent, MarkupKind, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind };
+export { TextDocument, Range, Position, DocumentUri, MarkupContent, MarkupKind, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind };
 /**
  * Error codes used by diagnostics
  */
@@ -29,6 +29,7 @@ export var ErrorCode;
     ErrorCode[ErrorCode["DuplicateKey"] = 520] = "DuplicateKey";
     ErrorCode[ErrorCode["CommentNotPermitted"] = 521] = "CommentNotPermitted";
     ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
+    ErrorCode[ErrorCode["SchemaUnsupportedFeature"] = 769] = "SchemaUnsupportedFeature";
 })(ErrorCode || (ErrorCode = {}));
 export var ClientCapabilities;
 (function (ClientCapabilities) {

package/lib/esm/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;