@ovencord/builders 1.11.1 → 1.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@ovencord/builders",
-	"version": "1.11.1",
+	"version": "1.11.3",
 	"description": "A set of builders that you can use when creating your bot",
 	"scripts": {
 		"test": "bun test",

package/src/components/Components.ts

@@ -14,6 +14,8 @@ import {
 	SecondaryButtonBuilder,
 	SuccessButtonBuilder,
 } from './button/CustomIdButton.js';
+import { ButtonBuilder } from './button/ButtonBuilder.js';
+export { ButtonBuilder };
 import { LinkButtonBuilder } from './button/LinkButton.js';
 import { PremiumButtonBuilder } from './button/PremiumButton.js';
 import { FileUploadBuilder } from './fileUpload/FileUpload.js';
@@ -61,16 +63,7 @@ export type ModalComponentBuilder =
 	| LabelBuilder
 	| ModalActionRowComponentBuilder;
 
-/**
- * Any button builder
- */
-export type ButtonBuilder =
-	| DangerButtonBuilder
-	| LinkButtonBuilder
-	| PremiumButtonBuilder
-	| PrimaryButtonBuilder
-	| SecondaryButtonBuilder
-	| SuccessButtonBuilder;
+// Any button builder is already covered by the ButtonBuilder class
 
 /**
  * The builders that may be used within an action row for messages.

package/src/components/button/ButtonBuilder.ts

@@ -0,0 +1,59 @@
+import { ButtonStyle, ComponentType, type APIButtonComponent } from 'discord-api-types/v10';
+import { Mixin } from 'ts-mixer';
+import { BaseButtonBuilder } from './Button.js';
+import { EmojiOrLabelButtonMixin } from './mixins/EmojiOrLabelButtonMixin.js';
+
+/**
+ * A builder that creates API-compatible JSON data for buttons.
+ *
+ * @mixes {@link BaseButtonBuilder}\<{@link discord-api-types/v10#(APIButtonComponent:interface)}\>
+ * @mixes {@link EmojiOrLabelButtonMixin}
+ */
+export interface ButtonBuilder extends BaseButtonBuilder<APIButtonComponent>, EmojiOrLabelButtonMixin {}
+
+export class ButtonBuilder extends Mixin(BaseButtonBuilder<APIButtonComponent>, EmojiOrLabelButtonMixin) {
+	/**
+	 * @internal
+	 */
+	protected override readonly data: Partial<APIButtonComponent>;
+
+	/**
+	 * Creates a new button builder.
+	 *
+	 * @param data - The API data to create this button with
+	 */
+	public constructor(data: Partial<APIButtonComponent> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.Button };
+	}
+
+	/**
+	 * Sets the custom id for this button.
+	 *
+	 * @param customId - The custom id to use
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customId;
+		return this;
+	}
+
+	/**
+	 * Sets the style for this button.
+	 *
+	 * @param style - The style to use
+	 */
+	public setStyle(style: ButtonStyle) {
+		this.data.style = style;
+		return this;
+	}
+
+	/**
+	 * Sets the URL for this button.
+	 *
+	 * @param url - The URL to use
+	 */
+	public setURL(url: string) {
+		this.data.url = url;
+		return this;
+	}
+}

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './components/button/mixins/EmojiOrLabelButtonMixin.js';
 export * from './components/button/Button.js';
+export * from './components/button/ButtonBuilder.js';
 export * from './components/button/CustomIdButton.js';
 export * from './components/button/LinkButton.js';
 export * from './components/button/PremiumButton.js';

package/src/interactions/commands/chatInput/mixins/SharedChatInputCommandOptions.ts

@@ -44,6 +44,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandBooleanOption, ...options);
 	}
 
+	/**
+	 * Adds a boolean option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addBooleanOption(option: ChatInputCommandBooleanOption | ((builder: ChatInputCommandBooleanOption) => ChatInputCommandBooleanOption)) {
+		return this.addBooleanOptions(option);
+	}
+
 	/**
 	 * Adds user options.
 	 *
@@ -57,6 +66,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandUserOption, ...options);
 	}
 
+	/**
+	 * Adds a user option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addUserOption(option: ChatInputCommandUserOption | ((builder: ChatInputCommandUserOption) => ChatInputCommandUserOption)) {
+		return this.addUserOptions(option);
+	}
+
 	/**
 	 * Adds channel options.
 	 *
@@ -70,6 +88,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandChannelOption, ...options);
 	}
 
+	/**
+	 * Adds a channel option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addChannelOption(option: ChatInputCommandChannelOption | ((builder: ChatInputCommandChannelOption) => ChatInputCommandChannelOption)) {
+		return this.addChannelOptions(option);
+	}
+
 	/**
 	 * Adds role options.
 	 *
@@ -83,6 +110,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandRoleOption, ...options);
 	}
 
+	/**
+	 * Adds a role option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addRoleOption(option: ChatInputCommandRoleOption | ((builder: ChatInputCommandRoleOption) => ChatInputCommandRoleOption)) {
+		return this.addRoleOptions(option);
+	}
+
 	/**
 	 * Adds attachment options.
 	 *
@@ -97,6 +133,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandAttachmentOption, ...options);
 	}
 
+	/**
+	 * Adds an attachment option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addAttachmentOption(option: ChatInputCommandAttachmentOption | ((builder: ChatInputCommandAttachmentOption) => ChatInputCommandAttachmentOption)) {
+		return this.addAttachmentOptions(option);
+	}
+
 	/**
 	 * Adds mentionable options.
 	 *
@@ -111,6 +156,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandMentionableOption, ...options);
 	}
 
+	/**
+	 * Adds a mentionable option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addMentionableOption(option: ChatInputCommandMentionableOption | ((builder: ChatInputCommandMentionableOption) => ChatInputCommandMentionableOption)) {
+		return this.addMentionableOptions(option);
+	}
+
 	/**
 	 * Adds string options.
 	 *
@@ -124,6 +178,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandStringOption, ...options);
 	}
 
+	/**
+	 * Adds a string option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addStringOption(option: ChatInputCommandStringOption | ((builder: ChatInputCommandStringOption) => ChatInputCommandStringOption)) {
+		return this.addStringOptions(option);
+	}
+
 	/**
 	 * Adds integer options.
 	 *
@@ -137,6 +200,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandIntegerOption, ...options);
 	}
 
+	/**
+	 * Adds an integer option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addIntegerOption(option: ChatInputCommandIntegerOption | ((builder: ChatInputCommandIntegerOption) => ChatInputCommandIntegerOption)) {
+		return this.addIntegerOptions(option);
+	}
+
 	/**
 	 * Adds number options.
 	 *
@@ -150,6 +222,15 @@ export class SharedChatInputCommandOptions {
 		return this.sharedAddOptions(ChatInputCommandNumberOption, ...options);
 	}
 
+	/**
+	 * Adds a number option.
+	 *
+	 * @param option - Option to add
+	 */
+	public addNumberOption(option: ChatInputCommandNumberOption | ((builder: ChatInputCommandNumberOption) => ChatInputCommandNumberOption)) {
+		return this.addNumberOptions(option);
+	}
+
 	/**
 	 * Removes, replaces, or inserts options for this command.
 	 *

package/src/interactions/commands/chatInput/mixins/SharedSubcommands.ts

@@ -39,6 +39,19 @@ export class SharedChatInputCommandSubcommands {
 		return this;
 	}
 
+	/**
+	 * Adds a subcommand group to this command.
+	 *
+	 * @param input - Subcommand group to add
+	 */
+	public addSubcommandGroup(
+		input:
+			| ChatInputCommandSubcommandGroupBuilder
+			| ((subcommandGroup: ChatInputCommandSubcommandGroupBuilder) => ChatInputCommandSubcommandGroupBuilder),
+	): this {
+		return this.addSubcommandGroups(input);
+	}
+
 	/**
 	 * Adds subcommands to this command.
 	 *
@@ -58,4 +71,17 @@ export class SharedChatInputCommandSubcommands {
 
 		return this;
 	}
+
+	/**
+	 * Adds a subcommand to this command.
+	 *
+	 * @param input - Subcommand to add
+	 */
+	public addSubcommand(
+		input:
+			| ChatInputCommandSubcommandBuilder
+			| ((subcommandGroup: ChatInputCommandSubcommandBuilder) => ChatInputCommandSubcommandBuilder),
+	): this {
+		return this.addSubcommands(input);
+	}
 }