@ts-core/angular 11.0.82 → 11.0.83

package/esm2015/service/RouterBaseService.js

@@ -30,6 +30,7 @@ export class RouterBaseService extends Loadable {
     initializeObservers() {
         this.router.events.pipe(takeUntil(this.destroyed)).subscribe(event => {
             if (event instanceof NavigationStart) {
+                this._previousUrl = this.url;
                 this.status = LoadableStatus.LOADING;
             }
             else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {
@@ -71,7 +72,7 @@ export class RouterBaseService extends Loadable {
                     this.isNeedUpdateExtras = false;
                     this.applyExtras(this.extrasToApply);
                 }
-                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, lastUrl: this.lastUrl }));
+                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, previousUrl: this.previousUrl }));
                 break;
         }
         if (newStatus === LoadableStatus.LOADED || newStatus === LoadableStatus.ERROR) {
@@ -200,17 +201,23 @@ export class RouterBaseService extends Loadable {
     get url() {
         return this.router.url;
     }
-    get lastUrl() {
-        return this._lastUrl;
-    }
     get urlTree() {
         return this.router.parseUrl(this.url);
     }
+    get lastUrl() {
+        return this._lastUrl;
+    }
     get lastUrlTree() {
         return this.router.parseUrl(this.lastUrl);
     }
+    get previousUrl() {
+        return this._previousUrl;
+    }
+    get previousUrlTree() {
+        return this.router.parseUrl(this.previousUrl);
+    }
     get router() {
         return this._router;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RouterBaseService.js","sourceRoot":"","sources":["../../../src/service/RouterBaseService.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    ActivatedRoute,\n    ActivatedRouteSnapshot,\n    NavigationCancel,\n    NavigationEnd,\n    NavigationError,\n    NavigationExtras,\n    NavigationStart,\n    Router,\n    UrlTree\n} from '@angular/router';\nimport { Loadable, LoadableEvent, LoadableStatus } from '@ts-core/common';\nimport { ObservableData } from '@ts-core/common/observer';\nimport { NativeWindowService } from '@ts-core/frontend/service/NativeWindowService';\nimport * as _ from 'lodash';\nimport { Subject } from 'rxjs';\nimport { takeUntil } from 'rxjs/operators';\n\nexport class RouterBaseService extends Loadable<void, RouterBaseServiceEventData> {\n    // --------------------------------------------------------------------------\n    //\n    // \tProperties\n    //\n    // --------------------------------------------------------------------------\n\n    protected params: Map<string, string>;\n\n    protected extrasToApply: NavigationExtras;\n    protected isNeedUpdateExtras: boolean = false;\n\n    protected _lastUrl: string;\n\n    // --------------------------------------------------------------------------\n    //\n    // \tConstructor\n    //\n    // --------------------------------------------------------------------------\n\n    constructor(protected _router: Router, protected window: NativeWindowService) {\n        super();\n        this.params = new Map();\n        this.observer = new Subject();\n\n        this._lastUrl = this.url;\n        this.window.getParams().forEach((value, key) => this.params.set(key, value));\n        this.initializeObservers();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPrivate Methods\n    //\n    // --------------------------------------------------------------------------\n\n    protected initializeObservers(): void {\n        this.router.events.pipe(takeUntil(this.destroyed)).subscribe(event => {\n            if (event instanceof NavigationStart) {\n                this.status = LoadableStatus.LOADING;\n            } else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {\n                if (event instanceof NavigationEnd) {\n                    this._lastUrl = event.url;\n                }\n                this.status = LoadableStatus.LOADED;\n            }\n        });\n    }\n\n    protected async applyExtras(extras?: NavigationExtras): Promise<boolean> {\n        let params = {} as NavigationExtras;\n        params.queryParams = this.getQueryParams();\n\n        if (!_.isNil(extras)) {\n            Object.assign(params, extras);\n        }\n\n        if (!this.isLoading) {\n            return this.router.navigate([], params);\n        }\n        this.extrasToApply = extras;\n        this.isNeedUpdateExtras = true;\n        return false;\n    }\n\n    protected getQueryParams(): any {\n        let params = {} as any;\n        this.params.forEach((value, key) => (params[key] = value));\n        return params;\n    }\n\n    protected commitStatusChangedProperties(oldStatus: LoadableStatus, newStatus: LoadableStatus): void {\n        super.commitStatusChangedProperties(oldStatus, newStatus);\n\n        switch (newStatus) {\n            case LoadableStatus.LOADING:\n                this.observer.next(new ObservableData(LoadableEvent.STARTED));\n                break;\n            case LoadableStatus.LOADED:\n                if (this.isNeedUpdateExtras) {\n                    this.isNeedUpdateExtras = false;\n                    this.applyExtras(this.extrasToApply);\n                }\n                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, lastUrl: this.lastUrl }));\n                break;\n        }\n\n        if (newStatus === LoadableStatus.LOADED || newStatus === LoadableStatus.ERROR) {\n            this.observer.next(new ObservableData(LoadableEvent.FINISHED));\n        }\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tNavigate Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public async navigate(url: string, extras?: NavigationExtras, isClearParams?: boolean): Promise<boolean> {\n        if (isClearParams) {\n            this.params.clear();\n        }\n\n        let params = {} as NavigationExtras;\n        params.queryParams = this.getQueryParams();\n        if (!_.isNil(extras)) {\n            Object.assign(params, extras);\n        }\n        return this.router.navigateByUrl(url, params);\n    }\n\n    public navigateToExternalUrl(url: string, target: string = '_blank'): void {\n        this.window.open(url, target);\n    }\n\n    public navigateToLast(extras?: NavigationExtras): Promise<boolean> {\n        return this.navigate(this.lastUrl, extras);\n    }\n\n    public async navigateIfNotLoading(url: string, extras?: NavigationExtras): Promise<boolean> {\n        return !this.isLoading ? this.navigate(url, extras) : false;\n    }\n\n    public reload(): void {\n        location.reload();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public isUrlActive(item: string | UrlTree, isExact: boolean = false): boolean {\n        if (isExact) {\n            return this.router.isActive(item, isExact);\n        }\n        if (_.isString(item)) {\n            item = this.router.parseUrl(item);\n        }\n\n        let current = this.router.parseUrl(this.urlTree.toString());\n        item.fragment = current.fragment = null;\n        item.queryParams = current.queryParams = {};\n        return item.toString() === current.toString();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Param Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public getParams<T = any>(): T {\n        let params = {} as any;\n        this.params.forEach((value, key) => (params[key] = value));\n        return params;\n    }\n\n    public hasParam(name: string): boolean {\n        return this.params.has(name);\n    }\n\n    public getParam<T = string>(name: string, defaultValue?: T): T {\n        return this.hasParam(name) ? (this.params.get(name) as any) : defaultValue;\n    }\n\n    public setParam(name: string, value: any, extras?: NavigationExtras): void {\n        if (!_.isNil(value)) {\n            value = value.toString().trim();\n            if (_.isEmpty(value)) {\n                value = null;\n            }\n        }\n        if (!_.isNil(value)) {\n            this.params.set(name, value);\n        } else {\n            this.params.delete(name);\n        }\n        if (!_.isNil(extras)) {\n            extras = { replaceUrl: true };\n        }\n        this.applyExtras(extras);\n    }\n\n    public removeParam(name: string, extras?: NavigationExtras): void {\n        if (this.hasParam(name)) {\n            this.setParam(name, null, extras);\n        }\n    }\n\n    public clearParams(extras?: NavigationExtras): void {\n        this.params.clear();\n        if (!_.isNil(extras)) {\n            extras = { replaceUrl: true };\n        }\n        this.applyExtras(extras);\n    }\n\n    public get hasParams(): boolean {\n        return this.params.size > 0;\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tFragment Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public getFragment(snapshot: ActivatedRoute | ActivatedRouteSnapshot, defaultValue?: string): string {\n        if (snapshot instanceof ActivatedRoute) {\n            snapshot = snapshot.snapshot;\n        }\n        return !_.isNil(snapshot.fragment) ? snapshot.fragment : defaultValue;\n    }\n\n    public async setFragment(value: string): Promise<boolean> {\n        return this.applyExtras({ fragment: value });\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Url Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public get url(): string {\n        return this.router.url;\n    }\n\n    public get lastUrl(): string {\n        return this._lastUrl;\n    }\n\n    public get urlTree(): UrlTree {\n        return this.router.parseUrl(this.url);\n    }\n\n    public get lastUrlTree(): UrlTree {\n        return this.router.parseUrl(this.lastUrl);\n    }\n\n    public get router(): Router {\n        return this._router;\n    }\n}\n\nexport interface RouterBaseServiceEventData {\n    url: string;\n    lastUrl: string;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RouterBaseService.js","sourceRoot":"","sources":["../../../src/service/RouterBaseService.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    ActivatedRoute,\n    ActivatedRouteSnapshot,\n    NavigationCancel,\n    NavigationEnd,\n    NavigationError,\n    NavigationExtras,\n    NavigationStart,\n    Router,\n    UrlTree\n} from '@angular/router';\nimport { Loadable, LoadableEvent, LoadableStatus } from '@ts-core/common';\nimport { ObservableData } from '@ts-core/common/observer';\nimport { NativeWindowService } from '@ts-core/frontend/service/NativeWindowService';\nimport * as _ from 'lodash';\nimport { Subject } from 'rxjs';\nimport { takeUntil } from 'rxjs/operators';\n\nexport class RouterBaseService extends Loadable<void, RouterBaseServiceEventData> {\n    // --------------------------------------------------------------------------\n    //\n    // \tProperties\n    //\n    // --------------------------------------------------------------------------\n\n    protected params: Map<string, string>;\n\n    protected extrasToApply: NavigationExtras;\n    protected isNeedUpdateExtras: boolean = false;\n\n    protected _lastUrl: string;\n    protected _previousUrl: string;\n\n    // --------------------------------------------------------------------------\n    //\n    // \tConstructor\n    //\n    // --------------------------------------------------------------------------\n\n    constructor(protected _router: Router, protected window: NativeWindowService) {\n        super();\n        this.params = new Map();\n        this.observer = new Subject();\n\n        this._lastUrl = this.url;\n        this.window.getParams().forEach((value, key) => this.params.set(key, value));\n        this.initializeObservers();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPrivate Methods\n    //\n    // --------------------------------------------------------------------------\n\n    protected initializeObservers(): void {\n        this.router.events.pipe(takeUntil(this.destroyed)).subscribe(event => {\n            if (event instanceof NavigationStart) {\n                this._previousUrl = this.url;\n                this.status = LoadableStatus.LOADING;\n            } else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {\n                if (event instanceof NavigationEnd) {\n                    this._lastUrl = event.url;\n                }\n                this.status = LoadableStatus.LOADED;\n            }\n        });\n    }\n\n    protected async applyExtras(extras?: NavigationExtras): Promise<boolean> {\n        let params = {} as NavigationExtras;\n        params.queryParams = this.getQueryParams();\n\n        if (!_.isNil(extras)) {\n            Object.assign(params, extras);\n        }\n\n        if (!this.isLoading) {\n            return this.router.navigate([], params);\n        }\n        this.extrasToApply = extras;\n        this.isNeedUpdateExtras = true;\n        return false;\n    }\n\n    protected getQueryParams(): any {\n        let params = {} as any;\n        this.params.forEach((value, key) => (params[key] = value));\n        return params;\n    }\n\n    protected commitStatusChangedProperties(oldStatus: LoadableStatus, newStatus: LoadableStatus): void {\n        super.commitStatusChangedProperties(oldStatus, newStatus);\n\n        switch (newStatus) {\n            case LoadableStatus.LOADING:\n                this.observer.next(new ObservableData(LoadableEvent.STARTED));\n                break;\n            case LoadableStatus.LOADED:\n                if (this.isNeedUpdateExtras) {\n                    this.isNeedUpdateExtras = false;\n                    this.applyExtras(this.extrasToApply);\n                }\n                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, previousUrl: this.previousUrl }));\n                break;\n        }\n\n        if (newStatus === LoadableStatus.LOADED || newStatus === LoadableStatus.ERROR) {\n            this.observer.next(new ObservableData(LoadableEvent.FINISHED));\n        }\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tNavigate Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public async navigate(url: string, extras?: NavigationExtras, isClearParams?: boolean): Promise<boolean> {\n        if (isClearParams) {\n            this.params.clear();\n        }\n\n        let params = {} as NavigationExtras;\n        params.queryParams = this.getQueryParams();\n        if (!_.isNil(extras)) {\n            Object.assign(params, extras);\n        }\n        return this.router.navigateByUrl(url, params);\n    }\n\n    public navigateToExternalUrl(url: string, target: string = '_blank'): void {\n        this.window.open(url, target);\n    }\n\n    public navigateToLast(extras?: NavigationExtras): Promise<boolean> {\n        return this.navigate(this.lastUrl, extras);\n    }\n\n    public async navigateIfNotLoading(url: string, extras?: NavigationExtras): Promise<boolean> {\n        return !this.isLoading ? this.navigate(url, extras) : false;\n    }\n\n    public reload(): void {\n        location.reload();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public isUrlActive(item: string | UrlTree, isExact: boolean = false): boolean {\n        if (isExact) {\n            return this.router.isActive(item, isExact);\n        }\n        if (_.isString(item)) {\n            item = this.router.parseUrl(item);\n        }\n\n        let current = this.router.parseUrl(this.urlTree.toString());\n        item.fragment = current.fragment = null;\n        item.queryParams = current.queryParams = {};\n        return item.toString() === current.toString();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Param Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public getParams<T = any>(): T {\n        let params = {} as any;\n        this.params.forEach((value, key) => (params[key] = value));\n        return params;\n    }\n\n    public hasParam(name: string): boolean {\n        return this.params.has(name);\n    }\n\n    public getParam<T = string>(name: string, defaultValue?: T): T {\n        return this.hasParam(name) ? (this.params.get(name) as any) : defaultValue;\n    }\n\n    public setParam(name: string, value: any, extras?: NavigationExtras): void {\n        if (!_.isNil(value)) {\n            value = value.toString().trim();\n            if (_.isEmpty(value)) {\n                value = null;\n            }\n        }\n        if (!_.isNil(value)) {\n            this.params.set(name, value);\n        } else {\n            this.params.delete(name);\n        }\n        if (!_.isNil(extras)) {\n            extras = { replaceUrl: true };\n        }\n        this.applyExtras(extras);\n    }\n\n    public removeParam(name: string, extras?: NavigationExtras): void {\n        if (this.hasParam(name)) {\n            this.setParam(name, null, extras);\n        }\n    }\n\n    public clearParams(extras?: NavigationExtras): void {\n        this.params.clear();\n        if (!_.isNil(extras)) {\n            extras = { replaceUrl: true };\n        }\n        this.applyExtras(extras);\n    }\n\n    public get hasParams(): boolean {\n        return this.params.size > 0;\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tFragment Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public getFragment(snapshot: ActivatedRoute | ActivatedRouteSnapshot, defaultValue?: string): string {\n        if (snapshot instanceof ActivatedRoute) {\n            snapshot = snapshot.snapshot;\n        }\n        return !_.isNil(snapshot.fragment) ? snapshot.fragment : defaultValue;\n    }\n\n    public async setFragment(value: string): Promise<boolean> {\n        return this.applyExtras({ fragment: value });\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Url Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public get url(): string {\n        return this.router.url;\n    }\n    public get urlTree(): UrlTree {\n        return this.router.parseUrl(this.url);\n    }\n\n    public get lastUrl(): string {\n        return this._lastUrl;\n    }\n    public get lastUrlTree(): UrlTree {\n        return this.router.parseUrl(this.lastUrl);\n    }\n\n    public get previousUrl(): string {\n        return this._previousUrl;\n    }\n    public get previousUrlTree(): UrlTree {\n        return this.router.parseUrl(this.previousUrl);\n    }\n\n    public get router(): Router {\n        return this._router;\n    }\n}\n\nexport interface RouterBaseServiceEventData {\n    url: string;\n    previousUrl: string;\n}\n"]}

package/fesm2015/ts-core-angular.js

@@ -8815,6 +8815,7 @@ class RouterBaseService extends Loadable {
     initializeObservers() {
         this.router.events.pipe(takeUntil(this.destroyed)).subscribe(event => {
             if (event instanceof NavigationStart) {
+                this._previousUrl = this.url;
                 this.status = LoadableStatus.LOADING;
             }
             else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {
@@ -8856,7 +8857,7 @@ class RouterBaseService extends Loadable {
                     this.isNeedUpdateExtras = false;
                     this.applyExtras(this.extrasToApply);
                 }
-                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, lastUrl: this.lastUrl }));
+                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, previousUrl: this.previousUrl }));
                 break;
         }
         if (newStatus === LoadableStatus.LOADED || newStatus === LoadableStatus.ERROR) {
@@ -8985,15 +8986,21 @@ class RouterBaseService extends Loadable {
     get url() {
         return this.router.url;
     }
-    get lastUrl() {
-        return this._lastUrl;
-    }
     get urlTree() {
         return this.router.parseUrl(this.url);
     }
+    get lastUrl() {
+        return this._lastUrl;
+    }
     get lastUrlTree() {
         return this.router.parseUrl(this.lastUrl);
     }
+    get previousUrl() {
+        return this._previousUrl;
+    }
+    get previousUrlTree() {
+        return this.router.parseUrl(this.previousUrl);
+    }
     get router() {
         return this._router;
     }