@zajno/common 2.6.2 → 2.6.3

package/cjs/localization/LocalizationManager.js

@@ -4,46 +4,70 @@ exports.LocalizationManager = void 0;
 const event_js_1 = require("../observing/event.js");
 class LocalizationManager {
     _dataSource;
-    _currentLocale = null;
+    // initial value is intentionally a nonsense to be updated on first useLocale call
+    _currentLocale = '';
     _currentStrings = null;
-    _defaultStrings;
-    _dependents = [];
     _localeUpdatedEvent = new event_js_1.Event();
-    constructor(_dataSource, initialLocale, defaultLocale = null) {
+    _firstInit;
+    constructor(_dataSource, locale, fallbackStrings = null) {
         this._dataSource = _dataSource;
-        this._defaultStrings = this.getStrings(defaultLocale || initialLocale);
-        this.useLocale(initialLocale);
+        this._currentStrings = fallbackStrings;
+        this._firstInit = this.useLocale(locale);
     }
     get Locale() { return this._currentLocale; }
     get Current() { return this._currentStrings; }
+    get firstInitialized() { return this._firstInit; }
     get localeUpdated() { return this._localeUpdatedEvent.expose(); }
+    /**
+     * Updates locale synchronously, and then loads corresponding strings from datasource.
+     * If loader for the locale is sync, this method updates instantly and returns resolved Promise.
+     * Otherwise, strings will be updated asynchronously.
+     */
     useLocale(locale) {
-        this._currentLocale = locale;
-        this._currentStrings = this.getStrings(this._currentLocale) || this._defaultStrings;
-        this.updateDependencies();
-        this._localeUpdatedEvent.trigger(this._currentLocale);
-        return this;
-    }
-    useDependency(dep, remove = false) {
-        const i = this._dependents.indexOf(dep);
-        if (i < 0 && !remove) {
-            this._dependents.push(dep);
-            this.updateDependencies();
+        if (locale === this._currentLocale) {
+            return Promise.resolve();
         }
-        else if (i >= 0 && remove) {
-            this._dependents.splice(i, 1);
+        const prevLocale = this._currentLocale;
+        const loader = this._dataSource[locale];
+        if (!loader) {
+            // just for throwing the same error
+            return this.doUpdateStrings(locale, null);
         }
-        return this;
-    }
-    updateDependencies() {
-        const { _currentLocale: locale, _currentStrings: strings } = this;
-        if (!strings || !locale) {
-            return;
+        // set locale immediately so it won't be updated twice in case instant second call
+        this._currentLocale = locale;
+        // revert locale in case of error
+        const tryRevert = () => {
+            if (this._currentLocale === locale) {
+                this._currentLocale = prevLocale;
+            }
+        };
+        if (typeof loader !== 'function') {
+            return this.doUpdateStrings(locale, loader, tryRevert);
         }
-        this._dependents.forEach(d => d.updateLocale(strings, locale));
+        // async part is separated to make the method synchronous
+        return (async () => {
+            let result = null;
+            try {
+                result = await loader();
+            }
+            catch (e) {
+                tryRevert();
+                throw new Error(`LocalizationManager: Failed to load localization data for locale "${locale}"`, { cause: e });
+            }
+            await this.doUpdateStrings(locale, result, tryRevert);
+        })();
     }
-    getStrings(locale) {
-        return this._dataSource[locale];
+    doUpdateStrings(locale, strings, revert) {
+        if (!strings) {
+            revert?.();
+            return Promise.reject(new Error(`LocalizationManager: No localization data for locale "${locale}"`));
+        }
+        this._currentStrings = strings;
+        this._localeUpdatedEvent.trigger({
+            locale: this._currentLocale,
+            strings: this._currentStrings,
+        });
+        return Promise.resolve();
     }
 }
 exports.LocalizationManager = LocalizationManager;

package/cjs/localization/LocalizationManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizationManager.js","sourceRoot":"","sources":["../../../src/localization/LocalizationManager.ts"],"names":[],"mappings":";;;AAEA,oDAA8C;AAE9C,MAAa,mBAAmB;IAUP;IATb,cAAc,GAAuB,IAAI,CAAC;IAC1C,eAAe,GAAoB,IAAI,CAAC;IAE/B,eAAe,CAAW;IAC1B,WAAW,GAAqD,EAAE,CAAC;IAEnE,mBAAmB,GAAG,IAAI,gBAAK,EAAe,CAAC;IAEhE,YACqB,WAA2C,EAC5D,aAA0B,EAC1B,gBAAoC,IAAI;QAFvB,gBAAW,GAAX,WAAW,CAAgC;QAI5D,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,IAAI,aAAa,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IAED,IAAW,MAAM,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IACnD,IAAW,OAAO,KAAK,OAAO,IAAI,CAAC,eAAgB,CAAC,CAAC,CAAC;IACtD,IAAW,aAAa,KAAK,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAEjE,SAAS,CAAC,MAAmB;QAChC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC;QACpF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,aAAa,CAAC,GAAmD,EAAE,MAAM,GAAG,KAAK;QACpF,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,kBAAkB;QACtB,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAClE,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAEO,UAAU,CAAC,MAAc;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CACJ;AArDD,kDAqDC"}
+{"version":3,"file":"LocalizationManager.js","sourceRoot":"","sources":["../../../src/localization/LocalizationManager.ts"],"names":[],"mappings":"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"}

package/cjs/localization/LocalizedValidationErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizedValidationErrors.js","sourceRoot":"","sources":["../../../src/localization/LocalizedValidationErrors.ts"],"names":[],"mappings":";;;AAQA,MAAa,yBAAyB;IAKL;IAFrB,QAAQ,GAA4C,IAAI,CAAC;IAEjE,YAA6B,OAAmD;QAAnD,YAAO,GAAP,OAAO,CAA4C;IAAI,CAAC;IAErF,IAAW,MAAM;QACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,OAAiB;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CACJ;AAlBD,8DAkBC"}
+{"version":3,"file":"LocalizedValidationErrors.js","sourceRoot":"","sources":["../../../src/localization/LocalizedValidationErrors.ts"],"names":[],"mappings":";;;AAOA,MAAa,yBAAyB;IAKL;IAFrB,QAAQ,GAA4C,IAAI,CAAC;IAEjE,YAA6B,OAAmD;QAAnD,YAAO,GAAP,OAAO,CAA4C;IAAI,CAAC;IAErF,IAAW,MAAM;QACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,OAAiB;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CACJ;AAlBD,8DAkBC"}

package/esm/localization/LocalizationManager.js

@@ -1,46 +1,70 @@
 import { Event } from '../observing/event.js';
 export class LocalizationManager {
     _dataSource;
-    _currentLocale = null;
+    // initial value is intentionally a nonsense to be updated on first useLocale call
+    _currentLocale = '';
     _currentStrings = null;
-    _defaultStrings;
-    _dependents = [];
     _localeUpdatedEvent = new Event();
-    constructor(_dataSource, initialLocale, defaultLocale = null) {
+    _firstInit;
+    constructor(_dataSource, locale, fallbackStrings = null) {
         this._dataSource = _dataSource;
-        this._defaultStrings = this.getStrings(defaultLocale || initialLocale);
-        this.useLocale(initialLocale);
+        this._currentStrings = fallbackStrings;
+        this._firstInit = this.useLocale(locale);
     }
     get Locale() { return this._currentLocale; }
     get Current() { return this._currentStrings; }
+    get firstInitialized() { return this._firstInit; }
     get localeUpdated() { return this._localeUpdatedEvent.expose(); }
+    /**
+     * Updates locale synchronously, and then loads corresponding strings from datasource.
+     * If loader for the locale is sync, this method updates instantly and returns resolved Promise.
+     * Otherwise, strings will be updated asynchronously.
+     */
     useLocale(locale) {
-        this._currentLocale = locale;
-        this._currentStrings = this.getStrings(this._currentLocale) || this._defaultStrings;
-        this.updateDependencies();
-        this._localeUpdatedEvent.trigger(this._currentLocale);
-        return this;
-    }
-    useDependency(dep, remove = false) {
-        const i = this._dependents.indexOf(dep);
-        if (i < 0 && !remove) {
-            this._dependents.push(dep);
-            this.updateDependencies();
+        if (locale === this._currentLocale) {
+            return Promise.resolve();
         }
-        else if (i >= 0 && remove) {
-            this._dependents.splice(i, 1);
+        const prevLocale = this._currentLocale;
+        const loader = this._dataSource[locale];
+        if (!loader) {
+            // just for throwing the same error
+            return this.doUpdateStrings(locale, null);
         }
-        return this;
-    }
-    updateDependencies() {
-        const { _currentLocale: locale, _currentStrings: strings } = this;
-        if (!strings || !locale) {
-            return;
+        // set locale immediately so it won't be updated twice in case instant second call
+        this._currentLocale = locale;
+        // revert locale in case of error
+        const tryRevert = () => {
+            if (this._currentLocale === locale) {
+                this._currentLocale = prevLocale;
+            }
+        };
+        if (typeof loader !== 'function') {
+            return this.doUpdateStrings(locale, loader, tryRevert);
         }
-        this._dependents.forEach(d => d.updateLocale(strings, locale));
+        // async part is separated to make the method synchronous
+        return (async () => {
+            let result = null;
+            try {
+                result = await loader();
+            }
+            catch (e) {
+                tryRevert();
+                throw new Error(`LocalizationManager: Failed to load localization data for locale "${locale}"`, { cause: e });
+            }
+            await this.doUpdateStrings(locale, result, tryRevert);
+        })();
     }
-    getStrings(locale) {
-        return this._dataSource[locale];
+    doUpdateStrings(locale, strings, revert) {
+        if (!strings) {
+            revert?.();
+            return Promise.reject(new Error(`LocalizationManager: No localization data for locale "${locale}"`));
+        }
+        this._currentStrings = strings;
+        this._localeUpdatedEvent.trigger({
+            locale: this._currentLocale,
+            strings: this._currentStrings,
+        });
+        return Promise.resolve();
     }
 }
 //# sourceMappingURL=LocalizationManager.js.map

package/esm/localization/LocalizationManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizationManager.js","sourceRoot":"","sources":["../../../src/localization/LocalizationManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,MAAM,OAAO,mBAAmB;IAUP;IATb,cAAc,GAAuB,IAAI,CAAC;IAC1C,eAAe,GAAoB,IAAI,CAAC;IAE/B,eAAe,CAAW;IAC1B,WAAW,GAAqD,EAAE,CAAC;IAEnE,mBAAmB,GAAG,IAAI,KAAK,EAAe,CAAC;IAEhE,YACqB,WAA2C,EAC5D,aAA0B,EAC1B,gBAAoC,IAAI;QAFvB,gBAAW,GAAX,WAAW,CAAgC;QAI5D,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,IAAI,aAAa,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IAED,IAAW,MAAM,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IACnD,IAAW,OAAO,KAAK,OAAO,IAAI,CAAC,eAAgB,CAAC,CAAC,CAAC;IACtD,IAAW,aAAa,KAAK,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAEjE,SAAS,CAAC,MAAmB;QAChC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC;QACpF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,aAAa,CAAC,GAAmD,EAAE,MAAM,GAAG,KAAK;QACpF,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,kBAAkB;QACtB,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAClE,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAEO,UAAU,CAAC,MAAc;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CACJ"}
+{"version":3,"file":"LocalizationManager.js","sourceRoot":"","sources":["../../../src/localization/LocalizationManager.ts"],"names":[],"mappings":"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"}

package/esm/localization/LocalizedValidationErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizedValidationErrors.js","sourceRoot":"","sources":["../../../src/localization/LocalizedValidationErrors.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,yBAAyB;IAKL;IAFrB,QAAQ,GAA4C,IAAI,CAAC;IAEjE,YAA6B,OAAmD;QAAnD,YAAO,GAAP,OAAO,CAA4C;IAAI,CAAC;IAErF,IAAW,MAAM;QACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,OAAiB;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CACJ"}
+{"version":3,"file":"LocalizedValidationErrors.js","sourceRoot":"","sources":["../../../src/localization/LocalizedValidationErrors.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,yBAAyB;IAKL;IAFrB,QAAQ,GAA4C,IAAI,CAAC;IAEjE,YAA6B,OAAmD;QAAnD,YAAO,GAAP,OAAO,CAA4C;IAAI,CAAC;IAErF,IAAW,MAAM;QACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,OAAiB;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "private": false,
   "type": "module",

package/types/localization/LocalizationManager.d.ts

@@ -1,20 +1,21 @@
-import type { ILocalization, ILocalizationDependency } from './abstractions.js';
+import type { ILocalization, LocaleStrings, StringsDataSource } from './abstractions.js';
 import type { AnyObject } from '../types/misc.js';
 export declare class LocalizationManager<TLocaleType extends string, TStrings extends AnyObject> implements ILocalization<TStrings> {
     private readonly _dataSource;
     private _currentLocale;
     private _currentStrings;
-    private readonly _defaultStrings;
-    private readonly _dependents;
     private readonly _localeUpdatedEvent;
-    constructor(_dataSource: {
-        [locale: string]: TStrings;
-    }, initialLocale: TLocaleType, defaultLocale?: TLocaleType | null);
-    get Locale(): TLocaleType | null;
+    private readonly _firstInit;
+    constructor(_dataSource: StringsDataSource<TLocaleType, TStrings>, locale: TLocaleType, fallbackStrings?: TStrings | null);
+    get Locale(): TLocaleType;
     get Current(): TStrings;
-    get localeUpdated(): import("../observing/event.js").IEvent<TLocaleType>;
-    useLocale(locale: TLocaleType): this;
-    useDependency(dep: ILocalizationDependency<TStrings, TLocaleType>, remove?: boolean): this;
-    private updateDependencies;
-    private getStrings;
+    get firstInitialized(): Promise<void>;
+    get localeUpdated(): import("../observing/event.js").IEvent<LocaleStrings<TLocaleType, TStrings>>;
+    /**
+     * Updates locale synchronously, and then loads corresponding strings from datasource.
+     * If loader for the locale is sync, this method updates instantly and returns resolved Promise.
+     * Otherwise, strings will be updated asynchronously.
+     */
+    useLocale(locale: TLocaleType): Promise<void>;
+    protected doUpdateStrings(locale: TLocaleType, strings: TStrings | null, revert?: () => void): Promise<void>;
 }

package/types/localization/LocalizedValidationErrors.d.ts

@@ -1,6 +1,6 @@
-import { IErrorsLocalization, ILocalizationDependency, ValidationErrorsFactory } from './abstractions.js';
+import { IErrorsLocalization, ValidationErrorsFactory } from './abstractions.js';
 import type { AnyObject } from '../types/misc.js';
-export declare class LocalizedValidationErrors<TStrings extends AnyObject, TErrors extends string | number> implements IErrorsLocalization<TErrors>, ILocalizationDependency<TStrings> {
+export declare class LocalizedValidationErrors<TStrings extends AnyObject, TErrors extends string | number> implements IErrorsLocalization<TErrors> {
     private readonly factory;
     private _strings;
     constructor(factory: ValidationErrorsFactory<TStrings, TErrors>);

package/types/localization/abstractions.d.ts

@@ -5,8 +5,11 @@ export interface ILocalization<TStrings extends AnyObject> {
 export interface IErrorsLocalization<TErrors extends string | number> {
     readonly Errors: ValidationErrorsStrings<TErrors>;
 }
-export interface ILocalizationDependency<TStrings extends AnyObject, TLocale extends string = any> {
-    updateLocale(strings: TStrings, locale?: TLocale): void;
-}
+export type StringsLoader<TStrings> = TStrings | (() => Promise<TStrings>);
+export type StringsDataSource<TLocale extends string, TStrings extends AnyObject> = Record<TLocale, StringsLoader<TStrings>>;
+export type LocaleStrings<TLocale extends string, TStrings extends AnyObject> = {
+    locale: TLocale;
+    strings: TStrings;
+};
 export type ValidationErrorsStrings<T extends string | number> = Partial<Record<T, string>>;
 export type ValidationErrorsFactory<TStrings extends AnyObject, TErrors extends string | number> = (strings: TStrings) => ValidationErrorsStrings<TErrors>;