@shuvi/router 1.0.45-pre.0 → 1.0.46

package/esm/matchRoutes.d.ts

@@ -3,4 +3,4 @@ export interface IRouteBaseObject<Element = any> extends Omit<IRouteRecord<Eleme
     children?: IRouteBaseObject<Element>[];
 }
 export declare function rankRouteBranches<T extends [string, ...any[]]>(branches: T[]): T[];
-export declare function matchRoutes<T extends IRouteBaseObject>(routes: T[], location: string | PartialLocation): IRouteMatch<T>[] | null;
+export declare function matchRoutes<T extends IRouteBaseObject>(routes: T[], location: string | PartialLocation, basename?: string): IRouteMatch<T>[] | null;

package/esm/matchRoutes.js

@@ -1,5 +1,5 @@
 import { matchPathname } from './matchPathname';
-import { joinPaths, resolvePath } from './utils';
+import { joinPaths, normalizeBase, resolvePath, stripBase } from './utils';
 import { tokensToParser, comparePathParserScore } from './pathParserRanker';
 import { tokenizePath } from './pathTokenizer';
 function matchRouteBranch(branch, pathname) {
@@ -61,15 +61,20 @@ function flattenRoutes(routes, branches = [], parentPath = '', parentRoutes = []
     });
     return branches;
 }
-export function matchRoutes(routes, location) {
+export function matchRoutes(routes, location, basename = '') {
     if (typeof location === 'string') {
         location = resolvePath(location);
     }
-    let pathname = location.pathname;
-    // If pathname is empty, it means invalid pathname and cannot match any route.
-    // This only happens when basename is set but url is not start with basename
-    if (!pathname) {
-        return null;
+    let pathname = location.pathname || '/';
+    if (basename) {
+        const normalizedBasename = normalizeBase(basename);
+        const pathnameWithoutBase = stripBase(pathname, normalizedBasename);
+        if (pathnameWithoutBase) {
+            pathname = pathnameWithoutBase;
+        }
+        else {
+            return null;
+        }
     }
     let branches = flattenRoutes(routes);
     branches = rankRouteBranches(branches);

package/esm/utils/path.d.ts

@@ -1,18 +1,19 @@
 import * as qs from 'query-string';
-import { PathRecord, Path } from '../types';
+import { PathRecord, PartialPath, Path } from '../types';
 export declare const trimTrailingSlashes: (path: string) => string;
 export declare const normalizeSlashes: (path: string) => string;
 export declare const joinPaths: (paths: string[]) => string;
 export declare const splitPath: (path: string) => string[];
 export declare function normalizeBase(base: string): string;
 export declare function parseQuery(queryStr: string): qs.ParsedQuery<string>;
-export declare function pathToString({ pathname, search, hash, query }: Path, basename?: string): string;
+export declare function pathToString({ pathname, search, hash, query }: PartialPath, basename?: string): string;
 /**
  * Parses a string URL path into its separate pathname, search, and hash components.
  */
 export declare function resolvePath(to: PathRecord, fromPathname?: string): Path;
 /**
  * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
  *
  * @param pathname - location.pathname
  * @param base - base to strip off

package/esm/utils/path.js

@@ -24,9 +24,6 @@ export function pathToString({ pathname = '/', search = '', hash = '', query = {
     }
     const pathString = pathname + search + hash;
     if (basename) {
-        if (pathString === '/') {
-            return basename;
-        }
         return joinPaths([basename, pathString]);
     }
     return pathString;
@@ -98,6 +95,7 @@ export function resolvePath(to, fromPathname = '/') {
 }
 /**
  * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
  *
  * @param pathname - location.pathname
  * @param base - base to strip off

package/lib/matchRoutes.d.ts

@@ -3,4 +3,4 @@ export interface IRouteBaseObject<Element = any> extends Omit<IRouteRecord<Eleme
     children?: IRouteBaseObject<Element>[];
 }
 export declare function rankRouteBranches<T extends [string, ...any[]]>(branches: T[]): T[];
-export declare function matchRoutes<T extends IRouteBaseObject>(routes: T[], location: string | PartialLocation): IRouteMatch<T>[] | null;
+export declare function matchRoutes<T extends IRouteBaseObject>(routes: T[], location: string | PartialLocation, basename?: string): IRouteMatch<T>[] | null;

package/lib/matchRoutes.js

@@ -65,15 +65,20 @@ function flattenRoutes(routes, branches = [], parentPath = '', parentRoutes = []
     });
     return branches;
 }
-function matchRoutes(routes, location) {
+function matchRoutes(routes, location, basename = '') {
     if (typeof location === 'string') {
         location = (0, utils_1.resolvePath)(location);
     }
-    let pathname = location.pathname;
-    // If pathname is empty, it means invalid pathname and cannot match any route.
-    // This only happens when basename is set but url is not start with basename
-    if (!pathname) {
-        return null;
+    let pathname = location.pathname || '/';
+    if (basename) {
+        const normalizedBasename = (0, utils_1.normalizeBase)(basename);
+        const pathnameWithoutBase = (0, utils_1.stripBase)(pathname, normalizedBasename);
+        if (pathnameWithoutBase) {
+            pathname = pathnameWithoutBase;
+        }
+        else {
+            return null;
+        }
     }
     let branches = flattenRoutes(routes);
     branches = rankRouteBranches(branches);

package/lib/utils/path.d.ts

@@ -1,18 +1,19 @@
 import * as qs from 'query-string';
-import { PathRecord, Path } from '../types';
+import { PathRecord, PartialPath, Path } from '../types';
 export declare const trimTrailingSlashes: (path: string) => string;
 export declare const normalizeSlashes: (path: string) => string;
 export declare const joinPaths: (paths: string[]) => string;
 export declare const splitPath: (path: string) => string[];
 export declare function normalizeBase(base: string): string;
 export declare function parseQuery(queryStr: string): qs.ParsedQuery<string>;
-export declare function pathToString({ pathname, search, hash, query }: Path, basename?: string): string;
+export declare function pathToString({ pathname, search, hash, query }: PartialPath, basename?: string): string;
 /**
  * Parses a string URL path into its separate pathname, search, and hash components.
  */
 export declare function resolvePath(to: PathRecord, fromPathname?: string): Path;
 /**
  * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
  *
  * @param pathname - location.pathname
  * @param base - base to strip off

package/lib/utils/path.js

@@ -33,9 +33,6 @@ function pathToString({ pathname = '/', search = '', hash = '', query = {} }, ba
     }
     const pathString = pathname + search + hash;
     if (basename) {
-        if (pathString === '/') {
-            return basename;
-        }
         return (0, exports.joinPaths)([basename, pathString]);
     }
     return pathString;
@@ -109,6 +106,7 @@ function resolvePath(to, fromPathname = '/') {
 exports.resolvePath = resolvePath;
 /**
  * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
  *
  * @param pathname - location.pathname
  * @param base - base to strip off

package/package.json

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