self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-03-23 21:09:30 +02:00
Code Issues Releases Activity

CLI: Validate required flags

Browse Source
This commit is contained in:
Laurent Cozic 2023-02-17 14:16:41 +00:00
parent b832930512
commit 42cef1e918
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/app-cli/app/cli-utils.js
View File

@ -82,6 +82,7 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
const options = cmd.options(); const options = cmd.options();
const booleanFlags = []; const booleanFlags = [];
const aliases = {}; const aliases = {};
const flagSpecs = [];
for (let i = 0; i < options.length; i++) { for (let i = 0; i < options.length; i++) {
if (options[i].length !== 2) throw new Error(`Invalid options: ${options[i]}`); if (options[i].length !== 2) throw new Error(`Invalid options: ${options[i]}`);
let flags = options[i][0]; let flags = options[i][0];
@ -96,6 +97,8 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
if (flags.short && flags.long) { if (flags.short && flags.long) {
aliases[flags.long] = [flags.short]; aliases[flags.long] = [flags.short];
} }
flagSpecs.push(flags);
} }
const args = yargParser(argv, { const args = yargParser(argv, {
@ -121,6 +124,19 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
argOptions[key] = args[key]; argOptions[key] = args[key];
} }
for (const [key, value] of Object.entries(argOptions)) {
const flagSpec = flagSpecs.find(s => {
return s.short === key || s.long === key;
});
if (flagSpec?.arg?.required) {
// If a flag is required, and no value is provided for it, Yargs
// sets the value to `true`.
if (value === true) {
throw new Error(_('Missing required flag value: %s', `-${flagSpec.short} <${flagSpec.arg.name}>`));
}
}
}
output.options = argOptions; output.options = argOptions;
return output; return output;