@tinkoff/router 0.1.67 → 0.1.68

package/lib/index.browser.js

@@ -220,17 +220,16 @@ class AbstractRouter {
         await this.runHooks('afterUpdateCurrent', navigation);
     }
     async navigate(navigateOptions) {
-        return this.internalNavigate(navigateOptions, {});
+        return this.internalNavigate(typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions, {});
     }
     async internalNavigate(navigateOptions, { history }) {
         var _a;
-        const options = typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions;
-        const { url, replace, params, navigateState, code } = options;
+        const { url, replace, params, navigateState, code } = navigateOptions;
         const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
         if (!url && !prevNavigation) {
             throw new Error('Navigate url should be specified and cannot be omitted for first navigation');
         }
-        const resolvedUrl = this.resolveUrl(options);
+        const resolvedUrl = this.resolveUrl(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
         let navigation = {
             type: 'navigate',

package/lib/index.es.js

@@ -220,17 +220,16 @@ class AbstractRouter {
         await this.runHooks('afterUpdateCurrent', navigation);
     }
     async navigate(navigateOptions) {
-        return this.internalNavigate(navigateOptions, {});
+        return this.internalNavigate(typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions, {});
     }
     async internalNavigate(navigateOptions, { history }) {
         var _a;
-        const options = typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions;
-        const { url, replace, params, navigateState, code } = options;
+        const { url, replace, params, navigateState, code } = navigateOptions;
         const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
         if (!url && !prevNavigation) {
             throw new Error('Navigate url should be specified and cannot be omitted for first navigation');
         }
-        const resolvedUrl = this.resolveUrl(options);
+        const resolvedUrl = this.resolveUrl(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
         let navigation = {
             type: 'navigate',
@@ -682,13 +681,16 @@ class Router extends AbstractRouter {
         });
         return this.lastNavigation;
     }
-    async run(navigation) {
-        if (this.redirectCode) {
-            return this.redirect(navigation, { url: navigation.url.path, code: this.redirectCode });
-        }
+    async internalNavigate(navigateOptions, internalOptions) {
         // any navigation after initial should be considered as redirects
         if (this.getCurrentRoute()) {
-            return this.redirect(navigation, { url: navigation.url.path, code: navigation.code });
+            return this.redirect(this.lastNavigation, navigateOptions);
+        }
+        return super.internalNavigate(navigateOptions, internalOptions);
+    }
+    async run(navigation) {
+        if (this.redirectCode) {
+            return this.redirect(navigation, { url: navigation.url.href, code: this.redirectCode });
         }
         await super.run(navigation);
     }

package/lib/index.js

@@ -236,17 +236,16 @@ class AbstractRouter {
         await this.runHooks('afterUpdateCurrent', navigation);
     }
     async navigate(navigateOptions) {
-        return this.internalNavigate(navigateOptions, {});
+        return this.internalNavigate(typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions, {});
     }
     async internalNavigate(navigateOptions, { history }) {
         var _a;
-        const options = typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions;
-        const { url, replace, params, navigateState, code } = options;
+        const { url, replace, params, navigateState, code } = navigateOptions;
         const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
         if (!url && !prevNavigation) {
             throw new Error('Navigate url should be specified and cannot be omitted for first navigation');
         }
-        const resolvedUrl = this.resolveUrl(options);
+        const resolvedUrl = this.resolveUrl(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
         let navigation = {
             type: 'navigate',
@@ -698,13 +697,16 @@ class Router extends AbstractRouter {
         });
         return this.lastNavigation;
     }
-    async run(navigation) {
-        if (this.redirectCode) {
-            return this.redirect(navigation, { url: navigation.url.path, code: this.redirectCode });
-        }
+    async internalNavigate(navigateOptions, internalOptions) {
         // any navigation after initial should be considered as redirects
         if (this.getCurrentRoute()) {
-            return this.redirect(navigation, { url: navigation.url.path, code: navigation.code });
+            return this.redirect(this.lastNavigation, navigateOptions);
+        }
+        return super.internalNavigate(navigateOptions, internalOptions);
+    }
+    async run(navigation) {
+        if (this.redirectCode) {
+            return this.redirect(navigation, { url: navigation.url.href, code: this.redirectCode });
         }
         await super.run(navigation);
     }

package/lib/router/abstract.d.ts

@@ -45,7 +45,7 @@ export declare abstract class AbstractRouter {
     protected internalUpdateCurrentRoute(updateRouteOptions: UpdateCurrentRouteOptions, { history }: InternalOptions): Promise<void>;
     protected runUpdateCurrentRoute(navigation: Navigation): Promise<void>;
     navigate(navigateOptions: NavigateOptions | string): Promise<void>;
-    protected internalNavigate(navigateOptions: NavigateOptions | string, { history }: InternalOptions): Promise<void>;
+    protected internalNavigate(navigateOptions: NavigateOptions, { history }: InternalOptions): Promise<void>;
     protected runNavigate(navigation: Navigation): Promise<void>;
     protected run(navigation: Navigation): Promise<void>;
     resolve(resolveOptions: NavigateOptions | string, options?: Parameters<AbstractRouter['resolveRoute']>[1]): import("../types").NavigationRoute;

package/lib/router/server.d.ts

@@ -8,6 +8,7 @@ export declare class Router extends AbstractRouter {
     constructor(options: Options);
     protected onRedirect: (navigation: Navigation) => Promise<void>;
     dehydrate(): Promise<Navigation>;
+    protected internalNavigate(navigateOptions: NavigateOptions, internalOptions: any): Promise<void>;
     protected run(navigation: Navigation): Promise<void>;
     protected redirect(navigation: Navigation, target: NavigateOptions): Promise<void>;
     protected notfound(navigation: Navigation): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.1.67",
+  "version": "0.1.68",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",