@rxdi/router 0.7.221 → 0.7.223

package/dist/helpers.d.ts

@@ -2,4 +2,4 @@ import { BehaviorSubject } from 'rxjs';
 import { Route } from './injection.tokens';
 export declare const ChildRoutesObservable: BehaviorSubject<Route[]>;
 export declare function loadRoutes(routes: Route[]): Route<any>[];
-export declare function getQueryParams<T>(params: string[]): T;
+export declare function getQueryParams<T>(): T;

package/dist/helpers.js

@@ -22,7 +22,6 @@ function assignChildren(route) {
         const lazyModule = route.children;
         route.children = function (context, commands) {
             return __awaiter(this, void 0, void 0, function* () {
-                console.log('Lazy loading route:', route.path);
                 const loadedModule = yield lazyModule(context, commands);
                 let routes = exports.ChildRoutesObservable.getValue();
                 if (loadedModule && Array.isArray(loadedModule.ROUTES)) {
@@ -41,7 +40,7 @@ function assignChildren(route) {
 function activateGuard(result, commands, route) {
     return __awaiter(this, void 0, void 0, function* () {
         if ((0, rxjs_1.isObservable)(result)) {
-            result = result.toPromise();
+            result = (0, rxjs_1.lastValueFrom)(result);
         }
         if (yield result) {
             return result;
@@ -112,14 +111,10 @@ function loadRoutes(routes) {
         routes.splice(routes.indexOf(notFoundRoute), 1);
         routes.push(notFoundRoute);
     }
-    const r = [...routes].map((route) => assignStaticIs(assignAction(assignChildren(route))));
+    const loadedRoutes = [...routes].map((route) => assignStaticIs(assignAction(assignChildren(route))));
     exports.ChildRoutesObservable.next(null);
-    return r;
+    return loadedRoutes;
 }
-function getQueryParams(params) {
-    const uriParams = new URLSearchParams(location.search);
-    return params.reduce((prev, curr) => {
-        prev[curr] = uriParams.get(curr);
-        return prev;
-    }, {});
+function getQueryParams() {
+    return [...new URLSearchParams(location.search)].reduce((prev, [key, value]) => (Object.assign(Object.assign({}, prev), { [key]: value })), {});
 }

package/dist/injection.tokens.d.ts

@@ -32,8 +32,9 @@ export interface RouteContext extends Route {
         path?: string | string[];
     } | null;
 }
+export type CanActiveResolverResponse = CanActivateRedirectResult | Promise<CanActivateRedirectResult> | boolean | Promise<boolean> | Observable<boolean>;
 export interface CanActivateResolver {
-    canActivate(context: CanActivateContext, commands: CanActivateCommands): CanActivateRedirectResult | Promise<CanActivateRedirectResult> | boolean | Promise<boolean> | Observable<boolean> | void;
+    canActivate(context: CanActivateContext, commands: CanActivateCommands): CanActiveResolverResponse;
 }
 export interface CanActivateRedirectResult {
     redirect: {
@@ -56,7 +57,7 @@ export interface CanActivateContext {
 }
 export interface CanActivateCommands {
     component: (component: string) => HTMLElement;
-    redirect: (path: string) => CanActivateRedirectResult;
+    redirect: (path: string | string[]) => CanActivateRedirectResult;
 }
 export declare const RouterRoutlet = "router-outlet";
 export declare const Routes = "router-routes";

package/dist/outlet.d.ts

@@ -17,7 +17,7 @@ export declare class Outlet extends Router {
     onSnapshotChange(): Observable<Detail>;
     freezeRouter(): void;
     unfreezeRouter(): void;
-    getQueryParams<T>(params: string[]): T;
+    getQueryParams<T>(): T;
     /**
      * Triggers navigation to a new path. Returns a boolean without waiting until the navigation is complete. Returns true if at least one Router has handled the navigation (was subscribed and had baseUrl matching the pathname argument), otherwise returns false.
      * @param pathnamea new in-app path

package/dist/outlet.js

@@ -28,8 +28,8 @@ class Outlet extends lib_1.Router {
     unfreezeRouter() {
         this.freeze = false;
     }
-    getQueryParams(params) {
-        return (0, helpers_1.getQueryParams)(params);
+    getQueryParams() {
+        return (0, helpers_1.getQueryParams)();
     }
     /**
      * Triggers navigation to a new path. Returns a boolean without waiting until the navigation is complete. Returns true if at least one Router has handled the navigation (was subscribed and had baseUrl matching the pathname argument), otherwise returns false.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/router",
-  "version": "0.7.221",
+  "version": "0.7.223",
   "main": "./dist/index.js",
   "author": "Kristiyan Tachev",
   "license": "MIT",
@@ -15,8 +15,8 @@
     "router-slot": "^1.5.4"
   },
   "devDependencies": {
-    "@rxdi/core": "^0.7.220",
-    "@rxdi/lit-html": "^0.7.220"
+    "@rxdi/core": "^0.7.222",
+    "@rxdi/lit-html": "^0.7.222"
   },
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",

package/types/@vaadin/router.d.ts

@@ -1,30 +0,0 @@
-export interface Route<C> {
-    path: string;
-    component?: C;
-    action?: () => Promise<any>;
-}
-
-export interface RouterOptions {
-    baseUrl: string;
-}
-export interface NavigationTrigger {}
-export declare class Router {
-    public static go(path): boolean;
-    static setTriggers(triggers: NavigationTrigger): void
-    constructor(element: any, options: { baseUrl?: string; });
-    setRoutes(routes: Route[]): void;
-    setOutlet(outlet: Node): void;
-    urlForName(url: string, params: any): string;
-    urlForPath(url: string, params: any): string;
-    getOutlet(): Node;
-    getRoutes(): any;
-    render(pathnameOrContext: string | { pathname: string; }, shouldUpdateHistory): Promise<Node>;
-    removeRoutes(): void;
-    subscribe(): void;
-    unsubscribe(): void;
-    addRoutes(routes: Route<C> | Route<C>[]): Route[];
-    location: {
-        routes: Route<C>[];
-        params: any
-    }
-}