@stemy/ngx-utils 17.4.0 → 17.4.2

package/ngx-utils/common-types.d.ts

@@ -35,8 +35,9 @@ export interface ITranslation {
     translation: string;
 }
 export interface ITranslations {
-    [key: string]: any;
+    [key: string]: string;
 }
+export type GlobalTranslations = Record<string, ITranslations>;
 export interface ILanguageSetting {
     unavailable?: string;
     [key: string]: string | boolean | number;
@@ -258,6 +259,10 @@ export interface IHttpService {
     makeListParams(page: number, itemsPerPage: number, orderBy?: string, orderDescending?: boolean, filter?: string): IHttpParams;
 }
 export declare const EXPRESS_REQUEST: InjectionToken<Request>;
+export interface IBaseHttpClient extends HttpClient {
+    requestHeaders: IHttpHeaders;
+    requestParams: IHttpParams;
+}
 export interface IApiService extends IHttpService {
     cache: any;
     client: HttpClient;
@@ -331,6 +336,7 @@ export declare class IConfiguration {
     [key: string]: any;
 }
 export interface IConfigService {
+    readonly http: IBaseHttpClient;
     readonly config: IConfiguration;
     readonly injector: Injector;
     readonly load: () => Promise<IConfiguration>;

package/ngx-utils/ngx-utils.imports.d.ts

@@ -54,8 +54,8 @@ import { PaginationMenuComponent } from "./components/pagination-menu/pagination
 import { UnorderedListComponent } from "./components/unordered-list/unordered-list.component";
 export declare const pipes: (typeof FilterPipe | typeof FormatNumberPipe | typeof GlobalTemplatePipe | typeof IncludesPipe | typeof ReducePipe | typeof RoundPipe | typeof SafeHtmlPipe | typeof TranslatePipe)[];
 export declare const directives: (typeof AsyncMethodBase | typeof BackgroundDirective | typeof DropdownDirective | typeof DropdownContentDirective | typeof DropdownToggleDirective | typeof DynamicTableTemplateDirective | typeof GlobalTemplateDirective | typeof IconDirective | typeof NgxTemplateOutletDirective | typeof PaginationDirective | typeof PaginationItemDirective | typeof ResourceIfDirective | typeof StickyDirective | typeof StickyClassDirective | typeof UnorderedListItemDirective | typeof UnorderedListTemplateDirective)[];
-export declare const components: (typeof DropdownBoxComponent | typeof DynamicTableComponent | typeof PaginationMenuComponent | typeof UnorderedListComponent)[];
-export declare const providers: (typeof FilterPipe | typeof FormatNumberPipe | typeof GlobalTemplatePipe | typeof IncludesPipe | typeof ReducePipe | typeof RoundPipe | typeof SafeHtmlPipe | typeof TranslatePipe | typeof BaseHttpClient | typeof BaseHttpService | typeof AuthGuard | typeof AclService | typeof StaticAuthService | typeof ConfigService | typeof ErrorHandlerService | typeof EventsService | typeof FormatterService | typeof GlobalTemplateService | typeof IconService | typeof StaticLanguageService | typeof OpenApiService | typeof PromiseService | typeof StateService | typeof StorageService | typeof ConsoleToasterService | typeof TranslatedUrlSerializer | typeof UniversalService | typeof WasmService | typeof DeviceDetectorService | {
+export declare const components: (typeof UnorderedListComponent | typeof DropdownBoxComponent | typeof DynamicTableComponent | typeof PaginationMenuComponent)[];
+export declare const providers: (typeof UniversalService | typeof StateService | typeof AuthGuard | typeof BaseHttpClient | typeof StorageService | typeof BaseHttpService | typeof WasmService | typeof AclService | typeof StaticAuthService | typeof ConfigService | typeof ErrorHandlerService | typeof EventsService | typeof FormatterService | typeof GlobalTemplateService | typeof IconService | typeof StaticLanguageService | typeof OpenApiService | typeof ConsoleToasterService | typeof TranslatedUrlSerializer | typeof PromiseService | typeof FilterPipe | typeof FormatNumberPipe | typeof GlobalTemplatePipe | typeof IncludesPipe | typeof ReducePipe | typeof RoundPipe | typeof SafeHtmlPipe | typeof TranslatePipe | typeof DeviceDetectorService | {
     provide: import("@angular/core").InjectionToken<import("@angular/platform-browser").EventManagerPlugin[]>;
     useClass: typeof ResizeEventPlugin;
     multi: boolean;

package/ngx-utils/pipes/translate.pipe.d.ts

@@ -4,7 +4,7 @@ import * as i0 from "@angular/core";
 export declare class TranslatePipe implements PipeTransform {
     readonly cdr: ChangeDetectorRef;
     readonly language: ILanguageService;
-    private lang;
+    private dictionary;
     private disabled;
     private query;
     private args;

package/ngx-utils/services/base-http.client.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient, HttpHandler, HttpHeaders, HttpParams } from "@angular/common/http";
-import { IHttpHeaders, IHttpParams } from "../common-types";
+import { IBaseHttpClient, IHttpHeaders, IHttpParams } from "../common-types";
 import * as i0 from "@angular/core";
-export declare class BaseHttpClient extends HttpClient {
+export declare class BaseHttpClient extends HttpClient implements IBaseHttpClient {
     requestHeaders: IHttpHeaders;
     requestParams: IHttpParams;
     renewTokenFunc: () => void;

package/ngx-utils/services/config.service.d.ts

@@ -1,10 +1,10 @@
 import { Injector } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
 import { UniversalService } from "./universal.service";
 import { IConfigService, IConfiguration } from "../common-types";
+import { BaseHttpClient } from "./base-http.client";
 import * as i0 from "@angular/core";
 export declare class ConfigService implements IConfigService {
-    readonly http: HttpClient;
+    readonly http: BaseHttpClient;
     readonly universal: UniversalService;
     readonly injector: Injector;
     readonly rootElement: any;
@@ -17,7 +17,7 @@ export declare class ConfigService implements IConfigService {
     get load(): () => Promise<IConfiguration>;
     get config(): IConfiguration;
     get configUrl(): string;
-    constructor(http: HttpClient, universal: UniversalService, injector: Injector, rootElement: any, baseUrl: string, baseConfig?: IConfiguration, scriptParams?: any);
+    constructor(http: BaseHttpClient, universal: UniversalService, injector: Injector, rootElement: any, baseUrl: string, baseConfig?: IConfiguration, scriptParams?: any);
     protected initService(): void;
     protected loadJson(): Promise<IConfiguration>;
     protected prepareConfig(config: IConfiguration): Promise<IConfiguration>;

package/ngx-utils/services/events.service.d.ts

@@ -4,6 +4,7 @@ export declare class EventsService {
     readonly eventForwarded: EventEmitter<Event>;
     readonly stickyUpdated: EventEmitter<boolean>;
     readonly languageChanged: EventEmitter<string>;
+    readonly editLanguageChanged: EventEmitter<string>;
     private sticky;
     get isSticky(): boolean;
     constructor();

package/ngx-utils/services/language.service.d.ts

@@ -3,7 +3,7 @@ import { ILanguageSetting, ILanguageSettings, ITranslations } from "../common-ty
 import { StaticLanguageService } from "./static-language.service";
 import * as i0 from "@angular/core";
 export declare class LanguageService extends StaticLanguageService {
-    protected translationRequests: ITranslations;
+    protected translationRequests: Record<string, Promise<ITranslations>>;
     protected settingsPromise: Promise<ILanguageSettings>;
     protected languageSettings: BehaviorSubject<ILanguageSettings>;
     get currentLanguage(): string;
@@ -14,7 +14,7 @@ export declare class LanguageService extends StaticLanguageService {
     initFromSettings(): Promise<any>;
     getTranslation(key: string, params?: any): Promise<string>;
     protected useLanguage(lang: string): Promise<ITranslations>;
-    protected loadDictionary(): Promise<any>;
+    getDictionary(lang?: string): Promise<ITranslations>;
     protected loadSettings(): Promise<ILanguageSettings>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LanguageService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LanguageService>;

package/ngx-utils/services/static-language.service.d.ts

@@ -1,4 +1,4 @@
-import { IConfigService, IConfiguration, ILanguageService, IPromiseService, ITranslation, ITranslations } from "../common-types";
+import { GlobalTranslations, IConfigService, IConfiguration, ILanguageService, IPromiseService, ITranslation, ITranslations } from "../common-types";
 import { EventsService } from "./events.service";
 import { StorageService } from "./storage.service";
 import { UniversalService } from "./universal.service";
@@ -28,11 +28,14 @@ export declare class StaticLanguageService implements ILanguageService {
     protected currentLang: string;
     protected disableTrans: boolean;
     protected languageList: string[];
-    protected readonly translations: ITranslations;
+    protected readonly translations: GlobalTranslations;
+    protected overrideTranslations: GlobalTranslations;
+    protected mergedTranslations: GlobalTranslations;
     constructor(events: EventsService, storage: StorageService, configs: IConfigService, promises: IPromiseService, client: BaseHttpClient);
     protected initService(): void;
     replaceLanguages(languages: string[]): void;
     addLanguages(languages: string[]): void;
+    setOverrideTranslations(translations: GlobalTranslations): void;
     getTranslationSync(key: string, params?: any): string;
     getTranslation(key: string, params?: any): Promise<string>;
     getTranslations(...keys: string[]): Promise<ITranslations>;
@@ -41,6 +44,7 @@ export declare class StaticLanguageService implements ILanguageService {
     protected interpolate(expr: string | Function, params?: any): string;
     protected interpolateString(expr: string, params?: any): string;
     protected getDefaultLanguage(): string;
+    protected mergeTranslations(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<StaticLanguageService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<StaticLanguageService>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stemy/ngx-utils",
-  "version": "17.4.0",
+  "version": "17.4.2",
   "license": "MIT",
   "public": true,
   "repository": "https://github.com/stemyke/ngx-utils.git",

package/public_api.d.ts

@@ -1,4 +1,4 @@
-export { TypedFactoryProvider, TypedValueProvider, CachedProvider, CachedFactory, OPTIONS_TOKEN, IResolveFactory, CanvasColor, IIconService, ICON_SERVICE, ITranslation, ITranslations, ILanguageSetting, ILanguageSettings, ILanguageService, LANGUAGE_SERVICE, IAuthService, RouteValidator, IRouteData, IRoute, AUTH_SERVICE, IAclComponent, IPromiseService, PROMISE_SERVICE, IWasi, IWasmExports, IWasm, IWasmAsync, WASI_IMPLEMENTATION, IRouteStateInfo, NavigationUrlParam, StorageMode, IToasterService, TOASTER_SERVICE, IAsyncMessage, AsyncMethod, DropdownAttachTo, UnorderedListTemplate, UnorderedListTemplates, UnorderedListStyle, IAjaxRequestDetails, AjaxRequestCallback, ScriptType, IScriptPromises, IStylePromises, ISearchObservable, FactoryDependencies, ObjectType, ITimer, IExtraProperties, IGroupMap, TranslationQuery, IPageInfo, IPaginationData, PaginationDataLoader, PaginationItemContext, IHttpHeaders, IHttpParams, IRequestOptions, IIssueContext, IProgress, ProgressListener, PromiseExecutor, HttpPromise, IHttpService, EXPRESS_REQUEST, IApiService, API_SERVICE, IOpenApiSchemaProperty, IOpenApiSchema, IOpenApiSchemas, ITableOrders, ITableColumn, ITableColumns, TableColumns, ITableTemplate, ITableTemplates, ITableDataQuery, TableDataLoader, ResourceIfContext, APP_BASE_URL, IConfiguration, IConfigService, CONFIG_SERVICE, BASE_CONFIG, SCRIPT_PARAMS, ROOT_ELEMENT, RESIZE_DELAY, ResizeEventStrategy, RESIZE_STRATEGY, ErrorHandlerCallback, ERROR_HANDLER, GlobalComponentModifier, AppInitializerFunc, IModuleConfig, ValuedPromise } from "./ngx-utils/common-types";
+export { TypedFactoryProvider, TypedValueProvider, CachedProvider, CachedFactory, OPTIONS_TOKEN, IResolveFactory, CanvasColor, IIconService, ICON_SERVICE, ITranslation, ITranslations, GlobalTranslations, ILanguageSetting, ILanguageSettings, ILanguageService, LANGUAGE_SERVICE, IAuthService, RouteValidator, IRouteData, IRoute, AUTH_SERVICE, IAclComponent, IPromiseService, PROMISE_SERVICE, IWasi, IWasmExports, IWasm, IWasmAsync, WASI_IMPLEMENTATION, IRouteStateInfo, NavigationUrlParam, StorageMode, IToasterService, TOASTER_SERVICE, IAsyncMessage, AsyncMethod, DropdownAttachTo, UnorderedListTemplate, UnorderedListTemplates, UnorderedListStyle, IAjaxRequestDetails, AjaxRequestCallback, ScriptType, IScriptPromises, IStylePromises, ISearchObservable, FactoryDependencies, ObjectType, ITimer, IExtraProperties, IGroupMap, TranslationQuery, IPageInfo, IPaginationData, PaginationDataLoader, PaginationItemContext, IHttpHeaders, IHttpParams, IRequestOptions, IIssueContext, IProgress, ProgressListener, PromiseExecutor, HttpPromise, IHttpService, EXPRESS_REQUEST, IBaseHttpClient, IApiService, API_SERVICE, IOpenApiSchemaProperty, IOpenApiSchema, IOpenApiSchemas, ITableOrders, ITableColumn, ITableColumns, TableColumns, ITableTemplate, ITableTemplates, ITableDataQuery, TableDataLoader, ResourceIfContext, APP_BASE_URL, IConfiguration, IConfigService, CONFIG_SERVICE, BASE_CONFIG, SCRIPT_PARAMS, ROOT_ELEMENT, RESIZE_DELAY, ResizeEventStrategy, RESIZE_STRATEGY, ErrorHandlerCallback, ERROR_HANDLER, GlobalComponentModifier, AppInitializerFunc, IModuleConfig, ValuedPromise } from "./ngx-utils/common-types";
 export { AjaxRequestHandler } from "./ngx-utils/utils/ajax-request-handler";
 export { ArrayUtils } from "./ngx-utils/utils/array.utils";
 export { AuthGuard } from "./ngx-utils/utils/auth.guard";