trivious 1.6.18 → 2.0.0

package/README.md

@@ -20,18 +20,17 @@ pnpm add trivious
 
 ```ts
 // src/index.ts
-import { TriviousClient, PermissionLevel } from "trivious";
+import { TriviousClient } from "trivious";
 import { GatewayIntentBits } from "discord.js";
 
 const client = new TriviousClient({
-	tokenReference: "BOT_TOKEN",
-	clientIdReference: "CLIENT_ID",
-	corePath: "core", // Folder containing commands/, events/, components/, modules/
-	intents: [GatewayIntentBits.Guilds],
-	rolePermissions: {
-		// Altneratively can be set via client.rolePermissions
-		"123456789012345678": PermissionLevel.GUILD_MODERATOR, // Role ID → PermissionLevel
+	credentials: {
+		tokenReference: "BOT_TOKEN",
+		clientIdReference: "CLIENT_ID",
 	},
+	corePath: "core", // Folder containing your bot's processes
+	intents: [GatewayIntentBits.Guilds],
+	ownerUserIds: ["1234"],
 });
 
 (async () => {
@@ -40,9 +39,9 @@ const client = new TriviousClient({
 		// Registers all commands, events, components, modules;
 		// Deploys slash commands globally and then logs into the bot
 
-		// To separately register commands, events, etc - use client.register()
 		// To separately deploy commands - use client.deploy() followed by client.login()
-	} catch (error) {
+	} catch (err: unknown) {
+		const error = err as Error;
 		console.error("Failed to start bot:", error);
 	}
 })();
@@ -53,36 +52,53 @@ const client = new TriviousClient({
 ### Included Default Events
 
 Trivious automatically includes and inserts `clientReady` and `interactionCreate` handlers, which can be overwritten.
-It is recommended to use the default interactionCreate handler, which requires zero input in your own code.
+It is recommended to use the default interactionCreate handler, which requires zero setup in your own code.
 
-These default events can be found in `src/core/events` in the Trivious repository.
+These default events can be found in `src/features/events/presets` in the Trivious repository.
 
 ---
 
 ### Creating a Slash Command
 
 ```ts
-// src/core/commands/debug/index.ts
+// commands/debug/index.ts
 import { SlashCommandBuilder } from "discord.js";
-import { PermissionLevel, SlashCommand } from "trivious";
+import { SlashCommandData } from "trivious";
 
 export default {
 	active: true,
 	context: "SlashCommand",
-	flags: ["OwnerOnly", "GuildOnly", "EphemeralReply", "DeferReply"],
-	permission: PermissionLevel.BOT_OWNER,
+	flags: ["Cached", "EphemeralReply", "DeferReply"],
 	data: new SlashCommandBuilder().setName("debug").setDescription("Debug commands"),
-} satisfies SlashCommand; // recommended for type-safety
+} satisfies SlashCommandData;
 ```
 
-> Subcommands go in the same directory as the command file and are auto-detected.
+### Creating a Subcommand Group
+
+```ts
+// commands/debug/config/index.ts
+import { Collection, SlashCommandSubcommandGroupBuilder } from "discord.js";
+import { SlashSubcommandGroupData } from "trivious";
+
+export default {
+	context: "SlashSubcommandGroup",
+	data: new SlashCommandSubcommandGroupBuilder()
+		.setName("config")
+		.setDescription("Config commands"),
+	subcommands: new Collection(),
+} satisfies SlashSubcommandGroupData;
+```
+
+> Subcommands go in the same directory as the subcommand group file and are auto-detected.
+
+---
 
 ### Creating a Subcommand
 
 ```ts
-// src/core/commands/debug/ping.ts
+// commands/debug/ping.ts
 import { SlashCommandSubcommandBuilder } from "discord.js";
-import { commandReply, SlashSubcommand } from "trivious";
+import { interactionReply, SlashSubcommandData } from "trivious";
 
 export default {
 	active: true,
@@ -92,61 +108,32 @@ export default {
 	async execute(client, interaction) {
 		const ping = (await interaction.fetchReply()).createdTimestamp - interaction.createdTimestamp;
 
-		await commandReply(this, interaction, {
-			content: `Pong!\nBot latency: ${ping}ms, API latency: ${client.ws.ping.toString()}ms`,
+		await interactionReply({
+			interaction,
+			replyPayload: {
+				content: `Pong!\nBot latency: ${ping}ms, API latency: ${client.ws.ping.toString()}ms`,
+			},
+			flags: ["EphemeralReply"],
 		});
 	},
-} satisfies SlashSubcommand; // recommended for type-safety
+} satisfies SlashSubcommandData;
 ```
 
 ---
 
-### Permission Levels
-
-```ts
-enum PermissionLevel {
-	USER = 0,
-	GUILD_STAFF = 1,
-	GUILD_MODERATOR = 2,
-	GUILD_ADMINISTRATOR = 3,
-	GUILD_OWNER = 4,
-	BOT_OWNER = 5,
-}
-```
-
-Set role permissions in client options
-
-```ts
-rolePermissions: {
-	"987654321098765432": PermissionLevel.GUILD_ADMINISTRATOR,
-	moderatorRole.id: PermissionLevel.GUILD_MODERATOR,
-}
-```
+### Project Structure
 
-Or dynamically at runtime:
+Any project structure (e.g. type-based, feature-based) is acceptable as long as everything you expect to be registered is within the core directory.
 
-```ts
-client.setRolePermissions({
-	"123456": PermissionLevel.GUILD_STAFF,
-});
-```
-
----
+For example, if all of your commands, components, events and modules are anywhere inside src/features, assuming they export the correct data, they will be detected and registered to the client.
 
-### Recommended Project Structure
+The only required specific structure are for slash commands, as shown below.
 
 ```
-src/
-├── core/
-│   ├── commands/
-│   │   └── debug/
-│   │       ├── index.ts
-│   │       └── ping.ts
-│   ├── events/
-│   │   └── ready.ts
-│   ├── components/
-│   │   └── ticket-create.ts
-│   └── modules/
-│       └── logging.ts
-└── index.ts
+command/
+├── index.ts
+├── subcommand.ts
+└── subcommand-group/
+		├── index.ts
+ 		└──subcommand.ts
 ```

package/dist/{core/builders/util.builders.d.ts → features/builders/utility.builders.d.ts}

@@ -2,19 +2,10 @@ import { MessageActionRowComponentBuilder, ActionRowBuilder, EmbedData, APIEmbed
 
 /**
  * Utility action row builder
- *
- * @export
- * @template {MessageActionRowComponentBuilder} T
- * @param {...T[]} builders
- * @returns {*}
  */
 declare function createActionRow<T extends MessageActionRowComponentBuilder>(...builders: T[]): ActionRowBuilder<T>;
 /**
  * Utility embed builder
- *
- * @export
- * @param {?(EmbedData | APIEmbed)} [data]
- * @returns {*}
  */
 declare function createEmbed(data?: EmbedData | APIEmbed): EmbedBuilder;
 

package/dist/{core/builders/util.builders.js → features/builders/utility.builders.js}

@@ -8,5 +8,5 @@ function createEmbed(data) {
 }
 
 export { createActionRow, createEmbed };
-//# sourceMappingURL=util.builders.js.map
-//# sourceMappingURL=util.builders.js.map
+//# sourceMappingURL=utility.builders.js.map
+//# sourceMappingURL=utility.builders.js.map

package/dist/features/builders/utility.builders.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/features/builders/utility.builders.ts"],"names":[],"mappings":";;AAWO,SAAS,mBAA+D,QAAA,EAAe;AAC7F,EAAA,OAAO,IAAI,gBAAA,EAAoB,CAAE,aAAA,CAAc,GAAG,QAAQ,CAAA;AAC3D;AAKO,SAAS,YAAY,IAAA,EAA6B;AACxD,EAAA,OAAO,IAAI,aAAa,IAAI,CAAA;AAC7B","file":"utility.builders.js","sourcesContent":["import {\n\tActionRowBuilder,\n\tAPIEmbed,\n\tEmbedBuilder,\n\tEmbedData,\n\tMessageActionRowComponentBuilder,\n} from \"discord.js\";\n\n/**\n * Utility action row builder\n */\nexport function createActionRow<T extends MessageActionRowComponentBuilder>(...builders: T[]) {\n\treturn new ActionRowBuilder<T>().setComponents(...builders);\n}\n\n/**\n * Utility embed builder\n */\nexport function createEmbed(data?: EmbedData | APIEmbed) {\n\treturn new EmbedBuilder(data);\n}\n"]}

package/dist/features/client/client.types.d.ts

@@ -0,0 +1,85 @@
+import { ClientOptions } from 'discord.js';
+
+/**
+ * Login credentials for the Discord application
+ *
+ * @param token Environment variable name for bot token
+ * @param clientId Environment variable name for bot client ID
+ */
+interface TriviousClientCredentials {
+    tokenRefernece: string;
+    clientIdReference: string;
+}
+/**
+ * Base interface for project structure
+ *
+ * @param useTypeBasedStructure Whether to use type-based structure or not
+ */
+interface TriviousStructure {
+    useTypeBasedStructure: boolean;
+}
+/**
+ * Type-based project structure configuration
+ *
+ * Everything is inside `src/core`; `src/core/commands`, `src/core/event`...
+ *
+ * Directory names of course can be different, but the default expected names are used unless configured otherwise by the user
+ *
+ * @param useTypeBasedStructure Identify as type-based structure
+ * @param corePath The path to the **core** directory
+ * @param commandsPath The path to the **commands** directory
+ * @param componentsPath The path to the **components** directory
+ * @param eventsPath The path to the **components** directory
+ * @param modulesPath The path to the **module** directory
+ */
+interface TypeBasedStructure extends TriviousStructure {
+    useTypeBasedStructure: true;
+    corePath: string;
+    commandsPath?: string;
+    componentPath?: string;
+    eventsPath?: string;
+    modulesPath?: string;
+}
+/**
+ * Feature-based structure configuration
+ *
+ * Everything is inside `src/features`; `src/features/moderation` and further; `src/features/moderation/commands/ban/index.ts`
+ *
+ * Feature directories are expected to contain command, component, event, and module directories.
+ * Though event and module directories remain optionally supported in the core path.
+ *
+ * @param useTypeBasedStructure Identify as feature-based structure
+ * @param featuresPath The path to the **features** directory
+ * @param corePath The path to the **core** directory - Commands and Components are NOT supported in this structure
+ */
+interface FeatureBasedStructure extends TriviousStructure {
+    useTypeBasedStructure: false;
+    featuresPath: string;
+    corePath?: string;
+}
+/**
+ * Command hash configuration for automatic command deployment
+ *
+ * @param enabled Whether this feature is enabled
+ * @param persistentDataPath The path to store the command hash, this should be persistent so the feature works as intended
+ */
+interface CommandHashConfiguration {
+    enabled: boolean;
+    persistentDataPath: string;
+}
+/**
+ * Trivious client options
+ *
+ * @param credentials Bot login credentials
+ * @param structurePaths Chosen project structure and relevant paths
+ * @param ownerUserIds Discord user IDs of bot owner(s)
+ * @param commandHashConfig Command auto-deployment configuration
+ */
+interface TriviousClientOptions extends ClientOptions {
+    credentials: TriviousClientCredentials;
+    corePath: string;
+    ownerUserIds?: string[];
+    commandHashConfig?: CommandHashConfiguration;
+}
+
+export type { CommandHashConfiguration, FeatureBasedStructure, TriviousClientCredentials, TriviousClientOptions, TriviousStructure, TypeBasedStructure };

package/dist/features/client/client.types.js

@@ -0,0 +1,3 @@
+
+//# sourceMappingURL=client.types.js.map
+//# sourceMappingURL=client.types.js.map

package/dist/{shared/typings/client.js.map → features/client/client.types.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"client.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"client.types.js"}

package/dist/features/client/deploy.client.d.ts

@@ -0,0 +1,7 @@
+import { T as TriviousClient } from '../../modules.types-Bn4HfuVk.js';
+import 'discord.js';
+import './client.types.js';
+
+declare function commandDeploy(client: TriviousClient): Promise<void>;
+
+export { commandDeploy as default };

package/dist/features/client/deploy.client.js

@@ -0,0 +1,43 @@
+import { createHash } from 'crypto';
+import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { REST, Routes } from 'discord.js';
+import { TriviousError } from '../../utility/errors.js';
+
+async function commandDeploy(client) {
+  const { commandHashConfig } = client.trivious;
+  const clientId = process.env[client.trivious.credentials.clientIdReference];
+  const token = process.env[client.trivious.credentials.tokenRefernece];
+  if (!clientId || !token)
+    throw new TriviousError("Invalid clientId or token environment variable");
+  const commands = client.stores.commands;
+  const body = [
+    ...commands.chatInput.map((command) => command.data.toJSON()),
+    ...commands.context.map(
+      (command) => command.data.toJSON()
+    )
+  ];
+  if (commandHashConfig && commandHashConfig.enabled) {
+    const hashFile = join(commandHashConfig.persistentDataPath || "data", "commands.hash");
+    const newHash = createHash("sha256").update(JSON.stringify(body.sort((a, b) => a.name.localeCompare(b.name))).toString()).digest("hex");
+    let oldHash = "";
+    if (existsSync(hashFile)) oldHash = readFileSync(hashFile, "utf-8");
+    if (newHash === oldHash) {
+      console.debug(`[Trivious] No changes in commands found, skipping deployment.`);
+      return;
+    }
+    const hashDirectory = dirname(hashFile);
+    if (!existsSync(hashDirectory)) {
+      mkdirSync(hashDirectory, { recursive: true });
+    }
+    writeFileSync(hashFile, newHash, { encoding: "utf-8" });
+    console.debug(`[Trivious] Created new command hash: ${hashFile}`);
+  }
+  const rest = new REST({ version: "10" }).setToken(token);
+  await rest.put(Routes.applicationCommands(clientId), { body });
+  console.debug(`[Trivious] Deployed ${body.length} commands`);
+}
+
+export { commandDeploy as default };
+//# sourceMappingURL=deploy.client.js.map
+//# sourceMappingURL=deploy.client.js.map

package/dist/features/client/deploy.client.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/features/client/deploy.client.ts"],"names":[],"mappings":";;;;;;AAQA,eAAO,cAAqC,MAAA,EAAwB;AACnE,EAAA,MAAM,EAAE,iBAAA,EAAkB,GAAI,MAAA,CAAO,QAAA;AAErC,EAAA,MAAM,WAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,CAAO,QAAA,CAAS,YAAY,iBAAiB,CAAA;AAC1E,EAAA,MAAM,QAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,CAAO,QAAA,CAAS,YAAY,cAAc,CAAA;AACpE,EAAA,IAAI,CAAC,YAAY,CAAC,KAAA;AACjB,IAAA,MAAM,IAAI,cAAc,gDAAgD,CAAA;AAEzE,EAAA,MAAM,QAAA,GAAW,OAAO,MAAA,CAAO,QAAA;AAC/B,EAAA,MAAM,IAAA,GAAO;AAAA,IACZ,GAAG,SAAS,SAAA,CAAU,GAAA,CAAI,CAAC,OAAA,KAAY,OAAA,CAAQ,IAAA,CAAK,MAAA,EAAQ,CAAA;AAAA,IAC5D,GAAG,SAAS,OAAA,CAAQ,GAAA;AAAA,MAAI,CAAC,OAAA,KACvB,OAAA,CAAiD,IAAA,CAAK,MAAA;AAAO;AAC/D,GACD;AAEA,EAAA,IAAI,iBAAA,IAAqB,kBAAkB,OAAA,EAAS;AACnD,IAAA,MAAM,QAAA,GAAW,IAAA,CAAK,iBAAA,CAAkB,kBAAA,IAAsB,QAAQ,eAAe,CAAA;AACrF,IAAA,MAAM,OAAA,GAAU,UAAA,CAAW,QAAQ,CAAA,CACjC,MAAA,CAAO,KAAK,SAAA,CAAU,IAAA,CAAK,IAAA,CAAK,CAAC,CAAA,EAAG,CAAA,KAAM,EAAE,IAAA,CAAK,aAAA,CAAc,CAAA,CAAE,IAAI,CAAC,CAAC,EAAE,QAAA,EAAU,CAAA,CACnF,MAAA,CAAO,KAAK,CAAA;AAEd,IAAA,IAAI,OAAA,GAAU,EAAA;AACd,IAAA,IAAI,WAAW,QAAQ,CAAA,EAAG,OAAA,GAAU,YAAA,CAAa,UAAU,OAAO,CAAA;AAElE,IAAA,IAAI,YAAY,OAAA,EAAS;AACxB,MAAA,OAAA,CAAQ,MAAM,CAAA,6DAAA,CAA+D,CAAA;AAC7E,MAAA;AAAA,IACD;AAEA,IAAA,MAAM,aAAA,GAAgB,QAAQ,QAAQ,CAAA;AACtC,IAAA,IAAI,CAAC,UAAA,CAAW,aAAa,CAAA,EAAG;AAC/B,MAAA,SAAA,CAAU,aAAA,EAAe,EAAE,SAAA,EAAW,IAAA,EAAM,CAAA;AAAA,IAC7C;AAEA,IAAA,aAAA,CAAc,QAAA,EAAU,OAAA,EAAS,EAAE,QAAA,EAAU,SAAS,CAAA;AACtD,IAAA,OAAA,CAAQ,KAAA,CAAM,CAAA,qCAAA,EAAwC,QAAQ,CAAA,CAAE,CAAA;AAAA,EACjE;AAEA,EAAA,MAAM,IAAA,GAAO,IAAI,IAAA,CAAK,EAAE,SAAS,IAAA,EAAM,CAAA,CAAE,QAAA,CAAS,KAAK,CAAA;AACvD,EAAA,MAAM,IAAA,CAAK,IAAI,MAAA,CAAO,mBAAA,CAAoB,QAAQ,CAAA,EAAG,EAAE,MAAM,CAAA;AAC7D,EAAA,OAAA,CAAQ,KAAA,CAAM,CAAA,oBAAA,EAAuB,IAAA,CAAK,MAAM,CAAA,SAAA,CAAW,CAAA;AAC5D","file":"deploy.client.js","sourcesContent":["import { createHash } from \"crypto\";\nimport { existsSync, mkdirSync, readFileSync, writeFileSync } from \"fs\";\nimport { dirname, join } from \"path\";\nimport { REST, Routes } from \"discord.js\";\nimport { TriviousError } from \"src/utility/errors.js\";\nimport { MessageCommandData, UserCommandData } from \"../commands/commands.types.js\";\nimport TriviousClient from \"./trivious.client.js\";\n\nexport default async function commandDeploy(client: TriviousClient) {\n\tconst { commandHashConfig } = client.trivious;\n\n\tconst clientId = process.env[client.trivious.credentials.clientIdReference];\n\tconst token = process.env[client.trivious.credentials.tokenRefernece];\n\tif (!clientId || !token)\n\t\tthrow new TriviousError(\"Invalid clientId or token environment variable\");\n\n\tconst commands = client.stores.commands;\n\tconst body = [\n\t\t...commands.chatInput.map((command) => command.data.toJSON()),\n\t\t...commands.context.map((command) =>\n\t\t\t(command as UserCommandData | MessageCommandData).data.toJSON()\n\t\t),\n\t];\n\n\tif (commandHashConfig && commandHashConfig.enabled) {\n\t\tconst hashFile = join(commandHashConfig.persistentDataPath || \"data\", \"commands.hash\");\n\t\tconst newHash = createHash(\"sha256\")\n\t\t\t.update(JSON.stringify(body.sort((a, b) => a.name.localeCompare(b.name))).toString())\n\t\t\t.digest(\"hex\");\n\n\t\tlet oldHash = \"\";\n\t\tif (existsSync(hashFile)) oldHash = readFileSync(hashFile, \"utf-8\");\n\n\t\tif (newHash === oldHash) {\n\t\t\tconsole.debug(`[Trivious] No changes in commands found, skipping deployment.`);\n\t\t\treturn;\n\t\t}\n\n\t\tconst hashDirectory = dirname(hashFile);\n\t\tif (!existsSync(hashDirectory)) {\n\t\t\tmkdirSync(hashDirectory, { recursive: true });\n\t\t}\n\n\t\twriteFileSync(hashFile, newHash, { encoding: \"utf-8\" });\n\t\tconsole.debug(`[Trivious] Created new command hash: ${hashFile}`);\n\t}\n\n\tconst rest = new REST({ version: \"10\" }).setToken(token);\n\tawait rest.put(Routes.applicationCommands(clientId), { body });\n\tconsole.debug(`[Trivious] Deployed ${body.length} commands`);\n}\n"]}

package/dist/features/client/trivious.client.d.ts

@@ -0,0 +1,3 @@
+import 'discord.js';
+import './client.types.js';
+export { T as default } from '../../modules.types-Bn4HfuVk.js';

package/dist/features/client/trivious.client.js

@@ -0,0 +1,62 @@
+import { Client, Collection } from 'discord.js';
+import registries from '../../shared/registries.js';
+import structure from '../structure/index.structure.js';
+import { TriviousError } from '../../utility/errors.js';
+import commandDeploy from './deploy.client.js';
+
+class TriviousClient extends Client {
+  trivious;
+  stores;
+  constructor(options) {
+    super(options);
+    this.trivious = options;
+    this.stores = {
+      commands: {
+        chatInput: new Collection(),
+        context: new Collection()
+      },
+      components: new Collection(),
+      events: new Collection(),
+      modules: new Collection()
+    };
+  }
+  /**
+   * Register, deploy and log into the bot.
+   *
+   * @throws {TriviousError} If invalid bot token
+   */
+  async start() {
+    const token = process.env[this.trivious.credentials.tokenRefernece];
+    if (!token) {
+      throw new TriviousError(
+        `Bot token environment variable '${this.trivious.credentials.tokenRefernece}' does not exist!`,
+        "Null environment variable"
+      );
+    }
+    await this.register();
+    await this.deploy();
+    try {
+      await registries.events.bind(this);
+      await registries.modules.bind(this);
+    } catch (err) {
+      const error = new TriviousError(err.message, "Error during events and modules binds");
+      console.error(error);
+    }
+    await this.login(token);
+  }
+  async register() {
+    const dir = structure.resolveRelativePath(this.trivious.corePath);
+    await registries.events.register(this, dir);
+    await registries.modules.register(this, dir);
+    await registries.commands.register(this, dir);
+    await registries.components.register(this, dir);
+    console.log(this.stores);
+  }
+  async deploy() {
+    await commandDeploy(this);
+  }
+}
+
+export { TriviousClient as default };
+//# sourceMappingURL=trivious.client.js.map
+//# sourceMappingURL=trivious.client.js.map

package/dist/features/client/trivious.client.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/features/client/trivious.client.ts"],"names":[],"mappings":";;;;;;AAeA,MAAO,uBAAqC,MAAA,CAAO;AAAA,EAClD,QAAA;AAAA,EACS,MAAA;AAAA,EAUT,YAAY,OAAA,EAAgC;AAC3C,IAAA,KAAA,CAAM,OAAO,CAAA;AACb,IAAA,IAAA,CAAK,QAAA,GAAW,OAAA;AAEhB,IAAA,IAAA,CAAK,MAAA,GAAS;AAAA,MACb,QAAA,EAAU;AAAA,QACT,SAAA,EAAW,IAAI,UAAA,EAAW;AAAA,QAC1B,OAAA,EAAS,IAAI,UAAA;AAAW,OACzB;AAAA,MACA,UAAA,EAAY,IAAI,UAAA,EAAW;AAAA,MAC3B,MAAA,EAAQ,IAAI,UAAA,EAAW;AAAA,MACvB,OAAA,EAAS,IAAI,UAAA;AAAW,KACzB;AAAA,EACD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,MAAM,KAAA,GAAQ;AACb,IAAA,MAAM,QAAQ,OAAA,CAAQ,GAAA,CAAI,IAAA,CAAK,QAAA,CAAS,YAAY,cAAc,CAAA;AAClE,IAAA,IAAI,CAAC,KAAA,EAAO;AACX,MAAA,MAAM,IAAI,aAAA;AAAA,QACT,CAAA,gCAAA,EAAmC,IAAA,CAAK,QAAA,CAAS,WAAA,CAAY,cAAc,CAAA,iBAAA,CAAA;AAAA,QAC3E;AAAA,OACD;AAAA,IACD;AAEA,IAAA,MAAM,KAAK,QAAA,EAAS;AACpB,IAAA,MAAM,KAAK,MAAA,EAAO;AAElB,IAAA,IAAI;AACH,MAAA,MAAM,UAAA,CAAW,MAAA,CAAO,IAAA,CAAK,IAAI,CAAA;AACjC,MAAA,MAAM,UAAA,CAAW,OAAA,CAAQ,IAAA,CAAK,IAAI,CAAA;AAAA,IACnC,SAAS,GAAA,EAAU;AAClB,MAAA,MAAM,KAAA,GAAQ,IAAI,aAAA,CAAc,GAAA,CAAI,SAAS,uCAAuC,CAAA;AACpF,MAAA,OAAA,CAAQ,MAAM,KAAK,CAAA;AAAA,IACpB;AAEA,IAAA,MAAM,IAAA,CAAK,MAAM,KAAK,CAAA;AAAA,EACvB;AAAA,EAEA,MAAM,QAAA,GAAW;AAChB,IAAA,MAAM,GAAA,GAAM,SAAA,CAAU,mBAAA,CAAoB,IAAA,CAAK,SAAS,QAAQ,CAAA;AAEhE,IAAA,MAAM,UAAA,CAAW,MAAA,CAAO,QAAA,CAAS,IAAA,EAAM,GAAG,CAAA;AAC1C,IAAA,MAAM,UAAA,CAAW,OAAA,CAAQ,QAAA,CAAS,IAAA,EAAM,GAAG,CAAA;AAC3C,IAAA,MAAM,UAAA,CAAW,QAAA,CAAS,QAAA,CAAS,IAAA,EAAM,GAAG,CAAA;AAC5C,IAAA,MAAM,UAAA,CAAW,UAAA,CAAW,QAAA,CAAS,IAAA,EAAM,GAAG,CAAA;AAE9C,IAAA,OAAA,CAAQ,GAAA,CAAI,KAAK,MAAM,CAAA;AAAA,EACxB;AAAA,EAEA,MAAM,MAAA,GAAS;AACd,IAAA,MAAM,cAAc,IAAI,CAAA;AAAA,EACzB;AACD","file":"trivious.client.js","sourcesContent":["import { Client, Collection } from \"discord.js\";\nimport registries from \"src/shared/registries.js\";\nimport structure from \"../structure/index.structure.js\";\n\nimport type {\n\tBaseContextCommandData,\n\tComponent,\n\tEvent,\n\tModule,\n\tSlashCommandData,\n\tTriviousClientOptions,\n} from \"#typings\";\nimport { TriviousError } from \"#utility/errors.js\";\nimport commandDeploy from \"./deploy.client.js\";\n\nexport default class TriviousClient extends Client {\n\ttrivious: TriviousClientOptions;\n\treadonly stores: {\n\t\tcommands: {\n\t\t\tchatInput: Collection<string, SlashCommandData>;\n\t\t\tcontext: Collection<string, BaseContextCommandData>;\n\t\t};\n\t\tcomponents: Collection<string, Component>;\n\t\tevents: Collection<string, Event>;\n\t\tmodules: Collection<string, Module>;\n\t};\n\n\tconstructor(options: TriviousClientOptions) {\n\t\tsuper(options);\n\t\tthis.trivious = options;\n\n\t\tthis.stores = {\n\t\t\tcommands: {\n\t\t\t\tchatInput: new Collection(),\n\t\t\t\tcontext: new Collection(),\n\t\t\t},\n\t\t\tcomponents: new Collection(),\n\t\t\tevents: new Collection(),\n\t\t\tmodules: new Collection(),\n\t\t};\n\t}\n\n\t/**\n\t * Register, deploy and log into the bot.\n\t *\n\t * @throws {TriviousError} If invalid bot token\n\t */\n\tasync start() {\n\t\tconst token = process.env[this.trivious.credentials.tokenRefernece];\n\t\tif (!token) {\n\t\t\tthrow new TriviousError(\n\t\t\t\t`Bot token environment variable '${this.trivious.credentials.tokenRefernece}' does not exist!`,\n\t\t\t\t\"Null environment variable\"\n\t\t\t);\n\t\t}\n\n\t\tawait this.register();\n\t\tawait this.deploy();\n\n\t\ttry {\n\t\t\tawait registries.events.bind(this);\n\t\t\tawait registries.modules.bind(this);\n\t\t} catch (err: any) {\n\t\t\tconst error = new TriviousError(err.message, \"Error during events and modules binds\");\n\t\t\tconsole.error(error);\n\t\t}\n\n\t\tawait this.login(token);\n\t}\n\n\tasync register() {\n\t\tconst dir = structure.resolveRelativePath(this.trivious.corePath);\n\n\t\tawait registries.events.register(this, dir);\n\t\tawait registries.modules.register(this, dir);\n\t\tawait registries.commands.register(this, dir);\n\t\tawait registries.components.register(this, dir);\n\n\t\tconsole.log(this.stores);\n\t}\n\n\tasync deploy() {\n\t\tawait commandDeploy(this);\n\t}\n}\n"]}

package/dist/features/commands/commands.types.d.ts

@@ -0,0 +1,3 @@
+import 'discord.js';
+export { d as BaseChatInputCommandData, B as BaseCommandData, e as BaseContextCommandData, C as ChatInputCommandContext, b as ChatInputCommandFunction, a as CommandFlags, h as ContextCommandData, c as ContextMenuCommandFunction, M as MessageCommandData, S as SlashCommandData, g as SlashSubcommandData, f as SlashSubcommandGroupData, U as UserCommandData } from '../../modules.types-Bn4HfuVk.js';
+import '../client/client.types.js';

package/dist/features/commands/commands.types.js

@@ -0,0 +1,3 @@
+
+//# sourceMappingURL=commands.types.js.map
+//# sourceMappingURL=commands.types.js.map

package/dist/{shared/typings/commands.js.map → features/commands/commands.types.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"commands.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"commands.types.js"}

package/dist/features/commands/methods.commands.d.ts

@@ -0,0 +1,13 @@
+import * as discord_js from 'discord.js';
+import { Interaction, CacheType, InteractionReplyOptions, InteractionEditReplyOptions, MessagePayload, ChatInputCommandInteraction } from 'discord.js';
+import { a as CommandFlags, T as TriviousClient, S as SlashCommandData } from '../../modules.types-Bn4HfuVk.js';
+import '../client/client.types.js';
+
+declare function interactionReply(options: {
+    interaction: Interaction<CacheType>;
+    replyPayload: InteractionReplyOptions | InteractionEditReplyOptions | MessagePayload;
+    flags?: (CommandFlags | "FollowUp")[];
+}): Promise<discord_js.Message<boolean> | discord_js.InteractionResponse<boolean> | undefined>;
+declare function handleSlashCommand(client: TriviousClient, command: SlashCommandData, interaction: ChatInputCommandInteraction): Promise<void>;
+
+export { handleSlashCommand, interactionReply };

package/dist/features/commands/methods.commands.js

@@ -0,0 +1,70 @@
+async function interactionReply(options) {
+  const { interaction, replyPayload, flags } = options;
+  if (!("reply" in interaction)) return;
+  const payload = replyPayload;
+  if (flags?.includes("EphemeralReply")) payload.flags = ["Ephemeral"];
+  if (interaction.deferred || interaction.replied) {
+    if (flags?.includes("FollowUp")) return await interaction.followUp(payload);
+    return await interaction.editReply(payload);
+  }
+  return await interaction.reply(payload);
+}
+async function handleSlashCommand(client, command, interaction) {
+  const { options } = interaction;
+  if (command.flags?.includes("Cached") && !interaction.inCachedGuild()) return;
+  if (command.flags?.includes("ExpectModal")) return;
+  if (command.flags?.includes("DeferReply")) {
+    await interactionReply({
+      interaction,
+      flags: command.flags,
+      replyPayload: { content: "Processing command..." }
+    });
+  }
+  if ("run" in command && command.run) {
+    try {
+      await command.run(client, interaction);
+    } catch (err) {
+      console.error(err);
+    }
+  }
+  const subcommandGroup = options.getSubcommandGroup(false);
+  const subcommand = options.getSubcommand(false);
+  if (subcommandGroup && command.subcommandGroups && subcommand) {
+    const foundGroup = command.subcommandGroups.get(subcommandGroup);
+    if (!foundGroup) {
+      await interactionReply({
+        interaction,
+        flags: ["EphemeralReply"],
+        replyPayload: {
+          content: "Subcommand group is outdated, inactive, or does not have a handler!"
+        }
+      });
+      return;
+    }
+    const foundSubcommand = foundGroup.subcommands.get(subcommand);
+    if (!foundSubcommand) {
+      await interactionReply({
+        interaction,
+        flags: ["EphemeralReply"],
+        replyPayload: { content: "Subcommand is outdated, inactive, or does not have a handler!" }
+      });
+      return;
+    }
+    return await foundSubcommand.execute(client, interaction);
+  } else if (subcommand && command.subcommands) {
+    const foundSubcommand = command.subcommands.get(subcommand);
+    if (!foundSubcommand) {
+      await interactionReply({
+        interaction,
+        flags: ["EphemeralReply"],
+        replyPayload: { content: "Subcommand is outdated, inactive, or does not have a handler!" }
+      });
+      return;
+    }
+    return await foundSubcommand.execute(client, interaction);
+  }
+}
+
+export { handleSlashCommand, interactionReply };
+//# sourceMappingURL=methods.commands.js.map
+//# sourceMappingURL=methods.commands.js.map

package/dist/features/commands/methods.commands.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/features/commands/methods.commands.ts"],"names":[],"mappings":"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","file":"methods.commands.js","sourcesContent":["import type {\n\tCacheType,\n\tChatInputCommandInteraction,\n\tInteraction,\n\tInteractionEditReplyOptions,\n\tInteractionReplyOptions,\n\tMessagePayload,\n} from \"discord.js\";\nimport type { CommandFlags, SlashCommandData, TriviousClient } from \"#typings\";\n\nexport async function interactionReply(options: {\n\tinteraction: Interaction<CacheType>;\n\treplyPayload: InteractionReplyOptions | InteractionEditReplyOptions | MessagePayload;\n\tflags?: (CommandFlags | \"FollowUp\")[];\n}) {\n\tconst { interaction, replyPayload, flags } = options;\n\tif (!(\"reply\" in interaction)) return;\n\n\tconst payload = replyPayload as InteractionReplyOptions;\n\tif (flags?.includes(\"EphemeralReply\")) payload.flags = [\"Ephemeral\"];\n\n\tif (interaction.deferred || interaction.replied) {\n\t\tif (flags?.includes(\"FollowUp\")) return await interaction.followUp(payload);\n\t\treturn await interaction.editReply(payload as InteractionEditReplyOptions);\n\t}\n\n\treturn await interaction.reply(payload);\n}\n\nexport async function handleSlashCommand(\n\tclient: TriviousClient,\n\tcommand: SlashCommandData,\n\tinteraction: ChatInputCommandInteraction\n) {\n\tconst { options } = interaction;\n\n\tif (command.flags?.includes(\"Cached\") && !interaction.inCachedGuild()) return;\n\tif (command.flags?.includes(\"ExpectModal\")) return;\n\tif (command.flags?.includes(\"DeferReply\")) {\n\t\tawait interactionReply({\n\t\t\tinteraction,\n\t\t\tflags: command.flags,\n\t\t\treplyPayload: { content: \"Processing command...\" },\n\t\t});\n\t}\n\n\tif (\"run\" in command && command.run) {\n\t\ttry {\n\t\t\tawait command.run(client, interaction);\n\t\t} catch (err: any) {\n\t\t\tconsole.error(err);\n\t\t}\n\t}\n\n\tconst subcommandGroup = options.getSubcommandGroup(false);\n\tconst subcommand = options.getSubcommand(false);\n\n\tif (subcommandGroup && command.subcommandGroups && subcommand) {\n\t\tconst foundGroup = command.subcommandGroups.get(subcommandGroup);\n\t\tif (!foundGroup) {\n\t\t\tawait interactionReply({\n\t\t\t\tinteraction,\n\t\t\t\tflags: [\"EphemeralReply\"],\n\t\t\t\treplyPayload: {\n\t\t\t\t\tcontent: \"Subcommand group is outdated, inactive, or does not have a handler!\",\n\t\t\t\t},\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\n\t\tconst foundSubcommand = foundGroup.subcommands.get(subcommand);\n\t\tif (!foundSubcommand) {\n\t\t\tawait interactionReply({\n\t\t\t\tinteraction,\n\t\t\t\tflags: [\"EphemeralReply\"],\n\t\t\t\treplyPayload: { content: \"Subcommand is outdated, inactive, or does not have a handler!\" },\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\n\t\treturn await foundSubcommand.execute(client, interaction);\n\t} else if (subcommand && command.subcommands) {\n\t\tconst foundSubcommand = command.subcommands.get(subcommand);\n\t\tif (!foundSubcommand) {\n\t\t\tawait interactionReply({\n\t\t\t\tinteraction,\n\t\t\t\tflags: [\"EphemeralReply\"],\n\t\t\t\treplyPayload: { content: \"Subcommand is outdated, inactive, or does not have a handler!\" },\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\n\t\treturn await foundSubcommand.execute(client, interaction);\n\t}\n}\n"]}

package/dist/features/commands/registry.commands.d.ts

@@ -0,0 +1,7 @@
+import { T as TriviousClient } from '../../modules.types-Bn4HfuVk.js';
+import 'discord.js';
+import '../client/client.types.js';
+
+declare function registerCommands(client: TriviousClient, directory: string): Promise<void>;
+
+export { registerCommands as default };

package/dist/features/commands/registry.commands.js

@@ -0,0 +1,84 @@
+import { TriviousError } from '../../utility/errors.js';
+import { importFile } from '../../utility/functions.js';
+import { Collection, ApplicationCommandType } from 'discord.js';
+import { existsSync, promises } from 'fs';
+import path, { join } from 'path';
+
+function validateCommand(command, expects) {
+  if (!("active" in command && "commandType" in command)) return false;
+  if (!command.active) return false;
+  return expects(command);
+}
+async function parseSlashSubcommands(directory, data) {
+  const subcommands = new Collection();
+  const files = promises.glob(join(directory, "./*.js"));
+  for await (const file of files) {
+    const subcommand = await importFile(file);
+    if (!subcommand || !validateCommand(subcommand, (subcmd) => subcmd.context === "SlashSubcommand"))
+      continue;
+    subcommand.parent = data;
+    subcommands.set(subcommand.data.name, subcommand);
+  }
+  if (subcommands.size > 0) data.subcommands = subcommands;
+  return subcommands;
+}
+async function parseSlashCommand(file, parentDir, subdirectories) {
+  if (!existsSync(file)) return;
+  const command = await importFile(file);
+  if (!command || !validateCommand(command, (cmd) => cmd.context === "SlashCommand")) return;
+  await parseSlashSubcommands(parentDir, command);
+  for (const subdir of subdirectories) {
+    const indexFile = path.resolve(subdir.parentPath, subdir.name, "index.js");
+    if (!existsSync(indexFile)) continue;
+    const group = await importFile(indexFile);
+    if (!group || !("context" in group) || group.context !== "SlashSubcommandGroup") continue;
+    group.parent = command;
+    if (!command.subcommandGroups) command.subcommandGroups = new Collection();
+    await parseSlashSubcommands(join(subdir.parentPath, subdir.name), group);
+    if (group.subcommands.size > 0) command.subcommandGroups.set(group.data.name, group);
+  }
+  return command;
+}
+async function parseContextCommands(parentDir) {
+  const collection = new Collection();
+  const files = promises.glob(join(parentDir, "**/*.js"));
+  for await (const file of files) {
+    const contextCommand = await importFile(file);
+    if (!contextCommand || !validateCommand(
+      contextCommand,
+      (cmd) => cmd.commandType === ApplicationCommandType.Message || cmd.commandType === ApplicationCommandType.User
+    ))
+      continue;
+    contextCommand.data.setType(contextCommand.commandType);
+    collection.set(contextCommand.data.name, contextCommand);
+  }
+  return collection;
+}
+async function registerDirectory(client, parentDir) {
+  const entries = await promises.readdir(parentDir, { withFileTypes: true });
+  const subdirectories = entries.filter((entry) => entry.isDirectory());
+  const indexFile = path.resolve(parentDir, "index.js");
+  const slashCommand = await parseSlashCommand(indexFile, parentDir, subdirectories);
+  if (slashCommand) client.stores.commands.chatInput.set(slashCommand.data.name, slashCommand);
+  const contextCommands = await parseContextCommands(parentDir);
+  contextCommands.forEach((cmd) => client.stores.commands.context.set(cmd.data.name, cmd));
+}
+async function registerCommands(client, directory) {
+  if (!existsSync(directory))
+    throw new TriviousError(
+      `Could not register commands; passed directory '${directory}' does not exist!`,
+      "Nonexistant directory passed"
+    );
+  const processedDirectories = /* @__PURE__ */ new Set();
+  const files = promises.glob(join(directory, "**/*.js"));
+  for await (const file of files) {
+    const parentDir = path.dirname(file);
+    if (processedDirectories.has(parentDir)) continue;
+    processedDirectories.add(parentDir);
+    await registerDirectory(client, parentDir);
+  }
+}
+
+export { registerCommands as default };
+//# sourceMappingURL=registry.commands.js.map
+//# sourceMappingURL=registry.commands.js.map