@shuvi/router 1.0.39 → 1.0.42

package/esm/history/base.d.ts

@@ -1,4 +1,4 @@
-import { State, HistoryState, Blocker, Location, ResolvedPath, PathRecord, Action } from '../types';
+import { State, HistoryState, Blocker, Location, ResolvedPath, PathRecord, Path, Action } from '../types';
 /**
  * A POP indicates a change to an arbitrary index in the history stack, such
  * as a back or forward navigation. It does not describe the direction of the
@@ -21,7 +21,7 @@ export declare const ACTION_REPLACE: Action;
 export interface TransitionOptions {
     state?: State;
     action?: Action;
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
     /**
      * skipGuards means this route transition will be straightforwardly executed without any before guard
      */
@@ -35,13 +35,13 @@ export interface TransitionOptions {
 }
 export interface PushOptions {
     state?: object | null | undefined;
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
     skipGuards?: boolean;
 }
 export default abstract class BaseHistory {
     action: Action;
     location: Location;
-    doTransition: (to: PathRecord, onComplete: Function, onAbort?: Function, skipGuards?: boolean) => void;
+    doTransition: (to: PathRecord, onComplete: Function, onAbort?: Function, skipGuards?: boolean, isReplace?: boolean, redirectedFrom?: Path) => void;
     protected _index: number;
     protected _blockers: import("../utils").Events<Blocker<State>>;
     protected abstract getIndexAndLocation(): [number, Location];

package/esm/history/base.js

@@ -71,7 +71,7 @@ export default class BaseHistory {
                 url: this.resolve(nextLocation).href
             });
             this._updateState(action);
-        }, onAbort, skipGuards);
+        }, onAbort, skipGuards, action === ACTION_REPLACE, redirectedFrom);
     }
     _updateState(nextAction) {
         // update state

package/esm/router.js

@@ -121,14 +121,16 @@ class Router {
       5. Emit change event(trigger react update)
       6. Call router.afterEach
       */
-    _doTransition(to, onComplete, onAbort, skipGuards) {
+    _doTransition(to, onComplete, onAbort, skipGuards, isReplace, redirectedFrom) {
         const nextRoute = this._getNextRoute(to);
         const current = this._current;
         const nextMatches = nextRoute.matches;
         const routeRedirect = getRedirectFromRoutes(nextMatches);
+        const isInitialNavigation = current === START;
         if (routeRedirect) {
-            return this._history.replace(routeRedirect, {
-                redirectedFrom: routeRedirect
+            const transitionMethod = isReplace || isInitialNavigation ? 'replace' : 'push';
+            return this._history[transitionMethod](routeRedirect, {
+                redirectedFrom: redirectedFrom || nextRoute
             });
         }
         const routeContext = new Map();
@@ -144,7 +146,7 @@ class Router {
             this._cancleHandler = null;
             onAbort && onAbort();
             // fire ready cbs once
-            if (!this._ready) {
+            if (!this._ready && this._current !== START) {
                 this._ready = true;
                 this._readyDefer.resolve();
             }
@@ -169,24 +171,21 @@ class Router {
                     else if (typeof to === 'string' ||
                         (typeof to === 'object' && typeof to.path === 'string')) {
                         abort();
+                        const useReplace = isReplace ||
+                            (typeof to === 'object' && to.replace) ||
+                            isInitialNavigation;
+                        const transitionMethod = useReplace ? 'replace' : 'push';
                         if (typeof to === 'object') {
-                            if (to.replace) {
-                                this._history.replace(to.path, {
-                                    redirectedFrom: current,
-                                    skipGuards: to.skipGuards,
-                                    state: to.state
-                                });
-                            }
-                            else {
-                                this._history.push(to.path, {
-                                    redirectedFrom: current,
-                                    skipGuards: to.skipGuards,
-                                    state: to.state
-                                });
-                            }
+                            this._history[transitionMethod](to.path, {
+                                redirectedFrom: redirectedFrom || nextRoute,
+                                skipGuards: to.skipGuards,
+                                state: to.state
+                            });
                         }
                         else {
-                            this._history.push(to, { redirectedFrom: current });
+                            this._history[transitionMethod](to, {
+                                redirectedFrom: redirectedFrom || nextRoute
+                            });
                         }
                     }
                     else {

package/esm/types/history.d.ts

@@ -95,7 +95,7 @@ export interface PartialPath {
  *
  */
 export interface Location<S extends State = State> extends Path {
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
     /**
      * An object of arbitrary data associated with this location.
      *

package/esm/utils/history.d.ts

@@ -1,9 +1,9 @@
-import { HistoryState, Location, PathRecord, State, Key, Blocker } from '../types';
+import { HistoryState, Location, PathRecord, State, Key, Blocker, Path } from '../types';
 import { Events } from './misc';
 export declare function createLocation(to: PathRecord, { state, key, redirectedFrom }?: {
     state?: State;
     key?: Key;
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
 }): Location<any>;
 export declare function pushState(state: HistoryState, url?: string, { replace }?: {
     replace?: boolean;

package/lib/history/base.d.ts

@@ -1,4 +1,4 @@
-import { State, HistoryState, Blocker, Location, ResolvedPath, PathRecord, Action } from '../types';
+import { State, HistoryState, Blocker, Location, ResolvedPath, PathRecord, Path, Action } from '../types';
 /**
  * A POP indicates a change to an arbitrary index in the history stack, such
  * as a back or forward navigation. It does not describe the direction of the
@@ -21,7 +21,7 @@ export declare const ACTION_REPLACE: Action;
 export interface TransitionOptions {
     state?: State;
     action?: Action;
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
     /**
      * skipGuards means this route transition will be straightforwardly executed without any before guard
      */
@@ -35,13 +35,13 @@ export interface TransitionOptions {
 }
 export interface PushOptions {
     state?: object | null | undefined;
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
     skipGuards?: boolean;
 }
 export default abstract class BaseHistory {
     action: Action;
     location: Location;
-    doTransition: (to: PathRecord, onComplete: Function, onAbort?: Function, skipGuards?: boolean) => void;
+    doTransition: (to: PathRecord, onComplete: Function, onAbort?: Function, skipGuards?: boolean, isReplace?: boolean, redirectedFrom?: Path) => void;
     protected _index: number;
     protected _blockers: import("../utils").Events<Blocker<State>>;
     protected abstract getIndexAndLocation(): [number, Location];

package/lib/history/base.js

@@ -74,7 +74,7 @@ class BaseHistory {
                 url: this.resolve(nextLocation).href
             });
             this._updateState(action);
-        }, onAbort, skipGuards);
+        }, onAbort, skipGuards, action === exports.ACTION_REPLACE, redirectedFrom);
     }
     _updateState(nextAction) {
         // update state

package/lib/router.js

@@ -124,14 +124,16 @@ class Router {
       5. Emit change event(trigger react update)
       6. Call router.afterEach
       */
-    _doTransition(to, onComplete, onAbort, skipGuards) {
+    _doTransition(to, onComplete, onAbort, skipGuards, isReplace, redirectedFrom) {
         const nextRoute = this._getNextRoute(to);
         const current = this._current;
         const nextMatches = nextRoute.matches;
         const routeRedirect = (0, getRedirectFromRoutes_1.getRedirectFromRoutes)(nextMatches);
+        const isInitialNavigation = current === START;
         if (routeRedirect) {
-            return this._history.replace(routeRedirect, {
-                redirectedFrom: routeRedirect
+            const transitionMethod = isReplace || isInitialNavigation ? 'replace' : 'push';
+            return this._history[transitionMethod](routeRedirect, {
+                redirectedFrom: redirectedFrom || nextRoute
             });
         }
         const routeContext = new Map();
@@ -147,7 +149,7 @@ class Router {
             this._cancleHandler = null;
             onAbort && onAbort();
             // fire ready cbs once
-            if (!this._ready) {
+            if (!this._ready && this._current !== START) {
                 this._ready = true;
                 this._readyDefer.resolve();
             }
@@ -172,24 +174,21 @@ class Router {
                     else if (typeof to === 'string' ||
                         (typeof to === 'object' && typeof to.path === 'string')) {
                         abort();
+                        const useReplace = isReplace ||
+                            (typeof to === 'object' && to.replace) ||
+                            isInitialNavigation;
+                        const transitionMethod = useReplace ? 'replace' : 'push';
                         if (typeof to === 'object') {
-                            if (to.replace) {
-                                this._history.replace(to.path, {
-                                    redirectedFrom: current,
-                                    skipGuards: to.skipGuards,
-                                    state: to.state
-                                });
-                            }
-                            else {
-                                this._history.push(to.path, {
-                                    redirectedFrom: current,
-                                    skipGuards: to.skipGuards,
-                                    state: to.state
-                                });
-                            }
+                            this._history[transitionMethod](to.path, {
+                                redirectedFrom: redirectedFrom || nextRoute,
+                                skipGuards: to.skipGuards,
+                                state: to.state
+                            });
                         }
                         else {
-                            this._history.push(to, { redirectedFrom: current });
+                            this._history[transitionMethod](to, {
+                                redirectedFrom: redirectedFrom || nextRoute
+                            });
                         }
                     }
                     else {

package/lib/types/history.d.ts

@@ -95,7 +95,7 @@ export interface PartialPath {
  *
  */
 export interface Location<S extends State = State> extends Path {
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
     /**
      * An object of arbitrary data associated with this location.
      *

package/lib/utils/history.d.ts

@@ -1,9 +1,9 @@
-import { HistoryState, Location, PathRecord, State, Key, Blocker } from '../types';
+import { HistoryState, Location, PathRecord, State, Key, Blocker, Path } from '../types';
 import { Events } from './misc';
 export declare function createLocation(to: PathRecord, { state, key, redirectedFrom }?: {
     state?: State;
     key?: Key;
-    redirectedFrom?: PathRecord;
+    redirectedFrom?: Path;
 }): Location<any>;
 export declare function pushState(state: HistoryState, url?: string, { replace }?: {
     replace?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/router",
-  "version": "1.0.39",
+  "version": "1.0.42",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -28,7 +28,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/utils": "1.0.39",
+    "@shuvi/utils": "1.0.42",
     "query-string": "6.13.8"
   }
 }