vscode-json-languageservice 3.7.0 → 3.8.3

package/lib/umd/services/jsonCompletion.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.JSONCompletion = void 0;
     var Parser = require("../parser/jsonParser");
     var Json = require("jsonc-parser");
     var json_1 = require("../utils/json");
@@ -234,6 +235,45 @@
                             }
                         });
                     }
+                    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: jsonLanguageTypes_1.CompletionItemKind.Property,
+                                label: name,
+                                insertText: _this.getInsertTextForProperty(name, undefined, addValue, separatorAfter),
+                                insertTextFormat: jsonLanguageTypes_1.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 && strings_1.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);
+                        }
+                    }
                 }
             });
         };
@@ -394,9 +434,28 @@
                                 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/umd/services/jsonDefinition.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.findDefinition = void 0;
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     function findDefinition(document, position, doc) {
         var offset = document.offsetAt(position);

package/lib/umd/services/jsonDocumentSymbols.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.JSONDocumentSymbols = void 0;
     var Parser = require("../parser/jsonParser");
     var Strings = require("../utils/strings");
     var colors_1 = require("../utils/colors");

package/lib/umd/services/jsonFolding.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getFoldingRanges = void 0;
     var jsonc_parser_1 = require("jsonc-parser");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     function getFoldingRanges(document, context) {

package/lib/umd/services/jsonHover.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.JSONHover = void 0;
     var Parser = require("../parser/jsonParser");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     var JSONHover = /** @class */ (function () {

package/lib/umd/services/jsonSchemaService.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.JSONSchemaService = exports.ResolvedSchema = exports.UnresolvedSchema = void 0;
     var Json = require("jsonc-parser");
     var vscode_uri_1 = require("vscode-uri");
     var Strings = require("../utils/strings");
@@ -168,7 +169,7 @@
             get: function () {
                 return this.promiseConstructor;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         JSONSchemaService.prototype.dispose = function () {
@@ -298,7 +299,7 @@
                     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;
@@ -417,7 +418,7 @@
                             }
                         }
                     }
-                    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);
                 };
@@ -484,9 +485,24 @@
                 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;
     }());
     exports.JSONSchemaService = JSONSchemaService;
+    var idCounter = 0;
     function normalizeId(id) {
         // remove trailing '#', normalize drive capitalization
         try {

package/lib/umd/services/jsonSelectionRanges.js

@@ -13,6 +13,7 @@
 })(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) {

package/lib/umd/services/jsonValidation.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.JSONValidation = void 0;
     var jsonSchemaService_1 = require("./jsonSchemaService");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     var nls = require("vscode-nls");

package/lib/umd/utils/colors.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.colorFrom256RGB = exports.colorFromHex = exports.hexDigit = void 0;
     var Digit0 = 48;
     var Digit9 = 57;
     var A = 65;

package/lib/umd/utils/json.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.stringifyObject = void 0;
     function stringifyObject(obj, indent, stringifyLiteral) {
         if (obj !== null && typeof obj === 'object') {
             var newIndent = indent + '\t';

package/lib/umd/utils/objects.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isString = exports.isBoolean = exports.isDefined = exports.isNumber = exports.equals = void 0;
     function equals(one, other) {
         if (one === other) {
             return true;

package/lib/umd/utils/strings.js

@@ -13,6 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.repeat = exports.convertSimple2RegExpPattern = exports.endsWith = exports.startsWith = void 0;
     function startsWith(haystack, needle) {
         if (haystack.length < needle.length) {
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "3.7.0",
+  "version": "3.8.3",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",

package/.nyc_output/0abe3076-16a9-4975-87da-4ecfc24d9226.json

@@ -1 +0,0 @@
-{}

package/.nyc_output/5a0d1463-368f-4136-8a80-4c7fda7ca33b.json

@@ -1 +0,0 @@
-{}