feat: Add getter isSkipable to CommandArgument class.

Advanced-Command-Handler · Aug 31, 2021 · 35f118a · 35f118a
1 parent c66ce3e
commit 35f118a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/classes/arguments/Argument.ts b/src/classes/arguments/Argument.ts
@@ -64,4 +64,8 @@ export class CommandArgument<T> {
 	public get isSimple() {
 		return !this.optional && !this.coalescing && !this.defaultValue;
 	}
+
+	public get isSkipable(): boolean {
+		return this.optional || !!this.defaultValue;
+	}
 }
diff --git a/src/classes/arguments/ArgumentParser.ts b/src/classes/arguments/ArgumentParser.ts
@@ -124,7 +124,7 @@ export class ArgumentParser {
 			i++;
 		}
 
-		const argsRequiredCount = this.args.filter(a => a.isSimple);
+		const argsRequiredCount = this.args.filter(a => !a.isSkipable);
 		if (argsMap.size < argsRequiredCount.length) {
 			for (let i = argsMap.size; i < argsRequiredCount.length; i++) {
 				const currentArgument = argsRequiredCount[i];