@tinkoff/router 0.1.76 → 0.1.79

package/lib/index.browser.js

@@ -221,17 +221,20 @@ class AbstractRouter {
         await this.runHooks('afterUpdateCurrent', navigation);
     }
     async navigate(navigateOptions) {
-        return this.internalNavigate(typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions, {});
+        return this.internalNavigate(makeNavigateOptions(navigateOptions), {});
     }
-    async internalNavigate(navigateOptions, { history }) {
+    async internalNavigate(navigateOptions, { history, redirect }) {
         var _a;
         const { url, replace, params, navigateState, code } = navigateOptions;
-        const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+        const prevNavigation = redirect
+            ? this.lastNavigation
+            : (_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(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
+        const redirectFrom = redirect ? this.currentNavigation.to : undefined;
         let navigation = {
             type: 'navigate',
             from,
@@ -241,6 +244,8 @@ class AbstractRouter {
             history,
             navigateState,
             code,
+            redirect,
+            redirectFrom,
         };
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
@@ -772,8 +777,11 @@ class ClientRouter extends AbstractRouter {
         // in case we didn't find any matched route just force hard page navigation
         const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
         const nextUrl = navigation.url.href;
-        // prevent redirect cycle on the same page
-        if (prevUrl !== nextUrl) {
+        const isNoSpaNavigation = navigation.from && !navigation.to;
+        // prevent redirect cycle on the same page,
+        // except cases when we run no-spa navigations,
+        // because we need hard reload in this cases
+        if (isNoSpaNavigation ? true : prevUrl !== nextUrl) {
             if (navigation.replace) {
                 window.location.replace(nextUrl);
             }
@@ -789,7 +797,12 @@ class ClientRouter extends AbstractRouter {
     }
     async redirect(navigation, target) {
         await super.redirect(navigation, target);
-        return this.navigate({ ...target, replace: target.replace || navigation.replace });
+        return this.internalNavigate({
+            ...target,
+            replace: target.replace || navigation.replace,
+        }, {
+            redirect: true,
+        });
     }
 }
 

package/lib/index.es.js

@@ -221,17 +221,20 @@ class AbstractRouter {
         await this.runHooks('afterUpdateCurrent', navigation);
     }
     async navigate(navigateOptions) {
-        return this.internalNavigate(typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions, {});
+        return this.internalNavigate(makeNavigateOptions(navigateOptions), {});
     }
-    async internalNavigate(navigateOptions, { history }) {
+    async internalNavigate(navigateOptions, { history, redirect }) {
         var _a;
         const { url, replace, params, navigateState, code } = navigateOptions;
-        const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+        const prevNavigation = redirect
+            ? this.lastNavigation
+            : (_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(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
+        const redirectFrom = redirect ? this.currentNavigation.to : undefined;
         let navigation = {
             type: 'navigate',
             from,
@@ -241,6 +244,8 @@ class AbstractRouter {
             history,
             navigateState,
             code,
+            redirect,
+            redirectFrom,
         };
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
@@ -1002,8 +1007,11 @@ class ClientRouter extends AbstractRouter {
         // in case we didn't find any matched route just force hard page navigation
         const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
         const nextUrl = navigation.url.href;
-        // prevent redirect cycle on the same page
-        if (prevUrl !== nextUrl) {
+        const isNoSpaNavigation = navigation.from && !navigation.to;
+        // prevent redirect cycle on the same page,
+        // except cases when we run no-spa navigations,
+        // because we need hard reload in this cases
+        if (isNoSpaNavigation ? true : prevUrl !== nextUrl) {
             if (navigation.replace) {
                 window.location.replace(nextUrl);
             }
@@ -1019,7 +1027,12 @@ class ClientRouter extends AbstractRouter {
     }
     async redirect(navigation, target) {
         await super.redirect(navigation, target);
-        return this.navigate({ ...target, replace: target.replace || navigation.replace });
+        return this.internalNavigate({
+            ...target,
+            replace: target.replace || navigation.replace,
+        }, {
+            redirect: true,
+        });
     }
 }
 

package/lib/index.js

@@ -236,17 +236,20 @@ class AbstractRouter {
         await this.runHooks('afterUpdateCurrent', navigation);
     }
     async navigate(navigateOptions) {
-        return this.internalNavigate(typeof navigateOptions === 'string' ? { url: navigateOptions } : navigateOptions, {});
+        return this.internalNavigate(makeNavigateOptions(navigateOptions), {});
     }
-    async internalNavigate(navigateOptions, { history }) {
+    async internalNavigate(navigateOptions, { history, redirect }) {
         var _a;
         const { url, replace, params, navigateState, code } = navigateOptions;
-        const prevNavigation = (_a = this.currentNavigation) !== null && _a !== void 0 ? _a : this.lastNavigation;
+        const prevNavigation = redirect
+            ? this.lastNavigation
+            : (_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(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation !== null && prevNavigation !== void 0 ? prevNavigation : {};
+        const redirectFrom = redirect ? this.currentNavigation.to : undefined;
         let navigation = {
             type: 'navigate',
             from,
@@ -256,6 +259,8 @@ class AbstractRouter {
             history,
             navigateState,
             code,
+            redirect,
+            redirectFrom,
         };
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
@@ -1017,8 +1022,11 @@ class ClientRouter extends AbstractRouter {
         // in case we didn't find any matched route just force hard page navigation
         const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
         const nextUrl = navigation.url.href;
-        // prevent redirect cycle on the same page
-        if (prevUrl !== nextUrl) {
+        const isNoSpaNavigation = navigation.from && !navigation.to;
+        // prevent redirect cycle on the same page,
+        // except cases when we run no-spa navigations,
+        // because we need hard reload in this cases
+        if (isNoSpaNavigation ? true : prevUrl !== nextUrl) {
             if (navigation.replace) {
                 window.location.replace(nextUrl);
             }
@@ -1034,7 +1042,12 @@ class ClientRouter extends AbstractRouter {
     }
     async redirect(navigation, target) {
         await super.redirect(navigation, target);
-        return this.navigate({ ...target, replace: target.replace || navigation.replace });
+        return this.internalNavigate({
+            ...target,
+            replace: target.replace || navigation.replace,
+        }, {
+            redirect: true,
+        });
     }
 }
 

package/lib/router/abstract.d.ts

@@ -20,6 +20,7 @@ export interface Options {
 }
 interface InternalOptions {
     history?: boolean;
+    redirect?: boolean;
 }
 export declare abstract class AbstractRouter {
     protected started: boolean;
@@ -45,7 +46,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, { history }: InternalOptions): Promise<void>;
+    protected internalNavigate(navigateOptions: NavigateOptions, { history, redirect }: 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/types.d.ts

@@ -40,6 +40,8 @@ export interface Navigation {
     history?: boolean;
     cancelled?: boolean;
     code?: number;
+    redirect?: boolean;
+    redirectFrom?: NavigationRoute;
 }
 export declare type NavigationGuard = (navigation: Navigation) => Promise<void | NavigateOptions | string | boolean>;
 export declare type NavigationHook = (navigation: Navigation) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.1.76",
+  "version": "0.1.79",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,8 +22,8 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.0.26",
-    "@tinkoff/url": "0.7.38",
+    "@tinkoff/react-hooks": "0.0.27",
+    "@tinkoff/url": "0.7.39",
     "@tinkoff/utils": "^2.1.2"
   },
   "peerDependencies": {