refactor: use new abstraction

discordjs · Sep 23, 2024 · efee37d · efee37d
1 parent 358b925
commit efee37d
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 202 deletions.
diff --git a/packages/builders/src/index.ts b/packages/builders/src/index.ts
@@ -23,7 +23,6 @@ export * from './interactions/commands/chatInput/mixins/ApplicationCommandOption
 export * from './interactions/commands/chatInput/mixins/ApplicationCommandOptionWithChoicesMixin.js';
 export * from './interactions/commands/chatInput/mixins/SharedChatInputCommandOptions.js';
 export * from './interactions/commands/chatInput/mixins/SharedSubcommands.js';
-export * from './interactions/commands/chatInput/mixins/SharedChatInputCommand.js';
 
 export * from './interactions/commands/chatInput/options/boolean.js';
 export * from './interactions/commands/chatInput/options/channel.js';

diff --git a/packages/builders/src/interactions/commands/Command.ts b/packages/builders/src/interactions/commands/Command.ts
@@ -1,9 +1,77 @@
 import type { JSONEncodable } from '@discordjs/util';
-import type { RESTPostAPIApplicationCommandsJSONBody } from 'discord-api-types/v10';
+import type {
+	ApplicationIntegrationType,
+	InteractionContextType,
+	Permissions,
+	RESTPostAPIApplicationCommandsJSONBody,
+} from 'discord-api-types/v10';
+import type { RestOrArray } from '../../util/normalizeArray.js';
+import { normalizeArray } from '../../util/normalizeArray.js';
+
+export interface CommandData
+	extends Partial<
+		Pick<
+			RESTPostAPIApplicationCommandsJSONBody,
+			'contexts' | 'default_member_permissions' | 'integration_types' | 'nsfw'
+		>
+	> {}
 
 export abstract class CommandBuilder<Command extends RESTPostAPIApplicationCommandsJSONBody>
 	implements JSONEncodable<Command>
 {
+	protected declare readonly data: CommandData;
+
+	/**
+	 * Sets the contexts of this command.
+	 *
+	 * @param contexts - The contexts
+	 */
+	public setContexts(...contexts: RestOrArray<InteractionContextType>) {
+		this.data.contexts = normalizeArray(contexts);
+		return this;
+	}
+
+	/**
+	 * Sets the integration types of this command.
+	 *
+	 * @param integrationTypes - The integration types
+	 */
+	public setIntegrationTypes(...integrationTypes: RestOrArray<ApplicationIntegrationType>) {
+		this.data.integration_types = normalizeArray(integrationTypes);
+		return this;
+	}
+
+	/**
+	 * Sets the default permissions a member should have in order to run the command.
+	 *
+	 * @remarks
+	 * You can set this to `'0'` to disable the command by default.
+	 * @param permissions - The permissions bit field to set
+	 * @see {@link https://discord.com/developers/docs/interactions/application-commands#permissions}
+	 */
+	public setDefaultMemberPermissions(permissions: Permissions | bigint | number) {
+		this.data.default_member_permissions = typeof permissions === 'string' ? permissions : permissions.toString();
+		return this;
+	}
+
+	/**
+	 * Clears the default permissions a member should have in order to run the command.
+	 */
+	public clearDefaultMemberPermissions() {
+		this.data.default_member_permissions = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets whether this command is NSFW.
+	 *
+	 * @param nsfw - Whether this command is NSFW
+	 */
+	public setNSFW(nsfw = true) {
+		this.data.nsfw = nsfw;
+		return this;
+	}
+
 	/**
 	 * Serializes this builder to API-compatible JSON data.
 	 *

diff --git a/packages/builders/src/interactions/commands/SharedName.ts b/packages/builders/src/interactions/commands/SharedName.ts
@@ -1,6 +1,7 @@
-import type { APIApplicationCommand, LocaleString } from 'discord-api-types/v10';
+import type { LocaleString, RESTPostAPIApplicationCommandsJSONBody } from 'discord-api-types/v10';
 
-export interface SharedNameData extends Partial<Pick<APIApplicationCommand, 'name_localizations' | 'name'>> {}
+export interface SharedNameData
+	extends Partial<Pick<RESTPostAPIApplicationCommandsJSONBody, 'name_localizations' | 'name'>> {}
 
 /**
  * This mixin holds name and description symbols for chat input commands.

diff --git a/packages/builders/src/interactions/commands/chatInput/ChatInputCommand.ts b/packages/builders/src/interactions/commands/chatInput/ChatInputCommand.ts
@@ -2,10 +2,9 @@ import { ApplicationCommandType, type RESTPostAPIChatInputApplicationCommandsJSO
 import { Mixin } from 'ts-mixer';
 import { isValidationEnabled } from '../../../util/validation.js';
 import { CommandBuilder } from '../Command.js';
+import { SharedNameAndDescription } from '../SharedNameAndDescription.js';
 import { chatInputCommandPredicate } from './Assertions.js';
-import { SharedChatInputCommand } from './mixins/SharedChatInputCommand.js';
 import { SharedChatInputCommandOptions } from './mixins/SharedChatInputCommandOptions.js';
-import { SharedNameAndDescription } from '../SharedNameAndDescription.js';
 import { SharedChatInputCommandSubcommands } from './mixins/SharedSubcommands.js';
 
 /**
@@ -16,7 +15,6 @@ export class ChatInputCommandBuilder extends Mixin(
 	SharedChatInputCommandOptions,
 	SharedNameAndDescription,
 	SharedChatInputCommandSubcommands,
-	SharedChatInputCommand,
 ) {
 	/**
 	 * {@inheritDoc CommandBuilder.toJSON}

diff --git a/packages/builders/src/interactions/commands/chatInput/mixins/SharedChatInputCommand.ts b/packages/builders/src/interactions/commands/chatInput/mixins/SharedChatInputCommand.ts
diff --git a/packages/builders/src/interactions/commands/contextMenu/ContextMenuCommand.ts b/packages/builders/src/interactions/commands/contextMenu/ContextMenuCommand.ts
@@ -1,14 +1,7 @@
-import type {
-	ApplicationCommandType,
-	ApplicationIntegrationType,
-	InteractionContextType,
-	LocaleString,
-	Permissions,
-	RESTPostAPIContextMenuApplicationCommandsJSONBody,
-} from 'discord-api-types/v10';
-import type { RestOrArray } from '../../../util/normalizeArray.js';
-import { normalizeArray } from '../../../util/normalizeArray.js';
+import type { ApplicationCommandType, RESTPostAPIContextMenuApplicationCommandsJSONBody } from 'discord-api-types/v10';
+import { Mixin } from 'ts-mixer';
 import { CommandBuilder } from '../Command.js';
+import { SharedName } from '../SharedName.js';
 
 /**
  * The type a context menu command can be.
@@ -18,123 +11,17 @@ export type ContextMenuCommandType = ApplicationCommandType.Message | Applicatio
 /**
  * A builder that creates API-compatible JSON data for context menu commands.
  */
-export abstract class ContextMenuCommandBuilder extends CommandBuilder<RESTPostAPIContextMenuApplicationCommandsJSONBody> {
-	protected readonly data: Partial<RESTPostAPIContextMenuApplicationCommandsJSONBody>;
+export abstract class ContextMenuCommandBuilder extends Mixin(
+	CommandBuilder<RESTPostAPIContextMenuApplicationCommandsJSONBody>,
+	SharedName,
+) {
+	protected override readonly data: Partial<RESTPostAPIContextMenuApplicationCommandsJSONBody>;
 
 	public constructor(data: Partial<RESTPostAPIContextMenuApplicationCommandsJSONBody> = {}) {
 		super();
 		this.data = structuredClone(data);
 	}
 
-	/**
-	 * Sets the contexts of this command.
-	 *
-	 * @param contexts - The contexts
-	 */
-	public setContexts(...contexts: RestOrArray<InteractionContextType>) {
-		this.data.contexts = normalizeArray(contexts);
-		return this;
-	}
-
-	/**
-	 * Sets integration types of this command.
-	 *
-	 * @param integrationTypes - The integration types
-	 */
-	public setIntegrationTypes(...integrationTypes: RestOrArray<ApplicationIntegrationType>) {
-		this.data.integration_types = normalizeArray(integrationTypes);
-		return this;
-	}
-
-	/**
-	 * Sets the name of this command.
-	 *
-	 * @param name - The name to use
-	 */
-	public setName(name: string) {
-		this.data.name = name;
-		return this;
-	}
-
-	/**
-	 * Sets the default permissions a member should have in order to run this command.
-	 *
-	 * @remarks
-	 * You can set this to `'0'` to disable the command by default.
-	 * @param permissions - The permissions bit field to set
-	 * @see {@link https://discord.com/developers/docs/interactions/application-commands#permissions}
-	 */
-	public setDefaultMemberPermissions(permissions: Permissions | bigint | number) {
-		this.data.default_member_permissions = typeof permissions === 'string' ? permissions : permissions.toString();
-		return this;
-	}
-
-	/**
-	 * Clears the default permissions for this command.
-	 */
-	public clearDefaultMemberPermissions() {
-		this.data.default_member_permissions = undefined;
-		return this;
-	}
-
-	/**
-	 * Sets a name localization for this command.
-	 *
-	 * @param locale - The locale to set
-	 * @param localizedName - The localized name for the given `locale`
-	 */
-	public setNameLocalization(locale: LocaleString, localizedName: string) {
-		this.data.name_localizations ??= {};
-		this.data.name_localizations[locale] = localizedName;
-
-		return this;
-	}
-
-	/**
-	 * Clears a name localization for this command.
-	 *
-	 * @param locale - The locale to clear
-	 */
-	public clearNameLocalization(locale: LocaleString) {
-		this.data.name_localizations ??= {};
-		this.data.name_localizations[locale] = undefined;
-
-		return this;
-	}
-
-	/**
-	 * Sets the name localizations for this command.
-	 *
-	 * @param localizedNames - The object of localized names to set
-	 */
-	public setNameLocalizations(localizedNames: Partial<Record<LocaleString, string>>) {
-		this.data.name_localizations = {};
-
-		for (const args of Object.entries(localizedNames)) {
-			this.setNameLocalization(...(args as [LocaleString, string]));
-		}
-
-		return this;
-	}
-
-	/**
-	 * Clears the name localizations for this command.
-	 */
-	public clearNameLocalizations() {
-		this.data.name_localizations = undefined;
-		return this;
-	}
-
-	/**
-	 * Sets whether this command is NSFW.
-	 *
-	 * @param nsfw - Whether this command is NSFW
-	 */
-	public setNSFW(nsfw = true) {
-		this.data.nsfw = nsfw;
-		return this;
-	}
-
 	/**
 	 * {@inheritDoc CommandBuilder.toJSON}
 	 */