vscode-json-languageservice 5.1.1 → 5.1.3

package/lib/esm/services/configuration.js

@@ -2,8 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
+import * as l10n from '@vscode/l10n';
 export const schemaContributions = {
     schemaAssociations: [],
     schemas: {
@@ -463,52 +462,52 @@ export const schemaContributions = {
     }
 };
 const descriptions = {
-    id: localize('schema.json.id', "A unique identifier for the schema."),
-    $schema: localize('schema.json.$schema', "The schema to verify this document against."),
-    title: localize('schema.json.title', "A descriptive title of the element."),
-    description: localize('schema.json.description', "A long description of the element. Used in hover menus and suggestions."),
-    default: localize('schema.json.default', "A default value. Used by suggestions."),
-    multipleOf: localize('schema.json.multipleOf', "A number that should cleanly divide the current value (i.e. have no remainder)."),
-    maximum: localize('schema.json.maximum', "The maximum numerical value, inclusive by default."),
-    exclusiveMaximum: localize('schema.json.exclusiveMaximum', "Makes the maximum property exclusive."),
-    minimum: localize('schema.json.minimum', "The minimum numerical value, inclusive by default."),
-    exclusiveMinimum: localize('schema.json.exclusiveMininum', "Makes the minimum property exclusive."),
-    maxLength: localize('schema.json.maxLength', "The maximum length of a string."),
-    minLength: localize('schema.json.minLength', "The minimum length of a string."),
-    pattern: localize('schema.json.pattern', "A regular expression to match the string against. It is not implicitly anchored."),
-    additionalItems: localize('schema.json.additionalItems', "For arrays, only when items is set as an array. If it is a schema, then this schema validates items after the ones specified by the items array. If it is false, then additional items will cause validation to fail."),
-    items: localize('schema.json.items', "For arrays. Can either be a schema to validate every element against or an array of schemas to validate each item against in order (the first schema will validate the first element, the second schema will validate the second element, and so on."),
-    maxItems: localize('schema.json.maxItems', "The maximum number of items that can be inside an array. Inclusive."),
-    minItems: localize('schema.json.minItems', "The minimum number of items that can be inside an array. Inclusive."),
-    uniqueItems: localize('schema.json.uniqueItems', "If all of the items in the array must be unique. Defaults to false."),
-    maxProperties: localize('schema.json.maxProperties', "The maximum number of properties an object can have. Inclusive."),
-    minProperties: localize('schema.json.minProperties', "The minimum number of properties an object can have. Inclusive."),
-    required: localize('schema.json.required', "An array of strings that lists the names of all properties required on this object."),
-    additionalProperties: localize('schema.json.additionalProperties', "Either a schema or a boolean. If a schema, then used to validate all properties not matched by 'properties' or 'patternProperties'. If false, then any properties not matched by either will cause this schema to fail."),
-    definitions: localize('schema.json.definitions', "Not used for validation. Place subschemas here that you wish to reference inline with $ref."),
-    properties: localize('schema.json.properties', "A map of property names to schemas for each property."),
-    patternProperties: localize('schema.json.patternProperties', "A map of regular expressions on property names to schemas for matching properties."),
-    dependencies: localize('schema.json.dependencies', "A map of property names to either an array of property names or a schema. An array of property names means the property named in the key depends on the properties in the array being present in the object in order to be valid. If the value is a schema, then the schema is only applied to the object if the property in the key exists on the object."),
-    enum: localize('schema.json.enum', "The set of literal values that are valid."),
-    type: localize('schema.json.type', "Either a string of one of the basic schema types (number, integer, null, array, object, boolean, string) or an array of strings specifying a subset of those types."),
-    format: localize('schema.json.format', "Describes the format expected for the value."),
-    allOf: localize('schema.json.allOf', "An array of schemas, all of which must match."),
-    anyOf: localize('schema.json.anyOf', "An array of schemas, where at least one must match."),
-    oneOf: localize('schema.json.oneOf', "An array of schemas, exactly one of which must match."),
-    not: localize('schema.json.not', "A schema which must not match."),
-    $id: localize('schema.json.$id', "A unique identifier for the schema."),
-    $ref: localize('schema.json.$ref', "Reference a definition hosted on any location."),
-    $comment: localize('schema.json.$comment', "Comments from schema authors to readers or maintainers of the schema."),
-    readOnly: localize('schema.json.readOnly', "Indicates that the value of the instance is managed exclusively by the owning authority."),
-    examples: localize('schema.json.examples', "Sample JSON values associated with a particular schema, for the purpose of illustrating usage."),
-    contains: localize('schema.json.contains', "An array instance is valid against \"contains\" if at least one of its elements is valid against the given schema."),
-    propertyNames: localize('schema.json.propertyNames', "If the instance is an object, this keyword validates if every property name in the instance validates against the provided schema."),
-    const: localize('schema.json.const', "An instance validates successfully against this keyword if its value is equal to the value of the keyword."),
-    contentMediaType: localize('schema.json.contentMediaType', "Describes the media type of a string property."),
-    contentEncoding: localize('schema.json.contentEncoding', "Describes the content encoding of a string property."),
-    if: localize('schema.json.if', "The validation outcome of the \"if\" subschema controls which of the \"then\" or \"else\" keywords are evaluated."),
-    then: localize('schema.json.then', "The \"if\" subschema is used for validation when the \"if\" subschema succeeds."),
-    else: localize('schema.json.else', "The \"else\" subschema is used for validation when the \"if\" subschema fails.")
+    id: l10n.t("A unique identifier for the schema."),
+    $schema: l10n.t("The schema to verify this document against."),
+    title: l10n.t("A descriptive title of the element."),
+    description: l10n.t("A long description of the element. Used in hover menus and suggestions."),
+    default: l10n.t("A default value. Used by suggestions."),
+    multipleOf: l10n.t("A number that should cleanly divide the current value (i.e. have no remainder)."),
+    maximum: l10n.t("The maximum numerical value, inclusive by default."),
+    exclusiveMaximum: l10n.t("Makes the maximum property exclusive."),
+    minimum: l10n.t("The minimum numerical value, inclusive by default."),
+    exclusiveMinimum: l10n.t("Makes the minimum property exclusive."),
+    maxLength: l10n.t("The maximum length of a string."),
+    minLength: l10n.t("The minimum length of a string."),
+    pattern: l10n.t("A regular expression to match the string against. It is not implicitly anchored."),
+    additionalItems: l10n.t("For arrays, only when items is set as an array. If it is a schema, then this schema validates items after the ones specified by the items array. If it is false, then additional items will cause validation to fail."),
+    items: l10n.t("For arrays. Can either be a schema to validate every element against or an array of schemas to validate each item against in order (the first schema will validate the first element, the second schema will validate the second element, and so on."),
+    maxItems: l10n.t("The maximum number of items that can be inside an array. Inclusive."),
+    minItems: l10n.t("The minimum number of items that can be inside an array. Inclusive."),
+    uniqueItems: l10n.t("If all of the items in the array must be unique. Defaults to false."),
+    maxProperties: l10n.t("The maximum number of properties an object can have. Inclusive."),
+    minProperties: l10n.t("The minimum number of properties an object can have. Inclusive."),
+    required: l10n.t("An array of strings that lists the names of all properties required on this object."),
+    additionalProperties: l10n.t("Either a schema or a boolean. If a schema, then used to validate all properties not matched by 'properties' or 'patternProperties'. If false, then any properties not matched by either will cause this schema to fail."),
+    definitions: l10n.t("Not used for validation. Place subschemas here that you wish to reference inline with $ref."),
+    properties: l10n.t("A map of property names to schemas for each property."),
+    patternProperties: l10n.t("A map of regular expressions on property names to schemas for matching properties."),
+    dependencies: l10n.t("A map of property names to either an array of property names or a schema. An array of property names means the property named in the key depends on the properties in the array being present in the object in order to be valid. If the value is a schema, then the schema is only applied to the object if the property in the key exists on the object."),
+    enum: l10n.t("The set of literal values that are valid."),
+    type: l10n.t("Either a string of one of the basic schema types (number, integer, null, array, object, boolean, string) or an array of strings specifying a subset of those types."),
+    format: l10n.t("Describes the format expected for the value."),
+    allOf: l10n.t("An array of schemas, all of which must match."),
+    anyOf: l10n.t("An array of schemas, where at least one must match."),
+    oneOf: l10n.t("An array of schemas, exactly one of which must match."),
+    not: l10n.t("A schema which must not match."),
+    $id: l10n.t("A unique identifier for the schema."),
+    $ref: l10n.t("Reference a definition hosted on any location."),
+    $comment: l10n.t("Comments from schema authors to readers or maintainers of the schema."),
+    readOnly: l10n.t("Indicates that the value of the instance is managed exclusively by the owning authority."),
+    examples: l10n.t("Sample JSON values associated with a particular schema, for the purpose of illustrating usage."),
+    contains: l10n.t("An array instance is valid against \"contains\" if at least one of its elements is valid against the given schema."),
+    propertyNames: l10n.t("If the instance is an object, this keyword validates if every property name in the instance validates against the provided schema."),
+    const: l10n.t("An instance validates successfully against this keyword if its value is equal to the value of the keyword."),
+    contentMediaType: l10n.t("Describes the media type of a string property."),
+    contentEncoding: l10n.t("Describes the content encoding of a string property."),
+    if: l10n.t("The validation outcome of the \"if\" subschema controls which of the \"then\" or \"else\" keywords are evaluated."),
+    then: l10n.t("The \"if\" subschema is used for validation when the \"if\" subschema succeeds."),
+    else: l10n.t("The \"else\" subschema is used for validation when the \"if\" subschema fails.")
 };
 for (const schemaName in schemaContributions.schemas) {
     const schema = schemaContributions.schemas[schemaName];
@@ -521,8 +520,5 @@ for (const schemaName in schemaContributions.schemas) {
         if (description) {
             propertyObject['description'] = description;
         }
-        else {
-            console.log(`${property}: localize('schema.json.${property}', "")`);
-        }
     }
 }

package/lib/esm/services/jsonCompletion.js

@@ -8,8 +8,7 @@ import { stringifyObject } from '../utils/json';
 import { endsWith, extendedRegExp } from '../utils/strings';
 import { isDefined } from '../utils/objects';
 import { CompletionItem, CompletionItemKind, Range, TextEdit, InsertTextFormat, MarkupKind } from '../jsonLanguageTypes';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
+import * as l10n from '@vscode/l10n';
 const valueCommitCharacters = [',', '}', ']'];
 const propertyCommitCharacters = [':'];
 export class JSONCompletion {
@@ -62,16 +61,16 @@ export class JSONCompletion {
             overwriteRange = Range.create(document.positionAt(overwriteStart), position);
         }
         const supportsCommitCharacters = false; //this.doesSupportsCommitCharacters(); disabled for now, waiting for new API: https://github.com/microsoft/vscode/issues/42544
-        const proposed = {};
+        const proposed = new Map();
         const collector = {
             add: (suggestion) => {
                 let label = suggestion.label;
-                const existing = proposed[label];
+                const existing = proposed.get(label);
                 if (!existing) {
                     label = label.replace(/[\n]/g, '↵');
                     if (label.length > 60) {
                         const shortendedLabel = label.substr(0, 57).trim() + '...';
-                        if (!proposed[shortendedLabel]) {
+                        if (!proposed.has(shortendedLabel)) {
                             label = shortendedLabel;
                         }
                     }
@@ -82,7 +81,7 @@ export class JSONCompletion {
                         suggestion.commitCharacters = suggestion.kind === CompletionItemKind.Property ? propertyCommitCharacters : valueCommitCharacters;
                     }
                     suggestion.label = label;
-                    proposed[label] = suggestion;
+                    proposed.set(label, suggestion);
                     result.items.push(suggestion);
                 }
                 else {
@@ -100,9 +99,6 @@ export class JSONCompletion {
             error: (message) => {
                 console.error(message);
             },
-            log: (message) => {
-                console.log(message);
-            },
             getNumberOfProposals: () => {
                 return result.items.length;
             }
@@ -135,7 +131,7 @@ export class JSONCompletion {
                 const properties = node.properties;
                 properties.forEach(p => {
                     if (!currentProperty || currentProperty !== p) {
-                        proposed[p.keyNode.value] = CompletionItem.create('__');
+                        proposed.set(p.keyNode.value, CompletionItem.create('__'));
                     }
                 });
                 let separatorAfter = '';
@@ -514,7 +510,7 @@ export class JSONCompletion {
                 label: this.getLabelForValue(value),
                 insertText: this.getInsertTextForValue(value, separatorAfter),
                 insertTextFormat: InsertTextFormat.Snippet,
-                detail: localize('json.suggest.default', 'Default value')
+                detail: l10n.t('Default value')
             });
             hasProposals = true;
         }
@@ -631,7 +627,7 @@ export class JSONCompletion {
                 label: '{}',
                 insertText: this.getInsertTextForGuessedValue({}, separatorAfter),
                 insertTextFormat: InsertTextFormat.Snippet,
-                detail: localize('defaults.object', 'New object'),
+                detail: l10n.t('New object'),
                 documentation: ''
             });
         }
@@ -641,7 +637,7 @@ export class JSONCompletion {
                 label: '[]',
                 insertText: this.getInsertTextForGuessedValue([], separatorAfter),
                 insertTextFormat: InsertTextFormat.Snippet,
-                detail: localize('defaults.array', 'New array'),
+                detail: l10n.t('New array'),
                 documentation: ''
             });
         }

package/lib/esm/services/jsonSchemaService.js

@@ -6,10 +6,9 @@ import * as Json from 'jsonc-parser';
 import { URI } from 'vscode-uri';
 import * as Strings from '../utils/strings';
 import * as Parser from '../parser/jsonParser';
-import * as nls from 'vscode-nls';
+import * as l10n from '@vscode/l10n';
 import { createRegex } from '../utils/glob';
 import { isObject, isString } from '../utils/objects';
-const localize = nls.loadMessageBundle();
 const BANG = '!';
 const PATH_SEP = '/';
 class FilePatternAssociation {
@@ -250,24 +249,24 @@ export class JSONSchemaService {
     }
     loadSchema(url) {
         if (!this.requestService) {
-            const errorMessage = localize('json.schema.norequestservice', 'Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
+            const errorMessage = l10n.t('Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
             return this.promise.resolve(new UnresolvedSchema({}, [errorMessage]));
         }
         return this.requestService(url).then(content => {
             if (!content) {
-                const errorMessage = localize('json.schema.nocontent', 'Unable to load schema from \'{0}\': No content.', toDisplayString(url));
+                const errorMessage = l10n.t('Unable to load schema from \'{0}\': No content.', toDisplayString(url));
                 return new UnresolvedSchema({}, [errorMessage]);
             }
             const errors = [];
             if (content.charCodeAt(0) === 65279) {
-                errors.push(localize('json.schema.encodingWithBOM', 'Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)));
+                errors.push(l10n.t('Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)));
                 content = content.trimStart();
             }
             let schemaContent = {};
             const jsonErrors = [];
             schemaContent = Json.parse(content, jsonErrors);
             if (jsonErrors.length) {
-                errors.push(localize('json.schema.invalidFormat', 'Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset));
+                errors.push(l10n.t('Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset));
             }
             return new UnresolvedSchema(schemaContent, errors);
         }, (error) => {
@@ -280,7 +279,7 @@ export class JSONSchemaService {
             if (Strings.endsWith(errorMessage, '.')) {
                 errorMessage = errorMessage.substr(0, errorMessage.length - 1);
             }
-            return new UnresolvedSchema({}, [localize('json.schema.nocontent', 'Unable to load schema from \'{0}\': {1}.', toDisplayString(url), errorMessage)]);
+            return new UnresolvedSchema({}, [l10n.t('Unable to load schema from \'{0}\': {1}.', toDisplayString(url), errorMessage)]);
         });
     }
     resolveSchemaContent(schemaToResolve, handle) {
@@ -288,7 +287,7 @@ export class JSONSchemaService {
         const schema = schemaToResolve.schema;
         let schemaDraft = schema.$schema ? normalizeId(schema.$schema) : undefined;
         if (schemaDraft === 'http://json-schema.org/draft-03/schema') {
-            return this.promise.resolve(new ResolvedSchema({}, [localize('json.schema.draft03.notsupported', "Draft-03 schemas are not supported.")], [], schemaDraft));
+            return this.promise.resolve(new ResolvedSchema({}, [l10n.t("Draft-03 schemas are not supported.")], [], schemaDraft));
         }
         let usesUnsupportedFeatures = new Set();
         const contextService = this.contextService;
@@ -335,7 +334,7 @@ export class JSONSchemaService {
                 merge(target, section);
             }
             else {
-                resolveErrors.push(localize('json.schema.invalidid', '$ref \'{0}\' in \'{1}\' can not be resolved.', refSegment, sourceHandle.uri));
+                resolveErrors.push(l10n.t('$ref \'{0}\' in \'{1}\' can not be resolved.', refSegment || '', sourceHandle.uri));
             }
         };
         const resolveExternalLink = (node, uri, refSegment, parentHandle) => {
@@ -348,7 +347,7 @@ export class JSONSchemaService {
                 parentHandle.dependencies.add(uri);
                 if (unresolvedSchema.errors.length) {
                     const loc = refSegment ? uri + '#' + refSegment : uri;
-                    resolveErrors.push(localize('json.schema.problemloadingref', 'Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0]));
+                    resolveErrors.push(l10n.t('Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0]));
                 }
                 mergeRef(node, unresolvedSchema.schema, referencedHandle, refSegment);
                 return resolveRefs(node, unresolvedSchema.schema, referencedHandle);
@@ -392,7 +391,7 @@ export class JSONSchemaService {
                 const anchor = isString(id) && id.charAt(0) === '#' ? id.substring(1) : next.$anchor;
                 if (anchor) {
                     if (result.has(anchor)) {
-                        resolveErrors.push(localize('json.schema.duplicateid', 'Duplicate anchor declaration: \'{0}\'', anchor));
+                        resolveErrors.push(l10n.t('Duplicate anchor declaration: \'{0}\'', anchor));
                     }
                     else {
                         result.set(anchor, next);
@@ -410,7 +409,7 @@ export class JSONSchemaService {
         return resolveRefs(schema, schema, handle).then(_ => {
             let resolveWarnings = [];
             if (usesUnsupportedFeatures.size) {
-                resolveWarnings.push(localize('json.schema.warnings', 'The schema uses meta-schema features ({0}) that are not yet supported by the validator.', Array.from(usesUnsupportedFeatures.keys()).join(', ')));
+                resolveWarnings.push(l10n.t('The schema uses meta-schema features ({0}) that are not yet supported by the validator.', Array.from(usesUnsupportedFeatures.keys()).join(', ')));
             }
             return new ResolvedSchema(schema, resolveErrors, resolveWarnings, schemaDraft);
         });

package/lib/esm/services/jsonValidation.js

@@ -3,9 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { ErrorCode, Diagnostic, DiagnosticSeverity, Range } from '../jsonLanguageTypes';
-import * as nls from 'vscode-nls';
+import * as l10n from '@vscode/l10n';
 import { isBoolean } from '../utils/objects';
-const localize = nls.loadMessageBundle();
 export class JSONValidation {
     constructor(jsonSchemaService, promiseConstructor) {
         this.jsonSchemaService = jsonSchemaService;
@@ -82,7 +81,7 @@ export class JSONValidation {
                 addProblem(p);
             }
             if (typeof commentSeverity === 'number') {
-                const message = localize('InvalidCommentToken', 'Comments are not permitted in JSON.');
+                const message = l10n.t('Comments are not permitted in JSON.');
                 jsonDocument.comments.forEach(c => {
                     addProblem(Diagnostic.create(c, message, commentSeverity, ErrorCode.CommentNotPermitted));
                 });

package/lib/umd/jsonContributions.d.ts

@@ -6,12 +6,11 @@ export interface JSONWorkerContribution {
     collectDefaultCompletions(uri: string, result: CompletionsCollector): Thenable<any>;
     resolveCompletion?(item: CompletionItem): Thenable<CompletionItem>;
 }
-export declare type Segment = string | number;
-export declare type JSONPath = Segment[];
+export type Segment = string | number;
+export type JSONPath = Segment[];
 export interface CompletionsCollector {
     add(suggestion: CompletionItem): void;
     error(message: string): void;
-    log(message: string): void;
     setAsIncomplete(): void;
     getNumberOfProposals(): number;
 }

package/lib/umd/jsonLanguageService.d.ts

@@ -1,6 +1,6 @@
 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, JSONLanguageStatus } from './jsonLanguageTypes';
 import { DocumentLink } from 'vscode-languageserver-types';
-export declare type JSONDocument = {
+export type JSONDocument = {
     root: ASTNode | undefined;
     getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
 };

package/lib/umd/jsonLanguageTypes.d.ts

@@ -28,7 +28,7 @@ export declare enum ErrorCode {
     SchemaResolveError = 768,
     SchemaUnsupportedFeature = 769
 }
-export declare type ASTNode = ObjectASTNode | PropertyASTNode | ArrayASTNode | StringASTNode | NumberASTNode | BooleanASTNode | NullASTNode;
+export type ASTNode = ObjectASTNode | PropertyASTNode | ArrayASTNode | StringASTNode | NumberASTNode | BooleanASTNode | NullASTNode;
 export interface BaseASTNode {
     readonly type: 'object' | 'array' | 'property' | 'string' | 'number' | 'boolean' | 'null';
     readonly parent?: ASTNode;
@@ -93,7 +93,7 @@ export interface LanguageSettings {
      */
     schemas?: SchemaConfiguration[];
 }
-export declare type SeverityLevel = 'error' | 'warning' | 'ignore';
+export type SeverityLevel = 'error' | 'warning' | 'ignore';
 export declare enum SchemaDraft {
     v3 = 3,
     v4 = 4,

package/lib/umd/jsonSchema.d.ts

@@ -1,4 +1,4 @@
-export declare type JSONSchemaRef = JSONSchema | boolean;
+export type JSONSchemaRef = JSONSchema | boolean;
 export interface JSONSchema {
     id?: string;
     $id?: string;