@oclif/core 2.7.2-beta.1 → 2.8.1-beta.1
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/lib/parser/parse.js +17 -12
- package/package.json +1 -1
package/lib/parser/parse.js
CHANGED
|
@@ -178,17 +178,6 @@ class Parser {
|
|
|
178
178
|
const flag = this.input.flags[token.flag];
|
|
179
179
|
if (!flag)
|
|
180
180
|
throw new errors_1.CLIError(`Unexpected flag ${token.flag}`);
|
|
181
|
-
// if flag has defaultHelp, capture its value into metadata
|
|
182
|
-
if (Reflect.has(flag, 'defaultHelp')) {
|
|
183
|
-
try {
|
|
184
|
-
const defaultHelpProperty = Reflect.get(flag, 'defaultHelp');
|
|
185
|
-
const defaultHelp = (typeof defaultHelpProperty === 'function' ? await defaultHelpProperty({ options: flag, flags, ...this.context }) : defaultHelpProperty);
|
|
186
|
-
this.metaData.flags[token.flag] = { ...this.metaData.flags[token.flag], defaultHelp };
|
|
187
|
-
}
|
|
188
|
-
catch {
|
|
189
|
-
// no-op
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
181
|
if (flag.type === 'boolean') {
|
|
193
182
|
if (token.input === `--no-${flag.name}`) {
|
|
194
183
|
flags[token.flag] = false;
|
|
@@ -242,9 +231,25 @@ class Parser {
|
|
|
242
231
|
}
|
|
243
232
|
if (!(k in flags) && flag.default !== undefined) {
|
|
244
233
|
this.metaData.flags[k] = { ...this.metaData.flags[k], setFromDefault: true };
|
|
245
|
-
const defaultValue = (typeof flag.default === 'function' ? await flag.default({
|
|
234
|
+
const defaultValue = (typeof flag.default === 'function' ? await flag.default({
|
|
235
|
+
options: flag,
|
|
236
|
+
flags, ...this.context,
|
|
237
|
+
}) : flag.default);
|
|
246
238
|
flags[k] = defaultValue;
|
|
247
239
|
}
|
|
240
|
+
if ((k in flags) && Reflect.has(flag, 'defaultHelp')) {
|
|
241
|
+
try {
|
|
242
|
+
const defaultHelpProperty = Reflect.get(flag, 'defaultHelp');
|
|
243
|
+
const defaultHelp = (typeof defaultHelpProperty === 'function' ? await defaultHelpProperty({
|
|
244
|
+
options: flag,
|
|
245
|
+
flags, ...this.context,
|
|
246
|
+
}) : defaultHelpProperty);
|
|
247
|
+
this.metaData.flags[k] = { ...this.metaData.flags[k], defaultHelp };
|
|
248
|
+
}
|
|
249
|
+
catch {
|
|
250
|
+
// no-op
|
|
251
|
+
}
|
|
252
|
+
}
|
|
248
253
|
}
|
|
249
254
|
return flags;
|
|
250
255
|
}
|