adnbn 0.9.0 → 0.11.0

package/dist/locale/helpers.d.ts

@@ -1,5 +1,4 @@
-import { LocaleNativeStructure } from "./providers/index.js";
-import { LocaleNonPluralKeys, LocalePluralKeys, LocaleSubstitutionArgs } from "../types/locale.js";
+import type { LocaleNonPluralKeys, LocalePluralKeys, LocaleRegistry, LocaleSubstitutionArgs } from "../types/locale.js";
 /**
  * Translates a non-plural locale key.
  *
@@ -17,7 +16,7 @@ import { LocaleNonPluralKeys, LocalePluralKeys, LocaleSubstitutionArgs } from ".
  * @param args
  * @returns The translated string.
  */
-export declare const t: <K extends LocaleNonPluralKeys<LocaleNativeStructure>>(key: K, ...args: LocaleSubstitutionArgs<LocaleNativeStructure, K>) => string;
+export declare const t: <K extends LocaleNonPluralKeys<LocaleRegistry>>(key: K, ...args: LocaleSubstitutionArgs<LocaleRegistry, K>) => string;
 /**
  * Translates a plural locale key using the provided count.
  *
@@ -35,7 +34,7 @@ export declare const t: <K extends LocaleNonPluralKeys<LocaleNativeStructure>>(k
  * @param args
  * @returns The translated string.
  */
-export declare const choice: <K extends LocalePluralKeys<LocaleNativeStructure>>(key: K, count: number, ...args: LocaleSubstitutionArgs<LocaleNativeStructure, K>) => string;
+export declare const choice: <K extends LocalePluralKeys<LocaleRegistry>>(key: K, count: number, ...args: LocaleSubstitutionArgs<LocaleRegistry, K>) => string;
 /**
  * Converts a locale key to a browser message reference.
  *
@@ -52,7 +51,7 @@ export declare const choice: <K extends LocalePluralKeys<LocaleNativeStructure>>
  * @param value - The locale key to convert.
  * @returns The browser message reference.
  */
-export declare const key: (value: keyof LocaleNativeStructure & string) => string;
+export declare const key: (value: keyof LocaleRegistry & string) => string;
 /**
  * Resolves a string that may contain a locale marker.
  *

package/dist/locale/helpers.js

@@ -1,5 +1,5 @@
 import { NativeLocale } from "./../locale/providers/index.js";
-import { convertLocaleMessageKey, extractLocaleKey } from "./../locale/utils.js";
+import { convertLocaleMessageKey, extractLocaleKey } from "./../shared/locale/index.js";
 const t = (key2, ...args) => {
   return NativeLocale.getInstance().trans(key2, ...args);
 };

package/dist/locale/helpers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/locale/helpers.ts"],"sourcesContent":["import {LocaleNativeStructure, NativeLocale} from \"@locale/providers\";\nimport {convertLocaleMessageKey, extractLocaleKey} from \"@locale/utils\";\nimport {LocaleNonPluralKeys, LocalePluralKeys, LocaleSubstitutionArgs} from \"@typing/locale\";\n\n/**\n * Translates a non-plural locale key.\n *\n * Substitutions are type-checked from the generated locale structure:\n * keys without placeholders do not accept substitutions, while keys with\n * placeholders require all declared substitution values.\n *\n * @example\n * ```ts\n * t(\"app.name\");\n * t(\"app.greeting\", {name: \"Alice\"});\n * ```\n *\n * @param key - The locale key to translate.\n * @param args\n * @returns The translated string.\n */\nexport const t = <K extends LocaleNonPluralKeys<LocaleNativeStructure>>(\n    key: K,\n    ...args: LocaleSubstitutionArgs<LocaleNativeStructure, K>\n): string => {\n    return NativeLocale.getInstance().trans(key, ...args);\n};\n\n/**\n * Translates a plural locale key using the provided count.\n *\n * Substitutions are type-checked from the generated locale structure:\n * keys without placeholders do not accept substitutions, while keys with\n * placeholders require all declared substitution values.\n *\n * @example\n * ```ts\n * choice(\"cart.items\", count, {count});\n * ```\n *\n * @param key - The locale key to translate.\n * @param count - The count used to select the plural form.\n * @param args\n * @returns The translated string.\n */\nexport const choice = <K extends LocalePluralKeys<LocaleNativeStructure>>(\n    key: K,\n    count: number,\n    ...args: LocaleSubstitutionArgs<LocaleNativeStructure, K>\n): string => {\n    return NativeLocale.getInstance().choice(key, count, ...args);\n};\n\n/**\n * Converts a locale key to a browser message reference.\n *\n * This is useful for browser-managed extension fields that expect\n * `__MSG_name__` references instead of already translated text.\n *\n * A warning is logged when the key does not exist in the generated locale keys.\n *\n * @example\n * ```ts\n * key(\"app.name\"); // \"__MSG_app_name__\"\n * ```\n *\n * @param value - The locale key to convert.\n * @returns The browser message reference.\n */\nexport const key = (value: keyof LocaleNativeStructure & string): string => {\n    const locale = NativeLocale.getInstance();\n\n    if (!locale.keys().has(value)) {\n        console.warn(`Locale key \"${value}\" not found in \"${locale.lang()}\" language.`);\n    }\n\n    return convertLocaleMessageKey(value);\n};\n\n/**\n * Resolves a string that may contain a locale marker.\n *\n * When the input contains a locale marker, the marker is extracted and translated.\n * Plain strings are returned unchanged.\n *\n * @example\n * ```ts\n * resolve(\"@app.name\");\n * resolve(\"Plain title\");\n * ```\n *\n * @param input - A plain string or a marked locale key string.\n * @returns The translated text when a marker is found, otherwise the original input.\n */\nexport const resolve = (input: string): string => {\n    const localeKey = extractLocaleKey(input);\n\n    if (localeKey) {\n        // Markers are runtime strings without substitutions; keep t() strict for typed callers.\n        return (t as (key: string) => string)(localeKey);\n    }\n\n    return input;\n};\n"],"mappings":"AAAA,SAA+B,oBAAmB;AAClD,SAAQ,yBAAyB,wBAAuB;AAoBjD,MAAM,IAAI,CACbA,SACG,SACM;AACT,SAAO,aAAa,YAAY,EAAE,MAAMA,MAAK,GAAG,IAAI;AACxD;AAmBO,MAAM,SAAS,CAClBA,MACA,UACG,SACM;AACT,SAAO,aAAa,YAAY,EAAE,OAAOA,MAAK,OAAO,GAAG,IAAI;AAChE;AAkBO,MAAM,MAAM,CAAC,UAAwD;AACxE,QAAM,SAAS,aAAa,YAAY;AAExC,MAAI,CAAC,OAAO,KAAK,EAAE,IAAI,KAAK,GAAG;AAC3B,YAAQ,KAAK,eAAe,KAAK,mBAAmB,OAAO,KAAK,CAAC,aAAa;AAAA,EAClF;AAEA,SAAO,wBAAwB,KAAK;AACxC;AAiBO,MAAM,UAAU,CAAC,UAA0B;AAC9C,QAAM,YAAY,iBAAiB,KAAK;AAExC,MAAI,WAAW;AAEX,WAAQ,EAA8B,SAAS;AAAA,EACnD;AAEA,SAAO;AACX;","names":["key"]}
+{"version":3,"sources":["../../src/locale/helpers.ts"],"sourcesContent":["import {NativeLocale} from \"@locale/providers\";\nimport {convertLocaleMessageKey, extractLocaleKey} from \"@shared/locale\";\nimport type {LocaleNonPluralKeys, LocalePluralKeys, LocaleRegistry, LocaleSubstitutionArgs} from \"@typing/locale\";\n\n/**\n * Translates a non-plural locale key.\n *\n * Substitutions are type-checked from the generated locale structure:\n * keys without placeholders do not accept substitutions, while keys with\n * placeholders require all declared substitution values.\n *\n * @example\n * ```ts\n * t(\"app.name\");\n * t(\"app.greeting\", {name: \"Alice\"});\n * ```\n *\n * @param key - The locale key to translate.\n * @param args\n * @returns The translated string.\n */\nexport const t = <K extends LocaleNonPluralKeys<LocaleRegistry>>(\n    key: K,\n    ...args: LocaleSubstitutionArgs<LocaleRegistry, K>\n): string => {\n    return NativeLocale.getInstance().trans(key, ...args);\n};\n\n/**\n * Translates a plural locale key using the provided count.\n *\n * Substitutions are type-checked from the generated locale structure:\n * keys without placeholders do not accept substitutions, while keys with\n * placeholders require all declared substitution values.\n *\n * @example\n * ```ts\n * choice(\"cart.items\", count, {count});\n * ```\n *\n * @param key - The locale key to translate.\n * @param count - The count used to select the plural form.\n * @param args\n * @returns The translated string.\n */\nexport const choice = <K extends LocalePluralKeys<LocaleRegistry>>(\n    key: K,\n    count: number,\n    ...args: LocaleSubstitutionArgs<LocaleRegistry, K>\n): string => {\n    return NativeLocale.getInstance().choice(key, count, ...args);\n};\n\n/**\n * Converts a locale key to a browser message reference.\n *\n * This is useful for browser-managed extension fields that expect\n * `__MSG_name__` references instead of already translated text.\n *\n * A warning is logged when the key does not exist in the generated locale keys.\n *\n * @example\n * ```ts\n * key(\"app.name\"); // \"__MSG_app_name__\"\n * ```\n *\n * @param value - The locale key to convert.\n * @returns The browser message reference.\n */\nexport const key = (value: keyof LocaleRegistry & string): string => {\n    const locale = NativeLocale.getInstance();\n\n    if (!locale.keys().has(value)) {\n        console.warn(`Locale key \"${value}\" not found in \"${locale.lang()}\" language.`);\n    }\n\n    return convertLocaleMessageKey(value);\n};\n\n/**\n * Resolves a string that may contain a locale marker.\n *\n * When the input contains a locale marker, the marker is extracted and translated.\n * Plain strings are returned unchanged.\n *\n * @example\n * ```ts\n * resolve(\"@app.name\");\n * resolve(\"Plain title\");\n * ```\n *\n * @param input - A plain string or a marked locale key string.\n * @returns The translated text when a marker is found, otherwise the original input.\n */\nexport const resolve = (input: string): string => {\n    const localeKey = extractLocaleKey(input);\n\n    if (localeKey) {\n        // Markers are runtime strings without substitutions; keep t() strict for typed callers.\n        return (t as (key: string) => string)(localeKey);\n    }\n\n    return input;\n};\n"],"mappings":"AAAA,SAAQ,oBAAmB;AAC3B,SAAQ,yBAAyB,wBAAuB;AAoBjD,MAAM,IAAI,CACbA,SACG,SACM;AACT,SAAO,aAAa,YAAY,EAAE,MAAMA,MAAK,GAAG,IAAI;AACxD;AAmBO,MAAM,SAAS,CAClBA,MACA,UACG,SACM;AACT,SAAO,aAAa,YAAY,EAAE,OAAOA,MAAK,OAAO,GAAG,IAAI;AAChE;AAkBO,MAAM,MAAM,CAAC,UAAiD;AACjE,QAAM,SAAS,aAAa,YAAY;AAExC,MAAI,CAAC,OAAO,KAAK,EAAE,IAAI,KAAK,GAAG;AAC3B,YAAQ,KAAK,eAAe,KAAK,mBAAmB,OAAO,KAAK,CAAC,aAAa;AAAA,EAClF;AAEA,SAAO,wBAAwB,KAAK;AACxC;AAiBO,MAAM,UAAU,CAAC,UAA0B;AAC9C,QAAM,YAAY,iBAAiB,KAAK;AAExC,MAAI,WAAW;AAEX,WAAQ,EAA8B,SAAS;AAAA,EACnD;AAEA,SAAO;AACX;","names":["key"]}

package/dist/locale/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./providers/index.js";
 export * from "./helpers.js";
-export { Language, LanguageCodes, LocaleDir, type LocaleStructure, type LocaleProvider, type LocaleDynamicProvider, type LocaleKeys, type LocaleSubstitutionArgs, type LocaleSubstitutionKeys, type LocaleSubstitutionValue, type LocaleNonPluralKeys, type LocalePluralKeys, } from "../types/locale.js";
+export * from "./storage/index.js";
+export { Language, LanguageCodes, LocaleDir, type LocaleStructure, type LocaleRegistry, type LocaleProvider, type LocaleDynamicProvider, type LocaleSnapshot, type LocaleStorageDriver, type LocaleKeys, type LocaleSubstitutionArgs, type LocaleSubstitutionKeys, type LocaleSubstitutionValue, type LocaleNonPluralKeys, type LocalePluralKeys, } from "../types/locale.js";

package/dist/locale/index.js

@@ -1,5 +1,6 @@
 export * from "./providers/index.js";
 export * from "./helpers.js";
+export * from "./storage/index.js";
 import {
   Language,
   LanguageCodes,

package/dist/locale/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/locale/index.ts"],"sourcesContent":["export * from \"./providers\";\nexport * from \"./helpers\";\n\nexport {\n    Language,\n    LanguageCodes,\n    LocaleDir,\n    type LocaleStructure,\n    type LocaleProvider,\n    type LocaleDynamicProvider,\n    type LocaleKeys,\n    type LocaleSubstitutionArgs,\n    type LocaleSubstitutionKeys,\n    type LocaleSubstitutionValue,\n    type LocaleNonPluralKeys,\n    type LocalePluralKeys,\n} from \"@typing/locale\";\n"],"mappings":"AAAA,cAAc;AACd,cAAc;AAEd;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,OAUG;","names":[]}
+{"version":3,"sources":["../../src/locale/index.ts"],"sourcesContent":["export * from \"./providers\";\nexport * from \"./helpers\";\nexport * from \"./storage\";\n\nexport {\n    Language,\n    LanguageCodes,\n    LocaleDir,\n    type LocaleStructure,\n    type LocaleRegistry,\n    type LocaleProvider,\n    type LocaleDynamicProvider,\n    type LocaleSnapshot,\n    type LocaleStorageDriver,\n    type LocaleKeys,\n    type LocaleSubstitutionArgs,\n    type LocaleSubstitutionKeys,\n    type LocaleSubstitutionValue,\n    type LocaleNonPluralKeys,\n    type LocalePluralKeys,\n} from \"@typing/locale\";\n"],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,OAaG;","names":[]}

package/dist/locale/providers/AbstractLocale.d.ts

@@ -1,13 +1,13 @@
 import { Language, LocaleNonPluralKeys, LocalePluralKeys, LocaleProvider, LocaleStructure, LocaleSubstitutionArgs, LocaleSubstitutionValue } from "../../types/locale.js";
-export default abstract class<S extends object = LocaleStructure> implements LocaleProvider<S> {
+export default abstract class AbstractLocale<S extends object = LocaleStructure> implements LocaleProvider<S> {
     abstract lang(): Language;
     abstract keys(): Set<keyof S>;
-    abstract languages(): Set<Language>;
+    abstract langs(): ReadonlySet<Language>;
     /** Returns native names for this provider's languages, preserving their order. */
-    languageNames(): Map<Language, string>;
+    langNames(): ReadonlyMap<Language, string>;
     protected abstract value(key: keyof S & string): string | undefined;
     trans<K extends LocaleNonPluralKeys<S>>(key: K, ...args: LocaleSubstitutionArgs<S, K>): string;
     choice<K extends LocalePluralKeys<S>>(key: K, count: number, ...args: LocaleSubstitutionArgs<S, K>): string;
     get<K extends keyof S & string>(key: K, substitutions?: Record<string, LocaleSubstitutionValue>): string;
-    private getPluralIndex;
+    private substitute;
 }

package/dist/locale/providers/AbstractLocale.js

@@ -1,12 +1,11 @@
+import { selectPluralForm, applySubstitutions } from "./../../shared/locale/index.js";
 import {
-  Language,
-  LanguageNames,
-  LocaleValuesSeparator
+  LanguageNames
 } from "./../../types/locale.js";
-class AbstractLocale_default {
+class AbstractLocale {
   /** Returns native names for this provider's languages, preserving their order. */
-  languageNames() {
-    return new Map([...this.languages()].map((language) => [language, LanguageNames[language]]));
+  langNames() {
+    return new Map([...this.langs()].map((language) => [language, LanguageNames[language]]));
   }
   trans(key, ...args) {
     const [substitutions] = args;
@@ -14,9 +13,8 @@ class AbstractLocale_default {
   }
   choice(key, count, ...args) {
     const [substitutions] = args;
-    const parts = this.get(key, substitutions).split(LocaleValuesSeparator);
-    const idx = this.getPluralIndex(count);
-    return parts[idx] ?? parts[0] ?? key;
+    const message = selectPluralForm(this.get(key), this.lang(), count);
+    return this.substitute(message, key, substitutions);
   }
   get(key, substitutions) {
     const template = this.value(key);
@@ -24,94 +22,15 @@ class AbstractLocale_default {
       console.warn(`Locale key "${key}" not found in "${this.lang()}" language.`);
       return key;
     }
-    if (substitutions) {
-      return template.replace(/{{(.*?)}}/g, (_, placeholder) => {
-        const substitution = placeholder.trim();
-        if (substitution in substitutions) {
-          return substitutions[substitution].toString();
-        }
-        console.warn(
-          `Locale substitution "${substitution}" not found for key "${key}" in "${this.lang()}" language.`
-        );
-        return substitution;
-      });
-    }
-    return template;
+    return this.substitute(template, key, substitutions);
   }
-  getPluralIndex(count) {
-    switch (this.lang()) {
-      case Language.Indonesian:
-      case Language.Japanese:
-      case Language.Kannada:
-      case Language.Korean:
-      case Language.Malay:
-      case Language.Thai:
-      case Language.Turkish:
-      case Language.Vietnamese:
-        return 0;
-      case Language.Bengali:
-      case Language.Bulgarian:
-      case Language.Catalan:
-      case Language.Danish:
-      case Language.German:
-      case Language.Greek:
-      case Language.English:
-      case Language.EnglishAustralia:
-      case Language.EnglishGreatBritain:
-      case Language.EnglishUSA:
-      case Language.Spanish:
-      case Language.SpanishLatinAmericaAndCaribbean:
-      case Language.Estonian:
-      case Language.Persian:
-      case Language.Finnish:
-      case Language.Gujarati:
-      case Language.Hebrew:
-      case Language.Hungarian:
-      case Language.Italian:
-      case Language.Malayalam:
-      case Language.Marathi:
-      case Language.Dutch:
-      case Language.Norwegian:
-      case Language.Swedish:
-      case Language.Swahili:
-      case Language.Tamil:
-      case Language.Telugu:
-      case Language.ChineseChina:
-      case Language.ChineseTaiwan:
-      case Language.PortugueseBrazil:
-      case Language.PortuguesePortugal:
-        return count == 1 ? 0 : 1;
-      case Language.Amharic:
-      case Language.Filipino:
-      case Language.French:
-      case Language.Hindi:
-        return count == 0 || count == 1 ? 0 : 1;
-      case Language.Croatian:
-      case Language.Russian:
-      case Language.Serbian:
-      case Language.Ukrainian:
-        return count % 10 == 1 && count % 100 != 11 ? 0 : count % 10 >= 2 && count % 10 <= 4 && (count % 100 < 10 || count % 100 >= 20) ? 1 : 2;
-      case Language.Czech:
-      case Language.Slovak:
-        return count == 1 ? 0 : count >= 2 && count <= 4 ? 1 : 2;
-      case Language.Lithuanian:
-        return count % 10 == 1 && count % 100 != 11 ? 0 : count % 10 >= 2 && (count % 100 < 10 || count % 100 >= 20) ? 1 : 2;
-      case Language.Slovenian:
-        return count % 100 == 1 ? 0 : count % 100 == 2 ? 1 : count % 100 == 3 || count % 100 == 4 ? 2 : 3;
-      case Language.Latvian:
-        return count == 0 ? 0 : count % 10 == 1 && count % 100 != 11 ? 1 : 2;
-      case Language.Polish:
-        return count == 1 ? 0 : count % 10 >= 2 && count % 10 <= 4 && (count % 100 < 12 || count % 100 > 14) ? 1 : 2;
-      case Language.Romanian:
-        return count == 1 ? 0 : count == 0 || count % 100 > 0 && count % 100 < 20 ? 1 : 2;
-      case Language.Arabic:
-        return count == 0 ? 0 : count == 1 ? 1 : count == 2 ? 2 : count % 100 >= 3 && count % 100 <= 10 ? 3 : count % 100 >= 11 && count % 100 <= 99 ? 4 : 5;
-      default:
-        return 0;
-    }
+  substitute(message, key, substitutions) {
+    return applySubstitutions(message, substitutions, (name) => {
+      console.warn(`Locale substitution "${name}" not found for key "${key}" in "${this.lang()}" language.`);
+    }).join("");
   }
 }
 export {
-  AbstractLocale_default as default
+  AbstractLocale as default
 };
 //# sourceMappingURL=AbstractLocale.js.map

package/dist/locale/providers/AbstractLocale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/locale/providers/AbstractLocale.ts"],"sourcesContent":["import {\n    Language,\n    LanguageNames,\n    LocaleNonPluralKeys,\n    LocalePluralKeys,\n    LocaleProvider,\n    LocaleStructure,\n    LocaleSubstitutionArgs,\n    LocaleSubstitutionValue,\n    LocaleValuesSeparator,\n} from \"@typing/locale\";\n\nexport default abstract class<S extends object = LocaleStructure> implements LocaleProvider<S> {\n    public abstract lang(): Language;\n\n    public abstract keys(): Set<keyof S>;\n\n    public abstract languages(): Set<Language>;\n\n    /** Returns native names for this provider's languages, preserving their order. */\n    public languageNames(): Map<Language, string> {\n        return new Map([...this.languages()].map(language => [language, LanguageNames[language]]));\n    }\n\n    protected abstract value(key: keyof S & string): string | undefined;\n\n    public trans<K extends LocaleNonPluralKeys<S>>(key: K, ...args: LocaleSubstitutionArgs<S, K>): string {\n        const [substitutions] = args;\n\n        return this.get(key, substitutions);\n    }\n\n    public choice<K extends LocalePluralKeys<S>>(key: K, count: number, ...args: LocaleSubstitutionArgs<S, K>): string {\n        const [substitutions] = args;\n        const parts = this.get(key, substitutions).split(LocaleValuesSeparator);\n\n        const idx = this.getPluralIndex(count);\n\n        return parts[idx] ?? parts[0] ?? (key as string);\n    }\n\n    public get<K extends keyof S & string>(key: K, substitutions?: Record<string, LocaleSubstitutionValue>): string {\n        const template = this.value(key);\n\n        if (template === undefined) {\n            console.warn(`Locale key \"${key}\" not found in \"${this.lang()}\" language.`);\n\n            return key as string;\n        }\n\n        if (substitutions) {\n            return template.replace(/{{(.*?)}}/g, (_, placeholder: string) => {\n                const substitution = placeholder.trim();\n\n                if (substitution in substitutions) {\n                    return substitutions[substitution]!.toString();\n                }\n\n                console.warn(\n                    `Locale substitution \"${substitution}\" not found for key \"${key}\" in \"${this.lang()}\" language.`\n                );\n\n                return substitution;\n            });\n        }\n\n        return template;\n    }\n\n    private getPluralIndex(count: number): number {\n        switch (this.lang()) {\n            case Language.Indonesian:\n            case Language.Japanese:\n            case Language.Kannada:\n            case Language.Korean:\n            case Language.Malay:\n            case Language.Thai:\n            case Language.Turkish:\n            case Language.Vietnamese:\n                return 0;\n\n            case Language.Bengali:\n            case Language.Bulgarian:\n            case Language.Catalan:\n            case Language.Danish:\n            case Language.German:\n            case Language.Greek:\n            case Language.English:\n            case Language.EnglishAustralia:\n            case Language.EnglishGreatBritain:\n            case Language.EnglishUSA:\n            case Language.Spanish:\n            case Language.SpanishLatinAmericaAndCaribbean:\n            case Language.Estonian:\n            case Language.Persian:\n            case Language.Finnish:\n            case Language.Gujarati:\n            case Language.Hebrew:\n            case Language.Hungarian:\n            case Language.Italian:\n            case Language.Malayalam:\n            case Language.Marathi:\n            case Language.Dutch:\n            case Language.Norwegian:\n            case Language.Swedish:\n            case Language.Swahili:\n            case Language.Tamil:\n            case Language.Telugu:\n            case Language.ChineseChina:\n            case Language.ChineseTaiwan:\n            case Language.PortugueseBrazil:\n            case Language.PortuguesePortugal:\n                return count == 1 ? 0 : 1;\n\n            case Language.Amharic:\n            case Language.Filipino:\n            case Language.French:\n            case Language.Hindi:\n                return count == 0 || count == 1 ? 0 : 1;\n\n            case Language.Croatian:\n            case Language.Russian:\n            case Language.Serbian:\n            case Language.Ukrainian:\n                return count % 10 == 1 && count % 100 != 11\n                    ? 0\n                    : count % 10 >= 2 && count % 10 <= 4 && (count % 100 < 10 || count % 100 >= 20)\n                      ? 1\n                      : 2;\n\n            case Language.Czech:\n            case Language.Slovak:\n                return count == 1 ? 0 : count >= 2 && count <= 4 ? 1 : 2;\n\n            case Language.Lithuanian:\n                return count % 10 == 1 && count % 100 != 11\n                    ? 0\n                    : count % 10 >= 2 && (count % 100 < 10 || count % 100 >= 20)\n                      ? 1\n                      : 2;\n\n            case Language.Slovenian:\n                return count % 100 == 1 ? 0 : count % 100 == 2 ? 1 : count % 100 == 3 || count % 100 == 4 ? 2 : 3;\n\n            case Language.Latvian:\n                return count == 0 ? 0 : count % 10 == 1 && count % 100 != 11 ? 1 : 2;\n\n            case Language.Polish:\n                return count == 1\n                    ? 0\n                    : count % 10 >= 2 && count % 10 <= 4 && (count % 100 < 12 || count % 100 > 14)\n                      ? 1\n                      : 2;\n\n            case Language.Romanian:\n                return count == 1 ? 0 : count == 0 || (count % 100 > 0 && count % 100 < 20) ? 1 : 2;\n\n            case Language.Arabic:\n                return count == 0\n                    ? 0\n                    : count == 1\n                      ? 1\n                      : count == 2\n                        ? 2\n                        : count % 100 >= 3 && count % 100 <= 10\n                          ? 3\n                          : count % 100 >= 11 && count % 100 <= 99\n                            ? 4\n                            : 5;\n\n            default:\n                return 0;\n        }\n    }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/locale/providers/AbstractLocale.ts"],"sourcesContent":["import {selectPluralForm, applySubstitutions} from \"@shared/locale\";\n\nimport {\n    Language,\n    LanguageNames,\n    LocaleNonPluralKeys,\n    LocalePluralKeys,\n    LocaleProvider,\n    LocaleStructure,\n    LocaleSubstitutionArgs,\n    LocaleSubstitutionValue,\n} from \"@typing/locale\";\n\nexport default abstract class AbstractLocale<S extends object = LocaleStructure> implements LocaleProvider<S> {\n    public abstract lang(): Language;\n\n    public abstract keys(): Set<keyof S>;\n\n    public abstract langs(): ReadonlySet<Language>;\n\n    /** Returns native names for this provider's languages, preserving their order. */\n    public langNames(): ReadonlyMap<Language, string> {\n        return new Map([...this.langs()].map(language => [language, LanguageNames[language]]));\n    }\n\n    protected abstract value(key: keyof S & string): string | undefined;\n\n    public trans<K extends LocaleNonPluralKeys<S>>(key: K, ...args: LocaleSubstitutionArgs<S, K>): string {\n        const [substitutions] = args;\n\n        return this.get(key, substitutions);\n    }\n\n    public choice<K extends LocalePluralKeys<S>>(key: K, count: number, ...args: LocaleSubstitutionArgs<S, K>): string {\n        const [substitutions] = args;\n        const message = selectPluralForm(this.get(key), this.lang(), count);\n\n        return this.substitute(message, key, substitutions);\n    }\n\n    public get<K extends keyof S & string>(key: K, substitutions?: Record<string, LocaleSubstitutionValue>): string {\n        const template = this.value(key);\n\n        if (template === undefined) {\n            console.warn(`Locale key \"${key}\" not found in \"${this.lang()}\" language.`);\n\n            return key as string;\n        }\n\n        return this.substitute(template, key, substitutions);\n    }\n\n    private substitute(message: string, key: string, substitutions?: Record<string, LocaleSubstitutionValue>): string {\n        return applySubstitutions(message, substitutions, name => {\n            console.warn(`Locale substitution \"${name}\" not found for key \"${key}\" in \"${this.lang()}\" language.`);\n        }).join(\"\");\n    }\n}\n"],"mappings":"AAAA,SAAQ,kBAAkB,0BAAyB;AAEnD;AAAA,EAEI;AAAA,OAOG;AAEP,MAAO,eAAuG;AAAA;AAAA,EAQnG,YAA2C;AAC9C,WAAO,IAAI,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,EAAE,IAAI,cAAY,CAAC,UAAU,cAAc,QAAQ,CAAC,CAAC,CAAC;AAAA,EACzF;AAAA,EAIO,MAAwC,QAAW,MAA4C;AAClG,UAAM,CAAC,aAAa,IAAI;AAExB,WAAO,KAAK,IAAI,KAAK,aAAa;AAAA,EACtC;AAAA,EAEO,OAAsC,KAAQ,UAAkB,MAA4C;AAC/G,UAAM,CAAC,aAAa,IAAI;AACxB,UAAM,UAAU,iBAAiB,KAAK,IAAI,GAAG,GAAG,KAAK,KAAK,GAAG,KAAK;AAElE,WAAO,KAAK,WAAW,SAAS,KAAK,aAAa;AAAA,EACtD;AAAA,EAEO,IAAgC,KAAQ,eAAiE;AAC5G,UAAM,WAAW,KAAK,MAAM,GAAG;AAE/B,QAAI,aAAa,QAAW;AACxB,cAAQ,KAAK,eAAe,GAAG,mBAAmB,KAAK,KAAK,CAAC,aAAa;AAE1E,aAAO;AAAA,IACX;AAEA,WAAO,KAAK,WAAW,UAAU,KAAK,aAAa;AAAA,EACvD;AAAA,EAEQ,WAAW,SAAiB,KAAa,eAAiE;AAC9G,WAAO,mBAAmB,SAAS,eAAe,UAAQ;AACtD,cAAQ,KAAK,wBAAwB,IAAI,wBAAwB,GAAG,SAAS,KAAK,KAAK,CAAC,aAAa;AAAA,IACzG,CAAC,EAAE,KAAK,EAAE;AAAA,EACd;AACJ;","names":[]}

package/dist/locale/providers/CustomLocale.d.ts

@@ -1,7 +1,7 @@
 import AbstractLocale from "./AbstractLocale.js";
 import { Language, LocaleStructure } from "../../types/locale.js";
-export type CustomLocaleData = Record<string, string>;
-export default class<T extends object = LocaleStructure> extends AbstractLocale<T> {
+export type CustomLocaleData = Readonly<Record<string, string>>;
+export default class CustomLocale<T extends object = LocaleStructure> extends AbstractLocale<T> {
     protected language: Language;
     protected data: CustomLocaleData;
     constructor(language?: Language, data?: CustomLocaleData);
@@ -9,6 +9,6 @@ export default class<T extends object = LocaleStructure> extends AbstractLocale<
     setData(data: CustomLocaleData): this;
     lang(): Language;
     keys(): Set<keyof T>;
-    languages(): Set<Language>;
+    langs(): ReadonlySet<Language>;
     protected value(key: string): string | undefined;
 }

package/dist/locale/providers/CustomLocale.js

@@ -1,7 +1,7 @@
-import { convertLocaleKey } from "../utils.js";
+import { convertLocaleKey } from "./../../shared/locale/index.js";
 import AbstractLocale from "./AbstractLocale.js";
 import { Language } from "./../../types/locale.js";
-class CustomLocale_default extends AbstractLocale {
+class CustomLocale extends AbstractLocale {
   constructor(language = Language.English, data = {}) {
     super();
     this.language = language;
@@ -23,11 +23,12 @@ class CustomLocale_default extends AbstractLocale {
   keys() {
     return new Set(Object.keys(this.data));
   }
-  languages() {
+  langs() {
     return /* @__PURE__ */ new Set([this.lang()]);
   }
   value(key) {
-    const value = this.data[convertLocaleKey(key)];
+    const name = convertLocaleKey(key);
+    const value = Object.hasOwn(this.data, name) ? this.data[name] : void 0;
     if (value === void 0) {
       return void 0;
     }
@@ -35,6 +36,6 @@ class CustomLocale_default extends AbstractLocale {
   }
 }
 export {
-  CustomLocale_default as default
+  CustomLocale as default
 };
 //# sourceMappingURL=CustomLocale.js.map

package/dist/locale/providers/CustomLocale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/locale/providers/CustomLocale.ts"],"sourcesContent":["import {convertLocaleKey} from \"../utils\";\n\nimport AbstractLocale from \"./AbstractLocale\";\n\nimport {Language, LocaleStructure} from \"@typing/locale\";\n\nexport type CustomLocaleData = Record<string, string>;\n\nexport default class<T extends object = LocaleStructure> extends AbstractLocale<T> {\n    constructor(\n        protected language: Language = Language.English,\n        protected data: CustomLocaleData = {}\n    ) {\n        super();\n    }\n\n    public setLang(lang: Language): this {\n        this.language = lang;\n\n        return this;\n    }\n\n    public setData(data: CustomLocaleData): this {\n        this.data = data;\n\n        return this;\n    }\n\n    public lang(): Language {\n        return this.language;\n    }\n\n    public keys(): Set<keyof T> {\n        return new Set(Object.keys(this.data)) as Set<keyof T>;\n    }\n\n    public languages(): Set<Language> {\n        return new Set([this.lang()]);\n    }\n\n    protected value(key: string): string | undefined {\n        const value = this.data[convertLocaleKey(key)];\n\n        if (value === undefined) {\n            return undefined;\n        }\n\n        return value;\n    }\n}\n"],"mappings":"AAAA,SAAQ,wBAAuB;AAE/B,OAAO,oBAAoB;AAE3B,SAAQ,gBAAgC;AAIxC,MAAO,6BAA0D,eAAkB;AAAA,EAC/E,YACc,WAAqB,SAAS,SAC9B,OAAyB,CAAC,GACtC;AACE,UAAM;AAHI;AACA;AAAA,EAGd;AAAA,EAJc;AAAA,EACA;AAAA,EAKP,QAAQ,MAAsB;AACjC,SAAK,WAAW;AAEhB,WAAO;AAAA,EACX;AAAA,EAEO,QAAQ,MAA8B;AACzC,SAAK,OAAO;AAEZ,WAAO;AAAA,EACX;AAAA,EAEO,OAAiB;AACpB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEO,OAAqB;AACxB,WAAO,IAAI,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC;AAAA,EACzC;AAAA,EAEO,YAA2B;AAC9B,WAAO,oBAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;AAAA,EAChC;AAAA,EAEU,MAAM,KAAiC;AAC7C,UAAM,QAAQ,KAAK,KAAK,iBAAiB,GAAG,CAAC;AAE7C,QAAI,UAAU,QAAW;AACrB,aAAO;AAAA,IACX;AAEA,WAAO;AAAA,EACX;AACJ;","names":[]}
+{"version":3,"sources":["../../../src/locale/providers/CustomLocale.ts"],"sourcesContent":["import {convertLocaleKey} from \"@shared/locale\";\n\nimport AbstractLocale from \"./AbstractLocale\";\n\nimport {Language, LocaleStructure} from \"@typing/locale\";\n\nexport type CustomLocaleData = Readonly<Record<string, string>>;\n\nexport default class CustomLocale<T extends object = LocaleStructure> extends AbstractLocale<T> {\n    constructor(\n        protected language: Language = Language.English,\n        protected data: CustomLocaleData = {}\n    ) {\n        super();\n    }\n\n    public setLang(lang: Language): this {\n        this.language = lang;\n\n        return this;\n    }\n\n    public setData(data: CustomLocaleData): this {\n        this.data = data;\n\n        return this;\n    }\n\n    public lang(): Language {\n        return this.language;\n    }\n\n    public keys(): Set<keyof T> {\n        return new Set(Object.keys(this.data)) as Set<keyof T>;\n    }\n\n    public langs(): ReadonlySet<Language> {\n        return new Set([this.lang()]);\n    }\n\n    protected value(key: string): string | undefined {\n        const name = convertLocaleKey(key);\n        const value = Object.hasOwn(this.data, name) ? this.data[name] : undefined;\n\n        if (value === undefined) {\n            return undefined;\n        }\n\n        return value;\n    }\n}\n"],"mappings":"AAAA,SAAQ,wBAAuB;AAE/B,OAAO,oBAAoB;AAE3B,SAAQ,gBAAgC;AAIxC,MAAO,qBAAuE,eAAkB;AAAA,EAC5F,YACc,WAAqB,SAAS,SAC9B,OAAyB,CAAC,GACtC;AACE,UAAM;AAHI;AACA;AAAA,EAGd;AAAA,EAJc;AAAA,EACA;AAAA,EAKP,QAAQ,MAAsB;AACjC,SAAK,WAAW;AAEhB,WAAO;AAAA,EACX;AAAA,EAEO,QAAQ,MAA8B;AACzC,SAAK,OAAO;AAEZ,WAAO;AAAA,EACX;AAAA,EAEO,OAAiB;AACpB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEO,OAAqB;AACxB,WAAO,IAAI,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC;AAAA,EACzC;AAAA,EAEO,QAA+B;AAClC,WAAO,oBAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;AAAA,EAChC;AAAA,EAEU,MAAM,KAAiC;AAC7C,UAAM,OAAO,iBAAiB,GAAG;AACjC,UAAM,QAAQ,OAAO,OAAO,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI;AAEjE,QAAI,UAAU,QAAW;AACrB,aAAO;AAAA,IACX;AAEA,WAAO;AAAA,EACX;AACJ;","names":[]}

package/dist/locale/providers/DynamicLocale.d.ts

@@ -1,19 +1,26 @@
-import { type StorageProvider } from "@addon-core/storage";
-import NativeLocale, { LocaleNativeStructure } from "./NativeLocale.js";
-import CustomLocale, { CustomLocaleData } from "./CustomLocale.js";
-import { Language, LocaleDynamicProvider } from "../../types/locale.js";
-export default class<T extends object = LocaleNativeStructure> extends NativeLocale<T> implements LocaleDynamicProvider<T> {
-    protected cache: Map<Language, CustomLocaleData>;
-    protected locale?: CustomLocale<T>;
-    protected storage?: StorageProvider<Record<string, Language>>;
-    protected storageKey?: string;
+import AbstractLocale from "./AbstractLocale.js";
+import { Language, type LocaleDynamicProvider, type LocaleRegistry, type LocaleStorageDriver } from "../../types/locale.js";
+export default class DynamicLocale<T extends object = LocaleRegistry> extends AbstractLocale<T> implements LocaleDynamicProvider<T> {
+    private language;
+    private data;
+    protected storage?: LocaleStorageDriver;
     protected unsubscribe?: () => void;
-    constructor(storage?: string | false);
+    constructor(storage?: LocaleStorageDriver | false);
+    /**
+     * Selects a language synchronously without saving it.
+     * With storage enabled, a later sync() or watched storage update can replace this local selection.
+     * @throws If the language is absent from the catalogue.
+     */
+    select(lang: Language): Language;
+    /** Selects a language immediately and saves it when storage is enabled. */
     change(lang: Language): Promise<Language>;
     sync(): Promise<Language>;
     watch(handler?: (lang: Language) => void): () => void;
     unwatch(): void;
     lang(): Language;
+    /** Completed messages for the current language, with underscore keys and no substitutions applied. */
+    messages(): Readonly<Record<string, string>>;
+    keys(): Set<keyof T>;
+    langs(): ReadonlySet<Language>;
     protected value(key: Extract<keyof T, string>): string | undefined;
-    protected fetch(lang: Language): Promise<CustomLocaleData>;
 }

package/dist/locale/providers/DynamicLocale.js

@@ -1,58 +1,74 @@
-import { flattenLocaleMessages, getLocaleFilename } from "../utils.js";
-import { Storage } from "@addon-core/storage";
-import NativeLocale from "./NativeLocale.js";
-import CustomLocale from "./CustomLocale.js";
-import { LanguageCodes } from "./../../types/locale.js";
-class DynamicLocale_default extends NativeLocale {
-  cache = /* @__PURE__ */ new Map();
-  locale;
+import { getI18nMessage } from "@addon-core/browser";
+import catalogue, { keys, lang as defaultLanguage, languages } from "#adnbn/locale";
+import AbstractLocale from "./AbstractLocale.js";
+import { LocaleStorage } from "../storage/index.js";
+import { convertLocaleKey, resolveLanguage } from "./../../shared/locale/index.js";
+import {
+  LocaleCustomKeyForLanguage
+} from "./../../types/locale.js";
+class DynamicLocale extends AbstractLocale {
+  language;
+  data;
   storage;
-  storageKey;
   unsubscribe;
-  constructor(storage = "lang") {
+  constructor(storage) {
     super();
-    if (storage) {
-      this.storageKey = storage;
-      this.storage = Storage.Local();
+    let marker;
+    try {
+      marker = getI18nMessage(LocaleCustomKeyForLanguage);
+    } catch {
     }
+    this.select(resolveLanguage(marker) ?? defaultLanguage);
+    this.storage = storage === false ? void 0 : storage ?? new LocaleStorage();
   }
-  async change(lang) {
-    if (lang === this.lang()) {
-      return lang;
+  /**
+   * Selects a language synchronously without saving it.
+   * With storage enabled, a later sync() or watched storage update can replace this local selection.
+   * @throws If the language is absent from the catalogue.
+   */
+  select(lang) {
+    if (!Object.hasOwn(catalogue, lang)) {
+      throw new Error(`[DynamicLocale] Language "${lang}" is not available in the catalogue.`);
     }
-    const messages = await this.fetch(lang);
-    (this.locale ?? (this.locale = new CustomLocale())).setLang(lang).setData(messages);
-    if (this.storage && this.storageKey) {
-      await this.storage.set(this.storageKey, lang);
+    this.language = lang;
+    this.data = catalogue[lang];
+    return lang;
+  }
+  /** Selects a language immediately and saves it when storage is enabled. */
+  async change(lang) {
+    this.select(lang);
+    if (this.storage) {
+      await this.storage.set(lang);
     }
     return lang;
   }
   async sync() {
-    if (!this.storage || !this.storageKey) {
+    if (!this.storage) {
       throw new Error("Language is not saving in storage");
     }
-    const lang = await this.storage.get(this.storageKey);
+    const lang = await this.storage.get();
     if (!lang) {
       return this.lang();
     }
-    if (!LanguageCodes.has(lang)) {
+    if (!Object.hasOwn(catalogue, lang)) {
       console.warn(`Incorrect language code in storage - "${lang}"`);
       return this.lang();
     }
-    return this.change(lang);
+    return this.select(lang);
   }
   watch(handler) {
-    if (!this.storage || !this.storageKey) {
+    if (!this.storage) {
       throw new Error("Language is not saved in storage");
     }
     if (this.unsubscribe) {
       throw new Error("Already subscribed to language changes in storage");
     }
-    this.unsubscribe = this.storage.watch({
-      [this.storageKey]: (newValue) => {
-        if (newValue) {
-          this.change(newValue).then(() => handler && handler(newValue)).catch((err) => console.error("Error while changing language:", err));
-        }
+    this.unsubscribe = this.storage.watch((lang) => {
+      try {
+        this.select(lang);
+        handler == null ? void 0 : handler(lang);
+      } catch (error) {
+        console.error("Error while changing language:", error);
       }
     });
     return this.unwatch.bind(this);
@@ -63,27 +79,24 @@ class DynamicLocale_default extends NativeLocale {
     this.unsubscribe = void 0;
   }
   lang() {
-    var _a;
-    return ((_a = this.locale) == null ? void 0 : _a.lang()) || super.lang();
+    return this.language;
   }
-  value(key) {
-    var _a;
-    return ((_a = this.locale) == null ? void 0 : _a.get(key)) ?? super.value(key);
+  /** Completed messages for the current language, with underscore keys and no substitutions applied. */
+  messages() {
+    return this.data;
   }
-  async fetch(lang) {
-    let messages = this.cache.get(lang);
-    if (!messages) {
-      const response = await (await fetch(getLocaleFilename(lang))).json();
-      if (!response || typeof response !== "object") {
-        throw new Error(`Invalid or empty locale data for "${lang}"`);
-      }
-      messages = flattenLocaleMessages(response);
-      this.cache.set(lang, messages);
-    }
-    return messages;
+  keys() {
+    return new Set(keys);
+  }
+  langs() {
+    return new Set(languages);
+  }
+  value(key) {
+    const name = convertLocaleKey(key);
+    return Object.hasOwn(this.data, name) ? this.data[name] : void 0;
   }
 }
 export {
-  DynamicLocale_default as default
+  DynamicLocale as default
 };
 //# sourceMappingURL=DynamicLocale.js.map

package/dist/locale/providers/DynamicLocale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/locale/providers/DynamicLocale.ts"],"sourcesContent":["import {flattenLocaleMessages, getLocaleFilename} from \"../utils\";\n\nimport {Storage, type StorageProvider} from \"@addon-core/storage\";\n\nimport NativeLocale, {LocaleNativeStructure} from \"./NativeLocale\";\nimport CustomLocale, {CustomLocaleData} from \"./CustomLocale\";\n\nimport {Language, LanguageCodes, LocaleDynamicProvider, LocaleMessages} from \"@typing/locale\";\n\nexport default class<T extends object = LocaleNativeStructure>\n    extends NativeLocale<T>\n    implements LocaleDynamicProvider<T>\n{\n    protected cache = new Map<Language, CustomLocaleData>();\n\n    protected locale?: CustomLocale<T>;\n\n    protected storage?: StorageProvider<Record<string, Language>>;\n    protected storageKey?: string;\n\n    protected unsubscribe?: () => void;\n\n    constructor(storage: string | false = \"lang\") {\n        super();\n\n        if (storage) {\n            this.storageKey = storage;\n            this.storage = Storage.Local();\n        }\n    }\n\n    public async change(lang: Language): Promise<Language> {\n        if (lang === this.lang()) {\n            return lang;\n        }\n\n        const messages = await this.fetch(lang);\n\n        (this.locale ??= new CustomLocale()).setLang(lang).setData(messages);\n\n        if (this.storage && this.storageKey) {\n            await this.storage.set(this.storageKey, lang);\n        }\n\n        return lang;\n    }\n\n    public async sync(): Promise<Language> {\n        if (!this.storage || !this.storageKey) {\n            throw new Error(\"Language is not saving in storage\");\n        }\n\n        const lang = await this.storage.get(this.storageKey);\n\n        if (!lang) {\n            return this.lang();\n        }\n\n        if (!LanguageCodes.has(lang)) {\n            console.warn(`Incorrect language code in storage - \"${lang}\"`);\n\n            return this.lang();\n        }\n\n        return this.change(lang);\n    }\n\n    public watch(handler?: (lang: Language) => void): () => void {\n        if (!this.storage || !this.storageKey) {\n            throw new Error(\"Language is not saved in storage\");\n        }\n\n        if (this.unsubscribe) {\n            throw new Error(\"Already subscribed to language changes in storage\");\n        }\n\n        this.unsubscribe = this.storage.watch({\n            [this.storageKey]: newValue => {\n                if (newValue) {\n                    this.change(newValue)\n                        .then(() => handler && handler(newValue))\n                        .catch(err => console.error(\"Error while changing language:\", err));\n                }\n            },\n        });\n\n        return this.unwatch.bind(this);\n    }\n\n    public unwatch(): void {\n        this.unsubscribe?.();\n        this.unsubscribe = undefined;\n    }\n\n    public lang(): Language {\n        return this.locale?.lang() || super.lang();\n    }\n\n    protected value(key: Extract<keyof T, string>): string | undefined {\n        return this.locale?.get(key) ?? super.value(key);\n    }\n\n    protected async fetch(lang: Language): Promise<CustomLocaleData> {\n        let messages = this.cache.get(lang);\n\n        if (!messages) {\n            const response: LocaleMessages = await (await fetch(getLocaleFilename(lang))).json();\n\n            if (!response || typeof response !== \"object\") {\n                throw new Error(`Invalid or empty locale data for \"${lang}\"`);\n            }\n\n            messages = flattenLocaleMessages(response);\n\n            this.cache.set(lang, messages);\n        }\n\n        return messages;\n    }\n}\n"],"mappings":"AAAA,SAAQ,uBAAuB,yBAAwB;AAEvD,SAAQ,eAAoC;AAE5C,OAAO,kBAA2C;AAClD,OAAO,kBAAsC;AAE7C,SAAkB,qBAA2D;AAE7E,MAAO,8BACK,aAEZ;AAAA,EACc,QAAQ,oBAAI,IAAgC;AAAA,EAE5C;AAAA,EAEA;AAAA,EACA;AAAA,EAEA;AAAA,EAEV,YAAY,UAA0B,QAAQ;AAC1C,UAAM;AAEN,QAAI,SAAS;AACT,WAAK,aAAa;AAClB,WAAK,UAAU,QAAQ,MAAM;AAAA,IACjC;AAAA,EACJ;AAAA,EAEA,MAAa,OAAO,MAAmC;AACnD,QAAI,SAAS,KAAK,KAAK,GAAG;AACtB,aAAO;AAAA,IACX;AAEA,UAAM,WAAW,MAAM,KAAK,MAAM,IAAI;AAEtC,KAAC,KAAK,WAAL,KAAK,SAAW,IAAI,aAAa,IAAG,QAAQ,IAAI,EAAE,QAAQ,QAAQ;AAEnE,QAAI,KAAK,WAAW,KAAK,YAAY;AACjC,YAAM,KAAK,QAAQ,IAAI,KAAK,YAAY,IAAI;AAAA,IAChD;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAa,OAA0B;AACnC,QAAI,CAAC,KAAK,WAAW,CAAC,KAAK,YAAY;AACnC,YAAM,IAAI,MAAM,mCAAmC;AAAA,IACvD;AAEA,UAAM,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,UAAU;AAEnD,QAAI,CAAC,MAAM;AACP,aAAO,KAAK,KAAK;AAAA,IACrB;AAEA,QAAI,CAAC,cAAc,IAAI,IAAI,GAAG;AAC1B,cAAQ,KAAK,yCAAyC,IAAI,GAAG;AAE7D,aAAO,KAAK,KAAK;AAAA,IACrB;AAEA,WAAO,KAAK,OAAO,IAAI;AAAA,EAC3B;AAAA,EAEO,MAAM,SAAgD;AACzD,QAAI,CAAC,KAAK,WAAW,CAAC,KAAK,YAAY;AACnC,YAAM,IAAI,MAAM,kCAAkC;AAAA,IACtD;AAEA,QAAI,KAAK,aAAa;AAClB,YAAM,IAAI,MAAM,mDAAmD;AAAA,IACvE;AAEA,SAAK,cAAc,KAAK,QAAQ,MAAM;AAAA,MAClC,CAAC,KAAK,UAAU,GAAG,cAAY;AAC3B,YAAI,UAAU;AACV,eAAK,OAAO,QAAQ,EACf,KAAK,MAAM,WAAW,QAAQ,QAAQ,CAAC,EACvC,MAAM,SAAO,QAAQ,MAAM,kCAAkC,GAAG,CAAC;AAAA,QAC1E;AAAA,MACJ;AAAA,IACJ,CAAC;AAED,WAAO,KAAK,QAAQ,KAAK,IAAI;AAAA,EACjC;AAAA,EAEO,UAAgB;AAzF3B;AA0FQ,eAAK,gBAAL;AACA,SAAK,cAAc;AAAA,EACvB;AAAA,EAEO,OAAiB;AA9F5B;AA+FQ,aAAO,UAAK,WAAL,mBAAa,WAAU,MAAM,KAAK;AAAA,EAC7C;AAAA,EAEU,MAAM,KAAmD;AAlGvE;AAmGQ,aAAO,UAAK,WAAL,mBAAa,IAAI,SAAQ,MAAM,MAAM,GAAG;AAAA,EACnD;AAAA,EAEA,MAAgB,MAAM,MAA2C;AAC7D,QAAI,WAAW,KAAK,MAAM,IAAI,IAAI;AAElC,QAAI,CAAC,UAAU;AACX,YAAM,WAA2B,OAAO,MAAM,MAAM,kBAAkB,IAAI,CAAC,GAAG,KAAK;AAEnF,UAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC3C,cAAM,IAAI,MAAM,qCAAqC,IAAI,GAAG;AAAA,MAChE;AAEA,iBAAW,sBAAsB,QAAQ;AAEzC,WAAK,MAAM,IAAI,MAAM,QAAQ;AAAA,IACjC;AAEA,WAAO;AAAA,EACX;AACJ;","names":[]}
+{"version":3,"sources":["../../../src/locale/providers/DynamicLocale.ts"],"sourcesContent":["import {getI18nMessage} from \"@addon-core/browser\";\n\nimport catalogue, {keys, lang as defaultLanguage, languages} from \"#adnbn/locale\";\n\nimport AbstractLocale from \"./AbstractLocale\";\nimport {LocaleStorage} from \"../storage\";\n\nimport {convertLocaleKey, resolveLanguage} from \"@shared/locale\";\nimport {\n    Language,\n    LocaleCustomKeyForLanguage,\n    type LocaleDynamicProvider,\n    type LocaleRegistry,\n    type LocaleStorageDriver,\n} from \"@typing/locale\";\n\nexport default class DynamicLocale<T extends object = LocaleRegistry>\n    extends AbstractLocale<T>\n    implements LocaleDynamicProvider<T>\n{\n    private language!: Language;\n    private data!: Readonly<Record<string, string>>;\n\n    protected storage?: LocaleStorageDriver;\n    protected unsubscribe?: () => void;\n\n    constructor(storage?: LocaleStorageDriver | false) {\n        super();\n\n        let marker: string | undefined;\n\n        try {\n            marker = getI18nMessage(LocaleCustomKeyForLanguage);\n        } catch {\n            // MAIN has no extension i18n; use the configured language from the bundled catalogue.\n        }\n\n        this.select(resolveLanguage(marker) ?? defaultLanguage);\n\n        this.storage = storage === false ? undefined : (storage ?? new LocaleStorage());\n    }\n\n    /**\n     * Selects a language synchronously without saving it.\n     * With storage enabled, a later sync() or watched storage update can replace this local selection.\n     * @throws If the language is absent from the catalogue.\n     */\n    public select(lang: Language): Language {\n        if (!Object.hasOwn(catalogue, lang)) {\n            throw new Error(`[DynamicLocale] Language \"${lang}\" is not available in the catalogue.`);\n        }\n\n        this.language = lang;\n        this.data = catalogue[lang]!;\n\n        return lang;\n    }\n\n    /** Selects a language immediately and saves it when storage is enabled. */\n    public async change(lang: Language): Promise<Language> {\n        this.select(lang);\n\n        if (this.storage) {\n            await this.storage.set(lang);\n        }\n\n        return lang;\n    }\n\n    public async sync(): Promise<Language> {\n        if (!this.storage) {\n            throw new Error(\"Language is not saving in storage\");\n        }\n\n        const lang = await this.storage.get();\n\n        if (!lang) {\n            return this.lang();\n        }\n\n        if (!Object.hasOwn(catalogue, lang)) {\n            console.warn(`Incorrect language code in storage - \"${lang}\"`);\n\n            return this.lang();\n        }\n\n        return this.select(lang);\n    }\n\n    public watch(handler?: (lang: Language) => void): () => void {\n        if (!this.storage) {\n            throw new Error(\"Language is not saved in storage\");\n        }\n\n        if (this.unsubscribe) {\n            throw new Error(\"Already subscribed to language changes in storage\");\n        }\n\n        this.unsubscribe = this.storage.watch(lang => {\n            try {\n                this.select(lang);\n                handler?.(lang);\n            } catch (error) {\n                console.error(\"Error while changing language:\", error);\n            }\n        });\n\n        return this.unwatch.bind(this);\n    }\n\n    public unwatch(): void {\n        this.unsubscribe?.();\n        this.unsubscribe = undefined;\n    }\n\n    public lang(): Language {\n        return this.language;\n    }\n\n    /** Completed messages for the current language, with underscore keys and no substitutions applied. */\n    public messages(): Readonly<Record<string, string>> {\n        return this.data;\n    }\n\n    public keys(): Set<keyof T> {\n        return new Set(keys) as Set<keyof T>;\n    }\n\n    public langs(): ReadonlySet<Language> {\n        return new Set(languages);\n    }\n\n    protected value(key: Extract<keyof T, string>): string | undefined {\n        const name = convertLocaleKey(key);\n\n        return Object.hasOwn(this.data, name) ? this.data[name] : undefined;\n    }\n}\n"],"mappings":"AAAA,SAAQ,sBAAqB;AAE7B,OAAO,aAAY,MAAM,QAAQ,iBAAiB,iBAAgB;AAElE,OAAO,oBAAoB;AAC3B,SAAQ,qBAAoB;AAE5B,SAAQ,kBAAkB,uBAAsB;AAChD;AAAA,EAEI;AAAA,OAIG;AAEP,MAAO,sBACK,eAEZ;AAAA,EACY;AAAA,EACA;AAAA,EAEE;AAAA,EACA;AAAA,EAEV,YAAY,SAAuC;AAC/C,UAAM;AAEN,QAAI;AAEJ,QAAI;AACA,eAAS,eAAe,0BAA0B;AAAA,IACtD,QAAQ;AAAA,IAER;AAEA,SAAK,OAAO,gBAAgB,MAAM,KAAK,eAAe;AAEtD,SAAK,UAAU,YAAY,QAAQ,SAAa,WAAW,IAAI,cAAc;AAAA,EACjF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOO,OAAO,MAA0B;AACpC,QAAI,CAAC,OAAO,OAAO,WAAW,IAAI,GAAG;AACjC,YAAM,IAAI,MAAM,6BAA6B,IAAI,sCAAsC;AAAA,IAC3F;AAEA,SAAK,WAAW;AAChB,SAAK,OAAO,UAAU,IAAI;AAE1B,WAAO;AAAA,EACX;AAAA;AAAA,EAGA,MAAa,OAAO,MAAmC;AACnD,SAAK,OAAO,IAAI;AAEhB,QAAI,KAAK,SAAS;AACd,YAAM,KAAK,QAAQ,IAAI,IAAI;AAAA,IAC/B;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAa,OAA0B;AACnC,QAAI,CAAC,KAAK,SAAS;AACf,YAAM,IAAI,MAAM,mCAAmC;AAAA,IACvD;AAEA,UAAM,OAAO,MAAM,KAAK,QAAQ,IAAI;AAEpC,QAAI,CAAC,MAAM;AACP,aAAO,KAAK,KAAK;AAAA,IACrB;AAEA,QAAI,CAAC,OAAO,OAAO,WAAW,IAAI,GAAG;AACjC,cAAQ,KAAK,yCAAyC,IAAI,GAAG;AAE7D,aAAO,KAAK,KAAK;AAAA,IACrB;AAEA,WAAO,KAAK,OAAO,IAAI;AAAA,EAC3B;AAAA,EAEO,MAAM,SAAgD;AACzD,QAAI,CAAC,KAAK,SAAS;AACf,YAAM,IAAI,MAAM,kCAAkC;AAAA,IACtD;AAEA,QAAI,KAAK,aAAa;AAClB,YAAM,IAAI,MAAM,mDAAmD;AAAA,IACvE;AAEA,SAAK,cAAc,KAAK,QAAQ,MAAM,UAAQ;AAC1C,UAAI;AACA,aAAK,OAAO,IAAI;AAChB,2CAAU;AAAA,MACd,SAAS,OAAO;AACZ,gBAAQ,MAAM,kCAAkC,KAAK;AAAA,MACzD;AAAA,IACJ,CAAC;AAED,WAAO,KAAK,QAAQ,KAAK,IAAI;AAAA,EACjC;AAAA,EAEO,UAAgB;AA9G3B;AA+GQ,eAAK,gBAAL;AACA,SAAK,cAAc;AAAA,EACvB;AAAA,EAEO,OAAiB;AACpB,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA,EAGO,WAA6C;AAChD,WAAO,KAAK;AAAA,EAChB;AAAA,EAEO,OAAqB;AACxB,WAAO,IAAI,IAAI,IAAI;AAAA,EACvB;AAAA,EAEO,QAA+B;AAClC,WAAO,IAAI,IAAI,SAAS;AAAA,EAC5B;AAAA,EAEU,MAAM,KAAmD;AAC/D,UAAM,OAAO,iBAAiB,GAAG;AAEjC,WAAO,OAAO,OAAO,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI;AAAA,EAC9D;AACJ;","names":[]}

package/dist/locale/providers/NativeLocale.d.ts

@@ -1,15 +1,12 @@
 import AbstractLocale from "./AbstractLocale.js";
-import { Language, LocaleProvider } from "../../types/locale.js";
-/** Augmented by the generated .adnbn/locale.d.ts for the current app. */
-export interface LocaleNativeStructure {
-}
-export default class NativeLocale<S extends object = LocaleNativeStructure> extends AbstractLocale<S> {
+import { Language, type LocaleRegistry } from "../../types/locale.js";
+export default class NativeLocale<S extends object = LocaleRegistry> extends AbstractLocale<S> {
     private static instance?;
-    static getInstance(): LocaleProvider<LocaleNativeStructure>;
+    static getInstance(): NativeLocale<LocaleRegistry>;
     private readonly language?;
     constructor();
     lang(): Language;
     keys(): Set<keyof S>;
-    languages(): Set<Language>;
+    langs(): ReadonlySet<Language>;
     protected value(key: Extract<keyof S, string>): string | undefined;
 }

package/dist/locale/providers/NativeLocale.js

@@ -1,6 +1,7 @@
 import { getI18nMessage } from "@addon-core/browser";
+import { keys, languages } from "#adnbn/locale";
 import AbstractLocale from "./AbstractLocale.js";
-import { convertLocaleKey, resolveLanguage } from "./../../locale/utils.js";
+import { convertLocaleKey, resolveLanguage } from "./../../shared/locale/index.js";
 import { LocaleCustomKeyForLanguage } from "./../../types/locale.js";
 class NativeLocale extends AbstractLocale {
   static instance;
@@ -27,20 +28,10 @@ class NativeLocale extends AbstractLocale {
     return this.language;
   }
   keys() {
-    try {
-      return new Set(__ADNBN_LOCALE_KEYS__);
-    } catch (e) {
-      console.error("[NativeLocale] Failed to access locale keys. Ensure the bundler plugin is active.", e);
-      return /* @__PURE__ */ new Set();
-    }
+    return new Set(keys);
   }
-  languages() {
-    try {
-      return new Set(__ADNBN_DEFINED_LOCALES__);
-    } catch (e) {
-      console.error("[NativeLocale] Failed to access defined locales. Check virtual variables configuration.", e);
-      return /* @__PURE__ */ new Set();
-    }
+  langs() {
+    return new Set(languages);
   }
   value(key) {
     const value = getI18nMessage(convertLocaleKey(key));