yaml-language-server 1.20.1-0402ed6.0 → 1.20.1-1dc7e48.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/README.md +1 -0
- package/bin/yaml-language-server +24 -0
- package/eslint-result.sarif +115 -110
- package/lib/esm/languageserver/handlers/settingsHandlers.js +4 -2
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeActions.js +3 -1
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.d.ts +1 -2
- package/lib/esm/languageservice/services/yamlCompletion.js +95 -85
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +3 -4
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/utils/objects.js +3 -2
- package/lib/esm/languageservice/utils/objects.js.map +1 -1
- package/lib/esm/languageservice/utils/yamlScalar.d.ts +1 -0
- package/lib/esm/languageservice/utils/yamlScalar.js +69 -0
- package/lib/esm/languageservice/utils/yamlScalar.js.map +1 -0
- package/lib/esm/yamlServerInit.js +4 -0
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +4 -2
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js +4 -2
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.d.ts +1 -2
- package/lib/umd/languageservice/services/yamlCompletion.js +96 -86
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +4 -5
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/utils/objects.js +4 -3
- package/lib/umd/languageservice/utils/objects.js.map +1 -1
- package/lib/umd/languageservice/utils/yamlScalar.d.ts +1 -0
- package/lib/umd/languageservice/utils/yamlScalar.js +83 -0
- package/lib/umd/languageservice/utils/yamlScalar.js.map +1 -0
- package/lib/umd/yamlServerInit.js +4 -0
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +4 -2
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js +3 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.d.ts +1 -2
- package/out/server/src/languageservice/services/yamlCompletion.js +95 -85
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +3 -4
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/utils/objects.js +3 -2
- package/out/server/src/languageservice/utils/objects.js.map +1 -1
- package/out/server/src/languageservice/utils/yamlScalar.d.ts +1 -0
- package/out/server/src/languageservice/utils/yamlScalar.js +73 -0
- package/out/server/src/languageservice/utils/yamlScalar.js.map +1 -0
- package/out/server/src/yamlServerInit.js +4 -0
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +45 -4
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +206 -14
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/hover.test.js +191 -7
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +102 -0
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/settingsHandlers.test.js +2 -2
- package/out/server/test/settingsHandlers.test.js.map +1 -1
- package/out/server/test/utils/serviceSetup.d.ts +2 -0
- package/out/server/test/utils/serviceSetup.js +4 -0
- package/out/server/test/utils/serviceSetup.js.map +1 -1
- package/out/server/test/yamlCodeActions.test.js +15 -0
- package/out/server/test/yamlCodeActions.test.js.map +1 -1
- package/out/server/test/yamlLanguageService.test.js +1 -1
- package/out/server/test/yamlLanguageService.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,8 +66,7 @@ export declare class YamlCompletion {
|
|
|
66
66
|
private fromMarkup;
|
|
67
67
|
private doesSupportMarkdown;
|
|
68
68
|
private findItemAtOffset;
|
|
69
|
-
|
|
70
|
-
convertToStringValue(param: unknown): string;
|
|
69
|
+
private getPropertyNamesCandidates;
|
|
71
70
|
getQuote(): string;
|
|
72
71
|
/**
|
|
73
72
|
* simplify `{$1:value}` to `value`
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
if (v !== undefined) module.exports = v;
|
|
9
9
|
}
|
|
10
10
|
else if (typeof define === "function" && define.amd) {
|
|
11
|
-
define(["require", "exports", "vscode-languageserver-types", "yaml", "../utils/arrUtils", "../utils/indentationGuesser", "../utils/textBuffer", "../utils/json", "../utils/objects", "../parser/isKubernetes", "../parser/jsonParser07", "../utils/astUtils", "./modelineUtil", "../utils/schemaUtils", "@vscode/l10n"], factory);
|
|
11
|
+
define(["require", "exports", "vscode-languageserver-types", "yaml", "../utils/arrUtils", "../utils/indentationGuesser", "../utils/textBuffer", "../utils/json", "../utils/objects", "../parser/isKubernetes", "../parser/jsonParser07", "../utils/astUtils", "./modelineUtil", "../utils/schemaUtils", "../utils/yamlScalar", "@vscode/l10n"], factory);
|
|
12
12
|
}
|
|
13
13
|
})(function (require, exports) {
|
|
14
14
|
"use strict";
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
const astUtils_1 = require("../utils/astUtils");
|
|
27
27
|
const modelineUtil_1 = require("./modelineUtil");
|
|
28
28
|
const schemaUtils_1 = require("../utils/schemaUtils");
|
|
29
|
+
const yamlScalar_1 = require("../utils/yamlScalar");
|
|
29
30
|
const l10n = require("@vscode/l10n");
|
|
30
|
-
const doubleQuotesEscapeRegExp = /[\\]+"/g;
|
|
31
31
|
const parentCompletionKind = vscode_languageserver_types_1.CompletionItemKind.Class;
|
|
32
32
|
const existingProposeItem = '__';
|
|
33
33
|
class YamlCompletion {
|
|
@@ -38,7 +38,6 @@
|
|
|
38
38
|
this.telemetry = telemetry;
|
|
39
39
|
this.completionEnabled = true;
|
|
40
40
|
this.arrayPrefixIndentation = '';
|
|
41
|
-
this.isNumberExp = /^\d+$/;
|
|
42
41
|
}
|
|
43
42
|
configure(languageSettings, yamlSettings) {
|
|
44
43
|
if (languageSettings) {
|
|
@@ -171,7 +170,7 @@
|
|
|
171
170
|
if (!(0, objects_1.isString)(label)) {
|
|
172
171
|
label = String(label);
|
|
173
172
|
}
|
|
174
|
-
label = label.replace(
|
|
173
|
+
label = label.replace(/\n|\\n/g, '↵');
|
|
175
174
|
if (label.length > 60) {
|
|
176
175
|
const shortendedLabel = label.substr(0, 57).trim() + '...';
|
|
177
176
|
if (!proposed[shortendedLabel]) {
|
|
@@ -187,13 +186,13 @@
|
|
|
187
186
|
completionItem.textEdit = vscode_languageserver_types_1.TextEdit.replace(overwriteRange, label);
|
|
188
187
|
}
|
|
189
188
|
else {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
if (
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
completionItem.insertText =
|
|
189
|
+
const mdText = completionItem.insertText.replace(/\${[0-9]+[:|](.*)}/g, (s, arg) => arg).replace(/\$([0-9]+)/g, '');
|
|
190
|
+
// handle single special characters that need escaping: ', ", \
|
|
191
|
+
const singleCharMatch = mdText.match(/^([^:"]+):\s*(['\\"\\])$/);
|
|
192
|
+
if (singleCharMatch) {
|
|
193
|
+
const key = singleCharMatch[1];
|
|
194
|
+
const char = singleCharMatch[2];
|
|
195
|
+
completionItem.insertText = `${key}: ${this.getQuote()}\\${char}${this.getQuote()}`;
|
|
197
196
|
}
|
|
198
197
|
// trim $1 from end of completion
|
|
199
198
|
if (completionItem.insertText.endsWith('$1') && !isForParentCompletion) {
|
|
@@ -232,6 +231,9 @@
|
|
|
232
231
|
if (existing && !existing.documentation && completionItem.documentation) {
|
|
233
232
|
existing.documentation = completionItem.documentation;
|
|
234
233
|
}
|
|
234
|
+
if (existing && !existing.detail && completionItem.detail) {
|
|
235
|
+
existing.detail = completionItem.detail;
|
|
236
|
+
}
|
|
235
237
|
},
|
|
236
238
|
error: (message) => {
|
|
237
239
|
this.telemetry?.sendError('yaml.completion.error', message);
|
|
@@ -667,8 +669,9 @@
|
|
|
667
669
|
}
|
|
668
670
|
}
|
|
669
671
|
let insertText = key;
|
|
672
|
+
const isRequiredProp = Array.isArray(schema.schema.required) ? schema.schema.required.includes(key) : false;
|
|
670
673
|
if (!key.startsWith(existingKey) || !hasColon) {
|
|
671
|
-
insertText = this.getInsertTextForProperty(key, propertySchema, separatorAfter, identCompensation + this.indentation);
|
|
674
|
+
insertText = this.getInsertTextForProperty(key, propertySchema, separatorAfter, identCompensation + this.indentation, isRequiredProp);
|
|
672
675
|
}
|
|
673
676
|
const isNodeNull = ((0, yaml_1.isScalar)(originalNode) && originalNode.value === null) ||
|
|
674
677
|
((0, yaml_1.isMap)(originalNode) && originalNode.items.length === 0);
|
|
@@ -686,7 +689,7 @@
|
|
|
686
689
|
if (schema.schema.required?.includes(key)) {
|
|
687
690
|
collector.add({
|
|
688
691
|
label: key,
|
|
689
|
-
insertText: this.getInsertTextForProperty(key, propertySchema, separatorAfter, identCompensation + this.indentation),
|
|
692
|
+
insertText: this.getInsertTextForProperty(key, propertySchema, separatorAfter, identCompensation + this.indentation, true),
|
|
690
693
|
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
691
694
|
documentation: this.fromMarkup(propertySchema.markdownDescription) || propertySchema.description || '',
|
|
692
695
|
parent: {
|
|
@@ -708,17 +711,36 @@
|
|
|
708
711
|
if (nodeParent && (0, yaml_1.isSeq)(nodeParent) && (0, schemaUtils_1.isPrimitiveType)(schema.schema)) {
|
|
709
712
|
this.addSchemaValueCompletions(schema.schema, separatorAfter, collector, {}, ignoreScalars);
|
|
710
713
|
}
|
|
711
|
-
if (schema.schema.
|
|
714
|
+
if (schema.schema.type === 'object' && schema.schema.propertyNames && schema.schema.additionalProperties !== false) {
|
|
712
715
|
const propertyNameSchema = (0, jsonParser07_1.asSchema)(schema.schema.propertyNames);
|
|
713
716
|
if (!propertyNameSchema.deprecationMessage && !propertyNameSchema.doNotSuggest) {
|
|
714
|
-
const
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
717
|
+
const doc = this.fromMarkup((propertyNameSchema.markdownDescription || propertyNameSchema.description || '') +
|
|
718
|
+
(propertyNameSchema.pattern ? `\n\n**Pattern:** \`${propertyNameSchema.pattern}\`` : ''));
|
|
719
|
+
const { candidates, impossible } = this.getPropertyNamesCandidates(propertyNameSchema);
|
|
720
|
+
if (impossible) {
|
|
721
|
+
// suggest nothing
|
|
722
|
+
}
|
|
723
|
+
else if (candidates.length) {
|
|
724
|
+
for (const key of candidates) {
|
|
725
|
+
collector.add({
|
|
726
|
+
kind: vscode_languageserver_types_1.CompletionItemKind.Property,
|
|
727
|
+
label: key,
|
|
728
|
+
insertText: `${key}: `,
|
|
729
|
+
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.PlainText,
|
|
730
|
+
documentation: doc,
|
|
731
|
+
});
|
|
732
|
+
}
|
|
733
|
+
}
|
|
734
|
+
else {
|
|
735
|
+
const label = propertyNameSchema.title || 'property';
|
|
736
|
+
collector.add({
|
|
737
|
+
kind: vscode_languageserver_types_1.CompletionItemKind.Property,
|
|
738
|
+
label,
|
|
739
|
+
insertText: '$' + `{1:${label}}: `,
|
|
740
|
+
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
741
|
+
documentation: doc,
|
|
742
|
+
});
|
|
743
|
+
}
|
|
722
744
|
}
|
|
723
745
|
}
|
|
724
746
|
}
|
|
@@ -818,9 +840,10 @@
|
|
|
818
840
|
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
819
841
|
});
|
|
820
842
|
}
|
|
821
|
-
getInsertTextForProperty(key, propertySchema, separatorAfter, indent = this.indentation) {
|
|
843
|
+
getInsertTextForProperty(key, propertySchema, separatorAfter, indent = this.indentation, isRequired = false) {
|
|
822
844
|
const propertyText = this.getInsertTextForValue(key, '', 'string');
|
|
823
845
|
const resultText = propertyText + ':';
|
|
846
|
+
const hasRequiredDefault = propertySchema && isRequired && (0, objects_1.isDefined)(propertySchema.default);
|
|
824
847
|
let value;
|
|
825
848
|
let nValueProposals = 0;
|
|
826
849
|
if (propertySchema) {
|
|
@@ -859,7 +882,7 @@
|
|
|
859
882
|
}
|
|
860
883
|
nValueProposals += propertySchema.enum.length;
|
|
861
884
|
}
|
|
862
|
-
if (propertySchema.const) {
|
|
885
|
+
if ((0, objects_1.isDefined)(propertySchema.const)) {
|
|
863
886
|
if (!value) {
|
|
864
887
|
value = this.getInsertTextForGuessedValue(propertySchema.const, '', type);
|
|
865
888
|
value = this.evaluateTab1Symbol(value); // prevent const being selected after snippet insert
|
|
@@ -868,8 +891,12 @@
|
|
|
868
891
|
nValueProposals++;
|
|
869
892
|
}
|
|
870
893
|
if ((0, objects_1.isDefined)(propertySchema.default)) {
|
|
871
|
-
if (!value) {
|
|
872
|
-
|
|
894
|
+
if (!value || hasRequiredDefault) {
|
|
895
|
+
let defText = this.getInsertTextForGuessedValue(propertySchema.default, '', type);
|
|
896
|
+
if (hasRequiredDefault) {
|
|
897
|
+
defText = this.evaluateTab1Symbol(defText);
|
|
898
|
+
}
|
|
899
|
+
value = ' ' + defText;
|
|
873
900
|
}
|
|
874
901
|
nValueProposals++;
|
|
875
902
|
}
|
|
@@ -888,9 +915,8 @@
|
|
|
888
915
|
if (nValueProposals === 0) {
|
|
889
916
|
switch (type) {
|
|
890
917
|
case 'boolean':
|
|
891
|
-
value = ' $1';
|
|
892
|
-
break;
|
|
893
918
|
case 'string':
|
|
919
|
+
case 'anyOf':
|
|
894
920
|
value = ' $1';
|
|
895
921
|
break;
|
|
896
922
|
case 'object':
|
|
@@ -906,15 +932,12 @@
|
|
|
906
932
|
case 'null':
|
|
907
933
|
value = ' ${1:null}';
|
|
908
934
|
break;
|
|
909
|
-
case 'anyOf':
|
|
910
|
-
value = ' $1';
|
|
911
|
-
break;
|
|
912
935
|
default:
|
|
913
936
|
return propertyText;
|
|
914
937
|
}
|
|
915
938
|
}
|
|
916
939
|
}
|
|
917
|
-
if (!value || nValueProposals > 1) {
|
|
940
|
+
if (!value || (nValueProposals > 1 && !hasRequiredDefault)) {
|
|
918
941
|
value = ' $1';
|
|
919
942
|
}
|
|
920
943
|
return resultText + value + separatorAfter;
|
|
@@ -949,7 +972,7 @@
|
|
|
949
972
|
let value = propertySchema.default || propertySchema.const;
|
|
950
973
|
if (value) {
|
|
951
974
|
if (type === 'string') {
|
|
952
|
-
value =
|
|
975
|
+
value = (0, yamlScalar_1.toYamlStringScalar)(value);
|
|
953
976
|
}
|
|
954
977
|
insertText += `${indent}${key}: \${${insertIndex++}:${value}}\n`;
|
|
955
978
|
}
|
|
@@ -993,7 +1016,7 @@
|
|
|
993
1016
|
key === 'null' ? this.getInsertTextForValue(key, '', 'string') : key}: \${${insertIndex++}:${propertySchema.default}}\n`;
|
|
994
1017
|
break;
|
|
995
1018
|
case 'string':
|
|
996
|
-
insertText += `${indent}${key}: \${${insertIndex++}:${
|
|
1019
|
+
insertText += `${indent}${key}: \${${insertIndex++}:${(0, yamlScalar_1.toYamlStringScalar)(propertySchema.default)}}\n`;
|
|
997
1020
|
break;
|
|
998
1021
|
case 'array':
|
|
999
1022
|
case 'object':
|
|
@@ -1054,12 +1077,10 @@
|
|
|
1054
1077
|
}
|
|
1055
1078
|
return this.getInsertTextForValue(value, separatorAfter, type);
|
|
1056
1079
|
case 'string': {
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
snippetValue = this.getInsertTextForPlainText(snippetValue); // escape \ and }
|
|
1060
|
-
if (type === 'string') {
|
|
1061
|
-
snippetValue = this.convertToStringValue(snippetValue);
|
|
1080
|
+
if (type === 'number' || type === 'integer') {
|
|
1081
|
+
return '${1:' + value + '}' + separatorAfter;
|
|
1062
1082
|
}
|
|
1083
|
+
const snippetValue = this.getInsertTextForPlainText((0, yamlScalar_1.toYamlStringScalar)(value));
|
|
1063
1084
|
return '${1:' + snippetValue + '}' + separatorAfter;
|
|
1064
1085
|
}
|
|
1065
1086
|
case 'number':
|
|
@@ -1069,7 +1090,7 @@
|
|
|
1069
1090
|
return this.getInsertTextForValue(value, separatorAfter, type);
|
|
1070
1091
|
}
|
|
1071
1092
|
getInsertTextForPlainText(text) {
|
|
1072
|
-
return text.replace(/[
|
|
1093
|
+
return text.replace(/\\(?=[$}\\])/g, '\\\\').replace(/[$}]/g, '\\$&');
|
|
1073
1094
|
}
|
|
1074
1095
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1075
1096
|
getInsertTextForValue(value, separatorAfter, type) {
|
|
@@ -1087,7 +1108,7 @@
|
|
|
1087
1108
|
}
|
|
1088
1109
|
type = Array.isArray(type) ? type[0] : type;
|
|
1089
1110
|
if (type === 'string') {
|
|
1090
|
-
value =
|
|
1111
|
+
value = (0, yamlScalar_1.toYamlStringScalar)(String(value), this.isSingleQuote);
|
|
1091
1112
|
}
|
|
1092
1113
|
return this.getInsertTextForPlainText(value + separatorAfter);
|
|
1093
1114
|
}
|
|
@@ -1168,11 +1189,11 @@
|
|
|
1168
1189
|
type = 'array';
|
|
1169
1190
|
}
|
|
1170
1191
|
let label;
|
|
1171
|
-
if (typeof value
|
|
1192
|
+
if (typeof value === 'object') {
|
|
1172
1193
|
label = l10n.t('Default Value');
|
|
1173
1194
|
}
|
|
1174
1195
|
else {
|
|
1175
|
-
label =
|
|
1196
|
+
label = this.getLabelForValue(value);
|
|
1176
1197
|
}
|
|
1177
1198
|
collector.add({
|
|
1178
1199
|
kind: this.getSuggestionKind(type),
|
|
@@ -1250,7 +1271,10 @@
|
|
|
1250
1271
|
if (Array.isArray(value)) {
|
|
1251
1272
|
return JSON.stringify(value);
|
|
1252
1273
|
}
|
|
1253
|
-
|
|
1274
|
+
if (typeof value === 'string') {
|
|
1275
|
+
return (0, yamlScalar_1.toYamlStringScalar)(value, this.isSingleQuote);
|
|
1276
|
+
}
|
|
1277
|
+
return String(value);
|
|
1254
1278
|
}
|
|
1255
1279
|
collectDefaultSnippets(schema, separatorAfter, collector, settings, arrayDepth = 0) {
|
|
1256
1280
|
if (Array.isArray(schema.defaultSnippets)) {
|
|
@@ -1439,50 +1463,36 @@
|
|
|
1439
1463
|
}
|
|
1440
1464
|
return 0;
|
|
1441
1465
|
}
|
|
1442
|
-
|
|
1443
|
-
let
|
|
1444
|
-
|
|
1445
|
-
|
|
1446
|
-
|
|
1447
|
-
|
|
1448
|
-
|
|
1449
|
-
|
|
1450
|
-
|
|
1451
|
-
|
|
1452
|
-
|
|
1453
|
-
|
|
1454
|
-
|
|
1455
|
-
|
|
1456
|
-
|
|
1457
|
-
|
|
1458
|
-
}
|
|
1459
|
-
if (value.indexOf('"') !== -1) {
|
|
1460
|
-
value = value.replace(doubleQuotesEscapeRegExp, '"');
|
|
1461
|
-
}
|
|
1462
|
-
let doQuote = !isNaN(parseInt(value)) || value.charAt(0) === '@';
|
|
1463
|
-
if (!doQuote) {
|
|
1464
|
-
// need to quote value if in `foo: bar`, `foo : bar` (mapping) or `foo:` (partial map) format
|
|
1465
|
-
// but `foo:bar` and `:bar` (colon without white-space after it) are just plain string
|
|
1466
|
-
let idx = value.indexOf(':', 0);
|
|
1467
|
-
for (; idx > 0 && idx < value.length; idx = value.indexOf(':', idx + 1)) {
|
|
1468
|
-
if (idx === value.length - 1) {
|
|
1469
|
-
// `foo:` (partial map) format
|
|
1470
|
-
doQuote = true;
|
|
1471
|
-
break;
|
|
1472
|
-
}
|
|
1473
|
-
// there are only two valid kinds of white-space in yaml: space or tab
|
|
1474
|
-
// ref: https://yaml.org/spec/1.2.1/#id2775170
|
|
1475
|
-
const nextChar = value.charAt(idx + 1);
|
|
1476
|
-
if (nextChar === '\t' || nextChar === ' ') {
|
|
1477
|
-
doQuote = true;
|
|
1478
|
-
break;
|
|
1466
|
+
getPropertyNamesCandidates(schema) {
|
|
1467
|
+
let impossible = false;
|
|
1468
|
+
const collect = (node) => {
|
|
1469
|
+
if (!node || typeof node !== 'object')
|
|
1470
|
+
return null;
|
|
1471
|
+
if (Array.isArray(node.allOf) && node.allOf.length) {
|
|
1472
|
+
let intersection = null;
|
|
1473
|
+
for (const part of node.allOf) {
|
|
1474
|
+
const partSet = collect(part);
|
|
1475
|
+
if (!partSet)
|
|
1476
|
+
continue;
|
|
1477
|
+
intersection = intersection ? new Set([...intersection].filter((v) => partSet.has(v))) : new Set(partSet);
|
|
1478
|
+
if (intersection.size === 0) {
|
|
1479
|
+
impossible = true;
|
|
1480
|
+
return new Set();
|
|
1481
|
+
}
|
|
1479
1482
|
}
|
|
1483
|
+
if (intersection)
|
|
1484
|
+
return intersection;
|
|
1480
1485
|
}
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
+
const result = new Set();
|
|
1487
|
+
if (typeof node.const === 'string')
|
|
1488
|
+
result.add(node.const);
|
|
1489
|
+
node.enum?.forEach((val) => typeof val === 'string' && result.add(val));
|
|
1490
|
+
node.anyOf?.forEach((branch) => collect(branch)?.forEach((val) => result.add(val)));
|
|
1491
|
+
node.oneOf?.forEach((branch) => collect(branch)?.forEach((val) => result.add(val)));
|
|
1492
|
+
return result.size ? result : null;
|
|
1493
|
+
};
|
|
1494
|
+
const set = collect(schema);
|
|
1495
|
+
return { candidates: set ? [...set] : [], impossible };
|
|
1486
1496
|
}
|
|
1487
1497
|
getQuote() {
|
|
1488
1498
|
return this.isSingleQuote ? `'` : `"`;
|