update type names + remove duplicates

Author: notunderctrl

packages/commandkit/src/CommandKit.ts

@@ -1,6 +1,6 @@
 import { CommandHandler, EventHandler, ValidationHandler } from './handlers';
 import { CommandKitData, CommandKitOptions } from './typings';
-import { CommandFileObject } from './types';
+import { CommandObject } from './types';
 import colors from 'colors/safe';
 
 export class CommandKit {
@@ -68,7 +68,7 @@ export class CommandKit {
      *
      * @returns An array of command objects
      */
-    get commands(): CommandFileObject[] {
+    get commands(): CommandObject[] {
         const commands = this.#data.commands.map((cmd) => {
             const { run, ...command } = cmd;
             return command;

packages/commandkit/src/handlers/command-handler/typings.d.ts

@@ -1,6 +1,6 @@
 import { ChatInputCommandInteraction, Client, ContextMenuCommandInteraction } from 'discord.js';
-import { ContextCommandObject, SlashCommandObject } from '../../typings';
 import { CommandKit } from '../../CommandKit';
+import { CommandFileObject } from '../../typings';
 
 export interface CommandHandlerOptions {
     client: Client;
@@ -14,12 +14,12 @@ export interface CommandHandlerOptions {
 }
 
 export interface CommandHandlerData extends CommandHandlerOptions {
-    commands: Array<SlashCommandObject | ContextCommandObject>;
+    commands: CommandFileObject[];
     builtInValidations: Array<BuiltInValidation>;
 }
 
 export interface BuiltInValidationParams {
-    targetCommand: SlashCommandObject | ContextCommandObject;
+    targetCommand: CommandFileObject;
     interaction: ChatInputCommandInteraction | ContextMenuCommandInteraction;
     handlerData: CommandHandlerData;
 }

packages/commandkit/src/types/index.ts

@@ -8,7 +8,7 @@ import type {
     APIApplicationCommandSubcommandGroupOption,
 } from 'discord.js';
 import type { CommandKit } from '../CommandKit';
-import type { ContextCommandObject, SlashCommandObject } from '../typings';
+import type { CommandFileObject } from '../typings';
 
 export interface CommandProps {
     interaction: CommandInteraction;
@@ -31,7 +31,7 @@ export interface ContextMenuCommandProps {
 export interface ValidationFunctionProps {
     interaction: ChatInputCommandInteraction | ContextMenuCommandInteraction;
     client: Client<true>;
-    commandObj: SlashCommandObject | ContextCommandObject;
+    commandObj: CommandObject;
     handler: CommandKit;
 }
 
@@ -97,7 +97,4 @@ export type CommandData = {
     >;
 };
 
-export interface CommandFileObject {
-    data: CommandData;
-    options?: CommandOptions;
-}
+export type CommandObject = Omit<CommandFileObject, 'run'>;

packages/commandkit/src/typings.d.ts

@@ -13,16 +13,10 @@ export interface CommandKitOptions {
 }
 
 export interface CommandKitData extends CommandKitOptions {
-    commands: Array<SlashCommandObject | ContextCommandObject>;
+    commands: CommandFileObject[];
 }
 
-export interface SlashCommandObject {
-    data: CommandData;
-    options?: CommandOptions;
-    run: ({}: { interaction: Interaction; client: Client; handler: CommandKit }) => void;
-}
-
-export interface ContextCommandObject {
+export interface CommandFileObject {
     data: CommandData;
     options?: CommandOptions;
     run: ({}: { interaction: Interaction; client: Client; handler: CommandKit }) => void;

packages/commandkit/tests/events/ready/console-log.ts

@@ -0,0 +1,6 @@
+import type { Client } from 'discord.js';
+import type { CommandKit } from '../../../src';
+
+export default function (c: Client<true>, client, handler: CommandKit) {
+    console.log(`${c.user.username} is online.`);
+}

packages/commandkit/tests/index.ts

@@ -8,11 +8,11 @@ const client = new Client({
     intents: ['Guilds', 'GuildMembers', 'GuildMessages', 'MessageContent'],
 });
 
-client.on('ready', (c) => console.log(`${c.user.username} is online`));
-
 new CommandKit({
     client,
     commandsPath: `${__dirname}/commands`,
+    eventsPath: `${__dirname}/events`,
+    validationsPath: `${__dirname}/validations`,
 });
 
 client.login(process.env.TOKEN);

packages/commandkit/tests/validations/devOnly.ts

@@ -0,0 +1,8 @@
+import type { ValidationFunctionProps } from '../../src';
+
+export default function ({ interaction, commandObj, handler }: ValidationFunctionProps) {
+    console.log(commandObj);
+    console.log(handler.commands);
+
+    return true;
+}