fix: default subcommand argument behavior (#365)

sapphiredev · Oct 8, 2022 · 6cef7c6 · 6cef7c6
1 parent a2bbd33
commit 6cef7c6
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/packages/subcommands/src/lib/Subcommand.ts b/packages/subcommands/src/lib/Subcommand.ts
@@ -128,7 +128,7 @@ export class Subcommand<PreParseReturn extends Args = Args, O extends Subcommand
 			mapping.type ??= 'method';
 
 			if (mapping.type === 'method') {
-				if (mapping.default) {
+				if (mapping.default && !defaultCommand) {
 					matchedWithGroupedSubcommand = false;
 					defaultCommand = mapping;
 				}
@@ -184,11 +184,7 @@ export class Subcommand<PreParseReturn extends Args = Args, O extends Subcommand
 
 		// No subcommand matched, let's try to run default, if any:
 		if (defaultCommand) {
-			if (subcommandOrGroup.isSome()) {
-				args.next();
-			}
-
-			// If we matched with a subcommand in a group we need to skip 1 more arg
+			// If we matched with a subcommand in a group we need to skip 1 the group name
 			if (matchedWithGroupedSubcommand) {
 				args.next();
 			}