vscode-json-languageservice 5.3.4 → 5.3.6

package/lib/esm/jsonContributions.d.ts

@@ -8,8 +8,13 @@ export interface JSONWorkerContribution {
 }
 export type Segment = string | number;
 export type JSONPath = Segment[];
+export type JSONCompletionItem = CompletionItem & {
+    insertText: string;
+};
 export interface CompletionsCollector {
-    add(suggestion: CompletionItem): void;
+    add(suggestion: JSONCompletionItem & {
+        insertText: string;
+    }): void;
     error(message: string): void;
     setAsIncomplete(): void;
     getNumberOfProposals(): number;

package/lib/esm/jsonLanguageTypes.d.ts

@@ -25,6 +25,7 @@ export declare enum ErrorCode {
     TrailingComma = 519,
     DuplicateKey = 520,
     CommentNotPermitted = 521,
+    PropertyKeysMustBeDoublequoted = 528,
     SchemaResolveError = 768,
     SchemaUnsupportedFeature = 769
 }

package/lib/esm/jsonLanguageTypes.js

@@ -28,6 +28,7 @@ export var ErrorCode;
     ErrorCode[ErrorCode["TrailingComma"] = 519] = "TrailingComma";
     ErrorCode[ErrorCode["DuplicateKey"] = 520] = "DuplicateKey";
     ErrorCode[ErrorCode["CommentNotPermitted"] = 521] = "CommentNotPermitted";
+    ErrorCode[ErrorCode["PropertyKeysMustBeDoublequoted"] = 528] = "PropertyKeysMustBeDoublequoted";
     ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
     ErrorCode[ErrorCode["SchemaUnsupportedFeature"] = 769] = "SchemaUnsupportedFeature";
 })(ErrorCode || (ErrorCode = {}));

package/lib/esm/parser/jsonParser.js

@@ -1091,7 +1091,7 @@ export function parse(textDocument, config) {
         if (!key) {
             if (scanner.getToken() === 16 /* Json.SyntaxKind.Unknown */) {
                 // give a more helpful error message
-                _error(l10n.t('Property keys must be doublequoted'), ErrorCode.Undefined);
+                _error(l10n.t('Property keys must be doublequoted'), ErrorCode.PropertyKeysMustBeDoublequoted);
                 const keyNode = new StringASTNodeImpl(node, scanner.getTokenOffset(), scanner.getTokenLength());
                 keyNode.value = scanner.getTokenValue();
                 key = keyNode;

package/lib/esm/services/configuration.js

@@ -6,10 +6,6 @@ import * as l10n from '@vscode/l10n';
 export const schemaContributions = {
     schemaAssociations: [],
     schemas: {
-        // refer to the latest schema
-        'http://json-schema.org/schema#': {
-            $ref: 'http://json-schema.org/draft-07/schema#'
-        },
         // bundle the schema-schema to include (localized) descriptions
         'http://json-schema.org/draft-04/schema#': {
             '$schema': 'http://json-schema.org/draft-04/schema#',

package/lib/esm/services/jsonCompletion.js

@@ -74,9 +74,7 @@ export class JSONCompletion {
                             label = shortendedLabel;
                         }
                     }
-                    if (overwriteRange && suggestion.insertText !== undefined) {
-                        suggestion.textEdit = TextEdit.replace(overwriteRange, suggestion.insertText);
-                    }
+                    suggestion.textEdit = TextEdit.replace(overwriteRange, suggestion.insertText);
                     if (supportsCommitCharacters) {
                         suggestion.commitCharacters = suggestion.kind === CompletionItemKind.Property ? propertyCommitCharacters : valueCommitCharacters;
                     }
@@ -407,26 +405,31 @@ export class JSONCompletion {
             for (const s of matchingSchemas) {
                 if (s.node === node && !s.inverted && s.schema) {
                     if (node.type === 'array' && s.schema.items) {
-                        const arrayValues = Parser.getNodeValue(node);
-                        const self = this;
-                        const filteringCollector = {
-                            ...collector,
-                            add(suggestion) {
-                                const value = self.getValueFromLabel(suggestion.label);
-                                if (s.schema.uniqueItems === true && arrayValues.includes(value)) {
-                                    return;
+                        let c = collector;
+                        if (s.schema.uniqueItems) {
+                            const existingValues = new Set();
+                            node.children.forEach(n => {
+                                if (n.type !== 'array' && n.type !== 'object') {
+                                    existingValues.add(this.getLabelForValue(Parser.getNodeValue(n)));
                                 }
-                                collector.add(suggestion);
-                            },
-                        };
+                            });
+                            c = {
+                                ...collector,
+                                add(suggestion) {
+                                    if (!existingValues.has(suggestion.label)) {
+                                        collector.add(suggestion);
+                                    }
+                                }
+                            };
+                        }
                         if (Array.isArray(s.schema.items)) {
                             const index = this.findItemAtOffset(node, document, offset);
                             if (index < s.schema.items.length) {
-                                this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, filteringCollector, types);
+                                this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, c, types);
                             }
                         }
                         else {
-                            this.addSchemaValueCompletions(s.schema.items, separatorAfter, filteringCollector, types);
+                            this.addSchemaValueCompletions(s.schema.items, separatorAfter, c, types);
                         }
                     }
                     if (parentKey !== undefined) {
@@ -683,13 +686,18 @@ export class JSONCompletion {
     }
     addDollarSchemaCompletions(separatorAfter, collector) {
         const schemaIds = this.schemaService.getRegisteredSchemaIds(schema => schema === 'http' || schema === 'https');
-        schemaIds.forEach(schemaId => collector.add({
-            kind: CompletionItemKind.Module,
-            label: this.getLabelForValue(schemaId),
-            filterText: this.getFilterTextForValue(schemaId),
-            insertText: this.getInsertTextForValue(schemaId, separatorAfter),
-            insertTextFormat: InsertTextFormat.Snippet, documentation: ''
-        }));
+        schemaIds.forEach(schemaId => {
+            if (schemaId.startsWith('http://json-schema.org/draft-')) {
+                schemaId = schemaId + '#';
+            }
+            collector.add({
+                kind: CompletionItemKind.Module,
+                label: this.getLabelForValue(schemaId),
+                filterText: this.getFilterTextForValue(schemaId),
+                insertText: this.getInsertTextForValue(schemaId, separatorAfter),
+                insertTextFormat: InsertTextFormat.Snippet, documentation: ''
+            });
+        });
     }
     getLabelForValue(value) {
         return JSON.stringify(value);

package/lib/umd/jsonContributions.d.ts

@@ -8,8 +8,13 @@ export interface JSONWorkerContribution {
 }
 export type Segment = string | number;
 export type JSONPath = Segment[];
+export type JSONCompletionItem = CompletionItem & {
+    insertText: string;
+};
 export interface CompletionsCollector {
-    add(suggestion: CompletionItem): void;
+    add(suggestion: JSONCompletionItem & {
+        insertText: string;
+    }): void;
     error(message: string): void;
     setAsIncomplete(): void;
     getNumberOfProposals(): number;

package/lib/umd/jsonLanguageTypes.d.ts

@@ -25,6 +25,7 @@ export declare enum ErrorCode {
     TrailingComma = 519,
     DuplicateKey = 520,
     CommentNotPermitted = 521,
+    PropertyKeysMustBeDoublequoted = 528,
     SchemaResolveError = 768,
     SchemaUnsupportedFeature = 769
 }

package/lib/umd/jsonLanguageTypes.js

@@ -75,9 +75,10 @@
         ErrorCode[ErrorCode["TrailingComma"] = 519] = "TrailingComma";
         ErrorCode[ErrorCode["DuplicateKey"] = 520] = "DuplicateKey";
         ErrorCode[ErrorCode["CommentNotPermitted"] = 521] = "CommentNotPermitted";
+        ErrorCode[ErrorCode["PropertyKeysMustBeDoublequoted"] = 528] = "PropertyKeysMustBeDoublequoted";
         ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
         ErrorCode[ErrorCode["SchemaUnsupportedFeature"] = 769] = "SchemaUnsupportedFeature";
-    })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
+    })(ErrorCode || (exports.ErrorCode = ErrorCode = {}));
     var SchemaDraft;
     (function (SchemaDraft) {
         SchemaDraft[SchemaDraft["v3"] = 3] = "v3";
@@ -86,7 +87,7 @@
         SchemaDraft[SchemaDraft["v7"] = 7] = "v7";
         SchemaDraft[SchemaDraft["v2019_09"] = 19] = "v2019_09";
         SchemaDraft[SchemaDraft["v2020_12"] = 20] = "v2020_12";
-    })(SchemaDraft = exports.SchemaDraft || (exports.SchemaDraft = {}));
+    })(SchemaDraft || (exports.SchemaDraft = SchemaDraft = {}));
     var ClientCapabilities;
     (function (ClientCapabilities) {
         ClientCapabilities.LATEST = {
@@ -100,5 +101,5 @@
                 }
             }
         };
-    })(ClientCapabilities = exports.ClientCapabilities || (exports.ClientCapabilities = {}));
+    })(ClientCapabilities || (exports.ClientCapabilities = ClientCapabilities = {}));
 });

package/lib/umd/parser/jsonParser.js

@@ -121,7 +121,7 @@
     (function (EnumMatch) {
         EnumMatch[EnumMatch["Key"] = 0] = "Key";
         EnumMatch[EnumMatch["Enum"] = 1] = "Enum";
-    })(EnumMatch = exports.EnumMatch || (exports.EnumMatch = {}));
+    })(EnumMatch || (exports.EnumMatch = EnumMatch = {}));
     const schemaDraftFromId = {
         'http://json-schema.org/draft-03/schema#': jsonLanguageTypes_1.SchemaDraft.v3,
         'http://json-schema.org/draft-04/schema#': jsonLanguageTypes_1.SchemaDraft.v4,
@@ -1118,7 +1118,7 @@
             if (!key) {
                 if (scanner.getToken() === 16 /* Json.SyntaxKind.Unknown */) {
                     // give a more helpful error message
-                    _error(l10n.t('Property keys must be doublequoted'), jsonLanguageTypes_1.ErrorCode.Undefined);
+                    _error(l10n.t('Property keys must be doublequoted'), jsonLanguageTypes_1.ErrorCode.PropertyKeysMustBeDoublequoted);
                     const keyNode = new StringASTNodeImpl(node, scanner.getTokenOffset(), scanner.getTokenLength());
                     keyNode.value = scanner.getTokenValue();
                     key = keyNode;

package/lib/umd/services/configuration.js

@@ -18,10 +18,6 @@
     exports.schemaContributions = {
         schemaAssociations: [],
         schemas: {
-            // refer to the latest schema
-            'http://json-schema.org/schema#': {
-                $ref: 'http://json-schema.org/draft-07/schema#'
-            },
             // bundle the schema-schema to include (localized) descriptions
             'http://json-schema.org/draft-04/schema#': {
                 '$schema': 'http://json-schema.org/draft-04/schema#',

package/lib/umd/services/jsonCompletion.js

@@ -86,9 +86,7 @@
                                 label = shortendedLabel;
                             }
                         }
-                        if (overwriteRange && suggestion.insertText !== undefined) {
-                            suggestion.textEdit = jsonLanguageTypes_1.TextEdit.replace(overwriteRange, suggestion.insertText);
-                        }
+                        suggestion.textEdit = jsonLanguageTypes_1.TextEdit.replace(overwriteRange, suggestion.insertText);
                         if (supportsCommitCharacters) {
                             suggestion.commitCharacters = suggestion.kind === jsonLanguageTypes_1.CompletionItemKind.Property ? propertyCommitCharacters : valueCommitCharacters;
                         }
@@ -419,26 +417,31 @@
                 for (const s of matchingSchemas) {
                     if (s.node === node && !s.inverted && s.schema) {
                         if (node.type === 'array' && s.schema.items) {
-                            const arrayValues = Parser.getNodeValue(node);
-                            const self = this;
-                            const filteringCollector = {
-                                ...collector,
-                                add(suggestion) {
-                                    const value = self.getValueFromLabel(suggestion.label);
-                                    if (s.schema.uniqueItems === true && arrayValues.includes(value)) {
-                                        return;
+                            let c = collector;
+                            if (s.schema.uniqueItems) {
+                                const existingValues = new Set();
+                                node.children.forEach(n => {
+                                    if (n.type !== 'array' && n.type !== 'object') {
+                                        existingValues.add(this.getLabelForValue(Parser.getNodeValue(n)));
                                     }
-                                    collector.add(suggestion);
-                                },
-                            };
+                                });
+                                c = {
+                                    ...collector,
+                                    add(suggestion) {
+                                        if (!existingValues.has(suggestion.label)) {
+                                            collector.add(suggestion);
+                                        }
+                                    }
+                                };
+                            }
                             if (Array.isArray(s.schema.items)) {
                                 const index = this.findItemAtOffset(node, document, offset);
                                 if (index < s.schema.items.length) {
-                                    this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, filteringCollector, types);
+                                    this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, c, types);
                                 }
                             }
                             else {
-                                this.addSchemaValueCompletions(s.schema.items, separatorAfter, filteringCollector, types);
+                                this.addSchemaValueCompletions(s.schema.items, separatorAfter, c, types);
                             }
                         }
                         if (parentKey !== undefined) {
@@ -695,13 +698,18 @@
         }
         addDollarSchemaCompletions(separatorAfter, collector) {
             const schemaIds = this.schemaService.getRegisteredSchemaIds(schema => schema === 'http' || schema === 'https');
-            schemaIds.forEach(schemaId => collector.add({
-                kind: jsonLanguageTypes_1.CompletionItemKind.Module,
-                label: this.getLabelForValue(schemaId),
-                filterText: this.getFilterTextForValue(schemaId),
-                insertText: this.getInsertTextForValue(schemaId, separatorAfter),
-                insertTextFormat: jsonLanguageTypes_1.InsertTextFormat.Snippet, documentation: ''
-            }));
+            schemaIds.forEach(schemaId => {
+                if (schemaId.startsWith('http://json-schema.org/draft-')) {
+                    schemaId = schemaId + '#';
+                }
+                collector.add({
+                    kind: jsonLanguageTypes_1.CompletionItemKind.Module,
+                    label: this.getLabelForValue(schemaId),
+                    filterText: this.getFilterTextForValue(schemaId),
+                    insertText: this.getInsertTextForValue(schemaId, separatorAfter),
+                    insertTextFormat: jsonLanguageTypes_1.InsertTextFormat.Snippet, documentation: ''
+                });
+            });
         }
         getLabelForValue(value) {
             return JSON.stringify(value);

package/lib/umd/utils/propertyTree.js

@@ -18,7 +18,7 @@
     (function (Container) {
         Container[Container["Object"] = 0] = "Object";
         Container[Container["Array"] = 1] = "Array";
-    })(Container = exports.Container || (exports.Container = {}));
+    })(Container || (exports.Container = Container = {}));
     class PropertyTree {
         constructor(propertyName, beginningLineNumber) {
             this.propertyName = propertyName ?? '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.3.4",
+  "version": "5.3.6",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -17,20 +17,20 @@
   "devDependencies": {
     "@types/mocha": "^10.0.1",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
-    "eslint": "^8.39.0",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
+    "eslint": "^8.48.0",
     "json-schema-test-suite": "https://github.com/json-schema-org/JSON-Schema-Test-Suite.git#69acf52990b004240839ae19b4bec8fb01d50876",
     "mocha": "^10.2.0",
-    "rimraf": "^5.0.0",
-    "typescript": "^5.0.4"
+    "rimraf": "^5.0.1",
+    "typescript": "^5.2.2"
   },
   "dependencies": {
     "jsonc-parser": "^3.2.0",
     "vscode-languageserver-textdocument": "^1.0.8",
     "vscode-languageserver-types": "^3.17.3",
     "vscode-uri": "^3.0.7",
-    "@vscode/l10n": "^0.0.13"
+    "@vscode/l10n": "^0.0.16"
   },
   "scripts": {
     "prepack": "npm run clean && npm run compile-esm && npm run test && npm run remove-sourcemap-refs",