@mostfeatured/dbi 0.1.32 → 0.1.34

package/src/DBI.ts

@@ -61,6 +61,8 @@ import {
 } from "./types/Components/RoleSelectMenu";
 import { handleMessageCommands } from "./methods/handleMessageCommands";
 import { FakeMessageInteraction } from "./types/other/FakeMessageInteraction";
+import { DBIHTMLComponentsV2, TDBIHTMLComponentsV2Omitted } from "./types/Components/HTMLComponentsV2";
+import { DBIHTMLComponentsV2Handlers } from "./types/Components/HTMLComponentsV2/HTMLComponentsV2Handlers";
 
 export interface DBIStore {
   get(key: string, defaultValue?: any): Promise<any>;
@@ -203,6 +205,7 @@ export interface DBIConfigConstructor<TNamespace extends NamespaceEnums, OtherDa
 export interface DBIRegisterAPI<TNamespace extends NamespaceEnums> {
   ChatInput(cfg: TDBIChatInputOmitted<TNamespace>): DBIChatInput<TNamespace>;
   ChatInputOptions: DBIChatInputOptions<TNamespace>;
+
   Event(cfg: TDBIEventOmitted<TNamespace>): DBIEvent<TNamespace>;
   Locale(cfg: TDBILocaleConstructor<TNamespace>): DBILocale<TNamespace>;
   Button(cfg: TDBIButtonOmitted<TNamespace>): DBIButton<TNamespace>;
@@ -233,6 +236,9 @@ export interface DBIRegisterAPI<TNamespace extends NamespaceEnums> {
     cfg: TDBICustomEventOmitted<TNamespace, T>
   ): DBICustomEvent<TNamespace, T>;
 
+  HTMLComponentsV2(cfg: TDBIHTMLComponentsV2Omitted<TNamespace>): DBIHTMLComponentsV2<TNamespace>;
+  HTMLComponentsV2Handlers: DBIHTMLComponentsV2Handlers<TNamespace>;
+
   createInlineEvent(cfg: Omit<TDBIEventOmitted<TNamespace>, "id">): DBIEvent<TNamespace>;
   createInlineButton(cfg: Omit<TDBIButtonOmitted<TNamespace>, "id" | "name">): DBIButton<TNamespace>;
   createInlineStringSelectMenu(
@@ -529,6 +535,7 @@ export class DBI<
   private async _registerAll(flags: string[] = []) {
     const self = this;
     const ChatInputOptions = new DBIChatInputOptions(self);
+    const HTMLComponentsV2Handlers = new DBIHTMLComponentsV2Handlers(self);
 
     const randomInlineId = () => `inline:${Math.random().toString(36).slice(2)}`;
 
@@ -543,14 +550,6 @@ export class DBI<
         if (!cfg.flag || flags.includes("all") || flags.includes(cfg.flag)) self.data.interactions.set(dbiChatInput.name, dbiChatInput);
         return dbiChatInput;
       };
-      ChatInput = Object.assign(
-        ChatInput,
-        class {
-          constructor(...args: any[]) {
-            return ChatInput.apply(this, args as any);
-          }
-        }
-      );
 
       let Event = function (cfg: TDBIEventOmitted<TNamespace>) {
         let dbiEvent = new DBIEvent(self as any, cfg);
@@ -564,14 +563,6 @@ export class DBI<
         if (!cfg.flag || flags.includes("all") || flags.includes(cfg.flag)) self.data.events.set(dbiEvent.id || dbiEvent.name, dbiEvent);
         return dbiEvent;
       };
-      Event = Object.assign(
-        Event,
-        class {
-          constructor(...args: any[]) {
-            return Event.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineEvent = function (cfg: Omit<TDBIEventOmitted<TNamespace>, "id">) {
         return Event({ ...cfg, ttl: cfg?.ttl || self.config.inlineListeners.autoClear?.ttl, id: randomInlineId() } as any);
@@ -587,14 +578,6 @@ export class DBI<
         if (!cfg.flag || flags.includes("all") || flags.includes(cfg.flag)) self.data.interactions.set(dbiButton.name, dbiButton as any);
         return dbiButton;
       };
-      Button = Object.assign(
-        Button,
-        class {
-          constructor(...args: any[]) {
-            return Button.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineButton = function (cfg: Omit<TDBIButtonOmitted<TNamespace>, "name" | "id">) {
         let id = randomInlineId();
@@ -620,14 +603,6 @@ export class DBI<
         );
         return dbiStringSelectMenu;
       };
-      StringSelectMenu = Object.assign(
-        StringSelectMenu,
-        class {
-          constructor(...args: any[]) {
-            return StringSelectMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineStringSelectMenu = function (cfg: Omit<TDBIStringSelectMenuOmitted<TNamespace>, "id" | "name">) {
         let id = randomInlineId();
@@ -652,14 +627,6 @@ export class DBI<
         );
         return dbiUserSelectMenu;
       };
-      UserSelectMenu = Object.assign(
-        UserSelectMenu,
-        class {
-          constructor(...args: any[]) {
-            return UserSelectMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineUserSelectMenu = function (cfg: Omit<TDBIUserSelectMenuOmitted<TNamespace>, "id" | "name">) {
         let id = randomInlineId();
@@ -684,14 +651,6 @@ export class DBI<
         );
         return dbiRoleSelectMenu;
       };
-      RoleSelectMenu = Object.assign(
-        RoleSelectMenu,
-        class {
-          constructor(...args: any[]) {
-            return RoleSelectMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineRoleSelectMenu = function (cfg: Omit<TDBIRoleSelectMenuOmitted<TNamespace>, "id" | "name">) {
         let id = randomInlineId();
@@ -717,14 +676,6 @@ export class DBI<
         );
         return dbiChannelSelectMenu;
       };
-      ChannelSelectMenu = Object.assign(
-        ChannelSelectMenu,
-        class {
-          constructor(...args: any[]) {
-            return ChannelSelectMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineChannelSelectMenu = function (cfg: Omit<TDBIChannelSelectMenuOmitted<TNamespace>, "id" | "name">) {
         let id = randomInlineId();
@@ -753,14 +704,6 @@ export class DBI<
         );
         return dbiMentionableSelectMenu;
       };
-      MentionableSelectMenu = Object.assign(
-        MentionableSelectMenu,
-        class {
-          constructor(...args: any[]) {
-            return MentionableSelectMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineMentionableSelectMenu = function (cfg: Omit<TDBIMentionableSelectMenuOmitted<TNamespace>, "id" | "name">) {
         let id = randomInlineId();
@@ -786,14 +729,6 @@ export class DBI<
         );
         return dbiMessageContextMenu;
       };
-      MessageContextMenu = Object.assign(
-        MessageContextMenu,
-        class {
-          constructor(...args: any[]) {
-            return MessageContextMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let UserContextMenu = function (
         cfg: TDBIUserContextMenuOmitted<TNamespace>
@@ -814,14 +749,6 @@ export class DBI<
         );
         return dbiUserContextMenu;
       };
-      UserContextMenu = Object.assign(
-        UserContextMenu,
-        class {
-          constructor(...args: any[]) {
-            return UserContextMenu.apply(this, args as any);
-          }
-        }
-      );
 
       let Modal = function (cfg: TDBIModalOmitted<TNamespace>) {
         let dbiModal = new DBIModal(self as any, cfg);
@@ -833,14 +760,6 @@ export class DBI<
         if (!cfg.flag || flags.includes("all") || flags.includes(cfg.flag)) self.data.interactions.set(dbiModal.name, dbiModal as any);
         return dbiModal;
       };
-      Modal = Object.assign(
-        Modal,
-        class {
-          constructor(...args: any[]) {
-            return Modal.apply(this, args as any);
-          }
-        }
-      );
 
       let createInlineModal = function (cfg: Omit<TDBIModalOmitted<TNamespace>, "name" | "id">) {
         let id = randomInlineId();
@@ -859,14 +778,6 @@ export class DBI<
         if (!cfg.flag || flags.includes("all") || flags.includes(cfg.flag)) self.data.locales.set(dbiLocale.name, dbiLocale);
         return dbiLocale;
       };
-      Locale = Object.assign(
-        Locale,
-        class {
-          constructor(...args: any[]) {
-            return Locale.apply(this, args as any);
-          }
-        }
-      );
 
       let CustomEvent = function (cfg: TDBICustomEventOmitted<TNamespace>) {
         let dbiCustomEvent = new DBICustomEvent(self, cfg) as any;
@@ -878,20 +789,12 @@ export class DBI<
         self.data.customEventNames.add(dbiCustomEvent.name);
         return dbiCustomEvent;
       };
-      CustomEvent = Object.assign(
-        CustomEvent,
-        class {
-          constructor(...args: any[]) {
-            return CustomEvent.apply(this, args as any);
-          }
-        }
-      );
 
       let InteractionLocale = function (cfg: TDBIInteractionLocaleOmitted) {
         let dbiInteractionLocale = new DBIInteractionLocale(self, cfg);
         if (
           self.config.strict &&
-          self.data.interactionLocales.has(dbiInteractionLocale.name)
+          self.data.interactions.has(dbiInteractionLocale.name)
         )
           throw new Error(
             `DBIInteractionLocale "${dbiInteractionLocale.name}" already loaded!`
@@ -902,14 +805,26 @@ export class DBI<
         );
         return dbiInteractionLocale;
       };
-      InteractionLocale = Object.assign(
-        InteractionLocale,
-        class {
-          constructor(...args: any[]) {
-            return InteractionLocale.apply(this, args as any);
-          }
-        }
-      );
+
+      let HTMLComponentsV2 = function (
+        cfg: TDBIHTMLComponentsV2Omitted<TNamespace>
+      ) {
+        let dbiHTMLComponentsV2 = new DBIHTMLComponentsV2(self as any, cfg);
+        if (
+          self.config.strict &&
+          self.data.interactions.has(dbiHTMLComponentsV2.name)
+        )
+          throw new Error(
+            `DBIHTMLComponentsV2 "${dbiHTMLComponentsV2.name
+            }" already loaded as "${self.data.interactions.get(dbiHTMLComponentsV2.name)?.type
+            }"!`
+          );
+        if (!cfg.flag || flags.includes("all") || flags.includes(cfg.flag)) self.data.interactions.set(
+          dbiHTMLComponentsV2.name,
+          dbiHTMLComponentsV2 as any
+        );
+        return dbiHTMLComponentsV2;
+      };
 
       await cb({
         ChatInput,
@@ -926,6 +841,8 @@ export class DBI<
         UserContextMenu,
         CustomEvent,
         Modal,
+        HTMLComponentsV2,
+        HTMLComponentsV2Handlers,
         InteractionLocale,
         createInlineButton,
         createInlineEvent,

package/src/methods/hookInteractionListeners.ts

@@ -17,30 +17,34 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
   async function handle(inter: Discord.Interaction<"cached">) {
     const dbiInter =
       (inter as any).dbiChatInput ??
-      dbi.data.interactions.find((i) => {
+      dbi.data.interactions.find((dbiInter) => {
         let isUsesCustomId =
           inter.isButton() || inter.isAnySelectMenu() || inter.isModalSubmit();
         let parsedId = isUsesCustomId
           ? parseCustomId(dbi, (inter as any).customId)
           : null;
         return (
-          (i.type == "ChatInput" &&
+          (dbiInter.type == "ChatInput" &&
             (inter.isChatInputCommand() || inter.isAutocomplete()) &&
-            i.name ==
-              [
-                inter.commandName,
-                inter.options.getSubcommandGroup(false),
-                inter.options.getSubcommand(false),
-              ]
-                .filter((i) => !!i)
-                .join(" ")) ||
-          ((i.type == "MessageContextMenu" || i.type == "UserContextMenu") &&
+            dbiInter.name ==
+            [
+              inter.commandName,
+              inter.options.getSubcommandGroup(false),
+              inter.options.getSubcommand(false),
+            ]
+              .filter((i) => !!i)
+              .join(" "))
+          ||
+          ((dbiInter.type == "MessageContextMenu" || dbiInter.type == "UserContextMenu") &&
             (inter.isMessageContextMenuCommand() ||
               inter.isUserContextMenuCommand()) &&
-            inter.commandName == i.name) ||
-          (componentTypes.includes(i.type) &&
+            inter.commandName == dbiInter.name)
+          ||
+          (componentTypes.includes(dbiInter.type) &&
             isUsesCustomId &&
-            parsedId?.name == i.name)
+            parsedId?.name == dbiInter.name)
+          ||
+          (parsedId.v2 && dbiInter.type == "HTMLComponentsV2" && parsedId.name == dbiInter.name)
         );
       });
 
@@ -65,10 +69,12 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
       guild: guildLocale,
     };
 
-    let data =
-      inter.isButton() || inter.isAnySelectMenu() || inter.isModalSubmit()
-        ? parseCustomId(dbi, inter.customId).data
-        : undefined;
+    let parsedId = inter.isButton() || inter.isAnySelectMenu() || inter.isModalSubmit()
+      ? parseCustomId(dbi, inter.customId)
+      : undefined;
+
+    let data = parsedId?.data;
+    let v2 = parsedId?.v2 || false;
 
     let other = {};
 
@@ -81,6 +87,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
         data,
         other,
         dbiInteraction: dbiInter,
+        v2
       }))
     )
       return;
@@ -100,6 +107,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
           other,
           locale,
           step: "Autocomplete",
+          v2,
         });
 
         if (Array.isArray(res) && res.length > 0) {
@@ -119,6 +127,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
           data,
           other,
           locale,
+          v2
         });
         await inter.respond(response);
       }
@@ -153,6 +162,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
               type: key,
               ...val,
             },
+            v2
           })) === true
         )
           return;
@@ -184,12 +194,12 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
                 ? dcOption.attachment
                 : dbiOption.type ===
                   Discord.ApplicationCommandOptionType.Channel
-                ? dcOption.channel
-                : dbiOption.type === Discord.ApplicationCommandOptionType.Role
-                ? dcOption.role
-                : dbiOption.type === Discord.ApplicationCommandOptionType.User
-                ? dcOption.user
-                : dcOption.value,
+                  ? dcOption.channel
+                  : dbiOption.type === Discord.ApplicationCommandOptionType.Role
+                    ? dcOption.role
+                    : dbiOption.type === Discord.ApplicationCommandOptionType.User
+                      ? dcOption.user
+                      : dcOption.value,
             interaction: inter,
             dbiInteraction: dbiInter,
             dbi,
@@ -218,21 +228,55 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
       data,
       // @ts-ignore
       other,
+      v2
     };
 
-    if (dbi.config.strict) {
-      // @ts-ignore
-      await dbiInter.onExecute(arg);
+
+    if (dbiInter.type === "HTMLComponentsV2") {
+      if (dbi.config.strict) {
+        // @ts-ignore
+        await dbiInter.onExecute?.(arg);
+
+        const elementName = data.shift();
+        dbiInter.handlers.forEach((handler) => {
+          if (handler.name === elementName) {
+            handler.onExecute(arg);
+          }
+        });
+      } else {
+        try {
+          // @ts-ignore
+          await dbiInter.onExecute?.(arg);
+
+          const elementName = data.shift();
+          dbiInter.handlers.forEach((handler) => {
+            if (handler.name === elementName) {
+              handler.onExecute(arg);
+            }
+          });
+        } catch (error) {
+          // @ts-ignore
+          await dbi.events.trigger(
+            "interactionError",
+            Object.assign(arg, { error })
+          );
+        }
+      }
     } else {
-      try {
+      if (dbi.config.strict) {
         // @ts-ignore
         await dbiInter.onExecute(arg);
-      } catch (error) {
-        // @ts-ignore
-        await dbi.events.trigger(
-          "interactionError",
-          Object.assign(arg, { error })
-        );
+      } else {
+        try {
+          // @ts-ignore
+          await dbiInter.onExecute(arg);
+        } catch (error) {
+          // @ts-ignore
+          await dbi.events.trigger(
+            "interactionError",
+            Object.assign(arg, { error })
+          );
+        }
       }
     }
 
@@ -245,6 +289,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
       setRateLimit,
       data,
       other,
+      v2
     });
   }
 

package/src/types/ChatInput/ChatInputOptions.ts

@@ -28,7 +28,7 @@ export interface IDBIValuedInteraction<
   TNamespace extends NamespaceEnums,
   TInteractionType extends Discord.Interaction,
   TValueType = string | number
-> extends IDBIBaseExecuteCtx<TNamespace> {
+> extends Omit<IDBIBaseExecuteCtx<TNamespace>, 'interaction'> {
   value: TValueType;
   interaction: TInteractionType;
 }
@@ -312,11 +312,11 @@ export class DBIChatInputOptions<TNamespace extends NamespaceEnums> {
     cfg: TDBIBaseOption & {
       channelTypes: Discord.ChannelType[];
     } & TDBIValidator<
-        TDBIValidateCtx<TNamespace, Discord.Channel>,
-        Discord.Channel,
-        "Result",
-        boolean
-      >
+      TDBIValidateCtx<TNamespace, Discord.Channel>,
+      Discord.Channel,
+      "Result",
+      boolean
+    >
   ) {
     return {
       type: Discord.ApplicationCommandOptionType.Channel,

package/src/types/Components/HTMLComponentsV2/HTMLComponentsV2Handlers.ts

@@ -0,0 +1,78 @@
+import { NamespaceEnums } from "../../../../generated/namespaceData";
+import { DBI } from "../../../DBI";
+import { IDBIButtonExecuteCtx } from "../Button";
+import { IDBIChannelSelectMenuExecuteCtx } from "../ChannelSelectMenu";
+import { IDBIMentionableSelectMenuExecuteCtx } from "../MentionableSelectMenu";
+import { IDBIModalExecuteCtx } from "../Modal";
+import { IDBIRoleSelectMenuExecuteCtx } from "../RoleSelectMenu";
+import { IDBIStringSelectMenuExecuteCtx } from "../StringSelectMenu";
+import { IDBIUserSelectMenuExecuteCtx } from "../UserSelectMenu";
+
+export interface IDBIHanlder<TNamespace extends NamespaceEnums, TExecuteCtx> {
+  name: string;
+  onExecute?: (ctx: TExecuteCtx) => void;
+}
+
+export class DBIHTMLComponentsV2Handlers<TNamespace extends NamespaceEnums> {
+  dbi: DBI<TNamespace>;
+
+  constructor(dbi: DBI<TNamespace>) {
+    this.dbi = dbi;
+  }
+
+  button(cfg: IDBIHanlder<TNamespace, IDBIButtonExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "Button",
+    }
+  }
+
+  channelSelectMenu(cfg: IDBIHanlder<TNamespace, IDBIChannelSelectMenuExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "ChannelSelectMenu",
+    }
+  }
+
+  mentionableSelectMenu(cfg: IDBIHanlder<TNamespace, IDBIMentionableSelectMenuExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "MentionableSelectMenu",
+    }
+  }
+
+  modal(cfg: IDBIHanlder<TNamespace, IDBIModalExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "Modal",
+    }
+  }
+
+  roleSelectMenu(cfg: IDBIHanlder<TNamespace, IDBIRoleSelectMenuExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "RoleSelectMenu",
+    }
+  }
+
+  stringSelectMenu(cfg: IDBIHanlder<TNamespace, IDBIStringSelectMenuExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "StringSelectMenu",
+    }
+  }
+
+  userSelectMenu(cfg: IDBIHanlder<TNamespace, IDBIUserSelectMenuExecuteCtx<TNamespace>>) {
+    return {
+      name: cfg.name,
+      onExecute: cfg.onExecute,
+      type: "UserSelectMenu",
+    }
+  }
+}

package/src/types/Components/HTMLComponentsV2/index.ts

@@ -0,0 +1,43 @@
+import { NamespaceEnums } from "../../../../generated/namespaceData";
+import { DBI } from "../../../DBI";
+import { DBIBaseInteraction, DBIRateLimit, IDBIBaseExecuteCtx, TDBIReferencedData } from "../../Interaction";
+import { parseHTMLComponentsV2 } from "./parser";
+import fs from "fs";
+
+export type TDBIHTMLComponentsV2Omitted<TNamespace extends NamespaceEnums> = Omit<DBIHTMLComponentsV2<TNamespace>, "type" | "dbi" | "toJSON">;
+
+export type TDBIHTMLComponentsV2ToJSONArgs = {
+  data?: Record<string, any>;
+}
+
+export interface IDBIHTMLComponentsV2ExecuteCtx<TNamespace extends NamespaceEnums> extends IDBIBaseExecuteCtx<TNamespace> {
+  data: TDBIReferencedData[];
+}
+
+export class DBIHTMLComponentsV2<TNamespace extends NamespaceEnums> extends DBIBaseInteraction<TNamespace> {
+  template?: string;
+  file?: string;
+
+  constructor(dbi: DBI<TNamespace>, args: TDBIHTMLComponentsV2Omitted<TNamespace>) {
+    super(dbi, {
+      ...(args as any),
+      type: "HTMLComponentsV2",
+    });
+    this.template = args.template || fs.readFileSync(args.file || "", "utf-8");
+    this.name = args.name;
+    this.handlers = args.handlers || [];
+  }
+
+  override toJSON(arg: TDBIHTMLComponentsV2ToJSONArgs = {}): any {
+    return parseHTMLComponentsV2(
+      this.dbi as any,
+      this.template,
+      this.name,
+      { data: arg.data }
+    )
+  }
+
+  override onExecute?(ctx: IDBIHTMLComponentsV2ExecuteCtx<TNamespace>) { };
+
+  handlers?: any[] = [];
+}