@mostfeatured/dbi 0.1.21 → 0.1.22

package/src/DBI.ts

@@ -86,6 +86,11 @@ export type TDBIMessageCommandsPrefixesCtx = {
   message: Discord.Message;
 };
 
+export type TDBILocaleInvalidPathCtx<TNamespace extends NamespaceEnums> = {
+  path: string;
+  locale: DBILocale<TNamespace>;
+}
+
 export interface DBIConfig<TNamespace extends NamespaceEnums> {
   discord: {
     namespace: string;
@@ -93,7 +98,10 @@ export interface DBIConfig<TNamespace extends NamespaceEnums> {
     options: Discord.ClientOptions;
   }[];
   defaults: {
-    locale: TDBILocaleString;
+    locale: {
+      name: TDBILocaleString;
+      invalidPath(ctx: TDBILocaleInvalidPathCtx<TNamespace>): string;
+    };
     directMessages: boolean;
     defaultMemberPermissions: Discord.PermissionsString[];
     messageCommands: {
@@ -143,7 +151,10 @@ export interface DBIConfigConstructor<TNamespace extends NamespaceEnums> {
   }[];
 
   defaults?: {
-    locale?: TDBILocaleString;
+    locale?: {
+      name?: TDBILocaleString;
+      invalidPath?: string | ((ctx: TDBILocaleInvalidPathCtx<TNamespace>) => string);
+    };
     directMessages?: boolean;
     defaultMemberPermissions?: Discord.PermissionsString[];
     messageCommands?: {
@@ -283,18 +294,25 @@ export class DBI<
 
     config.store = (config.store as any) || new MemoryStore();
     config.defaults = {
-      locale: "en",
+      locale: (() => {
+        const invalidPath = config.defaults?.locale?.invalidPath;
+        return {
+          ...(config.defaults?.locale || {}),
+          invalidPath: (typeof invalidPath === "function" ? invalidPath : (ctx: TDBILocaleInvalidPathCtx<TNamespace>) => invalidPath || `Invalid "${ctx.path}" locale path.`) as any
+        }
+      })(),
       defaultMemberPermissions: [],
       directMessages: false,
       ...(config.defaults || {}),
       messageCommands: (() => {
-        let deferReplyContent = config.defaults?.messageCommands?.deferReplyContent
+        const deferReplyContent = config.defaults?.messageCommands?.deferReplyContent
         return {
           ...(config.defaults?.messageCommands || {}),
           deferReplyContent: (typeof deferReplyContent === "function" ? deferReplyContent : () => deferReplyContent || "Loading...") as any
         }
       })(),
     };
+
     config.sharding = config.sharding ?? "off";
     config.strict = config.strict ?? true;
     config.references = {

package/src/methods/handleMessageCommands.ts

@@ -94,11 +94,11 @@ export async function handleMessageCommands(
   const builtLocale = {
     user:
       dbi.data.locales.get(interaction.locale) ||
-      dbi.data.locales.get(dbi.config.defaults.locale),
+      dbi.data.locales.get(dbi.config.defaults.locale.name),
     guild: message.guild?.preferredLocale
       ? dbi.data.locales.get(
         message.guild?.preferredLocale?.split("-")?.at(0)
-      ) || dbi.data.locales.get(dbi.config.defaults.locale)
+      ) || dbi.data.locales.get(dbi.config.defaults.locale.name)
       : null,
   };
 

package/src/methods/hookEventListeners.ts

@@ -36,7 +36,7 @@ export function hookEventListeners(dbi: DBI<NamespaceEnums>): () => any {
       if (current instanceof Guild) return current?.preferredLocale?.split?.("-")?.[0];
       return all;
     }, null);
-    let guildLocale = guildLocaleName ? (dbi.data.locales.has(guildLocaleName) ? dbi.data.locales.get(guildLocaleName) : dbi.data.locales.get(dbi.config.defaults.locale)) : null;
+    let guildLocale = guildLocaleName ? (dbi.data.locales.has(guildLocaleName) ? dbi.data.locales.get(guildLocaleName) : dbi.data.locales.get(dbi.config.defaults.locale.name)) : null;
 
     let locale = guildLocale ? { guild: guildLocale } : null;
 

package/src/methods/hookInteractionListeners.ts

@@ -49,7 +49,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
     let userLocaleName = inter.locale.split("-")[0];
     let userLocale = dbi.data.locales.has(userLocaleName)
       ? dbi.data.locales.get(userLocaleName)
-      : dbi.data.locales.get(dbi.config.defaults.locale);
+      : dbi.data.locales.get(dbi.config.defaults.locale.name);
 
     let guildLocaleName = inter.guild
       ? inter.guild.preferredLocale.split("-")[0]
@@ -57,7 +57,7 @@ export function hookInteractionListeners(dbi: DBI<NamespaceEnums>): () => any {
     let guildLocale = guildLocaleName
       ? dbi.data.locales.has(guildLocaleName)
         ? dbi.data.locales.get(guildLocaleName)
-        : dbi.data.locales.get(dbi.config.defaults.locale)
+        : dbi.data.locales.get(dbi.config.defaults.locale.name)
       : null;
 
     let locale = {

package/src/types/other/FakeMessageInteraction.ts

@@ -325,11 +325,11 @@ export class FakeMessageInteraction /* implements ChatInputCommandInteraction */
       interaction: this,
       locale: {
         user: this.dbi.data.locales.get(this.locale) ||
-          this.dbi.data.locales.get(this.dbi.config.defaults.locale),
+          this.dbi.data.locales.get(this.dbi.config.defaults.locale.name),
         guild: this.message.guild?.preferredLocale
           ? this.dbi.data.locales.get(
             this.message.guild?.preferredLocale?.split("-")?.at(0)
-          ) || this.dbi.data.locales.get(this.dbi.config.defaults.locale)
+          ) || this.dbi.data.locales.get(this.dbi.config.defaults.locale.name)
           : null,
       }
     })));

package/src/types/other/Locale.ts

@@ -1,7 +1,7 @@
 import stuffs from "stuffs";
 import { NamespaceData, NamespaceEnums } from "../../../generated/namespaceData";
 import { DBI } from "../../DBI";
-
+import _ from "lodash";
 
 export interface DBILangObject {
   [property: string]: DBILangObject & ((...args: any[]) => string);
@@ -18,7 +18,7 @@ export type TDBILocaleConstructor<TNamespace extends NamespaceEnums> = Omit<DBIL
 export class DBILocale<TNamespace extends NamespaceEnums> {
   name: TDBILocaleString;
   data: NamespaceData[TNamespace]["contentLocale"];
-  private _data: DBILangConstructorObject;
+  _data: DBILangConstructorObject;
   dbi: DBI<TNamespace, {}>;
   flag?: string
   constructor(dbi: DBI<TNamespace, {}>, cfg: TDBILocaleConstructor<TNamespace>) {
@@ -26,27 +26,40 @@ export class DBILocale<TNamespace extends NamespaceEnums> {
     this.name = cfg.name;
     this.flag = cfg.flag;
     this._data = cfg.data;
-    this.data = convertLang<TNamespace>(cfg.data);
+    this.data = createInfinitePathProxy((path, ...args) => {
+      return this.format(path.join("."), ...args);
+    });;
   }
   mergeLocale(locale: DBILocale<TNamespace>): DBILocale<TNamespace> {
     this._data = stuffs.defaultify(locale._data, this._data, true) as any;
-    this.data = convertLang<TNamespace>(this._data);
-
-    locale.data = this.data;
     locale._data = this._data;
 
     return this;
   }
+  get(path: string): string | null {
+    return _.get(this._data as any, path) as string || null;
+  }
+  format(path: string, ...args: any[]): string {
+    const value = this.get(path);
+    if (!value) {
+      const defaultLocale = this.dbi.locale(this.dbi.config.defaults.locale.name);
+      if (!defaultLocale) return this.dbi.config.defaults.locale.invalidPath({
+        locale: this,
+        path,
+      });
+      return defaultLocale.format(path, ...args);
+    }
+    return stuffs.mapReplace(value, args.map((t, i) => [new RegExp(`\\{${i}(;[^}]+)?\\}`, "g"), t]));
+  }
 }
 
-export function convertLang<TNamespace extends NamespaceEnums>(data: DBILangConstructorObject): NamespaceData[TNamespace]["contentLocale"] {
-  return Object.fromEntries(Object.entries(data).map(([key, value]) => {
-    if (typeof value === "string") {
-      return [key, (...args: any[]) => {
-        return stuffs.mapReplace(value, args.map((t, i) => [new RegExp(`\\{${i}(;[^}]+)?\\}`, "g"), t]))
-      }];
-    } else {
-      return [key, convertLang(value)];
+export function createInfinitePathProxy(onApplyPath: (path: string[], ...args: any[]) => string, path: string[] = []): any {
+  return new Proxy(() => { }, {
+    get(target, key) {
+      return createInfinitePathProxy(onApplyPath, [...path, key.toString()]);
+    },
+    apply(target, thisArg, args) {
+      return onApplyPath(path, ...args);
     }
-  }))
-}
+  });
+}