@mostfeatured/dbi 0.0.66 → 0.0.68

package/dist/types/Interaction.d.ts

@@ -1,50 +1,50 @@
-import Discord from "discord.js";
-import { NamespaceEnums, NamespaceData } from "../../generated/namespaceData";
-import { DBI } from "../DBI";
-import { DBIButton } from "./Button";
-import { DBIChatInput } from "./ChatInput/ChatInput";
-import { DBILocale } from "./Locale";
-import { DBIMessageContextMenu } from "./MessageContextMenu";
-import { DBIModal } from "./Modal";
-import { DBISelectMenu } from "./SelectMenu";
-import { DBIUserContextMenu } from "./UserContextMenu";
-export declare type TDBIInteractions<TNamespace extends NamespaceEnums> = DBIChatInput<TNamespace> | DBIButton<TNamespace> | DBISelectMenu<TNamespace> | DBIMessageContextMenu<TNamespace> | DBIUserContextMenu<TNamespace> | DBIModal<TNamespace>;
-export interface IDBIBaseExecuteCtx<TNamespace extends NamespaceEnums> {
-    interaction: Discord.ChatInputCommandInteraction | Discord.UserContextMenuCommandInteraction | Discord.MessageContextMenuCommandInteraction | Discord.ModalSubmitInteraction | Discord.AutocompleteInteraction | Discord.SelectMenuInteraction | Discord.ButtonInteraction;
-    locale: {
-        user: DBILocale<TNamespace>;
-        guild?: DBILocale<TNamespace>;
-    };
-    dbi: DBI<TNamespace>;
-    dbiInteraction: TDBIInteractions<TNamespace>;
-    setRateLimit(type: TDBIRateLimitTypes, duration: number): Promise<any>;
-    other: Record<string, any>;
-    clientNamespace: NamespaceData[TNamespace]["clientNamespaces"];
-}
-export declare type TDBIReferencedData = ({
-    [key: string]: any;
-    $ref: string;
-    $unRef(): boolean;
-} | string | number);
-export declare type TDBIInteractionTypes = "ChatInput" | "UserContextMenu" | "MessageContextMenu" | "Modal" | "Autocomplete" | "SelectMenu" | "Button";
-export declare type TDBIRateLimitTypes = "User" | "Channel" | "Guild" | "Member" | "Message";
-export declare type DBIRateLimit = {
-    type: TDBIRateLimitTypes;
-    /**
-     * Duration in milliseconds.
-     */
-    duration: number;
-};
-export declare class DBIBaseInteraction<TNamespace extends NamespaceEnums> {
-    constructor(dbi: DBI<TNamespace>, cfg: Omit<DBIBaseInteraction<TNamespace>, "dbi">);
-    publish?: NamespaceData[TNamespace]["clientNamespaces"];
-    dbi: DBI<TNamespace>;
-    name: string;
-    description: string;
-    readonly type: TDBIInteractionTypes;
-    options?: any | any[];
-    other?: Record<string, any>;
-    rateLimits?: DBIRateLimit[];
-    onExecute(ctx: IDBIBaseExecuteCtx<TNamespace>): Promise<void> | void;
-}
+import Discord from "discord.js";
+import { NamespaceEnums, NamespaceData } from "../../generated/namespaceData";
+import { DBI } from "../DBI";
+import { DBIButton } from "./Button";
+import { DBIChatInput } from "./ChatInput/ChatInput";
+import { DBILocale } from "./Locale";
+import { DBIMessageContextMenu } from "./MessageContextMenu";
+import { DBIModal } from "./Modal";
+import { DBISelectMenu } from "./SelectMenu";
+import { DBIUserContextMenu } from "./UserContextMenu";
+export declare type TDBIInteractions<TNamespace extends NamespaceEnums> = DBIChatInput<TNamespace> | DBIButton<TNamespace> | DBISelectMenu<TNamespace> | DBIMessageContextMenu<TNamespace> | DBIUserContextMenu<TNamespace> | DBIModal<TNamespace>;
+export interface IDBIBaseExecuteCtx<TNamespace extends NamespaceEnums> {
+    interaction: Discord.ChatInputCommandInteraction | Discord.UserContextMenuCommandInteraction | Discord.MessageContextMenuCommandInteraction | Discord.ModalSubmitInteraction | Discord.AutocompleteInteraction | Discord.SelectMenuInteraction | Discord.ButtonInteraction;
+    locale: {
+        user: DBILocale<TNamespace>;
+        guild?: DBILocale<TNamespace>;
+    };
+    dbi: DBI<TNamespace>;
+    dbiInteraction: TDBIInteractions<TNamespace>;
+    setRateLimit(type: TDBIRateLimitTypes, duration: number): Promise<any>;
+    other: Record<string, any>;
+    clientNamespace: NamespaceData[TNamespace]["clientNamespaces"];
+}
+export declare type TDBIReferencedData = ({
+    [key: string]: any;
+    $ref: string;
+    $unRef(): boolean;
+} | string | number);
+export declare type TDBIInteractionTypes = "ChatInput" | "UserContextMenu" | "MessageContextMenu" | "Modal" | "Autocomplete" | "SelectMenu" | "Button";
+export declare type TDBIRateLimitTypes = "User" | "Channel" | "Guild" | "Member" | "Message";
+export declare type DBIRateLimit = {
+    type: TDBIRateLimitTypes;
+    /**
+     * Duration in milliseconds.
+     */
+    duration: number;
+};
+export declare class DBIBaseInteraction<TNamespace extends NamespaceEnums> {
+    constructor(dbi: DBI<TNamespace>, cfg: Omit<DBIBaseInteraction<TNamespace>, "dbi">);
+    publish?: NamespaceData[TNamespace]["clientNamespaces"];
+    dbi: DBI<TNamespace>;
+    name: string;
+    description: string;
+    readonly type: TDBIInteractionTypes;
+    options?: any | any[];
+    other?: Record<string, any>;
+    rateLimits?: DBIRateLimit[];
+    onExecute(ctx: IDBIBaseExecuteCtx<TNamespace>): Promise<void> | void;
+}
 //# sourceMappingURL=Interaction.d.ts.map

package/dist/types/Interaction.js

@@ -1,27 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBIBaseInteraction = void 0;
-class DBIBaseInteraction {
-    constructor(dbi, cfg) {
-        this.dbi = dbi;
-        this.name = cfg.name;
-        this.description = cfg.description;
-        this.onExecute = cfg.onExecute;
-        this.type = cfg.type;
-        this.options = cfg.options;
-        this.other = cfg.other;
-        this.publish = cfg.publish ?? dbi.data.clients.first()?.namespace;
-    }
-    publish;
-    dbi;
-    name;
-    description;
-    type;
-    options;
-    other;
-    rateLimits;
-    onExecute(ctx) {
-    }
-}
-exports.DBIBaseInteraction = DBIBaseInteraction;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DBIBaseInteraction = void 0;
+class DBIBaseInteraction {
+    constructor(dbi, cfg) {
+        this.dbi = dbi;
+        this.name = cfg.name;
+        this.description = cfg.description;
+        this.onExecute = cfg.onExecute;
+        this.type = cfg.type;
+        this.options = cfg.options;
+        this.other = cfg.other;
+        this.publish = cfg.publish ?? dbi.data.clients.first()?.namespace;
+    }
+    publish;
+    dbi;
+    name;
+    description;
+    type;
+    options;
+    other;
+    rateLimits;
+    onExecute(ctx) {
+    }
+}
+exports.DBIBaseInteraction = DBIBaseInteraction;
 //# sourceMappingURL=Interaction.js.map

package/dist/utils/recursiveImport.d.ts

@@ -1,6 +1,6 @@
-/**
- * @example
- * await recursiveImport("./src", [".js"], [".d.ts"])
- */
-export declare function recursiveImport(folderPath: string, exts?: string[], ignore?: string[]): Promise<any>;
+/**
+ * @example
+ * await recursiveImport("./src", [".js"], [".d.ts"])
+ */
+export declare function recursiveImport(folderPath: string, exts?: string[], ignore?: string[]): Promise<any>;
 //# sourceMappingURL=recursiveImport.d.ts.map

package/dist/utils/recursiveImport.js

@@ -1,28 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveImport = void 0;
-const tslib_1 = require("tslib");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
-/**
- * @example
- * await recursiveImport("./src", [".js"], [".d.ts"])
- */
-async function recursiveImport(folderPath, exts = [".js"], ignore = [".d.ts", ".js.map", ".d.ts.map"]) {
-    let files = await fs_1.default.promises.readdir(folderPath, { withFileTypes: true });
-    let dirName = __dirname;
-    for (const file of files) {
-        let filePath = path_1.default.resolve(folderPath, file.name);
-        let relative = path_1.default.relative(dirName, filePath);
-        if (!relative.includes(`${path_1.default.sep}-`)) {
-            if (file.isDirectory()) {
-                await recursiveImport(filePath, exts);
-            }
-            else if (exts.some(i => file.name.endsWith(i)) && !ignore.some(i => file.name.endsWith(i))) {
-                await Promise.resolve().then(() => tslib_1.__importStar(require(filePath)));
-            }
-        }
-    }
-}
-exports.recursiveImport = recursiveImport;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recursiveImport = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+/**
+ * @example
+ * await recursiveImport("./src", [".js"], [".d.ts"])
+ */
+async function recursiveImport(folderPath, exts = [".js"], ignore = [".d.ts", ".js.map", ".d.ts.map"]) {
+    let files = await fs_1.default.promises.readdir(folderPath, { withFileTypes: true });
+    let dirName = __dirname;
+    for (const file of files) {
+        let filePath = path_1.default.resolve(folderPath, file.name);
+        let relative = path_1.default.relative(dirName, filePath);
+        if (!relative.includes(`${path_1.default.sep}-`)) {
+            if (file.isDirectory()) {
+                await recursiveImport(filePath, exts);
+            }
+            else if (exts.some(i => file.name.endsWith(i)) && !ignore.some(i => file.name.endsWith(i))) {
+                await Promise.resolve().then(() => tslib_1.__importStar(require(filePath)));
+            }
+        }
+    }
+}
+exports.recursiveImport = recursiveImport;
 //# sourceMappingURL=recursiveImport.js.map

package/package.json

@@ -10,7 +10,7 @@
     "stuffs": "^0.1.21"
   },
   "name": "@mostfeatured/dbi",
-  "version": "0.0.66",
+  "version": "0.0.68",
   "main": "dist/index.js",
   "type": "commonjs",
   "private": false,

package/src/DBI.ts

@@ -131,6 +131,7 @@ export class DBI<TNamespace extends NamespaceEnums, TOtherData = Record<string,
     & {
       next(key?: string): DBIClientData<TNamespace>,
       random(): DBIClientData<TNamespace>,
+      random(size: number): DBIClientData<TNamespace>[],
       first(): DBIClientData<TNamespace>,
       get(namespace: NamespaceData[TNamespace]["clientNamespaces"]): DBIClientData<TNamespace>,
       indexes: Record<string, number>
@@ -178,8 +179,12 @@ export class DBI<TNamespace extends NamespaceEnums, TOtherData = Record<string,
           this.indexes[key] = (((this.indexes[key] ?? -1) + 1) % this.length);
           return this[this.indexes[key]];
         },
-        random() {
-          return this[Math.floor(Math.random() * this.length)];
+        random(size?: number) {
+          if (typeof size === "number") {
+            return this.sort(() => Math.random() - 0.5).slice(0, size);
+          } else {
+            return this[Math.floor(Math.random() * this.length)];
+          }
         },
         first() {
           return this[0];

package/src/Events.ts

@@ -6,6 +6,10 @@ import { DBILocale } from "./types/Locale";
 
 export type TDBIEventNames = "beforeInteraction" | "afterInteraction" | "interactionRateLimit" | "beforeEvent" | "afterEvent" | "interactionError" | "eventError";
 
+export type TDBIEventHandlerCtx<TNamespace extends NamespaceEnums> = {
+  [K in keyof (ClientEvents & NamespaceData[TNamespace]["customEvents"])]: { other: Record<string, any>, locale?: { guild: DBILocale<TNamespace> }, eventName: K } & (ClientEvents & NamespaceData[TNamespace]["customEvents"])[K]
+}[keyof (ClientEvents & NamespaceData[TNamespace]["customEvents"])];
+
 export class Events<TNamespace extends NamespaceEnums> {
   DBI: DBI<TNamespace>;
   handlers: Record<string, Array<(data: any) => boolean | Promise<boolean>>>;
@@ -49,17 +53,13 @@ export class Events<TNamespace extends NamespaceEnums> {
 
   on(
     eventName: "beforeEvent" | "afterEvent",
-    handler: (data: {
-      [K in keyof (ClientEvents & NamespaceData[TNamespace]["customEvents"])]: { other: Record<string, any>, locale?: { guild: DBILocale<TNamespace> }, eventName: K } & (ClientEvents & NamespaceData[TNamespace]["customEvents"])[K]
-    }[keyof (ClientEvents & NamespaceData[TNamespace]["customEvents"])]) => Promise<boolean> | boolean,
+    handler: (data: TDBIEventHandlerCtx<TNamespace>) => Promise<boolean> | boolean,
     options?: { once: boolean }
   ): (() => any);
 
   on(
     eventName: "eventError",
-    handler: (data: {
-      [K in keyof (ClientEvents & NamespaceData[TNamespace]["customEvents"])]: { other: Record<string, any>, locale?: { guild: DBILocale<TNamespace> }, eventName: K, error: any } & (ClientEvents & NamespaceData[TNamespace]["customEvents"])[K]
-    }[keyof (ClientEvents & NamespaceData[TNamespace]["customEvents"])]) => Promise<boolean> | boolean,
+    handler: (data: TDBIEventHandlerCtx<TNamespace> & { error: any }) => Promise<boolean> | boolean,
     options?: { once: boolean }
   ): (() => any);
 

package/src/methods/publishInteractions.ts

@@ -176,11 +176,11 @@ export async function publishInteractions(
   
     switch (publishType) {
       case "Guild": {
-        await rest.put(Routes.applicationGuildCommands(me.id, guildId), { body: body[client.namespace] });
+        await rest.put(Routes.applicationGuildCommands(me.id, guildId), { body: body[client.namespace] || [] });
         break;
       }
       case "Global": {
-        await rest.put(Routes.applicationCommands(me.id), { body: body[client.namespace] });
+        await rest.put(Routes.applicationCommands(me.id), { body: body[client.namespace] || [] });
         break;
       }
     }