Merge pull request #139 from ghostdevv/fix-app-cmd-opt

Author: ghostdevv

.changeset/olive-kiwis-exist.md

@@ -0,0 +1,5 @@
+---
+'jellycommands': patch
+---
+
+fix JellyApplicationCommandOption type

packages/jellycommands/src/commands/types/commands/types.ts

@@ -1,40 +1,111 @@
 import {
-    ApplicationCommandOption,
-    ApplicationCommandAttachmentOption,
-    ApplicationCommandChannelOption,
-    ApplicationCommandChoicesOption,
-    ApplicationCommandNonOptions,
-    ApplicationCommandNumericOption,
-    ApplicationCommandStringOption,
-    ApplicationCommandSubCommand,
-    ApplicationCommandSubGroup,
+    ApplicationCommandOptionType,
+    BaseApplicationCommandOptionsData,
+    ApplicationCommandOptionChoiceData,
+    ChannelType,
 } from 'discord.js';
 
+type OptionSubcommand = ApplicationCommandOptionType.Subcommand | 'Subcommand';
+type OptionSubcommandGroup = ApplicationCommandOptionType.SubcommandGroup | 'SubcommandGroup';
+type OptionString = ApplicationCommandOptionType.String | 'String';
+type OptionInteger = ApplicationCommandOptionType.Integer | 'Integer';
+type OptionBoolean = ApplicationCommandOptionType.Boolean | 'Boolean';
+type OptionUser = ApplicationCommandOptionType.User | 'User';
+type OptionChannel = ApplicationCommandOptionType.Channel | 'Channel';
+type OptionRole = ApplicationCommandOptionType.Role | 'Role';
+type OptionMentionable = ApplicationCommandOptionType.Mentionable | 'Mentionable';
+type OptionNumber = ApplicationCommandOptionType.Number | 'Number';
+type OptionAttachment = ApplicationCommandOptionType.Attachment | 'Attachment';
+
+interface ApplicationCommandSubGroup extends Omit<BaseApplicationCommandOptionsData, 'required'> {
+    type: OptionSubcommandGroup;
+    options?: ApplicationCommandSubCommand[];
+}
+
+type CommandOptionChoiceResolvableType = OptionString | CommandOptionNumericResolvableType;
+type CommandOptionSubOptionResolvableType = OptionSubcommand | OptionSubcommandGroup;
+type CommandOptionNumericResolvableType = OptionNumber | OptionInteger;
+
+type CommandOptionNonChoiceResolvableType = Exclude<
+    ApplicationCommandOptionType,
+    CommandOptionChoiceResolvableType | CommandOptionSubOptionResolvableType | OptionChannel
+>;
+
+interface ApplicationCommandNonOptions extends BaseApplicationCommandOptionsData {
+    type: Exclude<CommandOptionNonChoiceResolvableType, ApplicationCommandOptionType>;
+}
+
+interface ApplicationCommandChannelOption extends BaseApplicationCommandOptionsData {
+    type: OptionChannel;
+    channelTypes?: ChannelType[];
+}
+
+interface ApplicationCommandChoicesOption
+    extends Omit<BaseApplicationCommandOptionsData, 'autocomplete'> {
+    type: CommandOptionChoiceResolvableType;
+    choices?: ApplicationCommandOptionChoiceData[];
+    autocomplete?: false;
+}
+
+interface ApplicationCommandChoicesOption
+    extends Omit<BaseApplicationCommandOptionsData, 'autocomplete'> {
+    type: CommandOptionChoiceResolvableType;
+    choices?: ApplicationCommandOptionChoiceData[];
+    autocomplete?: false;
+}
+
+interface ApplicationCommandStringOption extends ApplicationCommandChoicesOption {
+    type: OptionString;
+    minLength?: number;
+    maxLength?: number;
+}
+
+interface ApplicationCommandAttachmentOption extends BaseApplicationCommandOptionsData {
+    type: OptionAttachment;
+}
+
+interface ApplicationCommandSubCommand extends Omit<BaseApplicationCommandOptionsData, 'required'> {
+    type: OptionSubcommand;
+    options?: (
+        | ApplicationCommandChoicesOption
+        | ApplicationCommandNonOptions
+        | ApplicationCommandChannelOption
+    )[];
+}
+
+interface ApplicationCommandNumericOption extends ApplicationCommandChoicesOption {
+    type: CommandOptionNumericResolvableType;
+    minValue?: number;
+    maxValue?: number;
+}
+
+interface ApplicationCommandRoleOption extends BaseApplicationCommandOptionsData {
+    type: OptionRole;
+}
+
+interface ApplicationCommandUserOption extends BaseApplicationCommandOptionsData {
+    type: OptionUser;
+}
+
+interface ApplicationCommandMentionableOption extends BaseApplicationCommandOptionsData {
+    type: OptionMentionable;
+}
+
+interface ApplicationCommandBooleanOption extends BaseApplicationCommandOptionsData {
+    type: OptionBoolean;
+}
+
 // Patch discord.js' ApplicationCommandOption to reallow the string instead of the enum
 export type JellyApplicationCommandOption =
-    | PatchOption<ApplicationCommandSubGroup>
-    | PatchOption<ApplicationCommandNonOptions>
-    | PatchOption<ApplicationCommandChannelOption>
-    | PatchOption<ApplicationCommandChoicesOption>
-    | PatchOption<ApplicationCommandNumericOption>
-    | PatchOption<ApplicationCommandStringOption>
-    | PatchOption<ApplicationCommandAttachmentOption>
-    | PatchOption<ApplicationCommandSubCommand>;
-
-interface ReverseApplicationCommandOptionType {
-    1: 'Subcommand';
-    2: 'SubcommandGroup';
-    3: 'String';
-    4: 'Integer';
-    5: 'Boolean';
-    6: 'User';
-    7: 'Channel';
-    8: 'Role';
-    9: 'Mentionable';
-    10: 'Number';
-    11: 'Attachment';
-}
-
-type PatchOption<T extends ApplicationCommandOption> = Omit<T, 'type'> & {
-    type: T['type'] | ReverseApplicationCommandOptionType[T['type']];
-};
+    | ApplicationCommandSubGroup
+    | ApplicationCommandNonOptions
+    | ApplicationCommandChannelOption
+    | ApplicationCommandChoicesOption
+    | ApplicationCommandNumericOption
+    | ApplicationCommandStringOption
+    | ApplicationCommandRoleOption
+    | ApplicationCommandUserOption
+    | ApplicationCommandMentionableOption
+    | ApplicationCommandBooleanOption
+    | ApplicationCommandAttachmentOption
+    | ApplicationCommandSubCommand;