@ts-core/angular 19.0.10 → 19.0.12

package/application/ApplicationComponent.d.ts

@@ -1,18 +1,13 @@
-import { ThemeService, LanguageService, SettingsServiceBase } from '@ts-core/frontend';
-import { Language } from '@ts-core/language';
+import { LanguageService } from '@ts-core/frontend';
 import { ApplicationComponentBase } from './ApplicationComponentBase';
-export declare abstract class ApplicationComponent<T extends SettingsServiceBase> extends ApplicationComponentBase {
+export declare abstract class ApplicationComponent extends ApplicationComponentBase {
     private isLanguageLoaded;
     protected initialize(): void;
-    protected initializeAssets(): void;
-    protected initializeTheme(): void;
     protected initializeLanguage(): void;
     protected isReady(): boolean;
-    protected languageLoadingComplete(item: Language): void;
-    protected abstract languageLoadingError(item: Language, error: Error): void;
+    protected languageLoadingComplete(locale: string): void;
+    protected abstract languageLoadingError(locale: string, error: Error): void;
     protected viewReadyHandler(): void;
-    protected setLocale(item: Language): void;
-    protected abstract get theme(): ThemeService;
-    protected abstract get settings(): T;
+    protected setLocale(item: string): void;
     protected abstract get language(): LanguageService;
 }

package/application/ApplicationComponentBase.d.ts

@@ -3,7 +3,6 @@ import { DestroyableContainer } from '@ts-core/common';
 import { PromiseHandler } from '@ts-core/common';
 import * as i0 from "@angular/core";
 export declare abstract class ApplicationComponentBase extends DestroyableContainer implements AfterViewInit {
-    protected timeout: any;
     protected isReadyAlreadyCalled: boolean;
     protected viewReadyDelay: number;
     protected viewReadyPromise: PromiseHandler<void, void>;
@@ -15,8 +14,8 @@ export declare abstract class ApplicationComponentBase extends DestroyableContai
     protected abstract readyHandler(): void | Promise<void>;
     ngAfterViewInit(): void;
     destroy(): void;
-    get isViewReady(): boolean;
     get viewReady(): Promise<void>;
+    get isViewReady(): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<ApplicationComponentBase, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ApplicationComponentBase, "ng-component", never, {}, {}, never, never, true, never>;
 }

package/application/ApplicationInitializerBase.d.ts

@@ -1,23 +1,28 @@
 import { Destroyable } from '@ts-core/common';
-import { LanguageService, SettingsServiceBase } from '@ts-core/frontend';
+import { LanguageService, SettingsServiceBase, ThemeService } from '@ts-core/frontend';
 import { ILanguageLoader, ILanguageProjectSettings, LanguageLoadFunction } from '@ts-core/language';
 import { RouterServiceBase } from '../service/RouterServiceBase';
 import { PlatformService } from '../service/PlatformService';
 import { WindowService } from '../window/WindowService';
-export declare abstract class ApplicationInitializerBase<T = any, O extends ServerInitializeOptions<T> = ServerInitializeOptions<T>> extends Destroyable {
-    protected router: RouterServiceBase;
-    protected settings: SettingsServiceBase;
-    protected platform: PlatformService;
-    protected language: LanguageService;
-    protected windows: WindowService;
+export declare abstract class ApplicationInitializerBase<S extends SettingsServiceBase, R extends RouterServiceBase, T = any, O extends ServerInitializeOptions<T> = ServerInitializeOptions<T>> extends Destroyable {
     protected options?: O;
-    constructor(router: RouterServiceBase, settings: SettingsServiceBase, platform: PlatformService, language: LanguageService, windows: WindowService, options?: O);
-    initialize(): Promise<boolean>;
+    constructor(options?: O);
+    initialize(): Promise<void>;
+    protected initializeAsset(): Promise<void>;
+    protected initializeTheme(): Promise<void>;
+    protected initializeLanguage(): Promise<void>;
     protected getLanguageLoader<T = any>(): Promise<ILanguageLoader<T>>;
+    protected abstract getLanguageLoadSettings<T = any>(): ILanguageLoadSettings<T>;
     protected getConfig(): Promise<any>;
     protected getConfigLocal<T = any>(): Promise<T>;
-    protected getConfigRemote<T = any>(): Promise<T>;
-    protected abstract getLanguageLoadSettings<T = any>(): ILanguageLoadSettings<T>;
+    protected loadConfig<T = any>(url: string): Promise<T>;
+    protected abstract getConfigRemote<T = any>(local: any): Promise<T>;
+    protected abstract get theme(): ThemeService;
+    protected abstract get windows(): WindowService;
+    protected abstract get platform(): PlatformService;
+    protected abstract get language(): LanguageService;
+    protected abstract get router(): R;
+    protected abstract get settings(): S;
 }
 export interface ILanguageLoadSettings<T = any> {
     url: string;

package/fesm2022/ts-core-angular.mjs

@@ -1,13 +1,13 @@
 import * as i2 from '@ts-core/common';
 import { Destroyable, ExtendedError, DestroyableContainer, PromiseHandler, LoadableEvent, DateUtil, ArrayUtil, Loadable, LoadableStatus, ObservableData, TransportTimeoutError, TransportNoConnectionError, FilterableMapCollection, RemoveFilterableCondition, GetFilterableCondition, IDestroyable, MapCollection, TransportEvent, TransportLocal, Logger, LoggerLevel } from '@ts-core/common';
+import * as i1 from '@ts-core/frontend';
+import { AssetsCdnProvider, Assets, NativeWindowService, LanguageService, ThemeService, ThemeAssetService, LoadingService, ICookieOptions, DefaultLogger } from '@ts-core/frontend';
 import { LanguagePreloadLoader, LanguageProxyLoader, LanguageFileLoader } from '@ts-core/language';
 import axios from 'axios';
 import * as _ from 'lodash';
 import * as i0 from '@angular/core';
 import { Component, ViewContainerRef, booleanAttribute, Input, Directive, Pipe, NgModule, PLATFORM_ID, Inject, Injectable, InjectionToken, numberAttribute, EventEmitter, HostListener, Output, RendererStyleFlags2, Optional, NgModuleFactory, RendererFactory2, APP_INITIALIZER } from '@angular/core';
-import * as i1 from '@ts-core/frontend';
-import { AssetUrlProvider, Assets, NativeWindowService, LanguageService, ThemeService, ThemeAssetService, LoadingService, ICookieOptions, DefaultLogger } from '@ts-core/frontend';
-import { takeUntil, BehaviorSubject, distinctUntilChanged, debounceTime, fromEvent, filter, map, Subject } from 'rxjs';
+import { filter, takeUntil, BehaviorSubject, distinctUntilChanged, debounceTime, fromEvent, map, Subject } from 'rxjs';
 import moment from 'moment';
 import numeral from 'numeral';
 import { CommonModule, isPlatformServer, isPlatformBrowser, DatePipe, DOCUMENT } from '@angular/common';
@@ -20,28 +20,15 @@ import * as i1$3 from '@angular/platform-browser';
 import * as i1$4 from '@angular/service-worker';
 
 class ApplicationInitializerBase extends Destroyable {
-    router;
-    settings;
-    platform;
-    language;
-    windows;
     options;
     //--------------------------------------------------------------------------
     //
     // 	Constructor
     //
     //--------------------------------------------------------------------------
-    constructor(router, settings, platform, language, windows, options) {
+    constructor(options) {
         super();
-        this.router = router;
-        this.settings = settings;
-        this.platform = platform;
-        this.language = language;
-        this.windows = windows;
         this.options = options;
-        if (platform.isPlatformServer && _.isNil(options)) {
-            throw new ExtendedError(`Unable to initialize server platform: options is nil`);
-        }
     }
     //--------------------------------------------------------------------------
     //
@@ -49,21 +36,39 @@ class ApplicationInitializerBase extends Destroyable {
     //
     //--------------------------------------------------------------------------
     async initialize() {
+        if (this.platform.isPlatformServer && _.isNil(this.options)) {
+            throw new ExtendedError(`Unable to initialize: server platform requires options`);
+        }
         try {
             this.settings.initialize(await this.getConfig(), this.router.getParams());
         }
         catch (error) {
             this.windows.info(error.message, null, null, { isDisableClose: true, isModal: true });
-            return false;
+            return;
         }
-        this.language.loader = await this.getLanguageLoader();
-        return true;
+        this.initializeAsset();
+        this.initializeTheme();
+        this.initializeLanguage();
     }
     //--------------------------------------------------------------------------
     //
     // 	Protected Methods
     //
     //--------------------------------------------------------------------------
+    async initializeAsset() {
+        Assets.provider = new AssetsCdnProvider(this.settings.assetsUrl, this.settings.assetsCdnUrl);
+    }
+    async initializeTheme() {
+        this.theme.initialize(this.settings.themes);
+    }
+    //--------------------------------------------------------------------------
+    //
+    // 	Language Methods
+    //
+    //--------------------------------------------------------------------------
+    async initializeLanguage() {
+        this.language.loader = await this.getLanguageLoader();
+    }
     async getLanguageLoader() {
         if (this.platform.isPlatformServer) {
             return new LanguagePreloadLoader(this.options.locales);
@@ -71,18 +76,29 @@ class ApplicationInitializerBase extends Destroyable {
         let { url, project, proxy } = this.getLanguageLoadSettings();
         return this.settings.isProduction ? new LanguageProxyLoader(proxy) : new LanguageFileLoader(url, project.prefixes);
     }
+    //--------------------------------------------------------------------------
+    //
+    // 	Config Methods
+    //
+    //--------------------------------------------------------------------------
     async getConfig() {
         if (this.platform.isPlatformServer) {
             return this.options.config;
         }
-        return Object.assign(await this.getConfigLocal(), await this.getConfigRemote());
+        let local = await this.getConfigLocal();
+        return Object.assign(local, await this.getConfigRemote(local));
     }
     async getConfigLocal() {
-        let { data } = await axios.get('config.json');
-        return data;
+        return this.loadConfig('config.json');
     }
-    async getConfigRemote() {
-        return null;
+    async loadConfig(url) {
+        try {
+            let { data } = await axios.get(url);
+            return data;
+        }
+        catch (error) {
+            throw new ExtendedError(`Unable to load config from "${url}": ${error.message}`);
+        }
     }
 }
 class ServerInitializeOptions {
@@ -96,7 +112,6 @@ class ApplicationComponentBase extends DestroyableContainer {
     // 	Properties
     //
     // --------------------------------------------------------------------------
-    timeout;
     isReadyAlreadyCalled;
     viewReadyDelay = NaN;
     viewReadyPromise;
@@ -157,22 +172,18 @@ class ApplicationComponentBase extends DestroyableContainer {
             this.viewReadyPromise.reject();
             this.viewReadyPromise = null;
         }
-        if (!_.isNil(this.timeout)) {
-            clearTimeout(this.timeout);
-            this.timeout = null;
-        }
     }
     // --------------------------------------------------------------------------
     //
     // 	Public Properties
     //
     // --------------------------------------------------------------------------
-    get isViewReady() {
-        return !_.isNil(this.viewReadyPromise) ? this.viewReadyPromise.isResolved : false;
-    }
     get viewReady() {
         return !_.isNil(this.viewReadyPromise) ? this.viewReadyPromise.promise : null;
     }
+    get isViewReady() {
+        return !_.isNil(this.viewReadyPromise) ? this.viewReadyPromise.isResolved : false;
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: ApplicationComponentBase, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.10", type: ApplicationComponentBase, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: '', isInline: true });
 }
@@ -194,28 +205,13 @@ class ApplicationComponent extends ApplicationComponentBase {
     //
     // --------------------------------------------------------------------------
     initialize() {
-        this.initializeAssets();
-        this.initializeTheme();
         this.initializeLanguage();
     }
-    initializeAssets() {
-        Assets.provider = new AssetUrlProvider(this.settings.assetsUrl);
-    }
-    initializeTheme() {
-        this.theme.initialize(this.settings.themes);
-    }
     initializeLanguage() {
-        this.language.initialize(`${this.settings.assetsUrl}language/`, this.settings.languages);
-        this.language.events.pipe(takeUntil(this.destroyed)).subscribe(data => {
-            switch (data.type) {
-                case LoadableEvent.COMPLETE:
-                    this.languageLoadingComplete(data.data);
-                    break;
-                case LoadableEvent.ERROR:
-                    this.languageLoadingError(data.data, data.error);
-                    break;
-            }
-        });
+        this.language.events
+            .pipe(filter(item => item.type === LoadableEvent.ERROR), takeUntil(this.destroyed))
+            .subscribe(item => this.languageLoadingError(item.data.toString(), item.error));
+        this.language.completed.pipe(takeUntil(this.destroyed)).subscribe(item => this.languageLoadingComplete(item));
     }
     isReady() {
         return super.isReady() && this.isLanguageLoaded;
@@ -225,17 +221,17 @@ class ApplicationComponent extends ApplicationComponentBase {
     // 	Event Handlers
     //
     // --------------------------------------------------------------------------
-    languageLoadingComplete(item) {
+    languageLoadingComplete(locale) {
         this.isLanguageLoaded = true;
-        this.setLocale(item);
+        this.setLocale(locale);
         this.checkReady();
     }
     viewReadyHandler() {
         this.initialize();
     }
     setLocale(item) {
-        moment.locale(item.locale);
-        numeral.locale(item.locale);
+        moment.locale(item);
+        numeral.locale(item);
     }
 }
 
@@ -2901,14 +2897,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
 
 class LanguageToggleDirective extends Destroyable {
     language;
+    settings;
     // --------------------------------------------------------------------------
     //
     //	Constructor
     //
     // --------------------------------------------------------------------------
-    constructor(language) {
+    constructor(language, settings) {
         super();
         this.language = language;
+        this.settings = settings;
     }
     // --------------------------------------------------------------------------
     //
@@ -2916,9 +2914,10 @@ class LanguageToggleDirective extends Destroyable {
     //
     // --------------------------------------------------------------------------
     clickHandler() {
-        let items = this.language.languages.collection;
-        if (items.length > 1) {
-            this.language.language = ArrayUtil.nextItem(this.language.language, items, true);
+        let items = this.settings.languages.collection;
+        let item = ArrayUtil.nextItem(_.find(items, { locale: this.language.locale }), items, true);
+        if (!_.isNil(item)) {
+            this.language.locale = item.locale;
         }
     }
     // --------------------------------------------------------------------------
@@ -2933,7 +2932,7 @@ class LanguageToggleDirective extends Destroyable {
         super.destroy();
         this.language = null;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: LanguageToggleDirective, deps: [{ token: i1.LanguageService }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: LanguageToggleDirective, deps: [{ token: i1.LanguageService }, { token: i1.SettingsServiceBase }], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.2.10", type: LanguageToggleDirective, isStandalone: false, selector: "[vi-language-toggle]", host: { listeners: { "click": "clickHandler()" } }, usesInheritance: true, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: LanguageToggleDirective, decorators: [{
@@ -2942,7 +2941,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
                     selector: '[vi-language-toggle]',
                     standalone: false
                 }]
-        }], ctorParameters: () => [{ type: i1.LanguageService }], propDecorators: { clickHandler: [{
+        }], ctorParameters: () => [{ type: i1.LanguageService }, { type: i1.SettingsServiceBase }], propDecorators: { clickHandler: [{
                 type: HostListener,
                 args: ['click']
             }] } });
@@ -4974,7 +4973,7 @@ class PipeServiceBase extends Destroyable {
     //
     // --------------------------------------------------------------------------
     commitLanguageProperties() {
-        let locale = this.language.locale ? this.language.language.locale : 'en';
+        let locale = this.language.locale ? this.language.locale : 'en';
         this._locale = locale === 'en' ? 'en-US' : locale;
         if (PipeServiceBase.DATE) {
             PipeServiceBase.DATE = new DatePipe(this.locale);