vscode-json-languageservice 3.7.0 → 3.8.3

package/CHANGELOG.md

@@ -1,6 +1,10 @@
+3.8.0 / 2020-08-02
+=================
+ * new API `LanguageService.getMatchingSchemas`. Matches a document against its schema and list all AST nodes along with the matching sub schemas. 
+
 3.7.0 / 2020-06-04
 ==================
- * New API `JSONSchema.suggestSortText` to set the sort order of completion proposals (VSCode specific JSON schema extension)
+ * New API `JSONSchema.suggestSortText` to set the sort order of completion proposals (VS Code specific JSON schema extension)
 
 3.6.0 / 2020-04-27
 ==================
@@ -16,22 +20,22 @@
 
 3.4.0 / 2019-10-28
 ==================
-* Added `DocumentSymbolsContext` and `ColorInformationContext` with `resultLimit` and `onResultLimitExceeded`. `onResultLimitExceeded` is called when the result was cropped.
-* Added commit characters for completion proposals (if supported by ClientCapabilities)
-* Warn when using draft-03 or draft-08 schemas
+ * Added `DocumentSymbolsContext` and `ColorInformationContext` with `resultLimit` and `onResultLimitExceeded`. `onResultLimitExceeded` is called when the result was cropped.
+ * Added commit characters for completion proposals (if supported by ClientCapabilities)
+ * Warn when using draft-03 or draft-08 schemas
 
 3.3.4 / 2019-09-20
 ==================
-* Renamed `schema.allowsTrailingCommas` -> `schema.allowTrailingCommas`
+ * Renamed `schema.allowsTrailingCommas` -> `schema.allowTrailingCommas`
 
 3.3.3 / 2019-08-29
 ==================
-* Schemas can configure whether comments and/or trailing commas are permitted.
+ * Schemas can configure whether comments and/or trailing commas are permitted.
 
 3.3.0 / 2019-06-12
 ==================
-* New API `LanguageService.getSelectionRanges` to get semantic selection ranges.
-* Manage schema dependencies so that `resetSchema` also resets schemas that depend on the schema.
+ * New API `LanguageService.getSelectionRanges` to get semantic selection ranges.
+ * Manage schema dependencies so that `resetSchema` also resets schemas that depend on the schema.
 
 3.2.0 / 2018-09-27
 ==================

package/README.md

@@ -10,7 +10,7 @@ Why?
 ----
 The _vscode-json-languageservice_ contains the language smarts behind the JSON editing experience of Visual Studio Code
 and the Monaco editor.
- - *doValidation* analyses an input string and returns syntax and lint errros.
+ - *doValidation* analyses an input string and returns syntax and lint errors.
  - *doComplete* provides completion proposals for a given location. *doResolve* resolves a completion proposal
  - *doResolve* resolves a completion proposals.
  - *doHover* provides a hover text for a given location.
@@ -19,6 +19,7 @@ and the Monaco editor.
  - *format* formats the code at the given range.
  - *getFoldingRanges* gets folding ranges for the given document
  - *getSelectionRanges* gets selection ranges for a given location.
+ - *getMatchingSchemas* matches a document against its schema and returns all AST nodes along with the matching sub schemas
 
  - use *parseJSONDocument* create a JSON document from source code, or *newJSONDocument* to create the document from an AST.
 

package/lib/esm/jsonLanguageService.d.ts

@@ -1,5 +1,8 @@
-import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink } from './jsonLanguageTypes';
-export declare type JSONDocument = {};
+import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema } from './jsonLanguageTypes';
+export declare type JSONDocument = {
+    root: ASTNode | undefined;
+    getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
+};
 export * from './jsonLanguageTypes';
 export interface LanguageService {
     configure(settings: LanguageSettings): void;
@@ -7,6 +10,7 @@ export interface LanguageService {
     parseJSONDocument(document: TextDocument): JSONDocument;
     newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
     resetSchema(uri: string): boolean;
+    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
     doResolve(item: CompletionItem): Thenable<CompletionItem>;
     doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
     findDocumentSymbols(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): SymbolInformation[];

package/lib/esm/jsonLanguageService.js

@@ -37,6 +37,7 @@ export function getLanguageService(params) {
         doValidation: jsonValidation.doValidation.bind(jsonValidation),
         parseJSONDocument: function (document) { return parseJSON(document, { collectComments: true }); },
         newJSONDocument: function (root, diagnostics) { return newJSONDocument(root, diagnostics); },
+        getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
         doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
         doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
         findDocumentSymbols: jsonDocumentSymbols.findDocumentSymbols.bind(jsonDocumentSymbols),

package/lib/esm/jsonLanguageTypes.d.ts

@@ -1,9 +1,8 @@
 import { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector } from './jsonContributions';
 import { JSONSchema } from './jsonSchema';
-import { MarkupKind } from 'vscode-languageserver-types';
-export { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, JSONSchema };
-export { TextDocument } from 'vscode-languageserver-textdocument';
-export * from 'vscode-languageserver-types';
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, Position, InsertTextFormat, MarkupContent, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions, DefinitionLink } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+export { TextDocument, Range, TextEdit, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, Position, InsertTextFormat, MarkupContent, MarkupKind, DefinitionLink, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions };
 /**
  * Error codes used by diagnostics
  */
@@ -70,6 +69,10 @@ export interface NullASTNode extends BaseASTNode {
     readonly type: 'null';
     readonly value: null;
 }
+export interface MatchingSchema {
+    node: ASTNode;
+    schema: JSONSchema;
+}
 export interface LanguageSettings {
     /**
      * If set, the validator will return syntax and semantic errors.

package/lib/esm/jsonLanguageTypes.js

@@ -1,6 +1,10 @@
-import { MarkupKind } from 'vscode-languageserver-types';
-export { TextDocument } from 'vscode-languageserver-textdocument';
-export * from 'vscode-languageserver-types';
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, Position, InsertTextFormat, MarkupContent, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+export { TextDocument, Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, Position, InsertTextFormat, MarkupContent, MarkupKind, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions };
 /**
  * Error codes used by diagnostics
  */

package/lib/esm/parser/jsonParser.js

@@ -38,7 +38,7 @@ var ASTNodeImpl = /** @class */ (function () {
         get: function () {
             return [];
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     ASTNodeImpl.prototype.toString = function () {
@@ -81,7 +81,7 @@ var ArrayASTNodeImpl = /** @class */ (function (_super) {
         get: function () {
             return this.items;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     return ArrayASTNodeImpl;
@@ -123,7 +123,7 @@ var PropertyASTNodeImpl = /** @class */ (function (_super) {
         get: function () {
             return this.valueNode ? [this.keyNode, this.valueNode] : [this.keyNode];
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     return PropertyASTNodeImpl;
@@ -141,7 +141,7 @@ var ObjectASTNodeImpl = /** @class */ (function (_super) {
         get: function () {
             return this.properties;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     return ObjectASTNodeImpl;
@@ -184,7 +184,7 @@ var NoOpSchemaCollector = /** @class */ (function () {
     }
     Object.defineProperty(NoOpSchemaCollector.prototype, "schemas", {
         get: function () { return []; },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     NoOpSchemaCollector.prototype.add = function (schema) { };
@@ -523,8 +523,35 @@ function validate(n, schema, validationResult, matchingSchemas) {
     }
     function _validateNumberNode(node, schema, validationResult, matchingSchemas) {
         var val = node.value;
+        function normalizeFloats(float) {
+            var _a;
+            var parts = /^(-?\d+)(?:\.(\d+))?(?:e([-+]\d+))?$/.exec(float.toString());
+            return parts && {
+                value: Number(parts[1] + (parts[2] || '')),
+                multiplier: (((_a = parts[2]) === null || _a === void 0 ? void 0 : _a.length) || 0) - (parseInt(parts[3]) || 0)
+            };
+        }
+        ;
         if (isNumber(schema.multipleOf)) {
-            if (val % schema.multipleOf !== 0) {
+            var remainder = -1;
+            if (Number.isInteger(schema.multipleOf)) {
+                remainder = val % schema.multipleOf;
+            }
+            else {
+                var normMultipleOf = normalizeFloats(schema.multipleOf);
+                var normValue = normalizeFloats(val);
+                if (normMultipleOf && normValue) {
+                    var multiplier = Math.pow(10, Math.abs(normValue.multiplier - normMultipleOf.multiplier));
+                    if (normValue.multiplier < normMultipleOf.multiplier) {
+                        normValue.value *= multiplier;
+                    }
+                    else {
+                        normMultipleOf.value *= multiplier;
+                    }
+                    remainder = normValue.value % normMultipleOf.value;
+                }
+            }
+            if (remainder !== 0) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: DiagnosticSeverity.Warning,

package/lib/esm/services/jsonCompletion.js

@@ -223,6 +223,45 @@ var JSONCompletion = /** @class */ (function () {
                         }
                     });
                 }
+                var schemaPropertyNames_1 = s.schema.propertyNames;
+                if (typeof schemaPropertyNames_1 === 'object' && !schemaPropertyNames_1.deprecationMessage && !schemaPropertyNames_1.doNotSuggest) {
+                    var propertyNameCompletionItem = function (name, enumDescription) {
+                        if (enumDescription === void 0) { enumDescription = undefined; }
+                        var proposal = {
+                            kind: CompletionItemKind.Property,
+                            label: name,
+                            insertText: _this.getInsertTextForProperty(name, undefined, addValue, separatorAfter),
+                            insertTextFormat: InsertTextFormat.Snippet,
+                            filterText: _this.getFilterTextForValue(name),
+                            documentation: enumDescription || _this.fromMarkup(schemaPropertyNames_1.markdownDescription) || schemaPropertyNames_1.description || '',
+                        };
+                        if (schemaPropertyNames_1.suggestSortText !== undefined) {
+                            proposal.sortText = schemaPropertyNames_1.suggestSortText;
+                        }
+                        if (proposal.insertText && endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                            proposal.command = {
+                                title: 'Suggest',
+                                command: 'editor.action.triggerSuggest'
+                            };
+                        }
+                        collector.add(proposal);
+                    };
+                    if (schemaPropertyNames_1.enum) {
+                        for (var i = 0; i < schemaPropertyNames_1.enum.length; i++) {
+                            var enumDescription = undefined;
+                            if (schemaPropertyNames_1.markdownEnumDescriptions && i < schemaPropertyNames_1.markdownEnumDescriptions.length) {
+                                enumDescription = _this.fromMarkup(schemaPropertyNames_1.markdownEnumDescriptions[i]);
+                            }
+                            else if (schemaPropertyNames_1.enumDescriptions && i < schemaPropertyNames_1.enumDescriptions.length) {
+                                enumDescription = schemaPropertyNames_1.enumDescriptions[i];
+                            }
+                            propertyNameCompletionItem(schemaPropertyNames_1.enum[i], enumDescription);
+                        }
+                    }
+                    if (schemaPropertyNames_1.const) {
+                        propertyNameCompletionItem(schemaPropertyNames_1.const);
+                    }
+                }
             }
         });
     };
@@ -383,9 +422,28 @@ var JSONCompletion = /** @class */ (function () {
                             this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types);
                         }
                     }
-                    if (s.schema.properties && parentKey !== undefined) {
-                        var propertySchema = s.schema.properties[parentKey];
-                        if (propertySchema) {
+                    if (parentKey !== undefined) {
+                        var propertyMatched = false;
+                        if (s.schema.properties) {
+                            var propertySchema = s.schema.properties[parentKey];
+                            if (propertySchema) {
+                                propertyMatched = true;
+                                this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types);
+                            }
+                        }
+                        if (s.schema.patternProperties && !propertyMatched) {
+                            for (var _a = 0, _b = Object.keys(s.schema.patternProperties); _a < _b.length; _a++) {
+                                var pattern = _b[_a];
+                                var regex = new RegExp(pattern);
+                                if (regex.test(parentKey)) {
+                                    propertyMatched = true;
+                                    var propertySchema = s.schema.patternProperties[pattern];
+                                    this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types);
+                                }
+                            }
+                        }
+                        if (s.schema.additionalProperties && !propertyMatched) {
+                            var propertySchema = s.schema.additionalProperties;
                             this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types);
                         }
                     }

package/lib/esm/services/jsonSchemaService.js

@@ -157,7 +157,7 @@ var JSONSchemaService = /** @class */ (function () {
         get: function () {
             return this.promiseConstructor;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     JSONSchemaService.prototype.dispose = function () {
@@ -287,7 +287,7 @@ var JSONSchemaService = /** @class */ (function () {
                 return this.promise.resolve(new ResolvedSchema({}, [localize('json.schema.draft03.notsupported', "Draft-03 schemas are not supported.")]));
             }
             else if (id === 'https://json-schema.org/draft/2019-09/schema') {
-                schemaToResolve.errors.push(localize('json.schema.draft201909.notsupported', "Draft 2019-09 schemas are not yet fully supported."));
+                resolveErrors.push(localize('json.schema.draft201909.notsupported', "Draft 2019-09 schemas are not yet fully supported."));
             }
         }
         var contextService = this.contextService;
@@ -406,7 +406,7 @@ var JSONSchemaService = /** @class */ (function () {
                         }
                     }
                 }
-                collectEntries(next.items, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
+                collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
                 collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
                 collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
             };
@@ -473,9 +473,24 @@ var JSONSchemaService = /** @class */ (function () {
             return this.addSchemaHandle(combinedSchemaId, combinedSchema);
         }
     };
+    JSONSchemaService.prototype.getMatchingSchemas = function (document, jsonDocument, schema) {
+        if (schema) {
+            var id = schema.id || ('schemaservice://untitled/matchingSchemas/' + idCounter++);
+            return this.resolveSchemaContent(new UnresolvedSchema(schema), id, {}).then(function (resolvedSchema) {
+                return jsonDocument.getMatchingSchemas(resolvedSchema.schema).filter(function (s) { return !s.inverted; });
+            });
+        }
+        return this.getSchemaForResource(document.uri, jsonDocument).then(function (schema) {
+            if (schema) {
+                return jsonDocument.getMatchingSchemas(schema.schema).filter(function (s) { return !s.inverted; });
+            }
+            return [];
+        });
+    };
     return JSONSchemaService;
 }());
 export { JSONSchemaService };
+var idCounter = 0;
 function normalizeId(id) {
     // remove trailing '#', normalize drive capitalization
     try {

package/lib/umd/jsonLanguageService.d.ts

@@ -1,5 +1,8 @@
-import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink } from './jsonLanguageTypes';
-export declare type JSONDocument = {};
+import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema } from './jsonLanguageTypes';
+export declare type JSONDocument = {
+    root: ASTNode | undefined;
+    getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
+};
 export * from './jsonLanguageTypes';
 export interface LanguageService {
     configure(settings: LanguageSettings): void;
@@ -7,6 +10,7 @@ export interface LanguageService {
     parseJSONDocument(document: TextDocument): JSONDocument;
     newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
     resetSchema(uri: string): boolean;
+    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
     doResolve(item: CompletionItem): Thenable<CompletionItem>;
     doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
     findDocumentSymbols(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): SymbolInformation[];

package/lib/umd/jsonLanguageService.js

@@ -2,6 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -12,10 +22,8 @@
     }
 })(function (require, exports) {
     "use strict";
-    function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-    }
     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");
@@ -28,7 +36,7 @@
     var jsonc_parser_1 = require("jsonc-parser");
     var jsonLanguageTypes_1 = require("./jsonLanguageTypes");
     var jsonDefinition_1 = require("./services/jsonDefinition");
-    __export(require("./jsonLanguageTypes"));
+    __exportStar(require("./jsonLanguageTypes"), exports);
     function getLanguageService(params) {
         var promise = params.promiseConstructor || Promise;
         var jsonSchemaService = new jsonSchemaService_1.JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
@@ -51,6 +59,7 @@
             doValidation: jsonValidation.doValidation.bind(jsonValidation),
             parseJSONDocument: function (document) { return jsonParser_1.parse(document, { collectComments: true }); },
             newJSONDocument: function (root, diagnostics) { return jsonParser_1.newJSONDocument(root, diagnostics); },
+            getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
             doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
             doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
             findDocumentSymbols: jsonDocumentSymbols.findDocumentSymbols.bind(jsonDocumentSymbols),

package/lib/umd/jsonLanguageTypes.d.ts

@@ -1,9 +1,8 @@
 import { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector } from './jsonContributions';
 import { JSONSchema } from './jsonSchema';
-import { MarkupKind } from 'vscode-languageserver-types';
-export { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, JSONSchema };
-export { TextDocument } from 'vscode-languageserver-textdocument';
-export * from 'vscode-languageserver-types';
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, Position, InsertTextFormat, MarkupContent, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions, DefinitionLink } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+export { TextDocument, Range, TextEdit, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, Position, InsertTextFormat, MarkupContent, MarkupKind, DefinitionLink, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions };
 /**
  * Error codes used by diagnostics
  */
@@ -70,6 +69,10 @@ export interface NullASTNode extends BaseASTNode {
     readonly type: 'null';
     readonly value: null;
 }
+export interface MatchingSchema {
+    node: ASTNode;
+    schema: JSONSchema;
+}
 export interface LanguageSettings {
     /**
      * If set, the validator will return syntax and semantic errors.

package/lib/umd/jsonLanguageTypes.js

@@ -1,21 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  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", "vscode-languageserver-types", "vscode-languageserver-textdocument", "vscode-languageserver-types"], factory);
+        define(["require", "exports", "vscode-languageserver-types", "vscode-languageserver-textdocument"], factory);
     }
 })(function (require, exports) {
     "use strict";
-    function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-    }
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.ClientCapabilities = exports.ErrorCode = exports.FormattingOptions = exports.MarkedString = exports.Hover = exports.Location = exports.DocumentSymbol = exports.SymbolKind = exports.SymbolInformation = exports.MarkupKind = exports.MarkupContent = exports.InsertTextFormat = exports.Position = exports.CompletionList = exports.CompletionItemKind = exports.CompletionItem = exports.DiagnosticSeverity = exports.Diagnostic = exports.SelectionRange = exports.FoldingRangeKind = exports.FoldingRange = exports.ColorPresentation = exports.ColorInformation = exports.Color = exports.TextEdit = exports.Range = exports.TextDocument = void 0;
     var 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, "TextEdit", { enumerable: true, get: function () { return vscode_languageserver_types_1.TextEdit; } });
+    Object.defineProperty(exports, "Color", { enumerable: true, get: function () { return vscode_languageserver_types_1.Color; } });
+    Object.defineProperty(exports, "ColorInformation", { enumerable: true, get: function () { return vscode_languageserver_types_1.ColorInformation; } });
+    Object.defineProperty(exports, "ColorPresentation", { enumerable: true, get: function () { return vscode_languageserver_types_1.ColorPresentation; } });
+    Object.defineProperty(exports, "FoldingRange", { enumerable: true, get: function () { return vscode_languageserver_types_1.FoldingRange; } });
+    Object.defineProperty(exports, "FoldingRangeKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.FoldingRangeKind; } });
+    Object.defineProperty(exports, "MarkupKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkupKind; } });
+    Object.defineProperty(exports, "SelectionRange", { enumerable: true, get: function () { return vscode_languageserver_types_1.SelectionRange; } });
+    Object.defineProperty(exports, "Diagnostic", { enumerable: true, get: function () { return vscode_languageserver_types_1.Diagnostic; } });
+    Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return vscode_languageserver_types_1.DiagnosticSeverity; } });
+    Object.defineProperty(exports, "CompletionItem", { enumerable: true, get: function () { return vscode_languageserver_types_1.CompletionItem; } });
+    Object.defineProperty(exports, "CompletionItemKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.CompletionItemKind; } });
+    Object.defineProperty(exports, "CompletionList", { enumerable: true, get: function () { return vscode_languageserver_types_1.CompletionList; } });
+    Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return vscode_languageserver_types_1.Position; } });
+    Object.defineProperty(exports, "InsertTextFormat", { enumerable: true, get: function () { return vscode_languageserver_types_1.InsertTextFormat; } });
+    Object.defineProperty(exports, "MarkupContent", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkupContent; } });
+    Object.defineProperty(exports, "SymbolInformation", { enumerable: true, get: function () { return vscode_languageserver_types_1.SymbolInformation; } });
+    Object.defineProperty(exports, "SymbolKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.SymbolKind; } });
+    Object.defineProperty(exports, "DocumentSymbol", { enumerable: true, get: function () { return vscode_languageserver_types_1.DocumentSymbol; } });
+    Object.defineProperty(exports, "Location", { enumerable: true, get: function () { return vscode_languageserver_types_1.Location; } });
+    Object.defineProperty(exports, "Hover", { enumerable: true, get: function () { return vscode_languageserver_types_1.Hover; } });
+    Object.defineProperty(exports, "MarkedString", { enumerable: true, get: function () { return vscode_languageserver_types_1.MarkedString; } });
+    Object.defineProperty(exports, "FormattingOptions", { enumerable: true, get: function () { return vscode_languageserver_types_1.FormattingOptions; } });
     var vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-    exports.TextDocument = vscode_languageserver_textdocument_1.TextDocument;
-    __export(require("vscode-languageserver-types"));
+    Object.defineProperty(exports, "TextDocument", { enumerable: true, get: function () { return vscode_languageserver_textdocument_1.TextDocument; } });
     /**
      * Error codes used by diagnostics
      */

package/lib/umd/parser/jsonParser.js

@@ -26,6 +26,7 @@ var __extends = (this && this.__extends) || (function () {
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.parse = exports.JSONDocument = exports.contains = exports.getNodePath = exports.getNodeValue = exports.newJSONDocument = exports.ValidationResult = exports.EnumMatch = exports.asSchema = exports.ObjectASTNodeImpl = exports.PropertyASTNodeImpl = exports.StringASTNodeImpl = exports.NumberASTNodeImpl = exports.ArrayASTNodeImpl = exports.BooleanASTNodeImpl = exports.NullASTNodeImpl = exports.ASTNodeImpl = void 0;
     var Json = require("jsonc-parser");
     var objects_1 = require("../utils/objects");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
@@ -49,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
             get: function () {
                 return [];
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         ASTNodeImpl.prototype.toString = function () {
@@ -92,7 +93,7 @@ var __extends = (this && this.__extends) || (function () {
             get: function () {
                 return this.items;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         return ArrayASTNodeImpl;
@@ -134,7 +135,7 @@ var __extends = (this && this.__extends) || (function () {
             get: function () {
                 return this.valueNode ? [this.keyNode, this.valueNode] : [this.keyNode];
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         return PropertyASTNodeImpl;
@@ -152,7 +153,7 @@ var __extends = (this && this.__extends) || (function () {
             get: function () {
                 return this.properties;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         return ObjectASTNodeImpl;
@@ -196,7 +197,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         Object.defineProperty(NoOpSchemaCollector.prototype, "schemas", {
             get: function () { return []; },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         NoOpSchemaCollector.prototype.add = function (schema) { };
@@ -539,8 +540,35 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _validateNumberNode(node, schema, validationResult, matchingSchemas) {
             var val = node.value;
+            function normalizeFloats(float) {
+                var _a;
+                var parts = /^(-?\d+)(?:\.(\d+))?(?:e([-+]\d+))?$/.exec(float.toString());
+                return parts && {
+                    value: Number(parts[1] + (parts[2] || '')),
+                    multiplier: (((_a = parts[2]) === null || _a === void 0 ? void 0 : _a.length) || 0) - (parseInt(parts[3]) || 0)
+                };
+            }
+            ;
             if (objects_1.isNumber(schema.multipleOf)) {
-                if (val % schema.multipleOf !== 0) {
+                var remainder = -1;
+                if (Number.isInteger(schema.multipleOf)) {
+                    remainder = val % schema.multipleOf;
+                }
+                else {
+                    var normMultipleOf = normalizeFloats(schema.multipleOf);
+                    var normValue = normalizeFloats(val);
+                    if (normMultipleOf && normValue) {
+                        var multiplier = Math.pow(10, Math.abs(normValue.multiplier - normMultipleOf.multiplier));
+                        if (normValue.multiplier < normMultipleOf.multiplier) {
+                            normValue.value *= multiplier;
+                        }
+                        else {
+                            normMultipleOf.value *= multiplier;
+                        }
+                        remainder = normValue.value % normMultipleOf.value;
+                    }
+                }
+                if (remainder !== 0) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
                         severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,

package/lib/umd/services/configuration.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.schemaContributions = void 0;
     var nls = require("vscode-nls");
     var localize = nls.loadMessageBundle();
     exports.schemaContributions = {