Merge pull request #86 from underctrl-io/rewrite

feat!: rewrite commandkit

Author: twlite

apps/test-bot/commandkit.ts

@@ -1,6 +1,3 @@
 import { defineConfig } from 'commandkit';
 
-export default defineConfig({
-  main: 'index.js',
-  src: 'src',
-});
+export default defineConfig();

apps/test-bot/src/app.ts

@@ -0,0 +1,7 @@
+import { Client } from 'discord.js';
+
+const client = new Client({
+  intents: ['Guilds', 'GuildMembers', 'GuildMessages', 'MessageContent'],
+});
+
+export default client;

apps/test-bot/src/commands/misc/dm-only.ts apps/test-bot/src/app/commands/(actions)/dm-only.ts

@@ -1,11 +1,11 @@
 import { SlashCommandProps, CommandData, dmOnly } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'dm-only',
   description: 'This is a dm only command',
 };
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   dmOnly();
 
   await interaction.reply('This command can only be used in a dm.');

apps/test-bot/src/commands/misc/giveaway.ts apps/test-bot/src/app/commands/(actions)/giveaway.ts

@@ -11,7 +11,7 @@ import {
   AutocompleteProps,
 } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'ping',
   description: 'Pong!',
   options: [
@@ -42,7 +42,7 @@ export async function autocomplete({ interaction }: AutocompleteProps) {
   interaction.respond(filtered);
 }
 
-export async function run({ interaction, client }: SlashCommandProps) {
+export async function chatInput({ interaction, client }: SlashCommandProps) {
   if (!interaction.channel) return;
 
   const button = new ButtonKit()

apps/test-bot/src/commands/misc/guild-only.ts apps/test-bot/src/app/commands/(actions)/guild-only.ts

@@ -1,11 +1,11 @@
 import { SlashCommandProps, CommandData, guildOnly } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'guild-only',
   description: 'This is a guild only command.',
 };
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   guildOnly();
 
   await interaction.reply('This command can only be used in a guild.');

apps/test-bot/src/commands/misc/reload.ts apps/test-bot/src/app/commands/(developer)/reload.ts

@@ -1,11 +1,11 @@
 import { SlashCommandProps, CommandOptions, CommandData } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'reload',
   description: 'Reload commands, events, and validations.',
 };
 
-export async function run({ interaction, handler }: SlashCommandProps) {
+export async function chatInput({ interaction, handler }: SlashCommandProps) {
   await interaction.deferReply({ ephemeral: true });
 
   // await handler.reloadCommands();

apps/test-bot/src/commands/misc/run-after.ts apps/test-bot/src/app/commands/(developer)/run-after.ts

@@ -1,11 +1,11 @@
 import { SlashCommandProps, CommandData, afterCommand } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'run-after',
   description: 'This is a run-after command',
 };
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   afterCommand((env) => {
     console.log(
       `The command ${interaction.commandName} was executed successfully in ${env

apps/test-bot/src/app/commands/server/command.ts apps/test-bot/src/app/commands/(developer)/server.ts

@@ -1,6 +1,6 @@
 import { SlashCommandProps, CommandData } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'help',
   description: 'This is a help command.',
 };
@@ -12,7 +12,7 @@ function $botVersion(): string {
   return require(path).version;
 }
 
-export async function run({ interaction, handler }: SlashCommandProps) {
+export async function chatInput({ interaction, handler }: SlashCommandProps) {
   await interaction.deferReply();
 
   const botVersion = $botVersion();

apps/test-bot/src/app/commands/avatar/command.ts apps/test-bot/src/app/commands/(general)/avatar.ts

@@ -11,7 +11,7 @@ import {
   AutocompleteProps,
 } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'ping',
   description: 'Pong!',
   options: [
@@ -42,7 +42,7 @@ export async function autocomplete({ interaction }: AutocompleteProps) {
   interaction.respond(filtered);
 }
 
-export async function run({ interaction, client }: SlashCommandProps) {
+export async function chatInput({ interaction, client }: SlashCommandProps) {
   if (!interaction.channel) return;
 
   const button = new ButtonKit()

apps/test-bot/src/app/commands/cat/command.ts apps/test-bot/src/app/commands/(general)/cat.ts

@@ -7,7 +7,7 @@ import CommandKit, {
 } from 'commandkit';
 import { MessageFlags } from 'discord.js';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'commandkit',
   description: 'This is a commandkit command.',
 };
@@ -40,7 +40,7 @@ function ButtonGrid() {
   );
 }
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   await interaction.deferReply();
 
   await interaction.editReply({

apps/test-bot/src/app/commands/dog/command.ts apps/test-bot/src/app/commands/(general)/dog.ts

@@ -7,7 +7,7 @@ import CommandKit, {
 } from 'commandkit';
 import { ButtonStyle, MessageFlags } from 'discord.js';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'confirm',
   description: 'This is a confirm command.',
 };
@@ -30,7 +30,7 @@ const handleCancel: OnButtonKitClick = async (interaction, context) => {
   context.dispose();
 };
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   const buttons = (
     <ActionRow>
       <Button onClick={handleCancel} style={ButtonStyle.Primary}>

apps/test-bot/src/commands/misc/help.ts apps/test-bot/src/app/commands/(general)/help.ts

@@ -1,7 +1,7 @@
 import { SlashCommandProps, CommandData, cacheTag } from 'commandkit';
-import { database } from '../../database/store';
+import { database } from '../../../database/store.ts';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'xp',
   description: 'This is an xp command.',
 };
@@ -17,7 +17,7 @@ async function getUserXP(guildId: string, userId: string) {
   return xp;
 }
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   await interaction.deferReply();
 
   const dataRetrievalStart = Date.now();

apps/test-bot/src/commands/misc/ping.ts apps/test-bot/src/app/commands/(general)/ping.ts

@@ -1,6 +1,6 @@
 import { SlashCommandProps, CommandData, cache } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'random',
   description: 'This is a random command.',
 };
@@ -12,7 +12,7 @@ const random = cache(
   { name: 'random', ttl: 60_000 },
 );
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   await interaction.deferReply();
 
   const xp = await random();

apps/test-bot/src/commands/misc/commandkit.tsx apps/test-bot/src/app/commands/(interactions)/commandkit.tsx

@@ -1,11 +1,11 @@
 import { SlashCommandProps, CommandData, invalidate } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'invalidate-random',
   description: 'This is a random command invalidation.',
 };
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   await interaction.deferReply();
 
   await invalidate('random');

apps/test-bot/src/commands/misc/confirmation.tsx apps/test-bot/src/app/commands/(interactions)/confirmation.tsx

@@ -1,11 +1,11 @@
 import { SlashCommandProps, CommandData, revalidate } from 'commandkit';
 
-export const data: CommandData = {
+export const command: CommandData = {
   name: 'revalidate-random',
   description: 'This is a random command invalidation.',
 };
 
-export async function run({ interaction }: SlashCommandProps) {
+export async function chatInput({ interaction }: SlashCommandProps) {
   await interaction.deferReply();
 
   const revalidated = await revalidate<number>('random');

apps/test-bot/src/app/commands/prompt/middleware.ts apps/test-bot/src/app/commands/(interactions)/prompt.middleware.ts

@@ -1,6 +1,6 @@
 import type { Message } from 'discord.js';
 import { invalidate } from 'commandkit';
-import { database } from '../../database/store';
+import { database } from '../../../database/store.ts';
 
 export default async function (message: Message) {
   if (message.author.bot || !message.inGuild()) return;

apps/test-bot/src/app/commands/prompt/command.tsx apps/test-bot/src/app/commands/(interactions)/prompt.tsx

@@ -3,6 +3,8 @@
     "target": "ESNext",
     "module": "Preserve",
     "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
     "lib": ["ESNext", "DOM"],
     "jsx": "react",
     "jsxFactory": "CommandKit.createElement",

apps/test-bot/src/commands/misc/xp.ts apps/test-bot/src/app/commands/(leveling)/xp.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-import { bootstrapCommandkitCLI } from '../dist/index.mjs';
+import { bootstrapCommandkitCLI } from '../dist/index.js';
 
 await bootstrapCommandkitCLI(process.argv);

apps/test-bot/src/commands/misc/random.ts apps/test-bot/src/app/commands/random/index.ts

@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "lint": "tsc --noEmit",
-    "dev": "tsup --watch",
+    "dev": "pnpm run --filter=test-bot dev",
     "build": "tsup",
     "publish-package": "npm publish",
     "test": "vitest"
@@ -34,14 +34,15 @@
     "@babel/parser": "^7.26.5",
     "@babel/traverse": "^7.26.5",
     "@babel/types": "^7.26.5",
+    "chokidar": "^4.0.3",
     "commander": "^12.1.0",
     "dotenv": "^16.4.7",
     "ms": "^2.1.3",
     "ora": "^8.0.1",
     "picocolors": "^1.1.1",
     "rfdc": "^1.3.1",
     "rimraf": "^5.0.5",
-    "tsup": "^8.3.5",
+    "tsup": "^8.4.0",
     "use-macro": "^1.1.0"
   },
   "devDependencies": {