@zajno/common 1.4.8 → 1.4.11

package/lib/services/localization/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalaziedValidationErrors = exports.LocalizationManager = void 0;
+const tslib_1 = require("tslib");
+const LocalizationManager_1 = require("./LocalizationManager");
+Object.defineProperty(exports, "LocalizationManager", { enumerable: true, get: function () { return LocalizationManager_1.LocalizationManager; } });
+const LocalaziedValidationErrors_1 = require("./LocalaziedValidationErrors");
+Object.defineProperty(exports, "LocalaziedValidationErrors", { enumerable: true, get: function () { return LocalaziedValidationErrors_1.LocalaziedValidationErrors; } });
+tslib_1.__exportStar(require("./abstractions"), exports);
+//# sourceMappingURL=index.js.map

package/lib/services/localization/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/localization/index.ts"],"names":[],"mappings":";;;;AAAA,+DAA4D;AAKnD,oGALA,yCAAmB,OAKA;AAJ5B,6EAA0E;AAI5C,2GAJrB,uDAA0B,OAIqB;AAFxD,yDAA+B"}

package/lib/throttledEvent.d.ts

@@ -3,6 +3,6 @@ export declare class ThrottledEvent extends Event {
     private readonly _throttle;
     setTimeout(timeout: number): this;
     trigger(): void;
-    triggerAsync(): Promise<void>;
+    triggerAsync(): Promise<Error[]>;
 }
 //# sourceMappingURL=throttledEvent.d.ts.map

package/lib/throttledEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"throttledEvent.d.ts","sourceRoot":"","sources":["../src/throttledEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,qBAAa,cAAe,SAAQ,KAAK;IAErC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;IAE9C,UAAU,CAAC,OAAO,EAAE,MAAM;IAK1B,OAAO;IAID,YAAY;CAG5B"}
+{"version":3,"file":"throttledEvent.d.ts","sourceRoot":"","sources":["../src/throttledEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,qBAAa,cAAe,SAAQ,KAAK;IAErC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;IAE9C,UAAU,CAAC,OAAO,EAAE,MAAM;IAK1B,OAAO;IAID,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAGhD"}

package/lib/validation/ValidationErrorsLocalization.d.ts

@@ -0,0 +1,27 @@
+import { LocalaziedValidationErrors } from '../services/localization/LocalaziedValidationErrors';
+import { ValidationErrors } from './ValidationErrors';
+export declare const ValidationErrorsLocalized: LocalaziedValidationErrors<{
+    Ok: string;
+    Cancel: string;
+    Submit: string;
+    ForgotPassword: string;
+    Validation: {
+        Empty: string;
+        Name: string;
+        Email: string;
+        Password: string;
+        EnglishOnly: string;
+        Phone: string;
+        CreditCard: string;
+        CreditCardExpiryDate: string;
+        CreditCardCvv: string;
+        PasswordsShouldMatch: string;
+        FirstName: string;
+        LastName: string;
+        OnlyDigit: string;
+        Website: string;
+        Linkedin: string;
+    };
+    UnknownServerError: string;
+}, ValidationErrors>;
+//# sourceMappingURL=ValidationErrorsLocalization.d.ts.map

package/lib/validation/ValidationErrorsLocalization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValidationErrorsLocalization.d.ts","sourceRoot":"","sources":["../../src/validation/ValidationErrorsLocalization.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAuBtD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;oBAAkF,CAAC"}

package/lib/validation/ValidationErrorsLocalization.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidationErrorsLocalized = void 0;
+const LocalaziedValidationErrors_1 = require("../services/localization/LocalaziedValidationErrors");
+const ValidationErrors_1 = require("./ValidationErrors");
+function locationFactory(strings) {
+    return {
+        [ValidationErrors_1.ValidationErrors.None]: '',
+        [ValidationErrors_1.ValidationErrors.ShouldBeNonEmpty]: strings.Validation.Empty,
+        [ValidationErrors_1.ValidationErrors.InvalidNameFormat]: strings.Validation.Name,
+        [ValidationErrors_1.ValidationErrors.InvalidEmailFormat]: strings.Validation.Email,
+        [ValidationErrors_1.ValidationErrors.InvalidPasswordFormat]: strings.Validation.Password,
+        [ValidationErrors_1.ValidationErrors.OnlyEnglishLetters]: strings.Validation.EnglishOnly,
+        [ValidationErrors_1.ValidationErrors.InvalidPhoneFormat]: strings.Validation.Phone,
+        [ValidationErrors_1.ValidationErrors.InvalidCreditCardFormat]: strings.Validation.CreditCard,
+        [ValidationErrors_1.ValidationErrors.InvalidCreditCardExpiryDateFormat]: strings.Validation.CreditCardExpiryDate,
+        [ValidationErrors_1.ValidationErrors.InvalidCreditCardCvvFormat]: strings.Validation.CreditCardCvv,
+        [ValidationErrors_1.ValidationErrors.FirstName]: strings.Validation.FirstName,
+        [ValidationErrors_1.ValidationErrors.LastName]: strings.Validation.LastName,
+        [ValidationErrors_1.ValidationErrors.OnlyDigit]: strings.Validation.OnlyDigit,
+        [ValidationErrors_1.ValidationErrors.Website]: strings.Validation.Website,
+        [ValidationErrors_1.ValidationErrors.Linkedin]: strings.Validation.Linkedin,
+    };
+}
+exports.ValidationErrorsLocalized = new LocalaziedValidationErrors_1.LocalaziedValidationErrors(locationFactory);
+//# sourceMappingURL=ValidationErrorsLocalization.js.map

package/lib/validation/ValidationErrorsLocalization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValidationErrorsLocalization.js","sourceRoot":"","sources":["../../src/validation/ValidationErrorsLocalization.ts"],"names":[],"mappings":";;;AAEA,oGAAiG;AACjG,yDAAsD;AAEtD,SAAS,eAAe,CAAC,OAAqB;IAC1C,OAAO;QACH,CAAC,mCAAgB,CAAC,IAAI,CAAC,EAAE,EAAE;QAC3B,CAAC,mCAAgB,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK;QAC7D,CAAC,mCAAgB,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;QAC7D,CAAC,mCAAgB,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK;QAC/D,CAAC,mCAAgB,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;QACrE,CAAC,mCAAgB,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW;QACrE,CAAC,mCAAgB,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK;QAC/D,CAAC,mCAAgB,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU;QACzE,CAAC,mCAAgB,CAAC,iCAAiC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,oBAAoB;QAC7F,CAAC,mCAAgB,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa;QAE/E,CAAC,mCAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;QAC1D,CAAC,mCAAgB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;QACxD,CAAC,mCAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;QAC1D,CAAC,mCAAgB,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO;QACtD,CAAC,mCAAgB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;KAC3D,CAAC;AACN,CAAC;AAEY,QAAA,yBAAyB,GAAG,IAAI,uDAA0B,CAAiC,eAAe,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.4.8",
+  "version": "1.4.11",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",

package/src/event.ts

@@ -45,17 +45,16 @@ export class Event<T = any> implements IEvent<T> {
         });
     }
 
-    public async triggerAsync(data?: T): Promise<any[] | void> {
+    public async triggerAsync(data?: T): Promise<Error[]> {
         const hh = this._handlers.slice(0);
 
-        const errors = [];
+        const errors: Error[] = [];
 
         await forEachAsync(hh, async (cb: EventHandler<T>) => {
             try {
                 await cb(data);
             } catch (err) {
                 this.logError(data, cb, err);
-
                 errors.push(err);
             }
         });

package/src/services/localization/LocalaziedValidationErrors.ts

@@ -0,0 +1,18 @@
+import { action, observable } from 'mobx';
+import { IErrorsLocalization, ILocalizationDependency, ValidationErrorsFactory, ValidationErrorsStrings } from './abstractions';
+
+export class LocalaziedValidationErrors<TStrings extends { }, TErrors extends string | number>
+    implements IErrorsLocalization<TErrors>, ILocalizationDependency<TStrings> {
+
+    @observable.ref
+    private _strings: ValidationErrorsStrings<TErrors> = null;
+
+    constructor(private readonly factory: ValidationErrorsFactory<TStrings, TErrors>) { }
+
+    public get Errors(): Partial<Record<TErrors, string>> { return this._strings; }
+
+    @action
+    public updateLocale(strings: TStrings): void {
+        this._strings = this.factory(strings);
+    }
+}

package/src/services/localization/LocalizationManager.ts

@@ -1,21 +1,15 @@
-import { observable, transaction, makeObservable } from 'mobx';
-import { StringsShape } from './defaultShape';
-import createValidationErrorsStrings, { ValidationErrorsStrings } from './validationErrorsStrings';
-import { ILocalization } from './ILocalization';
+import { observable, makeObservable, action } from 'mobx';
+import { ILocalization, ILocalizationDependency } from './abstractions';
 
-export { ILocalization };
-
-export default class LocalizationManager<TLocaleType extends string, TStrings extends StringsShape> implements ILocalization<TStrings> {
+export class LocalizationManager<TLocaleType extends string, TStrings extends { }> implements ILocalization<TStrings> {
     @observable
     private _currentLocale: TLocaleType = null;
 
-    @observable
+    @observable.ref
     private _currentStrings: TStrings = null;
 
-    @observable
-    private _validationErrors: ValidationErrorsStrings = null;
-
     private readonly _defaultStrings: TStrings = null;
+    private readonly _dependants: ILocalizationDependency<TStrings, TLocaleType>[] = [];
 
     constructor(
         private readonly _dataSource: { [locale: string]: TStrings },
@@ -24,21 +18,28 @@ export default class LocalizationManager<TLocaleType extends string, TStrings ex
     ) {
         makeObservable(this);
         this._defaultStrings = this.getStrings(defaultLocale || initialLocale);
-        this.updateStrings(initialLocale);
+        this.useLocale(initialLocale);
     }
 
-    get Locale() { return this._currentLocale; }
-
-    get Current() { return this._currentStrings; }
+    public get Locale() { return this._currentLocale; }
+    public get Current() { return this._currentStrings; }
 
-    get ValidationErrors() { return this._validationErrors; }
+    @action
+    public useLocale(locale: TLocaleType) {
+        this._currentLocale = locale;
+        this._currentStrings = this.getStrings(this._currentLocale) || this._defaultStrings;
+        this._dependants.forEach(d => d.updateLocale(this._currentStrings, this._currentLocale));
+        return this;
+    }
 
-    updateStrings(locale: TLocaleType) {
-        transaction(() => {
-            this._currentLocale = locale;
-            this._currentStrings = this.getStrings(this._currentLocale) || this._defaultStrings;
-            this._validationErrors = createValidationErrorsStrings(this._currentStrings);
-        });
+    public useDependency(dep: ILocalizationDependency<TStrings, TLocaleType>, remove = false) {
+        const i = this._dependants.indexOf(dep);
+        if (i >= 0 && !remove) {
+            this._dependants.push(dep);
+        } else if (i < 0 && remove) {
+            this._dependants.splice(i, 1);
+        }
+        return this;
     }
 
     private getStrings(locale: string): TStrings {

package/src/services/localization/abstractions.ts

@@ -0,0 +1,16 @@
+
+export interface ILocalization<TStrings extends { }> {
+    readonly Current: Readonly<TStrings>;
+}
+
+export interface IErrorsLocalization<TErrors extends string | number> {
+    readonly Errors: ValidationErrorsStrings<TErrors>
+}
+
+export interface ILocalizationDependency<TStrings extends { }, TLocale extends string = any> {
+    updateLocale(strings: TStrings, locale?: TLocale): void;
+}
+
+export type ValidationErrorsStrings<T extends string | number> = Partial<Record<T, string>>;
+
+export type ValidationErrorsFactory<TStrings extends { }, TErrors extends string | number> = (strings: TStrings) => ValidationErrorsStrings<TErrors>;

package/src/services/localization/index.ts

@@ -0,0 +1,6 @@
+import { LocalizationManager } from './LocalizationManager';
+import { LocalaziedValidationErrors } from './LocalaziedValidationErrors';
+
+export * from './abstractions';
+
+export { LocalizationManager, LocalaziedValidationErrors };

package/src/throttledEvent.ts

@@ -14,7 +14,7 @@ export class ThrottledEvent extends Event {
         this._throttle.tryRun(() => super.trigger());
     }
 
-    public async triggerAsync() {
+    public async triggerAsync(): Promise<Error[]> {
         throw new Error('ThrottledEvent does not support triggerAsync');
     }
 }

package/src/{services/localization/validationErrorsStrings.ts → validation/ValidationErrorsLocalization.ts}

@@ -1,9 +1,9 @@
-import { ValidationErrors } from '../../validation';
-import { StringsShape } from './defaultShape';
+import { ValidationErrorsStrings } from '../services/localization';
+import { StringsShape } from '../services/localization/defaultShape';
+import { LocalaziedValidationErrors } from '../services/localization/LocalaziedValidationErrors';
+import { ValidationErrors } from './ValidationErrors';
 
-export type ValidationErrorsStrings = {[ error: number]: string };
-
-export default function Create(strings: StringsShape): ValidationErrorsStrings {
+function locationFactory(strings: StringsShape): ValidationErrorsStrings<ValidationErrors> {
     return {
         [ValidationErrors.None]: '',
         [ValidationErrors.ShouldBeNonEmpty]: strings.Validation.Empty,
@@ -23,3 +23,5 @@ export default function Create(strings: StringsShape): ValidationErrorsStrings {
         [ValidationErrors.Linkedin]: strings.Validation.Linkedin,
     };
 }
+
+export const ValidationErrorsLocalized = new LocalaziedValidationErrors<StringsShape, ValidationErrors>(locationFactory);