yaml-language-server 1.2.2 → 1.3.0

package/lib/umd/languageservice/utils/objects.js.map

@@ -1 +1 @@
-{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;oGAGgG;IAChG,YAAY,CAAC;;;IAEb,iHAAiH;IACjH,SAAgB,MAAM,CAAC,GAAQ,EAAE,KAAU;QACzC,IAAI,GAAG,KAAK,KAAK,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;YAC9E,OAAO,KAAK,CAAC;SACd;QACD,IAAI,OAAO,GAAG,KAAK,OAAO,KAAK,EAAE;YAC/B,OAAO,KAAK,CAAC;SACd;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/C,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAS,EAAE,GAAW,CAAC;QAE3B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;gBAC/B,OAAO,KAAK,CAAC;aACd;YACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC7B,OAAO,KAAK,CAAC;iBACd;aACF;SACF;aAAM;YACL,MAAM,OAAO,GAAa,EAAE,CAAC;YAE7B,KAAK,GAAG,IAAI,GAAG,EAAE;gBACf,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACnB;YACD,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,KAAK,GAAG,IAAI,KAAK,EAAE;gBACjB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACrB;YACD,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;gBAC/B,OAAO,KAAK,CAAC;aACd;YACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC/C,OAAO,KAAK,CAAC;iBACd;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAlDD,wBAkDC;IAED,SAAgB,QAAQ,CAAC,GAAY;QACnC,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC;IACjC,CAAC;IAFD,4BAEC;IAED,wDAAwD;IACxD,SAAgB,SAAS,CAAC,GAAY;QACpC,OAAO,OAAO,GAAG,KAAK,WAAW,CAAC;IACpC,CAAC;IAFD,8BAEC;IAED,SAAgB,SAAS,CAAC,GAAY;QACpC,OAAO,OAAO,GAAG,KAAK,SAAS,CAAC;IAClC,CAAC;IAFD,8BAEC;IAED,SAAgB,QAAQ,CAAC,GAAY;QACnC,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC;IACjC,CAAC;IAFD,4BAEC;IAED;;;;OAIG;IACH,SAAgB,UAAU,CAAC,GAAY;QACrC,OAAO,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAFD,gCAEC"}
+{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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"}

package/lib/umd/languageservice/utils/schemaUrls.d.ts

@@ -2,7 +2,7 @@ import { WorkspaceFolder } from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
 import { Telemetry } from '../../languageserver/telemetry';
 import { JSONSchema } from '../jsonSchema';
-export declare const KUBERNETES_SCHEMA_URL = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.20.5-standalone-strict/all.json";
+export declare const KUBERNETES_SCHEMA_URL = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.22.4-standalone-strict/all.json";
 export declare const JSON_SCHEMASTORE_URL = "https://www.schemastore.org/api/json/catalog.json";
 export declare function checkSchemaURI(workspaceFolders: WorkspaceFolder[], workspaceRoot: URI, uri: string, telemetry: Telemetry): string;
 /**

package/lib/umd/languageservice/utils/schemaUrls.js

@@ -12,7 +12,7 @@
     exports.getSchemaUrls = exports.checkSchemaURI = exports.JSON_SCHEMASTORE_URL = exports.KUBERNETES_SCHEMA_URL = void 0;
     const objects_1 = require("./objects");
     const paths_1 = require("./paths");
-    exports.KUBERNETES_SCHEMA_URL = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.20.5-standalone-strict/all.json';
+    exports.KUBERNETES_SCHEMA_URL = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.22.4-standalone-strict/all.json';
     exports.JSON_SCHEMASTORE_URL = 'https://www.schemastore.org/api/json/catalog.json';
     function checkSchemaURI(workspaceFolders, workspaceRoot, uri, telemetry) {
         if (uri.trim().toLowerCase() === 'kubernetes') {

package/lib/umd/languageservice/yamlLanguageService.d.ts

@@ -39,6 +39,10 @@ export interface LanguageSettings {
      * So if its true, no extra properties are allowed inside yaml.
      */
     disableAdditionalProperties?: boolean;
+    /**
+     * Disable adding not required properties with default values into completion text.
+     */
+    disableDefaultProperties?: boolean;
     /**
      * Default yaml lang version
      */

package/lib/umd/languageservice/yamlLanguageService.js

@@ -48,6 +48,7 @@
         const yamlCodeActions = new yamlCodeActions_1.YamlCodeActions(clientCapabilities);
         const yamlCodeLens = new yamlCodeLens_1.YamlCodeLens(schemaService, telemetry);
         const yamlLinks = new yamlLinks_1.YamlLinks(telemetry);
+        const yamlDefinition = new yamlDefinition_1.YamlDefinition(telemetry);
         new schemaSelectionHandlers_1.JSONSchemaSelection(schemaService, yamlSettings, connection);
         // register all commands
         yamlCommands_1.registerCommands(commandExecutor_1.commandExecutor, connection);
@@ -77,7 +78,7 @@
             doHover: hover.doHover.bind(hover),
             findDocumentSymbols: yamlDocumentSymbols.findDocumentSymbols.bind(yamlDocumentSymbols),
             findDocumentSymbols2: yamlDocumentSymbols.findHierarchicalDocumentSymbols.bind(yamlDocumentSymbols),
-            doDefinition: yamlDefinition_1.getDefinition.bind(yamlDefinition_1.getDefinition),
+            doDefinition: yamlDefinition.getDefinition.bind(yamlDefinition),
             resetSchema: (uri) => {
                 return schemaService.onResourceChange(uri);
             },

package/lib/umd/languageservice/yamlLanguageService.js.map

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

package/lib/umd/server.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "vscode-languageserver/node", "vscode-nls", "./languageservice/services/schemaRequestHandler", "./yamlServerInit", "./yamlSettings", "fs"], factory);
+        define(["require", "exports", "vscode-languageserver/node", "vscode-nls", "./languageservice/services/schemaRequestHandler", "./yamlServerInit", "./yamlSettings", "fs", "./languageservice/utils/objects"], factory);
     }
 })(function (require, exports) {
     /*---------------------------------------------------------------------------------------------
@@ -21,6 +21,7 @@
     const yamlServerInit_1 = require("./yamlServerInit");
     const yamlSettings_1 = require("./yamlSettings");
     const fs_1 = require("fs");
+    const objects_1 = require("./languageservice/utils/objects");
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     nls.config(process.env['VSCODE_NLS_CONFIG']);
     // Create a connection for the server.
@@ -31,6 +32,10 @@
     else {
         connection = node_1.createConnection();
     }
+    process.on('uncaughtException', (err) => {
+        // send all uncaught exception to telemetry with stack traces
+        connection.console.error(objects_1.convertErrorToTelemetryMsg(err));
+    });
     console.log = connection.console.log.bind(connection.console);
     console.error = connection.console.error.bind(connection.console);
     //vscode-nls calls console.error(null) in some cases, so we put that in info, to predict sending "null" in to telemetry

package/lib/umd/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;;oGAKgG;IAChG,YAAY,CAAC;;IAEb,qDAA4F;IAC5F,kCAAkC;IAClC,0FAAyG;IACzG,qDAAkD;IAClD,iDAA+C;IAC/C,2BAAoC;IAEpC,8DAA8D;IAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;IAEpD,sCAAsC;IACtC,IAAI,UAAU,GAAe,IAAI,CAAC;IAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,UAAU,GAAG,uBAAgB,CAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;KACrD;SAAM;QACL,UAAU,GAAG,uBAAgB,EAAE,CAAC;KACjC;IAED,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAElE,uHAAuH;IACvH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM;YACL,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;IAEzC,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;YAC9C,OAAO,aAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;IAEF;;;OAGG;IACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;QAC3F,OAAO,2CAAoB,CACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAEhF,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;;oGAKgG;IAChG,YAAY,CAAC;;IAEb,qDAA4F;IAC5F,kCAAkC;IAClC,0FAAyG;IACzG,qDAAkD;IAClD,iDAA+C;IAC/C,2BAAoC;IACpC,6DAA6E;IAE7E,8DAA8D;IAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;IAEpD,sCAAsC;IACtC,IAAI,UAAU,GAAe,IAAI,CAAC;IAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,UAAU,GAAG,uBAAgB,CAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;KACrD;SAAM;QACL,UAAU,GAAG,uBAAgB,EAAE,CAAC;KACjC;IAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAU,EAAE,EAAE;QAC7C,6DAA6D;QAC7D,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAElE,uHAAuH;IACvH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM;YACL,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;IAEzC,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;YAC9C,OAAO,aAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;IAEF;;;OAGG;IACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;QAC3F,OAAO,2CAAoB,CACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAEhF,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC"}

package/lib/umd/yamlSettings.d.ts

@@ -18,6 +18,7 @@ export interface Settings {
             url: string;
             enable: boolean;
         };
+        disableDefaultProperties: boolean;
         disableAdditionalProperties: boolean;
         maxItemsComputed: number;
         yamlVersion: YamlVersion;
@@ -53,6 +54,7 @@ export declare class SettingsState {
     schemaStoreUrl: string;
     indentation: string | undefined;
     disableAdditionalProperties: boolean;
+    disableDefaultProperties: boolean;
     maxItemsComputed: number;
     pendingValidationRequests: {
         [uri: string]: NodeJS.Timer;

package/lib/umd/yamlSettings.js

@@ -37,6 +37,7 @@
             this.schemaStoreUrl = schemaUrls_1.JSON_SCHEMASTORE_URL;
             this.indentation = undefined;
             this.disableAdditionalProperties = false;
+            this.disableDefaultProperties = false;
             this.maxItemsComputed = 5000;
             // File validation helpers
             this.pendingValidationRequests = {};

package/lib/umd/yamlSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,qDAA4G;IAK5G,2FAAkE;IAClE,mEAA0E;IAqC1E,0DAA0D;IAC1D,MAAa,aAAa;QAA1B;YACE,8BAAyB,GAAyB,SAAS,CAAC;YAC5D,uBAAkB,GAA4D,SAAS,CAAC;YACxF,0BAAqB,GAAyB,IAAI,CAAC;YACnD,2BAAsB,GAAG,EAAE,CAAC;YAC5B,gCAA2B,GAAG,EAAE,CAAC;YACjC,uBAAkB,GAAG,IAAI,CAAC;YAC1B,0BAAqB,GAAG;gBACtB,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,IAAI;gBACpB,SAAS,EAAE,UAAU;gBACrB,UAAU,EAAE,EAAE;gBACd,MAAM,EAAE,IAAI;aACa,CAAC;YAC5B,oBAAe,GAAG,IAAI,CAAC;YACvB,yBAAoB,GAAG,IAAI,CAAC;YAC5B,wBAAmB,GAAG,EAAE,CAAC;YACzB,eAAU,GAAG,EAAE,CAAC;YAChB,uBAAkB,GAAG,IAAI,CAAC;YAC1B,mBAAc,GAAG,iCAAoB,CAAC;YACtC,gBAAW,GAAuB,SAAS,CAAC;YAC5C,gCAA2B,GAAG,KAAK,CAAC;YACpC,qBAAgB,GAAG,IAAI,CAAC;YAExB,0BAA0B;YAC1B,8BAAyB,GAAoC,EAAE,CAAC;YAChE,sBAAiB,GAAG,GAAG,CAAC;YAExB,mEAAmE;YACnE,mCAAmC;YACnC,cAAS,GAA0D,IAAI,oBAAa,CAAC,iDAAY,CAAC,CAAC;YAInG,kBAAa,GAAQ,IAAI,CAAC;YAC1B,qBAAgB,GAAsB,EAAE,CAAC;YACzC,iCAA4B,GAAG,KAAK,CAAC;YACrC,sCAAiC,GAAG,KAAK,CAAC;YAC1C,iCAA4B,GAAG,KAAK,CAAC;YACrC,+BAA0B,GAAG,KAAK,CAAC;YACnC,4BAAuB,GAAG,KAAK,CAAC;YAChC,gBAAW,GAAgB,KAAK,CAAC;YACjC,+BAA0B,GAAG,KAAK,CAAC;YACnC,8CAAyC,GAAG,KAAK,CAAC;QACpD,CAAC;KAAA;IA5CD,sCA4CC;IAED,MAAa,uBAAwB,SAAQ,oBAA2B;QAGtE;YACE,KAAK,CAAC,iDAAY,CAAC,CAAC;YAHtB,sBAAiB,GAAG,IAAI,GAAG,EAAwB,CAAC;QAIpD,CAAC;QAED,GAAG,CAAC,GAAW;YACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC;QAED,GAAG,CAAC,YAA0B;YAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAC7D,CAAC;KACF;IAdD,0DAcC"}
+{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,qDAA4G;IAK5G,2FAAkE;IAClE,mEAA0E;IAsC1E,0DAA0D;IAC1D,MAAa,aAAa;QAA1B;YACE,8BAAyB,GAAyB,SAAS,CAAC;YAC5D,uBAAkB,GAA4D,SAAS,CAAC;YACxF,0BAAqB,GAAyB,IAAI,CAAC;YACnD,2BAAsB,GAAG,EAAE,CAAC;YAC5B,gCAA2B,GAAG,EAAE,CAAC;YACjC,uBAAkB,GAAG,IAAI,CAAC;YAC1B,0BAAqB,GAAG;gBACtB,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,IAAI;gBACpB,SAAS,EAAE,UAAU;gBACrB,UAAU,EAAE,EAAE;gBACd,MAAM,EAAE,IAAI;aACa,CAAC;YAC5B,oBAAe,GAAG,IAAI,CAAC;YACvB,yBAAoB,GAAG,IAAI,CAAC;YAC5B,wBAAmB,GAAG,EAAE,CAAC;YACzB,eAAU,GAAG,EAAE,CAAC;YAChB,uBAAkB,GAAG,IAAI,CAAC;YAC1B,mBAAc,GAAG,iCAAoB,CAAC;YACtC,gBAAW,GAAuB,SAAS,CAAC;YAC5C,gCAA2B,GAAG,KAAK,CAAC;YACpC,6BAAwB,GAAG,KAAK,CAAC;YACjC,qBAAgB,GAAG,IAAI,CAAC;YAExB,0BAA0B;YAC1B,8BAAyB,GAAoC,EAAE,CAAC;YAChE,sBAAiB,GAAG,GAAG,CAAC;YAExB,mEAAmE;YACnE,mCAAmC;YACnC,cAAS,GAA0D,IAAI,oBAAa,CAAC,iDAAY,CAAC,CAAC;YAInG,kBAAa,GAAQ,IAAI,CAAC;YAC1B,qBAAgB,GAAsB,EAAE,CAAC;YACzC,iCAA4B,GAAG,KAAK,CAAC;YACrC,sCAAiC,GAAG,KAAK,CAAC;YAC1C,iCAA4B,GAAG,KAAK,CAAC;YACrC,+BAA0B,GAAG,KAAK,CAAC;YACnC,4BAAuB,GAAG,KAAK,CAAC;YAChC,gBAAW,GAAgB,KAAK,CAAC;YACjC,+BAA0B,GAAG,KAAK,CAAC;YACnC,8CAAyC,GAAG,KAAK,CAAC;QACpD,CAAC;KAAA;IA7CD,sCA6CC;IAED,MAAa,uBAAwB,SAAQ,oBAA2B;QAGtE;YACE,KAAK,CAAC,iDAAY,CAAC,CAAC;YAHtB,sBAAiB,GAAG,IAAI,GAAG,EAAwB,CAAC;QAIpD,CAAC;QAED,GAAG,CAAC,GAAW;YACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC;QAED,GAAG,CAAC,YAA0B;YAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAC7D,CAAC;KACF;IAdD,0DAcC"}

package/out/server/src/languageserver/handlers/settingsHandlers.js

@@ -16,6 +16,7 @@ exports.SettingsHandler = void 0;
  *--------------------------------------------------------------------------------------------*/
 const request_light_1 = require("request-light");
 const vscode_languageserver_1 = require("vscode-languageserver");
+const objects_1 = require("../../languageservice/utils/objects");
 const paths_1 = require("../../languageservice/utils/paths");
 const schemaUrls_1 = require("../../languageservice/utils/schemaUrls");
 const yamlLanguageService_1 = require("../../languageservice/yamlLanguageService");
@@ -36,8 +37,7 @@ class SettingsHandler {
                     yield this.connection.client.register(vscode_languageserver_1.DidChangeConfigurationNotification.type, undefined);
                 }
                 catch (err) {
-                    console.warn(err);
-                    this.telemetry.sendError('yaml.settings.error', { error: err });
+                    this.telemetry.sendError('yaml.settings.error', { error: objects_1.convertErrorToTelemetryMsg(err) });
                 }
             }
             this.connection.onDidChangeConfiguration(() => this.pullConfiguration());
@@ -108,6 +108,7 @@ class SettingsHandler {
                     }
                 }
                 this.yamlSettings.disableAdditionalProperties = settings.yaml.disableAdditionalProperties;
+                this.yamlSettings.disableDefaultProperties = settings.yaml.disableDefaultProperties;
             }
             this.yamlSettings.schemaConfigurationSettings = [];
             if (settings.yamlEditor && settings.yamlEditor['editor.tabSize']) {
@@ -222,6 +223,7 @@ 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/out/server/src/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":"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"}

package/out/server/src/languageservice/parser/ast-converter.js

@@ -108,7 +108,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 jsonParser07_1.StringASTNodeImpl(parent, node, ...toOffsetLength(node.range));
+        resultNode.value = node.source;
+        return resultNode;
+    }
 }
 function toOffsetLength(range) {
     return [range[0], range[1] - range[0]];

package/out/server/src/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/out/server/src/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/out/server/src/languageservice/parser/jsonParser07.js

@@ -5,8 +5,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = exports.ProblemTypeMessages = exports.ProblemType = exports.YAML_SOURCE = exports.formats = void 0;
-const Json = require("jsonc-parser");
+exports.JSONDocument = exports.findNodeAtOffset = exports.contains = 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 = exports.ProblemTypeMessages = exports.ProblemType = exports.YAML_SOURCE = exports.formats = void 0;
 const objects_1 = require("../utils/objects");
 const schemaUtils_1 = require("../utils/schemaUtils");
 const vscode_json_languageservice_1 = require("vscode-json-languageservice");
@@ -267,12 +266,12 @@ 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 || arrUtils_1.isArrayEqual(p.problemArgs, bestResult.problemArgs)) // missingProp is merged only with same problemArg
                     );
@@ -352,17 +351,53 @@ function newJSONDocument(root, diagnostics = []) {
 exports.newJSONDocument = newJSONDocument;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getNodeValue(node) {
-    return Json.getNodeValue(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;
+    }
 }
 exports.getNodeValue = getNodeValue;
-function getNodePath(node) {
-    return Json.getNodePath(node);
-}
-exports.getNodePath = getNodePath;
 function contains(node, offset, includeRightBound = false) {
     return ((offset >= node.offset && offset <= node.offset + node.length) || (includeRightBound && offset === node.offset + node.length));
 }
 exports.contains = contains;
+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;
+}
+exports.findNodeAtOffset = findNodeAtOffset;
 class JSONDocument {
     constructor(root, syntaxErrors = [], comments = []) {
         this.root = root;
@@ -371,7 +406,7 @@ class JSONDocument {
     }
     getNodeFromOffset(offset, includeRightBound = false) {
         if (this.root) {
-            return Json.findNodeAtOffset(this.root, offset, includeRightBound);
+            return findNodeAtOffset(this.root, offset, includeRightBound);
         }
         return undefined;
     }
@@ -507,8 +542,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) {
@@ -530,14 +569,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: vscode_languageserver_types_1.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),
                 });
@@ -839,12 +878,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);
@@ -899,7 +948,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];
@@ -981,7 +1030,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);
@@ -1188,7 +1237,7 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
     }
 }
 function getSchemaSource(schema, originalSchema) {
-    var _a;
+    var _b;
     if (schema) {
         let label;
         if (schema.title) {
@@ -1198,7 +1247,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 = vscode_uri_1.URI.parse(uriString);
                 if (url.scheme === 'file') {
@@ -1214,8 +1263,8 @@ function getSchemaSource(schema, originalSchema) {
     return exports.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) {