npm - @buape/carbon - Versions diffs - 0.8.0 → 0.9.0 - Mend

@buape/carbon 0.8.0 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (258) hide show

package/dist/src/internals/AutocompleteInteraction.js CHANGED Viewed

@@ -6,7 +6,7 @@ export class AutocompleteInteraction extends BaseInteraction {
      * This is the options of the commands, parsed from the interaction data.
      */
     options;
-    constructor(client, data, defaults) {
+    constructor({ client, data, defaults, processingCommand }) {
         super(client, data, defaults);
         if (data.type !== InteractionType.ApplicationCommandAutocomplete) {
             throw new Error("Invalid interaction type was used to create this class");
@@ -14,7 +14,12 @@ export class AutocompleteInteraction extends BaseInteraction {
         if (data.data.type !== ApplicationCommandType.ChatInput) {
             throw new Error("Invalid command type was used to create this class");
         }
-        this.options = new AutocompleteOptionsHandler(client, data.data.options ?? []);
+        this.options = new AutocompleteOptionsHandler({
+            client,
+            options: data.data.options ?? [],
+            interactionData: data.data,
+            definitions: processingCommand?.options ?? []
+        });
     }
     async defer() {
         throw new Error("Defer is not available for autocomplete interactions");
@@ -26,11 +31,16 @@ export class AutocompleteInteraction extends BaseInteraction {
      * Respond with the choices for an autocomplete interaction
      */
     async respond(choices) {
+        let safeChoices = choices;
+        if (choices.length > 25) {
+            console.warn(`[Carbon] Autocomplete only supports up to 25 choices. Received ${choices.length}. Only the first 25 will be sent.`);
+            safeChoices = choices.slice(0, 25);
+        }
         await this.client.rest.post(Routes.interactionCallback(this.rawData.id, this.rawData.token), {
             body: {
                 type: InteractionResponseType.ApplicationCommandAutocompleteResult,
                 data: {
-                    choices
+                    choices: safeChoices
                 }
             }
         });

package/dist/src/internals/AutocompleteInteraction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AutocompleteInteraction.js","sourceRoot":"","sources":["../../../src/internals/AutocompleteInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,4BAA4B,EAC5B,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,MAAM,EACN,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACN,eAAe,EAEf,MAAM,iCAAiC,CAAA;~~AAExC~~,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,OAAO,uBAAwB,SAAQ,eAA6D;IACzG;;OAEG;IACH,OAAO,CAA4B;IACnC,~~YACC~~,~~MAAc~~,~~EACd~~,~~IAAkD~~,~~EAClD~~,~~QAA6B~~;~~QAE7B~~,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,8BAA8B,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,SAAS,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACtE,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,0BAA0B,~~CAC5C~~,MAAM,~~EACN~~,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,~~CACvB~~,CAAA;~~IACF~~,CAAC;IAEQ,KAAK,CAAC,KAAK;QACnB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;IACxE,CAAC;IAEQ,KAAK,CAAC,KAAK;QACnB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;IACxE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CACZ,OASG;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAC1B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAC/D;YACC,IAAI,EAAE;gBACL,IAAI,EAAE,uBAAuB,CAAC,oCAAoC;gBAClE,IAAI,EAAE;oBACL,OAAO;~~iBACP~~;aACD;SACD,CACD,CAAA;IACF,CAAC;CACD;AAED,MAAM,OAAO,0BAA2B,SAAQ,cAAc;IAC7D;;OAEG;IACH,UAAU;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;QACjE,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAA;QACzB,MAAM,KAAK,GACV,OAAO,CAAC,IAAI,KAAK,4BAA4B,CAAC,MAAM;YACnD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,4BAA4B,CAAC,OAAO;gBACtD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC/B,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,4BAA4B,CAAC,MAAM;oBACrD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;oBAC9B,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,4BAA4B,CAAC,OAAO;wBACtD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;wBAC/B,CAAC,CAAC,IAAI,CAAA;QAEX,OAAO;YACN,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,KAAK;SACZ,CAAA;IACF,CAAC;CACD"}
1	+ {"version":3,"file":"AutocompleteInteraction.js","sourceRoot":"","sources":["../../../src/internals/AutocompleteInteraction.ts"],"names":[],"mappings":"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"}

package/dist/src/internals/ButtonInteraction.d.ts CHANGED Viewed

@@ -3,7 +3,6 @@ import { BaseComponentInteraction } from "../abstracts/BaseComponentInteraction.
 import type { InteractionDefaults } from "../abstracts/BaseInteraction.js";
 import type { Client } from "../classes/Client.js";
 export declare class ButtonInteraction extends BaseComponentInteraction {
-    customId: string;
     constructor(client: Client, data: APIMessageComponentButtonInteraction, defaults: InteractionDefaults);
 }
 //# sourceMappingURL=ButtonInteraction.d.ts.map

package/dist/src/internals/ButtonInteraction.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ButtonInteraction.d.ts","sourceRoot":"","sources":["../../../src/internals/ButtonInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAEN~~,KAAK,oCAAoC,EAGzC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAA;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;~~AAGlD~~,qBAAa,iBAAkB,SAAQ,wBAAwB;~~IAC9D~~,~~QAAQ,EAAE,~~MAAM,~~CAEZ;gBAEH,MAAM,~~EAAE,MAAM,EACd,IAAI,EAAE,oCAAoC,EAC1C,QAAQ,EAAE,mBAAmB;CAY9B"}
1	+ {"version":3,"file":"ButtonInteraction.d.ts","sourceRoot":"","sources":["../../../src/internals/ButtonInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,oCAAoC,EAGzC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAA;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElD,qBAAa,iBAAkB,SAAQ,wBAAwB;gBAE7D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,oCAAoC,EAC1C,QAAQ,EAAE,mBAAmB;CAY9B"}

package/dist/src/internals/ButtonInteraction.js CHANGED Viewed

@@ -1,8 +1,6 @@
 import { ComponentType, InteractionType } from "discord-api-types/v10";
 import { BaseComponentInteraction } from "../abstracts/BaseComponentInteraction.js";
-import { splitCustomId } from "../utils.js";
 export class ButtonInteraction extends BaseComponentInteraction {
-    customId = splitCustomId(this.rawData.data.custom_id)[0];
     constructor(client, data, defaults) {
         super(client, data, defaults);
         if (!data.data)

package/dist/src/internals/ButtonInteraction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ButtonInteraction.js","sourceRoot":"","sources":["../../../src/internals/ButtonInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAGN~~,aAAa,EACb,eAAe,EACf,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAA;~~AAGnF~~,~~OAAO,EAAE,aAAa,EAAE,~~MAAM,~~aAAa,CAAA;AAE3C,MAAM,~~OAAO,iBAAkB,SAAQ,wBAAwB;IAC9D,~~QAAQ,GAAW,aAAa,CAC9B,IAAI,CAAC,OAAO,CAAC,IAAwC,CAAC,SAAS,CAChE,CAAC,CAAC,CAAC,CAAA;IACJ,~~YACC,MAAc,EACd,IAA0C,EAC1C,QAA6B;QAE7B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,CAAC,IAAI;YACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;QACxE,CAAC;IACF,CAAC;CACD"}
1	+ {"version":3,"file":"ButtonInteraction.js","sourceRoot":"","sources":["../../../src/internals/ButtonInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,aAAa,EACb,eAAe,EACf,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAA;AAInF,MAAM,OAAO,iBAAkB,SAAQ,wBAAwB;IAC9D,YACC,MAAc,EACd,IAA0C,EAC1C,QAA6B;QAE7B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,CAAC,IAAI;YACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;QACxE,CAAC;IACF,CAAC;CACD"}

package/dist/src/internals/CommandHandler.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ export declare class CommandHandler extends Base {
      * Handle a command interaction
      * @internal
      */
-    handleCommandInteraction(rawInteraction: APIApplicationCommandInteraction): Promise<false | void>;
+    handleCommandInteraction(rawInteraction: APIApplicationCommandInteraction): Promise<unknown>;
     handleAutocompleteInteraction(rawInteraction: APIApplicationCommandAutocompleteInteraction): Promise<false | void>;
 }
 //# sourceMappingURL=CommandHandler.d.ts.map

package/dist/src/internals/CommandHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CommandHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/CommandHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,4CAA4C,EACjD,KAAK,gCAAgC,EAIrC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;~~AAO3C~~,qBAAa,cAAe,SAAQ,IAAI;IACvC,OAAO,CAAC,UAAU;IAgElB;;;OAGG;IACG,wBAAwB,CAC7B,cAAc,EAAE,gCAAgC;~~IAqB3C~~,6BAA6B,CAClC,cAAc,EAAE,4CAA4C;~~CAmB7D~~"}
1	+ {"version":3,"file":"CommandHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/CommandHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,4CAA4C,EACjD,KAAK,gCAAgC,EAIrC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAQ3C,qBAAa,cAAe,SAAQ,IAAI;IACvC,OAAO,CAAC,UAAU;IAgElB;;;OAGG;IACG,wBAAwB,CAC7B,cAAc,EAAE,gCAAgC;IAoC3C,6BAA6B,CAClC,cAAc,EAAE,4CAA4C;CAsB7D"}

package/dist/src/internals/CommandHandler.js CHANGED Viewed

@@ -54,14 +54,29 @@ export class CommandHandler extends Base {
         const command = this.getCommand(rawInteraction);
         if (!command)
             return false;
-        const interaction = new CommandInteraction(this.client, rawInteraction, {
-            ephemeral: command.ephemeral
+        if (command.components) {
+            for (const component of command.components) {
+                this.client.componentHandler.registerComponent(component);
+            }
+        }
+        const interaction = new CommandInteraction({
+            client: this.client,
+            data: rawInteraction,
+            defaults: {
+                ephemeral: command.ephemeral
+            },
+            processingCommand: command
         });
         try {
             const command = this.getCommand(rawInteraction);
             if (command.defer) {
                 await interaction.defer();
             }
+            if (command.preCheck) {
+                const result = await command.preCheck(interaction);
+                if (!result)
+                    return false;
+            }
             return await command.run(interaction);
         }
         catch (e) {
@@ -74,7 +89,14 @@ export class CommandHandler extends Base {
         const command = this.getCommand(rawInteraction);
         if (!command)
             return false;
-        const interaction = new AutocompleteInteraction(this.client, rawInteraction, { ephemeral: command.ephemeral });
+        const interaction = new AutocompleteInteraction({
+            client: this.client,
+            data: rawInteraction,
+            defaults: {
+                ephemeral: command.ephemeral
+            },
+            processingCommand: command
+        });
         try {
             const command = this.getCommand(rawInteraction);
             return await command.autocomplete(interaction);

package/dist/src/internals/CommandHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../../src/internals/CommandHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,4BAA4B,EAC5B,sBAAsB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;~~AAC3C~~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~~YACvE~~,SAAS,EAAE,OAAO,CAAC,SAAS;~~SAC5B~~,CAAC,CAAA;QAEF,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;YAE/C,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC1B,CAAC;YACD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,YAAY,KAAK;gBAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YAChD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACF,CAAC;IACD,KAAK,CAAC,6BAA6B,CAClC,cAA4D;QAE5D,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAA;QAE1B,MAAM,WAAW,GAAG,IAAI,uBAAuB,~~CAC9C~~,IAAI,CAAC,MAAM,~~EACX~~,cAAc,~~EACd~~,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,~~CAChC~~,CAAA;~~QAED~~,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;YAC/C,OAAO,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QAC/C,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,YAAY,KAAK;gBAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YAChD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACF,CAAC;CACD"}
1	+ {"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../../src/internals/CommandHandler.ts"],"names":[],"mappings":"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"}

package/dist/src/internals/CommandInteraction.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { type APIApplicationCommandInteraction } from "discord-api-types/v10";
 import { BaseInteraction, type InteractionDefaults } from "../abstracts/BaseInteraction.js";
 import type { Client } from "../classes/Client.js";
+import type { Command } from "../classes/Command.js";
 import { OptionsHandler } from "./OptionsHandler.js";
 /**
  * Represents a command interaction
@@ -11,6 +12,11 @@ export declare class CommandInteraction extends BaseInteraction<APIApplicationCo
      * It will not have any options in it if the command is not a ChatInput command.
      */
     options: OptionsHandler;
-    constructor(client: Client, data: APIApplicationCommandInteraction, defaults: InteractionDefaults);
+    constructor({ client, data, defaults, processingCommand }: {
+        client: Client;
+        data: APIApplicationCommandInteraction;
+        defaults: InteractionDefaults;
+        processingCommand?: Command;
+    });
 }
 //# sourceMappingURL=CommandInteraction.d.ts.map

package/dist/src/internals/CommandInteraction.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CommandInteraction.d.ts","sourceRoot":"","sources":["../../../src/internals/CommandInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,gCAAgC,~~EAGrC~~,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACN,eAAe,EACf,KAAK,mBAAmB,EACxB,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;~~AAEpD~~;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,eAAe,CAAC,gCAAgC,CAAC;IACxF;;;OAGG;IACH,OAAO,EAAE,cAAc,CAAA;~~gBAEtB~~,MAAM,EAAE,MAAM,~~EACd~~,IAAI,EAAE,gCAAgC,~~EACtC~~,QAAQ,EAAE,mBAAmB;~~CAa9B~~"}
1	+ {"version":3,"file":"CommandInteraction.d.ts","sourceRoot":"","sources":["../../../src/internals/CommandInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,gCAAgC,EAIrC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACN,eAAe,EACf,KAAK,mBAAmB,EACxB,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,eAAe,CAAC,gCAAgC,CAAC;IACxF;;;OAGG;IACH,OAAO,EAAE,cAAc,CAAA;gBACX,EACX,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,EAAE;QACF,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,EAAE,gCAAgC,CAAA;QACtC,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAC3B;CAgBD"}

package/dist/src/internals/CommandInteraction.js CHANGED Viewed

@@ -10,14 +10,20 @@ export class CommandInteraction extends BaseInteraction {
      * It will not have any options in it if the command is not a ChatInput command.
      */
     options;
-    constructor(client, data, defaults) {
+    constructor({ client, data, defaults, processingCommand }) {
         super(client, data, defaults);
         if (data.type !== InteractionType.ApplicationCommand) {
             throw new Error("Invalid interaction type was used to create this class");
         }
-        this.options = new OptionsHandler(client, data.data.type === ApplicationCommandType.ChatInput
-            ? (data.data.options ?? [])
-            : []);
+        this.options = new OptionsHandler({
+            client,
+            options: data.data.type === ApplicationCommandType.ChatInput
+                ? (data.data.options ?? [])
+                : [],
+            interactionData: this.rawData
+                .data,
+            definitions: processingCommand?.options ?? []
+        });
     }
 }
 //# sourceMappingURL=CommandInteraction.js.map

package/dist/src/internals/CommandInteraction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CommandInteraction.js","sourceRoot":"","sources":["../../../src/internals/CommandInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAEN~~,sBAAsB,EACtB,eAAe,EACf,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACN,eAAe,EAEf,MAAM,iCAAiC,CAAA;~~AAExC~~,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;~~AAEpD~~;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,eAAiD;IACxF;;;OAGG;IACH,OAAO,CAAgB;IACvB,~~YACC~~,~~MAAc~~,~~EACd~~,~~IAAsC~~,~~EACtC~~,~~QAA6B~~;~~QAE7B~~,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,kBAAkB,EAAE,CAAC;YACtD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,~~CAChC~~,MAAM,EACN,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,SAAS;~~YAClD~~,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;~~YAC3B~~,CAAC,CAAC,EAAE,~~CACL~~,CAAA;~~IACF~~,CAAC;CACD"}
1	+ {"version":3,"file":"CommandInteraction.js","sourceRoot":"","sources":["../../../src/internals/CommandInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,sBAAsB,EACtB,eAAe,EACf,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACN,eAAe,EAEf,MAAM,iCAAiC,CAAA;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,eAAiD;IACxF;;;OAGG;IACH,OAAO,CAAgB;IACvB,YAAY,EACX,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,iBAAiB,EAMjB;QACA,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,kBAAkB,EAAE,CAAC;YACtD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAA;QAC1E,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC;YACjC,MAAM;YACN,OAAO,EACN,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,SAAS;gBAClD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBAC3B,CAAC,CAAC,EAAE;YACN,eAAe,EAAE,IAAI,CAAC,OAAO;iBAC3B,IAAqD;YACvD,WAAW,EAAE,iBAAiB,EAAE,OAAO,IAAI,EAAE;SAC7C,CAAC,CAAA;IACH,CAAC;CACD"}

package/dist/src/internals/ComponentHandler.d.ts CHANGED Viewed

@@ -1,8 +1,11 @@
-import type { APIMessageComponentInteraction } from "discord-api-types/v10";
+import { type APIMessageComponentInteraction, type APIMessageComponentInteractionData } from "discord-api-types/v10";
 import { Base } from "../abstracts/Base.js";
 import type { BaseMessageInteractiveComponent } from "../abstracts/BaseMessageInteractiveComponent.js";
 export declare class ComponentHandler extends Base {
     components: BaseMessageInteractiveComponent[];
+    oneOffComponents: Map<`${string}-${string}`, {
+        resolve: (data: APIMessageComponentInteractionData) => void;
+    }>;
     /**
      * Register a component with the handler
      * @internal
@@ -12,6 +15,6 @@ export declare class ComponentHandler extends Base {
      * Handle an interaction
      * @internal
      */
-    handleInteraction(data: APIMessageComponentInteraction): Promise<false | undefined>;
+    handleInteraction(data: APIMessageComponentInteraction): Promise<void>;
 }
 //# sourceMappingURL=ComponentHandler.d.ts.map

package/dist/src/internals/ComponentHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ComponentHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/ComponentHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,~~EAEX,~~8BAA8B,~~EAE9B~~,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAA;AActG,qBAAa,gBAAiB,SAAQ,IAAI;IACzC,UAAU,EAAE,+BAA+B,EAAE,CAAK;~~IAClD~~;;;OAGG;IACH,iBAAiB,CAAC,SAAS,EAAE,+BAA+B;IAK5D;;;OAGG;IACG,iBAAiB,CAAC,IAAI,EAAE,8BAA8B;~~CA8D5D~~"}
1	+ {"version":3,"file":"ComponentHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/ComponentHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,8BAA8B,EACnC,KAAK,kCAAkC,EAKvC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAA;AActG,qBAAa,gBAAiB,SAAQ,IAAI;IACzC,UAAU,EAAE,+BAA+B,EAAE,CAAK;IAElD,gBAAgB,EAAE,GAAG,CACpB,GAAG,MAAM,IAAI,MAAM,EAAE,EACrB;QACC,OAAO,EAAE,CAAC,IAAI,EAAE,kCAAkC,KAAK,IAAI,CAAA;KAC3D,CACD,CAAY;IACb;;;OAGG;IACH,iBAAiB,CAAC,SAAS,EAAE,+BAA+B;IAK5D;;;OAGG;IACG,iBAAiB,CAAC,IAAI,EAAE,8BAA8B;CA6F5D"}

package/dist/src/internals/ComponentHandler.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { InteractionResponseType, Routes } from "discord-api-types/v10";
 import { Base } from "../abstracts/Base.js";
 import { Button } from "../classes/components/Button.js";
 import { ChannelSelectMenu } from "../classes/components/ChannelSelectMenu.js";
@@ -13,6 +14,7 @@ import { StringSelectMenuInteraction } from "./StringSelectMenuInteraction.js";
 import { UserSelectMenuInteraction } from "./UserSelectMenuInteraction.js";
 export class ComponentHandler extends Base {
     components = [];
+    oneOffComponents = new Map();
     /**
      * Register a component with the handler
      * @internal
@@ -27,45 +29,67 @@ export class ComponentHandler extends Base {
      * @internal
      */
     async handleInteraction(data) {
-        const component = this.components.find((x) => x.customId === data.data.custom_id &&
-            x.type === data.data.component_type);
-        if (!component)
-            return false;
+        const component = this.components.find((x) => {
+            const componentKey = x.customIdParser(x.customId).key;
+            const interactionKey = x.customIdParser(data.data.custom_id).key;
+            return (componentKey === interactionKey && x.type === data.data.component_type);
+        });
+        if (!component) {
+            const oneOffComponent = this.oneOffComponents.get(`${data.message.id}-${data.message.channel_id}`);
+            if (oneOffComponent) {
+                oneOffComponent.resolve(data.data);
+                this.oneOffComponents.delete(`${data.message.id}-${data.message.channel_id}`);
+                await this.client.rest
+                    .post(Routes.interactionCallback(data.id, data.token), {
+                    body: {
+                        type: InteractionResponseType.DeferredMessageUpdate
+                    }
+                })
+                    .catch(() => {
+                    console.warn(`Failed to acknowledge one-off component interaction for message ${data.message.id}`);
+                });
+            }
+            else {
+                throw new Error(`Unknown component with type ${data.data.component_type} and custom ID ${data.data.custom_id} was received, did you forget to register the component? See https://carbon.buape.com/concepts/component-registration for more information.`);
+            }
+            return;
+        }
+        const parsed = component.customIdParser(data.data.custom_id);
         if (component instanceof Button) {
             const interaction = new ButtonInteraction(this.client, data, { ephemeral: component.ephemeral });
             if (component.defer)
                 await interaction.defer();
-            await component.run(interaction);
+            await component.run(interaction, parsed.data);
         }
         else if (component instanceof RoleSelectMenu) {
             const interaction = new RoleSelectMenuInteraction(this.client, data, { ephemeral: component.ephemeral });
             if (component.defer)
                 await interaction.defer();
-            await component.run(interaction);
+            await component.run(interaction, parsed.data);
         }
         else if (component instanceof ChannelSelectMenu) {
             const interaction = new ChannelSelectMenuInteraction(this.client, data, { ephemeral: component.ephemeral });
             if (component.defer)
                 await interaction.defer();
-            await component.run(interaction);
+            await component.run(interaction, parsed.data);
         }
         else if (component instanceof MentionableSelectMenu) {
             const interaction = new MentionableSelectMenuInteraction(this.client, data, { ephemeral: component.ephemeral });
             if (component.defer)
                 await interaction.defer();
-            await component.run(interaction);
+            await component.run(interaction, parsed.data);
         }
         else if (component instanceof StringSelectMenu) {
             const interaction = new StringSelectMenuInteraction(this.client, data, { ephemeral: component.ephemeral });
             if (component.defer)
                 await interaction.defer();
-            await component.run(interaction);
+            await component.run(interaction, parsed.data);
         }
         else if (component instanceof UserSelectMenu) {
             const interaction = new UserSelectMenuInteraction(this.client, data, { ephemeral: component.ephemeral });
             if (component.defer)
                 await interaction.defer();
-            await component.run(interaction);
+            await component.run(interaction, parsed.data);
         }
         else {
             throw new Error(`Unknown component with type ${data.data.component_type} and custom ID ${data.data.custom_id}`);

package/dist/src/internals/ComponentHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ComponentHandler.js","sourceRoot":"","sources":["../../../src/internals/ComponentHandler.ts"],"names":[],"mappings":"~~AAKA~~,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAA;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAA;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAA;AAChF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAA;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAE1E,MAAM,OAAO,gBAAiB,SAAQ,IAAI;IACzC,UAAU,GAAsC,EAAE,CAAA;~~IAClD~~;;;OAGG;IACH,iBAAiB,CAAC,SAA0C;QAC3D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAChC,CAAC;IACF,CAAC;IACD;;;OAGG;IACH,KAAK,CAAC,iBAAiB,CAAC,IAAoC;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,~~CACrC~~,CAAC,CAAC,EAAE,EAAE,~~CACL~~,CAAC,CAAC,QAAQ,~~KAAK~~,IAAI,CAAC,IAAI,CAAC,SAAS;~~YAClC~~,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,cAAc,~~CACpC~~,CAAA;~~QACD~~,IAAI,CAAC,SAAS;~~YAAE~~,OAAO,KAAK,CAAA;~~QAE5B~~,IAAI,SAAS,YAAY,MAAM,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,IAAI,iBAAiB,CACxC,IAAI,CAAC,MAAM,EACX,IAA4C,EAC5C,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAClC,CAAA;YACD,IAAI,SAAS,CAAC,KAAK;gBAAE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC9C,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;~~QACjC~~,CAAC;aAAM,IAAI,SAAS,YAAY,cAAc,EAAE,CAAC;YAChD,MAAM,WAAW,GAAG,IAAI,yBAAyB,CAChD,IAAI,CAAC,MAAM,EACX,IAAgD,EAChD,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAClC,CAAA;YACD,IAAI,SAAS,CAAC,KAAK;gBAAE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC9C,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;~~QACjC~~,CAAC;aAAM,IAAI,SAAS,YAAY,iBAAiB,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,IAAI,4BAA4B,CACnD,IAAI,CAAC,MAAM,EACX,IAAgD,EAChD,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAClC,CAAA;YACD,IAAI,SAAS,CAAC,KAAK;gBAAE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC9C,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;~~QACjC~~,CAAC;aAAM,IAAI,SAAS,YAAY,qBAAqB,EAAE,CAAC;YACvD,MAAM,WAAW,GAAG,IAAI,gCAAgC,CACvD,IAAI,CAAC,MAAM,EACX,IAAgD,EAChD,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAClC,CAAA;YACD,IAAI,SAAS,CAAC,KAAK;gBAAE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC9C,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;~~QACjC~~,CAAC;aAAM,IAAI,SAAS,YAAY,gBAAgB,EAAE,CAAC;YAClD,MAAM,WAAW,GAAG,IAAI,2BAA2B,CAClD,IAAI,CAAC,MAAM,EACX,IAAgD,EAChD,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAClC,CAAA;YACD,IAAI,SAAS,CAAC,KAAK;gBAAE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC9C,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;~~QACjC~~,CAAC;aAAM,IAAI,SAAS,YAAY,cAAc,EAAE,CAAC;YAChD,MAAM,WAAW,GAAG,IAAI,yBAAyB,CAChD,IAAI,CAAC,MAAM,EACX,IAAgD,EAChD,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,CAClC,CAAA;YACD,IAAI,SAAS,CAAC,KAAK;gBAAE,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC9C,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;~~QACjC~~,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACd,+BAA+B,IAAI,CAAC,IAAI,CAAC,cAAc,kBAAkB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAC9F,CAAA;QACF,CAAC;IACF,CAAC;CACD"}
1	+ {"version":3,"file":"ComponentHandler.js","sourceRoot":"","sources":["../../../src/internals/ComponentHandler.ts"],"names":[],"mappings":"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"}

package/dist/src/internals/ModalHandler.d.ts CHANGED Viewed

@@ -12,6 +12,6 @@ export declare class ModalHandler extends Base {
      * Handle an interaction
      * @internal
      */
-    handleInteraction(data: APIModalSubmitInteraction): Promise<false | void>;
+    handleInteraction(data: APIModalSubmitInteraction): Promise<unknown>;
 }
 //# sourceMappingURL=ModalHandler.d.ts.map

package/dist/src/internals/ModalHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ModalHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/ModalHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAGhD,qBAAa,YAAa,SAAQ,IAAI;IACrC,MAAM,EAAE,KAAK,EAAE,CAAK;IACpB;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,KAAK;IAK1B;;;OAGG;IACG,iBAAiB,CAAC,IAAI,EAAE,yBAAyB;~~CAMvD~~"}
1	+ {"version":3,"file":"ModalHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/ModalHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAGhD,qBAAa,YAAa,SAAQ,IAAI;IACrC,MAAM,EAAE,KAAK,EAAE,CAAK;IACpB;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,KAAK;IAK1B;;;OAGG;IACG,iBAAiB,CAAC,IAAI,EAAE,yBAAyB;CAavD"}

package/dist/src/internals/ModalHandler.js CHANGED Viewed

@@ -16,10 +16,14 @@ export class ModalHandler extends Base {
      * @internal
      */
     async handleInteraction(data) {
-        const modal = this.modals.find((x) => x.customId === data.data.custom_id);
+        const modal = this.modals.find((x) => {
+            const modalKey = x.customIdParser(x.customId).key;
+            const interactionKey = x.customIdParser(data.data.custom_id).key;
+            return modalKey === interactionKey;
+        });
         if (!modal)
             return false;
-        return await modal.run(new ModalInteraction(this.client, data, {}));
+        return await modal.run(new ModalInteraction(this.client, data, {}), modal.customIdParser(data.data.custom_id).data);
     }
 }
 //# sourceMappingURL=ModalHandler.js.map

package/dist/src/internals/ModalHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ModalHandler.js","sourceRoot":"","sources":["../../../src/internals/ModalHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,OAAO,YAAa,SAAQ,IAAI;IACrC,MAAM,GAAY,EAAE,CAAA;IACpB;;;OAGG;IACH,aAAa,CAAC,KAAY;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;IACF,CAAC;IACD;;;OAGG;IACH,KAAK,CAAC,iBAAiB,CAAC,IAA+B;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,~~KAAK~~,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;~~QACzE~~,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAA;QAExB,OAAO,MAAM,KAAK,CAAC,GAAG,~~CAAC~~,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;~~IACpE~~,CAAC;CACD"}
1	+ {"version":3,"file":"ModalHandler.js","sourceRoot":"","sources":["../../../src/internals/ModalHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,OAAO,YAAa,SAAQ,IAAI;IACrC,MAAM,GAAY,EAAE,CAAA;IACpB;;;OAGG;IACH,aAAa,CAAC,KAAY;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;IACF,CAAC;IACD;;;OAGG;IACH,KAAK,CAAC,iBAAiB,CAAC,IAA+B;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACpC,MAAM,QAAQ,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAA;YACjD,MAAM,cAAc,GAAG,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAA;YAChE,OAAO,QAAQ,KAAK,cAAc,CAAA;QACnC,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAA;QAExB,OAAO,MAAM,KAAK,CAAC,GAAG,CACrB,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAC3C,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9C,CAAA;IACF,CAAC;CACD"}

package/dist/src/internals/ModalInteraction.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { InteractionResponseType, Routes } from "discord-api-types/v10";
 import { BaseInteraction } from "../abstracts/BaseInteraction.js";
-import { serializePayload } from "../utils.js";
+import { serializePayload } from "../utils/index.js";
 import { FieldsHandler } from "./FieldsHandler.js";
 export class ModalInteraction extends BaseInteraction {
     customId;

package/dist/src/internals/ModalInteraction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ModalInteraction.js","sourceRoot":"","sources":["../../../src/internals/ModalInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,uBAAuB,EAEvB,MAAM,EACN,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAGjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,~~aAAa~~,CAAA;~~AAC9C~~,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,OAAO,gBAAiB,SAAQ,eAA0C;IAC/E,QAAQ,CAAQ;IAChB,MAAM,CAAe;IAErB,YACC,MAAc,EACd,IAA+B,EAC/B,QAA6B;QAE7B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAE7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAA;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW;QAChB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAC1B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAC/D;YACC,IAAI,EAAE;gBACL,IAAI,EAAE,uBAAuB,CAAC,qBAAqB;aACT;SAC3C,CACD,CAAA;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;IACtB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,IAAoB;QAChC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAC1B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAC/D;YACC,IAAI,EAAE;gBACL,IAAI,EAAE,uBAAuB,CAAC,aAAa;gBAC3C,IAAI,EAAE;oBACL,GAAG,UAAU;iBACb;aACyC;SAC3C,CACD,CAAA;IACF,CAAC;CACD"}
1	+ {"version":3,"file":"ModalInteraction.js","sourceRoot":"","sources":["../../../src/internals/ModalInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,uBAAuB,EAEvB,MAAM,EACN,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAGjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,OAAO,gBAAiB,SAAQ,eAA0C;IAC/E,QAAQ,CAAQ;IAChB,MAAM,CAAe;IAErB,YACC,MAAc,EACd,IAA+B,EAC/B,QAA6B;QAE7B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAE7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAA;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW;QAChB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAC1B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAC/D;YACC,IAAI,EAAE;gBACL,IAAI,EAAE,uBAAuB,CAAC,qBAAqB;aACT;SAC3C,CACD,CAAA;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;IACtB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,IAAoB;QAChC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAC1B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAC/D;YACC,IAAI,EAAE;gBACL,IAAI,EAAE,uBAAuB,CAAC,aAAa;gBAC3C,IAAI,EAAE;oBACL,GAAG,UAAU;iBACb;aACyC;SAC3C,CACD,CAAA;IACF,CAAC;CACD"}

package/dist/src/internals/OptionsHandler.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { type APIApplicationCommandInteractionDataBasicOption, type APIApplicationCommandInteractionDataOption } from "discord-api-types/v10";
+import { type APIApplicationCommandInteractionDataBasicOption, type APIApplicationCommandInteractionDataOption, type APIAutocompleteApplicationCommandInteractionData, type APIChatInputApplicationCommandInteractionData } from "discord-api-types/v10";
 import { Base } from "../abstracts/Base.js";
-import { type Client, Role, User, channelFactory } from "../index.js";
+import { type Client, type CommandOptions, type ResolvedFile, Role, User, channelFactory } from "../index.js";
 export type RawOptions = {
     [key: string]: APIApplicationCommandInteractionDataBasicOption["value"] | undefined;
 };
@@ -13,7 +13,14 @@ export declare class OptionsHandler extends Base {
      * The raw options that were in the interaction data, before they were parsed.
      */
     readonly raw: APIApplicationCommandInteractionDataBasicOption[];
-    constructor(client: Client, options: APIApplicationCommandInteractionDataOption[]);
+    private interactionData?;
+    private definitions?;
+    constructor({ client, options, interactionData, definitions }: {
+        client: Client;
+        options: APIApplicationCommandInteractionDataOption[];
+        interactionData: APIChatInputApplicationCommandInteractionData | APIAutocompleteApplicationCommandInteractionData;
+        definitions: CommandOptions;
+    });
     /**
      * Get the value of a string option.
      * @param key The name of the option to get the value of.
@@ -78,5 +85,8 @@ export declare class OptionsHandler extends Base {
      */
     getMentionable(key: string, required?: false): Promise<User | Role<true> | undefined>;
     getMentionable(key: string, required: true): Promise<User | Role<true>>;
+    getAttachment(key: string, required?: false): ResolvedFile | undefined;
+    getAttachment(key: string, required: true): ResolvedFile;
+    private checkAgainstDefinition;
 }
 //# sourceMappingURL=OptionsHandler.d.ts.map

package/dist/src/internals/OptionsHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OptionsHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/OptionsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,+CAA+C,EACpD,KAAK,0CAA0C,~~EAI~~/C,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,~~EAAE~~,KAAK,MAAM,~~EAAE~~,IAAI,~~EAAE~~,IAAI,~~EAAE~~,cAAc,~~EAAE~~,MAAM,aAAa,CAAA;~~AAErE~~,MAAM,MAAM,UAAU,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GACT,+CAA+C,CAAC,OAAO,CAAC,GACxD,SAAS,CAAA;CACZ,CAAA;AAED;;;GAGG;AACH,qBAAa,cAAe,SAAQ,IAAI;IACvC;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,+CAA+C,EAAE,CAAA;~~gBAG9D~~,MAAM,EAAE,MAAM,~~EACd~~,OAAO,EAAE,0CAA0C,EAAE;~~IAuBtD~~;;;;;OAKG;IACI,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS;IAC5D,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,MAAM;~~IAYrD~~;;;;;OAKG;IACI,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS;IAC7D,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,MAAM;~~IAiBtD~~;;;;;OAKG;IACI,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS;IAC5D,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,MAAM;~~IAYrD~~;;;;;OAKG;IACI,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS;IAC9D,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,OAAO;IAYvD;;;;;OAKG;IACI,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS;IAC9D,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAYvD;;;;;OAKG;IACU,UAAU,CACtB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,KAAK,GACd,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,GAAG,SAAS,CAAC;IAC5C,UAAU,CACtB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,IAAI,GACZ,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAgB7C;;;;;OAKG;IACI,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS;IAC9D,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAYvD;;;;;OAKG;IACU,cAAc,CAC1B,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,KAAK,GACd,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5B,cAAc,CAC1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,IAAI,GACZ,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;~~CAsB7B~~"}
1	+ {"version":3,"file":"OptionsHandler.d.ts","sourceRoot":"","sources":["../../../src/internals/OptionsHandler.ts"],"names":[],"mappings":"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"}

package/dist/src/internals/OptionsHandler.js CHANGED Viewed

@@ -10,9 +10,13 @@ export class OptionsHandler extends Base {
      * The raw options that were in the interaction data, before they were parsed.
      */
     raw;
-    constructor(client, options) {
+    interactionData;
+    definitions;
+    constructor({ client, options, interactionData, definitions }) {
         super(client);
         this.raw = [];
+        this.interactionData = interactionData;
+        this.definitions = definitions;
         for (const option of options) {
             if (option.type === ApplicationCommandOptionType.Subcommand) {
                 for (const subOption of option.options ?? []) {
@@ -41,6 +45,7 @@ export class OptionsHandler extends Base {
         }
         else if (!value || typeof value !== "string")
             return undefined;
+        this.checkAgainstDefinition(key, value);
         return value;
     }
     getInteger(key, required = false) {
@@ -53,6 +58,7 @@ export class OptionsHandler extends Base {
             typeof value !== "number" ||
             !Number.isSafeInteger(value))
             return undefined;
+        this.checkAgainstDefinition(key, value);
         return value;
     }
     getNumber(key, required = false) {
@@ -63,6 +69,7 @@ export class OptionsHandler extends Base {
         }
         else if (!value || typeof value !== "number")
             return undefined;
+        this.checkAgainstDefinition(key, value);
         return value;
     }
     getBoolean(key, required = false) {
@@ -123,5 +130,48 @@ export class OptionsHandler extends Base {
             return new Role(this.client, id);
         }
     }
+    getAttachment(key, required = false) {
+        if (!this.interactionData)
+            throw new Error("Interaction data is not available, this is a bug in Carbon.");
+        const id = this.raw.find((x) => x.name === key && x.type === ApplicationCommandOptionType.Attachment)?.value;
+        if (required) {
+            if (!id || typeof id !== "string")
+                throw new Error(`Missing required option: ${key}`);
+        }
+        else if (!id || typeof id !== "string")
+            return undefined;
+        const attachment = this.interactionData.resolved?.attachments?.[id];
+        if (!attachment) {
+            if (required)
+                throw new Error(`Missing required option: ${key}`);
+            return undefined;
+        }
+        return attachment;
+    }
+    checkAgainstDefinition(key, value) {
+        const definition = this.definitions?.find((x) => x.name === key);
+        if (!definition)
+            return;
+        if (definition.type === ApplicationCommandOptionType.String &&
+            typeof value === "string") {
+            if (definition.max_length && value.length > definition.max_length)
+                throw new Error(`Invalid length for option ${key}: Should be less than ${definition.max_length} characters but is ${value.length} characters`);
+            if (definition.min_length && value.length < definition.min_length)
+                throw new Error(`Invalid length for option ${key}: Should be more than ${definition.min_length} characters but is ${value.length} characters`);
+        }
+        if ((definition.type === ApplicationCommandOptionType.Integer ||
+            definition.type === ApplicationCommandOptionType.Number) &&
+            typeof value === "number") {
+            if (definition.min_value && value < definition.min_value)
+                throw new Error(`Invalid value for option ${key}: Should be more than ${definition.min_value} but is ${value}`);
+            if (definition.max_value && value > definition.max_value)
+                throw new Error(`Invalid value for option ${key}: Should be less than ${definition.max_value} but is ${value}`);
+        }
+        if ("choices" in definition && definition.choices) {
+            const choice = definition.choices.find((x) => x.value === value);
+            if (!choice)
+                throw new Error(`Invalid choice for option ${key}: Should be one of ${definition.choices?.map((x) => x.value).join(", ")} but is ${value}`);
+        }
+    }
 }
 //# sourceMappingURL=OptionsHandler.js.map

package/dist/src/internals/OptionsHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OptionsHandler.js","sourceRoot":"","sources":["../../../src/internals/OptionsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAIN~~,4BAA4B,EAC5B,MAAM,EACN,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,~~EAAe~~,IAAI,~~EAAE~~,IAAI,~~EAAE~~,cAAc,~~EAAE~~,MAAM,aAAa,CAAA;~~AAQrE~~;;;GAGG;AACH,MAAM,OAAO,cAAe,SAAQ,IAAI;IACvC;;OAEG;IACM,GAAG,CAAmD;~~IAE/D~~,~~YACC~~,~~MAAc~~,~~EACd~~,~~OAAqD~~;~~QAErD~~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"}
1	+ {"version":3,"file":"OptionsHandler.js","sourceRoot":"","sources":["../../../src/internals/OptionsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAMN,4BAA4B,EAC5B,MAAM,EACN,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAIN,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,MAAM,aAAa,CAAA;AAOpB;;;GAGG;AACH,MAAM,OAAO,cAAe,SAAQ,IAAI;IACvC;;OAEG;IACM,GAAG,CAAmD;IAEvD,eAAe,CAE4B;IAC3C,WAAW,CAAiB;IAEpC,YAAY,EACX,MAAM,EACN,OAAO,EACP,eAAe,EACf,WAAW,EAQX;QACA,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;QACb,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,4BAA4B,CAAC,UAAU,EAAE,CAAC;gBAC7D,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;oBAC9C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACzB,CAAC;YACF,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,4BAA4B,CAAC,eAAe,EAAE,CAAC;gBACzE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;oBAC9C,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;wBACvB,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;4BACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;wBAC5B,CAAC;oBACF,CAAC;gBACF,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACtB,CAAC;QACF,CAAC;IACF,CAAC;IAUM,SAAS,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,MAAM,CACvE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBACtC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAChE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACvC,OAAO,KAAK,CAAA;IACb,CAAC;IAUM,UAAU,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,OAAO,CACxE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;gBACtE,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IACN,CAAC,KAAK;YACN,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YAE5B,OAAO,SAAS,CAAA;QACjB,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACvC,OAAO,KAAK,CAAA;IACb,CAAC;IAUM,SAAS,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,MAAM,CACvE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBACtC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAChE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACvC,OAAO,KAAK,CAAA;IACb,CAAC;IAUM,UAAU,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,OAAO,CACxE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,SAAS;gBACvC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,SAAS;YAAE,OAAO,SAAS,CAAA;QACjE,OAAO,KAAK,CAAA;IACb,CAAC;IAUM,OAAO,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;QAC3C,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,IAAI,CACrE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;gBAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC1D,OAAO,IAAI,IAAI,CAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACvC,CAAC;IAgBM,KAAK,CAAC,UAAU,CACtB,GAAW,EACX,QAAQ,GAAG,KAAK;QAEhB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,OAAO,CACxE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;gBAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC1D,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAe,CAAA;QAC3E,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACzC,CAAC;IAUM,OAAO,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;QAC3C,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,IAAI,CACrE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;gBAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC1D,OAAO,IAAI,IAAI,CAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACvC,CAAC;IAgBM,KAAK,CAAC,cAAc,CAC1B,GAAW,EACX,QAAQ,GAAG,KAAK;QAEhB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,WAAW,CACtE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;gBAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAE1D,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,IAAI,IAAI,CAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YAC5C,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAClB,OAAO,IAA8B,CAAA;QACtC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,IAAI,IAAI,CAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACvC,CAAC;IACF,CAAC;IAIM,aAAa,CACnB,GAAW,EACX,QAAQ,GAAG,KAAK;QAEhB,IAAI,CAAC,IAAI,CAAC,eAAe;YACxB,MAAM,IAAI,KAAK,CACd,6DAA6D,CAC7D,CAAA;QACF,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,4BAA4B,CAAC,UAAU,CACrE,EAAE,KAAK,CAAA;QACR,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;gBAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;QACpD,CAAC;aAAM,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;QACnE,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,IAAI,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;YAChE,OAAO,SAAS,CAAA;QACjB,CAAC;QACD,OAAO,UAAU,CAAA;IAClB,CAAC;IAEO,sBAAsB,CAC7B,GAAW,EACX,KAAgC;QAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAA;QAChE,IAAI,CAAC,UAAU;YAAE,OAAM;QACvB,IACC,UAAU,CAAC,IAAI,KAAK,4BAA4B,CAAC,MAAM;YACvD,OAAO,KAAK,KAAK,QAAQ,EACxB,CAAC;YACF,IAAI,UAAU,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC,UAAU;gBAChE,MAAM,IAAI,KAAK,CACd,6BAA6B,GAAG,yBAAyB,UAAU,CAAC,UAAU,sBAAsB,KAAK,CAAC,MAAM,aAAa,CAC7H,CAAA;YACF,IAAI,UAAU,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC,UAAU;gBAChE,MAAM,IAAI,KAAK,CACd,6BAA6B,GAAG,yBAAyB,UAAU,CAAC,UAAU,sBAAsB,KAAK,CAAC,MAAM,aAAa,CAC7H,CAAA;QACH,CAAC;QACD,IACC,CAAC,UAAU,CAAC,IAAI,KAAK,4BAA4B,CAAC,OAAO;YACxD,UAAU,CAAC,IAAI,KAAK,4BAA4B,CAAC,MAAM,CAAC;YACzD,OAAO,KAAK,KAAK,QAAQ,EACxB,CAAC;YACF,IAAI,UAAU,CAAC,SAAS,IAAI,KAAK,GAAG,UAAU,CAAC,SAAS;gBACvD,MAAM,IAAI,KAAK,CACd,4BAA4B,GAAG,yBAAyB,UAAU,CAAC,SAAS,WAAW,KAAK,EAAE,CAC9F,CAAA;YACF,IAAI,UAAU,CAAC,SAAS,IAAI,KAAK,GAAG,UAAU,CAAC,SAAS;gBACvD,MAAM,IAAI,KAAK,CACd,4BAA4B,GAAG,yBAAyB,UAAU,CAAC,SAAS,WAAW,KAAK,EAAE,CAC9F,CAAA;QACH,CAAC;QACD,IAAI,SAAS,IAAI,UAAU,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;YAChE,IAAI,CAAC,MAAM;gBACV,MAAM,IAAI,KAAK,CACd,6BAA6B,GAAG,sBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,EAAE,CAC1H,CAAA;QACH,CAAC;IACF,CAAC;CACD"}