seyfert 1.5.0 → 2.0.0

package/lib/commands/optionresolver.d.ts

@@ -1,16 +1,16 @@
-import { type APIApplicationCommandInteractionDataOption, type APIAttachment, type APIGuildMember, type APIInteractionDataResolvedChannel, type APIInteractionGuildMember, type APIRole, type APIUser, ApplicationCommandOptionType } from 'discord-api-types/v10';
-import { Attachment, GuildMember } from '..';
+import { type APIApplicationCommandInteractionDataOption, type APIAttachment, type APIGuildMember, type APIInteractionDataResolvedChannel, type APIInteractionGuildMember, type APIRole, type APIUser, ApplicationCommandOptionType } from '../types';
 import type { MakeRequired } from '../common';
-import type { AllChannels } from '../structures';
-import { GuildRole, InteractionGuildMember, User } from '../structures';
+import { type AllChannels } from '../structures';
 import type { Command, CommandAutocompleteOption, SubCommand } from './applications/chat';
 import type { UsingClient } from './applications/shared';
+import { type GuildMemberStructure, type GuildRoleStructure, type InteractionGuildMemberStructure, type UserStructure } from '../client/transformers';
+import { Attachment } from '../builders';
 export type ContextOptionsResolved = {
-    members?: Record<string, APIGuildMember | APIInteractionGuildMember | GuildMember | InteractionGuildMember>;
-    users?: Record<string, APIUser | User>;
-    roles?: Record<string, APIRole | GuildRole>;
-    channels?: Record<string, APIInteractionDataResolvedChannel | AllChannels>;
-    attachments?: Record<string, APIAttachment | Attachment>;
+    members?: Record<string, APIGuildMember | Omit<APIGuildMember, 'user'> | APIInteractionGuildMember>;
+    users?: Record<string, APIUser>;
+    roles?: Record<string, APIRole>;
+    channels?: Record<string, APIInteractionDataResolvedChannel>;
+    attachments?: Record<string, APIAttachment>;
 };
 export declare class OptionResolver {
     private client;
@@ -31,7 +31,7 @@ export declare class OptionResolver {
     getGroup(): string | null;
     get(name: string): OptionResolved | undefined;
     getHoisted(name: string): OptionResolved | undefined;
-    getValue(name: string): string | number | boolean | Attachment | GuildRole | GuildMember | User | import("..").BaseChannel<import("discord-api-types/v10").ChannelType> | import("..").DMChannel | import("..").CategoryChannel | InteractionGuildMember | undefined;
+    getValue(name: string): string | number | boolean | import("../structures").GuildMember | import("../structures").User | import("../structures").BaseChannel<import("../types").ChannelType> | import("../structures").DMChannel | import("../structures").CategoryChannel | Attachment | import("../structures").InteractionGuildMember | import("../structures").GuildRole | undefined;
     private getTypedOption;
     getChannel(name: string, required?: true): AllChannels;
     getString(name: string, required?: true): string;
@@ -42,11 +42,11 @@ export interface OptionResolved {
     type: ApplicationCommandOptionType;
     value?: string | number | boolean;
     options?: OptionResolved[];
-    user?: User;
-    member?: GuildMember | InteractionGuildMember;
+    user?: UserStructure;
+    member?: GuildMemberStructure | InteractionGuildMemberStructure;
     attachment?: Attachment;
     channel?: AllChannels;
-    role?: GuildRole;
+    role?: GuildRoleStructure;
     focused?: boolean;
 }
 export type OptionResolvedWithValue = MakeRequired<Pick<OptionResolved, 'name' | 'value' | 'focused'>, 'value'> & {

package/lib/commands/optionresolver.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OptionResolver = void 0;
-const v10_1 = require("discord-api-types/v10");
-const __1 = require("..");
+const types_1 = require("../types");
 const structures_1 = require("../structures");
-const channels_1 = __importDefault(require("../structures/channels"));
+const transformers_1 = require("../client/transformers");
+const builders_1 = require("../builders");
 class OptionResolver {
     client;
     parent;
@@ -23,11 +20,11 @@ class OptionResolver {
         this.guildId = guildId;
         this.resolved = resolved;
         this.hoistedOptions = this.options = options.map(option => this.transformOption(option, resolved));
-        if (this.hoistedOptions[0]?.type === v10_1.ApplicationCommandOptionType.Subcommand) {
+        if (this.hoistedOptions[0]?.type === types_1.ApplicationCommandOptionType.Subcommand) {
             this.subCommand = this.hoistedOptions[0].name;
             this.hoistedOptions = this.hoistedOptions[0].options ?? [];
         }
-        if (this.hoistedOptions[0]?.type === v10_1.ApplicationCommandOptionType.SubcommandGroup) {
+        if (this.hoistedOptions[0]?.type === types_1.ApplicationCommandOptionType.SubcommandGroup) {
             this.group = this.hoistedOptions[0].name;
             this.subCommand = this.hoistedOptions[0].options[0].name;
             this.hoistedOptions = this.hoistedOptions[0].options[0].options ?? [];
@@ -69,22 +66,22 @@ class OptionResolver {
             return;
         }
         switch (option.type) {
-            case v10_1.ApplicationCommandOptionType.Attachment:
+            case types_1.ApplicationCommandOptionType.Attachment:
                 return option.attachment;
-            case v10_1.ApplicationCommandOptionType.Boolean:
+            case types_1.ApplicationCommandOptionType.Boolean:
                 return option.value;
-            case v10_1.ApplicationCommandOptionType.Channel:
+            case types_1.ApplicationCommandOptionType.Channel:
                 return option.channel;
-            case v10_1.ApplicationCommandOptionType.Integer:
-            case v10_1.ApplicationCommandOptionType.Number:
+            case types_1.ApplicationCommandOptionType.Integer:
+            case types_1.ApplicationCommandOptionType.Number:
                 return option.value;
-            case v10_1.ApplicationCommandOptionType.Role:
+            case types_1.ApplicationCommandOptionType.Role:
                 return option.role;
-            case v10_1.ApplicationCommandOptionType.String:
+            case types_1.ApplicationCommandOptionType.String:
                 return option.value;
-            case v10_1.ApplicationCommandOptionType.User:
+            case types_1.ApplicationCommandOptionType.User:
                 return option.member ?? option.user;
-            case v10_1.ApplicationCommandOptionType.Mentionable:
+            case types_1.ApplicationCommandOptionType.Mentionable:
                 return option.member ?? option.user ?? option.role;
             default:
                 return;
@@ -101,11 +98,11 @@ class OptionResolver {
         return option;
     }
     getChannel(name) {
-        const option = this.getTypedOption(name, [v10_1.ApplicationCommandOptionType.Channel]);
+        const option = this.getTypedOption(name, [types_1.ApplicationCommandOptionType.Channel]);
         return option.channel;
     }
     getString(name) {
-        const option = this.getTypedOption(name, [v10_1.ApplicationCommandOptionType.String]);
+        const option = this.getTypedOption(name, [types_1.ApplicationCommandOptionType.String]);
         return option.value;
     }
     transformOption(option, resolved) {
@@ -122,28 +119,26 @@ class OptionResolver {
             const value = resolve.value;
             const user = resolved.users?.[value];
             if (user) {
-                resolve.user = user instanceof structures_1.User ? user : new structures_1.User(this.client, user);
+                resolve.user = transformers_1.Transformers.User(this.client, user);
             }
             const member = resolved.members?.[value];
             if (member) {
                 resolve.member =
-                    member instanceof __1.GuildMember || member instanceof structures_1.InteractionGuildMember
-                        ? member
-                        : 'permissions' in member
-                            ? new structures_1.InteractionGuildMember(this.client, member, user, this.guildId)
-                            : new __1.GuildMember(this.client, member, user, this.guildId);
+                    'permissions' in member
+                        ? transformers_1.Transformers.InteractionGuildMember(this.client, member, user, this.guildId)
+                        : transformers_1.Transformers.GuildMember(this.client, member, user, this.guildId);
             }
             const channel = resolved.channels?.[value];
             if (channel) {
-                resolve.channel = 'fetch' in channel ? channel : (0, channels_1.default)(channel, this.client);
+                resolve.channel = 'fetch' in channel ? channel : (0, structures_1.channelFrom)(channel, this.client);
             }
             const role = resolved.roles?.[value];
             if (role) {
-                resolve.role = role instanceof structures_1.GuildRole ? role : new structures_1.GuildRole(this.client, role, this.guildId);
+                resolve.role = transformers_1.Transformers.GuildRole(this.client, role, this.guildId);
             }
             const attachment = resolved.attachments?.[value];
             if (attachment) {
-                resolve.attachment = attachment instanceof __1.Attachment ? attachment : new __1.Attachment(this.client, attachment);
+                resolve.attachment = attachment instanceof builders_1.Attachment ? attachment : new builders_1.Attachment(this.client, attachment);
             }
         }
         return resolve;

package/lib/common/bot/watcher.d.ts

@@ -1,36 +1,7 @@
-/// <reference types="node" />
-import type { GatewayDispatchPayload, GatewaySendPayload } from 'discord-api-types/v10';
-import { ApiHandler } from '../../api';
-import { ShardManager, type ShardManagerOptions } from '../../websocket';
-import { Logger } from '../it/logger';
-import type { MakeRequired } from '../types/util';
-/**
- * Represents a watcher class that extends the ShardManager.
- */
-export declare class Watcher extends ShardManager {
-    worker?: import('node:worker_threads').Worker;
-    logger: Logger;
-    rest?: ApiHandler;
-    options: MakeRequired<WatcherOptions, 'intents' | 'token' | 'handlePayload' | 'info'>;
-    /**
-     * Initializes a new instance of the Watcher class.
-     * @param options The options for the watcher.
-     */
-    constructor(options: WatcherOptions);
-    /**
-     * Resets the worker instance.
-     */
-    resetWorker(): void;
-    /**
-     * Spawns shards for the watcher.
-     */
-    spawnShards(): Promise<void>;
-    /**
-     * Builds the watcher.
-     */
-    protected build(): void;
-}
-export interface WatcherOptions extends Omit<ShardManagerOptions, 'handlePayload' | 'info' | 'token' | 'intents'> {
+import type { GatewayDispatchPayload, GatewaySendPayload } from '../../types';
+import type { ShardManager, ShardManagerOptions } from '../../websocket';
+import type { MakePartial } from '../types/util';
+export interface WatcherOptions extends MakePartial<Omit<ShardManager['options'], 'handlePayload' | 'info' | 'token' | 'intents'>, 'compress' | 'presence' | 'properties' | 'shardEnd' | 'shardStart' | 'spawnShardDelay' | 'totalShards' | 'url' | 'version'> {
     filePath: string;
     transpileCommand: string;
     srcPath: string;

package/lib/common/bot/watcher.js

@@ -1,111 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Watcher = void 0;
-const node_child_process_1 = require("node:child_process");
-const api_1 = require("../../api");
-const base_1 = require("../../client/base");
-const websocket_1 = require("../../websocket");
-const logger_1 = require("../it/logger");
-const utils_1 = require("../it/utils");
-/**
- * Represents a watcher class that extends the ShardManager.
- */
-class Watcher extends websocket_1.ShardManager {
-    worker;
-    logger = new logger_1.Logger({
-        name: '[Watcher]',
-    });
-    rest;
-    /**
-     * Initializes a new instance of the Watcher class.
-     * @param options The options for the watcher.
-     */
-    constructor(options) {
-        super({
-            handlePayload() { },
-            token: '',
-            intents: 0,
-            info: {
-                url: 'wss://gateway.discord.gg',
-                session_start_limit: {
-                    max_concurrency: -1,
-                    remaining: -1,
-                    reset_after: -1,
-                    total: -1,
-                },
-                shards: -1,
-            },
-            ...options,
-        });
-    }
-    /**
-     * Resets the worker instance.
-     */
-    resetWorker() {
-        const worker_threads = (0, utils_1.lazyLoadPackage)('node:worker_threads');
-        if (!worker_threads)
-            throw new Error('Cannot use worker_threads');
-        if (this.worker) {
-            this.worker.terminate();
-        }
-        this.build();
-        this.worker = new worker_threads.Worker(this.options.filePath, {
-            argv: this.options.argv,
-            workerData: {
-                __USING_WATCHER__: true,
-            },
-        });
-        this.worker.on('message', (data) => {
-            switch (data.type) {
-                case 'SEND_TO_SHARD':
-                    this.send(data.shardId, data.payload);
-                    break;
-            }
-        });
-    }
-    /**
-     * Spawns shards for the watcher.
-     */
-    async spawnShards() {
-        const RC = await base_1.BaseClient.prototype.getRC();
-        this.options.token = RC.token;
-        this.rest ??= new api_1.ApiHandler({
-            baseUrl: 'api/v10',
-            domain: 'https://discord.com',
-            token: this.options.token,
-        });
-        this.options.intents = RC.intents;
-        this.options.info = await new api_1.Router(this.rest).createProxy().gateway.bot.get();
-        this.options.totalShards = this.options.info.shards;
-        this.resetWorker();
-        const oldFn = this.options.handlePayload;
-        this.options.handlePayload = (shardId, payload) => {
-            this.worker?.postMessage({
-                type: 'PAYLOAD',
-                shardId,
-                payload,
-            });
-            return oldFn?.(shardId, payload);
-        };
-        this.connectQueue.concurrency = this.options.info.session_start_limit.max_concurrency;
-        await super.spawnShards();
-        const chokidar = (0, utils_1.lazyLoadPackage)('chokidar');
-        if (!chokidar?.watch)
-            return this.logger.warn('No chokidar installed.');
-        const watcher = chokidar.watch(this.options.srcPath).on('ready', () => {
-            this.logger.debug(`Watching ${this.options.srcPath}`);
-            watcher.on('all', event => {
-                this.logger.debug(`${event} event detected, building`);
-                this.resetWorker();
-            });
-        });
-    }
-    /**
-     * Builds the watcher.
-     */
-    build() {
-        (0, node_child_process_1.execSync)(`cd ${process.cwd()} && ${this.options.transpileCommand}`);
-        this.logger.info('Builded');
-    }
-}
-exports.Watcher = Watcher;

package/lib/common/index.d.ts

@@ -15,6 +15,7 @@ export * from './shorters/users';
 export * from './shorters/threads';
 export * from './shorters/webhook';
 export * from './shorters/interaction';
+export * from './shorters/application';
 export * from './types/options';
 export * from './types/resolvables';
 export * from './types/util';

package/lib/common/index.js

@@ -32,6 +32,7 @@ __exportStar(require("./shorters/users"), exports);
 __exportStar(require("./shorters/threads"), exports);
 __exportStar(require("./shorters/webhook"), exports);
 __exportStar(require("./shorters/interaction"), exports);
+__exportStar(require("./shorters/application"), exports);
 //
 __exportStar(require("./types/options"), exports);
 __exportStar(require("./types/resolvables"), exports);