@shuvi/router 2.0.0-dev.34 → 2.0.0-dev.35

package/esm/matchPathname.js

@@ -1,5 +1,4 @@
-import { tokensToParser } from './pathParserRanker';
-import { tokenizePath } from './pathTokenizer';
+import { compilePath } from './pathParserRanker';
 function safelyDecodeURIComponent(value, paramName, optional) {
     try {
         if (Array.isArray(value)) {
@@ -28,7 +27,7 @@ export function matchPathname(pattern, pathname) {
         pattern = { path: pattern };
     }
     const { path, caseSensitive = false, end = true, strict = false } = pattern;
-    const pathParser = tokensToParser(tokenizePath(path), {
+    const pathParser = compilePath(path, {
         strict,
         end,
         sensitive: caseSensitive
@@ -52,6 +51,6 @@ export function matchPathname(pattern, pathname) {
  * @param options
  */
 export function matchStringify(path, params, options) {
-    const pathParser = tokensToParser(tokenizePath(path), options);
+    const pathParser = compilePath(path, options);
     return pathParser.stringify(params);
 }

package/esm/matchRoutes.d.ts

@@ -6,6 +6,12 @@ export declare function rankRouteBranches<T extends [string, ...any[]]>(branches
 export interface IMatchRoutesOptions {
     strict?: boolean;
 }
+export type RoutesMatcher<T extends IRouteBaseObject> = (location: string | PartialLocation, basename?: string) => IRouteMatch<T>[] | null;
+/**
+ * Flattens and ranks the routes once, on the first match, and reuses them for
+ * every match after. The routes must not be changed in place once matched.
+ */
+export declare function createRoutesMatcher<T extends IRouteBaseObject>(routes: T[], options?: IMatchRoutesOptions): RoutesMatcher<T>;
 export declare function matchRoutes<T extends IRouteBaseObject>(routes: T[], location: string | PartialLocation, basename?: string, options?: IMatchRoutesOptions): IRouteMatch<T>[] | null;
 /**
  * When strict trailing-slash routing is enabled, a pathname that does not

package/esm/matchRoutes.js

@@ -1,7 +1,6 @@
 import { matchPathname } from './matchPathname';
-import { joinPaths, normalizeBase, resolvePath, stripBase } from './utils';
-import { tokensToParser, comparePathParserScore } from './pathParserRanker';
-import { tokenizePath } from './pathTokenizer';
+import { joinPaths, normalizeBase, resolvePath, stripBase, isDev, warning } from './utils';
+import { compilePath, getBranchScore, comparePathParserScore } from './pathParserRanker';
 function matchRouteBranch(branch, pathname, strict = false) {
     let routes = branch[1];
     let matchedPathname = '/';
@@ -36,8 +35,7 @@ export function rankRouteBranches(branches) {
     }
     const normalizedPaths = branches.map((branch, index) => {
         const [path, routes] = branch;
-        return Object.assign(Object.assign({}, tokensToParser(tokenizePath(path), undefined, { routes })), { path,
-            index });
+        return Object.assign(Object.assign({}, compilePath(path)), { score: getBranchScore(path, routes), index });
     });
     normalizedPaths.sort((a, b) => comparePathParserScore(a, b));
     const newBranches = [];
@@ -71,8 +69,24 @@ function flattenRoutes(routes, branches = [], parentPath = '', parentRoutes = []
     });
     return branches;
 }
-export function matchRoutes(routes, location, basename = '', options = {}) {
-    const { strict = false } = options;
+// Everything matching reads from the routes: each array and its items, and the
+// path, caseSensitive and children of each route.
+function snapshotRoutes(routes, snapshot = []) {
+    snapshot.push(routes, routes.length);
+    routes.forEach(route => {
+        snapshot.push(route, route.path, route.caseSensitive, route.children);
+        if (route.children) {
+            snapshotRoutes(route.children, snapshot);
+        }
+    });
+    return snapshot;
+}
+function isSameSnapshot(a, b) {
+    return a.length === b.length && a.every((value, i) => value === b[i]);
+}
+// The branches are only got once the basename has matched, so a route that
+// fails to compile does not throw for a pathname outside the basename.
+function matchBranches(getBranches, location, basename, strict) {
     if (typeof location === 'string') {
         location = resolvePath(location);
     }
@@ -87,8 +101,7 @@ export function matchRoutes(routes, location, basename = '', options = {}) {
             return null;
         }
     }
-    let branches = flattenRoutes(routes);
-    branches = rankRouteBranches(branches);
+    const branches = getBranches();
     let matches = null;
     for (let i = 0; matches == null && i < branches.length; ++i) {
         // TODO: Match on search, state too?
@@ -96,6 +109,36 @@ export function matchRoutes(routes, location, basename = '', options = {}) {
     }
     return matches;
 }
+/**
+ * Flattens and ranks the routes once, on the first match, and reuses them for
+ * every match after. The routes must not be changed in place once matched.
+ */
+export function createRoutesMatcher(routes, options = {}) {
+    const { strict = false } = options;
+    let branches;
+    // development only, to warn about routes changed in place after the first match
+    let snapshot;
+    const getBranches = () => {
+        if (!branches) {
+            branches = rankRouteBranches(flattenRoutes(routes));
+            if (isDev) {
+                snapshot = snapshotRoutes(routes);
+            }
+        }
+        else if (snapshot && !isSameSnapshot(snapshot, snapshotRoutes(routes))) {
+            warning(false, `Routes were changed in place after they had been matched. ` +
+                `Matching does not fully apply such changes and may return wrong ` +
+                `results, use router.replaceRoutes() to change the routes instead.`);
+            snapshot = undefined;
+        }
+        return branches;
+    };
+    return (location, basename = '') => matchBranches(getBranches, location, basename, strict);
+}
+export function matchRoutes(routes, location, basename = '', options = {}) {
+    const { strict = false } = options;
+    return matchBranches(() => rankRouteBranches(flattenRoutes(routes)), location, basename, strict);
+}
 /**
  * When strict trailing-slash routing is enabled, a pathname that does not
  * match any route may be a non-canonical variant (e.g. `/foo/` for a route

package/esm/pathParserRanker.d.ts

@@ -55,6 +55,14 @@ export type PathParserOptions = Pick<_PathParserOptions, 'end' | 'sensitive' | '
 export declare function tokensToParser(segments: Array<Token[]>, extraOptions?: _PathParserOptions, branchInfo?: {
     routes: IRouteRecord[];
 }): PathParser;
+/**
+ * Returns the parser of a path, compiled once per path and options.
+ */
+export declare function compilePath(path: string, options?: PathParserOptions): PathParser;
+/**
+ * The score of a branch, without changing the cached score of its path.
+ */
+export declare function getBranchScore(path: string, routes?: IRouteRecord[]): Array<number[]>;
 /**
  * Compare function that can be used with `sort` to sort an array of PathParser
  * @param a - first PathParser

package/esm/pathParserRanker.js

@@ -1,3 +1,4 @@
+import { tokenizePath } from './pathTokenizer';
 // default pattern for a param: non greedy everything but /
 const BASE_PARAM_PATTERN = '[^/]+?';
 const BASE_PATH_PARSER_OPTIONS = {
@@ -36,7 +37,6 @@ function endsAtSeparator(segments) {
  * @returns a PathParser
  */
 export function tokensToParser(segments, extraOptions, branchInfo) {
-    var _a;
     const options = Object.assign({}, BASE_PATH_PARSER_OPTIONS, extraOptions);
     /**
      * end with *, eg: /* /a* /a/*
@@ -258,17 +258,7 @@ export function tokensToParser(segments, extraOptions, branchInfo) {
         }
         return path;
     }
-    /**
-     * To make sure the score of pageBranch is always higher priority
-     * than the layoutRoute.
-     * We append a bonus score if the last route is an empty path.
-     */
-    if (branchInfo === null || branchInfo === void 0 ? void 0 : branchInfo.routes) {
-        const lastRoutePath = (_a = branchInfo.routes[branchInfo.routes.length - 1]) === null || _a === void 0 ? void 0 : _a.path;
-        if (lastRoutePath === '') {
-            score.push([0.1 /* PathScore.BonusEmptyStringPath */]);
-        }
-    }
+    score = withBranchBonus(score, branchInfo === null || branchInfo === void 0 ? void 0 : branchInfo.routes);
     return {
         re,
         score,
@@ -277,6 +267,45 @@ export function tokensToParser(segments, extraOptions, branchInfo) {
         stringify
     };
 }
+// Parsers are cached rather than tokens: tokensToParser mutates the tokens of a
+// catch-all path, so sharing them would leak one call's options into another.
+// Past the limit new paths are compiled without being cached.
+const PATH_PARSER_CACHE_LIMIT = 10000;
+const pathParserCache = new Map();
+/**
+ * Returns the parser of a path, compiled once per path and options.
+ */
+export function compilePath(path, options = {}) {
+    const { end = true, strict = false, sensitive = false } = options;
+    const cacheKey = `${+end}${+strict}${+sensitive}${path}`;
+    let parser = pathParserCache.get(cacheKey);
+    if (!parser) {
+        parser = tokensToParser(tokenizePath(path), { end, strict, sensitive });
+        if (pathParserCache.size < PATH_PARSER_CACHE_LIMIT) {
+            pathParserCache.set(cacheKey, parser);
+        }
+    }
+    return parser;
+}
+/**
+ * To make sure the score of pageBranch is always higher priority
+ * than the layoutRoute.
+ * We append a bonus score if the last route is an empty path.
+ * Returns a new array rather than changing the given score.
+ */
+function withBranchBonus(score, routes) {
+    var _a;
+    const lastRoutePath = (_a = routes === null || routes === void 0 ? void 0 : routes[routes.length - 1]) === null || _a === void 0 ? void 0 : _a.path;
+    return lastRoutePath === ''
+        ? score.concat([[0.1 /* PathScore.BonusEmptyStringPath */]])
+        : score;
+}
+/**
+ * The score of a branch, without changing the cached score of its path.
+ */
+export function getBranchScore(path, routes) {
+    return withBranchBonus(compilePath(path).score, routes);
+}
 /**
  * Compares an array of numbers as used in PathParser.score and returns a
  * number. This function can be used to `sort` an array

package/esm/router.js

@@ -1,5 +1,5 @@
 import { createDefer } from '@shuvi/utils/defer';
-import { matchRoutes, getTrailingSlashRedirectPath } from './matchRoutes';
+import { createRoutesMatcher, getTrailingSlashRedirectPath } from './matchRoutes';
 import { createRoutesFromArray } from './createRoutesFromArray';
 import { createEvents, resolvePath } from './utils';
 import { isError, isFunction } from './utils/error';
@@ -73,9 +73,7 @@ class Router {
             return this._history.resolve(to, from);
         };
         this.match = (to) => {
-            const { _routes: routes, _strictTrailingSlash: strict } = this;
-            const matches = matchRoutes(routes, to, undefined, { strict });
-            return matches || [];
+            return this._matchRoutes(to) || [];
         };
         this.replaceRoutes = (routes) => {
             if (this._ready) {
@@ -92,6 +90,9 @@ class Router {
                 this._cancleHandler = null;
             }
             this._routes = createRoutesFromArray(routes);
+            this._matchRoutes = createRoutesMatcher(this._routes, {
+                strict: this._strictTrailingSlash
+            });
             this._current = START;
             const setup = () => this._history.setup();
             this._history.transitionTo(this._getCurrent(), {
@@ -102,6 +103,9 @@ class Router {
         this._history = history;
         this._routes = createRoutesFromArray(routes);
         this._strictTrailingSlash = strictTrailingSlash;
+        this._matchRoutes = createRoutesMatcher(this._routes, {
+            strict: strictTrailingSlash
+        });
         this._current = START;
         this._history.doTransition = this._doTransition.bind(this);
     }
@@ -292,7 +296,7 @@ class Router {
         if (this._strictTrailingSlash && !matches.length) {
             const canonical = getTrailingSlashRedirectPath(parsedPath.pathname || '/');
             if (canonical) {
-                const rematched = matchRoutes(this._routes, Object.assign(Object.assign({}, parsedPath), { pathname: canonical }), undefined, { strict: true });
+                const rematched = this._matchRoutes(Object.assign(Object.assign({}, parsedPath), { pathname: canonical }));
                 if (rematched && rematched.length) {
                     route.redirect = { path: canonical, status: 308 };
                 }

package/lib/matchPathname.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchPathname = matchPathname;
 exports.matchStringify = matchStringify;
 const pathParserRanker_1 = require("./pathParserRanker");
-const pathTokenizer_1 = require("./pathTokenizer");
 function safelyDecodeURIComponent(value, paramName, optional) {
     try {
         if (Array.isArray(value)) {
@@ -32,7 +31,7 @@ function matchPathname(pattern, pathname) {
         pattern = { path: pattern };
     }
     const { path, caseSensitive = false, end = true, strict = false } = pattern;
-    const pathParser = (0, pathParserRanker_1.tokensToParser)((0, pathTokenizer_1.tokenizePath)(path), {
+    const pathParser = (0, pathParserRanker_1.compilePath)(path, {
         strict,
         end,
         sensitive: caseSensitive
@@ -56,6 +55,6 @@ function matchPathname(pattern, pathname) {
  * @param options
  */
 function matchStringify(path, params, options) {
-    const pathParser = (0, pathParserRanker_1.tokensToParser)((0, pathTokenizer_1.tokenizePath)(path), options);
+    const pathParser = (0, pathParserRanker_1.compilePath)(path, options);
     return pathParser.stringify(params);
 }

package/lib/matchRoutes.d.ts

@@ -6,6 +6,12 @@ export declare function rankRouteBranches<T extends [string, ...any[]]>(branches
 export interface IMatchRoutesOptions {
     strict?: boolean;
 }
+export type RoutesMatcher<T extends IRouteBaseObject> = (location: string | PartialLocation, basename?: string) => IRouteMatch<T>[] | null;
+/**
+ * Flattens and ranks the routes once, on the first match, and reuses them for
+ * every match after. The routes must not be changed in place once matched.
+ */
+export declare function createRoutesMatcher<T extends IRouteBaseObject>(routes: T[], options?: IMatchRoutesOptions): RoutesMatcher<T>;
 export declare function matchRoutes<T extends IRouteBaseObject>(routes: T[], location: string | PartialLocation, basename?: string, options?: IMatchRoutesOptions): IRouteMatch<T>[] | null;
 /**
  * When strict trailing-slash routing is enabled, a pathname that does not

package/lib/matchRoutes.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rankRouteBranches = rankRouteBranches;
+exports.createRoutesMatcher = createRoutesMatcher;
 exports.matchRoutes = matchRoutes;
 exports.getTrailingSlashRedirectPath = getTrailingSlashRedirectPath;
 const matchPathname_1 = require("./matchPathname");
 const utils_1 = require("./utils");
 const pathParserRanker_1 = require("./pathParserRanker");
-const pathTokenizer_1 = require("./pathTokenizer");
 function matchRouteBranch(branch, pathname, strict = false) {
     let routes = branch[1];
     let matchedPathname = '/';
@@ -41,8 +41,7 @@ function rankRouteBranches(branches) {
     }
     const normalizedPaths = branches.map((branch, index) => {
         const [path, routes] = branch;
-        return Object.assign(Object.assign({}, (0, pathParserRanker_1.tokensToParser)((0, pathTokenizer_1.tokenizePath)(path), undefined, { routes })), { path,
-            index });
+        return Object.assign(Object.assign({}, (0, pathParserRanker_1.compilePath)(path)), { score: (0, pathParserRanker_1.getBranchScore)(path, routes), index });
     });
     normalizedPaths.sort((a, b) => (0, pathParserRanker_1.comparePathParserScore)(a, b));
     const newBranches = [];
@@ -76,8 +75,24 @@ function flattenRoutes(routes, branches = [], parentPath = '', parentRoutes = []
     });
     return branches;
 }
-function matchRoutes(routes, location, basename = '', options = {}) {
-    const { strict = false } = options;
+// Everything matching reads from the routes: each array and its items, and the
+// path, caseSensitive and children of each route.
+function snapshotRoutes(routes, snapshot = []) {
+    snapshot.push(routes, routes.length);
+    routes.forEach(route => {
+        snapshot.push(route, route.path, route.caseSensitive, route.children);
+        if (route.children) {
+            snapshotRoutes(route.children, snapshot);
+        }
+    });
+    return snapshot;
+}
+function isSameSnapshot(a, b) {
+    return a.length === b.length && a.every((value, i) => value === b[i]);
+}
+// The branches are only got once the basename has matched, so a route that
+// fails to compile does not throw for a pathname outside the basename.
+function matchBranches(getBranches, location, basename, strict) {
     if (typeof location === 'string') {
         location = (0, utils_1.resolvePath)(location);
     }
@@ -92,8 +107,7 @@ function matchRoutes(routes, location, basename = '', options = {}) {
             return null;
         }
     }
-    let branches = flattenRoutes(routes);
-    branches = rankRouteBranches(branches);
+    const branches = getBranches();
     let matches = null;
     for (let i = 0; matches == null && i < branches.length; ++i) {
         // TODO: Match on search, state too?
@@ -101,6 +115,36 @@ function matchRoutes(routes, location, basename = '', options = {}) {
     }
     return matches;
 }
+/**
+ * Flattens and ranks the routes once, on the first match, and reuses them for
+ * every match after. The routes must not be changed in place once matched.
+ */
+function createRoutesMatcher(routes, options = {}) {
+    const { strict = false } = options;
+    let branches;
+    // development only, to warn about routes changed in place after the first match
+    let snapshot;
+    const getBranches = () => {
+        if (!branches) {
+            branches = rankRouteBranches(flattenRoutes(routes));
+            if (utils_1.isDev) {
+                snapshot = snapshotRoutes(routes);
+            }
+        }
+        else if (snapshot && !isSameSnapshot(snapshot, snapshotRoutes(routes))) {
+            (0, utils_1.warning)(false, `Routes were changed in place after they had been matched. ` +
+                `Matching does not fully apply such changes and may return wrong ` +
+                `results, use router.replaceRoutes() to change the routes instead.`);
+            snapshot = undefined;
+        }
+        return branches;
+    };
+    return (location, basename = '') => matchBranches(getBranches, location, basename, strict);
+}
+function matchRoutes(routes, location, basename = '', options = {}) {
+    const { strict = false } = options;
+    return matchBranches(() => rankRouteBranches(flattenRoutes(routes)), location, basename, strict);
+}
 /**
  * When strict trailing-slash routing is enabled, a pathname that does not
  * match any route may be a non-canonical variant (e.g. `/foo/` for a route

package/lib/pathParserRanker.d.ts

@@ -55,6 +55,14 @@ export type PathParserOptions = Pick<_PathParserOptions, 'end' | 'sensitive' | '
 export declare function tokensToParser(segments: Array<Token[]>, extraOptions?: _PathParserOptions, branchInfo?: {
     routes: IRouteRecord[];
 }): PathParser;
+/**
+ * Returns the parser of a path, compiled once per path and options.
+ */
+export declare function compilePath(path: string, options?: PathParserOptions): PathParser;
+/**
+ * The score of a branch, without changing the cached score of its path.
+ */
+export declare function getBranchScore(path: string, routes?: IRouteRecord[]): Array<number[]>;
 /**
  * Compare function that can be used with `sort` to sort an array of PathParser
  * @param a - first PathParser

package/lib/pathParserRanker.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokensToParser = tokensToParser;
+exports.compilePath = compilePath;
+exports.getBranchScore = getBranchScore;
 exports.comparePathParserScore = comparePathParserScore;
+const pathTokenizer_1 = require("./pathTokenizer");
 // default pattern for a param: non greedy everything but /
 const BASE_PARAM_PATTERN = '[^/]+?';
 const BASE_PATH_PARSER_OPTIONS = {
@@ -40,7 +43,6 @@ function endsAtSeparator(segments) {
  * @returns a PathParser
  */
 function tokensToParser(segments, extraOptions, branchInfo) {
-    var _a;
     const options = Object.assign({}, BASE_PATH_PARSER_OPTIONS, extraOptions);
     /**
      * end with *, eg: /* /a* /a/*
@@ -262,17 +264,7 @@ function tokensToParser(segments, extraOptions, branchInfo) {
         }
         return path;
     }
-    /**
-     * To make sure the score of pageBranch is always higher priority
-     * than the layoutRoute.
-     * We append a bonus score if the last route is an empty path.
-     */
-    if (branchInfo === null || branchInfo === void 0 ? void 0 : branchInfo.routes) {
-        const lastRoutePath = (_a = branchInfo.routes[branchInfo.routes.length - 1]) === null || _a === void 0 ? void 0 : _a.path;
-        if (lastRoutePath === '') {
-            score.push([0.1 /* PathScore.BonusEmptyStringPath */]);
-        }
-    }
+    score = withBranchBonus(score, branchInfo === null || branchInfo === void 0 ? void 0 : branchInfo.routes);
     return {
         re,
         score,
@@ -281,6 +273,45 @@ function tokensToParser(segments, extraOptions, branchInfo) {
         stringify
     };
 }
+// Parsers are cached rather than tokens: tokensToParser mutates the tokens of a
+// catch-all path, so sharing them would leak one call's options into another.
+// Past the limit new paths are compiled without being cached.
+const PATH_PARSER_CACHE_LIMIT = 10000;
+const pathParserCache = new Map();
+/**
+ * Returns the parser of a path, compiled once per path and options.
+ */
+function compilePath(path, options = {}) {
+    const { end = true, strict = false, sensitive = false } = options;
+    const cacheKey = `${+end}${+strict}${+sensitive}${path}`;
+    let parser = pathParserCache.get(cacheKey);
+    if (!parser) {
+        parser = tokensToParser((0, pathTokenizer_1.tokenizePath)(path), { end, strict, sensitive });
+        if (pathParserCache.size < PATH_PARSER_CACHE_LIMIT) {
+            pathParserCache.set(cacheKey, parser);
+        }
+    }
+    return parser;
+}
+/**
+ * To make sure the score of pageBranch is always higher priority
+ * than the layoutRoute.
+ * We append a bonus score if the last route is an empty path.
+ * Returns a new array rather than changing the given score.
+ */
+function withBranchBonus(score, routes) {
+    var _a;
+    const lastRoutePath = (_a = routes === null || routes === void 0 ? void 0 : routes[routes.length - 1]) === null || _a === void 0 ? void 0 : _a.path;
+    return lastRoutePath === ''
+        ? score.concat([[0.1 /* PathScore.BonusEmptyStringPath */]])
+        : score;
+}
+/**
+ * The score of a branch, without changing the cached score of its path.
+ */
+function getBranchScore(path, routes) {
+    return withBranchBonus(compilePath(path).score, routes);
+}
 /**
  * Compares an array of numbers as used in PathParser.score and returns a
  * number. This function can be used to `sort` an array

package/lib/router.js

@@ -76,9 +76,7 @@ class Router {
             return this._history.resolve(to, from);
         };
         this.match = (to) => {
-            const { _routes: routes, _strictTrailingSlash: strict } = this;
-            const matches = (0, matchRoutes_1.matchRoutes)(routes, to, undefined, { strict });
-            return matches || [];
+            return this._matchRoutes(to) || [];
         };
         this.replaceRoutes = (routes) => {
             if (this._ready) {
@@ -95,6 +93,9 @@ class Router {
                 this._cancleHandler = null;
             }
             this._routes = (0, createRoutesFromArray_1.createRoutesFromArray)(routes);
+            this._matchRoutes = (0, matchRoutes_1.createRoutesMatcher)(this._routes, {
+                strict: this._strictTrailingSlash
+            });
             this._current = START;
             const setup = () => this._history.setup();
             this._history.transitionTo(this._getCurrent(), {
@@ -105,6 +106,9 @@ class Router {
         this._history = history;
         this._routes = (0, createRoutesFromArray_1.createRoutesFromArray)(routes);
         this._strictTrailingSlash = strictTrailingSlash;
+        this._matchRoutes = (0, matchRoutes_1.createRoutesMatcher)(this._routes, {
+            strict: strictTrailingSlash
+        });
         this._current = START;
         this._history.doTransition = this._doTransition.bind(this);
     }
@@ -295,7 +299,7 @@ class Router {
         if (this._strictTrailingSlash && !matches.length) {
             const canonical = (0, matchRoutes_1.getTrailingSlashRedirectPath)(parsedPath.pathname || '/');
             if (canonical) {
-                const rematched = (0, matchRoutes_1.matchRoutes)(this._routes, Object.assign(Object.assign({}, parsedPath), { pathname: canonical }), undefined, { strict: true });
+                const rematched = this._matchRoutes(Object.assign(Object.assign({}, parsedPath), { pathname: canonical }));
                 if (rematched && rematched.length) {
                     route.redirect = { path: canonical, status: 308 };
                 }

package/package.json

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