@ts-core/angular 13.0.17 → 13.0.20

package/login/LoginBaseService.d.ts

@@ -22,7 +22,7 @@ export declare abstract class LoginBaseService<E = any, U = any, V = any> extend
     protected parseLoginSidErrorResponse(error: ExtendedError): void;
     abstract login(param: any): void;
     loginByResponse(param: U): Promise<void>;
-    tryLoginBySid(): boolean;
+    loginBySidIfCan(): boolean;
     logout(): Promise<void>;
     isCanLoginWithSid(): boolean;
     destroy(): void;

package/login/LoginGuard.d.ts

@@ -1,13 +1,13 @@
-import { CanActivate, Router, UrlTree } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { LoginBaseService } from './LoginBaseService';
 import { LoginRequireResolver } from './LoginRequireResolver';
 import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
-export declare class LoginGuard extends LoginRequireResolver implements CanActivate {
+export declare class LoginGuard<T extends LoginBaseService = LoginBaseService> extends LoginRequireResolver<T> implements CanActivate {
     protected router: Router;
     static redirectUrl: string;
-    constructor(login: LoginBaseService, router: Router);
-    canActivate(): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginGuard, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginGuard>;
+    constructor(login: T, router: Router);
+    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginGuard<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginGuard<any>>;
 }

package/login/LoginIfCanGuard.d.ts

@@ -0,0 +1,12 @@
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { LoginBaseService } from './LoginBaseService';
+import { LoginGuard } from './LoginGuard';
+import * as i0 from "@angular/core";
+export declare class LoginIfCanGuard<T extends LoginBaseService = LoginBaseService> extends LoginGuard<T> {
+    protected router: Router;
+    constructor(login: T, router: Router);
+    protected loginIfCan(): Promise<void>;
+    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginIfCanGuard<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginIfCanGuard<any>>;
+}

package/login/LoginNotGuard.d.ts

@@ -1,13 +1,13 @@
-import { CanActivate, Router, UrlTree } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { LoginBaseService } from './LoginBaseService';
 import { LoginRequireResolver } from './LoginRequireResolver';
 import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
-export declare class LoginNotGuard extends LoginRequireResolver implements CanActivate {
+export declare class LoginNotGuard<T extends LoginBaseService = LoginBaseService> extends LoginRequireResolver<T> implements CanActivate {
     protected router: Router;
     static redirectUrl: string;
-    constructor(login: LoginBaseService, router: Router);
-    canActivate(): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginNotGuard, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginNotGuard>;
+    constructor(login: T, router: Router);
+    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginNotGuard<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginNotGuard<any>>;
 }

package/login/LoginRequireResolver.d.ts

@@ -1,8 +1,8 @@
 import { Resolve } from '@angular/router';
 import { LoginBaseService } from './LoginBaseService';
-export declare class LoginRequireResolver<E = any, U = any, V = any> implements Resolve<V> {
-    protected login: LoginBaseService<E, U, V>;
-    constructor(login: LoginBaseService<E, U, V>);
-    resolve(): Promise<V>;
+export declare class LoginRequireResolver<T extends LoginBaseService = LoginBaseService> implements Resolve<void> {
+    protected login: T;
+    constructor(login: T);
+    resolve(): Promise<void>;
     isLoggedIn(): boolean;
 }

package/login/LoginResolver.d.ts

@@ -1,8 +1,8 @@
 import { LoginBaseService } from './LoginBaseService';
 import { LoginRequireResolver } from './LoginRequireResolver';
 import * as i0 from "@angular/core";
-export declare class LoginResolver extends LoginRequireResolver {
-    constructor(login: LoginBaseService);
-    static ɵfac: i0.ɵɵFactoryDeclaration<LoginResolver, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LoginResolver>;
+export declare class LoginResolver<T extends LoginBaseService> extends LoginRequireResolver<T> {
+    constructor(login: T);
+    static ɵfac: i0.ɵɵFactoryDeclaration<LoginResolver<any>, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LoginResolver<any>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-core/angular",
-  "version": "13.0.17",
+  "version": "13.0.20",
   "description": "Modules for frontend based on angular",
   "main": "public-api.js",
   "author": {

package/public-api.d.ts

@@ -61,6 +61,7 @@ export * from './language/LanguageRequireResolver';
 export * from './language/LanguageDirective';
 export * from './language/LanguageHasDirective';
 export * from './login/LoginGuard';
+export * from './login/LoginIfCanGuard';
 export * from './login/LoginNotGuard';
 export * from './login/LoginResolver';
 export * from './login/LoginBaseService';

package/user/UserBaseService.d.ts

@@ -1,11 +1,12 @@
+import { DestroyableContainer } from '@ts-core/common';
 import { ObservableData } from '@ts-core/common/observer';
 import { Observable, Subject } from 'rxjs';
 import { LoginBaseService } from '../login/LoginBaseService';
 import { IUser, UserUid } from './IUser';
-export declare abstract class UserBaseService<U extends IUser = any, V = void> {
+export declare abstract class UserBaseService<U extends IUser = any, V = void> extends DestroyableContainer {
     protected login: LoginBaseService;
     protected _user: U;
-    protected observer: Subject<ObservableData<V | UserBaseServiceEvent, U>>;
+    protected observer: Subject<ObservableData<V | UserBaseServiceEvent, U | Partial<U>>>;
     constructor(login: LoginBaseService);
     protected initialize(): void;
     protected initializeUser(): void;
@@ -15,9 +16,10 @@ export declare abstract class UserBaseService<U extends IUser = any, V = void> {
     protected abstract createUser(data: any): U;
     isUser(value: Partial<U> | UserUid): boolean;
     userUpdate(data: any): void;
-    get events(): Observable<ObservableData<V | UserBaseServiceEvent, U>>;
+    destroy(): void;
+    get events(): Observable<ObservableData<V | UserBaseServiceEvent, U | Partial<U>>>;
     get logined(): Observable<U>;
-    get changed(): Observable<any>;
+    get changed(): Observable<Partial<U>>;
     get logouted(): Observable<void>;
     get hasUser(): boolean;
     get isLogined(): boolean;

package/window/IWindowContent.d.ts

@@ -28,7 +28,7 @@ export declare abstract class IWindowContent<T = any> extends DestroyableContain
     get window(): IWindow<T>;
     set window(value: IWindow<T>);
     static ɵfac: i0.ɵɵFactoryDeclaration<IWindowContent<any>, [{ optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<IWindowContent<any>, "ng-component", never, {}, {}, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<IWindowContent<any>, "ng-component", never, { "isDisabled": "isDisabled"; "window": "window"; }, {}, never, never>;
 }
 export declare type WindowContentContainer = ElementRef | ViewContainerRef;
 export declare const WINDOW_CONTENT_CONTAINER: InjectionToken<WindowContentContainer>;