@mostfeatured/dbi 0.1.20 → 0.1.22

package/src/types/Builders/StringSelectMenuBuilder.ts

@@ -4,13 +4,13 @@ import { NamespaceEnums } from "../../../generated/namespaceData";
 import { DBIStringSelectMenu } from "../Components/StringSelectMenu";
 import { RecursivePartial } from "../../utils/UtilTypes";
 
-export type DBIStringSelectMenuOverrides =  RecursivePartial<Omit<StringSelectMenuComponentData, "customId" | "type">>
+export type DBIStringSelectMenuOverrides = RecursivePartial<Omit<StringSelectMenuComponentData, "customId" | "type">>
 
 export class DBIStringSelectMenuBuilder<TNamespace extends NamespaceEnums> {
   component: DBIStringSelectMenu<TNamespace>
   overrides: DBIStringSelectMenuOverrides;
-  reference: { data: (string | number | object)[], ttl?: number };
-  constructor(arg: { component: DBIStringSelectMenu<TNamespace>, overrides?: DBIStringSelectMenuOverrides, reference?: { data: (string | number | object)[], ttl?: number } }) {
+  reference: { data: (string | number | object | boolean | null | undefined)[], ttl?: number };
+  constructor(arg: { component: DBIStringSelectMenu<TNamespace>, overrides?: DBIStringSelectMenuOverrides, reference?: { data: (string | number | object | boolean | null | undefined)[], ttl?: number } }) {
     this.component = arg.component;
     this.overrides = arg.overrides ?? {};
     this.reference = arg.reference ?? { data: [] };
@@ -26,12 +26,12 @@ export class DBIStringSelectMenuBuilder<TNamespace extends NamespaceEnums> {
     return this;
   }
 
-  setData(...data: (string | number | object)[]): DBIStringSelectMenuBuilder<TNamespace> {
+  setData(...data: (string | number | object | boolean | null | undefined)[]): DBIStringSelectMenuBuilder<TNamespace> {
     this.reference.data = data;
     return this;
   }
 
-  addData(...data: (string | number | object)[]): DBIStringSelectMenuBuilder<TNamespace> {
+  addData(...data: (string | number | object | boolean | null | undefined)[]): DBIStringSelectMenuBuilder<TNamespace> {
     this.reference.data = [...this.reference.data, ...data];
     return this;
   }

package/src/types/Builders/UserSelectMenuBuilder.ts

@@ -4,13 +4,13 @@ import { NamespaceEnums } from "../../../generated/namespaceData";
 import { DBIUserSelectMenu } from "../Components/UserSelectMenu";
 import { RecursivePartial } from "../../utils/UtilTypes";
 
-export type DBIUserSelectMenuOverrides =  RecursivePartial<Omit<UserSelectMenuComponentData, "customId" | "type">>
+export type DBIUserSelectMenuOverrides = RecursivePartial<Omit<UserSelectMenuComponentData, "customId" | "type">>
 
 export class DBIUserSelectMenuBuilder<TNamespace extends NamespaceEnums> {
   component: DBIUserSelectMenu<TNamespace>
   overrides: DBIUserSelectMenuOverrides;
-  reference: { data: (string | number | object)[], ttl?: number };
-  constructor(arg: { component: DBIUserSelectMenu<TNamespace>, overrides?: DBIUserSelectMenuOverrides, reference?: { data: (string | number | object)[], ttl?: number } }) {
+  reference: { data: (string | number | object | boolean | null | undefined)[], ttl?: number };
+  constructor(arg: { component: DBIUserSelectMenu<TNamespace>, overrides?: DBIUserSelectMenuOverrides, reference?: { data: (string | number | object | boolean | null | undefined)[], ttl?: number } }) {
     this.component = arg.component;
     this.overrides = arg.overrides ?? {};
     this.reference = arg.reference ?? { data: [] };
@@ -26,12 +26,12 @@ export class DBIUserSelectMenuBuilder<TNamespace extends NamespaceEnums> {
     return this;
   }
 
-  setData(...data: (string | number | object)[]): DBIUserSelectMenuBuilder<TNamespace> {
+  setData(...data: (string | number | object | boolean | null | undefined)[]): DBIUserSelectMenuBuilder<TNamespace> {
     this.reference.data = data;
     return this;
   }
 
-  addData(...data: (string | number | object)[]): DBIUserSelectMenuBuilder<TNamespace> {
+  addData(...data: (string | number | object | boolean | null | undefined)[]): DBIUserSelectMenuBuilder<TNamespace> {
     this.reference.data = [...this.reference.data, ...data];
     return this;
   }

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);
     }
-  }))
-}
+  });
+}

package/src/utils/UtilTypes.ts

@@ -1,7 +1,7 @@
 export interface IDBIToJSONArgs<T> {
   reference?: {
     ttl?: number;
-    data: (string | number | object)[];
+    data: (string | number | object | boolean | null | undefined)[];
   };
   overrides?: RecursivePartial<T>;
 }