trivious 2.3.5 → 2.3.6

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

@@ -1,4 +1,4 @@
-import { T as TriviousClient } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import './client.types.js';
 import '../permissions/permissions.types.js';

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

@@ -1,5 +1,5 @@
 import 'discord.js';
 import './client.types.js';
-export { T as default } from '../../modules.types-hjAYMYut.js';
+export { T as default } from '../../modules.types-D-tuJArP.js';
 import './logger.js';
 import '../permissions/permissions.types.js';

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

@@ -1,4 +1,4 @@
-import { j as ContextCommandData, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData } from '../../modules.types-hjAYMYut.js';
+import { j as ContextCommandData, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';

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

@@ -1,5 +1,5 @@
 import 'discord.js';
-export { B as BaseChatInputCommandData, a as BaseCommandData, C as ChatInputCommandContext, b as CollatedCommandData, c as CommandFlags, d as CommandFunction, e as CommandSetData, j as ContextCommandData, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData } from '../../modules.types-hjAYMYut.js';
+export { B as BaseChatInputCommandData, a as BaseCommandData, C as ChatInputCommandContext, b as CollatedCommandData, c as CommandFlags, d as CommandFunction, e as CommandSetData, j as ContextCommandData, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData } from '../../modules.types-D-tuJArP.js';
 import '../permissions/permissions.types.js';
 import '../client/client.types.js';
 import '../client/logger.js';

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

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, Interaction, CacheType, InteractionReplyOptions, InteractionResponse, InteractionEditReplyOptions, Message, MessagePayload } from 'discord.js';
-import { T as TriviousClient, S as SlashCommandData, c as CommandFlags } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient, S as SlashCommandData, c as CommandFlags } from '../../modules.types-D-tuJArP.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';
 import '../client/logger.js';

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

@@ -1,4 +1,4 @@
-import { T as TriviousClient } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';

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

@@ -1,6 +1,6 @@
 import { TriviousError } from "../../utility/errors.js";
 import { importFile } from "../../utility/functions.js";
-import { Collection } from "discord.js";
+import { ApplicationCommandType, Collection } from "discord.js";
 import { existsSync, promises as fs } from "fs";
 import path from "path";
 async function parseBase(input, expects) {
@@ -15,12 +15,9 @@ async function parseBase(input, expects) {
 async function parseDirectory(data, directory) {
   const files = fs.glob(path.join(directory, "*.{js,ts}"));
   for await (const file of files) {
-    const base = await parseBase(
-      file,
-      (base2) => "context" in base2 && !!base2.context
-    );
+    const base = await parseBase(file);
     if (!base) continue;
-    const targetSet = data[base.context];
+    const targetSet = "context" in base ? data[base.context] : "commandType" in base && (base.commandType === ApplicationCommandType.Message || base.commandType === ApplicationCommandType.User) ? data.ContextCommand : null;
     if (targetSet) targetSet.add([base, directory]);
   }
 }
@@ -82,35 +79,55 @@ async function setChildrenToParents(data) {
     parent.data.addSubcommand(subcommand.data);
   }
 }
+async function registerSlashCommands(client, data) {
+  await setChildrenToParents(data);
+  for (const [slashCommand] of data.SlashCommand) {
+    if (client.stores.commands.chatInput.get(slashCommand.data.name))
+      client.logger.warn(
+        `Command '${slashCommand.data.name}' has been overridden by a command with the same name`
+      );
+    client.logger.debug("Registered slash command:", slashCommand.data.name);
+    client.stores.commands.chatInput.set(slashCommand.data.name, slashCommand);
+  }
+}
+async function registerContextMenuCommands(client, data) {
+  for (const [contextCommand] of data.ContextCommand) {
+    if (client.stores.commands.chatInput.get(contextCommand.data.name))
+      client.logger.warn(
+        `Command '${contextCommand.data.name}' has been overridden by a command with the same name`
+      );
+    client.logger.debug(
+      "Registered",
+      ApplicationCommandType[contextCommand.commandType],
+      "context command:",
+      contextCommand.data.name
+    );
+    client.stores.commands.context.set(contextCommand.data.name, contextCommand);
+  }
+}
 async function registerCommands(client, directory) {
   if (!existsSync(directory))
     throw new TriviousError(
       `Could not regsiter commands; passed directory ${directory} does not exist`,
       "Nonexistant directory passed"
     );
-  const processedDirectories = /* @__PURE__ */ new Set();
-  const files = fs.glob(path.join(directory, "**/*.{js,ts}"));
   const data = {
     SlashCommand: /* @__PURE__ */ new Set(),
     SlashSubcommand: /* @__PURE__ */ new Set(),
-    SlashSubcommandGroup: /* @__PURE__ */ new Set()
+    SlashSubcommandGroup: /* @__PURE__ */ new Set(),
+    ContextCommand: /* @__PURE__ */ new Set()
   };
   client.logger.debug("Starting command registration in:", directory);
+  const files = fs.glob(path.join(directory, "**/*.{js,ts}"));
+  const processedDirectories = /* @__PURE__ */ new Set();
   for await (const file of files) {
     const parentDir = path.dirname(file);
     if (processedDirectories.has(parentDir)) continue;
     processedDirectories.add(parentDir);
     await parseDirectory(data, parentDir);
   }
-  await setChildrenToParents(data);
-  for (const [slashCommand] of data.SlashCommand) {
-    if (client.stores.commands.chatInput.get(slashCommand.data.name))
-      client.logger.warn(
-        `Command '${slashCommand.data.name}' has been overridden by a command with the same name`
-      );
-    client.logger.debug("Registered slash command:", slashCommand.data.name);
-    client.stores.commands.chatInput.set(slashCommand.data.name, slashCommand);
-  }
+  await registerSlashCommands(client, data);
+  await registerContextMenuCommands(client, data);
 }
 export {
   registerCommands as default

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/features/commands/registry.commands.ts"],"sourcesContent":["import {\n\tCollatedCommandData,\n\tCommandSetData,\n\tSlashCommandData,\n\tSlashSubcommandData,\n\tSlashSubcommandGroupData,\n\tTriviousClient,\n} from \"@typings\";\nimport { TriviousError } from \"@utility/errors.js\";\nimport { importFile } from \"@utility/functions.js\";\nimport { Collection } from \"discord.js\";\nimport { existsSync, promises as fs } from \"fs\";\nimport path from \"path\";\n\nasync function parseBase<T>(input: string | T, expects?: (base: Partial<T>) => boolean) {\n\tlet base: T | null = null;\n\tif (typeof input === \"string\") {\n\t\tbase = await importFile<T>(input);\n\t} else base = input;\n\tif (!base) return null;\n\tif (expects && !expects(base)) return null;\n\treturn base;\n}\n\nasync function parseDirectory(data: CollatedCommandData, directory: string): Promise<void> {\n\tconst files = fs.glob(path.join(directory, \"*.{js,ts}\"));\n\tfor await (const file of files) {\n\t\tconst base = await parseBase<SlashCommandData | SlashSubcommandData | SlashSubcommandGroupData>(\n\t\t\tfile,\n\t\t\t(base) => \"context\" in base && !!base.context\n\t\t);\n\t\tif (!base) continue;\n\t\tconst targetSet = data[base.context];\n\t\tif (targetSet) (targetSet as Set<[typeof base, string]>).add([base, directory]);\n\t}\n}\n\nfunction isSubdirectoryOf(directory: string, subdirectory: string) {\n\tconst relative = path.relative(path.resolve(directory), path.resolve(subdirectory));\n\treturn !!relative && !relative.startsWith(\"..\") && !path.isAbsolute(relative);\n}\n\nfunction getDataFromCommandSet<Data>(\n\tset: Set<CommandSetData<Data>>,\n\toptions: { matchParentDirectory?: string; matchData?: Partial<Data> }\n) {\n\tconst { matchData, matchParentDirectory } = options;\n\tif (!matchData && !matchParentDirectory) return undefined;\n\tconst array = Array.from(set.entries());\n\tlet bestMatch: CommandSetData<Data> | undefined;\n\tlet bestDepth = -1;\n\n\tfor (const entry of array) {\n\t\tconst [key, [data, directory]] = entry;\n\t\tif (matchData && data === matchData) return key[0];\n\t\tif (!matchParentDirectory) continue;\n\t\tconst isExact = directory === matchParentDirectory;\n\t\tconst isParent = isSubdirectoryOf(directory, matchParentDirectory);\n\t\tif (isExact || isParent) {\n\t\t\tconst depth = directory.split(/\\\\|\\//).length;\n\t\t\tif (depth > bestDepth) {\n\t\t\t\tbestDepth = depth;\n\t\t\t\tbestMatch = entry[0];\n\t\t\t}\n\t\t}\n\t}\n\n\treturn bestMatch?.[0];\n}\n\nasync function setChildrenToParents(data: CollatedCommandData) {\n\tfor (const [group, directory] of data.SlashSubcommandGroup) {\n\t\tconst slashCommand =\n\t\t\tgroup.parent || getDataFromCommandSet(data.SlashCommand, { matchParentDirectory: directory });\n\n\t\tif (!slashCommand || !(\"addSubcommandGroup\" in slashCommand.data)) {\n\t\t\tconsole.warn(\"[Trivious] Could not find parent for subcommand group\", group.data.name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (!slashCommand.subcommandGroups) slashCommand.subcommandGroups = new Collection();\n\t\tif (slashCommand.subcommandGroups.has(group.data.name))\n\t\t\tconsole.warn(\n\t\t\t\t`[Trivious] SubcommandGroup '${group.data.name}' under SlashCommand '${slashCommand.data.name}' has been overridden by a group with the same name`\n\t\t\t);\n\t\tgroup.parent = slashCommand;\n\t\tslashCommand.subcommandGroups.set(group.data.name, group);\n\t\tslashCommand.data.addSubcommandGroup(group.data);\n\t}\n\n\tfor (const [subcommand, directory] of data.SlashSubcommand) {\n\t\tconst parent =\n\t\t\tsubcommand.parent ||\n\t\t\tgetDataFromCommandSet(data.SlashSubcommandGroup, { matchParentDirectory: directory }) ||\n\t\t\tgetDataFromCommandSet(data.SlashCommand, { matchParentDirectory: directory });\n\n\t\tif (!parent || !(\"addSubcommand\" in parent.data)) {\n\t\t\tconsole.warn(\"[Trivious] Could not find parent for subcommand\", subcommand.data.name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (!parent.subcommands) parent.subcommands = new Collection();\n\t\tif (parent.subcommands.has(subcommand.data.name))\n\t\t\tconsole.warn(\n\t\t\t\t`[Trivious] Subcommand '${subcommand.data.name}' under SlashCommand/SubcommandGroup '${parent.data.name}' has been overridden by a subcommand with the same name`\n\t\t\t);\n\t\tsubcommand.parent = parent;\n\t\tparent.subcommands.set(subcommand.data.name, subcommand);\n\t\tparent.data.addSubcommand(subcommand.data);\n\t}\n}\n\nexport default async function registerCommands(client: TriviousClient, directory: string) {\n\tif (!existsSync(directory))\n\t\tthrow new TriviousError(\n\t\t\t`Could not regsiter commands; passed directory ${directory} does not exist`,\n\t\t\t\"Nonexistant directory passed\"\n\t\t);\n\tconst processedDirectories = new Set<string>();\n\tconst files = fs.glob(path.join(directory, \"**/*.{js,ts}\"));\n\tconst data: CollatedCommandData = {\n\t\tSlashCommand: new Set<CommandSetData<SlashCommandData>>(),\n\t\tSlashSubcommand: new Set<CommandSetData<SlashSubcommandData>>(),\n\t\tSlashSubcommandGroup: new Set<CommandSetData<SlashSubcommandGroupData>>(),\n\t};\n\tclient.logger.debug(\"Starting command registration in:\", directory);\n\tfor await (const file of files) {\n\t\tconst parentDir = path.dirname(file);\n\t\tif (processedDirectories.has(parentDir)) continue;\n\t\tprocessedDirectories.add(parentDir);\n\t\tawait parseDirectory(data, parentDir);\n\t}\n\tawait setChildrenToParents(data);\n\tfor (const [slashCommand] of data.SlashCommand) {\n\t\tif (client.stores.commands.chatInput.get(slashCommand.data.name))\n\t\t\tclient.logger.warn(\n\t\t\t\t`Command '${slashCommand.data.name}' has been overridden by a command with the same name`\n\t\t\t);\n\t\tclient.logger.debug(\"Registered slash command:\", slashCommand.data.name);\n\t\tclient.stores.commands.chatInput.set(slashCommand.data.name, slashCommand);\n\t}\n}\n"],"mappings":"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","names":["base"]}
+{"version":3,"sources":["../../../src/features/commands/registry.commands.ts"],"sourcesContent":["import {\n\tCollatedCommandData,\n\tCommandSetData,\n\tContextCommandData,\n\tSlashCommandData,\n\tSlashSubcommandData,\n\tSlashSubcommandGroupData,\n\tTriviousClient,\n} from \"@typings\";\nimport { TriviousError } from \"@utility/errors.js\";\nimport { importFile } from \"@utility/functions.js\";\nimport { ApplicationCommandType, Collection } from \"discord.js\";\nimport { existsSync, promises as fs } from \"fs\";\nimport path from \"path\";\n\nasync function parseBase<T>(input: string | T, expects?: (base: Partial<T>) => boolean) {\n\tlet base: T | null = null;\n\tif (typeof input === \"string\") {\n\t\tbase = await importFile<T>(input);\n\t} else base = input;\n\tif (!base) return null;\n\tif (expects && !expects(base)) return null;\n\treturn base;\n}\n\nasync function parseDirectory(data: CollatedCommandData, directory: string): Promise<void> {\n\tconst files = fs.glob(path.join(directory, \"*.{js,ts}\"));\n\tfor await (const file of files) {\n\t\tconst base = await parseBase<\n\t\t\tSlashCommandData | SlashSubcommandData | SlashSubcommandGroupData | ContextCommandData\n\t\t>(file);\n\t\tif (!base) continue;\n\t\tconst targetSet =\n\t\t\t\"context\" in base\n\t\t\t\t? data[base.context]\n\t\t\t\t: \"commandType\" in base &&\n\t\t\t\t\t  (base.commandType === ApplicationCommandType.Message ||\n\t\t\t\t\t\t\tbase.commandType === ApplicationCommandType.User)\n\t\t\t\t\t? data.ContextCommand\n\t\t\t\t\t: null;\n\t\tif (targetSet) (targetSet as Set<[typeof base, string]>).add([base, directory]);\n\t}\n}\n\nfunction isSubdirectoryOf(directory: string, subdirectory: string) {\n\tconst relative = path.relative(path.resolve(directory), path.resolve(subdirectory));\n\treturn !!relative && !relative.startsWith(\"..\") && !path.isAbsolute(relative);\n}\n\nfunction getDataFromCommandSet<Data>(\n\tset: Set<CommandSetData<Data>>,\n\toptions: { matchParentDirectory?: string; matchData?: Partial<Data> }\n) {\n\tconst { matchData, matchParentDirectory } = options;\n\tif (!matchData && !matchParentDirectory) return undefined;\n\tconst array = Array.from(set.entries());\n\tlet bestMatch: CommandSetData<Data> | undefined;\n\tlet bestDepth = -1;\n\n\tfor (const entry of array) {\n\t\tconst [key, [data, directory]] = entry;\n\t\tif (matchData && data === matchData) return key[0];\n\t\tif (!matchParentDirectory) continue;\n\t\tconst isExact = directory === matchParentDirectory;\n\t\tconst isParent = isSubdirectoryOf(directory, matchParentDirectory);\n\t\tif (isExact || isParent) {\n\t\t\tconst depth = directory.split(/\\\\|\\//).length;\n\t\t\tif (depth > bestDepth) {\n\t\t\t\tbestDepth = depth;\n\t\t\t\tbestMatch = entry[0];\n\t\t\t}\n\t\t}\n\t}\n\n\treturn bestMatch?.[0];\n}\n\nasync function setChildrenToParents(data: CollatedCommandData) {\n\tfor (const [group, directory] of data.SlashSubcommandGroup) {\n\t\tconst slashCommand =\n\t\t\tgroup.parent || getDataFromCommandSet(data.SlashCommand, { matchParentDirectory: directory });\n\n\t\tif (!slashCommand || !(\"addSubcommandGroup\" in slashCommand.data)) {\n\t\t\tconsole.warn(\"[Trivious] Could not find parent for subcommand group\", group.data.name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (!slashCommand.subcommandGroups) slashCommand.subcommandGroups = new Collection();\n\t\tif (slashCommand.subcommandGroups.has(group.data.name))\n\t\t\tconsole.warn(\n\t\t\t\t`[Trivious] SubcommandGroup '${group.data.name}' under SlashCommand '${slashCommand.data.name}' has been overridden by a group with the same name`\n\t\t\t);\n\t\tgroup.parent = slashCommand;\n\t\tslashCommand.subcommandGroups.set(group.data.name, group);\n\t\tslashCommand.data.addSubcommandGroup(group.data);\n\t}\n\n\tfor (const [subcommand, directory] of data.SlashSubcommand) {\n\t\tconst parent =\n\t\t\tsubcommand.parent ||\n\t\t\tgetDataFromCommandSet(data.SlashSubcommandGroup, { matchParentDirectory: directory }) ||\n\t\t\tgetDataFromCommandSet(data.SlashCommand, { matchParentDirectory: directory });\n\n\t\tif (!parent || !(\"addSubcommand\" in parent.data)) {\n\t\t\tconsole.warn(\"[Trivious] Could not find parent for subcommand\", subcommand.data.name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (!parent.subcommands) parent.subcommands = new Collection();\n\t\tif (parent.subcommands.has(subcommand.data.name))\n\t\t\tconsole.warn(\n\t\t\t\t`[Trivious] Subcommand '${subcommand.data.name}' under SlashCommand/SubcommandGroup '${parent.data.name}' has been overridden by a subcommand with the same name`\n\t\t\t);\n\t\tsubcommand.parent = parent;\n\t\tparent.subcommands.set(subcommand.data.name, subcommand);\n\t\tparent.data.addSubcommand(subcommand.data);\n\t}\n}\n\nasync function registerSlashCommands(client: TriviousClient, data: CollatedCommandData) {\n\tawait setChildrenToParents(data);\n\tfor (const [slashCommand] of data.SlashCommand) {\n\t\tif (client.stores.commands.chatInput.get(slashCommand.data.name))\n\t\t\tclient.logger.warn(\n\t\t\t\t`Command '${slashCommand.data.name}' has been overridden by a command with the same name`\n\t\t\t);\n\t\tclient.logger.debug(\"Registered slash command:\", slashCommand.data.name);\n\t\tclient.stores.commands.chatInput.set(slashCommand.data.name, slashCommand);\n\t}\n}\n\nasync function registerContextMenuCommands(client: TriviousClient, data: CollatedCommandData) {\n\tfor (const [contextCommand] of data.ContextCommand) {\n\t\tif (client.stores.commands.chatInput.get(contextCommand.data.name))\n\t\t\tclient.logger.warn(\n\t\t\t\t`Command '${contextCommand.data.name}' has been overridden by a command with the same name`\n\t\t\t);\n\t\tclient.logger.debug(\n\t\t\t\"Registered\",\n\t\t\tApplicationCommandType[contextCommand.commandType],\n\t\t\t\"context command:\",\n\t\t\tcontextCommand.data.name\n\t\t);\n\t\tclient.stores.commands.context.set(contextCommand.data.name, contextCommand);\n\t}\n}\n\nexport default async function registerCommands(client: TriviousClient, directory: string) {\n\tif (!existsSync(directory))\n\t\tthrow new TriviousError(\n\t\t\t`Could not regsiter commands; passed directory ${directory} does not exist`,\n\t\t\t\"Nonexistant directory passed\"\n\t\t);\n\tconst data: CollatedCommandData = {\n\t\tSlashCommand: new Set<CommandSetData<SlashCommandData>>(),\n\t\tSlashSubcommand: new Set<CommandSetData<SlashSubcommandData>>(),\n\t\tSlashSubcommandGroup: new Set<CommandSetData<SlashSubcommandGroupData>>(),\n\t\tContextCommand: new Set<CommandSetData<ContextCommandData>>(),\n\t};\n\tclient.logger.debug(\"Starting command registration in:\", directory);\n\tconst files = fs.glob(path.join(directory, \"**/*.{js,ts}\"));\n\tconst processedDirectories = new Set<string>();\n\tfor await (const file of files) {\n\t\tconst parentDir = path.dirname(file);\n\t\tif (processedDirectories.has(parentDir)) continue;\n\t\tprocessedDirectories.add(parentDir);\n\t\tawait parseDirectory(data, parentDir);\n\t}\n\tawait registerSlashCommands(client, data);\n\tawait registerContextMenuCommands(client, data);\n}\n"],"mappings":"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","names":[]}

package/dist/features/components/builders.components.d.ts

@@ -1,4 +1,4 @@
-import { f as Component, g as ComponentContext } from '../../modules.types-hjAYMYut.js';
+import { f as Component, g as ComponentContext } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';

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

@@ -1,5 +1,5 @@
 import 'discord.js';
-export { f as Component, g as ComponentContext, h as ComponentFlags, i as ComponentInteraction } from '../../modules.types-hjAYMYut.js';
+export { f as Component, g as ComponentContext, h as ComponentFlags, i as ComponentInteraction } from '../../modules.types-D-tuJArP.js';
 import '../permissions/permissions.types.js';
 import '../client/client.types.js';
 import '../client/logger.js';

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

@@ -1,4 +1,4 @@
-import { T as TriviousClient } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';

package/dist/features/customId/customid.types.d.ts

@@ -1,5 +1,5 @@
 import '../client/client.types.js';
-import { g as ComponentContext } from '../../modules.types-hjAYMYut.js';
+import { g as ComponentContext } from '../../modules.types-D-tuJArP.js';
 import '../permissions/permissions.types.js';
 import 'discord.js';
 import '../client/logger.js';

package/dist/features/customId/methods.customid.d.ts

@@ -1,7 +1,7 @@
 import { ComponentCustomId } from './customid.types.js';
 import '../client/client.types.js';
 import 'discord.js';
-import '../../modules.types-hjAYMYut.js';
+import '../../modules.types-D-tuJArP.js';
 import '../permissions/permissions.types.js';
 import '../client/logger.js';
 

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

@@ -1,5 +1,5 @@
 import 'discord.js';
-export { E as Event } from '../../modules.types-hjAYMYut.js';
+export { E as Event } from '../../modules.types-D-tuJArP.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';
 import '../client/logger.js';

package/dist/features/events/presets/clientReady.d.ts

@@ -1,4 +1,4 @@
-import { T as TriviousClient } from '../../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../../client/client.types.js';
 import '../../permissions/permissions.types.js';

package/dist/features/events/presets/interactionCreate.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { T as TriviousClient } from '../../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../../modules.types-D-tuJArP.js';
 import '../../client/client.types.js';
 import '../../permissions/permissions.types.js';
 import '../../client/logger.js';

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

@@ -1,4 +1,4 @@
-import { T as TriviousClient } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';

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

@@ -1,5 +1,5 @@
 import 'discord.js';
-export { M as Module } from '../../modules.types-hjAYMYut.js';
+export { M as Module } from '../../modules.types-D-tuJArP.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';
 import '../client/logger.js';

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

@@ -1,4 +1,4 @@
-import { T as TriviousClient } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient } from '../../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../client/client.types.js';
 import '../permissions/permissions.types.js';

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

@@ -1,5 +1,5 @@
 import { GuildMember, User } from 'discord.js';
-import { T as TriviousClient, a as BaseCommandData, f as Component } from '../../modules.types-hjAYMYut.js';
+import { T as TriviousClient, a as BaseCommandData, f as Component } from '../../modules.types-D-tuJArP.js';
 import '../client/client.types.js';
 import './permissions.types.js';
 import '../client/logger.js';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { CommandHashConfiguration, FeatureBasedStructure, TriviousClientCredentials, TriviousClientOptions, TriviousStructure, TypeBasedStructure } from './features/client/client.types.js';
-export { B as BaseChatInputCommandData, a as BaseCommandData, C as ChatInputCommandContext, b as CollatedCommandData, c as CommandFlags, d as CommandFunction, e as CommandSetData, f as Component, g as ComponentContext, h as ComponentFlags, i as ComponentInteraction, j as ContextCommandData, E as Event, M as Module, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData, T as TriviousClient } from './modules.types-hjAYMYut.js';
+export { B as BaseChatInputCommandData, a as BaseCommandData, C as ChatInputCommandContext, b as CollatedCommandData, c as CommandFlags, d as CommandFunction, e as CommandSetData, f as Component, g as ComponentContext, h as ComponentFlags, i as ComponentInteraction, j as ContextCommandData, E as Event, M as Module, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData, T as TriviousClient } from './modules.types-D-tuJArP.js';
 export { ComponentCustomId, ComponentTag } from './features/customId/customid.types.js';
 export { CommandPermissionValues } from './features/permissions/permissions.types.js';
 export { createActionRow, createEmbed } from './features/builders/utility.builders.js';

package/dist/{modules.types-hjAYMYut.d.ts → modules.types-D-tuJArP.d.ts}

@@ -110,6 +110,7 @@ type CollatedCommandData = {
     SlashCommand: Set<CommandSetData<SlashCommandData>>;
     SlashSubcommand: Set<CommandSetData<SlashSubcommandData>>;
     SlashSubcommandGroup: Set<CommandSetData<SlashSubcommandGroupData>>;
+    ContextCommand: Set<CommandSetData<ContextCommandData>>;
 };
 
 type ComponentFlags = "Cached" | "DeferReply" | "EphemeralReply" | "ExpectModal";

package/dist/shared/registries.d.ts

@@ -2,7 +2,7 @@ import registerCommands from '../features/commands/registry.commands.js';
 import registerComponents from '../features/components/registry.components.js';
 import registerEvents, { bindEvents } from '../features/events/registry.events.js';
 import registerModules, { bindModules } from '../features/modules/registry.modules.js';
-import '../modules.types-hjAYMYut.js';
+import '../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../features/client/client.types.js';
 import '../features/permissions/permissions.types.js';

package/dist/shared/typings.d.ts

@@ -1,5 +1,5 @@
 export { CommandHashConfiguration, FeatureBasedStructure, TriviousClientCredentials, TriviousClientOptions, TriviousStructure, TypeBasedStructure } from '../features/client/client.types.js';
-export { B as BaseChatInputCommandData, a as BaseCommandData, C as ChatInputCommandContext, b as CollatedCommandData, c as CommandFlags, d as CommandFunction, e as CommandSetData, f as Component, g as ComponentContext, h as ComponentFlags, i as ComponentInteraction, j as ContextCommandData, E as Event, M as Module, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData, T as TriviousClient } from '../modules.types-hjAYMYut.js';
+export { B as BaseChatInputCommandData, a as BaseCommandData, C as ChatInputCommandContext, b as CollatedCommandData, c as CommandFlags, d as CommandFunction, e as CommandSetData, f as Component, g as ComponentContext, h as ComponentFlags, i as ComponentInteraction, j as ContextCommandData, E as Event, M as Module, S as SlashCommandData, k as SlashSubcommandData, l as SlashSubcommandGroupData, T as TriviousClient } from '../modules.types-D-tuJArP.js';
 export { ComponentCustomId, ComponentTag } from '../features/customId/customid.types.js';
 export { CommandPermissionValues } from '../features/permissions/permissions.types.js';
 import 'discord.js';

package/dist/utility/errors.d.ts

@@ -1,4 +1,4 @@
-import { a as BaseCommandData, S as SlashCommandData } from '../modules.types-hjAYMYut.js';
+import { a as BaseCommandData, S as SlashCommandData } from '../modules.types-D-tuJArP.js';
 import 'discord.js';
 import '../features/client/client.types.js';
 import '../features/permissions/permissions.types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "trivious",
-	"version": "2.3.5",
+	"version": "2.3.6",
 	"type": "module",
 	"keywords": [
 		"discord-bot",