fix: load event ns

Author: twlite

apps/test-bot/package.json

@@ -21,4 +21,4 @@
   "devDependencies": {
     "tsx": "^4.7.0"
   }
-}
+}

apps/test-bot/src/events/guildMemberAdd/guildMemberAdd.ts

@@ -1,3 +1,3 @@
 export default async function onGuildMemberAdd() {
   console.log('guildMemberAdd event fired!');
-};
+}

packages/commandkit/events.cjs

@@ -1,6 +1,6 @@
 const { getCommandKit } = require('./dist/context/async-context.js');
 
 export function useEvents() {
-    const commandkit = getCommandKit(true);
-    return commandkit.events;
-}
+  const commandkit = getCommandKit(true);
+  return commandkit.events;
+}

packages/commandkit/package.json

@@ -137,4 +137,4 @@
   "engines": {
     "node": ">=22"
   }
-}
+}

packages/i18n/src/hooks.ts

@@ -5,6 +5,7 @@ import {
   eventWorkerContext,
   CommandKitEnvironment,
 } from 'commandkit';
+import { TFunction } from 'i18next';
 
 /**
  * Gets the localization context. If the context originates from the event worker context, the returned t function is not bound to the command.
@@ -30,7 +31,7 @@ export function locale(locale?: Locale): CommandLocalizationContext {
     const detectedLocale: Locale = locale || commandkit.config.defaultLocale;
 
     return {
-      t: i18n.t,
+      t: i18n.getFixedT(context.event),
       locale: detectedLocale,
       i18n,
       isEventWorker: true,
@@ -45,3 +46,18 @@ export function locale(locale?: Locale): CommandLocalizationContext {
 
   return context.locale(locale);
 }
+
+/**
+ * Fetches the translation function for the given locale and namespace.
+ * @param lng The locale to use.
+ * @param ns The namespace to use.
+ * @param keyPrefix The key prefix to use.
+ * @returns The translation function.
+ */
+export function fetchT(
+  lng: string | string[],
+  ns?: string | null,
+  keyPrefix?: string,
+): TFunction {
+  return locale().i18n.getFixedT(lng, ns, keyPrefix);
+}

packages/i18n/src/i18n.ts

@@ -193,6 +193,7 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
 
   private async scanLocaleDirectory() {
     const endPattern = /{{lng}}(\/|\\){{ns}}.json$/;
+    const eventFilePattern = /\.event\.json$/;
     const localesPath = I18nPlugin.getLoadPath();
     const scanDirTarget = localesPath.replace(endPattern, '');
 
@@ -211,6 +212,7 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
 
     for (const file of files) {
       const isValidLocale = DISCORD_LOCALES.has(file.name as Locale);
+
       if (file.isDirectory()) {
         if (!isValidLocale) {
           Logger.warn(`I18nPlugin: Invalid locale directory ${file.name}`);
@@ -229,29 +231,49 @@ export class I18nPlugin extends RuntimePlugin<LocalizationPluginOptions> {
 
             if (!/\.json$/.test(ext)) continue;
 
-            const name = basename(file.name, ext);
-            namespaces.add(name);
+            let name: string;
+            const isEvent = eventFilePattern.test(file.name);
+            // Handle event files specially
+            if (isEvent) {
+              name = file.name.replace('.event.json', '');
+            } else {
+              name = basename(file.name, ext);
+            }
+            namespaces.add(`${isEvent ? 'event_' : ''}${name}`);
 
             const locale = basename(file.parentPath);
 
-            await this.loadMetadata(
-              join(file.parentPath, file.name),
-              locale,
-              name,
-            );
+            if (!isEvent)
+              await this.loadMetadata(
+                join(file.parentPath, file.name),
+                locale,
+                name,
+              );
           }
         }
       } else if (file.isFile()) {
         const ext = extname(file.name);
 
         if (!/\.json$/.test(ext)) continue;
 
-        const name = basename(file.name, ext);
-        namespaces.add(name);
+        let name: string;
+        const isEvent = eventFilePattern.test(file.name);
+        // Handle event files specially
+        if (isEvent) {
+          name = file.name.replace('.event.json', '');
+        } else {
+          name = basename(file.name, ext);
+        }
+        namespaces.add(`${isEvent ? 'event_' : ''}${name}`);
 
         const locale = basename(file.parentPath);
 
-        await this.loadMetadata(join(file.parentPath, file.name), locale, name);
+        if (!isEvent)
+          await this.loadMetadata(
+            join(file.parentPath, file.name),
+            locale,
+            name,
+          );
       }
     }
 

packages/i18n/src/index.ts

@@ -22,5 +22,5 @@ export function i18n(
 }
 
 export { I18nCliTemplatePlugin };
-export { locale } from './hooks';
+export { locale, fetchT } from './hooks';
 export { getI18n, I18nPlugin, type CommandLocalizationContext } from './i18n';