seyfert 2.1.1-dev-11464165753.0 → 2.1.1-dev-11520718826.0

package/lib/client/base.d.ts

@@ -1,7 +1,7 @@
 import { ApiHandler } from '../api';
 import type { Adapter } from '../cache';
 import { Cache } from '../cache';
-import type { Command, CommandContext, ContextMenuCommand, ExtraProps, MenuCommandContext, RegisteredMiddlewares, SubCommand, UsingClient } from '../commands';
+import type { Command, CommandContext, ContextMenuCommand, ExtendedRC, ExtendedRCLocations, ExtraProps, MenuCommandContext, RegisteredMiddlewares, SubCommand, UsingClient } from '../commands';
 import { type InferWithPrefix, type MiddlewareContext } from '../commands/applications/shared';
 import { CommandHandler } from '../commands/handler';
 import { ApplicationShorter, ChannelShorter, EmojiShorter, GuildShorter, InteractionShorter, Logger, type MakeRequired, MemberShorter, MessageShorter, ReactionShorter, RoleShorter, TemplateShorter, ThreadShorter, UsersShorter, WebhookShorter } from '../common';
@@ -68,13 +68,7 @@ export declare class BaseClient {
     getRC<T extends InternalRuntimeConfigHTTP | InternalRuntimeConfig = InternalRuntimeConfigHTTP | InternalRuntimeConfig>(): Promise<{
         debug: boolean;
     } & Omit<T, "debug" | "locations"> & {
-        templates: string | undefined;
-        langs: string | undefined;
-        events: string | undefined;
-        components: string | undefined;
-        commands: string | undefined;
-        base: string;
-        output: string;
+        locations: MakeRequired<Partial<Record<"components" | "events" | "base" | "output" | "commands" | "langs" | "templates", string>>, "base" | "output">;
     }>;
 }
 export interface BaseClientOptions {
@@ -127,7 +121,7 @@ export interface StartOptions {
     };
     token: string;
 }
-interface RC extends Variables {
+interface RC extends ExtendedRC {
     debug?: boolean;
     locations: {
         base: string;
@@ -137,9 +131,7 @@ interface RC extends Variables {
         templates?: string;
         events?: string;
         components?: string;
-    };
-}
-export interface Variables {
+    } & ExtendedRCLocations;
     token: string;
     intents?: number;
     applicationId?: string;

package/lib/client/base.js

@@ -260,21 +260,21 @@ class BaseClient {
             await this.syncCachePath(cachePath);
     }
     async loadCommands(dir) {
-        dir ??= await this.getRC().then(x => x.commands);
+        dir ??= await this.getRC().then(x => x.locations.commands);
         if (dir && this.commands) {
             await this.commands.load(dir, this);
             this.logger.info('CommandHandler loaded');
         }
     }
     async loadComponents(dir) {
-        dir ??= await this.getRC().then(x => x.components);
+        dir ??= await this.getRC().then(x => x.locations.components);
         if (dir && this.components) {
             await this.components.load(dir);
             this.logger.info('ComponentHandler loaded');
         }
     }
     async loadLangs(dir) {
-        dir ??= await this.getRC().then(x => x.langs);
+        dir ??= await this.getRC().then(x => x.locations.langs);
         if (dir && this.langs) {
             await this.langs.load(dir);
             this.logger.info('LangsHandler loaded');
@@ -293,16 +293,21 @@ class BaseClient {
                 throw e.errors.find((err) => !err.stack?.includes('ERR_MODULE_NOT_FOUND')) ?? e.errors[0];
             })));
         const { locations, debug, ...env } = seyfertConfig;
+        const locationsFullPaths = {
+            base: locations.base,
+            output: locations.output,
+        };
+        for (const i in locations) {
+            const key = i;
+            const location = locations[i];
+            if (!location || locationsFullPaths[key])
+                continue;
+            locationsFullPaths[key] = (0, node_path_1.join)(process.cwd(), locations.output, location);
+        }
         const obj = {
             debug: !!debug,
             ...env,
-            templates: locations.templates ? (0, node_path_1.join)(process.cwd(), locations.base, locations.templates) : undefined,
-            langs: locations.langs ? (0, node_path_1.join)(process.cwd(), locations.output, locations.langs) : undefined,
-            events: 'events' in locations && locations.events ? (0, node_path_1.join)(process.cwd(), locations.output, locations.events) : undefined,
-            components: locations.components ? (0, node_path_1.join)(process.cwd(), locations.output, locations.components) : undefined,
-            commands: locations.commands ? (0, node_path_1.join)(process.cwd(), locations.output, locations.commands) : undefined,
-            base: (0, node_path_1.join)(process.cwd(), locations.base),
-            output: (0, node_path_1.join)(process.cwd(), locations.output),
+            locations: locationsFullPaths,
         };
         return obj;
     }

package/lib/client/client.js

@@ -34,7 +34,7 @@ class Client extends base_1.BaseClient {
         }
     }
     async loadEvents(dir) {
-        dir ??= await this.getRC().then(x => x.events);
+        dir ??= await this.getRC().then(x => ('events' in x.locations ? x.locations.events : undefined));
         if (dir && this.events) {
             await this.events.load(dir);
             this.logger.info('EventHandler loaded');

package/lib/client/workerclient.js

@@ -129,7 +129,7 @@ class WorkerClient extends base_1.BaseClient {
         this.cache.intents = workerData.intents;
     }
     async loadEvents(dir) {
-        dir ??= await this.getRC().then(x => x.events);
+        dir ??= await this.getRC().then(x => ('events' in x.locations ? x.locations.events : undefined));
         if (dir && this.events) {
             await this.events.load(dir);
             this.logger.info('EventHandler loaded');
@@ -503,7 +503,7 @@ class WorkerClient extends base_1.BaseClient {
                                 });
                                 await this.events?.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
                             }
-                            if (!this.__handleGuilds.length) {
+                            if (!this.__handleGuilds?.length) {
                                 if ([...this.shards.values()].every(shard => shard.data.session_id)) {
                                     this.postMessage({
                                         type: 'WORKER_READY',

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

@@ -4,6 +4,7 @@ import type { ModalContext } from '../../components';
 import type { ComponentContext } from '../../components/componentcontext';
 import type { MessageCommandInteraction, UserCommandInteraction } from '../../structures';
 import { type APIApplicationCommandBasicOption, type APIApplicationCommandOptionChoice, ApplicationCommandOptionType, type ChannelType } from '../../types';
+import type { LocalizationMap } from '../../types/payloads';
 import type { CommandContext } from './chatcontext';
 import type { DefaultLocale, MiddlewareContext, OKFunction, StopFunction } from './shared';
 export interface SeyfertBasicOption<T extends keyof ReturnOptionsTypes, R = true | false> {
@@ -35,7 +36,11 @@ export interface SeyfertBaseChoiceableOption<T extends keyof ReturnOptionsTypes,
 export type SeyfertChoice<T extends string | number> = {
     readonly name: string;
     readonly value: T;
-} | APIApplicationCommandOptionChoice<T>;
+    name_localizations?: LocalizationMap | null;
+    locales?: FlatObjectKeys<DefaultLocale>;
+} | (APIApplicationCommandOptionChoice<T> & {
+    locales?: FlatObjectKeys<DefaultLocale>;
+});
 export type ChoiceableTypes = ApplicationCommandOptionType.String | ApplicationCommandOptionType.Integer | ApplicationCommandOptionType.Number;
 export interface ChoiceableValues {
     [ApplicationCommandOptionType.String]: string;

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

@@ -19,6 +19,10 @@ export interface ExtraProps {
 }
 export interface UsingClient extends BaseClient {
 }
+export interface ExtendedRC {
+}
+export interface ExtendedRCLocations {
+}
 export type ParseClient<T extends BaseClient> = T;
 export type ParseGlobalMiddlewares<T extends Record<string, MiddlewareContext>> = {
     [K in keyof T]: MetadataMiddleware<T[K]>;

package/lib/commands/handler.d.ts

@@ -1,5 +1,5 @@
 import type { EntryPointCommand } from '.';
-import type { Logger, MakeRequired, NulleableCoalising, OmitInsert } from '../common';
+import type { Logger, NulleableCoalising, OmitInsert } from '../common';
 import { BaseHandler } from '../common';
 import { type APIApplicationCommandOption, type LocalizationMap } from '../types';
 import { Command, type CommandOption, SubCommand } from './applications/chat';
@@ -15,13 +15,14 @@ export declare class CommandHandler extends BaseHandler {
     reload(resolve: string | Command): Promise<void>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
     protected shouldUploadLocales(locales?: LocalizationMap | null, cachedLocales?: LocalizationMap | null): boolean;
+    protected shoudUploadChoices(option: APIApplicationCommandOption, cached: APIApplicationCommandOption): boolean;
     protected shouldUploadOption(option: APIApplicationCommandOption, cached: APIApplicationCommandOption): boolean;
     shouldUpload(file: string, guildId?: string): Promise<boolean>;
     set(commands: SeteableCommand[]): void;
     load(commandsDir: string, client: UsingClient): Promise<(Command | ContextMenuCommand)[]>;
     parseLocales(command: InstanceType<HandleableCommand>): Command | ContextMenuCommand | SubCommand | EntryPointCommand;
     parseGlobalLocales(command: InstanceType<HandleableCommand>): void;
-    parseCommandOptionLocales(option: MakeRequired<CommandOption, 'locales'>): void;
+    parseCommandOptionLocales(option: CommandOption): void;
     parseCommandLocales(command: Command): void;
     parseContextMenuLocales(command: ContextMenuCommand): ContextMenuCommand;
     parseSubCommandLocales(command: SubCommand): SubCommand;

package/lib/commands/handler.js

@@ -47,21 +47,35 @@ class CommandHandler extends common_1.BaseHandler {
             return true;
         if (locales && !cachedLocales)
             return true;
-        if (locales && cachedLocales) {
-            const localesEntries = Object.entries(locales);
-            const cachedLocalesEntries = Object.entries(cachedLocales);
-            if (localesEntries.length !== cachedLocalesEntries.length)
+        if (!(locales && cachedLocales))
+            return true;
+        const localesEntries = Object.entries(locales);
+        const cachedLocalesEntries = Object.entries(cachedLocales);
+        if (localesEntries.length !== cachedLocalesEntries.length)
+            return true;
+        for (const [key, value] of localesEntries) {
+            const cached = cachedLocalesEntries.find(x => x[0] === key);
+            if (!cached)
+                return true;
+            if (value !== cached[1])
                 return true;
-            for (const [key, value] of localesEntries) {
-                const cached = cachedLocalesEntries.find(x => x[0] === key);
-                if (!cached)
-                    return true;
-                if (value !== cached[1])
-                    return true;
-            }
         }
         return false;
     }
+    shoudUploadChoices(option, cached) {
+        const optionChoiceable = option;
+        const cachedChoiceable = cached;
+        if (!(optionChoiceable.choices?.length && cachedChoiceable.choices?.length))
+            return false;
+        if (optionChoiceable.choices.length !== cachedChoiceable.choices.length)
+            return true;
+        return !optionChoiceable.choices.every((choice, index) => {
+            const cachedChoice = cachedChoiceable.choices[index];
+            return (choice.name === cachedChoice.name &&
+                choice.value === cachedChoice.value &&
+                !this.shouldUploadLocales(choice.name_localizations, cachedChoice.name_localizations));
+        });
+    }
     shouldUploadOption(option, cached) {
         if (option.description !== cached.description)
             return true;
@@ -79,7 +93,9 @@ class CommandHandler extends common_1.BaseHandler {
         switch (option.type) {
             case types_1.ApplicationCommandOptionType.String:
                 return (option.min_length !== cached.min_length ||
-                    option.max_length !== cached.max_length);
+                    option.max_length !== cached.max_length ||
+                    !!option.autocomplete !== !!cached.autocomplete ||
+                    this.shoudUploadChoices(option, cached));
             case types_1.ApplicationCommandOptionType.Channel:
                 {
                     if (option.channel_types?.length !== cached.channel_types?.length)
@@ -113,7 +129,9 @@ class CommandHandler extends common_1.BaseHandler {
             case types_1.ApplicationCommandOptionType.Integer:
             case types_1.ApplicationCommandOptionType.Number:
                 return (option.min_value !== cached.min_value ||
-                    option.max_value !== cached.max_value);
+                    option.max_value !== cached.max_value ||
+                    !!option.autocomplete !== !!cached.autocomplete ||
+                    this.shoudUploadChoices(option, cached));
             case types_1.ApplicationCommandOptionType.Attachment:
             case types_1.ApplicationCommandOptionType.Boolean:
             case types_1.ApplicationCommandOptionType.Mentionable:
@@ -272,7 +290,7 @@ class CommandHandler extends common_1.BaseHandler {
                                 }
                                 for (const fileSubCommand of fileSubCommands) {
                                     const subCommand = this.onSubCommand(fileSubCommand);
-                                    if (subCommand && subCommand instanceof chat_1.SubCommand) {
+                                    if (subCommand instanceof chat_1.SubCommand) {
                                         subCommand.__filePath = option;
                                         commandInstance.options.push(subCommand);
                                     }
@@ -308,16 +326,14 @@ class CommandHandler extends common_1.BaseHandler {
             this.parseContextMenuLocales(command);
             return command;
         }
-        if (command instanceof chat_1.Command && command.__tGroups) {
+        if (command instanceof chat_1.Command) {
             this.parseCommandLocales(command);
             for (const option of command.options ?? []) {
                 if (option instanceof chat_1.SubCommand) {
                     this.parseSubCommandLocales(option);
                     continue;
                 }
-                // @ts-expect-error
-                if (option.locales)
-                    this.parseCommandOptionLocales(option);
+                this.parseCommandOptionLocales(option);
             }
         }
         if (command instanceof chat_1.SubCommand) {
@@ -327,8 +343,8 @@ class CommandHandler extends common_1.BaseHandler {
     }
     parseGlobalLocales(command) {
         if (command.__t) {
-            command.name_localizations = {};
-            command.description_localizations = {};
+            command.name_localizations ??= {};
+            command.description_localizations ??= {};
             for (const locale of Object.keys(this.client.langs.values)) {
                 const locales = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
                 if (Object.values(types_1.Locale).includes(locale))
@@ -351,30 +367,42 @@ class CommandHandler extends common_1.BaseHandler {
         }
     }
     parseCommandOptionLocales(option) {
-        option.name_localizations = {};
-        option.description_localizations = {};
+        option.name_localizations ??= {};
+        option.description_localizations ??= {};
         for (const locale of Object.keys(this.client.langs.values)) {
             const locales = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
             if (Object.values(types_1.Locale).includes(locale))
                 locales.push(locale);
-            if (option.locales.name) {
+            if (option.locales?.name) {
                 for (const i of locales) {
                     const valueName = this.client.langs.getKey(locale, option.locales.name);
                     if (valueName)
                         option.name_localizations[i] = valueName;
                 }
             }
-            if (option.locales.description) {
+            if (option.locales?.description) {
                 for (const i of locales) {
                     const valueKey = this.client.langs.getKey(locale, option.locales.description);
                     if (valueKey)
                         option.description_localizations[i] = valueKey;
                 }
             }
+            if ('choices' in option && option.choices?.length) {
+                for (const c of option.choices) {
+                    c.name_localizations ??= {};
+                    if (!c.locales)
+                        continue;
+                    for (const i of locales) {
+                        const valueKey = this.client.langs.getKey(locale, c.locales);
+                        if (valueKey)
+                            c.name_localizations[i] = valueKey;
+                    }
+                }
+            }
         }
     }
     parseCommandLocales(command) {
-        command.groups = {};
+        command.groups ??= {};
         for (const locale of Object.keys(this.client.langs.values)) {
             const locales = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
             if (Object.values(types_1.Locale).includes(locale))
@@ -409,9 +437,7 @@ class CommandHandler extends common_1.BaseHandler {
     }
     parseSubCommandLocales(command) {
         for (const i of command.options ?? []) {
-            // @ts-expect-error
-            if (i.locales)
-                this.parseCommandOptionLocales(i);
+            this.parseCommandOptionLocales(i);
         }
         return command;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11464165753.0",
+	"version": "2.1.1-dev-11520718826.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -24,7 +24,7 @@
 		"@biomejs/biome": "1.9.4",
 		"@commitlint/cli": "^19.5.0",
 		"@commitlint/config-conventional": "^19.5.0",
-		"@types/node": "^22.7.7",
+		"@types/node": "^22.7.9",
 		"husky": "^9.1.6",
 		"lint-staged": "^15.2.10",
 		"typescript": "^5.6.3",