commandkit 0.1.11-dev.20250408053600 → 0.1.11-dev.20250414064855

package/dist/index.js

@@ -2012,12 +2012,6 @@ var init_RuntimePlugin = __esm({
        */
       async onBeforeMessageCommand(ctx, message) {
       }
-      /**
-       * Called before message update command is processed
-       * @param message The message
-       */
-      async onBeforeMessageUpdateCommand(ctx, oldMessage, newMessage) {
-      }
       /**
        * Called before command is executed. This method can execute the command itself.
        * @param source The source that triggered the command
@@ -2085,6 +2079,13 @@ var init_RuntimePlugin = __esm({
        */
       async onBeforeRegisterGuildCommands(ctx, event) {
       }
+      /**
+       * Called after command and all of its deferred functions are executed.
+       * @param ctx The context
+       * @param env The environment of the command. This environment contains the command execution data such as command context and more.
+       */
+      async onAfterCommand(ctx, env) {
+      }
     };
     __name(_RuntimePlugin, "RuntimePlugin");
     RuntimePlugin = _RuntimePlugin;
@@ -2112,7 +2113,7 @@ var init_DefaultLogger = __esm({
       autocomplete: "Autocomplete",
       messageContextMenu: "MessageContextMenu",
       userContextMenu: "UserContextMenu",
-      chatInput: "SlashCommand",
+      chatInput: "ChatInputCommand",
       message: "Message"
     };
     TextColorMap = {
@@ -2265,10 +2266,10 @@ var init_Logger = __esm({
   }
 });
 
-// src/plugins/runtime/CommandKitPluginRuntime.ts
+// src/plugins/plugin-runtime/CommandKitPluginRuntime.ts
 var import_discord12, _CommandKitPluginRuntime, CommandKitPluginRuntime;
 var init_CommandKitPluginRuntime = __esm({
-  "src/plugins/runtime/CommandKitPluginRuntime.ts"() {
+  "src/plugins/plugin-runtime/CommandKitPluginRuntime.ts"() {
     "use strict";
     init_cjs_shims();
     import_discord12 = require("discord.js");
@@ -2350,7 +2351,7 @@ var init_CommandKitPluginRuntime = __esm({
   }
 });
 
-// src/plugins/runtime/CompilerPluginRuntime.ts
+// src/plugins/plugin-runtime/CompilerPluginRuntime.ts
 function fromEsbuildPlugin(plugin) {
   const _EsbuildPluginCompat = class _EsbuildPluginCompat extends CompilerPlugin {
     name = plugin.name;
@@ -2377,7 +2378,7 @@ function fromEsbuildPlugin(plugin) {
 }
 var import_promises, pattern, _CompilerPluginRuntime, CompilerPluginRuntime;
 var init_CompilerPluginRuntime = __esm({
-  "src/plugins/runtime/CompilerPluginRuntime.ts"() {
+  "src/plugins/plugin-runtime/CompilerPluginRuntime.ts"() {
     "use strict";
     init_cjs_shims();
     import_promises = require("fs/promises");
@@ -2540,17 +2541,17 @@ var init_CompilerPluginRuntime = __esm({
   }
 });
 
-// src/plugins/runtime/types.ts
+// src/plugins/plugin-runtime/types.ts
 var init_types3 = __esm({
-  "src/plugins/runtime/types.ts"() {
+  "src/plugins/plugin-runtime/types.ts"() {
     "use strict";
     init_cjs_shims();
   }
 });
 
-// src/plugins/runtime/runtime.ts
+// src/plugins/plugin-runtime/runtime.ts
 var init_runtime = __esm({
-  "src/plugins/runtime/runtime.ts"() {
+  "src/plugins/plugin-runtime/runtime.ts"() {
     "use strict";
     init_cjs_shims();
   }
@@ -2571,10 +2572,139 @@ var init_plugins = __esm({
   }
 });
 
-// src/plugins/runtime/builtin/cache/UseCacheTransformer.ts
-var parser, import_traverse, import_generator, t, traverse, generate, IMPORT_PATH, DIRECTIVE, CACHE_IDENTIFIER, generateRandomString, cacheDirectivePlugin;
-var init_UseCacheTransformer = __esm({
-  "src/plugins/runtime/builtin/cache/UseCacheTransformer.ts"() {
+// src/plugins/plugin-runtime/builtin/common/directive-transformer.ts
+function createDirectiveTransformer(options) {
+  const IMPORT_PATH = options.importPath;
+  const DIRECTIVE = options.directive;
+  const CACHE_IDENTIFIER = options.importName;
+  const ASYNC_ONLY = options.asyncOnly ?? true;
+  const transformer = /* @__PURE__ */ __name(async (source, args) => {
+    var _a;
+    const ast = parser.parse(source, {
+      sourceType: "module",
+      plugins: ["typescript", "jsx"]
+    });
+    let state = {
+      needsImport: false,
+      hasExistingImport: false,
+      cacheIdentifierName: CACHE_IDENTIFIER,
+      modifications: []
+    };
+    traverse(ast, {
+      Program: {
+        enter(path3) {
+          const binding = path3.scope.getBinding(CACHE_IDENTIFIER);
+          if (binding) {
+            state.cacheIdentifierName = `${CACHE_IDENTIFIER}_${generateRandomString()}`;
+          }
+        }
+      },
+      ImportDeclaration(path3) {
+        if (path3.node.source.value === IMPORT_PATH && path3.node.specifiers.some(
+          (spec) => t.isImportSpecifier(spec) && // @ts-ignore
+          spec.imported.name === CACHE_IDENTIFIER
+        )) {
+          state.hasExistingImport = true;
+          if (state.cacheIdentifierName !== CACHE_IDENTIFIER) {
+            state.modifications.push(() => {
+              path3.node.specifiers.forEach((spec) => {
+                if (t.isImportSpecifier(spec) && // @ts-ignore
+                spec.imported.name === CACHE_IDENTIFIER) {
+                  spec.local.name = state.cacheIdentifierName;
+                }
+              });
+            });
+          }
+        }
+      },
+      "FunctionDeclaration|FunctionExpression|ArrowFunctionExpression|ObjectMethod"(path3) {
+        var _a2, _b, _c;
+        const body = t.isBlockStatement(path3.node.body) ? path3.node.body : null;
+        const hasUseCache = (_a2 = body == null ? void 0 : body.directives) == null ? void 0 : _a2.some(
+          (d) => d.value.value === DIRECTIVE
+        );
+        if (!hasUseCache && !t.isBlockStatement(path3.node.body)) {
+          const parentFunction = path3.findParent(
+            (p) => (p.isFunction() || p.isProgram()) && "directives" in p.node
+          );
+          if (!((_b = parentFunction == null ? void 0 : parentFunction.node.directives) == null ? void 0 : _b.some(
+            (d) => d.value.value === DIRECTIVE
+          ))) {
+            return;
+          }
+        }
+        if (hasUseCache || !t.isBlockStatement(path3.node.body)) {
+          if (ASYNC_ONLY && !path3.node.async) {
+            throw new Error(
+              `"${DIRECTIVE}" directive may only be used in async functions at ${args.path}
+
+${path3.toString()}
+^^^^${"-".repeat(6)} This function must be async`
+            );
+          }
+          state.needsImport = true;
+          const isDeclaration = t.isFunctionDeclaration(path3.node);
+          const name = isDeclaration ? (_c = path3.node.id) == null ? void 0 : _c.name : void 0;
+          const newBody = t.isBlockStatement(path3.node.body) ? t.blockStatement(
+            path3.node.body.body,
+            path3.node.body.directives.filter(
+              (d) => d.value.value !== DIRECTIVE
+            )
+          ) : path3.node.body;
+          const wrapped = t.callExpression(
+            t.identifier(state.cacheIdentifierName),
+            [t.arrowFunctionExpression(path3.node.params, newBody, true)]
+          );
+          state.modifications.push(() => {
+            if (t.isObjectMethod(path3.node)) {
+              path3.replaceWith(
+                t.objectProperty(t.identifier(path3.node.key.name), wrapped)
+              );
+            } else if (name) {
+              path3.replaceWith(
+                t.variableDeclaration(
+                  "const",
+                  [
+                    t.variableDeclarator(t.identifier(name), wrapped)
+                  ]
+                )
+              );
+            } else if (!t.isVariableDeclarator(path3.parent)) {
+              path3.replaceWith(wrapped);
+            } else {
+              path3.parent.init = wrapped;
+            }
+          });
+        }
+      }
+    });
+    if (state.modifications.length > 0) {
+      if (state.needsImport && !state.hasExistingImport) {
+        ast.program.body.unshift(
+          t.importDeclaration(
+            [
+              t.importSpecifier(
+                t.identifier(state.cacheIdentifierName),
+                t.identifier(CACHE_IDENTIFIER)
+              )
+            ],
+            t.stringLiteral(IMPORT_PATH)
+          )
+        );
+      }
+      state.modifications.forEach((modify) => modify());
+    }
+    const { code } = generate(ast);
+    return {
+      contents: code,
+      loader: (_a = args.path) == null ? void 0 : _a.split(".").pop()
+    };
+  }, "transformer");
+  return transformer;
+}
+var parser, import_traverse, import_generator, t, traverse, generate, generateRandomString;
+var init_directive_transformer = __esm({
+  "src/plugins/plugin-runtime/builtin/common/directive-transformer.ts"() {
     "use strict";
     init_cjs_shims();
     parser = __toESM(require("@babel/parser"));
@@ -2583,9 +2713,6 @@ var init_UseCacheTransformer = __esm({
     t = __toESM(require("@babel/types"));
     traverse = import_traverse.default.default || import_traverse.default;
     generate = import_generator.default.default || import_generator.default;
-    IMPORT_PATH = "commandkit";
-    DIRECTIVE = "use cache";
-    CACHE_IDENTIFIER = "zzz_commandkit_secret_internal_use_cache_wrapper_do_not_use_or_you_will_be_fired";
     generateRandomString = /* @__PURE__ */ __name((length = 6) => {
       const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
       return Array.from(
@@ -2593,135 +2720,30 @@ var init_UseCacheTransformer = __esm({
         () => chars[Math.floor(Math.random() * chars.length)]
       ).join("");
     }, "generateRandomString");
-    cacheDirectivePlugin = /* @__PURE__ */ __name(async (source, args) => {
-      var _a;
-      const ast = parser.parse(source, {
-        sourceType: "module",
-        plugins: ["typescript", "jsx"]
-      });
-      let state = {
-        needsImport: false,
-        hasExistingImport: false,
-        cacheIdentifierName: CACHE_IDENTIFIER,
-        modifications: []
-      };
-      traverse(ast, {
-        Program: {
-          enter(path3) {
-            const binding = path3.scope.getBinding(CACHE_IDENTIFIER);
-            if (binding) {
-              state.cacheIdentifierName = `${CACHE_IDENTIFIER}_${generateRandomString()}`;
-            }
-          }
-        },
-        ImportDeclaration(path3) {
-          if (path3.node.source.value === IMPORT_PATH && path3.node.specifiers.some(
-            (spec) => t.isImportSpecifier(spec) && // @ts-ignore
-            spec.imported.name === CACHE_IDENTIFIER
-          )) {
-            state.hasExistingImport = true;
-            if (state.cacheIdentifierName !== CACHE_IDENTIFIER) {
-              state.modifications.push(() => {
-                path3.node.specifiers.forEach((spec) => {
-                  if (t.isImportSpecifier(spec) && // @ts-ignore
-                  spec.imported.name === CACHE_IDENTIFIER) {
-                    spec.local.name = state.cacheIdentifierName;
-                  }
-                });
-              });
-            }
-          }
-        },
-        "FunctionDeclaration|FunctionExpression|ArrowFunctionExpression|ObjectMethod"(path3) {
-          var _a2, _b, _c;
-          const body = t.isBlockStatement(path3.node.body) ? path3.node.body : null;
-          const hasUseCache = (_a2 = body == null ? void 0 : body.directives) == null ? void 0 : _a2.some(
-            (d) => d.value.value === DIRECTIVE
-          );
-          if (!hasUseCache && !t.isBlockStatement(path3.node.body)) {
-            const parentFunction = path3.findParent(
-              (p) => (p.isFunction() || p.isProgram()) && "directives" in p.node
-            );
-            if (!((_b = parentFunction == null ? void 0 : parentFunction.node.directives) == null ? void 0 : _b.some(
-              (d) => d.value.value === DIRECTIVE
-            ))) {
-              return;
-            }
-          }
-          if (hasUseCache || !t.isBlockStatement(path3.node.body)) {
-            if (!path3.node.async) {
-              throw new Error(
-                `"${DIRECTIVE}" directive may only be used in async functions at ${args.path}
+    __name(createDirectiveTransformer, "createDirectiveTransformer");
+  }
+});
 
-${path3.toString()}
-^^^^${"-".repeat(6)} This function must be async`
-              );
-            }
-            state.needsImport = true;
-            const isDeclaration = t.isFunctionDeclaration(path3.node);
-            const name = isDeclaration ? (_c = path3.node.id) == null ? void 0 : _c.name : void 0;
-            const newBody = t.isBlockStatement(path3.node.body) ? t.blockStatement(
-              path3.node.body.body,
-              path3.node.body.directives.filter(
-                (d) => d.value.value !== DIRECTIVE
-              )
-            ) : path3.node.body;
-            const wrapped = t.callExpression(
-              t.identifier(state.cacheIdentifierName),
-              [t.arrowFunctionExpression(path3.node.params, newBody, true)]
-            );
-            state.modifications.push(() => {
-              if (t.isObjectMethod(path3.node)) {
-                path3.replaceWith(
-                  t.objectProperty(t.identifier(path3.node.key.name), wrapped)
-                );
-              } else if (name) {
-                path3.replaceWith(
-                  t.variableDeclaration(
-                    "const",
-                    [
-                      t.variableDeclarator(t.identifier(name), wrapped)
-                    ]
-                  )
-                );
-              } else if (!t.isVariableDeclarator(path3.parent)) {
-                path3.replaceWith(wrapped);
-              } else {
-                path3.parent.init = wrapped;
-              }
-            });
-          }
-        }
-      });
-      if (state.modifications.length > 0) {
-        if (state.needsImport && !state.hasExistingImport) {
-          ast.program.body.unshift(
-            t.importDeclaration(
-              [
-                t.importSpecifier(
-                  t.identifier(state.cacheIdentifierName),
-                  t.identifier(CACHE_IDENTIFIER)
-                )
-              ],
-              t.stringLiteral(IMPORT_PATH)
-            )
-          );
-        }
-        state.modifications.forEach((modify) => modify());
-      }
-      const { code } = generate(ast);
-      return {
-        contents: code,
-        loader: (_a = args.path) == null ? void 0 : _a.split(".").pop()
-      };
-    }, "cacheDirectivePlugin");
+// src/plugins/plugin-runtime/builtin/cache/UseCacheTransformer.ts
+var cacheDirectivePlugin;
+var init_UseCacheTransformer = __esm({
+  "src/plugins/plugin-runtime/builtin/cache/UseCacheTransformer.ts"() {
+    "use strict";
+    init_cjs_shims();
+    init_directive_transformer();
+    cacheDirectivePlugin = createDirectiveTransformer({
+      directive: "use cache",
+      importPath: "commandkit",
+      importName: "zxcvbnm____",
+      asyncOnly: true
+    });
   }
 });
 
-// src/plugins/runtime/builtin/cache/CachePlugin.ts
+// src/plugins/plugin-runtime/builtin/cache/CachePlugin.ts
 var _CachePlugin, CachePlugin;
 var init_CachePlugin = __esm({
-  "src/plugins/runtime/builtin/cache/CachePlugin.ts"() {
+  "src/plugins/plugin-runtime/builtin/cache/CachePlugin.ts"() {
     "use strict";
     init_cjs_shims();
     init_plugins();
@@ -2745,10 +2767,10 @@ var init_CachePlugin = __esm({
   }
 });
 
-// src/plugins/runtime/builtin/MacroPlugin.ts
+// src/plugins/plugin-runtime/builtin/MacroPlugin.ts
 var _MacroPlugin, MacroPlugin;
 var init_MacroPlugin = __esm({
-  "src/plugins/runtime/builtin/MacroPlugin.ts"() {
+  "src/plugins/plugin-runtime/builtin/MacroPlugin.ts"() {
     "use strict";
     init_cjs_shims();
     init_plugins();
@@ -3377,14 +3399,14 @@ var init_CommandRegistrar = __esm({
 });
 
 // src/context/environment.ts
-function afterCommand(fn) {
+function after(fn) {
   const env = getContext();
   if (!env) {
     throw new Error("after must be called inside commandkit handler.");
   }
   return env.registerDeferredFunction(fn);
 }
-function cancelAfterCommand(id) {
+function cancelAfter(id) {
   const env = getContext();
   if (!env) {
     throw new Error("cancelAfter must be called inside commandkit handler.");
@@ -3553,8 +3575,8 @@ var init_environment = __esm({
       CommandKitEnvironmentType2["CommandHandler"] = "COMMAND_HANDLER";
       return CommandKitEnvironmentType2;
     })(CommandKitEnvironmentType || {});
-    __name(afterCommand, "afterCommand");
-    __name(cancelAfterCommand, "cancelAfterCommand");
+    __name(after, "after");
+    __name(cancelAfter, "cancelAfter");
   }
 });
 
@@ -3579,217 +3601,16 @@ var init_signals = __esm({
   }
 });
 
-// src/cache/utils.ts
-function isSerializablePrimitive(value) {
-  return value === null || PRIMITIVE_TYPES.has(typeof value);
-}
-function createKey(val) {
-  return `commandkit:cache:object:${val}`;
-}
-function getObjectId(obj) {
-  const primitive = isSerializablePrimitive(obj);
-  if (primitive) return createKey(obj);
-  if (obj instanceof Date) return createKey(obj.getTime());
-  if (obj instanceof RegExp) return createKey(obj);
-  const ref = references.get(obj);
-  if (ref) return createKey(ref);
-  const id = tracker++;
-  references.set(obj, id);
-  return createKey(id);
-}
-async function createObjectHash(...args) {
-  const serializedKey = args.map(getObjectId).join(":");
-  try {
-    const hash = (0, import_node_crypto2.createHash)("sha256");
-    hash.update(serializedKey);
-    return hash.digest("hex");
-  } catch {
-    return serializedKey;
-  }
-}
-var import_node_crypto2, tracker, references, PRIMITIVE_TYPES;
-var init_utils = __esm({
-  "src/cache/utils.ts"() {
-    "use strict";
-    init_cjs_shims();
-    import_node_crypto2 = require("crypto");
-    tracker = 0n;
-    references = /* @__PURE__ */ new WeakMap();
-    PRIMITIVE_TYPES = /* @__PURE__ */ new Set(
-      [
-        "string",
-        "number",
-        "boolean",
-        "bigint",
-        "undefined"
-      ]
-    );
-    __name(isSerializablePrimitive, "isSerializablePrimitive");
-    __name(createKey, "createKey");
-    __name(getObjectId, "getObjectId");
-    __name(createObjectHash, "createObjectHash");
-  }
-});
-
-// src/cache/use-cache.ts
-function getCacheProvider() {
-  const commandkit2 = getCommandKit(true);
-  const provider = commandkit2.getCacheProvider();
-  if (!provider) {
-    throw new Error(
-      `Cache provider was not found, please provide a cache provider to commandkit.`
-    );
-  }
-  return provider;
-}
-function useCache(fn, id, params) {
-  const isLocal = id === CACHE_FN_ID;
-  if (id && !isLocal) {
-    throw new Error("Illegal use of cache function.");
-  }
-  const fnId = (0, import_node_crypto3.randomUUID)();
-  const memo = /* @__PURE__ */ __name(async (...args) => {
-    const forcedName = isLocal ? params == null ? void 0 : params.name : null;
-    const keyHash = forcedName ?? await createObjectHash(fnId, ...args);
-    const resolvedTTL = isLocal && (params == null ? void 0 : params.ttl) != null ? typeof params.ttl === "string" ? (0, import_ms.default)(params.ttl) : params.ttl : null;
-    return cacheContext.run(
-      {
-        params: {
-          name: keyHash,
-          ttl: resolvedTTL ?? DEFAULT_TTL
-        }
-      },
-      async () => {
-        const provider = getCacheProvider();
-        const context2 = cacheContext.getStore();
-        if (!context2) {
-          throw new Error("Cache context was not found.");
-        }
-        const storedFn = fnStore.get(keyHash);
-        const effectiveKey = (storedFn == null ? void 0 : storedFn.key) ?? context2.params.name;
-        const cached = await provider.get(effectiveKey);
-        if (cached && cached.value != null) return cached.value;
-        const result = await fn(...args);
-        if (result != null) {
-          const finalKey = context2.params.name;
-          const ttl = context2.params.ttl ?? DEFAULT_TTL;
-          await provider.set(finalKey, result, ttl);
-          fnStore.set(keyHash, {
-            key: finalKey,
-            hash: keyHash,
-            ttl,
-            original: fn,
-            memo
-          });
-        }
-        return result;
-      }
-    );
-  }, "memo");
-  if (!Object.prototype.hasOwnProperty.call(fn, CACHED_FN_SYMBOL)) {
-    Object.defineProperty(memo, CACHED_FN_SYMBOL, {
-      get() {
-        return true;
-      },
-      configurable: false,
-      enumerable: false
-    });
-  }
-  return memo;
-}
-function cache(fn, params) {
-  return useCache(fn, CACHE_FN_ID, params);
-}
-function cacheTag(tag) {
-  const context2 = cacheContext.getStore();
-  if (!context2) {
-    throw new Error("cacheTag() must be called inside a cached function.");
-  }
-  if (!tag) {
-    throw new Error("cacheTag() must be called with a tag name.");
-  }
-  context2.params.name = tag;
-}
-function cacheLife(ttl) {
-  const context2 = cacheContext.getStore();
-  if (!context2) {
-    throw new Error("cacheLife() must be called inside a cached function.");
-  }
-  if (ttl == null || !["string", "number"].includes(typeof ttl)) {
-    throw new Error("cacheLife() must be called with a ttl.");
-  }
-  context2.params.ttl = typeof ttl === "string" ? (0, import_ms.default)(ttl) : ttl;
-}
-async function invalidate(tag) {
-  const provider = getCacheProvider();
-  const entry = Array.from(fnStore.values()).find(
-    (v) => v.key === tag || v.hash === tag
-  );
-  if (!entry) return;
-  await provider.delete(entry.key);
-}
-async function revalidate(tag, ...args) {
-  const provider = getCacheProvider();
-  const entry = Array.from(fnStore.values()).find(
-    (v) => v.key === tag || v.hash === tag
-  );
-  if (!entry) return void 0;
-  await provider.delete(entry.key);
-  return entry.memo(...args);
-}
-function isCachedFunction(fn) {
-  return Object.prototype.hasOwnProperty.call(fn, CACHED_FN_SYMBOL);
-}
-var import_node_async_hooks2, import_node_crypto3, import_ms, cacheContext, fnStore, DEFAULT_TTL, CACHE_FN_ID, CACHED_FN_SYMBOL, zzz_commandkit_secret_internal_use_cache_wrapper_do_not_use_or_you_will_be_fired;
-var init_use_cache = __esm({
-  "src/cache/use-cache.ts"() {
-    "use strict";
-    init_cjs_shims();
-    import_node_async_hooks2 = require("async_hooks");
-    init_async_context();
-    import_node_crypto3 = require("crypto");
-    import_ms = __toESM(require("ms"));
-    init_utils();
-    cacheContext = new import_node_async_hooks2.AsyncLocalStorage();
-    fnStore = /* @__PURE__ */ new Map();
-    DEFAULT_TTL = (0, import_ms.default)("15m");
-    CACHE_FN_ID = `__cache_fn_id_${Date.now()}__${Math.random()}__`;
-    CACHED_FN_SYMBOL = Symbol("commandkit.cache.sentinel");
-    __name(getCacheProvider, "getCacheProvider");
-    __name(useCache, "useCache");
-    __name(cache, "cache");
-    __name(cacheTag, "cacheTag");
-    __name(cacheLife, "cacheLife");
-    __name(invalidate, "invalidate");
-    __name(revalidate, "revalidate");
-    __name(isCachedFunction, "isCachedFunction");
-    zzz_commandkit_secret_internal_use_cache_wrapper_do_not_use_or_you_will_be_fired = useCache;
-  }
-});
-
-// src/cache/index.ts
-var init_cache = __esm({
-  "src/cache/index.ts"() {
-    "use strict";
-    init_cjs_shims();
-    init_CacheProvider();
-    init_MemoryCache();
-    init_use_cache();
-  }
-});
-
 // src/app/commands/Context.ts
 var CommandExecutionMode, _store, _Context, Context, _cancel, _MiddlewareContext, MiddlewareContext;
 var init_Context = __esm({
   "src/app/commands/Context.ts"() {
     "use strict";
     init_cjs_shims();
-    init_environment();
     init_async_context();
     init_signals();
-    init_cache();
     CommandExecutionMode = {
-      SlashCommand: "chatInput",
+      ChatInputCommand: "chatInput",
       MessageContextMenu: "messageContextMenu",
       UserContextMenu: "userContextMenu",
       Autocomplete: "autocomplete",
@@ -3812,6 +3633,22 @@ var init_Context = __esm({
          * The message that triggered the command.
          */
         __publicField(this, "message");
+        /**
+         * The guild where the command was triggered.
+         */
+        __publicField(this, "guild");
+        /**
+         * The guild ID where the command was triggered.
+         */
+        __publicField(this, "guildId");
+        /**
+         * The channel where the command was triggered.
+         */
+        __publicField(this, "channel");
+        /**
+         * The channel id where the command was triggered.
+         */
+        __publicField(this, "channelId");
         /**
          * The client instance.
          */
@@ -3827,6 +3664,18 @@ var init_Context = __esm({
         this.client = commandkit2.client;
         __privateSet(this, _store, config.store ?? /* @__PURE__ */ new Map());
         this.command = config.command;
+        if (config.interaction) {
+          this.guild = config.interaction.guild;
+          this.guildId = config.interaction.guildId;
+          this.channel = config.interaction.channel;
+          this.channelId = config.interaction.channelId;
+        }
+        if (config.message) {
+          this.guild = config.message.guild;
+          this.guildId = config.message.guildId;
+          this.channel = config.message.channel;
+          this.channelId = config.message.channelId;
+        }
         if (this.config.environment) {
           this.config.environment.setContext(this);
         }
@@ -3904,17 +3753,37 @@ var init_Context = __esm({
       get executionMode() {
         return this.config.executionMode;
       }
+      // /**
+      //  * The guild where this command was triggered.
+      //  */
+      // public get guild() {
+      //   if (this.isInteraction()) {
+      //     return this.interaction.guild;
+      //   } else {
+      //     return (<MessageCommandContext>this).message.guild;
+      //   }
+      // }
+      // /**
+      //  * The guild ID where this command was triggered.
+      //  */
+      // public get guildId() {
+      //   if (this.isInteraction()) {
+      //     return this.interaction.guildId;
+      //   } else {
+      //     return (<MessageCommandContext>this).message.guildId;
+      //   }
+      // }
       /**
        * Whether the command was triggered by an interaction.
        */
       isInteraction() {
-        return this.executionMode === CommandExecutionMode.SlashCommand || this.executionMode === CommandExecutionMode.Autocomplete || this.executionMode === CommandExecutionMode.MessageContextMenu || this.executionMode === CommandExecutionMode.UserContextMenu;
+        return this.executionMode === CommandExecutionMode.ChatInputCommand || this.executionMode === CommandExecutionMode.Autocomplete || this.executionMode === CommandExecutionMode.MessageContextMenu || this.executionMode === CommandExecutionMode.UserContextMenu;
       }
       /**
        * Whether the command was triggered by a slash command interaction.
        */
-      isSlashCommand() {
-        return this.executionMode === CommandExecutionMode.SlashCommand;
+      isChatInputCommand() {
+        return this.executionMode === CommandExecutionMode.ChatInputCommand;
       }
       /**
        * Whether the command was triggered by an autocomplete interaction.
@@ -4021,28 +3890,6 @@ var init_Context = __esm({
       exit() {
         exitMiddleware();
       }
-      /**
-       * Defers the given function to be executed after this command's execution.
-       * @param fn The function to defer.
-       * @returns A unique identifier for the deferred function.
-       */
-      defer(fn) {
-        return afterCommand(fn);
-      }
-      /**
-       * Cancels the deferred function with the given identifier.
-       * @param id The identifier of the deferred function.
-       */
-      cancelDeferred(id) {
-        cancelAfterCommand(id);
-      }
-      /**
-       * Validates if the given function is a cached function.
-       * @param fn The function to validate.
-       */
-      isCached(fn) {
-        return isCachedFunction(fn);
-      }
     };
     _store = new WeakMap();
     __name(_Context, "Context");
@@ -4102,9 +3949,6 @@ var init_AppCommandRunner = __esm({
         __privateAdd(this, _AppCommandRunner_instances);
       }
       async runCommand(prepared, source) {
-        if (source instanceof import_discord15.Message && (source.editedTimestamp || source.partial)) {
-          return;
-        }
         const { commandkit: commandkit2 } = this.handler;
         const executionMode = this.getExecutionMode(source);
         let runCommand = null;
@@ -4224,7 +4068,8 @@ var init_AppCommandRunner = __esm({
       }
       getExecutionMode(source) {
         if (source instanceof import_discord15.Message) return CommandExecutionMode.Message;
-        if (source.isChatInputCommand()) return CommandExecutionMode.SlashCommand;
+        if (source.isChatInputCommand())
+          return CommandExecutionMode.ChatInputCommand;
         if (source.isAutocomplete()) {
           return CommandExecutionMode.Autocomplete;
         }
@@ -4242,6 +4087,9 @@ var init_AppCommandRunner = __esm({
       const env = useEnvironment();
       await env.runDeferredFunctions();
       env.clearAllDeferredFunctions();
+      await this.handler.commandkit.plugins.execute(async (ctx, plugin) => {
+        await plugin.onAfterCommand(ctx, env);
+      });
     }, "#finalizer");
     __name(_AppCommandRunner, "AppCommandRunner");
     AppCommandRunner = _AppCommandRunner;
@@ -4349,43 +4197,95 @@ var init_AppCommandHandler = __esm({
       registrar;
       onInteraction = null;
       onMessageCreate = null;
-      onMessageUpdate = null;
       commandRunner = new AppCommandRunner(this);
       externalCommandData = new import_discord16.Collection();
       externalMiddlewareData = new import_discord16.Collection();
       printBanner() {
+        const uncategorized = crypto.randomUUID();
         const categorizedCommands = this.getCommandsArray().reduce(
           (acc, cmd) => {
-            const category = cmd.command.category || "uncategorized";
+            const category = cmd.command.category || uncategorized;
             acc[category] = acc[category] || [];
             acc[category].push(cmd);
             return acc;
           },
           {}
         );
-        const categories = Object.keys(categorizedCommands).sort();
         console.log(
           colors_default.green(
             `Loaded ${colors_default.magenta(this.loadedCommands.size.toString())} commands:`
           )
         );
-        categories.forEach((category, index) => {
+        const categories = Object.keys(categorizedCommands).sort();
+        const categoryTree = {};
+        categories.forEach((category) => {
+          if (category === uncategorized) return;
+          if (category.includes(":")) {
+            const parts = category.split(":");
+            let bestParent = null;
+            for (let i = parts.length - 1; i > 0; i--) {
+              const potentialParent = parts.slice(0, i).join(":");
+              if (categories.includes(potentialParent)) {
+                bestParent = potentialParent;
+                break;
+              }
+            }
+            if (bestParent) {
+              categoryTree[bestParent] = categoryTree[bestParent] || [];
+              categoryTree[bestParent].push(category);
+            }
+          }
+        });
+        const processedCategories = /* @__PURE__ */ new Set();
+        const printCategory = /* @__PURE__ */ __name((category, indent = "", isLast = false, parentPrefix = "") => {
+          if (processedCategories.has(category)) return;
+          processedCategories.add(category);
           const commands = categorizedCommands[category];
-          const isLastCategory = index === categories.length - 1;
-          const categoryPrefix = isLastCategory ? "\u2514\u2500" : "\u251C\u2500";
-          if (category !== "uncategorized") {
-            console.log(colors_default.cyan(`${categoryPrefix} ${colors_default.bold(category)}`));
+          const hasChildren = categoryTree[category] && categoryTree[category].length > 0;
+          const thisPrefix = isLast ? "\u2514\u2500" : "\u251C\u2500";
+          const childIndent = parentPrefix + (isLast ? "   " : "\u2502  ");
+          if (category !== uncategorized) {
+            const displayName = category.includes(":") ? category.split(":").pop() : category;
+            console.log(
+              colors_default.cyan(`${indent}${thisPrefix} ${colors_default.bold(displayName)}`)
+            );
           }
           commands.forEach((cmd, cmdIndex) => {
-            const isLastCommand = cmdIndex === commands.length - 1;
-            const commandPrefix = category !== "uncategorized" ? (isLastCategory ? "   " : "\u2502  ") + (isLastCommand ? "\u2514\u2500" : "\u251C\u2500") : isLastCommand ? "\u2514\u2500" : "\u251C\u2500";
+            const cmdIsLast = cmdIndex === commands.length - 1 && !hasChildren;
+            const cmdPrefix = cmdIsLast ? "\u2514\u2500" : "\u251C\u2500";
+            const cmdIndent = category !== uncategorized ? childIndent : indent;
             const name = cmd.data.command.name;
             const hasMw = cmd.command.middlewares.length > 0;
             const middlewareIcon = hasMw ? colors_default.magenta(" (\u03BB)") : "";
             console.log(
-              `${colors_default.green(commandPrefix)} ${colors_default.yellow(name)}${middlewareIcon}`
+              `${colors_default.green(`${cmdIndent}${cmdPrefix}`)} ${colors_default.yellow(name)}${middlewareIcon}`
             );
           });
+          if (hasChildren) {
+            const children = categoryTree[category].sort();
+            children.forEach((childCategory, idx) => {
+              const childIsLast = idx === children.length - 1;
+              printCategory(childCategory, childIndent, childIsLast, childIndent);
+            });
+          }
+        }, "printCategory");
+        const topLevelCategories = categories.filter((category) => {
+          if (category === uncategorized) return true;
+          if (category.includes(":")) {
+            const parts = category.split(":");
+            for (let i = 1; i < parts.length; i++) {
+              const parentPath = parts.slice(0, i).join(":");
+              if (categories.includes(parentPath)) {
+                return false;
+              }
+            }
+            return true;
+          }
+          return true;
+        }).sort();
+        topLevelCategories.forEach((category, index) => {
+          const isLast = index === topLevelCategories.length - 1;
+          printCategory(category, "", isLast);
         });
       }
       getCommandsArray() {
@@ -4417,26 +4317,8 @@ var init_AppCommandHandler = __esm({
           if (!prepared) return;
           return this.commandRunner.runCommand(prepared, message);
         };
-        this.onMessageUpdate ??= async (oldMessage, newMessage) => {
-          const success = await this.commandkit.plugins.execute(
-            async (ctx, plugin) => {
-              return plugin.onBeforeMessageUpdateCommand(
-                ctx,
-                oldMessage,
-                newMessage
-              );
-            }
-          );
-          if (success) return;
-          if (oldMessage.partial || newMessage.partial) return;
-          if (oldMessage.author.bot) return;
-          const prepared = await this.prepareCommandRun(newMessage);
-          if (!prepared) return;
-          return this.commandRunner.runCommand(prepared, newMessage);
-        };
         this.commandkit.client.on(import_discord16.Events.InteractionCreate, this.onInteraction);
         this.commandkit.client.on(import_discord16.Events.MessageCreate, this.onMessageCreate);
-        this.commandkit.client.on(import_discord16.Events.MessageUpdate, this.onMessageUpdate);
       }
       async prepareCommandRun(source, cmdName) {
         var _a;
@@ -4731,6 +4613,9 @@ var init_CommandsRouter = __esm({
             if (this.isCommand(entry.name) || this.isMiddleware(entry.name)) {
               await this.handle(entry, category);
             }
+          } else if (entry.isDirectory() && this.isCategory(entry.name) && category) {
+            const nestedCategory = this.isCategory(entry.name) ? `${category}:${entry.name.slice(1, -1)}` : null;
+            await this.traverse((0, import_node_path3.join)(path3, entry.name), nestedCategory);
           }
         }
       }
@@ -5694,7 +5579,7 @@ var init_version = __esm({
     "use strict";
     init_cjs_shims();
     version = /* @__MACRO__ $version */
-    "0.1.11-dev.20250408053600";
+    "0.1.11-dev.20250414064855";
   }
 });
 
@@ -6242,7 +6127,7 @@ async function createSpinner(text) {
   });
 }
 var ora;
-var init_utils2 = __esm({
+var init_utils = __esm({
   "src/cli/utils.ts"() {
     "use strict";
     init_cjs_shims();
@@ -6296,7 +6181,7 @@ var init_production = __esm({
     init_common2();
     init_build();
     init_plugins();
-    init_utils2();
+    init_utils();
     __name(bootstrapProductionServer, "bootstrapProductionServer");
     __name(createProductionBuild, "createProductionBuild");
   }
@@ -6312,14 +6197,14 @@ function determineExtension() {
   return (0, import_fs2.existsSync)((0, import_path4.join)(BASE_PATH, "tsconfig.json")) ? "ts" : "js";
 }
 function TS_COMMAND_SOURCE(name) {
-  return `import type { CommandData, SlashCommand, MessageCommand } from 'commandkit';
+  return `import type { CommandData, ChatInputCommand, MessageCommand } from 'commandkit';
 
 export const command: CommandData = {
   name: '${name}',
   description: '${name} command',
 };
 
-export const chatInput: SlashCommand = async (ctx) => {
+export const chatInput: ChatInputCommand = async (ctx) => {
   await ctx.interaction.reply('Hello from ${name}!');
 };
 
@@ -6338,7 +6223,7 @@ export const command = {
 };
 
 /**
- * @type {import('commandkit').SlashCommand}
+ * @type {import('commandkit').ChatInputCommand}
  */
 export const chatInput = async (ctx) => {
   await ctx.interaction.reply('Hello from ${name}!');
@@ -6616,12 +6501,12 @@ __export(index_exports, {
   TextInput: () => TextInput,
   UserSelectMenu: () => UserSelectMenu,
   UserSelectMenuKit: () => UserSelectMenuKit,
-  afterCommand: () => afterCommand,
+  after: () => after,
   bootstrapCommandkitCLI: () => bootstrapCommandkitCLI,
   cache: () => cache,
   cacheLife: () => cacheLife,
   cacheTag: () => cacheTag,
-  cancelAfterCommand: () => cancelAfterCommand,
+  cancelAfter: () => cancelAfter,
   commandkit: () => commandkit,
   createElement: () => createElement,
   createLogger: () => createLogger,
@@ -6654,7 +6539,7 @@ __export(index_exports, {
   revalidate: () => revalidate,
   useEnvironment: () => useEnvironment,
   version: () => version,
-  zzz_commandkit_secret_internal_use_cache_wrapper_do_not_use_or_you_will_be_fired: () => zzz_commandkit_secret_internal_use_cache_wrapper_do_not_use_or_you_will_be_fired
+  zxcvbnm____: () => zxcvbnm____
 });
 module.exports = __toCommonJS(index_exports);
 init_cjs_shims();
@@ -6664,7 +6549,188 @@ init_components();
 init_config();
 init_async_context();
 init_environment();
-init_cache();
+
+// src/cache/index.ts
+init_cjs_shims();
+init_CacheProvider();
+init_MemoryCache();
+
+// src/cache/use-cache.ts
+init_cjs_shims();
+var import_node_async_hooks2 = require("async_hooks");
+init_async_context();
+var import_node_crypto3 = require("crypto");
+var import_ms = __toESM(require("ms"));
+
+// src/cache/utils.ts
+init_cjs_shims();
+var import_node_crypto2 = require("crypto");
+var tracker = 0n;
+var references = /* @__PURE__ */ new WeakMap();
+var PRIMITIVE_TYPES = /* @__PURE__ */ new Set(
+  [
+    "string",
+    "number",
+    "boolean",
+    "bigint",
+    "undefined"
+  ]
+);
+function isSerializablePrimitive(value) {
+  return value === null || PRIMITIVE_TYPES.has(typeof value);
+}
+__name(isSerializablePrimitive, "isSerializablePrimitive");
+function createKey(val) {
+  return `commandkit:cache:object:${val}`;
+}
+__name(createKey, "createKey");
+function getObjectId(obj) {
+  const primitive = isSerializablePrimitive(obj);
+  if (primitive) return createKey(obj);
+  if (obj instanceof Date) return createKey(obj.getTime());
+  if (obj instanceof RegExp) return createKey(obj);
+  const ref = references.get(obj);
+  if (ref) return createKey(ref);
+  const id = tracker++;
+  references.set(obj, id);
+  return createKey(id);
+}
+__name(getObjectId, "getObjectId");
+async function createObjectHash(...args) {
+  const serializedKey = args.map(getObjectId).join(":");
+  try {
+    const hash = (0, import_node_crypto2.createHash)("sha256");
+    hash.update(serializedKey);
+    return hash.digest("hex");
+  } catch {
+    return serializedKey;
+  }
+}
+__name(createObjectHash, "createObjectHash");
+
+// src/cache/use-cache.ts
+var cacheContext = new import_node_async_hooks2.AsyncLocalStorage();
+var fnStore = /* @__PURE__ */ new Map();
+var DEFAULT_TTL = (0, import_ms.default)("15m");
+var CACHE_FN_ID = `__cache_fn_id_${Date.now()}__${Math.random()}__`;
+var CACHED_FN_SYMBOL = Symbol("commandkit.cache.sentinel");
+function getCacheProvider() {
+  const commandkit2 = getCommandKit(true);
+  const provider = commandkit2.getCacheProvider();
+  if (!provider) {
+    throw new Error(
+      `Cache provider was not found, please provide a cache provider to commandkit.`
+    );
+  }
+  return provider;
+}
+__name(getCacheProvider, "getCacheProvider");
+function useCache(fn, id, params) {
+  const isLocal = id === CACHE_FN_ID;
+  if (id && !isLocal) {
+    throw new Error("Illegal use of cache function.");
+  }
+  const fnId = (0, import_node_crypto3.randomUUID)();
+  const memo = /* @__PURE__ */ __name(async (...args) => {
+    const forcedName = isLocal ? params == null ? void 0 : params.name : null;
+    const keyHash = forcedName ?? await createObjectHash(fnId, ...args);
+    const resolvedTTL = isLocal && (params == null ? void 0 : params.ttl) != null ? typeof params.ttl === "string" ? (0, import_ms.default)(params.ttl) : params.ttl : null;
+    return cacheContext.run(
+      {
+        params: {
+          name: keyHash,
+          ttl: resolvedTTL ?? DEFAULT_TTL
+        }
+      },
+      async () => {
+        const provider = getCacheProvider();
+        const context2 = cacheContext.getStore();
+        if (!context2) {
+          throw new Error("Cache context was not found.");
+        }
+        const storedFn = fnStore.get(keyHash);
+        const effectiveKey = (storedFn == null ? void 0 : storedFn.key) ?? context2.params.name;
+        const cached = await provider.get(effectiveKey);
+        if (cached && cached.value != null) return cached.value;
+        const result = await fn(...args);
+        if (result != null) {
+          const finalKey = context2.params.name;
+          const ttl = context2.params.ttl ?? DEFAULT_TTL;
+          await provider.set(finalKey, result, ttl);
+          fnStore.set(keyHash, {
+            key: finalKey,
+            hash: keyHash,
+            ttl,
+            original: fn,
+            memo
+          });
+        }
+        return result;
+      }
+    );
+  }, "memo");
+  if (!Object.prototype.hasOwnProperty.call(fn, CACHED_FN_SYMBOL)) {
+    Object.defineProperty(memo, CACHED_FN_SYMBOL, {
+      get() {
+        return true;
+      },
+      configurable: false,
+      enumerable: false
+    });
+  }
+  return memo;
+}
+__name(useCache, "useCache");
+function cache(fn, params) {
+  return useCache(fn, CACHE_FN_ID, params);
+}
+__name(cache, "cache");
+function cacheTag(tag) {
+  const context2 = cacheContext.getStore();
+  if (!context2) {
+    throw new Error("cacheTag() must be called inside a cached function.");
+  }
+  if (!tag) {
+    throw new Error("cacheTag() must be called with a tag name.");
+  }
+  context2.params.name = tag;
+}
+__name(cacheTag, "cacheTag");
+function cacheLife(ttl) {
+  const context2 = cacheContext.getStore();
+  if (!context2) {
+    throw new Error("cacheLife() must be called inside a cached function.");
+  }
+  if (ttl == null || !["string", "number"].includes(typeof ttl)) {
+    throw new Error("cacheLife() must be called with a ttl.");
+  }
+  context2.params.ttl = typeof ttl === "string" ? (0, import_ms.default)(ttl) : ttl;
+}
+__name(cacheLife, "cacheLife");
+async function invalidate(tag) {
+  const provider = getCacheProvider();
+  const entry = Array.from(fnStore.values()).find(
+    (v) => v.key === tag || v.hash === tag
+  );
+  if (!entry) return;
+  await provider.delete(entry.key);
+}
+__name(invalidate, "invalidate");
+async function revalidate(tag, ...args) {
+  const provider = getCacheProvider();
+  const entry = Array.from(fnStore.values()).find(
+    (v) => v.key === tag || v.hash === tag
+  );
+  if (!entry) return void 0;
+  await provider.delete(entry.key);
+  return entry.memo(...args);
+}
+__name(revalidate, "revalidate");
+function isCachedFunction(fn) {
+  return Object.prototype.hasOwnProperty.call(fn, CACHED_FN_SYMBOL);
+}
+__name(isCachedFunction, "isCachedFunction");
+var zxcvbnm____ = useCache;
 
 // src/app/index.ts
 init_cjs_shims();
@@ -6809,12 +6875,12 @@ var index_default = CommandKit;
   TextInput,
   UserSelectMenu,
   UserSelectMenuKit,
-  afterCommand,
+  after,
   bootstrapCommandkitCLI,
   cache,
   cacheLife,
   cacheTag,
-  cancelAfterCommand,
+  cancelAfter,
   commandkit,
   createElement,
   createLogger,
@@ -6846,6 +6912,6 @@ var index_default = CommandKit;
   revalidate,
   useEnvironment,
   version,
-  zzz_commandkit_secret_internal_use_cache_wrapper_do_not_use_or_you_will_be_fired
+  zxcvbnm____
 });
 //# sourceMappingURL=index.js.map