fix: add localizations for subcommand builders and option choices (#7862)

packages/builders/src/interactions/slashCommands/Assertions.ts

@@ -1,6 +1,6 @@
 import { s } from '@sapphire/shapeshift';
 import is from '@sindresorhus/is';
-import { type APIApplicationCommandOptionChoice, Locale } from 'discord-api-types/v10';
+import { type APIApplicationCommandOptionChoice, Locale, LocalizationMap } from 'discord-api-types/v10';
 import type { ToAPIApplicationCommandOptions } from './SlashCommandBuilder';
 import type { SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder } from './SlashCommandSubcommands';
 import type { ApplicationCommandOptionBase } from './mixins/ApplicationCommandOptionBase';
@@ -87,3 +87,11 @@ export function assertReturnOfBuilder<
 		throw new TypeError(`Expected to receive a ${instanceName} builder, got ${fullResultName} instead.`);
 	}
 }
+
+export const localizationMapPredicate = s.object<LocalizationMap>(
+	Object.fromEntries(Object.values(Locale).map((locale) => [locale, s.string.nullish])),
+).strict.nullish;
+
+export function validateLocalizationMap(value: unknown): asserts value is LocalizationMap {
+	localizationMapPredicate.parse(value);
+}

packages/builders/src/interactions/slashCommands/SlashCommandBuilder.ts

@@ -7,6 +7,7 @@ import { mix } from 'ts-mixer';
 import {
 	assertReturnOfBuilder,
 	validateDefaultPermission,
+	validateLocalizationMap,
 	validateMaxOptionsLength,
 	validateRequiredParameters,
 } from './Assertions';
@@ -56,6 +57,9 @@ export class SlashCommandBuilder {
 	public toJSON(): RESTPostAPIApplicationCommandsJSONBody {
 		validateRequiredParameters(this.name, this.description, this.options);
 
+		validateLocalizationMap(this.name_localizations);
+		validateLocalizationMap(this.description_localizations);
+
 		return {
 			name: this.name,
 			name_localizations: this.name_localizations,

packages/builders/src/interactions/slashCommands/SlashCommandSubcommands.ts

@@ -66,7 +66,9 @@ export class SlashCommandSubcommandGroupBuilder implements ToAPIApplicationComma
 		return {
 			type: ApplicationCommandOptionType.SubcommandGroup,
 			name: this.name,
+			name_localizations: this.name_localizations,
 			description: this.description,
+			description_localizations: this.description_localizations,
 			options: this.options.map((option) => option.toJSON()),
 		};
 	}
@@ -102,7 +104,9 @@ export class SlashCommandSubcommandBuilder implements ToAPIApplicationCommandOpt
 		return {
 			type: ApplicationCommandOptionType.Subcommand,
 			name: this.name,
+			name_localizations: this.name_localizations,
 			description: this.description,
+			description_localizations: this.description_localizations,
 			options: this.options.map((option) => option.toJSON()),
 		};
 	}

packages/builders/src/interactions/slashCommands/mixins/ApplicationCommandOptionBase.ts

@@ -1,6 +1,6 @@
 import type { APIApplicationCommandBasicOption, ApplicationCommandOptionType } from 'discord-api-types/v10';
 import { SharedNameAndDescription } from './NameAndDescription';
-import { validateRequiredParameters, validateRequired } from '../Assertions';
+import { validateRequiredParameters, validateRequired, validateLocalizationMap } from '../Assertions';
 
 export abstract class ApplicationCommandOptionBase extends SharedNameAndDescription {
 	public abstract readonly type: ApplicationCommandOptionType;
@@ -26,6 +26,10 @@ export abstract class ApplicationCommandOptionBase extends SharedNameAndDescript
 	protected runRequiredValidations() {
 		validateRequiredParameters(this.name, this.description, []);
 
+		// Validate localizations
+		validateLocalizationMap(this.name_localizations);
+		validateLocalizationMap(this.description_localizations);
+
 		// Assert that you actually passed a boolean
 		validateRequired(this.required);
 	}

packages/builders/src/interactions/slashCommands/mixins/ApplicationCommandOptionWithChoicesAndAutocompleteMixin.ts

@@ -1,10 +1,14 @@
 import { s } from '@sapphire/shapeshift';
 import { APIApplicationCommandOptionChoice, ApplicationCommandOptionType } from 'discord-api-types/v10';
-import { validateChoicesLength } from '../Assertions';
+import { localizationMapPredicate, validateChoicesLength } from '../Assertions';
 
 const stringPredicate = s.string.lengthGe(1).lengthLe(100);
 const numberPredicate = s.number.gt(-Infinity).lt(Infinity);
-const choicesPredicate = s.object({ name: stringPredicate, value: s.union(stringPredicate, numberPredicate) }).array;
+const choicesPredicate = s.object({
+	name: stringPredicate,
+	name_localizations: localizationMapPredicate,
+	value: s.union(stringPredicate, numberPredicate),
+}).array;
 const booleanPredicate = s.boolean;
 
 export class ApplicationCommandOptionWithChoicesAndAutocompleteMixin<T extends string | number> {
@@ -32,7 +36,7 @@ export class ApplicationCommandOptionWithChoicesAndAutocompleteMixin<T extends s
 
 		validateChoicesLength(choices.length, this.choices);
 
-		for (const { name, value } of choices) {
+		for (const { name, name_localizations, value } of choices) {
 			// Validate the value
 			if (this.type === ApplicationCommandOptionType.String) {
 				stringPredicate.parse(value);
@@ -40,7 +44,7 @@ export class ApplicationCommandOptionWithChoicesAndAutocompleteMixin<T extends s
 				numberPredicate.parse(value);
 			}
 
-			this.choices!.push({ name, value });
+			this.choices!.push({ name, name_localizations, value });
 		}
 
 		return this;

packages/builders/src/interactions/slashCommands/mixins/NameAndDescription.ts

@@ -46,14 +46,16 @@ export class SharedNameAndDescription {
 			Reflect.set(this, 'name_localizations', {});
 		}
 
+		const parsedLocale = validateLocale(locale);
+
 		if (localizedName === null) {
-			this.name_localizations![locale] = null;
+			this.name_localizations![parsedLocale] = null;
 			return this;
 		}
 
 		validateName(localizedName);
 
-		this.name_localizations![validateLocale(locale)] = localizedName;
+		this.name_localizations![parsedLocale] = localizedName;
 		return this;
 	}
 
@@ -87,14 +89,16 @@ export class SharedNameAndDescription {
 			Reflect.set(this, 'description_localizations', {});
 		}
 
+		const parsedLocale = validateLocale(locale);
+
 		if (localizedDescription === null) {
-			this.description_localizations![locale] = null;
+			this.description_localizations![parsedLocale] = null;
 			return this;
 		}
 
 		validateDescription(localizedDescription);
 
-		this.description_localizations![validateLocale(locale)] = localizedDescription;
+		this.description_localizations![parsedLocale] = localizedDescription;
 		return this;
 	}