refactor: cleanup compiler plugins

Author: twlite

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

@@ -3,7 +3,7 @@ import CommandKit, {
   ActionRow,
   CommandData,
   OnButtonKitClick,
-  SlashCommandContext,
+  ChatInputCommandContext,
 } from 'commandkit';
 import { MessageFlags } from 'discord.js';
 
@@ -40,7 +40,7 @@ function ButtonGrid() {
   );
 }
 
-export async function chatInput({ interaction }: SlashCommandContext) {
+export async function chatInput({ interaction }: ChatInputCommandContext) {
   await interaction.deferReply();
 
   await interaction.editReply({

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

@@ -1,7 +1,7 @@
 import CommandKit, {
   Button,
   ActionRow,
-  SlashCommandContext,
+  ChatInputCommandContext,
   CommandData,
   OnButtonKitClick,
 } from 'commandkit';
@@ -30,7 +30,7 @@ const handleCancel: OnButtonKitClick = async (interaction, context) => {
   context.dispose();
 };
 
-export async function chatInput({ interaction }: SlashCommandContext) {
+export async function chatInput({ interaction }: ChatInputCommandContext) {
   const buttons = (
     <ActionRow>
       <Button onClick={handleCancel} style={ButtonStyle.Primary}>

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

@@ -5,7 +5,7 @@ import CommandKit, {
   ParagraphInput,
   OnModalKitSubmit,
   MessageCommandContext,
-  SlashCommandContext,
+  ChatInputCommandContext,
 } from 'commandkit';
 import { MessageFlags } from 'discord.js';
 
@@ -26,7 +26,7 @@ const handleSubmit: OnModalKitSubmit = async (interaction, context) => {
   context.dispose();
 };
 
-export async function chatInput(ctx: SlashCommandContext) {
+export async function chatInput(ctx: ChatInputCommandContext) {
   const modal = (
     <Modal title={'Modal'} onSubmit={handleSubmit}>
       <ShortInput customId="name" label="Name" placeholder="John" required />

apps/test-bot/src/app/commands/(select menu)/select-channel.tsx

@@ -3,7 +3,7 @@ import CommandKit, {
   ChannelSelectMenu,
   CommandData,
   OnChannelSelectMenuKitSubmit,
-  SlashCommand,
+  ChatInputCommand,
 } from 'commandkit';
 
 export const command: CommandData = {
@@ -24,7 +24,7 @@ const handleSelect: OnChannelSelectMenuKitSubmit = async (
   context.dispose();
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   const select = (
     <ActionRow>
       <ChannelSelectMenu onSelect={handleSelect} />

apps/test-bot/src/app/commands/(select menu)/select-mentionable.tsx

@@ -3,7 +3,7 @@ import CommandKit, {
   CommandData,
   MentionableSelectMenu,
   OnMentionableSelectMenuKitSubmit,
-  SlashCommand,
+  ChatInputCommand,
 } from 'commandkit';
 
 export const command: CommandData = {
@@ -25,7 +25,7 @@ const handleSelect: OnMentionableSelectMenuKitSubmit = async (
   context.dispose();
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   const select = (
     <ActionRow>
       <MentionableSelectMenu onSelect={handleSelect} />

apps/test-bot/src/app/commands/(select menu)/select-role.tsx

@@ -3,7 +3,7 @@ import CommandKit, {
   CommandData,
   OnRoleSelectMenuKitSubmit,
   RoleSelectMenu,
-  SlashCommand,
+  ChatInputCommand,
 } from 'commandkit';
 
 export const command: CommandData = {
@@ -24,7 +24,7 @@ const handleSelect: OnRoleSelectMenuKitSubmit = async (
   context.dispose();
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   const select = (
     <ActionRow>
       <RoleSelectMenu onSelect={handleSelect} />

apps/test-bot/src/app/commands/(select menu)/select-string-multi.tsx

@@ -2,7 +2,7 @@ import CommandKit, {
   ActionRow,
   CommandData,
   OnStringSelectMenuKitSubmit,
-  SlashCommand,
+  ChatInputCommand,
   StringSelectMenu,
   StringSelectMenuOption,
 } from 'commandkit';
@@ -25,7 +25,7 @@ const handleSelect: OnStringSelectMenuKitSubmit = async (
   context.dispose();
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   const select = (
     <ActionRow>
       <StringSelectMenu onSelect={handleSelect} maxValues={9} minValues={1}>

apps/test-bot/src/app/commands/(select menu)/select-string.tsx

@@ -2,7 +2,7 @@ import CommandKit, {
   ActionRow,
   CommandData,
   OnStringSelectMenuKitSubmit,
-  SlashCommand,
+  ChatInputCommand,
   StringSelectMenu,
   StringSelectMenuOption,
 } from 'commandkit';
@@ -25,7 +25,7 @@ const handleSelect: OnStringSelectMenuKitSubmit = async (
   context.dispose();
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   const select = (
     <ActionRow>
       <StringSelectMenu onSelect={handleSelect}>

apps/test-bot/src/app/commands/(select menu)/select-user.tsx

@@ -2,7 +2,7 @@ import CommandKit, {
   ActionRow,
   CommandData,
   OnUserSelectMenuKitSubmit,
-  SlashCommand,
+  ChatInputCommand,
   UserSelectMenu,
 } from 'commandkit';
 
@@ -24,7 +24,7 @@ const handleSelect: OnUserSelectMenuKitSubmit = async (
   context.dispose();
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   const select = (
     <ActionRow>
       <UserSelectMenu onSelect={handleSelect} />

packages/commandkit/package.json

@@ -30,12 +30,9 @@
     "event handler"
   ],
   "dependencies": {
-    "@babel/generator": "^7.26.5",
-    "@babel/parser": "^7.26.5",
-    "@babel/traverse": "^7.26.5",
-    "@babel/types": "^7.26.5",
     "chokidar": "^4.0.3",
     "commander": "^12.1.0",
+    "directive-to-hof": "^0.0.2",
     "dotenv": "^16.4.7",
     "ms": "^2.1.3",
     "ora": "^8.0.1",
@@ -46,8 +43,6 @@
     "use-macro": "^1.1.0"
   },
   "devDependencies": {
-    "@types/babel__generator": "^7.6.8",
-    "@types/babel__traverse": "^7.20.6",
     "@types/ms": "^0.7.34",
     "@types/node": "^22.10.2",
     "@types/yargs": "^17.0.32",

packages/commandkit/src/cache/use-cache.ts

@@ -309,4 +309,5 @@ export function isCachedFunction(fn: GenericFunction): boolean {
  * @private
  * @internal
  */
-export const zxcvbnm____: any = useCache;
+export const __SECRET_USE_CACHE_INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: any =
+  useCache;

packages/commandkit/src/cli/generators.ts

@@ -1,6 +1,5 @@
 import { mkdir, writeFile, readdir } from 'fs/promises';
 import { join } from 'path';
-import { Locale } from 'discord.js';
 import { panic } from './common';
 import { existsSync } from 'fs';
 import colors from '../utils/colors';

packages/commandkit/src/config/default.ts

@@ -1,4 +1,4 @@
-import { CachePlugin } from '../plugins/plugin-runtime/builtin/cache/CachePlugin';
+import { CachePlugin } from '../plugins/plugin-runtime/builtin/CachePlugin';
 import { MacroPlugin } from '../plugins/plugin-runtime/builtin/MacroPlugin';
 import { ResolvedCommandKitConfig } from './utils';
 

packages/commandkit/src/plugins/plugin-runtime/builtin/CachePlugin.ts

@@ -0,0 +1,18 @@
+import {
+  CommonDirectiveTransformer,
+  CommonDirectiveTransformerOptions,
+} from './CommonDirectiveTransformer';
+
+export class CachePlugin extends CommonDirectiveTransformer {
+  public readonly name = 'CachePlugin';
+
+  public constructor(options?: Partial<CommonDirectiveTransformerOptions>) {
+    super({
+      ...options,
+      directive: 'use cache',
+      importPath: 'commandkit',
+      importName: '__SECRET_USE_CACHE_INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED',
+      asyncOnly: true,
+    });
+  }
+}

packages/commandkit/src/plugins/plugin-runtime/builtin/CommonDirectiveTransformer.ts

@@ -0,0 +1,44 @@
+import { DirectiveTransformerOptions } from 'directive-to-hof';
+import {
+  CompilerPlugin,
+  CompilerPluginRuntime,
+  MaybeFalsey,
+  PluginTransformParameters,
+  TransformedResult,
+} from '../..';
+
+export type CommonDirectiveTransformerOptions = DirectiveTransformerOptions & {
+  enabled?: boolean;
+};
+
+export abstract class CommonDirectiveTransformer extends CompilerPlugin<CommonDirectiveTransformerOptions> {
+  private transformer: ReturnType<
+    typeof import('directive-to-hof').createDirectiveTransformer
+  > | null = null;
+
+  public async activate(ctx: CompilerPluginRuntime): Promise<void> {
+    const { createDirectiveTransformer } = await import('directive-to-hof');
+    this.transformer = createDirectiveTransformer(this.options);
+  }
+
+  public async deactivate(ctx: CompilerPluginRuntime): Promise<void> {
+    this.transformer = null;
+  }
+
+  public async transform(
+    params: PluginTransformParameters,
+  ): Promise<MaybeFalsey<TransformedResult>> {
+    if (!this.options.enabled) return null;
+    if (!this.transformer) return null;
+
+    const result = await this.transformer(
+      params.contents.toString(),
+      params.path,
+    );
+
+    return {
+      contents: result.contents,
+      loader: result.loader,
+    };
+  }
+}