arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-10 02:45:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

add oneOf handler

Browse Source
This commit is contained in:
Dragon Fire
2024-03-20 00:30:06 -04:00
parent bd38a03c74
commit 51826788b1
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/Dispatcher.js
+13 -3
View File
@@ -1,4 +1,5 @@
const minimist = require('minimist');
const { stripIndents } = require('common-tags');
const argRegex = /"([^"]*)"|(\S+)/g;
module.exports = class CommandDispatcher {
@@ -54,7 +55,10 @@ module.exports = class CommandDispatcher {
for (const parsedArg of infinite) {
const valid = await arg.validate(parsedArg, msg, arg);
if (!valid || typeof valid === 'string') {
return `An invalid value was provided for one of the "${arg.label || arg.key}" arguments.`;
return stripIndents`
An invalid value was provided for one of the "${arg.label || arg.key}" arguments.
${arg.oneOf ? `It must be one of the following: ${arg.oneOf.map(a => `\`${a}\``)}` : ''}
`;
}
parsedArgs.push(await arg.parse(parsedArg, msg, arg));
}
@@ -64,7 +68,10 @@ module.exports = class CommandDispatcher {
const parsedArg = i + 1 === command.args.length ? parsed._.slice(i).join(' ') : parsed._[i]?.toString();
if (arg.isEmpty(parsedArg, msg, arg)) {
if (arg.default === null) {
return `The "${arg.label || arg.key}" argument is required.`;
return stripIndents`
The "${arg.label || arg.key}" argument is required.
${arg.oneOf ? `It must be one of the following: ${arg.oneOf.map(a => `\`${a}\``)}` : ''}
`;
} else {
finalResult[arg.key] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
continue;
@@ -72,7 +79,10 @@ module.exports = class CommandDispatcher {
}
const valid = await arg.validate(parsedArg, msg, arg);
if (!valid || typeof valid === 'string') {
return `An invalid value was provided for the "${arg.label || arg.key}" argument.`;
return stripIndents`
An invalid value was provided for the "${arg.label || arg.key}" argument.
${arg.oneOf ? `It must be one of the following: ${arg.oneOf.map(a => `\`${a}\``)}` : ''}
`;
}
finalResult[arg.key] = await arg.parse(parsedArg, msg, arg);
}