@ts-core/angular 19.0.3 → 19.0.5

package/directive/AspectRatioResizeDirective.d.ts

@@ -1,7 +1,7 @@
 import { AfterViewInit, ElementRef } from '@angular/core';
-import { DestroyableContainer } from '@ts-core/common';
+import { Destroyable } from '@ts-core/common';
 import * as i0 from "@angular/core";
-export declare class AspectRatioResizeDirective extends DestroyableContainer implements AfterViewInit {
+export declare class AspectRatioResizeDirective extends Destroyable implements AfterViewInit {
     protected static UPDATE_DELAY: number;
     private _ratio;
     private _direction;

package/directive/ScrollCheckDirective.d.ts

@@ -1,7 +1,7 @@
 import { ElementRef, EventEmitter } from '@angular/core';
-import { DestroyableContainer } from '@ts-core/common';
+import { Destroyable } from '@ts-core/common';
 import * as i0 from "@angular/core";
-export declare class ScrollCheckDirective extends DestroyableContainer {
+export declare class ScrollCheckDirective extends Destroyable {
     top: EventEmitter<boolean>;
     bottom: EventEmitter<boolean>;
     limitExceed: EventEmitter<boolean>;

package/directive/StructureDirective.d.ts

@@ -1,6 +1,6 @@
 import { EmbeddedViewRef, TemplateRef, ViewContainerRef } from '@angular/core';
-import { DestroyableContainer } from '@ts-core/common';
-export declare class StructureDirective<T = any> extends DestroyableContainer {
+import { Destroyable } from '@ts-core/common';
+export declare class StructureDirective<T = any> extends Destroyable {
     protected template: TemplateRef<T>;
     protected container: ViewContainerRef;
     protected view: EmbeddedViewRef<T>;

package/fesm2022/ts-core-angular.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { Component, ViewContainerRef, booleanAttribute, Directive, Input, Pipe, NgModule, PLATFORM_ID, Injectable, Inject, InjectionToken, numberAttribute, EventEmitter, Output, HostListener, RendererStyleFlags2, Optional, NgModuleFactory, APP_INITIALIZER, RendererFactory2 } from '@angular/core';
 import * as i2 from '@ts-core/common';
-import { DestroyableContainer, PromiseHandler, LoadableEvent, ExtendedError, Destroyable, DateUtil, Loadable, LoadableStatus, ObservableData, TransportTimeoutError, TransportNoConnectionError, ArrayUtil, FilterableMapCollection, RemoveFilterableCondition, GetFilterableCondition, IDestroyable, MapCollection, TransportEvent, TransportLocal, Logger, LoggerLevel } from '@ts-core/common';
+import { DestroyableContainer, PromiseHandler, LoadableEvent, ExtendedError, Destroyable, DateUtil, ArrayUtil, Loadable, LoadableStatus, ObservableData, TransportTimeoutError, TransportNoConnectionError, FilterableMapCollection, RemoveFilterableCondition, GetFilterableCondition, IDestroyable, MapCollection, TransportEvent, TransportLocal, Logger, LoggerLevel } from '@ts-core/common';
 import * as _ from 'lodash';
 import * as i1 from '@ts-core/frontend';
 import { Assets, AssetUrlProvider, NativeWindowService, LanguageService, ThemeService, ThemeAssetService, LoadingService, ICookieOptions, DefaultLogger } from '@ts-core/frontend';
@@ -1168,7 +1168,7 @@ class CookieWriterService extends Cookie.CookieWriterService {
     }
 }
 
-class PlatformService extends DestroyableContainer {
+class PlatformService extends Destroyable {
     // --------------------------------------------------------------------------
     //
     // 	Constants
@@ -1345,7 +1345,7 @@ class ResizeManager {
     }
 }
 
-class AspectRatioResizeDirective extends DestroyableContainer {
+class AspectRatioResizeDirective extends Destroyable {
     // --------------------------------------------------------------------------
     //
     //	Static Properties
@@ -2113,7 +2113,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 args: [{ transform: booleanAttribute }]
             }] } });
 
-class StructureDirective extends DestroyableContainer {
+class StructureDirective extends Destroyable {
     template;
     container;
     //--------------------------------------------------------------------------
@@ -2191,7 +2191,7 @@ class StructureDirective extends DestroyableContainer {
     }
 }
 
-class ScrollCheckDirective extends DestroyableContainer {
+class ScrollCheckDirective extends Destroyable {
     //--------------------------------------------------------------------------
     //
     //	Properties
@@ -2293,7 +2293,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 args: ['vi-scroll-check']
             }] } });
 
-class LanguagePipe extends DestroyableContainer {
+class LanguagePipe extends Destroyable {
     detection;
     language;
     // --------------------------------------------------------------------------
@@ -2555,7 +2555,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: PlatformService }] });
 
-class LanguagePipePure extends DestroyableContainer {
+class LanguagePipePure extends Destroyable {
     language;
     // --------------------------------------------------------------------------
     //
@@ -2741,7 +2741,55 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 type: Input
             }] } });
 
-class LanguagePipeHas extends DestroyableContainer {
+class LanguageToggleDirective extends Destroyable {
+    language;
+    // --------------------------------------------------------------------------
+    //
+    //	Constructor
+    //
+    // --------------------------------------------------------------------------
+    constructor(language) {
+        super();
+        this.language = language;
+    }
+    // --------------------------------------------------------------------------
+    //
+    //	Event Handlers
+    //
+    // --------------------------------------------------------------------------
+    clickHandler() {
+        let items = this.language.languages.collection;
+        if (items.length > 1) {
+            this.language.language = ArrayUtil.nextItem(this.language.language, items, true);
+        }
+    }
+    // --------------------------------------------------------------------------
+    //
+    //	Public Methods
+    //
+    // --------------------------------------------------------------------------
+    destroy() {
+        if (this.isDestroyed) {
+            return;
+        }
+        super.destroy();
+        this.language = null;
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LanguageToggleDirective, deps: [{ token: i1.LanguageService }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.1.5", type: LanguageToggleDirective, isStandalone: false, selector: "[vi-language-toggle]", host: { listeners: { "click": "clickHandler()" } }, usesInheritance: true, ngImport: i0 });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LanguageToggleDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[vi-language-toggle]',
+                    standalone: false
+                }]
+        }], ctorParameters: () => [{ type: i1.LanguageService }], propDecorators: { clickHandler: [{
+                type: HostListener,
+                args: ['click']
+            }] } });
+
+class LanguagePipeHas extends Destroyable {
     language;
     // --------------------------------------------------------------------------
     //
@@ -2800,7 +2848,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1.LanguageService }] });
 
-class LanguagePipeHasPure extends DestroyableContainer {
+class LanguagePipeHasPure extends Destroyable {
     language;
     // --------------------------------------------------------------------------
     //
@@ -2920,7 +2968,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 args: ['viTranslateHasIsOnlyIfNotEmpty']
             }] } });
 
-let declarations$2 = [LanguagePipe, LanguagePipePure, LanguagePipeHas, LanguagePipeHasPure, LanguageHasDirective, LanguageDirective];
+let declarations$2 = [LanguagePipe, LanguagePipePure, LanguagePipeHas, LanguagePipeHasPure, LanguageToggleDirective, LanguageHasDirective, LanguageDirective];
 class LanguageModule {
     // --------------------------------------------------------------------------
     //
@@ -2949,7 +2997,7 @@ class LanguageModule {
         };
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LanguageModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.1.5", ngImport: i0, type: LanguageModule, declarations: [LanguagePipe, LanguagePipePure, LanguagePipeHas, LanguagePipeHasPure, LanguageHasDirective, LanguageDirective], imports: [CookieModule], exports: [LanguagePipe, LanguagePipePure, LanguagePipeHas, LanguagePipeHasPure, LanguageHasDirective, LanguageDirective] });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.1.5", ngImport: i0, type: LanguageModule, declarations: [LanguagePipe, LanguagePipePure, LanguagePipeHas, LanguagePipeHasPure, LanguageToggleDirective, LanguageHasDirective, LanguageDirective], imports: [CookieModule], exports: [LanguagePipe, LanguagePipePure, LanguagePipeHas, LanguagePipeHasPure, LanguageToggleDirective, LanguageHasDirective, LanguageDirective] });
     static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LanguageModule, imports: [CookieModule] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LanguageModule, decorators: [{
@@ -2968,7 +3016,46 @@ function languageServiceFactory(cookie, options) {
 }
 const LANGUAGE_OPTIONS = new InjectionToken(`LANGUAGE_OPTIONS`);
 
-class LoginBaseService extends Loadable {
+class Loginable extends Destroyable {
+    login;
+    // --------------------------------------------------------------------------
+    //
+    // 	Constructor
+    //
+    // --------------------------------------------------------------------------
+    constructor(login) {
+        super();
+        this.login = login;
+    }
+    // --------------------------------------------------------------------------
+    //
+    // 	Protected Methods
+    //
+    // --------------------------------------------------------------------------
+    initialize() {
+        if (this.login.isLoggedIn) {
+            this.loginedHandler();
+        }
+        this.login.logined.pipe().subscribe(() => this.loginedHandler());
+        this.login.logouted.pipe().subscribe(() => this.logoutedHandler());
+    }
+    loginedHandler() { }
+    logoutedHandler() { }
+    // --------------------------------------------------------------------------
+    //
+    // 	Public Methods
+    //
+    // --------------------------------------------------------------------------
+    destroy() {
+        if (this.isDestroyed) {
+            return;
+        }
+        super.destroy();
+        this.login = null;
+    }
+}
+
+class LoginServiceBase extends Loadable {
     // --------------------------------------------------------------------------
     //
     // 	Properties
@@ -3000,7 +3087,7 @@ class LoginBaseService extends Loadable {
         let response;
         this.status = LoadableStatus.LOADING;
         this.observer.next(new ObservableData(LoadableEvent.STARTED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_STARTED));
+        this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_STARTED));
         try {
             response = await sidReturnFunction();
             this.parseLoginResponse(response);
@@ -3015,11 +3102,11 @@ class LoginBaseService extends Loadable {
             let extendedError = ExtendedError.create(error);
             this.status = LoadableStatus.ERROR;
             this.parseLoginErrorResponse(extendedError);
-            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_ERROR, null, extendedError));
+            this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_ERROR, null, extendedError));
         }
         if (!this.isLoading) {
             this.observer.next(new ObservableData(LoadableEvent.FINISHED));
-            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_FINISHED));
+            this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_FINISHED));
         }
         return response;
     }
@@ -3033,7 +3120,7 @@ class LoginBaseService extends Loadable {
             this._isLoggedIn = true;
             this.status = LoadableStatus.LOADED;
             this.observer.next(new ObservableData(LoadableEvent.COMPLETE, response));
-            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_COMPLETE, response));
+            this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_COMPLETE, response));
         }
         catch (error) {
             let extendedError = ExtendedError.create(error);
@@ -3041,10 +3128,10 @@ class LoginBaseService extends Loadable {
             this._isLoggedIn = false;
             this.status = LoadableStatus.ERROR;
             this.observer.next(new ObservableData(LoadableEvent.ERROR, null, extendedError));
-            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_ERROR, null, extendedError));
+            this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_ERROR, null, extendedError));
         }
         this.observer.next(new ObservableData(LoadableEvent.FINISHED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_FINISHED));
+        this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_FINISHED));
     }
     reset() {
         this._sid = null;
@@ -3067,7 +3154,7 @@ class LoginBaseService extends Loadable {
         }
         this.status = LoadableStatus.LOADING;
         this.observer.next(new ObservableData(LoadableEvent.STARTED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_STARTED));
+        this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_STARTED));
         this.parseLoginResponse(param);
         this.status = !this.isCanLoginWithSid() ? LoadableStatus.LOADED : LoadableStatus.LOADING;
         if (this.isLoading) {
@@ -3083,7 +3170,7 @@ class LoginBaseService extends Loadable {
         }
         this.status = LoadableStatus.LOADING;
         this.observer.next(new ObservableData(LoadableEvent.STARTED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGIN_STARTED));
+        this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGIN_STARTED));
         this.loginBySid();
         return true;
     }
@@ -3092,7 +3179,7 @@ class LoginBaseService extends Loadable {
             return;
         }
         this.observer.next(new ObservableData(LoadableEvent.STARTED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGOUT_STARTED));
+        this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGOUT_STARTED));
         try {
             await this.logoutRequest();
         }
@@ -3105,7 +3192,7 @@ class LoginBaseService extends Loadable {
             this._isLoggedIn = false;
             this.status = LoadableStatus.NOT_LOADED;
             this.observer.next(new ObservableData(LoadableEvent.FINISHED));
-            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGOUT_FINISHED));
+            this.observer.next(new ObservableData(LoginServiceBaseEvent.LOGOUT_FINISHED));
         }
     }
     isCanLoginWithSid() {
@@ -3124,10 +3211,10 @@ class LoginBaseService extends Loadable {
     //
     // --------------------------------------------------------------------------
     get logined() {
-        return this.events.pipe(filter(item => item.type === LoginBaseServiceEvent.LOGIN_COMPLETE), map(item => item.data));
+        return this.events.pipe(filter(item => item.type === LoginServiceBaseEvent.LOGIN_COMPLETE), map(item => item.data));
     }
     get logouted() {
-        return this.events.pipe(filter(item => item.type === LoginBaseServiceEvent.LOGOUT_FINISHED), map(() => null));
+        return this.events.pipe(filter(item => item.type === LoginServiceBaseEvent.LOGOUT_FINISHED), map(() => null));
     }
     get sid() {
         return this._sid;
@@ -3139,19 +3226,19 @@ class LoginBaseService extends Loadable {
         return this._isLoggedIn;
     }
 }
-var LoginBaseServiceEvent;
-(function (LoginBaseServiceEvent) {
-    LoginBaseServiceEvent["LOGIN_ERROR"] = "LOGIN_ERROR";
-    LoginBaseServiceEvent["LOGIN_STARTED"] = "LOGIN_STARTED";
-    LoginBaseServiceEvent["LOGIN_COMPLETE"] = "LOGIN_COMPLETE";
-    LoginBaseServiceEvent["LOGIN_FINISHED"] = "LOGIN_FINISHED";
-    LoginBaseServiceEvent["LOGOUT_STARTED"] = "LOGOUT_STARTED";
-    LoginBaseServiceEvent["LOGOUT_FINISHED"] = "LOGOUT_FINISHED";
-    LoginBaseServiceEvent["REGISTRATION_ERROR"] = "REGISTRATION_ERROR";
-    LoginBaseServiceEvent["REGISTRATION_STARTED"] = "REGISTRATION_STARTED";
-    LoginBaseServiceEvent["REGISTRATION_COMPLETE"] = "REGISTRATION_COMPLETE";
-    LoginBaseServiceEvent["REGISTRATION_FINISHED"] = "REGISTRATION_FINISHED";
-})(LoginBaseServiceEvent || (LoginBaseServiceEvent = {}));
+var LoginServiceBaseEvent;
+(function (LoginServiceBaseEvent) {
+    LoginServiceBaseEvent["LOGIN_ERROR"] = "LOGIN_ERROR";
+    LoginServiceBaseEvent["LOGIN_STARTED"] = "LOGIN_STARTED";
+    LoginServiceBaseEvent["LOGIN_COMPLETE"] = "LOGIN_COMPLETE";
+    LoginServiceBaseEvent["LOGIN_FINISHED"] = "LOGIN_FINISHED";
+    LoginServiceBaseEvent["LOGOUT_STARTED"] = "LOGOUT_STARTED";
+    LoginServiceBaseEvent["LOGOUT_FINISHED"] = "LOGOUT_FINISHED";
+    LoginServiceBaseEvent["REGISTRATION_ERROR"] = "REGISTRATION_ERROR";
+    LoginServiceBaseEvent["REGISTRATION_STARTED"] = "REGISTRATION_STARTED";
+    LoginServiceBaseEvent["REGISTRATION_COMPLETE"] = "REGISTRATION_COMPLETE";
+    LoginServiceBaseEvent["REGISTRATION_FINISHED"] = "REGISTRATION_FINISHED";
+})(LoginServiceBaseEvent || (LoginServiceBaseEvent = {}));
 
 class LoginRequireResolver {
     login;
@@ -3174,13 +3261,13 @@ class LoginRequireResolver {
         }
         let promise = PromiseHandler.create();
         let subscription = this.login.events.subscribe(data => {
-            if (data.type === LoginBaseServiceEvent.LOGIN_ERROR) {
+            if (data.type === LoginServiceBaseEvent.LOGIN_ERROR) {
                 promise.reject(data.error.toString());
             }
-            else if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {
+            else if (data.type === LoginServiceBaseEvent.LOGIN_COMPLETE) {
                 promise.resolve();
             }
-            else if (data.type === LoginBaseServiceEvent.LOGIN_FINISHED) {
+            else if (data.type === LoginServiceBaseEvent.LOGIN_FINISHED) {
                 subscription.unsubscribe();
             }
         });
@@ -3216,7 +3303,7 @@ class LoginGuard extends LoginRequireResolver {
     canActivate(route, state) {
         return this.isLoggedIn() ? true : this.router.parseUrl(LoginGuard.redirectUrl);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginBaseService }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginServiceBase }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginGuard, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginGuard, decorators: [{
@@ -3224,7 +3311,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
-                    args: [LoginBaseService]
+                    args: [LoginServiceBase]
                 }] }, { type: i1$1.Router }] });
 
 class LoginNotGuard extends LoginRequireResolver {
@@ -3252,7 +3339,7 @@ class LoginNotGuard extends LoginRequireResolver {
     canActivate(route, state) {
         return !this.isLoggedIn() ? true : this.router.parseUrl(LoginNotGuard.redirectUrl);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginBaseService }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginServiceBase }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginNotGuard, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginNotGuard, decorators: [{
@@ -3260,9 +3347,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
-                    args: [LoginBaseService]
+                    args: [LoginServiceBase]
                 }] }, { type: i1$1.Router }] });
 
+class LoginResolver extends LoginRequireResolver {
+    // --------------------------------------------------------------------------
+    //
+    // 	Constructor
+    //
+    // --------------------------------------------------------------------------
+    constructor(login) {
+        super(login);
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginResolver, deps: [{ token: LoginServiceBase }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginResolver, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginResolver, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [LoginServiceBase]
+                }] }] });
+
 class LoginIfCanGuard extends LoginGuard {
     router;
     // --------------------------------------------------------------------------
@@ -3301,7 +3408,7 @@ class LoginIfCanGuard extends LoginGuard {
         }
         return super.canActivate(route, state);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginIfCanGuard, deps: [{ token: LoginBaseService }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginIfCanGuard, deps: [{ token: LoginServiceBase }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginIfCanGuard, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginIfCanGuard, decorators: [{
@@ -3309,30 +3416,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
-                    args: [LoginBaseService]
+                    args: [LoginServiceBase]
                 }] }, { type: i1$1.Router }] });
 
-class LoginResolver extends LoginRequireResolver {
-    // --------------------------------------------------------------------------
-    //
-    // 	Constructor
-    //
-    // --------------------------------------------------------------------------
-    constructor(login) {
-        super(login);
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginResolver, deps: [{ token: LoginBaseService }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginResolver, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: LoginResolver, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [LoginBaseService]
-                }] }] });
-
-class ValueStorage extends DestroyableContainer {
+class ValueStorage extends Destroyable {
     storage;
     cookies;
     //--------------------------------------------------------------------------
@@ -4684,7 +4771,7 @@ class QuestionManager extends Destroyable {
     }
 }
 
-class PipeBaseService extends DestroyableContainer {
+class PipeBaseService extends Destroyable {
     language;
     sanitizer;
     // --------------------------------------------------------------------------
@@ -5890,8 +5977,7 @@ class IUser {
     id;
 }
 
-class UserBaseService extends DestroyableContainer {
-    login;
+class UserServiceBase extends Loginable {
     // --------------------------------------------------------------------------
     //
     // 	Properties
@@ -5905,8 +5991,7 @@ class UserBaseService extends DestroyableContainer {
     //
     // --------------------------------------------------------------------------
     constructor(login) {
-        super();
-        this.login = login;
+        super(login);
         this.observer = new Subject();
     }
     // --------------------------------------------------------------------------
@@ -5914,19 +5999,6 @@ class UserBaseService extends DestroyableContainer {
     // 	Protected Methods
     //
     // --------------------------------------------------------------------------
-    initialize() {
-        if (this.login.isLoggedIn) {
-            this.loginedHandler();
-        }
-        this.login.events.pipe(takeUntil(this.destroyed)).subscribe(data => {
-            if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {
-                this.loginedHandler();
-            }
-            else if (data.type === LoginBaseServiceEvent.LOGOUT_FINISHED) {
-                this.logoutedHandler();
-            }
-        });
-    }
     initializeUser(data) {
         this._user = this.createUser(data);
     }
@@ -5935,32 +6007,32 @@ class UserBaseService extends DestroyableContainer {
     }
     loginedHandler() {
         this.initializeUser(this.login.loginData);
-        this.observer.next(new ObservableData(UserBaseServiceEvent.LOGINED, this.user));
+        this.observer.next(new ObservableData(UserServiceBaseEvent.LOGINED, this.user));
     }
     logoutedHandler() {
         this.deinitializeUser();
-        this.observer.next(new ObservableData(UserBaseServiceEvent.LOGOUTED));
+        this.observer.next(new ObservableData(UserServiceBaseEvent.LOGOUTED));
     }
     // --------------------------------------------------------------------------
     //
     // 	Public Methods
     //
     // --------------------------------------------------------------------------
-    isUser(value) {
-        if (_.isNil(value) || _.isNil(this.user)) {
+    isUser(item) {
+        if (!this.has || _.isNil(item)) {
             return false;
         }
-        if (_.isString(value) || _.isNumber(value)) {
-            return value === this.user.id;
+        if (_.isString(item) || _.isNumber(item)) {
+            return item === this.user.id;
         }
-        return value.id === this.user.id;
+        return item.id === this.user.id;
     }
-    userUpdate(data) {
-        if (!this.hasUser) {
+    update(data) {
+        if (!this.has) {
             return;
         }
         this.user.update(data);
-        this.observer.next(new ObservableData(UserBaseServiceEvent.CHANGED, data));
+        this.observer.next(new ObservableData(UserServiceBaseEvent.CHANGED, data));
     }
     destroy() {
         if (this.isDestroyed) {
@@ -5971,43 +6043,44 @@ class UserBaseService extends DestroyableContainer {
             this.observer.complete();
             this.observer = null;
         }
+        this._user = null;
     }
     // --------------------------------------------------------------------------
     //
     // 	Public Properties
     //
     // --------------------------------------------------------------------------
+    get id() {
+        return this.has ? this.user.id : null;
+    }
+    get has() {
+        return !_.isNil(this._user);
+    }
+    get user() {
+        return this._user;
+    }
+    get isLogined() {
+        return this.has;
+    }
     get events() {
         return this.observer.asObservable();
     }
     get logined() {
-        return this.events.pipe(filter(item => item.type === UserBaseServiceEvent.LOGINED), map(item => item.data));
+        return this.events.pipe(filter(item => item.type === UserServiceBaseEvent.LOGINED), map(item => item.data));
     }
     get changed() {
-        return this.events.pipe(filter(item => item.type === UserBaseServiceEvent.CHANGED), map(item => item.data));
+        return this.events.pipe(filter(item => item.type === UserServiceBaseEvent.CHANGED), map(item => item.data));
     }
     get logouted() {
-        return this.events.pipe(filter(item => item.type === UserBaseServiceEvent.LOGOUTED), map(() => null));
-    }
-    get hasUser() {
-        return !_.isNil(this._user);
-    }
-    get isLogined() {
-        return this.hasUser;
-    }
-    get user() {
-        return this._user;
-    }
-    get id() {
-        return this.hasUser ? this.user.id : null;
+        return this.events.pipe(filter(item => item.type === UserServiceBaseEvent.LOGOUTED), map(() => null));
     }
 }
-var UserBaseServiceEvent;
-(function (UserBaseServiceEvent) {
-    UserBaseServiceEvent["LOGINED"] = "LOGINED";
-    UserBaseServiceEvent["CHANGED"] = "CHANGED";
-    UserBaseServiceEvent["LOGOUTED"] = "LOGOUTED";
-})(UserBaseServiceEvent || (UserBaseServiceEvent = {}));
+var UserServiceBaseEvent;
+(function (UserServiceBaseEvent) {
+    UserServiceBaseEvent["LOGINED"] = "LOGINED";
+    UserServiceBaseEvent["CHANGED"] = "CHANGED";
+    UserServiceBaseEvent["LOGOUTED"] = "LOGOUTED";
+})(UserServiceBaseEvent || (UserServiceBaseEvent = {}));
 
 class IWindow extends Destroyable {
     // --------------------------------------------------------------------------
@@ -6791,7 +6864,7 @@ var NotificationServiceEvent;
 class BottomSheetService extends Destroyable {
 }
 
-class LocalStorageService extends DestroyableContainer {
+class LocalStorageService extends Destroyable {
     //--------------------------------------------------------------------------
     //
     // 	Properties
@@ -7311,5 +7384,5 @@ const VI_ANGULAR_OPTIONS = new InjectionToken(`VI_ANGULAR_OPTIONS`);
  * Generated bundle index. Do not edit.
  */
 
-export { APPLICATION_INJECTOR, ApplicationBaseComponent, ApplicationComponent, AspectRatioResizeDirective, AssetBackgroundDirective, AssetBackgroundPipe, AssetFilePipe, AssetIconPipe, AssetImagePipe, AssetModule, AssetSoundPipe, AssetVideoPipe, AutoScrollBottomDirective, BooleanValueStorage, BottomSheetService, COOKIE_OPTIONS, CamelCasePipe, CanDeactivateGuard, ClickToCopyDirective, ClickToSelectDirective, CookieModule, CookieOptions, CookieService, DateValueStorage, Direction, FinancePipe, FocusDirective, FocusManager, HTMLContentTitleDirective, HTMLTitleDirective, INotification, INotificationContent, IUser, IVIOptions, IWindow, IWindowContent, InfiniteScrollDirective, IsBrowserDirective, IsServerDirective, JSONValueStorage, LANGUAGE_OPTIONS, LanguageDirective, LanguageHasDirective, LanguageModule, LanguagePipe, LanguagePipeHas, LanguagePipeHasPure, LanguagePipePure, LanguageRequireResolver, LanguageResolver, LazyModuleLoader, ListItem, ListItems, LocalStorageService, LoginBaseService, LoginBaseServiceEvent, LoginGuard, LoginIfCanGuard, LoginNotGuard, LoginRequireResolver, LoginResolver, LoginTokenStorage, MenuItem, MenuItemBase, MenuItems, MessageBaseComponent, MomentDateAdaptivePipe, MomentDateFromNowPipe, MomentDatePipe, MomentTimePipe, NavigationMenuItem, NgModelErrorPipe, NotificationConfig, NotificationEvent, NotificationService, NotificationServiceEvent, PipeBaseService, PlatformService, PrettifyPipe, QuestionEvent, QuestionManager, QuestionMode, ResizeDirective, ResizeManager, RouterBaseService, RouterSelectListItems, SanitizePipe, ScrollCheckDirective, ScrollDirective, SelectListItem, SelectListItems, SelectOnFocusDirective, ServiceWorkerService, StartCasePipe, StructureDirective, THEME_OPTIONS, ThemeAssetBackgroundDirective, ThemeAssetDirective, ThemeAssetIconDirective, ThemeAssetImageDirective, ThemeModule, ThemeStyleDirective, ThemeStyleHoverDirective, ThemeToggleDirective, TimePipe, TransportLazy, TransportLazyModule, TransportLazyModuleLoadedEvent, TruncatePipe, UserBaseService, UserBaseServiceEvent, VIModule, VI_ANGULAR_OPTIONS, ValueStorage, ViewUtil, WINDOW_CONTENT_CONTAINER, WindowAlign, WindowBase, WindowClosedError, WindowConfig, WindowEvent, WindowService, WindowServiceEvent, cookieServiceFactory, initializerFactory, languageServiceFactory, localStorageServiceFactory, loggerServiceFactory, loginTokenStorageServiceFactory, nativeWindowServiceFactory, themeAssetServiceFactory, themeServiceFactory };
+export { APPLICATION_INJECTOR, ApplicationBaseComponent, ApplicationComponent, AspectRatioResizeDirective, AssetBackgroundDirective, AssetBackgroundPipe, AssetFilePipe, AssetIconPipe, AssetImagePipe, AssetModule, AssetSoundPipe, AssetVideoPipe, AutoScrollBottomDirective, BooleanValueStorage, BottomSheetService, COOKIE_OPTIONS, CamelCasePipe, CanDeactivateGuard, ClickToCopyDirective, ClickToSelectDirective, CookieModule, CookieOptions, CookieService, DateValueStorage, Direction, FinancePipe, FocusDirective, FocusManager, HTMLContentTitleDirective, HTMLTitleDirective, INotification, INotificationContent, IUser, IVIOptions, IWindow, IWindowContent, InfiniteScrollDirective, IsBrowserDirective, IsServerDirective, JSONValueStorage, LANGUAGE_OPTIONS, LanguageDirective, LanguageHasDirective, LanguageModule, LanguagePipe, LanguagePipeHas, LanguagePipeHasPure, LanguagePipePure, LanguageRequireResolver, LanguageResolver, LanguageToggleDirective, LazyModuleLoader, ListItem, ListItems, LocalStorageService, LoginGuard, LoginIfCanGuard, LoginNotGuard, LoginRequireResolver, LoginResolver, LoginServiceBase, LoginServiceBaseEvent, LoginTokenStorage, Loginable, MenuItem, MenuItemBase, MenuItems, MessageBaseComponent, MomentDateAdaptivePipe, MomentDateFromNowPipe, MomentDatePipe, MomentTimePipe, NavigationMenuItem, NgModelErrorPipe, NotificationConfig, NotificationEvent, NotificationService, NotificationServiceEvent, PipeBaseService, PlatformService, PrettifyPipe, QuestionEvent, QuestionManager, QuestionMode, ResizeDirective, ResizeManager, RouterBaseService, RouterSelectListItems, SanitizePipe, ScrollCheckDirective, ScrollDirective, SelectListItem, SelectListItems, SelectOnFocusDirective, ServiceWorkerService, StartCasePipe, StructureDirective, THEME_OPTIONS, ThemeAssetBackgroundDirective, ThemeAssetDirective, ThemeAssetIconDirective, ThemeAssetImageDirective, ThemeModule, ThemeStyleDirective, ThemeStyleHoverDirective, ThemeToggleDirective, TimePipe, TransportLazy, TransportLazyModule, TransportLazyModuleLoadedEvent, TruncatePipe, UserServiceBase, UserServiceBaseEvent, VIModule, VI_ANGULAR_OPTIONS, ValueStorage, ViewUtil, WINDOW_CONTENT_CONTAINER, WindowAlign, WindowBase, WindowClosedError, WindowConfig, WindowEvent, WindowService, WindowServiceEvent, cookieServiceFactory, initializerFactory, languageServiceFactory, localStorageServiceFactory, loggerServiceFactory, loginTokenStorageServiceFactory, nativeWindowServiceFactory, themeAssetServiceFactory, themeServiceFactory };
 //# sourceMappingURL=ts-core-angular.mjs.map