seyfert 2.1.1-dev-11310514874.0 → 2.1.1-dev-11317878487.0

package/lib/commands/applications/chat.d.ts

@@ -1,12 +1,11 @@
-import type { PermissionStrings, SeyfertNumberOption, SeyfertStringOption } from '../..';
+import type { PermissionStrings, SeyfertBaseChoiceableOption, SeyfertBasicOption, SeyfertChoice, SeyfertNumberOption, SeyfertStringOption } from '../..';
 import type { Attachment } from '../../builders';
 import type { GuildRoleStructure, InteractionGuildMemberStructure, UserStructure } from '../../client/transformers';
-import { type Awaitable, type FlatObjectKeys } from '../../common';
 import type { AllChannels, AutocompleteInteraction } from '../../structures';
 import { type APIApplicationCommandBasicOption, type APIApplicationCommandOption, ApplicationCommandOptionType, ApplicationCommandType, type ApplicationIntegrationType, type InteractionContextType, type LocaleString } from '../../types';
 import type { Groups, RegisteredMiddlewares } from '../decorators';
 import type { CommandContext } from './chatcontext';
-import type { DefaultLocale, ExtraProps, IgnoreCommand, OKFunction, OnOptionsReturnObject, StopFunction, UsingClient } from './shared';
+import type { ExtraProps, IgnoreCommand, OnOptionsReturnObject, UsingClient } from './shared';
 export interface ReturnOptionsTypes {
     1: never;
     2: never;
@@ -20,49 +19,33 @@ export interface ReturnOptionsTypes {
     10: number;
     11: Attachment;
 }
-type Wrap<N extends ApplicationCommandOptionType> = N extends ApplicationCommandOptionType.Subcommand | ApplicationCommandOptionType.SubcommandGroup ? never : {
-    required?: boolean;
-    value?(data: {
-        context: CommandContext;
-        value: ReturnOptionsTypes[N];
-    }, ok: OKFunction<any>, fail: StopFunction): Awaitable<void>;
-} & {
-    description: string;
-    description_localizations?: APIApplicationCommandBasicOption['description_localizations'];
-    name_localizations?: APIApplicationCommandBasicOption['name_localizations'];
-    locales?: {
-        name?: FlatObjectKeys<DefaultLocale>;
-        description?: FlatObjectKeys<DefaultLocale>;
-    };
-};
-export type __TypeWrapper<T extends ApplicationCommandOptionType> = Wrap<T>;
-export type __TypesWrapper = {
-    [P in keyof typeof ApplicationCommandOptionType]: `${(typeof ApplicationCommandOptionType)[P]}` extends `${infer D extends number}` ? Wrap<D> : never;
-};
 export type AutocompleteCallback = (interaction: AutocompleteInteraction) => any;
 export type OnAutocompleteErrorCallback = (interaction: AutocompleteInteraction, error: unknown) => any;
-export type CommandBaseOption = __TypesWrapper[keyof __TypesWrapper];
-export type CommandBaseAutocompleteOption = __TypesWrapper[keyof __TypesWrapper] & {
+export type CommandBaseOption = SeyfertBaseChoiceableOption<ApplicationCommandOptionType> | SeyfertBasicOption<ApplicationCommandOptionType>;
+export type CommandBaseAutocompleteOption = (SeyfertBasicOption<ApplicationCommandOptionType> | SeyfertBaseChoiceableOption<ApplicationCommandOptionType>) & {
     autocomplete: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
 };
 export type CommandAutocompleteOption = CommandBaseAutocompleteOption & {
     name: string;
 };
-export type __CommandOption = CommandBaseOption;
-export type CommandOption = __CommandOption & {
+export type CommandOptionWithoutName = CommandBaseOption;
+export type CommandOption = CommandOptionWithoutName & {
     name: string;
 };
-export type OptionsRecord = Record<string, __CommandOption & {
+export type OptionsRecord = Record<string, CommandOptionWithoutName & {
     type: ApplicationCommandOptionType;
 }>;
 type KeysWithoutRequired<T extends OptionsRecord> = {
-    [K in keyof T]-?: T[K]['required'] extends true ? never : K;
+    [K in keyof T]-?: NonNullable<T[K]['required']> extends true ? never : K;
 }[keyof T];
+type ContextOptionsAuxInternal<T extends CommandBaseOption & {
+    type: ApplicationCommandOptionType;
+}> = T['value'] extends (...args: any) => any ? Parameters<Parameters<T['value']>[1]>[0] : NonNullable<T['value']> extends (...args: any) => any ? Parameters<Parameters<NonNullable<T['value']>>[1]>[0] extends never ? T extends SeyfertStringOption | SeyfertNumberOption ? NonNullable<T['choices']> extends SeyfertChoice<string | number>[] ? NonNullable<T['choices']>[number]['value'] : ReturnOptionsTypes[T['type']] : ReturnOptionsTypes[T['type']] : Parameters<Parameters<NonNullable<T['value']>>[1]>[0] : T extends SeyfertStringOption | SeyfertNumberOption ? NonNullable<T['choices']> extends SeyfertChoice<string | number>[] ? NonNullable<T['choices']>[number]['value'] : ReturnOptionsTypes[T['type']] : ReturnOptionsTypes[T['type']];
 type ContextOptionsAux<T extends OptionsRecord> = {
-    [K in Exclude<keyof T, KeysWithoutRequired<T>>]: T[K]['value'] extends (...args: any) => any ? Parameters<Parameters<T[K]['value']>[1]>[0] : T[K] extends SeyfertStringOption | SeyfertNumberOption ? T[K]['choices'] extends NonNullable<SeyfertStringOption['choices'] | SeyfertNumberOption['choices']> ? T[K]['choices'][number]['value'] : ReturnOptionsTypes[T[K]['type']] : ReturnOptionsTypes[T[K]['type']];
+    [K in Exclude<keyof T, KeysWithoutRequired<T>>]: ContextOptionsAuxInternal<T[K]>;
 } & {
-    [K in KeysWithoutRequired<T>]?: T[K]['value'] extends (...args: any) => any ? Parameters<Parameters<T[K]['value']>[1]>[0] : T[K] extends SeyfertStringOption | SeyfertNumberOption ? T[K]['choices'] extends NonNullable<SeyfertStringOption['choices'] | SeyfertNumberOption['choices']> ? T[K]['choices'][number]['value'] : ReturnOptionsTypes[T[K]['type']] : ReturnOptionsTypes[T[K]['type']];
+    [K in KeysWithoutRequired<T>]?: ContextOptionsAuxInternal<T[K]>;
 };
 export type ContextOptions<T extends OptionsRecord> = ContextOptionsAux<T>;
 export declare class BaseCommand {

package/lib/commands/applications/options.d.ts

@@ -1,68 +1,144 @@
-import type { AutocompleteCallback, EntryPointContext, MenuCommandContext, OnAutocompleteErrorCallback, ReturnOptionsTypes, __TypesWrapper } from '..';
+import type { AutocompleteCallback, EntryPointContext, MenuCommandContext, OnAutocompleteErrorCallback, ReturnOptionsTypes } from '..';
+import type { Awaitable, FlatObjectKeys } from '../../common';
 import type { ModalContext } from '../../components';
 import type { ComponentContext } from '../../components/componentcontext';
 import type { MessageCommandInteraction, UserCommandInteraction } from '../../structures';
-import { type APIApplicationCommandOptionChoice, ApplicationCommandOptionType, type ChannelType } from '../../types';
+import { type APIApplicationCommandBasicOption, type APIApplicationCommandOptionChoice, ApplicationCommandOptionType, type ChannelType } from '../../types';
 import type { CommandContext } from './chatcontext';
-import type { MiddlewareContext } from './shared';
-export type SeyfertBasicOption<T extends keyof __TypesWrapper, D = object> = __TypesWrapper[T] & D;
-export type SeyfertStringOption = SeyfertBasicOption<'String'> & {
+import type { DefaultLocale, MiddlewareContext, OKFunction, StopFunction } from './shared';
+export interface SeyfertBasicOption<T extends keyof ReturnOptionsTypes, R = true | false> {
+    required?: R;
+    value?(data: {
+        context: CommandContext;
+        value: ReturnOptionsTypes[T];
+    }, ok: OKFunction<any>, fail: StopFunction): Awaitable<void>;
+    description: string;
+    description_localizations?: APIApplicationCommandBasicOption['description_localizations'];
+    name_localizations?: APIApplicationCommandBasicOption['name_localizations'];
+    locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+}
+export interface SeyfertBaseChoiceableOption<T extends keyof ReturnOptionsTypes, C = T extends ChoiceableTypes ? SeyfertChoice<ChoiceableValues[T]>[] : never, R = true | false, VC = never> {
+    required?: R;
+    choices?: C;
+    value?: ValueCallback<T, C, VC>;
+    description: string;
+    description_localizations?: APIApplicationCommandBasicOption['description_localizations'];
+    name_localizations?: APIApplicationCommandBasicOption['name_localizations'];
+    locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+}
+export type SeyfertChoice<T extends string | number> = {
+    readonly name: string;
+    readonly value: T;
+} | APIApplicationCommandOptionChoice<T>;
+export type ChoiceableTypes = ApplicationCommandOptionType.String | ApplicationCommandOptionType.Integer | ApplicationCommandOptionType.Number;
+export interface ChoiceableValues {
+    [ApplicationCommandOptionType.String]: string;
+    [ApplicationCommandOptionType.Number]: number;
+    [ApplicationCommandOptionType.Integer]: number;
+}
+export type ValueCallback<T extends keyof ReturnOptionsTypes, C = T extends ChoiceableTypes ? SeyfertChoice<ChoiceableValues[T]>[] : never, I = any> = (data: {
+    context: CommandContext;
+    value: T extends ChoiceableTypes ? C extends SeyfertChoice<ChoiceableValues[T]>[] ? C[number]['value'] extends ReturnOptionsTypes[T] ? C[number]['value'] : ReturnOptionsTypes[T] : ReturnOptionsTypes[T] : ReturnOptionsTypes[T];
+}, ok: OKFunction<I>, fail: StopFunction) => Awaitable<void>;
+export type SeyfertStringOption<T = SeyfertChoice<string>[], R = boolean, VC = never> = SeyfertBaseChoiceableOption<ApplicationCommandOptionType.String, T, R, VC> & {
     autocomplete?: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
-    choices?: readonly {
-        readonly name: string;
-        readonly value: string;
-    }[] | APIApplicationCommandOptionChoice<ReturnOptionsTypes[ApplicationCommandOptionType.String]>[];
     min_length?: number;
     max_length?: number;
 };
-export type SeyfertIntegerOption = SeyfertBasicOption<'Integer'> & {
+export type SeyfertIntegerOption<T = SeyfertChoice<number>[], R = boolean, VC = never> = SeyfertBaseChoiceableOption<ApplicationCommandOptionType.Integer, T, R, VC> & {
     autocomplete?: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
-    choices?: APIApplicationCommandOptionChoice<ReturnOptionsTypes[ApplicationCommandOptionType.Integer]>[];
     min_value?: number;
     max_value?: number;
 };
-export type SeyfertBooleanOption = SeyfertBasicOption<'Boolean'>;
-export type SeyfertUserOption = SeyfertBasicOption<'User'>;
-export type SeyfertChannelOption = SeyfertBasicOption<'Channel'> & {
-    channel_types?: ChannelType[];
-};
-export type SeyfertRoleOption = SeyfertBasicOption<'Role'>;
-export type SeyfertMentionableOption = SeyfertBasicOption<'Mentionable'>;
-export type SeyfertNumberOption = SeyfertBasicOption<'Number'> & {
+export type SeyfertNumberOption<T = SeyfertChoice<number>[], R = boolean, VC = never> = SeyfertBaseChoiceableOption<ApplicationCommandOptionType.Number, T, R, VC> & {
     autocomplete?: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
-    choices?: APIApplicationCommandOptionChoice<ReturnOptionsTypes[ApplicationCommandOptionType.Number]>[];
     min_value?: number;
     max_value?: number;
 };
-export type SeyfertAttachmentOption = SeyfertBasicOption<'Attachment'>;
-export declare function createStringOption<T extends SeyfertStringOption = SeyfertStringOption>(data: T): T & {
+export type SeyfertBooleanOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Boolean, R>;
+export type SeyfertUserOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.User, R>;
+export type SeyfertChannelOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Channel, R> & {
+    channel_types?: ChannelType[];
+};
+export type SeyfertRoleOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Role, R>;
+export type SeyfertMentionableOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Mentionable, R>;
+export type SeyfertAttachmentOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Attachment, R>;
+export declare function createStringOption<R extends boolean, C extends SeyfertChoice<string>[] = SeyfertChoice<string>[], VC = never>(data: SeyfertStringOption<C, R, VC>): {
     readonly type: ApplicationCommandOptionType.String;
+    readonly required?: R | undefined;
+    readonly choices?: C | undefined;
+    readonly value?: ValueCallback<ApplicationCommandOptionType.String, C, VC> | undefined;
+    readonly description: string;
+    readonly description_localizations?: APIApplicationCommandBasicOption["description_localizations"];
+    readonly name_localizations?: APIApplicationCommandBasicOption["name_localizations"];
+    readonly locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+    readonly autocomplete?: AutocompleteCallback;
+    readonly onAutocompleteError?: OnAutocompleteErrorCallback;
+    readonly min_length?: number;
+    readonly max_length?: number;
 };
-export declare function createIntegerOption<T extends SeyfertIntegerOption = SeyfertIntegerOption>(data: T): T & {
+export declare function createIntegerOption<R extends boolean, C extends SeyfertChoice<number>[] = SeyfertChoice<number>[], VC = never>(data: SeyfertIntegerOption<C, R, VC>): {
     readonly type: ApplicationCommandOptionType.Integer;
+    readonly required?: R | undefined;
+    readonly choices?: C | undefined;
+    readonly value?: ValueCallback<ApplicationCommandOptionType.Integer, C, VC> | undefined;
+    readonly description: string;
+    readonly description_localizations?: APIApplicationCommandBasicOption["description_localizations"];
+    readonly name_localizations?: APIApplicationCommandBasicOption["name_localizations"];
+    readonly locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+    readonly autocomplete?: AutocompleteCallback;
+    readonly onAutocompleteError?: OnAutocompleteErrorCallback;
+    readonly min_value?: number;
+    readonly max_value?: number;
 };
-export declare function createBooleanOption<T extends SeyfertBooleanOption = SeyfertBooleanOption>(data: T): T & {
+export declare function createNumberOption<R extends boolean, C extends SeyfertChoice<number>[] = SeyfertChoice<number>[], VC = never>(data: SeyfertNumberOption<C, R, VC>): {
+    readonly type: ApplicationCommandOptionType.Number;
+    readonly required?: R | undefined;
+    readonly choices?: C | undefined;
+    readonly value?: ValueCallback<ApplicationCommandOptionType.Number, C, VC> | undefined;
+    readonly description: string;
+    readonly description_localizations?: APIApplicationCommandBasicOption["description_localizations"];
+    readonly name_localizations?: APIApplicationCommandBasicOption["name_localizations"];
+    readonly locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+    readonly autocomplete?: AutocompleteCallback;
+    readonly onAutocompleteError?: OnAutocompleteErrorCallback;
+    readonly min_value?: number;
+    readonly max_value?: number;
+};
+export declare function createBooleanOption<R extends boolean, T extends SeyfertBooleanOption<R> = SeyfertBooleanOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Boolean;
 };
-export declare function createUserOption<T extends SeyfertUserOption = SeyfertUserOption>(data: T): T & {
+export declare function createUserOption<R extends boolean, T extends SeyfertUserOption<R> = SeyfertUserOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.User;
 };
-export declare function createChannelOption<T extends SeyfertChannelOption = SeyfertChannelOption>(data: T): T & {
+export declare function createChannelOption<R extends boolean, T extends SeyfertChannelOption<R> = SeyfertChannelOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Channel;
 };
-export declare function createRoleOption<T extends SeyfertRoleOption = SeyfertRoleOption>(data: T): T & {
+export declare function createRoleOption<R extends boolean, T extends SeyfertRoleOption<R> = SeyfertRoleOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Role;
 };
-export declare function createMentionableOption<T extends SeyfertMentionableOption = SeyfertMentionableOption>(data: T): T & {
+export declare function createMentionableOption<R extends boolean, T extends SeyfertMentionableOption<R> = SeyfertMentionableOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Mentionable;
 };
-export declare function createNumberOption<T extends SeyfertNumberOption = SeyfertNumberOption>(data: T): T & {
-    readonly type: ApplicationCommandOptionType.Number;
-};
-export declare function createAttachmentOption<T extends SeyfertAttachmentOption = SeyfertAttachmentOption>(data: T): T & {
+export declare function createAttachmentOption<R extends boolean, T extends SeyfertAttachmentOption<R> = SeyfertAttachmentOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Attachment;
 };
 export type AnyContext = CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>> | ComponentContext | ModalContext | EntryPointContext;

package/lib/commands/applications/options.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStringOption = createStringOption;
 exports.createIntegerOption = createIntegerOption;
+exports.createNumberOption = createNumberOption;
 exports.createBooleanOption = createBooleanOption;
 exports.createUserOption = createUserOption;
 exports.createChannelOption = createChannelOption;
 exports.createRoleOption = createRoleOption;
 exports.createMentionableOption = createMentionableOption;
-exports.createNumberOption = createNumberOption;
 exports.createAttachmentOption = createAttachmentOption;
 exports.createMiddleware = createMiddleware;
 const types_1 = require("../../types");
@@ -17,6 +17,9 @@ function createStringOption(data) {
 function createIntegerOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Integer };
 }
+function createNumberOption(data) {
+    return { ...data, type: types_1.ApplicationCommandOptionType.Number };
+}
 function createBooleanOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Boolean };
 }
@@ -32,9 +35,6 @@ function createRoleOption(data) {
 function createMentionableOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Mentionable };
 }
-function createNumberOption(data) {
-    return { ...data, type: types_1.ApplicationCommandOptionType.Number };
-}
 function createAttachmentOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Attachment };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11310514874.0",
+	"version": "2.1.1-dev-11317878487.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",