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

package/dist/history/abstract.d.ts

@@ -9,7 +9,7 @@ export declare class AbstractHistory extends BaseRouterHistory {
     }): Promise<void>;
     destroy(): void;
     setupListeners(): void;
-    isSameHost(location: RouterRawLocation, route: Route): any;
+    isSameHost(location: RouterRawLocation, route: Route): boolean;
     handleOutside(location: RouterRawLocation, replace?: boolean, isTriggerWithWindow?: boolean): boolean;
     push(location: RouterRawLocation): Promise<void>;
     /**
@@ -22,7 +22,7 @@ export declare class AbstractHistory extends BaseRouterHistory {
      */
     replaceWindow(location: RouterRawLocation): Promise<void>;
     jump(location: RouterRawLocation, replace?: boolean): Promise<void>;
-    private _jump;
+    _jump(location: RouterRawLocation, replace?: boolean, isTriggerWithWindow?: boolean): Promise<void>;
     go(delta: number): void;
     forward(): void;
     back(): void;

package/dist/history/abstract.mjs

@@ -7,7 +7,6 @@ export class AbstractHistory extends BaseRouterHistory {
     super(router);
     this.index = -1;
     this.stack = [];
-    this.init();
   }
   async init({ replace } = { replace: true }) {
     const { initUrl } = this.router.options;
@@ -35,7 +34,8 @@ export class AbstractHistory extends BaseRouterHistory {
   }
   // 处理外站跳转逻辑
   handleOutside(location, replace = false, isTriggerWithWindow = false) {
-    const { flag, route } = isPathWithProtocolOrDomain(location);
+    const base = this.router.base;
+    const { flag, route } = isPathWithProtocolOrDomain(location, base);
     if (!flag) {
       return false;
     }

package/dist/history/base.d.ts

@@ -8,7 +8,7 @@ export declare abstract class BaseRouterHistory implements RouterHistory {
     /**
      * 路由是否冻结
      */
-    get isFrozen(): any;
+    get isFrozen(): boolean;
     /**
      * 匹配的当前路由
      */

package/dist/history/html.d.ts

@@ -1,8 +1,16 @@
-import { type RouterInstance, type RouterRawLocation } from '../types';
+import type { RouterInstance, RouterRawLocation } from '../types';
 import { BaseRouterHistory } from './base';
 export declare class HtmlHistory extends BaseRouterHistory {
     constructor(router: RouterInstance);
-    getCurrentLocation(): any;
+    getCurrentLocation(): {
+        state: any;
+        query?: Record<string, string | undefined>;
+        queryArray: Record<string, string[]>;
+        params?: Record<string, string>;
+        hash?: string;
+        path: string;
+        base: string;
+    };
     onPopState: (e: PopStateEvent) => void;
     init({ replace }?: {
         replace?: boolean;

package/dist/history/html.mjs

@@ -94,7 +94,8 @@ export class HtmlHistory extends BaseRouterHistory {
   }
   // 处理外站跳转逻辑
   handleOutside(location, replace = false, isTriggerWithWindow = false) {
-    const { flag, route } = isPathWithProtocolOrDomain(location);
+    const base = this.router.base;
+    const { flag, route } = isPathWithProtocolOrDomain(location, base);
     const router = this.router;
     const { handleOutside, validateOutside } = router.options;
     const isSameHost = !flag || window.location.hostname === route.hostname;
@@ -103,13 +104,14 @@ export class HtmlHistory extends BaseRouterHistory {
         return false;
       }
     }
-    if (handleOutside == null ? void 0 : handleOutside({
+    const res = handleOutside == null ? void 0 : handleOutside({
       router,
       route,
       replace,
       isTriggerWithWindow,
       isSameHost
-    })) {
+    });
+    if (res === false) {
       return true;
     }
     if (replace) {

package/dist/history/index.mjs

@@ -1,4 +1,4 @@
-import { RouterMode } from "../types";
+import { RouterMode } from "../types/index.mjs";
 import { AbstractHistory } from "./abstract.mjs";
 import { HtmlHistory } from "./html.mjs";
 export function createHistory({

package/dist/index.mjs

@@ -1,3 +1,3 @@
 export { createRouter } from "./router.mjs";
-export * from "./types";
+export * from "./types/index.mjs";
 export * from "./utils/index.mjs";

package/dist/router.d.ts

@@ -106,6 +106,6 @@ export declare class Router implements RouterInstance {
     go(delta?: number): void;
     forward(): void;
     back(): void;
-    getRoutes(): any;
+    getRoutes(): import("./types").RouteMatch[];
 }
 export declare function createRouter(options: RouterOptions): RouterInstance;

package/dist/router.mjs

@@ -4,7 +4,7 @@ import { createRouterMatcher } from "./matcher/index.mjs";
 import {
   RouterMode,
   StateLayerConfigKey
-} from "./types";
+} from "./types/index.mjs";
 import { inBrowser, normalizePath, regexDomain } from "./utils/index.mjs";
 const baseValue = Number(Date.now());
 let layerIdOffset = 0;