@esmx/router 3.0.0-rc.13 → 3.0.0-rc.14

package/src/utils/path.spec.ts

@@ -1,18 +1,6 @@
 import { describe, it } from 'vitest';
 
-import {
-    isPathWithProtocolOrDomain,
-    normalizeLocation,
-    normalizePath
-} from './path';
-
-// console.log(normalizeLocation({ path: '/' }));
-
-// console.log(isPathWithProtocolOrDomain('/'));
-// console.log(isPathWithProtocolOrDomain('www.a.b'));
-// console.log(isPathWithProtocolOrDomain('a.b.cm'));
-// console.log(isPathWithProtocolOrDomain('http://a.cn'));
-// console.log(isPathWithProtocolOrDomain('a.b/path'));
+import { normalizeLocation, normalizePath } from './path';
 
 describe('testing normalizeLocation', () => {
     it('testing normal domain', ({ expect }) => {

package/src/utils/path.ts

@@ -1,3 +1,4 @@
+import normalizeUrl from 'normalize-url';
 import URLParse from 'url-parse';
 
 import type {
@@ -15,7 +16,7 @@ import {
     encodeQueryValue
 } from './encoding';
 import { isValidValue } from './utils';
-import { warn } from './warn';
+import { assert, warn } from './warn';
 
 /**
  * 判断路径是否以 http 或 https 开头 或者直接是域名开头
@@ -270,7 +271,10 @@ export function normalizeLocation(
 /**
  * 判断路径是否以协议或域名开头
  */
-export function isPathWithProtocolOrDomain(location: RouterRawLocation): {
+export function isPathWithProtocolOrDomain(
+    location: RouterRawLocation,
+    base: RouterBase = ''
+): {
     /**
      * 是否以协议或域名开头
      */
@@ -282,6 +286,17 @@ export function isPathWithProtocolOrDomain(location: RouterRawLocation): {
 } {
     let url = '';
     let state = {};
+    let baseString = '';
+    if (typeof base === 'string') {
+        baseString = base;
+    } else {
+        baseString = base({
+            fullPath: '',
+            query: {},
+            queryArray: {},
+            hash: ''
+        });
+    }
 
     if (typeof location === 'string') {
         url = location;
@@ -303,51 +318,56 @@ export function isPathWithProtocolOrDomain(location: RouterRawLocation): {
         });
     }
 
-    // 如果以 scheme 协议开头 并且不是 http(s) 协议开头 则认为是外站跳转
-    if (regexScheme.test(url) && !regexHttpScheme.test(url)) {
+    try {
+        url = normalizeUrl(url, {
+            stripWWW: false,
+            removeQueryParameters: false
+        });
+    } catch (error) {
         try {
-            const {
-                hash,
-                host,
-                hostname,
-                href,
-                origin,
-                pathname,
-                port,
-                protocol,
-                search
-            } = new URL(url);
-            const route: Route = {
-                hash,
-                host,
-                hostname,
-                href,
-                origin,
-                pathname,
-                port,
-                protocol,
-                search,
-                params: {},
-                query: {},
-                queryArray: {},
-                state,
-                meta: {},
-                path: pathname,
-                fullPath: url,
-                base: '',
-                matched: []
-            };
-            return {
-                flag: true,
-                route
-            };
+            url = new URL(url, baseString).href;
         } catch (error) {
-            warn(error);
+            assert(false, `Invalid URL: ${url}`);
         }
     }
 
-    if (!/^https?:\/\//i.test(url)) {
-        url = `http://${url}`;
+    // 如果以 scheme 协议开头 并且不是 http(s) 协议开头 则认为是外站跳转
+    if (regexScheme.test(url) && !regexHttpScheme.test(url)) {
+        const {
+            hash,
+            host,
+            hostname,
+            href,
+            origin,
+            pathname,
+            port,
+            protocol,
+            search
+        } = new URL(url);
+        const route: Route = {
+            hash,
+            host,
+            hostname,
+            href,
+            origin,
+            pathname,
+            port,
+            protocol,
+            search,
+            params: {},
+            query: {},
+            queryArray: {},
+            state,
+            meta: {},
+            path: pathname,
+            fullPath: url,
+            base: '',
+            matched: []
+        };
+        return {
+            flag: true,
+            route
+        };
     }
 
     const {