yaml-language-server 1.2.2 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+### 1.3.0
+- Fix: Wrong hover information [#647](https://github.com/redhat-developer/vscode-yaml/issues/647)
+- Fix: relative file paths with fragments [#603](https://github.com/redhat-developer/yaml-language-server/pull/603)
+- Update K8S json schema version from 1.20.5 to 1.22.4 [#611](https://github.com/redhat-developer/yaml-language-server/pull/611)
+- Feat: extend array documentation on completion [#608](https://github.com/redhat-developer/yaml-language-server/pull/608)
+- Feat: add more detail into anyOf array completion [#607](https://github.com/redhat-developer/yaml-language-server/pull/607)
+- Feat: trim end $1 from completion [#609](https://github.com/redhat-developer/yaml-language-server/pull/609)
+- Fix: auto-complete is not working properly [#563](https://github.com/redhat-developer/yaml-language-server/issues/563)
+- Fix: TypeError: Cannot read property 'type' of undefined [#652](https://github.com/redhat-developer/vscode-yaml/issues/652)
+- Feat: Improve telemetry error logging [#602](https://github.com/redhat-developer/yaml-language-server/pull/602)
+- Fix: completion invoke in three different scenarios [#617](https://github.com/redhat-developer/yaml-language-server/pull/617)
+- Fix: DefaultSnippets quick suggestions don't show description if they overlap with const defined in if else [#642](https://github.com/redhat-developer/vscode-yaml/issues/642)
+- Fix: If maxProperties is set, completion does not work for the last property [#612](https://github.com/redhat-developer/yaml-language-server/issues/612)
+- Feat: Add convert to boolean code action [#622](https://github.com/redhat-developer/yaml-language-server/pull/622)
+- Remove `getSchemas` method [#626](https://github.com/redhat-developer/yaml-language-server/pull/626)
+- Lock `vscode-json-languageservice@4.1.8` [#637](https://github.com/redhat-developer/yaml-language-server/pull/637)
+- Feat: disable default props [#606](https://github.com/redhat-developer/yaml-language-server/pull/606)
+- Fix: Schema validation matches `@bitnami` as a uri-formatted string. [#586](https://github.com/redhat-developer/yaml-language-server/issues/586)
+- Fix: Array indent doesn't work properly inside another array [#634](https://github.com/redhat-developer/yaml-language-server/pull/634)
+- Fix: _PROXY environment and setting not honoured since 1.1.1 [#588](https://github.com/redhat-developer/yaml-language-server/issues/588)
+- Fix: array indent on different index position [#635](https://github.com/redhat-developer/yaml-language-server/pull/635)
+- Feat: parent completion [#628](https://github.com/redhat-developer/yaml-language-server/pull/628)
+
+Thanks to tonypai, Martti Laine, Petr Spacek, sfalmo
+
 ### 1.2.2
 - Fix: LSP triggeringregisterCapability despite dynamicRegistration set to false [#583](https://github.com/redhat-developer/yaml-language-server/issues/583)
 - Add methods which allow client get schemas info [#556](https://github.com/redhat-developer/yaml-language-server/pull/556)

package/README.md

@@ -48,6 +48,7 @@ The following settings are supported:
 - `http.proxy`: The URL of the proxy server that will be used when attempting to download a schema. If it is not set or it is undefined no proxy server will be used.
 - `http.proxyStrictSSL`: If true the proxy server certificate should be verified against the list of supplied CAs. Default is false.
 - `[yaml].editor.formatOnType`: Enable/disable on type indent and auto formatting array
+- `yaml.disableDefaultProperties`: Disable adding not required properties with default values into completion text
 
 ##### Adding custom tags
 
@@ -241,11 +242,13 @@ or absolute path:
 ```
 
 ## Containerized Language Server
+
 An image is provided for users who would like to use the YAML language server without having to install dependencies locally.
 
 The image is located at `quay.io/redhat-developer/yaml-language-server`
 
 To run the image you can use:
+
 ```
 docker run -it quay.io/redhat-developer/yaml-language-server:latest
 ```
@@ -263,14 +266,16 @@ docker run -it quay.io/redhat-developer/yaml-language-server:latest
 The support schema selection notification is sent from a client to the server to inform server that client supports JSON Schema selection.
 
 _Notification:_
+
 - method: `'yaml/supportSchemaSelection'`
-- params: `void` 
+- params: `void`
 
 #### SchemaStoreInitialized Notification
 
 The schema store initialized notification is sent from the server to a client to inform client that server has finished initializing/loading schemas from schema store, and client now can ask for schemas.
 
 _Notification:_
+
 - method: `'yaml/schema/store/initialized'`
 - params: `void`
 
@@ -279,12 +284,14 @@ _Notification:_
 The get all schemas request sent from a client to server to get all known schemas.
 
 _Request:_
+
 - method: `'yaml/get/all/jsonSchemas'`;
 - params: the document uri, server will mark used schema for document
 
 _Response:_
 
 - result: `JSONSchemaDescriptionExt[]`
+
 ```typescript
 interface JSONSchemaDescriptionExt {
   /**
@@ -315,10 +322,12 @@ interface JSONSchemaDescriptionExt {
 The request sent from a client to server to get schemas used for current document. Client can use this method to indicate in UI which schemas used for current YAML document.
 
 _Request:_
+
 - method: `'yaml/get/jsonSchema'`;
 - params: the document uri to get used schemas
 
 _Response:_
+
 - result: `JSONSchemaDescription[]`
 
 ```typescript

package/lib/esm/languageserver/handlers/settingsHandlers.js

@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  *--------------------------------------------------------------------------------------------*/
 import { xhr, configure as configureHttpRequests } from 'request-light';
 import { DocumentFormattingRequest, DidChangeConfigurationNotification } from 'vscode-languageserver';
+import { convertErrorToTelemetryMsg } from '../../languageservice/utils/objects';
 import { isRelativePath, relativeToAbsolutePath } from '../../languageservice/utils/paths';
 import { checkSchemaURI, JSON_SCHEMASTORE_URL, KUBERNETES_SCHEMA_URL } from '../../languageservice/utils/schemaUrls';
 import { SchemaPriority } from '../../languageservice/yamlLanguageService';
@@ -33,8 +34,7 @@ export class SettingsHandler {
                     yield this.connection.client.register(DidChangeConfigurationNotification.type, undefined);
                 }
                 catch (err) {
-                    console.warn(err);
-                    this.telemetry.sendError('yaml.settings.error', { error: err });
+                    this.telemetry.sendError('yaml.settings.error', { error: convertErrorToTelemetryMsg(err) });
                 }
             }
             this.connection.onDidChangeConfiguration(() => this.pullConfiguration());
@@ -105,6 +105,7 @@ export class SettingsHandler {
                     }
                 }
                 this.yamlSettings.disableAdditionalProperties = settings.yaml.disableAdditionalProperties;
+                this.yamlSettings.disableDefaultProperties = settings.yaml.disableDefaultProperties;
             }
             this.yamlSettings.schemaConfigurationSettings = [];
             if (settings.yamlEditor && settings.yamlEditor['editor.tabSize']) {
@@ -219,6 +220,7 @@ export class SettingsHandler {
             format: this.yamlSettings.yamlFormatterSettings.enable,
             indentation: this.yamlSettings.indentation,
             disableAdditionalProperties: this.yamlSettings.disableAdditionalProperties,
+            disableDefaultProperties: this.yamlSettings.disableDefaultProperties,
             yamlVersion: this.yamlSettings.yamlVersion,
         };
         if (this.yamlSettings.schemaAssociations) {

package/lib/esm/languageserver/handlers/settingsHandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;gGAGgG;AAChG,OAAO,EAAE,GAAG,EAAE,SAAS,IAAI,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAc,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAClH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AACrH,OAAO,EAAqC,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC9G,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAK7D,MAAM,OAAO,eAAe;IAC1B,YACmB,UAAsB,EACtB,eAAgC,EAChC,YAA2B,EAC3B,iBAAoC,EACpC,SAAoB;QAJpB,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAiB;QAChC,iBAAY,GAAZ,YAAY,CAAe;QAC3B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAW;IACpC,CAAC;IAEE,gBAAgB;;YACpB,IAAI,IAAI,CAAC,YAAY,CAAC,0BAA0B,IAAI,IAAI,CAAC,YAAY,CAAC,4BAA4B,EAAE;gBAClG,IAAI;oBACF,0CAA0C;oBAC1C,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;iBAC3F;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAC7F;aACF;YACD,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC3E,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;;YACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC;gBAC9D,EAAE,OAAO,EAAE,MAAM,EAAE;gBACnB,EAAE,OAAO,EAAE,MAAM,EAAE;gBACnB,EAAE,OAAO,EAAE,QAAQ,EAAE;aACtB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAa;gBACzB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;gBACf,IAAI,EAAE;oBACJ,KAAK,cAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,EAAE;oBAC7B,cAAc,cAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,cAAc,mCAAI,KAAK;iBACnD;gBACD,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;aACtB,CAAC;YACF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;;KACjC;IAEK,gBAAgB,CAAC,QAAkB;;;YACvC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAE3G,IAAI,CAAC,YAAY,CAAC,sBAAsB,GAAG,EAAE,CAAC;YAC9C,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACjB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;oBAClE,IAAI,CAAC,YAAY,CAAC,yBAAyB,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;iBACrE;gBACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;oBACnE,IAAI,CAAC,YAAY,CAAC,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC/D;gBACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;oBAChE,IAAI,CAAC,YAAY,CAAC,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;iBACzD;gBACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE;oBACrE,IAAI,CAAC,YAAY,CAAC,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;iBACnE;gBACD,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;gBAExF,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;gBAE7G,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,YAAY,CAAC,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;oBACxE,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;wBAC9C,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;qBAClE;iBACF;gBAED,IAAI,CAAC,YAAY,CAAC,WAAW,SAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,mCAAI,KAAK,CAAC;gBAEnE,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;oBACxB,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG;wBACxC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU;wBACvD,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;qBAClD,CAAC;oBAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;wBAClD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;qBACxF;oBAED,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE;wBACrD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;qBAC9F;oBAED,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;wBAC7C,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;qBAC9E;iBACF;gBACD,IAAI,CAAC,YAAY,CAAC,2BAA2B,GAAG,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC;gBAC1F,IAAI,CAAC,YAAY,CAAC,wBAAwB,GAAG,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC;aACrF;YAED,IAAI,CAAC,YAAY,CAAC,2BAA2B,GAAG,EAAE,CAAC;YAEnD,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;gBAChE,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;aACnF;YAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE;gBAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBAErE,MAAM,SAAS,GAAG;oBAChB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;oBACnE,GAAG,EAAE,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;iBAC9G,CAAC;gBACF,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC/D;YAED,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAC5C,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,YAAY,CAAC,0BAA0B,EAAE;gBAChD,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;aACtF;YAED,6CAA6C;YAC7C,IAAI,IAAI,CAAC,YAAY,CAAC,4BAA4B,EAAE;gBAClD,MAAM,eAAe,GAAG,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;gBAEzG,IAAI,eAAe,EAAE;oBACnB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE;wBAC5C,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAC,IAAI,EAAE;4BACxG,gBAAgB,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;yBACzC,CAAC,CAAC;qBACJ;iBACF;qBAAM,IAAI,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE;oBAClD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;wBACjD,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;oBACrB,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG,IAAI,CAAC;iBAChD;aACF;;KACF;IAED;;;;OAIG;IACU,8BAA8B;;YACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC;YAC5E,IAAI,cAAc,GAAG,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;gBACjD,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;aACnD;iBAAM;gBACL,cAAc,GAAG,oBAAoB,CAAC;aACvC;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,IAAI,CAAC,gBAAgB,EAAE;gBAC7D,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;oBAC7E,IAAI,CAAC,YAAY,CAAC,mBAAmB,GAAG,WAAW,CAAC,OAAO,CAAC;oBAC5D,IAAI,CAAC,mBAAmB,EAAE,CAAC;iBAC5B;gBAAC,OAAO,GAAG,EAAE;oBACZ,SAAS;iBACV;aACF;iBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;gBAChD,IAAI,CAAC,YAAY,CAAC,mBAAmB,GAAG,EAAE,CAAC;gBAC3C,IAAI,CAAC,mBAAmB,EAAE,CAAC;aAC5B;QACH,CAAC;KAAA;IAED;;OAEG;IACH,8DAA8D;IACtD,6BAA6B,CAAC,cAAsB;QAC1D,OAAO,GAAG,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpD,MAAM,gBAAgB,GAAG;gBACvB,OAAO,EAAE,EAAE;aACZ,CAAC;YAEF,yCAAyC;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAElD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE;gBACzC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAE5C,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE;oBAC9B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,SAAS,EAAE;wBACxC,MAAM,aAAa,GAAW,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;wBAC1D,gFAAgF;wBAChF,IAAI,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;4BACjF,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC;gCAC5B,GAAG,EAAE,MAAM,CAAC,GAAG;gCACf,SAAS,EAAE,CAAC,aAAa,CAAC;gCAC1B,QAAQ,EAAE,cAAc,CAAC,WAAW;gCACpC,IAAI,EAAE,MAAM,CAAC,IAAI;gCACjB,WAAW,EAAE,MAAM,CAAC,WAAW;6BAChC,CAAC,CAAC;yBACJ;qBACF;iBACF;aACF;YAED,OAAO,gBAAgB,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,mBAAmB;QACxB,IAAI,gBAAgB,GAAqB;YACvC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB;YAC9C,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,oBAAoB;YAClD,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU;YACxC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM;YACtD,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;YAC1C,2BAA2B,EAAE,IAAI,CAAC,YAAY,CAAC,2BAA2B;YAC1E,wBAAwB,EAAE,IAAI,CAAC,YAAY,CAAC,wBAAwB;YACpE,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;SAC3C,CAAC;QAEF,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;YACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE;gBACvD,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC3D,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CACtC,WAAW,CAAC,GAAG,EACf,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,MAAM,EAClB,gBAAgB,EAChB,cAAc,CAAC,iBAAiB,CACjC,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;oBACtD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;oBAC5D,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;iBACpH;aACF;SACF;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE;YACjD,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC/D,IAAI,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;gBACrB,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE;oBACzB,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;iBACxB;gBACD,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE;oBAC5B,GAAG,GAAG,0BAA0B,GAAG,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBACnF;gBACD,IAAI,GAAG,EAAE;oBACP,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE;wBACvB,GAAG,GAAG,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;qBACxG;oBAED,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CACtC,GAAG,EACH,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,MAAM,EACb,gBAAgB,EAChB,cAAc,CAAC,QAAQ,CACxB,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE;YACzC,gBAAgB,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAEjD,qCAAqC;QACrC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrG,CAAC;IAED;;;;;;OAMG;IACH,8DAA8D;IACtD,gBAAgB,CACtB,GAAW,EACX,SAAmB,EACnB,MAAe,EACf,gBAAkC,EAClC,aAAqB;QAErB,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAE/G,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;SACvF;aAAM;YACL,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;SACvG;QAED,IAAI,SAAS,CAAC,WAAW,KAAK,KAAK,IAAI,GAAG,KAAK,qBAAqB,EAAE;YACpE,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxB,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,GAAG,KAAK,qBAAqB,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC1D;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF"}

package/lib/esm/languageservice/parser/ast-converter.js

@@ -104,7 +104,15 @@ function convertScalar(node, parent) {
 }
 function convertAlias(node, parent, doc, lineCounter) {
     refDepth++;
-    return convertAST(parent, node.resolve(doc), doc, lineCounter);
+    const resolvedNode = node.resolve(doc);
+    if (resolvedNode) {
+        return convertAST(parent, resolvedNode, doc, lineCounter);
+    }
+    else {
+        const resultNode = new StringASTNodeImpl(parent, node, ...toOffsetLength(node.range));
+        resultNode.value = node.source;
+        return resultNode;
+    }
 }
 export function toOffsetLength(range) {
     return [range[0], range[1] - range[0]];

package/lib/esm/languageservice/parser/ast-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}

package/lib/esm/languageservice/parser/jsonParser07.d.ts

@@ -1,6 +1,6 @@
 import { JSONSchema, JSONSchemaRef } from '../jsonSchema';
 import { ASTNode, ObjectASTNode, ArrayASTNode, BooleanASTNode, NumberASTNode, StringASTNode, NullASTNode, PropertyASTNode } from '../jsonASTTypes';
-import { ErrorCode, JSONPath } from 'vscode-json-languageservice';
+import { ErrorCode } from 'vscode-json-languageservice';
 import { DiagnosticSeverity, Range } from 'vscode-languageserver-types';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { Diagnostic } from 'vscode-languageserver';
@@ -145,8 +145,8 @@ export declare class ValidationResult {
 }
 export declare function newJSONDocument(root: ASTNode, diagnostics?: Diagnostic[]): JSONDocument;
 export declare function getNodeValue(node: ASTNode): any;
-export declare function getNodePath(node: ASTNode): JSONPath;
 export declare function contains(node: ASTNode, offset: number, includeRightBound?: boolean): boolean;
+export declare function findNodeAtOffset(node: ASTNode, offset: number, includeRightBound: boolean): ASTNode;
 export declare class JSONDocument {
     readonly root: ASTNode;
     readonly syntaxErrors: Diagnostic[];

package/lib/esm/languageservice/parser/jsonParser07.js

@@ -3,7 +3,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as Json from 'jsonc-parser';
 import { isNumber, equals, isString, isDefined, isBoolean, isIterable } from '../utils/objects';
 import { getSchemaTypeName } from '../utils/schemaUtils';
 import { ErrorCode } from 'vscode-json-languageservice';
@@ -255,12 +254,12 @@ export class ValidationResult {
      * @param subValidationResult another possible result
      */
     mergeWarningGeneric(subValidationResult, problemTypesToMerge) {
-        var _a, _b;
-        if ((_a = this.problems) === null || _a === void 0 ? void 0 : _a.length) {
+        var _b, _c;
+        if ((_b = this.problems) === null || _b === void 0 ? void 0 : _b.length) {
             for (const problemType of problemTypesToMerge) {
                 const bestResults = this.problems.filter((p) => p.problemType === problemType);
                 for (const bestResult of bestResults) {
-                    const mergingResult = (_b = subValidationResult.problems) === null || _b === void 0 ? void 0 : _b.find((p) => p.problemType === problemType &&
+                    const mergingResult = (_c = subValidationResult.problems) === null || _c === void 0 ? void 0 : _c.find((p) => p.problemType === problemType &&
                         bestResult.location.offset === p.location.offset &&
                         (problemType !== ProblemType.missingRequiredPropWarning || isArrayEqual(p.problemArgs, bestResult.problemArgs)) // missingProp is merged only with same problemArg
                     );
@@ -338,14 +337,50 @@ export function newJSONDocument(root, diagnostics = []) {
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getNodeValue(node) {
-    return Json.getNodeValue(node);
-}
-export function getNodePath(node) {
-    return Json.getNodePath(node);
+    switch (node.type) {
+        case 'array':
+            return node.children.map(getNodeValue);
+        case 'object': {
+            const obj = Object.create(null);
+            for (let _i = 0, _a = node.children; _i < _a.length; _i++) {
+                const prop = _a[_i];
+                const valueNode = prop.children[1];
+                if (valueNode) {
+                    obj[prop.children[0].value] = getNodeValue(valueNode);
+                }
+            }
+            return obj;
+        }
+        case 'null':
+        case 'string':
+        case 'number':
+        case 'boolean':
+            return node.value;
+        default:
+            return undefined;
+    }
 }
 export function contains(node, offset, includeRightBound = false) {
     return ((offset >= node.offset && offset <= node.offset + node.length) || (includeRightBound && offset === node.offset + node.length));
 }
+export function findNodeAtOffset(node, offset, includeRightBound) {
+    if (includeRightBound === void 0) {
+        includeRightBound = false;
+    }
+    if (contains(node, offset, includeRightBound)) {
+        const children = node.children;
+        if (Array.isArray(children)) {
+            for (let i = 0; i < children.length && children[i].offset <= offset; i++) {
+                const item = findNodeAtOffset(children[i], offset, includeRightBound);
+                if (item) {
+                    return item;
+                }
+            }
+        }
+        return node;
+    }
+    return undefined;
+}
 export class JSONDocument {
     constructor(root, syntaxErrors = [], comments = []) {
         this.root = root;
@@ -354,7 +389,7 @@ export class JSONDocument {
     }
     getNodeFromOffset(offset, includeRightBound = false) {
         if (this.root) {
-            return Json.findNodeAtOffset(this.root, offset, includeRightBound);
+            return findNodeAtOffset(this.root, offset, includeRightBound);
         }
         return undefined;
     }
@@ -489,8 +524,12 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
                 matchingSchemas.add(ms);
             }
         }
-        const testAlternatives = (alternatives, maxOneMatch) => {
+        const testAlternatives = (alternatives, minOneMatch) => {
             const matches = [];
+            let minMatch = 1;
+            if (minOneMatch) {
+                minMatch = alternatives.length;
+            }
             // remember the best match that is used for error messages
             let bestMatch = null;
             for (const subSchemaRef of alternatives) {
@@ -512,14 +551,14 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
                     bestMatch = alternativeComparison(subValidationResult, bestMatch, subSchema, subMatchingSchemas);
                 }
                 else {
-                    bestMatch = genericComparison(maxOneMatch, subValidationResult, bestMatch, subSchema, subMatchingSchemas);
+                    bestMatch = genericComparison(minOneMatch, subValidationResult, bestMatch, subSchema, subMatchingSchemas);
                 }
             }
-            if (matches.length > 1 && maxOneMatch) {
+            if (matches.length > minMatch && minOneMatch) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: 1 },
                     severity: DiagnosticSeverity.Warning,
-                    message: localize('oneOfWarning', 'Matches multiple schemas when only one must validate.'),
+                    message: localize('oneOfWarning', 'Minimum one schema should validate.'),
                     source: getSchemaSource(schema, originalSchema),
                     schemaUri: getSchemaUri(schema, originalSchema),
                 });
@@ -821,12 +860,22 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
         else {
             const itemSchema = asSchema(schema.items);
             if (itemSchema) {
-                for (const item of node.items) {
-                    const itemValidationResult = new ValidationResult(isKubernetes);
-                    validate(item, itemSchema, schema, itemValidationResult, matchingSchemas, options);
-                    validationResult.mergePropertyMatch(itemValidationResult);
-                    validationResult.mergeEnumValues(itemValidationResult);
-                }
+                const itemValidationResult = new ValidationResult(isKubernetes);
+                node.items.forEach((item) => {
+                    if (itemSchema.oneOf && itemSchema.oneOf.length === 1) {
+                        const subSchemaRef = itemSchema.oneOf[0];
+                        const subSchema = asSchema(subSchemaRef);
+                        subSchema.title = schema.title;
+                        validate(item, subSchema, schema, itemValidationResult, matchingSchemas, options);
+                        validationResult.mergePropertyMatch(itemValidationResult);
+                        validationResult.mergeEnumValues(itemValidationResult);
+                    }
+                    else {
+                        validate(item, itemSchema, schema, itemValidationResult, matchingSchemas, options);
+                        validationResult.mergePropertyMatch(itemValidationResult);
+                        validationResult.mergeEnumValues(itemValidationResult);
+                    }
+                });
             }
         }
         const containsSchema = asSchema(schema.contains);
@@ -881,7 +930,7 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
         }
     }
     function _validateObjectNode(node, schema, validationResult, matchingSchemas) {
-        var _a;
+        var _b;
         const seenKeys = Object.create(null);
         const unprocessedProperties = [];
         const unprocessedNodes = [...node.properties];
@@ -963,7 +1012,7 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
                         }
                     }
                     else {
-                        propertySchema.url = (_a = schema.url) !== null && _a !== void 0 ? _a : originalSchema.url;
+                        propertySchema.url = (_b = schema.url) !== null && _b !== void 0 ? _b : originalSchema.url;
                         const propertyValidationResult = new ValidationResult(isKubernetes);
                         validate(child, propertySchema, schema, propertyValidationResult, matchingSchemas, options);
                         validationResult.mergePropertyMatch(propertyValidationResult);
@@ -1170,7 +1219,7 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
     }
 }
 function getSchemaSource(schema, originalSchema) {
-    var _a;
+    var _b;
     if (schema) {
         let label;
         if (schema.title) {
@@ -1180,7 +1229,7 @@ function getSchemaSource(schema, originalSchema) {
             label = originalSchema.title;
         }
         else {
-            const uriString = (_a = schema.url) !== null && _a !== void 0 ? _a : originalSchema.url;
+            const uriString = (_b = schema.url) !== null && _b !== void 0 ? _b : originalSchema.url;
             if (uriString) {
                 const url = URI.parse(uriString);
                 if (url.scheme === 'file') {
@@ -1196,8 +1245,8 @@ function getSchemaSource(schema, originalSchema) {
     return YAML_SOURCE;
 }
 function getSchemaUri(schema, originalSchema) {
-    var _a;
-    const uriString = (_a = schema.url) !== null && _a !== void 0 ? _a : originalSchema.url;
+    var _b;
+    const uriString = (_b = schema.url) !== null && _b !== void 0 ? _b : originalSchema.url;
     return uriString ? [uriString] : [];
 }
 function getWarningMessage(problemType, args) {