@viewfly/router 2.0.0 → 2.0.1

package/bundles/index.d.ts

@@ -104,6 +104,8 @@ interface NavigatorHooks {
 declare class BrowserNavigator extends Navigator {
     private hooks;
     onUrlChanged: Observable<void>;
+    /** 挂载在 location 上的路径前缀；'' 或 '/' 表示站点根，不做剥离 */
+    private get basePathPrefix();
     get pathname(): string;
     private urlParser;
     urlTree: UrlTree;

package/bundles/index.esm.js

@@ -343,9 +343,18 @@ function formatQueryParams(queryParams) {
     return params.join('&');
 }
 let BrowserNavigator = class BrowserNavigator extends Navigator {
+    /** 挂载在 location 上的路径前缀；'' 或 '/' 表示站点根，不做剥离 */
+    get basePathPrefix() {
+        return this.baseUrl === '/' || this.baseUrl === '' ? '' : this.baseUrl;
+    }
     get pathname() {
         const pathname = location.pathname;
-        return pathname.startsWith(this.baseUrl) ? pathname.substring(this.baseUrl.length) : pathname;
+        if (!this.basePathPrefix) {
+            return pathname;
+        }
+        return pathname.startsWith(this.basePathPrefix)
+            ? pathname.substring(this.basePathPrefix.length)
+            : pathname;
     }
     constructor(baseUrl, hooks = {}) {
         super(baseUrl);
@@ -390,7 +399,7 @@ let BrowserNavigator = class BrowserNavigator extends Navigator {
             this.urlTree = this.getUrlTree();
             this.urlChangeEvent.next();
         }));
-        if (!this.pathname.startsWith(this.baseUrl)) {
+        if (this.basePathPrefix && !location.pathname.startsWith(this.basePathPrefix)) {
             history.replaceState(null, '', this.baseUrl);
         }
     }

package/bundles/index.js

@@ -345,9 +345,18 @@ function formatQueryParams(queryParams) {
     return params.join('&');
 }
 exports.BrowserNavigator = class BrowserNavigator extends Navigator {
+    /** 挂载在 location 上的路径前缀；'' 或 '/' 表示站点根，不做剥离 */
+    get basePathPrefix() {
+        return this.baseUrl === '/' || this.baseUrl === '' ? '' : this.baseUrl;
+    }
     get pathname() {
         const pathname = location.pathname;
-        return pathname.startsWith(this.baseUrl) ? pathname.substring(this.baseUrl.length) : pathname;
+        if (!this.basePathPrefix) {
+            return pathname;
+        }
+        return pathname.startsWith(this.basePathPrefix)
+            ? pathname.substring(this.basePathPrefix.length)
+            : pathname;
     }
     constructor(baseUrl, hooks = {}) {
         super(baseUrl);
@@ -392,7 +401,7 @@ exports.BrowserNavigator = class BrowserNavigator extends Navigator {
             this.urlTree = this.getUrlTree();
             this.urlChangeEvent.next();
         }));
-        if (!this.pathname.startsWith(this.baseUrl)) {
+        if (this.basePathPrefix && !location.pathname.startsWith(this.basePathPrefix)) {
             history.replaceState(null, '', this.baseUrl);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/router",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A routing library based on the Viewfly framework that can be run in the browser or Nodejs background.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",