@moody-djs/prompts 1.0.1 → 1.0.3

package/dist/v2/{prompt.types.d.mts → index.d.mts}

@@ -50,4 +50,46 @@ declare class PromptSelectMenuBuilder<Context extends object> extends StringSele
     getModal(): ModalBuilder | ((interaction: StringSelectMenuInteraction) => MaybePromise<ModalBuilder | null>) | undefined;
 }
 
-export { type APIPromptButtonComponent, type APIPromptSelectMenuComponent, type APIPromptTopLevelComponent, PromptButtonBuilder, type PromptContext, PromptSelectMenuBuilder, type PromptState, type PromptStateMessageCallback, type RegisterComponentsOptions };
+declare class PromptError extends Error {
+    constructor(message: string);
+}
+/**
+ * A prompt that allows you to create a sequence of states that a user can go through
+ * with discord.js buttons and select menus.
+ *
+ * @example
+ * ```ts
+ * const prompt = new Prompt<ContextType>(defaults, initialState.name, [...]);
+ * await prompt.start(interaction);
+ * ```
+ */
+declare class Prompt<T extends object> {
+    initialState: string;
+    /** The current context of this prompt */
+    private context;
+    /** The current state */
+    private currentState?;
+    /** All components for this prompt */
+    private components;
+    /** The interaction collector */
+    private collector?;
+    /** The states represented in a map */
+    states: Map<string, PromptState<T>>;
+    /** Creates the prompt with a given set of states */
+    constructor(defaults: T, initialState: string, states: PromptState<T>[]);
+    /**
+     * Starts the prompt with a given interaction
+     * @param interaction The interaction starting off the sequence
+     * @returns {boolean} If true, the prompt started successfully
+     */
+    start(interaction: RepliableInteraction): Promise<boolean>;
+    private changeState;
+    private handleCollect;
+    private prepareMessageOptions;
+    private getNewStateFromCallback;
+    private registerComponents;
+    private unwrap;
+    private replyOrEdit;
+}
+
+export { type APIPromptButtonComponent, type APIPromptSelectMenuComponent, type APIPromptTopLevelComponent, Prompt, PromptButtonBuilder, type PromptContext, PromptError, PromptSelectMenuBuilder, type PromptState, type PromptStateMessageCallback, type RegisterComponentsOptions };

package/dist/v2/{prompt.types.d.ts → index.d.ts}

@@ -50,4 +50,46 @@ declare class PromptSelectMenuBuilder<Context extends object> extends StringSele
     getModal(): ModalBuilder | ((interaction: StringSelectMenuInteraction) => MaybePromise<ModalBuilder | null>) | undefined;
 }
 
-export { type APIPromptButtonComponent, type APIPromptSelectMenuComponent, type APIPromptTopLevelComponent, PromptButtonBuilder, type PromptContext, PromptSelectMenuBuilder, type PromptState, type PromptStateMessageCallback, type RegisterComponentsOptions };
+declare class PromptError extends Error {
+    constructor(message: string);
+}
+/**
+ * A prompt that allows you to create a sequence of states that a user can go through
+ * with discord.js buttons and select menus.
+ *
+ * @example
+ * ```ts
+ * const prompt = new Prompt<ContextType>(defaults, initialState.name, [...]);
+ * await prompt.start(interaction);
+ * ```
+ */
+declare class Prompt<T extends object> {
+    initialState: string;
+    /** The current context of this prompt */
+    private context;
+    /** The current state */
+    private currentState?;
+    /** All components for this prompt */
+    private components;
+    /** The interaction collector */
+    private collector?;
+    /** The states represented in a map */
+    states: Map<string, PromptState<T>>;
+    /** Creates the prompt with a given set of states */
+    constructor(defaults: T, initialState: string, states: PromptState<T>[]);
+    /**
+     * Starts the prompt with a given interaction
+     * @param interaction The interaction starting off the sequence
+     * @returns {boolean} If true, the prompt started successfully
+     */
+    start(interaction: RepliableInteraction): Promise<boolean>;
+    private changeState;
+    private handleCollect;
+    private prepareMessageOptions;
+    private getNewStateFromCallback;
+    private registerComponents;
+    private unwrap;
+    private replyOrEdit;
+}
+
+export { type APIPromptButtonComponent, type APIPromptSelectMenuComponent, type APIPromptTopLevelComponent, Prompt, PromptButtonBuilder, type PromptContext, PromptError, PromptSelectMenuBuilder, type PromptState, type PromptStateMessageCallback, type RegisterComponentsOptions };

package/dist/v2/index.js

@@ -0,0 +1,255 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/v2/index.ts
+var v2_exports = {};
+__export(v2_exports, {
+  Prompt: () => Prompt,
+  PromptButtonBuilder: () => PromptButtonBuilder,
+  PromptError: () => PromptError,
+  PromptSelectMenuBuilder: () => PromptSelectMenuBuilder
+});
+module.exports = __toCommonJS(v2_exports);
+
+// src/v2/Prompt.ts
+var import_node_util = require("util");
+var import_discord2 = require("discord.js");
+
+// src/v2/prompt.types.ts
+var import_discord = require("discord.js");
+var PromptButtonBuilder = class extends import_discord.ButtonBuilder {
+  static {
+    __name(this, "PromptButtonBuilder");
+  }
+  callback;
+  modal;
+  setCallback(callback) {
+    this.callback = callback;
+    return this;
+  }
+  getCallback() {
+    return this.callback;
+  }
+  setModal(modal) {
+    this.modal = modal;
+    return this;
+  }
+  getModal() {
+    return this.modal;
+  }
+};
+var PromptSelectMenuBuilder = class extends import_discord.StringSelectMenuBuilder {
+  static {
+    __name(this, "PromptSelectMenuBuilder");
+  }
+  callback;
+  modal;
+  setCallback(callback) {
+    this.callback = callback;
+    return this;
+  }
+  getCallback() {
+    return this.callback;
+  }
+  setModal(modal) {
+    this.modal = modal;
+    return this;
+  }
+  getModal() {
+    return this.modal;
+  }
+};
+
+// src/v2/Prompt.ts
+var PromptError = class _PromptError extends Error {
+  static {
+    __name(this, "PromptError");
+  }
+  constructor(message) {
+    super(message);
+    Error.captureStackTrace?.(this, _PromptError);
+  }
+};
+var Prompt = class {
+  /** Creates the prompt with a given set of states */
+  constructor(defaults, initialState, states) {
+    this.initialState = initialState;
+    const previousStates = [];
+    const goBack = /* @__PURE__ */ __name(() => {
+      return this.context.previousStates.pop() ?? this.initialState;
+    }, "goBack");
+    this.context = { ...defaults, previousStates, goBack };
+    this.states = new Map(states.map((s) => [s.name, s]));
+  }
+  static {
+    __name(this, "Prompt");
+  }
+  /** The current context of this prompt */
+  context;
+  /** The current state */
+  currentState;
+  /** All components for this prompt */
+  components = new import_discord2.Collection();
+  /** The interaction collector */
+  collector;
+  /** The states represented in a map */
+  states;
+  /**
+   * Starts the prompt with a given interaction
+   * @param interaction The interaction starting off the sequence
+   * @returns {boolean} If true, the prompt started successfully
+   */
+  async start(interaction) {
+    this.context.interaction = interaction;
+    return this.changeState(this.initialState, interaction);
+  }
+  async changeState(newState, interaction) {
+    const state = this.states.get(newState);
+    if (!state) return Promise.reject(new PromptError(`State ${newState} not found.`));
+    this.context.previousStates.push(this.currentState?.name ?? this.initialState);
+    this.currentState = state;
+    const shouldChangeState = await state.onEntered?.(this.context);
+    if (shouldChangeState) return this.changeState(shouldChangeState, interaction);
+    this.components.clear();
+    const messageOptions = await this.prepareMessageOptions(state);
+    const msg = await this.replyOrEdit(interaction, messageOptions);
+    if (this.collector) this.collector.stop();
+    this.collector = msg.createMessageComponentCollector({
+      time: state.timeout || 12e4,
+      filter: /* @__PURE__ */ __name((i) => i.user.id === interaction.user.id, "filter")
+    });
+    this.collector.on("collect", this.handleCollect.bind(this));
+    return true;
+  }
+  async handleCollect(interaction) {
+    const component = this.components.get(interaction.customId);
+    if (!component) throw new PromptError(`Couldn't find component with customId: ${interaction.customId}`);
+    if (component.modal) {
+      const modal = await this.unwrap(component.modal, interaction);
+      if (!modal) {
+        await interaction.deferUpdate();
+        this.collector?.stop();
+        this.context.interaction = interaction;
+        const newState3 = await this.getNewStateFromCallback(component) ?? this.currentState?.name;
+        if (!newState3) return interaction.deleteReply();
+        return void this.changeState(newState3, interaction);
+      }
+      const snowflake = import_discord2.SnowflakeUtil.generate().toString();
+      modal.setCustomId(snowflake);
+      await interaction.showModal(modal);
+      const response = await interaction.awaitModalSubmit({
+        time: 3e5,
+        filter: /* @__PURE__ */ __name((i) => i.user.id === interaction.user.id && i.customId === snowflake, "filter")
+      }).catch(() => null);
+      if (!response) return;
+      await response.deferUpdate();
+      this.collector?.stop();
+      this.context.interaction = response;
+      const newState2 = await this.getNewStateFromCallback(component, response) ?? this.currentState?.name;
+      if (!newState2) return interaction.deleteReply();
+      return void this.changeState(newState2, interaction);
+    }
+    await interaction.deferUpdate();
+    this.collector?.stop();
+    this.context.interaction = interaction;
+    const newState = await this.getNewStateFromCallback(component) ?? this.currentState?.name;
+    if (!newState) return interaction.deleteReply();
+    return void this.changeState(newState, interaction);
+  }
+  async prepareMessageOptions(state) {
+    const messageData = await this.unwrap(state.message, this.context);
+    const components = await this.unwrap(messageData.components, this.context);
+    this.registerComponents(components);
+    console.log((0, import_node_util.inspect)(components, { depth: null }));
+    const messageOptions = {
+      components,
+      fetchReply: true,
+      flags: (messageData.ephemeral ? import_discord2.MessageFlags.Ephemeral : 0) | import_discord2.MessageFlags.IsComponentsV2
+    };
+    return messageOptions;
+  }
+  async getNewStateFromCallback(component, modalInteraction) {
+    if (!component.callback) return void 0;
+    if (typeof component.callback === "string") return component.callback;
+    if (component.modal) {
+      if (!modalInteraction) throw new PromptError("No modal submit interaction found when required.");
+      return component.callback(
+        this.context,
+        modalInteraction
+      );
+    }
+    return component.callback(
+      this.context
+    );
+  }
+  registerComponents(components) {
+    for (const builder of components) {
+      if (builder instanceof PromptButtonBuilder) {
+        const id = import_discord2.SnowflakeUtil.generate().toString();
+        builder.setCustomId(id);
+        this.components.set(id, {
+          ...builder.toJSON(),
+          custom_id: id,
+          callback: builder.getCallback(),
+          modal: builder.getModal()
+        });
+      } else if (builder instanceof PromptSelectMenuBuilder) {
+        const id = import_discord2.SnowflakeUtil.generate().toString();
+        builder.setCustomId(id);
+        this.components.set(id, {
+          ...builder.toJSON(),
+          custom_id: id,
+          callback: builder.getCallback(),
+          modal: builder.getModal()
+        });
+      } else if (builder instanceof import_discord2.SectionBuilder && builder.accessory instanceof PromptButtonBuilder) {
+        const id = import_discord2.SnowflakeUtil.generate().toString();
+        builder.accessory.setCustomId(id);
+        this.components.set(id, {
+          ...builder.accessory.toJSON(),
+          custom_id: id,
+          callback: builder.accessory.getCallback(),
+          modal: builder.accessory.getModal()
+        });
+      } else if ("components" in builder && Array.isArray(builder.components)) {
+        this.registerComponents(builder.components);
+      }
+    }
+  }
+  async unwrap(value, ...args) {
+    if (typeof value === "function") {
+      return value(...args);
+    }
+    return value;
+  }
+  async replyOrEdit(interaction, options) {
+    if (interaction.replied || interaction.deferred) {
+      return interaction.editReply({ components: options.components });
+    }
+    return interaction.reply(options);
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Prompt,
+  PromptButtonBuilder,
+  PromptError,
+  PromptSelectMenuBuilder
+});

package/dist/v2/index.mjs

@@ -0,0 +1,235 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+
+// src/v2/Prompt.ts
+import { inspect } from "util";
+import {
+  Collection,
+  MessageFlags,
+  SectionBuilder,
+  SnowflakeUtil
+} from "discord.js";
+
+// src/v2/prompt.types.ts
+import {
+  ButtonBuilder,
+  StringSelectMenuBuilder
+} from "discord.js";
+var PromptButtonBuilder = class extends ButtonBuilder {
+  static {
+    __name(this, "PromptButtonBuilder");
+  }
+  callback;
+  modal;
+  setCallback(callback) {
+    this.callback = callback;
+    return this;
+  }
+  getCallback() {
+    return this.callback;
+  }
+  setModal(modal) {
+    this.modal = modal;
+    return this;
+  }
+  getModal() {
+    return this.modal;
+  }
+};
+var PromptSelectMenuBuilder = class extends StringSelectMenuBuilder {
+  static {
+    __name(this, "PromptSelectMenuBuilder");
+  }
+  callback;
+  modal;
+  setCallback(callback) {
+    this.callback = callback;
+    return this;
+  }
+  getCallback() {
+    return this.callback;
+  }
+  setModal(modal) {
+    this.modal = modal;
+    return this;
+  }
+  getModal() {
+    return this.modal;
+  }
+};
+
+// src/v2/Prompt.ts
+var PromptError = class _PromptError extends Error {
+  static {
+    __name(this, "PromptError");
+  }
+  constructor(message) {
+    super(message);
+    Error.captureStackTrace?.(this, _PromptError);
+  }
+};
+var Prompt = class {
+  /** Creates the prompt with a given set of states */
+  constructor(defaults, initialState, states) {
+    this.initialState = initialState;
+    const previousStates = [];
+    const goBack = /* @__PURE__ */ __name(() => {
+      return this.context.previousStates.pop() ?? this.initialState;
+    }, "goBack");
+    this.context = { ...defaults, previousStates, goBack };
+    this.states = new Map(states.map((s) => [s.name, s]));
+  }
+  static {
+    __name(this, "Prompt");
+  }
+  /** The current context of this prompt */
+  context;
+  /** The current state */
+  currentState;
+  /** All components for this prompt */
+  components = new Collection();
+  /** The interaction collector */
+  collector;
+  /** The states represented in a map */
+  states;
+  /**
+   * Starts the prompt with a given interaction
+   * @param interaction The interaction starting off the sequence
+   * @returns {boolean} If true, the prompt started successfully
+   */
+  async start(interaction) {
+    this.context.interaction = interaction;
+    return this.changeState(this.initialState, interaction);
+  }
+  async changeState(newState, interaction) {
+    const state = this.states.get(newState);
+    if (!state) return Promise.reject(new PromptError(`State ${newState} not found.`));
+    this.context.previousStates.push(this.currentState?.name ?? this.initialState);
+    this.currentState = state;
+    const shouldChangeState = await state.onEntered?.(this.context);
+    if (shouldChangeState) return this.changeState(shouldChangeState, interaction);
+    this.components.clear();
+    const messageOptions = await this.prepareMessageOptions(state);
+    const msg = await this.replyOrEdit(interaction, messageOptions);
+    if (this.collector) this.collector.stop();
+    this.collector = msg.createMessageComponentCollector({
+      time: state.timeout || 12e4,
+      filter: /* @__PURE__ */ __name((i) => i.user.id === interaction.user.id, "filter")
+    });
+    this.collector.on("collect", this.handleCollect.bind(this));
+    return true;
+  }
+  async handleCollect(interaction) {
+    const component = this.components.get(interaction.customId);
+    if (!component) throw new PromptError(`Couldn't find component with customId: ${interaction.customId}`);
+    if (component.modal) {
+      const modal = await this.unwrap(component.modal, interaction);
+      if (!modal) {
+        await interaction.deferUpdate();
+        this.collector?.stop();
+        this.context.interaction = interaction;
+        const newState3 = await this.getNewStateFromCallback(component) ?? this.currentState?.name;
+        if (!newState3) return interaction.deleteReply();
+        return void this.changeState(newState3, interaction);
+      }
+      const snowflake = SnowflakeUtil.generate().toString();
+      modal.setCustomId(snowflake);
+      await interaction.showModal(modal);
+      const response = await interaction.awaitModalSubmit({
+        time: 3e5,
+        filter: /* @__PURE__ */ __name((i) => i.user.id === interaction.user.id && i.customId === snowflake, "filter")
+      }).catch(() => null);
+      if (!response) return;
+      await response.deferUpdate();
+      this.collector?.stop();
+      this.context.interaction = response;
+      const newState2 = await this.getNewStateFromCallback(component, response) ?? this.currentState?.name;
+      if (!newState2) return interaction.deleteReply();
+      return void this.changeState(newState2, interaction);
+    }
+    await interaction.deferUpdate();
+    this.collector?.stop();
+    this.context.interaction = interaction;
+    const newState = await this.getNewStateFromCallback(component) ?? this.currentState?.name;
+    if (!newState) return interaction.deleteReply();
+    return void this.changeState(newState, interaction);
+  }
+  async prepareMessageOptions(state) {
+    const messageData = await this.unwrap(state.message, this.context);
+    const components = await this.unwrap(messageData.components, this.context);
+    this.registerComponents(components);
+    console.log(inspect(components, { depth: null }));
+    const messageOptions = {
+      components,
+      fetchReply: true,
+      flags: (messageData.ephemeral ? MessageFlags.Ephemeral : 0) | MessageFlags.IsComponentsV2
+    };
+    return messageOptions;
+  }
+  async getNewStateFromCallback(component, modalInteraction) {
+    if (!component.callback) return void 0;
+    if (typeof component.callback === "string") return component.callback;
+    if (component.modal) {
+      if (!modalInteraction) throw new PromptError("No modal submit interaction found when required.");
+      return component.callback(
+        this.context,
+        modalInteraction
+      );
+    }
+    return component.callback(
+      this.context
+    );
+  }
+  registerComponents(components) {
+    for (const builder of components) {
+      if (builder instanceof PromptButtonBuilder) {
+        const id = SnowflakeUtil.generate().toString();
+        builder.setCustomId(id);
+        this.components.set(id, {
+          ...builder.toJSON(),
+          custom_id: id,
+          callback: builder.getCallback(),
+          modal: builder.getModal()
+        });
+      } else if (builder instanceof PromptSelectMenuBuilder) {
+        const id = SnowflakeUtil.generate().toString();
+        builder.setCustomId(id);
+        this.components.set(id, {
+          ...builder.toJSON(),
+          custom_id: id,
+          callback: builder.getCallback(),
+          modal: builder.getModal()
+        });
+      } else if (builder instanceof SectionBuilder && builder.accessory instanceof PromptButtonBuilder) {
+        const id = SnowflakeUtil.generate().toString();
+        builder.accessory.setCustomId(id);
+        this.components.set(id, {
+          ...builder.accessory.toJSON(),
+          custom_id: id,
+          callback: builder.accessory.getCallback(),
+          modal: builder.accessory.getModal()
+        });
+      } else if ("components" in builder && Array.isArray(builder.components)) {
+        this.registerComponents(builder.components);
+      }
+    }
+  }
+  async unwrap(value, ...args) {
+    if (typeof value === "function") {
+      return value(...args);
+    }
+    return value;
+  }
+  async replyOrEdit(interaction, options) {
+    if (interaction.replied || interaction.deferred) {
+      return interaction.editReply({ components: options.components });
+    }
+    return interaction.reply(options);
+  }
+};
+export {
+  Prompt,
+  PromptButtonBuilder,
+  PromptError,
+  PromptSelectMenuBuilder
+};

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@moody-djs/prompts",
 	"description": "A simple library for creating state based prompts in discord.js",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"main": "dist/index.js",
 	"scripts": {
 		"test": "tsc --noEmit --skipLibCheck",
@@ -29,6 +29,16 @@
 			"import": "./dist/v2/index.mjs"
 		}
 	},
+	"typesVersions": {
+		"*": {
+			"v2": [
+				"./dist/v2/index.d.ts"
+			],
+			"index": [
+				"./dist/index.d.ts"
+			]
+		}
+	},
 	"peerDependencies": {
 		"discord.js": "latest"
 	},

package/dist/Prompt.d.mts

@@ -1,42 +0,0 @@
-import { RepliableInteraction } from 'discord.js';
-import { PromptState } from './types/prompt.types.mjs';
-import './types/util.types.mjs';
-
-/**
- * A prompt that allows you to create a sequence of states that a user can go through
- * with discord.js buttons and select menus.
- *
- * @example
- * ```ts
- * const prompt = new Prompt<ContextType>(defaults, initialState.name, [...]);
- * await prompt.start(interaction);
- * ```
- */
-declare class Prompt<T extends object> {
-    initialState: string;
-    /** The current context of this prompt */
-    private context;
-    /** The current state */
-    private currentState?;
-    /** All components for this prompt */
-    private components;
-    /** The interaction collector */
-    private collector?;
-    /** The states represented in a map */
-    states: Map<string, PromptState<T>>;
-    /** Creates the prompt with a given set of states */
-    constructor(defaults: T, initialState: string, states: PromptState<T>[]);
-    /**
-     * Starts the prompt with a given interaction
-     * @param interaction The interaction starting off the sequence
-     * @returns {boolean} If true, the prompt started successfully
-     */
-    start(interaction: RepliableInteraction): Promise<boolean>;
-    private changeState;
-    private handleCollect;
-    private prepareMessageOptions;
-    private getNewStateFromCallback;
-    private formatComponents;
-}
-
-export { Prompt };

package/dist/Prompt.d.ts

@@ -1,42 +0,0 @@
-import { RepliableInteraction } from 'discord.js';
-import { PromptState } from './types/prompt.types.js';
-import './types/util.types.js';
-
-/**
- * A prompt that allows you to create a sequence of states that a user can go through
- * with discord.js buttons and select menus.
- *
- * @example
- * ```ts
- * const prompt = new Prompt<ContextType>(defaults, initialState.name, [...]);
- * await prompt.start(interaction);
- * ```
- */
-declare class Prompt<T extends object> {
-    initialState: string;
-    /** The current context of this prompt */
-    private context;
-    /** The current state */
-    private currentState?;
-    /** All components for this prompt */
-    private components;
-    /** The interaction collector */
-    private collector?;
-    /** The states represented in a map */
-    states: Map<string, PromptState<T>>;
-    /** Creates the prompt with a given set of states */
-    constructor(defaults: T, initialState: string, states: PromptState<T>[]);
-    /**
-     * Starts the prompt with a given interaction
-     * @param interaction The interaction starting off the sequence
-     * @returns {boolean} If true, the prompt started successfully
-     */
-    start(interaction: RepliableInteraction): Promise<boolean>;
-    private changeState;
-    private handleCollect;
-    private prepareMessageOptions;
-    private getNewStateFromCallback;
-    private formatComponents;
-}
-
-export { Prompt };