@ngrdt/router 0.0.22 → 0.0.24

package/fesm2022/ngrdt-router.mjs

@@ -38,6 +38,9 @@ class RdtParameters extends RdtReadonlyParameters {
         this.params[route.absolutePath] = params;
     }
 }
+function ALWAYS_TRUE() {
+    return true;
+}
 
 const RDT_ROUTES_PROVIDER = new InjectionToken('RDT_ROUTES_PROVIDER');
 
@@ -183,10 +186,10 @@ class RdtRouterService {
         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: "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' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtRouterService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtRouterService, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtRouterService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtRouterService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -202,6 +205,7 @@ class RdtAngularRoute {
     route;
     children = [];
     // Must be set from component declaration files
+    loadComponent;
     loadChildren;
     component;
     providers = [];
@@ -218,6 +222,10 @@ class RdtAngularRoute {
         this.providers.push(...providers);
         return this;
     }
+    withLazyComponent(callback) {
+        this.loadComponent = callback;
+        return this;
+    }
     withModule(callback) {
         this.loadChildren = callback;
         return this;
@@ -289,6 +297,9 @@ class RdtAngularRoute {
         else if (this.loadChildren) {
             res.loadChildren = this.loadChildren;
         }
+        else if (this.loadComponent) {
+            res.loadComponent = this.loadComponent;
+        }
         res.data = this.data ?? {
             breadcrumb: {
                 label: this.route.name,
@@ -341,7 +352,7 @@ class RdtAngularRoute {
         //    ]
         //    }
         if (this.children.length > 0) {
-            if (this.loadChildren || this.component) {
+            if (this.loadChildren || this.component || this.loadComponent) {
                 const path = res.path;
                 res.path = '';
                 res.pathMatch = 'full';
@@ -414,26 +425,40 @@ class RdtAngularRoute {
     }
 }
 
-function ALWAYS_TRUE() {
-    return true;
-}
-class RdtRoute {
-    orderedParams = [];
+class RdtRouteBase {
+    _orderedParams = [];
     _paramMap = {};
     _regex = null;
-    paramMappings = [];
-    _staticParams = {};
-    _queryParams = {};
-    _stateParams = {};
-    _data = {};
+    _paramMappings = [];
     _name;
     _path;
     _parent = null;
     _children = [];
     _entryDisabled = false;
     _canBeEntered = ALWAYS_TRUE;
-    _built = false;
-    _absoluteRegex;
+    _data = {};
+    /**
+     * Data that is passed to Angular route definition.
+     */
+    get data() {
+        return this._data;
+    }
+    /**
+     * Regular expression route path relative to parent route.
+     * Hostname excluded.
+     */
+    get regex() {
+        return this._regex;
+    }
+    /**
+     * Denotes disabled route entry.
+     * If true, route should have no NgModule
+     * or component and only serves as virtual module
+     * for breadcrumb.
+     */
+    get entryDisabled() {
+        return this._entryDisabled;
+    }
     /**
      * Map of parameters and their types.
      */
@@ -464,6 +489,13 @@ class RdtRoute {
     get children() {
         return this._children;
     }
+}
+
+class RdtRoute extends RdtRouteBase {
+    _absoluteRegex;
+    _staticParams = {};
+    _queryParams = {};
+    _stateParams = {};
     /**
      * Absolute path of parent route or '/' if there is no parent.
      * Hostname excluded.
@@ -477,13 +509,6 @@ class RdtRoute {
     get absolutePath() {
         return RdtStringUtils.joinPaths(this.basePath, this._path);
     }
-    /**
-     * Regular expression route path relative to parent route.
-     * Hostname excluded.
-     */
-    get regex() {
-        return this._regex;
-    }
     /**
      * Regular expression to match only this route (not children
      * or parent routes). Hostname excluded.
@@ -508,15 +533,6 @@ class RdtRoute {
         }
         return this._absoluteRegex;
     }
-    /**
-     * Denotes disabled route entry.
-     * If true, route should have no NgModule
-     * or component and only serves as virtual module
-     * for breadcrumb.
-     */
-    get entryDisabled() {
-        return this._entryDisabled;
-    }
     /**
      * Statically set state params used when navigating to this instance.
      */
@@ -545,12 +561,6 @@ class RdtRoute {
     get hasCanBeEnteredGuard() {
         return this._canBeEntered !== ALWAYS_TRUE;
     }
-    /**
-     * Data that is passed to Angular route definition.
-     */
-    get data() {
-        return this._data;
-    }
     /**
      * Meta guard that is used by [rdtRouterLink] and RdtMenu
      * to determine if route can be entered.
@@ -587,10 +597,10 @@ class RdtRoute {
     }
     fill(values, res = {}) {
         const params = {};
-        const reversedParams = this.orderedParams.slice().reverse();
+        const reversedParams = this._orderedParams.slice().reverse();
         for (let i = 0; i < reversedParams.length && i < values.length; i++) {
             const key = reversedParams[i];
-            const mappedKey = this.paramMappings.find((m) => m.urlName === key)?.tableName ?? key;
+            const mappedKey = this._paramMappings.find((m) => m.urlName === key)?.tableName ?? key;
             let val = values[i];
             if (this._paramMap[key] === 'number') {
                 val = parseInt(val);
@@ -624,7 +634,7 @@ class RdtRoute {
         const paramNames = Object.keys(this._paramMap);
         paramNames.sort((a, b) => b.length - a.length);
         const extendedParamMap = { ...paramMap };
-        this.paramMappings.forEach((mapping) => {
+        this._paramMappings.forEach((mapping) => {
             if (mapping.tableName in paramMap) {
                 extendedParamMap[mapping.urlName] = paramMap[mapping.tableName];
             }
@@ -639,9 +649,6 @@ class RdtRoute {
         return path;
     }
     toAngularRoute() {
-        if (!this._built) {
-            throw new Error('You have to first call .build() on route!');
-        }
         return new RdtAngularRoute(this);
     }
     /**
@@ -652,7 +659,7 @@ class RdtRoute {
      */
     withParamMappings(mappings) {
         const clone = this.clone();
-        clone.paramMappings = mappings;
+        clone._paramMappings = mappings;
         return clone;
     }
     /**
@@ -693,8 +700,8 @@ class RdtRoute {
      */
     extractRouteParams(row) {
         const res = {};
-        this.orderedParams.forEach((param) => {
-            const mapping = this.paramMappings.find((m) => m.urlName === param);
+        this._orderedParams.forEach((param) => {
+            const mapping = this._paramMappings.find((m) => m.urlName === param);
             const mappedParam = (mapping?.tableName ?? param);
             if (mappedParam in row) {
                 res[mappedParam] = row[mappedParam];
@@ -712,18 +719,65 @@ class RdtRoute {
         clone._parent = this._parent?.clone() ?? null;
         clone._path = this.path;
         clone._entryDisabled = this._entryDisabled;
-        clone.orderedParams = [...this.orderedParams];
+        clone._orderedParams = [...this._orderedParams];
         clone._paramMap = { ...this._paramMap };
         clone._regex = this._regex ? new RegExp(this._regex) : null;
-        clone.paramMappings = this.paramMappings;
+        clone._paramMappings = this._paramMappings;
         clone._staticParams = { ...this._staticParams };
         clone._stateParams = { ...this._stateParams };
         return clone;
     }
+    setRegex() {
+        const params = Object.keys(this._paramMap);
+        params.sort((a, b) => b.length - a.length);
+        let substituted = this.path;
+        params.forEach((p) => {
+            const type = this._paramMap[p];
+            if (!type) {
+                throw new Error('Params is not set i');
+            }
+            substituted = substituted.replace(`:${p}`, RdtRoute.groups[type]);
+        });
+        if (substituted === '') {
+            this._regex = null;
+        }
+        else {
+            this._regex = new RegExp(substituted);
+        }
+    }
+    static fromBuilder(builder) {
+        const route = new RdtRoute();
+        route._name = builder.name;
+        route._path = builder.path;
+        route._entryDisabled = builder.entryDisabled;
+        route._orderedParams = builder.orderedParams;
+        route._canBeEntered = builder.canBeEntered;
+        route._paramMap = builder.paramMap;
+        route._regex = builder.regex ? new RegExp(builder.regex) : null;
+        route._paramMappings = builder.paramMappings;
+        route._children = builder.children;
+        route._data = builder.data;
+        route._children.forEach((child) => (child._parent = route));
+        route.setRegex();
+        return route;
+    }
+    static groups = {
+        string: '(.+)',
+        number: '(\\d+)',
+    };
 }
 
 const DEFAULT_PARAM_TYPE = 'number';
-class RdtRouteBuilder extends RdtRoute {
+class RdtRouteBuilder extends RdtRouteBase {
+    get canBeEntered() {
+        return this._canBeEntered;
+    }
+    get orderedParams() {
+        return this._orderedParams;
+    }
+    get paramMappings() {
+        return this._paramMappings;
+    }
     /**
      * CanBeEntered function is synchronous function which
      * lets framework hide menu buttons and disable links.
@@ -776,7 +830,7 @@ class RdtRouteBuilder extends RdtRoute {
                 }
             }
         });
-        this.orderedParams = params;
+        this._orderedParams = params;
         return this;
     }
     /**
@@ -832,9 +886,6 @@ class RdtRouteBuilder extends RdtRoute {
      */
     withChildren(...children) {
         this._children = children;
-        for (const child of children) {
-            child._parent = this;
-        }
         return this;
     }
     /**
@@ -847,32 +898,8 @@ class RdtRouteBuilder extends RdtRoute {
         if (typeof this._path !== 'string') {
             throw new Error('Please provide path for route. Empty string is acceptable.');
         }
-        this._built = true;
-        this.setRegex();
-        return this;
+        return RdtRoute.fromBuilder(this);
     }
-    setRegex() {
-        const params = Object.keys(this._paramMap);
-        params.sort((a, b) => b.length - a.length);
-        let substituted = this.path;
-        params.forEach((p) => {
-            const type = this._paramMap[p];
-            if (!type) {
-                throw new Error('Params is not set i');
-            }
-            substituted = substituted.replace(`:${p}`, RdtRouteBuilder.groups[type]);
-        });
-        if (substituted === '') {
-            this._regex = null;
-        }
-        else {
-            this._regex = new RegExp(substituted);
-        }
-    }
-    static groups = {
-        string: '(.+)',
-        number: '(\\d+)',
-    };
 }
 
 const EXACT_TRUE_OPTS = {
@@ -974,10 +1001,10 @@ class RdtAnyRouteActiveDirective {
             return input;
         }
     }
-    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 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtAnyRouteActiveDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.0.0", 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: "20.1.7", ngImport: i0, type: RdtAnyRouteActiveDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtAnyRouteActiveDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[rdtAnyRouteActive]',
@@ -1019,10 +1046,10 @@ class RdtBackLinkDirective {
             }
         });
     }
-    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 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtBackLinkDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.0.0", type: RdtBackLinkDirective, isStandalone: true, selector: "[rdtBackLink]", ngImport: i0 });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: RdtBackLinkDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtBackLinkDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[rdtBackLink]',
@@ -1038,16 +1065,15 @@ class RdtRouterLinkDirective {
     });
     routerLinkRef = inject(RouterLink, { self: true });
     envInjector = inject(EnvironmentInjector);
-    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,
-        }]));
+    route = input.required({ alias: 'rdtRouterLink' });
+    target = input('_self');
+    params = input();
+    queryParams = input();
+    stateParams = input();
+    disabled = input(false, {
+        alias: 'rdtDisabled',
+        transform: booleanAttribute,
+    });
     updateEffect = effect(() => {
         if (this.buttonRef) {
             this.updateButton();
@@ -1055,7 +1081,7 @@ class RdtRouterLinkDirective {
         else {
             this.updateRouterLink();
         }
-    }, ...(ngDevMode ? [{ debugName: "updateEffect" }] : []));
+    });
     updateButton() {
         const route = this.route();
         if (!route) {
@@ -1133,10 +1159,10 @@ class RdtRouterLinkDirective {
     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 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtRouterLinkDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "20.0.0", 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: "20.1.7", ngImport: i0, type: RdtRouterLinkDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: RdtRouterLinkDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[rdtRouterLink]',
@@ -1193,10 +1219,10 @@ class GlobalRouteGuardService {
             canDeactivateGuards.push(preventDataLossGuardFn);
         }
     }
-    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' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: GlobalRouteGuardService, deps: [{ token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: GlobalRouteGuardService, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: GlobalRouteGuardService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.0", ngImport: i0, type: GlobalRouteGuardService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1.Router }] });
@@ -1205,5 +1231,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.7", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-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 };
+export { 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