@ngrdt/router 0.0.17 → 0.0.19

package/fesm2022/ngrdt-router.mjs

@@ -1,11 +1,12 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, EnvironmentInjector, runInInjectionContext, DestroyRef, Renderer2, ElementRef, Directive, Input, booleanAttribute } from '@angular/core';
-import { defer, of, filter, take } from 'rxjs';
+import { InjectionToken, inject, Injectable, EnvironmentInjector, runInInjectionContext, DestroyRef, Renderer2, ElementRef, Input, Directive, afterNextRender, input, booleanAttribute, effect } from '@angular/core';
+import { defer, of, filter, take, fromEvent } from 'rxjs';
 import { Location, PlatformLocation } from '@angular/common';
 import * as i1 from '@angular/router';
 import { Router, NavigationEnd, RouterModule, RouterLink, GuardsCheckStart } from '@angular/router';
 import { RdtStringUtils } from '@ngrdt/utils';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { RDT_BUTTON_BASE_PROVIDER } from '@ngrdt/button';
 import { RdtComponentGuardStoreService } from '@ngrdt/core';
 
 /**
@@ -176,17 +177,16 @@ class RdtRouterService {
         return currentRoute.parseAbsoluteUrl(url);
     }
     isParentOfCurrentLocation(route) {
-        console.log(this.parseAbsoluteUrl());
         return true;
     }
     removeQueryParams(...paramNames) {
         const regex = new RegExp(`[?&](${paramNames.join('|')})=[^&]*`, 'g');
         return history.replaceState(history.state, '', location.pathname + location.search.replace(regex, '').replace(/^&/, '?'));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtRouterService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtRouterService, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtRouterService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtRouterService, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtRouterService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtRouterService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -218,18 +218,37 @@ class RdtAngularRoute {
         this.providers.push(...providers);
         return this;
     }
+    withModule(callback) {
+        this.loadChildren = callback;
+        return this;
+    }
+    /**
+     * @deprecated Use withModule() instead.
+     */
     setModule(callback) {
         this.loadChildren = callback;
         return this;
     }
-    setComponent(comp) {
+    withComponent(comp) {
         this.component = comp;
         return this;
     }
-    setChildren(...routes) {
+    /**
+     * @deprecated Use withComponent() instead.
+     */
+    setComponent(comp) {
+        return this.withComponent(comp);
+    }
+    withChildren(...routes) {
         this.children = routes;
         return this;
     }
+    /**
+     * @deprecated Use withChildren() instead.
+     */
+    setChildren(...routes) {
+        return this.withChildren(...routes);
+    }
     addResolve(paramName, resolver) {
         this.resolvers[paramName] = resolver;
         return this;
@@ -246,10 +265,16 @@ class RdtAngularRoute {
         this.canActivateChild.push(...fns);
         return this;
     }
-    setRunGuardsAndResolvers(value) {
+    withRunGuardsAndResolvers(value) {
         this.runGuardsAndResolvers = value;
         return this;
     }
+    /**
+     * @deprecated Use withRunGuardsAndResolvers() instead.
+     */
+    setRunGuardsAndResolvers(value) {
+        return this.withRunGuardsAndResolvers(value);
+    }
     build() {
         this.checkChildrenMatch();
         let res = {
@@ -605,7 +630,11 @@ class RdtRoute {
             }
         });
         paramNames.forEach((param) => {
-            path = path.replace(`:${param}`, `${extendedParamMap[param]}`);
+            if (!(param in extendedParamMap)) {
+                throw new Error(`Param ${param} is missing for route ${this.absolutePath}. Please pass object with required parameters.`);
+            }
+            const value = extendedParamMap[param];
+            path = path.replace(`:${param}`, `${value}`);
         });
         return path;
     }
@@ -702,25 +731,37 @@ class RdtRouteBuilder extends RdtRoute {
      * you can inject global services, tokens, etc.
      * @param fn
      */
-    setCanBeEntered(fn) {
+    withCanBeEntered(fn) {
         this._canBeEntered = fn;
         return this;
     }
+    /**
+     * @deprecated Use withCanBeEntered() instead.
+     */
+    setCanBeEntered(fn) {
+        return this.withCanBeEntered(fn);
+    }
     /**
      * Entry disabled route will generate disabled breadcrumb.
      * It should not have any component nor module added to it.
      * @param value
      * @returns
      */
-    setEntryDisabled(value = true) {
+    withEntryDisabled(value = true) {
         this._entryDisabled = value;
         return this;
     }
+    /**
+     * @deprecated Use withEntryDisabled() instead.
+     */
+    setEntryDisabled(value = true) {
+        return this.withEntryDisabled(value);
+    }
     /**
      * Sets path relative to parent. It is defined the same way as Angular route path including parameters.
      * You need to call setParam() for each parameter you use in the path.
      */
-    setPath(path) {
+    withPath(path) {
         this._path = path;
         const s = path.split('/');
         const params = [];
@@ -738,40 +779,70 @@ class RdtRouteBuilder extends RdtRoute {
         this.orderedParams = params;
         return this;
     }
+    /**
+     * @deprecated Use withPath() instead.
+     */
+    setPath(path) {
+        return this.withPath(path);
+    }
     /**
      * Sets Angular route data.
      * @param data Angular route data object. Breadcrumb key is merged into it.
      */
-    setData(data) {
+    withData(data) {
         this._data = data;
         return this;
     }
+    /**
+     * @deprecated Use withData() instead.
+     */
+    setData(data) {
+        return this.withData(data);
+    }
     /**
      * Defines parameter type and lets framework parse it.
      * @param paramName
      * @param type
      */
-    setParam(paramName, type) {
+    withParam(paramName, type) {
         this._paramMap[paramName] = type;
         return this;
     }
+    /**
+     * @deprecated Use withParam() instead.
+     */
+    setParam(paramName, type) {
+        return this.withParam(paramName, type);
+    }
     /**
      * Sets name to display in breadcrumb, etc.
      */
-    setName(name) {
+    withName(name) {
         this._name = name;
         return this;
     }
+    /**
+     * @deprecated Use withName() instead.
+     */
+    setName(name) {
+        return this.withName(name);
+    }
     /**
      * Call .build() on children before you call this method!
      */
-    setChildren(...children) {
+    withChildren(...children) {
         this._children = children;
         for (const child of children) {
             child._parent = this;
         }
         return this;
     }
+    /**
+     * @deprecated Use withChildren() instead.
+     */
+    setChildren(...children) {
+        return this.withChildren(...children);
+    }
     build() {
         if (typeof this._path !== 'string') {
             throw new Error('Please provide path for route. Empty string is acceptable.');
@@ -903,10 +974,10 @@ class RdtAnyRouteActiveDirective {
             return input;
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtAnyRouteActiveDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.7", type: RdtAnyRouteActiveDirective, isStandalone: true, selector: "[rdtAnyRouteActive]", inputs: { anyRouteActive: ["rdtAnyRouteActive", "anyRouteActive"], watchedRoutes: "watchedRoutes", anyRouteActiveOptions: "anyRouteActiveOptions", ariaCurrentWhenActive: "ariaCurrentWhenActive" }, providers: [RouterModule], usesOnChanges: true, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtAnyRouteActiveDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.1.7", type: RdtAnyRouteActiveDirective, isStandalone: true, selector: "[rdtAnyRouteActive]", inputs: { anyRouteActive: ["rdtAnyRouteActive", "anyRouteActive"], watchedRoutes: "watchedRoutes", anyRouteActiveOptions: "anyRouteActiveOptions", ariaCurrentWhenActive: "ariaCurrentWhenActive" }, providers: [RouterModule], usesOnChanges: true, ngImport: i0 });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtAnyRouteActiveDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtAnyRouteActiveDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[rdtAnyRouteActive]',
@@ -925,43 +996,147 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
                 type: Input
             }] } });
 
+class RdtBackLinkDirective {
+    destroyRef = inject(DestroyRef);
+    location = inject(Location);
+    elRef = inject((ElementRef));
+    buttonClass = inject(RDT_BUTTON_BASE_PROVIDER);
+    buttonRef = inject(this.buttonClass, {
+        optional: true,
+        host: true,
+    });
+    constructor() {
+        afterNextRender(() => {
+            if (this.buttonRef) {
+                this.buttonRef.click$
+                    .pipe(takeUntilDestroyed(this.destroyRef))
+                    .subscribe(() => this.location.back());
+            }
+            else {
+                fromEvent(this.elRef.nativeElement, 'click')
+                    .pipe(takeUntilDestroyed(this.destroyRef))
+                    .subscribe(() => this.location.back());
+            }
+        });
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtBackLinkDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.1.7", type: RdtBackLinkDirective, isStandalone: true, selector: "[rdtBackLink]", ngImport: i0 });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtBackLinkDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[rdtBackLink]',
+                }]
+        }], ctorParameters: () => [] });
+
+const PERMISSION_DISABLED_KEY = Symbol();
 class RdtRouterLinkDirective {
+    buttonClass = inject(RDT_BUTTON_BASE_PROVIDER);
+    buttonRef = inject(this.buttonClass, {
+        host: true,
+        optional: true,
+    });
     routerLinkRef = inject(RouterLink, { self: true });
     envInjector = inject(EnvironmentInjector);
-    route;
-    target = '_self';
-    params;
-    queryParams;
-    stateParams;
-    disabled = false;
-    ngOnInit() {
-        this.update();
+    route = input.required(...(ngDevMode ? [{ debugName: "route", alias: 'rdtRouterLink' }] : [{ alias: 'rdtRouterLink' }]));
+    target = input('_self', ...(ngDevMode ? [{ debugName: "target" }] : []));
+    params = input(...(ngDevMode ? [undefined, { debugName: "params" }] : []));
+    queryParams = input(...(ngDevMode ? [undefined, { debugName: "queryParams" }] : []));
+    stateParams = input(...(ngDevMode ? [undefined, { debugName: "stateParams" }] : []));
+    disabled = input(false, ...(ngDevMode ? [{ debugName: "disabled", alias: 'rdtDisabled',
+            transform: booleanAttribute }] : [{
+            alias: 'rdtDisabled',
+            transform: booleanAttribute,
+        }]));
+    updateEffect = effect(() => {
+        if (this.buttonRef) {
+            this.updateButton();
+        }
+        else {
+            this.updateRouterLink();
+        }
+    }, ...(ngDevMode ? [{ debugName: "updateEffect" }] : []));
+    updateButton() {
+        const route = this.route();
+        if (!route) {
+            this.clearButtonLink();
+            return;
+        }
+        if (route.canBeEntered(this.envInjector)) {
+            this.setButtonLink(route);
+        }
+        else {
+            this.disableButtonLink();
+        }
     }
-    ngOnChanges() {
-        this.update();
+    setButtonLink(route) {
+        const button = this.buttonRef;
+        try {
+            const ngHref = this.getNgHref(route);
+            button.ngHref.set(ngHref);
+            button.stateParams.set(this.stateParams() ?? route.stateParams);
+            button.queryParams.set(this.queryParams() ?? route.queryParams);
+            button.setDisabledState(false, PERMISSION_DISABLED_KEY);
+        }
+        catch (err) {
+            console.error(err);
+            this.disableButtonLink();
+        }
     }
-    update() {
-        if (this.route.canBeEntered(this.envInjector) && !this.disabled) {
-            this.setLink();
+    disableButtonLink() {
+        const button = this.buttonRef;
+        button.ngHref.set(null);
+        button.setDisabledState(true, PERMISSION_DISABLED_KEY);
+    }
+    clearButtonLink() {
+        const button = this.buttonRef;
+        button.ngHref.set(null);
+        button.stateParams.set(undefined);
+        button.queryParams.set(undefined);
+        button.setDisabledState(false, PERMISSION_DISABLED_KEY);
+    }
+    updateRouterLink() {
+        const route = this.route();
+        if (!route) {
+            this.clearRouterLink();
+        }
+        else if (route.canBeEntered(this.envInjector) && !this.disabled()) {
+            this.setRouterLink(route);
         }
         else {
-            this.disableLink();
+            this.disableRouterLink();
         }
     }
-    setLink() {
-        this.routerLinkRef.routerLink = this.route.createAbsoluteUrl(this.params);
-        this.routerLinkRef.state = this.stateParams ?? this.route.stateParams;
-        this.routerLinkRef.queryParams = this.queryParams ?? this.route.queryParams;
+    setRouterLink(route) {
+        try {
+            const ngHref = this.getNgHref(route);
+            this.routerLinkRef.routerLink = ngHref;
+            this.routerLinkRef.state = this.stateParams() ?? route.stateParams;
+            this.routerLinkRef.queryParams = this.queryParams() ?? route.queryParams;
+            this.routerLinkRef.ngOnChanges({});
+        }
+        catch (err) {
+            console.error(err);
+            this.disableRouterLink();
+        }
+    }
+    disableRouterLink() {
+        this.routerLinkRef.routerLink = null;
         this.routerLinkRef.ngOnChanges({});
     }
-    disableLink() {
+    clearRouterLink() {
         this.routerLinkRef.routerLink = null;
+        this.routerLinkRef.state = undefined;
+        this.routerLinkRef.queryParams = undefined;
         this.routerLinkRef.ngOnChanges({});
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtRouterLinkDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "16.1.0", version: "18.2.7", type: RdtRouterLinkDirective, isStandalone: true, selector: "[rdtRouterLink]", inputs: { route: ["rdtRouterLink", "route"], target: "target", params: "params", queryParams: "queryParams", stateParams: "stateParams", disabled: ["disabled", "disabled", booleanAttribute] }, usesOnChanges: true, hostDirectives: [{ directive: i1.RouterLink, inputs: ["target", "target"] }], ngImport: i0 });
+    getNgHref(route) {
+        return route.createAbsoluteUrl(this.params());
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtRouterLinkDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "20.1.7", type: RdtRouterLinkDirective, isStandalone: true, selector: "[rdtRouterLink]", inputs: { route: { classPropertyName: "route", publicName: "rdtRouterLink", isSignal: true, isRequired: true, transformFunction: null }, target: { classPropertyName: "target", publicName: "target", isSignal: true, isRequired: false, transformFunction: null }, params: { classPropertyName: "params", publicName: "params", isSignal: true, isRequired: false, transformFunction: null }, queryParams: { classPropertyName: "queryParams", publicName: "queryParams", isSignal: true, isRequired: false, transformFunction: null }, stateParams: { classPropertyName: "stateParams", publicName: "stateParams", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "rdtDisabled", isSignal: true, isRequired: false, transformFunction: null } }, hostDirectives: [{ directive: i1.RouterLink, inputs: ["target", "target"] }], ngImport: i0 });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: RdtRouterLinkDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtRouterLinkDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[rdtRouterLink]',
@@ -973,21 +1148,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
                         },
                     ],
                 }]
-        }], propDecorators: { route: [{
-                type: Input,
-                args: [{ alias: 'rdtRouterLink', required: true }]
-            }], target: [{
-                type: Input
-            }], params: [{
-                type: Input
-            }], queryParams: [{
-                type: Input
-            }], stateParams: [{
-                type: Input
-            }], disabled: [{
-                type: Input,
-                args: [{ transform: booleanAttribute }]
-            }] } });
+        }] });
 
 const preventDataLossGuardFn = () => {
     const guardStore = inject(RdtComponentGuardStoreService);
@@ -1032,10 +1193,10 @@ class GlobalRouteGuardService {
             canDeactivateGuards.push(preventDataLossGuardFn);
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: GlobalRouteGuardService, deps: [{ token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: GlobalRouteGuardService, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: GlobalRouteGuardService, deps: [{ token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: GlobalRouteGuardService, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImport: i0, type: GlobalRouteGuardService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: GlobalRouteGuardService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.Router }] });
@@ -1044,5 +1205,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ALWAYS_TRUE, GlobalRouteGuardService, RDT_CANNOT_BE_ENTERED_PROVIDER, RDT_CONFIRM_DATA_LOSS_SERVICE, RDT_ROUTES_PROVIDER, RdtAngularRoute, RdtAnyRouteActiveDirective, RdtConfirmDataLossService, RdtConfirmDataLossServiceAlert, RdtNavigationSource, RdtRoute, RdtRouteBuilder, RdtRouterLinkDirective, RdtRouterService, preventDataLossGuardFn };
+export { ALWAYS_TRUE, GlobalRouteGuardService, PERMISSION_DISABLED_KEY, RDT_CANNOT_BE_ENTERED_PROVIDER, RDT_CONFIRM_DATA_LOSS_SERVICE, RDT_ROUTES_PROVIDER, RdtAngularRoute, RdtAnyRouteActiveDirective, RdtBackLinkDirective, RdtConfirmDataLossService, RdtConfirmDataLossServiceAlert, RdtNavigationSource, RdtRoute, RdtRouteBuilder, RdtRouterLinkDirective, RdtRouterService, preventDataLossGuardFn };
 //# sourceMappingURL=ngrdt-router.mjs.map