refactor(builder): remove unsafe*Builders (#8074)

packages/builders/src/components/ActionRow.ts

@@ -7,7 +7,9 @@ import {
 } from 'discord-api-types/v10';
 import { ComponentBuilder } from './Component';
 import { createComponentBuilder } from './Components';
-import type { ButtonBuilder, SelectMenuBuilder, TextInputBuilder } from '..';
+import type { ButtonBuilder } from './button/Button';
+import type { SelectMenuBuilder } from './selectMenu/SelectMenu';
+import type { TextInputBuilder } from './textInput/TextInput';
 import { normalizeArray, type RestOrArray } from '../util/normalizeArray';
 
 export type MessageComponentBuilder =

packages/builders/src/components/Assertions.ts

@@ -1,55 +1,78 @@
 import { s } from '@sapphire/shapeshift';
 import { APIMessageComponentEmoji, ButtonStyle } from 'discord-api-types/v10';
-import type { SelectMenuOptionBuilder } from './selectMenu/SelectMenuOption';
-import { UnsafeSelectMenuOptionBuilder } from './selectMenu/UnsafeSelectMenuOption';
+import { SelectMenuOptionBuilder } from './selectMenu/SelectMenuOption';
+import { isValidationEnabled } from '../util/validation';
 
-export const customIdValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
+export const customIdValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(100)
+	.setValidationEnabled(isValidationEnabled);
 
-export const emojiValidator = s.object({
-	id: s.string,
-	name: s.string,
-	animated: s.boolean,
-}).partial.strict;
+export const emojiValidator = s
+	.object({
+		id: s.string,
+		name: s.string,
+		animated: s.boolean,
+	})
+	.partial.strict.setValidationEnabled(isValidationEnabled);
 
 export const disabledValidator = s.boolean;
 
-export const buttonLabelValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(80);
+export const buttonLabelValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(80)
+	.setValidationEnabled(isValidationEnabled);
 
 export const buttonStyleValidator = s.nativeEnum(ButtonStyle);
 
-export const placeholderValidator = s.string.lengthLessThanOrEqual(150);
-export const minMaxValidator = s.number.int.greaterThanOrEqual(0).lessThanOrEqual(25);
+export const placeholderValidator = s.string.lengthLessThanOrEqual(150).setValidationEnabled(isValidationEnabled);
+export const minMaxValidator = s.number.int
+	.greaterThanOrEqual(0)
+	.lessThanOrEqual(25)
+	.setValidationEnabled(isValidationEnabled);
 
-export const labelValueDescriptionValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
-export const optionValidator = s.union(
-	s.object({
-		label: labelValueDescriptionValidator,
-		value: labelValueDescriptionValidator,
-		description: labelValueDescriptionValidator.optional,
-		emoji: emojiValidator.optional,
-		default: s.boolean.optional,
-	}),
-	s.instance(UnsafeSelectMenuOptionBuilder),
-);
-export const optionsValidator = optionValidator.array.lengthGreaterThanOrEqual(0);
-export const optionsLengthValidator = s.number.int.greaterThanOrEqual(0).lessThanOrEqual(25);
+export const labelValueDescriptionValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(100)
+	.setValidationEnabled(isValidationEnabled);
+export const optionValidator = s
+	.union(
+		s.object({
+			label: labelValueDescriptionValidator,
+			value: labelValueDescriptionValidator,
+			description: labelValueDescriptionValidator.optional,
+			emoji: emojiValidator.optional,
+			default: s.boolean.optional,
+		}),
+		s.instance(SelectMenuOptionBuilder),
+	)
+	.setValidationEnabled(isValidationEnabled);
+
+export const optionsValidator = optionValidator.array
+	.lengthGreaterThanOrEqual(0)
+	.setValidationEnabled(isValidationEnabled);
+export const optionsLengthValidator = s.number.int
+	.greaterThanOrEqual(0)
+	.lessThanOrEqual(25)
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateRequiredSelectMenuParameters(options: SelectMenuOptionBuilder[], customId?: string) {
 	customIdValidator.parse(customId);
 	optionsValidator.parse(options);
 }
 
-export const labelValueValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
 export const defaultValidator = s.boolean;
 
 export function validateRequiredSelectMenuOptionParameters(label?: string, value?: string) {
-	labelValueValidator.parse(label);
-	labelValueValidator.parse(value);
+	labelValueDescriptionValidator.parse(label);
+	labelValueDescriptionValidator.parse(value);
 }
 
-export const urlValidator = s.string.url({
-	allowedProtocols: ['http:', 'https:', 'discord:'],
-});
+export const urlValidator = s.string
+	.url({
+		allowedProtocols: ['http:', 'https:', 'discord:'],
+	})
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateRequiredButtonParameters(
 	style?: ButtonStyle,

packages/builders/src/components/Components.ts

@@ -1,6 +1,14 @@
 import { APIMessageComponent, APIModalComponent, ComponentType } from 'discord-api-types/v10';
-import type { AnyComponentBuilder, MessageComponentBuilder, ModalComponentBuilder } from './ActionRow';
-import { ActionRowBuilder, ButtonBuilder, ComponentBuilder, SelectMenuBuilder, TextInputBuilder } from '../index';
+import {
+	ActionRowBuilder,
+	type AnyComponentBuilder,
+	type MessageComponentBuilder,
+	type ModalComponentBuilder,
+} from './ActionRow';
+import { ComponentBuilder } from './Component';
+import { ButtonBuilder } from './button/Button';
+import { SelectMenuBuilder } from './selectMenu/SelectMenu';
+import { TextInputBuilder } from './textInput/TextInput';
 
 export interface MappedComponentTypes {
 	[ComponentType.ActionRow]: ActionRowBuilder<AnyComponentBuilder>;

packages/builders/src/components/button/Button.ts

@@ -1,11 +1,11 @@
-import type {
+import {
+	ComponentType,
 	ButtonStyle,
-	APIMessageComponentEmoji,
-	APIButtonComponent,
-	APIButtonComponentWithCustomId,
-	APIButtonComponentWithURL,
+	type APIMessageComponentEmoji,
+	type APIButtonComponent,
+	type APIButtonComponentWithURL,
+	type APIButtonComponentWithCustomId,
 } from 'discord-api-types/v10';
-import { UnsafeButtonBuilder } from './UnsafeButton';
 import {
 	buttonLabelValidator,
 	buttonStyleValidator,
@@ -15,36 +15,77 @@ import {
 	urlValidator,
 	validateRequiredButtonParameters,
 } from '../Assertions';
+import { ComponentBuilder } from '../Component';
 
 /**
- * Represents a validated button component
+ * Represents a button component
  */
-export class ButtonBuilder extends UnsafeButtonBuilder {
-	public override setStyle(style: ButtonStyle) {
-		return super.setStyle(buttonStyleValidator.parse(style));
+export class ButtonBuilder extends ComponentBuilder<APIButtonComponent> {
+	public constructor(data?: Partial<APIButtonComponent>) {
+		super({ type: ComponentType.Button, ...data });
 	}
 
-	public override setURL(url: string) {
-		return super.setURL(urlValidator.parse(url));
+	/**
+	 * Sets the style of this button
+	 *
+	 * @param style - The style of the button
+	 */
+	public setStyle(style: ButtonStyle) {
+		this.data.style = buttonStyleValidator.parse(style);
+		return this;
 	}
 
-	public override setCustomId(customId: string) {
-		return super.setCustomId(customIdValidator.parse(customId));
+	/**
+	 * Sets the URL for this button
+	 *
+	 * @param url - The URL to open when this button is clicked
+	 */
+	public setURL(url: string) {
+		(this.data as APIButtonComponentWithURL).url = urlValidator.parse(url);
+		return this;
 	}
 
-	public override setEmoji(emoji: APIMessageComponentEmoji) {
-		return super.setEmoji(emojiValidator.parse(emoji));
+	/**
+	 * Sets the custom id for this button
+	 *
+	 * @param customId - The custom id to use for this button
+	 */
+	public setCustomId(customId: string) {
+		(this.data as APIButtonComponentWithCustomId).custom_id = customIdValidator.parse(customId);
+		return this;
 	}
 
-	public override setDisabled(disabled = true) {
-		return super.setDisabled(disabledValidator.parse(disabled));
+	/**
+	 * Sets the emoji to display on this button
+	 *
+	 * @param emoji - The emoji to display on this button
+	 */
+	public setEmoji(emoji: APIMessageComponentEmoji) {
+		this.data.emoji = emojiValidator.parse(emoji);
+		return this;
 	}
 
-	public override setLabel(label: string) {
-		return super.setLabel(buttonLabelValidator.parse(label));
+	/**
+	 * Sets whether this button is disabled
+	 *
+	 * @param disabled - Whether to disable this button
+	 */
+	public setDisabled(disabled = true) {
+		this.data.disabled = disabledValidator.parse(disabled);
+		return this;
 	}
 
-	public override toJSON(): APIButtonComponent {
+	/**
+	 * Sets the label for this button
+	 *
+	 * @param label - The label to display on this button
+	 */
+	public setLabel(label: string) {
+		this.data.label = buttonLabelValidator.parse(label);
+		return this;
+	}
+
+	public toJSON(): APIButtonComponent {
 		validateRequiredButtonParameters(
 			this.data.style,
 			this.data.label,
@@ -52,6 +93,9 @@ export class ButtonBuilder extends UnsafeButtonBuilder {
 			(this.data as APIButtonComponentWithCustomId).custom_id,
 			(this.data as APIButtonComponentWithURL).url,
 		);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+		} as APIButtonComponent;
 	}
 }

packages/builders/src/components/button/UnsafeButton.ts

@@ -1,85 +0,0 @@
-import {
-	ComponentType,
-	ButtonStyle,
-	type APIMessageComponentEmoji,
-	type APIButtonComponent,
-	type APIButtonComponentWithURL,
-	type APIButtonComponentWithCustomId,
-} from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component';
-
-/**
- * Represents a non-validated button component
- */
-export class UnsafeButtonBuilder extends ComponentBuilder<APIButtonComponent> {
-	public constructor(data?: Partial<APIButtonComponent>) {
-		super({ type: ComponentType.Button, ...data });
-	}
-
-	/**
-	 * Sets the style of this button
-	 *
-	 * @param style - The style of the button
-	 */
-	public setStyle(style: ButtonStyle) {
-		this.data.style = style;
-		return this;
-	}
-
-	/**
-	 * Sets the URL for this button
-	 *
-	 * @param url - The URL to open when this button is clicked
-	 */
-	public setURL(url: string) {
-		(this.data as APIButtonComponentWithURL).url = url;
-		return this;
-	}
-
-	/**
-	 * Sets the custom Id for this button
-	 *
-	 * @param customId - The custom id to use for this button
-	 */
-	public setCustomId(customId: string) {
-		(this.data as APIButtonComponentWithCustomId).custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Sets the emoji to display on this button
-	 *
-	 * @param emoji - The emoji to display on this button
-	 */
-	public setEmoji(emoji: APIMessageComponentEmoji) {
-		this.data.emoji = emoji;
-		return this;
-	}
-
-	/**
-	 * Sets whether this button is disable or not
-	 *
-	 * @param disabled - Whether or not to disable this button or not
-	 */
-	public setDisabled(disabled = true) {
-		this.data.disabled = disabled;
-		return this;
-	}
-
-	/**
-	 * Sets the label for this button
-	 *
-	 * @param label - The label to display on this button
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	public toJSON(): APIButtonComponent {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-		} as APIButtonComponent;
-	}
-}

packages/builders/src/components/selectMenu/SelectMenu.ts

@@ -1,6 +1,5 @@
-import type { APISelectMenuComponent, APISelectMenuOption } from 'discord-api-types/v10';
-import { UnsafeSelectMenuBuilder } from './UnsafeSelectMenu';
-import { UnsafeSelectMenuOptionBuilder } from './UnsafeSelectMenuOption';
+import { APISelectMenuOption, ComponentType, type APISelectMenuComponent } from 'discord-api-types/v10';
+import { SelectMenuOptionBuilder } from './SelectMenuOption';
 import { normalizeArray, type RestOrArray } from '../../util/normalizeArray';
 import {
 	customIdValidator,
@@ -11,61 +10,118 @@ import {
 	placeholderValidator,
 	validateRequiredSelectMenuParameters,
 } from '../Assertions';
+import { ComponentBuilder } from '../Component';
 
 /**
- * Represents a validated select menu component
+ * Represents a select menu component
  */
-export class SelectMenuBuilder extends UnsafeSelectMenuBuilder {
-	public override setPlaceholder(placeholder: string) {
-		return super.setPlaceholder(placeholderValidator.parse(placeholder));
+export class SelectMenuBuilder extends ComponentBuilder<APISelectMenuComponent> {
+	/**
+	 * The options within this select menu
+	 */
+	public readonly options: SelectMenuOptionBuilder[];
+
+	public constructor(data?: Partial<APISelectMenuComponent>) {
+		const { options, ...initData } = data ?? {};
+		super({ type: ComponentType.SelectMenu, ...initData });
+		this.options = options?.map((o) => new SelectMenuOptionBuilder(o)) ?? [];
 	}
 
-	public override setMinValues(minValues: number) {
-		return super.setMinValues(minMaxValidator.parse(minValues));
+	/**
+	 * Sets the placeholder for this select menu
+	 *
+	 * @param placeholder - The placeholder to use for this select menu
+	 */
+	public setPlaceholder(placeholder: string) {
+		this.data.placeholder = placeholderValidator.parse(placeholder);
+		return this;
 	}
 
-	public override setMaxValues(maxValues: number) {
-		return super.setMaxValues(minMaxValidator.parse(maxValues));
+	/**
+	 * Sets the minimum values that must be selected in the select menu
+	 *
+	 * @param minValues - The minimum values that must be selected
+	 */
+	public setMinValues(minValues: number) {
+		this.data.min_values = minMaxValidator.parse(minValues);
+		return this;
 	}
 
-	public override setCustomId(customId: string) {
-		return super.setCustomId(customIdValidator.parse(customId));
+	/**
+	 * Sets the maximum values that must be selected in the select menu
+	 *
+	 * @param maxValues - The maximum values that must be selected
+	 */
+	public setMaxValues(maxValues: number) {
+		this.data.max_values = minMaxValidator.parse(maxValues);
+		return this;
 	}
 
-	public override setDisabled(disabled = true) {
-		return super.setDisabled(disabledValidator.parse(disabled));
+	/**
+	 * Sets the custom id for this select menu
+	 *
+	 * @param customId - The custom id to use for this select menu
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customIdValidator.parse(customId);
+		return this;
 	}
 
-	public override addOptions(...options: RestOrArray<UnsafeSelectMenuOptionBuilder | APISelectMenuOption>) {
+	/**
+	 * Sets whether this select menu is disabled
+	 *
+	 * @param disabled - Whether this select menu is disabled
+	 */
+	public setDisabled(disabled = true) {
+		this.data.disabled = disabledValidator.parse(disabled);
+		return this;
+	}
+
+	/**
+	 * Adds options to this select menu
+	 *
+	 * @param options - The options to add to this select menu
+	 * @returns
+	 */
+	public addOptions(...options: RestOrArray<SelectMenuOptionBuilder | APISelectMenuOption>) {
 		options = normalizeArray(options);
 		optionsLengthValidator.parse(this.options.length + options.length);
 		this.options.push(
 			...options.map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder
+				option instanceof SelectMenuOptionBuilder
 					? option
-					: new UnsafeSelectMenuOptionBuilder(optionValidator.parse<APISelectMenuOption>(option)),
+					: new SelectMenuOptionBuilder(optionValidator.parse<APISelectMenuOption>(option)),
 			),
 		);
 		return this;
 	}
 
-	public override setOptions(...options: RestOrArray<UnsafeSelectMenuOptionBuilder | APISelectMenuOption>) {
+	/**
+	 * Sets the options on this select menu
+	 *
+	 * @param options - The options to set on this select menu
+	 */
+	public setOptions(...options: RestOrArray<SelectMenuOptionBuilder | APISelectMenuOption>) {
 		options = normalizeArray(options);
 		optionsLengthValidator.parse(options.length);
 		this.options.splice(
 			0,
 			this.options.length,
 			...options.map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder
+				option instanceof SelectMenuOptionBuilder
 					? option
-					: new UnsafeSelectMenuOptionBuilder(optionValidator.parse<APISelectMenuOption>(option)),
+					: new SelectMenuOptionBuilder(optionValidator.parse<APISelectMenuOption>(option)),
 			),
 		);
 		return this;
 	}
 
-	public override toJSON(): APISelectMenuComponent {
+	public toJSON(): APISelectMenuComponent {
 		validateRequiredSelectMenuParameters(this.options, this.data.custom_id);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+			options: this.options.map((o) => o.toJSON()),
+		} as APISelectMenuComponent;
 	}
 }

packages/builders/src/components/selectMenu/SelectMenuOption.ts

@@ -1,30 +1,73 @@
 import type { APIMessageComponentEmoji, APISelectMenuOption } from 'discord-api-types/v10';
-import { UnsafeSelectMenuOptionBuilder } from './UnsafeSelectMenuOption';
+
 import {
 	defaultValidator,
 	emojiValidator,
-	labelValueValidator,
+	labelValueDescriptionValidator,
 	validateRequiredSelectMenuOptionParameters,
 } from '../Assertions';
 
 /**
- * Represents a validated option within a select menu component
+ * Represents a option within a select menu component
  */
-export class SelectMenuOptionBuilder extends UnsafeSelectMenuOptionBuilder {
-	public override setDescription(description: string) {
-		return super.setDescription(labelValueValidator.parse(description));
+export class SelectMenuOptionBuilder {
+	public constructor(public data: Partial<APISelectMenuOption> = {}) {}
+
+	/**
+	 * Sets the label of this option
+	 *
+	 * @param label - The label to show on this option
+	 */
+	public setLabel(label: string) {
+		this.data.label = labelValueDescriptionValidator.parse(label);
+		return this;
 	}
 
-	public override setDefault(isDefault = true) {
-		return super.setDefault(defaultValidator.parse(isDefault));
+	/**
+	 * Sets the value of this option
+	 *
+	 * @param value - The value of this option
+	 */
+	public setValue(value: string) {
+		this.data.value = labelValueDescriptionValidator.parse(value);
+		return this;
 	}
 
-	public override setEmoji(emoji: APIMessageComponentEmoji) {
-		return super.setEmoji(emojiValidator.parse(emoji));
+	/**
+	 * Sets the description of this option
+	 *
+	 * @param description - The description of this option
+	 */
+	public setDescription(description: string) {
+		this.data.description = labelValueDescriptionValidator.parse(description);
+		return this;
 	}
 
-	public override toJSON(): APISelectMenuOption {
+	/**
+	 * Sets whether this option is selected by default
+	 *
+	 * @param isDefault - Whether this option is selected by default
+	 */
+	public setDefault(isDefault = true) {
+		this.data.default = defaultValidator.parse(isDefault);
+		return this;
+	}
+
+	/**
+	 * Sets the emoji to display on this option
+	 *
+	 * @param emoji - The emoji to display on this option
+	 */
+	public setEmoji(emoji: APIMessageComponentEmoji) {
+		this.data.emoji = emojiValidator.parse(emoji);
+		return this;
+	}
+
+	public toJSON(): APISelectMenuOption {
 		validateRequiredSelectMenuOptionParameters(this.data.label, this.data.value);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+		} as APISelectMenuOption;
 	}
 }

packages/builders/src/components/selectMenu/UnsafeSelectMenu.ts

@@ -1,108 +0,0 @@
-import { APISelectMenuOption, ComponentType, type APISelectMenuComponent } from 'discord-api-types/v10';
-import { UnsafeSelectMenuOptionBuilder } from './UnsafeSelectMenuOption';
-import { normalizeArray, type RestOrArray } from '../../util/normalizeArray';
-import { ComponentBuilder } from '../Component';
-
-/**
- * Represents a non-validated select menu component
- */
-export class UnsafeSelectMenuBuilder extends ComponentBuilder<APISelectMenuComponent> {
-	/**
-	 * The options within this select menu
-	 */
-	public readonly options: UnsafeSelectMenuOptionBuilder[];
-
-	public constructor(data?: Partial<APISelectMenuComponent>) {
-		const { options, ...initData } = data ?? {};
-		super({ type: ComponentType.SelectMenu, ...initData });
-		this.options = options?.map((o) => new UnsafeSelectMenuOptionBuilder(o)) ?? [];
-	}
-
-	/**
-	 * Sets the placeholder for this select menu
-	 *
-	 * @param placeholder - The placeholder to use for this select menu
-	 */
-	public setPlaceholder(placeholder: string) {
-		this.data.placeholder = placeholder;
-		return this;
-	}
-
-	/**
-	 * Sets the minimum values that must be selected in the select menu
-	 *
-	 * @param minValues - The minimum values that must be selected
-	 */
-	public setMinValues(minValues: number) {
-		this.data.min_values = minValues;
-		return this;
-	}
-
-	/**
-	 * Sets the maximum values that must be selected in the select menu
-	 *
-	 * @param minValues - The maximum values that must be selected
-	 */
-	public setMaxValues(maxValues: number) {
-		this.data.max_values = maxValues;
-		return this;
-	}
-
-	/**
-	 * Sets the custom Id for this select menu
-	 *
-	 * @param customId - The custom id to use for this select menu
-	 */
-	public setCustomId(customId: string) {
-		this.data.custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Sets whether or not this select menu is disabled
-	 *
-	 * @param disabled - Whether or not this select menu is disabled
-	 */
-	public setDisabled(disabled = true) {
-		this.data.disabled = disabled;
-		return this;
-	}
-
-	/**
-	 * Adds options to this select menu
-	 *
-	 * @param options - The options to add to this select menu
-	 */
-	public addOptions(...options: RestOrArray<UnsafeSelectMenuOptionBuilder | APISelectMenuOption>) {
-		this.options.push(
-			...normalizeArray(options).map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder ? option : new UnsafeSelectMenuOptionBuilder(option),
-			),
-		);
-		return this;
-	}
-
-	/**
-	 * Sets the options on this select menu
-	 *
-	 * @param options - The options to set on this select menu
-	 */
-	public setOptions(...options: RestOrArray<UnsafeSelectMenuOptionBuilder | APISelectMenuOption>) {
-		this.options.splice(
-			0,
-			this.options.length,
-			...normalizeArray(options).map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder ? option : new UnsafeSelectMenuOptionBuilder(option),
-			),
-		);
-		return this;
-	}
-
-	public toJSON(): APISelectMenuComponent {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-			options: this.options.map((o) => o.toJSON()),
-		} as APISelectMenuComponent;
-	}
-}

packages/builders/src/components/selectMenu/UnsafeSelectMenuOption.ts

@@ -1,65 +0,0 @@
-import type { APIMessageComponentEmoji, APISelectMenuOption } from 'discord-api-types/v10';
-
-/**
- * Represents a non-validated option within a select menu component
- */
-export class UnsafeSelectMenuOptionBuilder {
-	public constructor(public data: Partial<APISelectMenuOption> = {}) {}
-
-	/**
-	 * Sets the label of this option
-	 *
-	 * @param label - The label to show on this option
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	/**
-	 * Sets the value of this option
-	 *
-	 * @param value - The value of this option
-	 */
-	public setValue(value: string) {
-		this.data.value = value;
-		return this;
-	}
-
-	/**
-	 * Sets the description of this option.
-	 *
-	 * @param description - The description of this option
-	 */
-	public setDescription(description: string) {
-		this.data.description = description;
-		return this;
-	}
-
-	/**
-	 * Sets whether this option is selected by default
-	 *
-	 * @param isDefault - Whether this option is selected by default
-	 */
-	public setDefault(isDefault = true) {
-		this.data.default = isDefault;
-		return this;
-	}
-
-	/**
-	 * Sets the emoji to display on this option
-	 *
-	 * @param emoji - The emoji to display on this option
-	 */
-	public setEmoji(emoji: APIMessageComponentEmoji) {
-		this.data.emoji = emoji;
-		return this;
-	}
-
-	public toJSON(): APISelectMenuOption {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-		} as APISelectMenuOption;
-	}
-}

packages/builders/src/components/textInput/Assertions.ts

@@ -1,14 +1,24 @@
 import { s } from '@sapphire/shapeshift';
 import { TextInputStyle } from 'discord-api-types/v10';
+import { isValidationEnabled } from '../../util/validation';
 import { customIdValidator } from '../Assertions';
 
 export const textInputStyleValidator = s.nativeEnum(TextInputStyle);
-export const minLengthValidator = s.number.int.greaterThanOrEqual(0).lessThanOrEqual(4000);
-export const maxLengthValidator = s.number.int.greaterThanOrEqual(1).lessThanOrEqual(4000);
+export const minLengthValidator = s.number.int
+	.greaterThanOrEqual(0)
+	.lessThanOrEqual(4000)
+	.setValidationEnabled(isValidationEnabled);
+export const maxLengthValidator = s.number.int
+	.greaterThanOrEqual(1)
+	.lessThanOrEqual(4000)
+	.setValidationEnabled(isValidationEnabled);
 export const requiredValidator = s.boolean;
-export const valueValidator = s.string.lengthLessThanOrEqual(4000);
-export const placeholderValidator = s.string.lengthLessThanOrEqual(100);
-export const labelValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(45);
+export const valueValidator = s.string.lengthLessThanOrEqual(4000).setValidationEnabled(isValidationEnabled);
+export const placeholderValidator = s.string.lengthLessThanOrEqual(100).setValidationEnabled(isValidationEnabled);
+export const labelValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(45)
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateRequiredParameters(customId?: string, style?: TextInputStyle, label?: string) {
 	customIdValidator.parse(customId);

packages/builders/src/components/textInput/TextInput.ts

@@ -1,4 +1,5 @@
-import type { APITextInputComponent, TextInputStyle } from 'discord-api-types/v10';
+import { ComponentType, type TextInputStyle, type APITextInputComponent } from 'discord-api-types/v10';
+import isEqual from 'fast-deep-equal';
 import {
 	maxLengthValidator,
 	minLengthValidator,
@@ -9,44 +10,108 @@ import {
 	labelValidator,
 	textInputStyleValidator,
 } from './Assertions';
-import { UnsafeTextInputBuilder } from './UnsafeTextInput';
+import { isJSONEncodable, type JSONEncodable } from '../../util/jsonEncodable';
 import { customIdValidator } from '../Assertions';
+import { ComponentBuilder } from '../Component';
 
-export class TextInputBuilder extends UnsafeTextInputBuilder {
-	public override setCustomId(customId: string): this {
-		return super.setCustomId(customIdValidator.parse(customId));
+export class TextInputBuilder extends ComponentBuilder<APITextInputComponent> {
+	public constructor(data?: APITextInputComponent & { type?: ComponentType.TextInput }) {
+		super({ type: ComponentType.TextInput, ...data });
 	}
 
-	public override setLabel(label: string): this {
-		return super.setLabel(labelValidator.parse(label));
+	/**
+	 * Sets the custom id for this text input
+	 *
+	 * @param customId - The custom id of this text input
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customIdValidator.parse(customId);
+		return this;
 	}
 
-	public override setStyle(style: TextInputStyle): this {
-		return super.setStyle(textInputStyleValidator.parse(style));
+	/**
+	 * Sets the label for this text input
+	 *
+	 * @param label - The label for this text input
+	 */
+	public setLabel(label: string) {
+		this.data.label = labelValidator.parse(label);
+		return this;
 	}
 
-	public override setMinLength(minLength: number) {
-		return super.setMinLength(minLengthValidator.parse(minLength));
+	/**
+	 * Sets the style for this text input
+	 *
+	 * @param style - The style for this text input
+	 */
+	public setStyle(style: TextInputStyle) {
+		this.data.style = textInputStyleValidator.parse(style);
+		return this;
 	}
 
-	public override setMaxLength(maxLength: number) {
-		return super.setMaxLength(maxLengthValidator.parse(maxLength));
+	/**
+	 * Sets the minimum length of text for this text input
+	 *
+	 * @param minLength - The minimum length of text for this text input
+	 */
+	public setMinLength(minLength: number) {
+		this.data.min_length = minLengthValidator.parse(minLength);
+		return this;
 	}
 
-	public override setPlaceholder(placeholder: string) {
-		return super.setPlaceholder(placeholderValidator.parse(placeholder));
+	/**
+	 * Sets the maximum length of text for this text input
+	 *
+	 * @param maxLength - The maximum length of text for this text input
+	 */
+	public setMaxLength(maxLength: number) {
+		this.data.max_length = maxLengthValidator.parse(maxLength);
+		return this;
 	}
 
-	public override setValue(value: string) {
-		return super.setValue(valueValidator.parse(value));
+	/**
+	 * Sets the placeholder of this text input
+	 *
+	 * @param placeholder - The placeholder of this text input
+	 */
+	public setPlaceholder(placeholder: string) {
+		this.data.placeholder = placeholderValidator.parse(placeholder);
+		return this;
 	}
 
-	public override setRequired(required = true) {
-		return super.setRequired(requiredValidator.parse(required));
+	/**
+	 * Sets the value of this text input
+	 *
+	 * @param value - The value for this text input
+	 */
+	public setValue(value: string) {
+		this.data.value = valueValidator.parse(value);
+		return this;
 	}
 
-	public override toJSON(): APITextInputComponent {
+	/**
+	 * Sets whether this text input is required
+	 *
+	 * @param required - Whether this text input is required
+	 */
+	public setRequired(required = true) {
+		this.data.required = requiredValidator.parse(required);
+		return this;
+	}
+
+	public toJSON(): APITextInputComponent {
 		validateRequiredParameters(this.data.custom_id, this.data.style, this.data.label);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+		} as APITextInputComponent;
+	}
+
+	public equals(other: JSONEncodable<APITextInputComponent> | APITextInputComponent): boolean {
+		if (isJSONEncodable(other)) {
+			return isEqual(other.toJSON(), this.data);
+		}
+
+		return isEqual(other, this.data);
 	}
 }

packages/builders/src/components/textInput/UnsafeTextInput.ts

@@ -1,104 +0,0 @@
-import { ComponentType, type TextInputStyle, type APITextInputComponent } from 'discord-api-types/v10';
-import isEqual from 'fast-deep-equal';
-import { ComponentBuilder } from '../../index';
-
-export class UnsafeTextInputBuilder extends ComponentBuilder<APITextInputComponent> {
-	public constructor(data?: APITextInputComponent & { type?: ComponentType.TextInput }) {
-		super({ type: ComponentType.TextInput, ...data });
-	}
-
-	/**
-	 * Sets the custom id for this text input
-	 *
-	 * @param customId - The custom id of this text input
-	 */
-	public setCustomId(customId: string) {
-		this.data.custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Sets the label for this text input
-	 *
-	 * @param label - The label for this text input
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	/**
-	 * Sets the style for this text input
-	 *
-	 * @param style - The style for this text input
-	 */
-	public setStyle(style: TextInputStyle) {
-		this.data.style = style;
-		return this;
-	}
-
-	/**
-	 * Sets the minimum length of text for this text input
-	 *
-	 * @param minLength - The minimum length of text for this text input
-	 */
-	public setMinLength(minLength: number) {
-		this.data.min_length = minLength;
-		return this;
-	}
-
-	/**
-	 * Sets the maximum length of text for this text input
-	 *
-	 * @param maxLength - The maximum length of text for this text input
-	 */
-	public setMaxLength(maxLength: number) {
-		this.data.max_length = maxLength;
-		return this;
-	}
-
-	/**
-	 * Sets the placeholder of this text input
-	 *
-	 * @param placeholder - The placeholder of this text input
-	 */
-	public setPlaceholder(placeholder: string) {
-		this.data.placeholder = placeholder;
-		return this;
-	}
-
-	/**
-	 * Sets the value of this text input
-	 *
-	 * @param value - The value for this text input
-	 */
-	public setValue(value: string) {
-		this.data.value = value;
-		return this;
-	}
-
-	/**
-	 * Sets whether this text input is required or not
-	 *
-	 * @param required - Whether this text input is required or not
-	 */
-	public setRequired(required = true) {
-		this.data.required = required;
-		return this;
-	}
-
-	public toJSON(): APITextInputComponent {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-		} as APITextInputComponent;
-	}
-
-	public equals(other: UnsafeTextInputBuilder | APITextInputComponent): boolean {
-		if (other instanceof UnsafeTextInputBuilder) {
-			return isEqual(other.data, this.data);
-		}
-
-		return isEqual(other, this.data);
-	}
-}