fix(SlashCommandBuilder): allow subcommands and groups to coexist at …

…the root level (#26)

Co-authored-by: Keenser1 <36800359+Keenser1@users.noreply.github.com>

src/interactions/slashCommands/SlashCommandBuilder.ts

@@ -44,16 +44,12 @@ export class SlashCommandBuilder {
 		input:
 			| SlashCommandSubcommandGroupBuilder
 			| ((subcommandGroup: SlashCommandSubcommandGroupBuilder) => SlashCommandSubcommandGroupBuilder),
-	): SlashCommandSubcommandGroupsOnlyBuilder {
+	): SlashCommandSubcommandsOnlyBuilder {
 		const { options } = this;
 
 		// First, assert options conditions - we cannot have more than 25 options
 		validateMaxOptionsLength(options);
 
-		// Make sure there is no subcommand at the root level - if there is, throw
-		const hasSubcommands = options.some((item) => item instanceof SlashCommandSubcommandBuilder);
-		if (hasSubcommands) throw new RangeError(`You cannot mix subcommands and subcommand groups at the root level.`);
-
 		// Get the final result
 		const result = typeof input === 'function' ? input(new SlashCommandSubcommandGroupBuilder()) : input;
 
@@ -79,11 +75,6 @@ export class SlashCommandBuilder {
 		// First, assert options conditions - we cannot have more than 25 options
 		validateMaxOptionsLength(options);
 
-		// Make sure there is no subcommand at the root level - if there is, throw
-		const hasSubcommandGroups = options.some((item) => item instanceof SlashCommandSubcommandGroupBuilder);
-		if (hasSubcommandGroups)
-			throw new RangeError(`You cannot mix subcommands and subcommand groups at the root level.`);
-
 		// Get the final result
 		const result = typeof input === 'function' ? input(new SlashCommandSubcommandBuilder()) : input;
 
@@ -100,11 +91,7 @@ export interface SlashCommandBuilder extends SharedNameAndDescription, SharedSla
 
 export interface SlashCommandSubcommandsOnlyBuilder
 	extends SharedNameAndDescription,
-		Pick<SlashCommandBuilder, 'toJSON' | 'addSubcommand'> {}
-
-export interface SlashCommandSubcommandGroupsOnlyBuilder
-	extends SharedNameAndDescription,
-		Pick<SlashCommandBuilder, 'toJSON' | 'addSubcommandGroup'> {}
+		Pick<SlashCommandBuilder, 'toJSON' | 'addSubcommand' | 'addSubcommandGroup'> {}
 
 export interface SlashCommandOptionsOnlyBuilder
 	extends SharedNameAndDescription,

tests/SlashCommands.test.ts

@@ -227,17 +227,10 @@ describe('Slash Commands', () => {
 				).not.toThrowError();
 			});
 
-			test('GIVEN builder with a subcommand group that tries to add a subcommand THEN throw error', () => {
-				expect(() =>
-					// @ts-expect-error Checking if check works JS-side too
-					getNamedBuilder().addSubcommandGroup(getSubcommandGroup()).addSubcommand(getSubcommand()),
-				).toThrowError();
-			});
-
 			test('GIVEN builder with a subcommand that tries to add an invalid result THEN throw error', () => {
 				expect(() =>
 					// @ts-expect-error Checking if check works JS-side too
-					getNamedBuilder().addSubcommand(getSubcommand()).addSubcommandGroup(getSubcommandGroup()),
+					getNamedBuilder().addSubcommand(getSubcommand()).addInteger(getInteger()),
 				).toThrowError();
 			});