wevu 7.2.1 → 7.3.0

package/dist/dev/router/createRouter.mjs

@@ -1,6 +1,5 @@
-import { getCurrentMiniProgramTabBarPagePaths, getMiniProgramGlobalObject } from "../runtime/platform.mjs";
-import { setActiveRouter } from "./instance.mjs";
-import { DEFAULT_INITIAL_NAVIGATION_TIMEOUT, registerInitialNavigationRunner } from "./initialNavigation.mjs";
+import { getCurrentMiniProgramGlobalObject } from "../runtime/platform/current.mjs";
+import { getCurrentMiniProgramTabBarPagePaths } from "../runtime/platform.mjs";
 import { installRouteStateSyncOnNativeRouter, notifyRouteStateSync } from "./routeSync.mjs";
 import { resolvePath } from "../routerInternal/path.mjs";
 import { parseQuery, stringifyQuery } from "../routerInternal/query.mjs";
@@ -14,6 +13,8 @@ import { NavigationFailureType } from "./types.mjs";
 import { createNavigationFailure, executeNavigationMethod } from "./navigationCore.mjs";
 import { createNavigationResultController } from "./navigationResult.mjs";
 import { resolveBackNavigationTarget, runBackNavigationGuards } from "./backNavigation.mjs";
+import { setActiveRouter } from "./instance.mjs";
+import { DEFAULT_INITIAL_NAVIGATION_TIMEOUT, registerInitialNavigationRunner } from "./initialNavigation.mjs";
 import { navigateWithTarget } from "./navigationTarget.mjs";
 import { createNavigationApi } from "./navigationApi.mjs";
 import { resolveRouteLocation } from "./resolve.mjs";
@@ -25,28 +26,27 @@ import { createRouteStateController, useNativeRouter } from "./useRoute.mjs";
 * @description 创建高阶路由导航器（对齐 Vue Router 的 createRouter 心智）
 */
 function createRouter(optionsInput = {}) {
-	var _options$maxRedirects, _options$initialNavig, _options$paramsMode, _options$rejectOnErro, _options$parseQuery, _options$stringifyQue, _options$tabBarEntrie;
 	const options = optionsInput;
 	const nativeRouter = useNativeRouter();
-	installRouteStateSyncOnNativeRouter(getMiniProgramGlobalObject());
+	installRouteStateSyncOnNativeRouter(getCurrentMiniProgramGlobalObject());
 	const beforeEachGuards = /* @__PURE__ */ new Set();
 	const beforeResolveGuards = /* @__PURE__ */ new Set();
 	const afterEachHooks = /* @__PURE__ */ new Set();
 	const errorHandlers = /* @__PURE__ */ new Set();
-	const maxRedirects = (_options$maxRedirects = options.maxRedirects) !== null && _options$maxRedirects !== void 0 ? _options$maxRedirects : 10;
+	const maxRedirects = options.maxRedirects ?? 10;
 	const initialNavigationMode = options.initialNavigationMode === "blocking" ? "blocking" : "eager";
-	const initialNavigationTimeout = Number.isFinite(options.initialNavigationTimeout) && ((_options$initialNavig = options.initialNavigationTimeout) !== null && _options$initialNavig !== void 0 ? _options$initialNavig : 0) > 0 ? Math.max(1, Math.trunc(options.initialNavigationTimeout)) : DEFAULT_INITIAL_NAVIGATION_TIMEOUT;
-	const paramsMode = (_options$paramsMode = options.paramsMode) !== null && _options$paramsMode !== void 0 ? _options$paramsMode : "loose";
-	const rejectOnError = (_options$rejectOnErro = options.rejectOnError) !== null && _options$rejectOnErro !== void 0 ? _options$rejectOnErro : true;
+	const initialNavigationTimeout = Number.isFinite(options.initialNavigationTimeout) && (options.initialNavigationTimeout ?? 0) > 0 ? Math.max(1, Math.trunc(options.initialNavigationTimeout)) : DEFAULT_INITIAL_NAVIGATION_TIMEOUT;
+	const paramsMode = options.paramsMode ?? "loose";
+	const rejectOnError = options.rejectOnError ?? true;
 	const routeResolveCodec = {
-		parseQuery: (_options$parseQuery = options.parseQuery) !== null && _options$parseQuery !== void 0 ? _options$parseQuery : parseQuery,
-		stringifyQuery: (_options$stringifyQue = options.stringifyQuery) !== null && _options$stringifyQue !== void 0 ? _options$stringifyQue : stringifyQuery
+		parseQuery: options.parseQuery ?? parseQuery,
+		stringifyQuery: options.stringifyQuery ?? stringifyQuery
 	};
 	const readyPromise = Promise.resolve();
 	const routeEntries = resolveRouteOptionEntries(options);
 	warnDuplicateRouteEntries(routeEntries);
 	const namedRouteLookup = createNamedRouteLookup(routeEntries);
-	const normalizedTabBarEntries = ((_options$tabBarEntrie = options.tabBarEntries) !== null && _options$tabBarEntrie !== void 0 ? _options$tabBarEntrie : getCurrentMiniProgramTabBarPagePaths()).map((path) => resolvePath(path, "")).filter(Boolean);
+	const normalizedTabBarEntries = (options.tabBarEntries ?? getCurrentMiniProgramTabBarPagePaths()).map((path) => resolvePath(path, "")).filter(Boolean);
 	const tabBarPathSet = new Set(normalizedTabBarEntries);
 	const routeRegistry = createRouteRegistry(namedRouteLookup);
 	let managedNavigationCount = 0;
@@ -99,7 +99,7 @@ function createRouter(optionsInput = {}) {
 			beforeResolveGuards,
 			resolveWithCodec
 		}).then((result) => {
-			return emitObservedNavigationAfterEach === null || emitObservedNavigationAfterEach === void 0 ? void 0 : emitObservedNavigationAfterEach(result);
+			return emitObservedNavigationAfterEach?.(result);
 		}).finally(() => {
 			pendingExternalRouteSyncPath = void 0;
 		});
@@ -144,7 +144,7 @@ function createRouter(optionsInput = {}) {
 	function resolveManagedRoutePath(to) {
 		try {
 			return resolveWithCodec(to, route.path).fullPath;
-		} catch (_unused) {
+		} catch {
 			return;
 		}
 	}
@@ -219,9 +219,8 @@ function createRouter(optionsInput = {}) {
 		options: routerOptions,
 		currentRoute: route,
 		install(app) {
-			var _config;
 			setActiveRouter(router);
-			const globalProperties = app === null || app === void 0 || (_config = app.config) === null || _config === void 0 ? void 0 : _config.globalProperties;
+			const globalProperties = app?.config?.globalProperties;
 			if (globalProperties) globalProperties.$router = router;
 		},
 		resolve,
@@ -230,14 +229,8 @@ function createRouter(optionsInput = {}) {
 		},
 		push: (to) => runManagedNavigation(() => navigationApi.push(to), resolveManagedRoutePath(to)),
 		replace: (to) => runManagedNavigation(() => navigationApi.replace(to), resolveManagedRoutePath(to)),
-		back: (delta) => {
-			var _resolveBackNavigatio;
-			return runManagedNavigation(() => navigationApi.back(delta), (_resolveBackNavigatio = resolveBackNavigationTarget(delta !== null && delta !== void 0 ? delta : 1, route, resolveWithCodec)) === null || _resolveBackNavigatio === void 0 ? void 0 : _resolveBackNavigatio.fullPath);
-		},
-		go: (delta) => {
-			var _resolveBackNavigatio2;
-			return runManagedNavigation(() => navigationApi.go(delta), delta < 0 ? (_resolveBackNavigatio2 = resolveBackNavigationTarget(Math.abs(delta), route, resolveWithCodec)) === null || _resolveBackNavigatio2 === void 0 ? void 0 : _resolveBackNavigatio2.fullPath : void 0);
-		},
+		back: (delta) => runManagedNavigation(() => navigationApi.back(delta), resolveBackNavigationTarget(delta ?? 1, route, resolveWithCodec)?.fullPath),
+		go: (delta) => runManagedNavigation(() => navigationApi.go(delta), delta < 0 ? resolveBackNavigationTarget(Math.abs(delta), route, resolveWithCodec)?.fullPath : void 0),
 		forward: () => runManagedNavigation(() => navigationApi.forward()),
 		hasRoute: routeRegistry.hasRoute,
 		getRoutes: routeRegistry.getRoutes,

package/dist/dev/router/createRouter.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createRouter.mjs","names":["typedRouter"],"sources":["../../../src/router/createRouter.ts"],"sourcesContent":["import type { WevuNamedRouteMap } from '../router'\nimport type { RouteResolveCodec } from '../routerInternal/shared'\nimport type { NavigationRunResult } from './navigationResult'\nimport type { RouteStateSyncPayload } from './routeSync'\nimport type {\n  InitialNavigationMode,\n  LocationQueryRaw,\n  NavigationAfterEach,\n  NavigationErrorHandler,\n  NavigationGuard,\n  RouteLocationNormalizedLoaded,\n  RouteLocationRaw,\n  RouterNavigation,\n  UseRouterOptions,\n} from './types'\nimport {\n  cloneRouteMeta,\n  cloneRouteParams,\n  createNamedRouteLookup,\n  createNativeRouteUrl,\n  createRouterOptionsSnapshot,\n  mergeMatchedRouteMeta,\n  normalizeRouteRecordMatched,\n  parseQuery,\n  resolveCurrentRoute,\n  resolveMatchedRouteRecord,\n  resolveNamedRouteLocation,\n  resolvePath,\n  resolveRouteOptionEntries,\n  snapshotRouteLocation,\n  stringifyQuery,\n  warnDuplicateRouteEntries,\n} from '../routerInternal/shared'\nimport { getCurrentMiniProgramTabBarPagePaths, getMiniProgramGlobalObject } from '../runtime/platform'\nimport { resolveBackNavigationTarget, runBackNavigationGuards } from './backNavigation'\nimport { DEFAULT_INITIAL_NAVIGATION_TIMEOUT, registerInitialNavigationRunner } from './initialNavigation'\nimport { setActiveRouter } from './instance'\nimport { createNavigationApi } from './navigationApi'\nimport { createNavigationFailure, executeNavigationMethod } from './navigationCore'\nimport { createNavigationResultController } from './navigationResult'\nimport { navigateWithTarget } from './navigationTarget'\nimport { resolveRouteLocation } from './resolve'\nimport { createRouteRegistry } from './routeRegistry'\nimport { installRouteStateSyncOnNativeRouter, notifyRouteStateSync } from './routeSync'\nimport { NavigationFailureType } from './types'\nimport { createRouteStateController, useNativeRouter } from './useRoute'\n\n/**\n * @description 创建高阶路由导航器（对齐 Vue Router 的 createRouter 心智）\n */\nexport function createRouter<TRouteMap extends object = WevuNamedRouteMap>(\n  optionsInput: UseRouterOptions<NoInfer<TRouteMap>> = {},\n): RouterNavigation<TRouteMap> {\n  // 路由表泛型只约束公开类型；运行时继续使用同一套名称无关的导航引擎。\n  const options = optionsInput as unknown as UseRouterOptions\n  const nativeRouter = useNativeRouter()\n  installRouteStateSyncOnNativeRouter(getMiniProgramGlobalObject())\n  const beforeEachGuards = new Set<NavigationGuard>()\n  const beforeResolveGuards = new Set<NavigationGuard>()\n  const afterEachHooks = new Set<NavigationAfterEach>()\n  const errorHandlers = new Set<NavigationErrorHandler>()\n  const maxRedirects = options.maxRedirects ?? 10\n  const initialNavigationMode: InitialNavigationMode = options.initialNavigationMode === 'blocking' ? 'blocking' : 'eager'\n  const initialNavigationTimeout = Number.isFinite(options.initialNavigationTimeout) && (options.initialNavigationTimeout ?? 0) > 0\n    ? Math.max(1, Math.trunc(options.initialNavigationTimeout!))\n    : DEFAULT_INITIAL_NAVIGATION_TIMEOUT\n  const paramsMode = options.paramsMode ?? 'loose'\n  const rejectOnError = options.rejectOnError ?? true\n  const routeResolveCodec: RouteResolveCodec = {\n    parseQuery: options.parseQuery ?? parseQuery,\n    stringifyQuery: options.stringifyQuery ?? stringifyQuery,\n  }\n  const readyPromise = Promise.resolve()\n  const routeEntries = resolveRouteOptionEntries(options)\n  warnDuplicateRouteEntries(routeEntries)\n  const namedRouteLookup = createNamedRouteLookup(routeEntries)\n  const tabBarEntrySource = options.tabBarEntries ?? getCurrentMiniProgramTabBarPagePaths()\n  const normalizedTabBarEntries = tabBarEntrySource\n    .map(path => resolvePath(path, ''))\n    .filter(Boolean)\n  const tabBarPathSet = new Set(normalizedTabBarEntries)\n  const routeRegistry = createRouteRegistry(namedRouteLookup)\n  let managedNavigationCount = 0\n  let activeManagedRoutePath: string | undefined\n  let pendingManagedRouteSyncPath: string | undefined\n  let pendingExternalRouteSyncPath: string | undefined\n  const routerOptions = createRouterOptionsSnapshot(\n    normalizedTabBarEntries,\n    routeRegistry.getRoutes(),\n    paramsMode,\n    maxRedirects,\n    initialNavigationMode,\n    initialNavigationTimeout,\n    routeResolveCodec,\n    rejectOnError,\n  )\n\n  function enrichRouteRecordState(routeLocation: RouteLocationNormalizedLoaded): RouteLocationNormalizedLoaded {\n    const resolved = { ...routeLocation }\n    resolved.href = resolved.fullPath\n    const matchedResult = resolveMatchedRouteRecord(resolved, namedRouteLookup)\n    if (matchedResult) {\n      const matchedRecord = matchedResult.record\n      if (resolved.name === undefined) {\n        resolved.name = matchedRecord.name\n      }\n      const mergedRouteMeta = mergeMatchedRouteMeta(matchedResult.matchedRecords)\n      if (mergedRouteMeta !== undefined) {\n        resolved.meta = cloneRouteMeta(mergedRouteMeta)\n      }\n      if (matchedResult.params && Object.keys(resolved.params).length === 0) {\n        resolved.params = cloneRouteParams(matchedResult.params)\n      }\n      resolved.matched = matchedResult.matchedRecords.map((record, index, records) => {\n        const leafMatchedPath = index === records.length - 1\n          ? matchedResult.matchedPath\n          : undefined\n        return normalizeRouteRecordMatched(record, leafMatchedPath)\n      })\n    }\n    else {\n      resolved.matched = []\n    }\n    return resolved\n  }\n\n  function resolveWithCodec(to: RouteLocationRaw, currentPath: string): RouteLocationNormalizedLoaded {\n    const rawTo = typeof to === 'string'\n      ? to\n      : resolveNamedRouteLocation(to, namedRouteLookup, paramsMode)\n    return enrichRouteRecordState(resolveRouteLocation(rawTo, currentPath, routeResolveCodec))\n  }\n\n  let route: Readonly<RouteLocationNormalizedLoaded>\n  let emitObservedNavigationAfterEach: ((result: NavigationRunResult) => Promise<void>) | undefined\n\n  function isExternalBackSync(payload: RouteStateSyncPayload): boolean {\n    return payload.source === 'page'\n      || (payload.source === 'native' && payload.method === 'navigateBack')\n  }\n\n  function beforeRouteStateSync(\n    nextRoute: RouteLocationNormalizedLoaded,\n    payload: RouteStateSyncPayload,\n  ) {\n    if (managedNavigationCount > 0 || !isExternalBackSync(payload)) {\n      return\n    }\n\n    if (pendingExternalRouteSyncPath !== undefined) {\n      return\n    }\n\n    if (pendingManagedRouteSyncPath !== undefined) {\n      const expectedPath = pendingManagedRouteSyncPath\n      pendingManagedRouteSyncPath = undefined\n      if (nextRoute.fullPath === expectedPath) {\n        return\n      }\n    }\n\n    if (nextRoute.fullPath === route.fullPath) {\n      return\n    }\n\n    pendingExternalRouteSyncPath = nextRoute.fullPath\n    const from = snapshotRouteLocation(route)\n    void runBackNavigationGuards({\n      target: nextRoute,\n      from,\n      nativeRouter,\n      beforeEachGuards,\n      beforeResolveGuards,\n      resolveWithCodec,\n    }).then((result) => {\n      return emitObservedNavigationAfterEach?.(result)\n    }).finally(() => {\n      pendingExternalRouteSyncPath = undefined\n    })\n  }\n\n  const routeController = createRouteStateController({\n    beforeRouteStateSync,\n    resolveRoute: enrichRouteRecordState,\n  })\n  route = routeController.route\n\n  const resolve = (to: RouteLocationRaw): RouteLocationNormalizedLoaded =>\n    resolveWithCodec(to, route.path)\n\n  const navigationResultController = createNavigationResultController({\n    afterEachHooks,\n    errorHandlers,\n    nativeRouter,\n    rejectOnError,\n  })\n  emitObservedNavigationAfterEach = navigationResultController.emitNavigationAfterEach\n\n  const navigationApi = createNavigationApi({\n    nativeRouter,\n    route,\n    routeResolveCodec,\n    namedRouteLookup,\n    beforeEachGuards,\n    beforeResolveGuards,\n    maxRedirects,\n    tabBarPathSet,\n    resolveWithCodec,\n    settleNavigationResult: navigationResultController.settleNavigationResult,\n  })\n\n  async function runManagedNavigation<T>(navigation: () => Promise<T>, targetPath?: string): Promise<T> {\n    const previousRoutePath = route.fullPath\n    if (targetPath) {\n      activeManagedRoutePath = targetPath\n    }\n    managedNavigationCount += 1\n    try {\n      const result = await navigation()\n      if (route.fullPath !== previousRoutePath) {\n        pendingManagedRouteSyncPath = route.fullPath\n      }\n      return result\n    }\n    finally {\n      managedNavigationCount -= 1\n      if (managedNavigationCount <= 0) {\n        activeManagedRoutePath = undefined\n      }\n    }\n  }\n\n  function resolveManagedRoutePath(to: RouteLocationRaw): string | undefined {\n    try {\n      return resolveWithCodec(to, route.path).fullPath\n    }\n    catch {\n      return undefined\n    }\n  }\n\n  async function runInitialNavigation(\n    page: Parameters<typeof resolveCurrentRoute>[1],\n    query?: LocationQueryRaw,\n    isActive: () => boolean = () => true,\n  ) {\n    return runManagedNavigation(async () => {\n      const from = snapshotRouteLocation(route)\n      const target = enrichRouteRecordState(resolveCurrentRoute(query, page))\n      if (!target.path) {\n        return undefined\n      }\n      if (activeManagedRoutePath === target.fullPath) {\n        notifyRouteStateSync({\n          route: target,\n          source: 'router',\n        })\n        return undefined\n      }\n      const result = await navigateWithTarget({\n        mode: 'push',\n        target,\n        from,\n        nativeRouter,\n        routeResolveCodec,\n        namedRouteLookup,\n        beforeEachGuards,\n        beforeResolveGuards,\n        maxRedirects,\n        tabBarPathSet,\n        resolveWithCodec,\n        executeNative: false,\n        allowSameLocation: true,\n      })\n      if (!isActive()) {\n        return undefined\n      }\n      if (initialNavigationMode === 'blocking' && result.to && result.to.fullPath !== target.fullPath) {\n        const redirectedTarget = result.to\n        const isTabBarTarget = tabBarPathSet.has(redirectedTarget.path)\n        const method = isTabBarTarget ? nativeRouter.switchTab : nativeRouter.redirectTo\n        const nativeResult = await executeNavigationMethod(\n          method as (options: Record<string, any>) => unknown,\n          { url: createNativeRouteUrl(redirectedTarget, routeResolveCodec.stringifyQuery) },\n          redirectedTarget,\n          from,\n        )\n        if (nativeResult) {\n          return nativeResult\n        }\n        notifyRouteStateSync({\n          route: redirectedTarget,\n          source: 'router',\n        })\n        return createNavigationFailure(NavigationFailureType.cancelled, redirectedTarget, from)\n      }\n      return navigationResultController.settleNavigationResult(result)\n    })\n  }\n\n  function beforeEach(guard: NavigationGuard): () => void {\n    beforeEachGuards.add(guard)\n    return () => {\n      beforeEachGuards.delete(guard)\n    }\n  }\n\n  function beforeResolve(guard: NavigationGuard): () => void {\n    beforeResolveGuards.add(guard)\n    return () => {\n      beforeResolveGuards.delete(guard)\n    }\n  }\n\n  function afterEach(hook: NavigationAfterEach): () => void {\n    afterEachHooks.add(hook)\n    return () => {\n      afterEachHooks.delete(hook)\n    }\n  }\n\n  function onError(handler: NavigationErrorHandler): () => void {\n    errorHandlers.add(handler)\n    return () => {\n      errorHandlers.delete(handler)\n    }\n  }\n\n  const router: RouterNavigation = {\n    nativeRouter,\n    options: routerOptions,\n    currentRoute: route,\n    install(app?: unknown): void {\n      setActiveRouter(router)\n      const globalProperties = (app as { config?: { globalProperties?: Record<string, unknown> } } | undefined)?.config?.globalProperties\n      if (globalProperties) {\n        globalProperties.$router = router\n      }\n    },\n    resolve,\n    isReady(): Promise<void> {\n      return readyPromise\n    },\n    push: to => runManagedNavigation(() => navigationApi.push(to), resolveManagedRoutePath(to)),\n    replace: to => runManagedNavigation(() => navigationApi.replace(to), resolveManagedRoutePath(to)),\n    back: delta => runManagedNavigation(\n      () => navigationApi.back(delta),\n      resolveBackNavigationTarget(delta ?? 1, route, resolveWithCodec)?.fullPath,\n    ),\n    go: delta => runManagedNavigation(\n      () => navigationApi.go(delta),\n      delta < 0\n        ? resolveBackNavigationTarget(Math.abs(delta), route, resolveWithCodec)?.fullPath\n        : undefined,\n    ),\n    forward: () => runManagedNavigation(() => navigationApi.forward()),\n    hasRoute: routeRegistry.hasRoute,\n    getRoutes: routeRegistry.getRoutes,\n    addRoute: routeRegistry.addRoute,\n    removeRoute: routeRegistry.removeRoute,\n    clearRoutes: routeRegistry.clearRoutes,\n    beforeEach,\n    beforeResolve,\n    afterEach,\n    onError,\n  }\n\n  setActiveRouter(router)\n  registerInitialNavigationRunner(router, runInitialNavigation, initialNavigationTimeout, initialNavigationMode)\n  const typedRouter = router as unknown as RouterNavigation<TRouteMap>\n  return typedRouter\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAkDA,SAAgB,aACd,eAAqD,CAAC,GACzB;;CAE7B,MAAM,UAAU;CAChB,MAAM,eAAe,gBAAgB;CACrC,oCAAoC,2BAA2B,CAAC;CAChE,MAAM,mCAAmB,IAAI,IAAqB;CAClD,MAAM,sCAAsB,IAAI,IAAqB;CACrD,MAAM,iCAAiB,IAAI,IAAyB;CACpD,MAAM,gCAAgB,IAAI,IAA4B;CACtD,MAAM,wCAAe,QAAQ,qFAAgB;CAC7C,MAAM,wBAA+C,QAAQ,0BAA0B,aAAa,aAAa;CACjH,MAAM,2BAA2B,OAAO,SAAS,QAAQ,wBAAwB,+BAAM,QAAQ,iGAA4B,KAAK,IAC5H,KAAK,IAAI,GAAG,KAAK,MAAM,QAAQ,wBAAyB,CAAC,IACzD;CACJ,MAAM,oCAAa,QAAQ,+EAAc;CACzC,MAAM,yCAAgB,QAAQ,sFAAiB;CAC/C,MAAM,oBAAuC;EAC3C,mCAAY,QAAQ,+EAAc;EAClC,yCAAgB,QAAQ,uFAAkB;CAC5C;CACA,MAAM,eAAe,QAAQ,QAAQ;CACrC,MAAM,eAAe,0BAA0B,OAAO;CACtD,0BAA0B,YAAY;CACtC,MAAM,mBAAmB,uBAAuB,YAAY;CAE5D,MAAM,oDADoB,QAAQ,sFAAiB,qCAAqC,EACvC,CAC9C,KAAI,SAAQ,YAAY,MAAM,EAAE,CAAC,CAAC,CAClC,OAAO,OAAO;CACjB,MAAM,gBAAgB,IAAI,IAAI,uBAAuB;CACrD,MAAM,gBAAgB,oBAAoB,gBAAgB;CAC1D,IAAI,yBAAyB;CAC7B,IAAI;CACJ,IAAI;CACJ,IAAI;CACJ,MAAM,gBAAgB,4BACpB,yBACA,cAAc,UAAU,GACxB,YACA,cACA,uBACA,0BACA,mBACA,aACF;CAEA,SAAS,uBAAuB,eAA6E;EAC3G,MAAM,WAAW,EAAE,GAAG,cAAc;EACpC,SAAS,OAAO,SAAS;EACzB,MAAM,gBAAgB,0BAA0B,UAAU,gBAAgB;EAC1E,IAAI,eAAe;GACjB,MAAM,gBAAgB,cAAc;GACpC,IAAI,SAAS,SAAS,QACpB,SAAS,OAAO,cAAc;GAEhC,MAAM,kBAAkB,sBAAsB,cAAc,cAAc;GAC1E,IAAI,oBAAoB,QACtB,SAAS,OAAO,eAAe,eAAe;GAEhD,IAAI,cAAc,UAAU,OAAO,KAAK,SAAS,MAAM,CAAC,CAAC,WAAW,GAClE,SAAS,SAAS,iBAAiB,cAAc,MAAM;GAEzD,SAAS,UAAU,cAAc,eAAe,KAAK,QAAQ,OAAO,YAAY;IAC9E,MAAM,kBAAkB,UAAU,QAAQ,SAAS,IAC/C,cAAc,cACd;IACJ,OAAO,4BAA4B,QAAQ,eAAe;GAC5D,CAAC;EACH,OAEE,SAAS,UAAU,CAAC;EAEtB,OAAO;CACT;CAEA,SAAS,iBAAiB,IAAsB,aAAoD;EAClG,MAAM,QAAQ,OAAO,OAAO,WACxB,KACA,0BAA0B,IAAI,kBAAkB,UAAU;EAC9D,OAAO,uBAAuB,qBAAqB,OAAO,aAAa,iBAAiB,CAAC;CAC3F;CAEA,IAAI;CACJ,IAAI;CAEJ,SAAS,mBAAmB,SAAyC;EACnE,OAAO,QAAQ,WAAW,UACpB,QAAQ,WAAW,YAAY,QAAQ,WAAW;CAC1D;CAEA,SAAS,qBACP,WACA,SACA;EACA,IAAI,yBAAyB,KAAK,CAAC,mBAAmB,OAAO,GAC3D;EAGF,IAAI,iCAAiC,QACnC;EAGF,IAAI,gCAAgC,QAAW;GAC7C,MAAM,eAAe;GACrB,8BAA8B;GAC9B,IAAI,UAAU,aAAa,cACzB;EAEJ;EAEA,IAAI,UAAU,aAAa,MAAM,UAC/B;EAGF,+BAA+B,UAAU;EACzC,MAAM,OAAO,sBAAsB,KAAK;EACxC,AAAK,wBAAwB;GAC3B,QAAQ;GACR;GACA;GACA;GACA;GACA;EACF,CAAC,CAAC,CAAC,MAAM,WAAW;GAClB,yGAAO,gCAAkC,MAAM;EACjD,CAAC,CAAC,CAAC,cAAc;GACf,+BAA+B;EACjC,CAAC;CACH;CAMA,QAJwB,2BAA2B;EACjD;EACA,cAAc;CAChB,CACsB,CAAC,CAAC;CAExB,MAAM,WAAW,OACf,iBAAiB,IAAI,MAAM,IAAI;CAEjC,MAAM,6BAA6B,iCAAiC;EAClE;EACA;EACA;EACA;CACF,CAAC;CACD,kCAAkC,2BAA2B;CAE7D,MAAM,gBAAgB,oBAAoB;EACxC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,wBAAwB,2BAA2B;CACrD,CAAC;CAED,eAAe,qBAAwB,YAA8B,YAAiC;EACpG,MAAM,oBAAoB,MAAM;EAChC,IAAI,YACF,yBAAyB;EAE3B,0BAA0B;EAC1B,IAAI;GACF,MAAM,SAAS,MAAM,WAAW;GAChC,IAAI,MAAM,aAAa,mBACrB,8BAA8B,MAAM;GAEtC,OAAO;EACT,UACQ;GACN,0BAA0B;GAC1B,IAAI,0BAA0B,GAC5B,yBAAyB;EAE7B;CACF;CAEA,SAAS,wBAAwB,IAA0C;EACzE,IAAI;GACF,OAAO,iBAAiB,IAAI,MAAM,IAAI,CAAC,CAAC;EAC1C,kBACM;GACJ;EACF;CACF;CAEA,eAAe,qBACb,MACA,OACA,iBAAgC,MAChC;EACA,OAAO,qBAAqB,YAAY;GACtC,MAAM,OAAO,sBAAsB,KAAK;GACxC,MAAM,SAAS,uBAAuB,oBAAoB,OAAO,IAAI,CAAC;GACtE,IAAI,CAAC,OAAO,MACV;GAEF,IAAI,2BAA2B,OAAO,UAAU;IAC9C,qBAAqB;KACnB,OAAO;KACP,QAAQ;IACV,CAAC;IACD;GACF;GACA,MAAM,SAAS,MAAM,mBAAmB;IACtC,MAAM;IACN;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,eAAe;IACf,mBAAmB;GACrB,CAAC;GACD,IAAI,CAAC,SAAS,GACZ;GAEF,IAAI,0BAA0B,cAAc,OAAO,MAAM,OAAO,GAAG,aAAa,OAAO,UAAU;IAC/F,MAAM,mBAAmB,OAAO;IAEhC,MAAM,SADiB,cAAc,IAAI,iBAAiB,IAC9B,IAAI,aAAa,YAAY,aAAa;IACtE,MAAM,eAAe,MAAM,wBACzB,QACA,EAAE,KAAK,qBAAqB,kBAAkB,kBAAkB,cAAc,EAAE,GAChF,kBACA,IACF;IACA,IAAI,cACF,OAAO;IAET,qBAAqB;KACnB,OAAO;KACP,QAAQ;IACV,CAAC;IACD,OAAO,wBAAwB,sBAAsB,WAAW,kBAAkB,IAAI;GACxF;GACA,OAAO,2BAA2B,uBAAuB,MAAM;EACjE,CAAC;CACH;CAEA,SAAS,WAAW,OAAoC;EACtD,iBAAiB,IAAI,KAAK;EAC1B,aAAa;GACX,iBAAiB,OAAO,KAAK;EAC/B;CACF;CAEA,SAAS,cAAc,OAAoC;EACzD,oBAAoB,IAAI,KAAK;EAC7B,aAAa;GACX,oBAAoB,OAAO,KAAK;EAClC;CACF;CAEA,SAAS,UAAU,MAAuC;EACxD,eAAe,IAAI,IAAI;EACvB,aAAa;GACX,eAAe,OAAO,IAAI;EAC5B;CACF;CAEA,SAAS,QAAQ,SAA6C;EAC5D,cAAc,IAAI,OAAO;EACzB,aAAa;GACX,cAAc,OAAO,OAAO;EAC9B;CACF;CAEA,MAAM,SAA2B;EAC/B;EACA,SAAS;EACT,cAAc;EACd,QAAQ,KAAqB;;GAC3B,gBAAgB,MAAM;GACtB,MAAM,gEAAoB,IAAiF,0DAAQ;GACnH,IAAI,kBACF,iBAAiB,UAAU;EAE/B;EACA;EACA,UAAyB;GACvB,OAAO;EACT;EACA,OAAM,OAAM,2BAA2B,cAAc,KAAK,EAAE,GAAG,wBAAwB,EAAE,CAAC;EAC1F,UAAS,OAAM,2BAA2B,cAAc,QAAQ,EAAE,GAAG,wBAAwB,EAAE,CAAC;EAChG,OAAM,UAAS;;qCACP,cAAc,KAAK,KAAK,4BAC9B,4BAA4B,6CAAS,GAAG,OAAO,gBAAgB,iFAAG,QACpE;;EACA,KAAI,UAAS;;qCACL,cAAc,GAAG,KAAK,GAC5B,QAAQ,8BACJ,4BAA4B,KAAK,IAAI,KAAK,GAAG,OAAO,gBAAgB,mFAAG,WACvE,MACN;;EACA,eAAe,2BAA2B,cAAc,QAAQ,CAAC;EACjE,UAAU,cAAc;EACxB,WAAW,cAAc;EACzB,UAAU,cAAc;EACxB,aAAa,cAAc;EAC3B,aAAa,cAAc;EAC3B;EACA;EACA;EACA;CACF;CAEA,gBAAgB,MAAM;CACtB,gCAAgC,QAAQ,sBAAsB,0BAA0B,qBAAqB;CAE7G,OAAOA;AACT"}
+{"version":3,"file":"createRouter.mjs","names":["typedRouter"],"sources":["../../../src/router/createRouter.ts"],"sourcesContent":["import type { WevuNamedRouteMap } from '../router'\nimport type { RouteResolveCodec } from '../routerInternal/shared'\nimport type { NavigationRunResult } from './navigationResult'\nimport type { RouteStateSyncPayload } from './routeSync'\nimport type {\n  InitialNavigationMode,\n  LocationQueryRaw,\n  NavigationAfterEach,\n  NavigationErrorHandler,\n  NavigationGuard,\n  RouteLocationNormalizedLoaded,\n  RouteLocationRaw,\n  RouterNavigation,\n  UseRouterOptions,\n} from './types'\nimport {\n  cloneRouteMeta,\n  cloneRouteParams,\n  createNamedRouteLookup,\n  createNativeRouteUrl,\n  createRouterOptionsSnapshot,\n  mergeMatchedRouteMeta,\n  normalizeRouteRecordMatched,\n  parseQuery,\n  resolveCurrentRoute,\n  resolveMatchedRouteRecord,\n  resolveNamedRouteLocation,\n  resolvePath,\n  resolveRouteOptionEntries,\n  snapshotRouteLocation,\n  stringifyQuery,\n  warnDuplicateRouteEntries,\n} from '../routerInternal/shared'\nimport { getCurrentMiniProgramGlobalObject, getCurrentMiniProgramTabBarPagePaths } from '../runtime/platform'\nimport { resolveBackNavigationTarget, runBackNavigationGuards } from './backNavigation'\nimport { DEFAULT_INITIAL_NAVIGATION_TIMEOUT, registerInitialNavigationRunner } from './initialNavigation'\nimport { setActiveRouter } from './instance'\nimport { createNavigationApi } from './navigationApi'\nimport { createNavigationFailure, executeNavigationMethod } from './navigationCore'\nimport { createNavigationResultController } from './navigationResult'\nimport { navigateWithTarget } from './navigationTarget'\nimport { resolveRouteLocation } from './resolve'\nimport { createRouteRegistry } from './routeRegistry'\nimport { installRouteStateSyncOnNativeRouter, notifyRouteStateSync } from './routeSync'\nimport { NavigationFailureType } from './types'\nimport { createRouteStateController, useNativeRouter } from './useRoute'\n\n/**\n * @description 创建高阶路由导航器（对齐 Vue Router 的 createRouter 心智）\n */\nexport function createRouter<TRouteMap extends object = WevuNamedRouteMap>(\n  optionsInput: UseRouterOptions<NoInfer<TRouteMap>> = {},\n): RouterNavigation<TRouteMap> {\n  // 路由表泛型只约束公开类型；运行时继续使用同一套名称无关的导航引擎。\n  const options = optionsInput as unknown as UseRouterOptions\n  const nativeRouter = useNativeRouter()\n  installRouteStateSyncOnNativeRouter(getCurrentMiniProgramGlobalObject())\n  const beforeEachGuards = new Set<NavigationGuard>()\n  const beforeResolveGuards = new Set<NavigationGuard>()\n  const afterEachHooks = new Set<NavigationAfterEach>()\n  const errorHandlers = new Set<NavigationErrorHandler>()\n  const maxRedirects = options.maxRedirects ?? 10\n  const initialNavigationMode: InitialNavigationMode = options.initialNavigationMode === 'blocking' ? 'blocking' : 'eager'\n  const initialNavigationTimeout = Number.isFinite(options.initialNavigationTimeout) && (options.initialNavigationTimeout ?? 0) > 0\n    ? Math.max(1, Math.trunc(options.initialNavigationTimeout!))\n    : DEFAULT_INITIAL_NAVIGATION_TIMEOUT\n  const paramsMode = options.paramsMode ?? 'loose'\n  const rejectOnError = options.rejectOnError ?? true\n  const routeResolveCodec: RouteResolveCodec = {\n    parseQuery: options.parseQuery ?? parseQuery,\n    stringifyQuery: options.stringifyQuery ?? stringifyQuery,\n  }\n  const readyPromise = Promise.resolve()\n  const routeEntries = resolveRouteOptionEntries(options)\n  warnDuplicateRouteEntries(routeEntries)\n  const namedRouteLookup = createNamedRouteLookup(routeEntries)\n  const tabBarEntrySource = options.tabBarEntries ?? getCurrentMiniProgramTabBarPagePaths()\n  const normalizedTabBarEntries = tabBarEntrySource\n    .map(path => resolvePath(path, ''))\n    .filter(Boolean)\n  const tabBarPathSet = new Set(normalizedTabBarEntries)\n  const routeRegistry = createRouteRegistry(namedRouteLookup)\n  let managedNavigationCount = 0\n  let activeManagedRoutePath: string | undefined\n  let pendingManagedRouteSyncPath: string | undefined\n  let pendingExternalRouteSyncPath: string | undefined\n  const routerOptions = createRouterOptionsSnapshot(\n    normalizedTabBarEntries,\n    routeRegistry.getRoutes(),\n    paramsMode,\n    maxRedirects,\n    initialNavigationMode,\n    initialNavigationTimeout,\n    routeResolveCodec,\n    rejectOnError,\n  )\n\n  function enrichRouteRecordState(routeLocation: RouteLocationNormalizedLoaded): RouteLocationNormalizedLoaded {\n    const resolved = { ...routeLocation }\n    resolved.href = resolved.fullPath\n    const matchedResult = resolveMatchedRouteRecord(resolved, namedRouteLookup)\n    if (matchedResult) {\n      const matchedRecord = matchedResult.record\n      if (resolved.name === undefined) {\n        resolved.name = matchedRecord.name\n      }\n      const mergedRouteMeta = mergeMatchedRouteMeta(matchedResult.matchedRecords)\n      if (mergedRouteMeta !== undefined) {\n        resolved.meta = cloneRouteMeta(mergedRouteMeta)\n      }\n      if (matchedResult.params && Object.keys(resolved.params).length === 0) {\n        resolved.params = cloneRouteParams(matchedResult.params)\n      }\n      resolved.matched = matchedResult.matchedRecords.map((record, index, records) => {\n        const leafMatchedPath = index === records.length - 1\n          ? matchedResult.matchedPath\n          : undefined\n        return normalizeRouteRecordMatched(record, leafMatchedPath)\n      })\n    }\n    else {\n      resolved.matched = []\n    }\n    return resolved\n  }\n\n  function resolveWithCodec(to: RouteLocationRaw, currentPath: string): RouteLocationNormalizedLoaded {\n    const rawTo = typeof to === 'string'\n      ? to\n      : resolveNamedRouteLocation(to, namedRouteLookup, paramsMode)\n    return enrichRouteRecordState(resolveRouteLocation(rawTo, currentPath, routeResolveCodec))\n  }\n\n  let route: Readonly<RouteLocationNormalizedLoaded>\n  let emitObservedNavigationAfterEach: ((result: NavigationRunResult) => Promise<void>) | undefined\n\n  function isExternalBackSync(payload: RouteStateSyncPayload): boolean {\n    return payload.source === 'page'\n      || (payload.source === 'native' && payload.method === 'navigateBack')\n  }\n\n  function beforeRouteStateSync(\n    nextRoute: RouteLocationNormalizedLoaded,\n    payload: RouteStateSyncPayload,\n  ) {\n    if (managedNavigationCount > 0 || !isExternalBackSync(payload)) {\n      return\n    }\n\n    if (pendingExternalRouteSyncPath !== undefined) {\n      return\n    }\n\n    if (pendingManagedRouteSyncPath !== undefined) {\n      const expectedPath = pendingManagedRouteSyncPath\n      pendingManagedRouteSyncPath = undefined\n      if (nextRoute.fullPath === expectedPath) {\n        return\n      }\n    }\n\n    if (nextRoute.fullPath === route.fullPath) {\n      return\n    }\n\n    pendingExternalRouteSyncPath = nextRoute.fullPath\n    const from = snapshotRouteLocation(route)\n    void runBackNavigationGuards({\n      target: nextRoute,\n      from,\n      nativeRouter,\n      beforeEachGuards,\n      beforeResolveGuards,\n      resolveWithCodec,\n    }).then((result) => {\n      return emitObservedNavigationAfterEach?.(result)\n    }).finally(() => {\n      pendingExternalRouteSyncPath = undefined\n    })\n  }\n\n  const routeController = createRouteStateController({\n    beforeRouteStateSync,\n    resolveRoute: enrichRouteRecordState,\n  })\n  route = routeController.route\n\n  const resolve = (to: RouteLocationRaw): RouteLocationNormalizedLoaded =>\n    resolveWithCodec(to, route.path)\n\n  const navigationResultController = createNavigationResultController({\n    afterEachHooks,\n    errorHandlers,\n    nativeRouter,\n    rejectOnError,\n  })\n  emitObservedNavigationAfterEach = navigationResultController.emitNavigationAfterEach\n\n  const navigationApi = createNavigationApi({\n    nativeRouter,\n    route,\n    routeResolveCodec,\n    namedRouteLookup,\n    beforeEachGuards,\n    beforeResolveGuards,\n    maxRedirects,\n    tabBarPathSet,\n    resolveWithCodec,\n    settleNavigationResult: navigationResultController.settleNavigationResult,\n  })\n\n  async function runManagedNavigation<T>(navigation: () => Promise<T>, targetPath?: string): Promise<T> {\n    const previousRoutePath = route.fullPath\n    if (targetPath) {\n      activeManagedRoutePath = targetPath\n    }\n    managedNavigationCount += 1\n    try {\n      const result = await navigation()\n      if (route.fullPath !== previousRoutePath) {\n        pendingManagedRouteSyncPath = route.fullPath\n      }\n      return result\n    }\n    finally {\n      managedNavigationCount -= 1\n      if (managedNavigationCount <= 0) {\n        activeManagedRoutePath = undefined\n      }\n    }\n  }\n\n  function resolveManagedRoutePath(to: RouteLocationRaw): string | undefined {\n    try {\n      return resolveWithCodec(to, route.path).fullPath\n    }\n    catch {\n      return undefined\n    }\n  }\n\n  async function runInitialNavigation(\n    page: Parameters<typeof resolveCurrentRoute>[1],\n    query?: LocationQueryRaw,\n    isActive: () => boolean = () => true,\n  ) {\n    return runManagedNavigation(async () => {\n      const from = snapshotRouteLocation(route)\n      const target = enrichRouteRecordState(resolveCurrentRoute(query, page))\n      if (!target.path) {\n        return undefined\n      }\n      if (activeManagedRoutePath === target.fullPath) {\n        notifyRouteStateSync({\n          route: target,\n          source: 'router',\n        })\n        return undefined\n      }\n      const result = await navigateWithTarget({\n        mode: 'push',\n        target,\n        from,\n        nativeRouter,\n        routeResolveCodec,\n        namedRouteLookup,\n        beforeEachGuards,\n        beforeResolveGuards,\n        maxRedirects,\n        tabBarPathSet,\n        resolveWithCodec,\n        executeNative: false,\n        allowSameLocation: true,\n      })\n      if (!isActive()) {\n        return undefined\n      }\n      if (initialNavigationMode === 'blocking' && result.to && result.to.fullPath !== target.fullPath) {\n        const redirectedTarget = result.to\n        const isTabBarTarget = tabBarPathSet.has(redirectedTarget.path)\n        const method = isTabBarTarget ? nativeRouter.switchTab : nativeRouter.redirectTo\n        const nativeResult = await executeNavigationMethod(\n          method as (options: Record<string, any>) => unknown,\n          { url: createNativeRouteUrl(redirectedTarget, routeResolveCodec.stringifyQuery) },\n          redirectedTarget,\n          from,\n        )\n        if (nativeResult) {\n          return nativeResult\n        }\n        notifyRouteStateSync({\n          route: redirectedTarget,\n          source: 'router',\n        })\n        return createNavigationFailure(NavigationFailureType.cancelled, redirectedTarget, from)\n      }\n      return navigationResultController.settleNavigationResult(result)\n    })\n  }\n\n  function beforeEach(guard: NavigationGuard): () => void {\n    beforeEachGuards.add(guard)\n    return () => {\n      beforeEachGuards.delete(guard)\n    }\n  }\n\n  function beforeResolve(guard: NavigationGuard): () => void {\n    beforeResolveGuards.add(guard)\n    return () => {\n      beforeResolveGuards.delete(guard)\n    }\n  }\n\n  function afterEach(hook: NavigationAfterEach): () => void {\n    afterEachHooks.add(hook)\n    return () => {\n      afterEachHooks.delete(hook)\n    }\n  }\n\n  function onError(handler: NavigationErrorHandler): () => void {\n    errorHandlers.add(handler)\n    return () => {\n      errorHandlers.delete(handler)\n    }\n  }\n\n  const router: RouterNavigation = {\n    nativeRouter,\n    options: routerOptions,\n    currentRoute: route,\n    install(app?: unknown): void {\n      setActiveRouter(router)\n      const globalProperties = (app as { config?: { globalProperties?: Record<string, unknown> } } | undefined)?.config?.globalProperties\n      if (globalProperties) {\n        globalProperties.$router = router\n      }\n    },\n    resolve,\n    isReady(): Promise<void> {\n      return readyPromise\n    },\n    push: to => runManagedNavigation(() => navigationApi.push(to), resolveManagedRoutePath(to)),\n    replace: to => runManagedNavigation(() => navigationApi.replace(to), resolveManagedRoutePath(to)),\n    back: delta => runManagedNavigation(\n      () => navigationApi.back(delta),\n      resolveBackNavigationTarget(delta ?? 1, route, resolveWithCodec)?.fullPath,\n    ),\n    go: delta => runManagedNavigation(\n      () => navigationApi.go(delta),\n      delta < 0\n        ? resolveBackNavigationTarget(Math.abs(delta), route, resolveWithCodec)?.fullPath\n        : undefined,\n    ),\n    forward: () => runManagedNavigation(() => navigationApi.forward()),\n    hasRoute: routeRegistry.hasRoute,\n    getRoutes: routeRegistry.getRoutes,\n    addRoute: routeRegistry.addRoute,\n    removeRoute: routeRegistry.removeRoute,\n    clearRoutes: routeRegistry.clearRoutes,\n    beforeEach,\n    beforeResolve,\n    afterEach,\n    onError,\n  }\n\n  setActiveRouter(router)\n  registerInitialNavigationRunner(router, runInitialNavigation, initialNavigationTimeout, initialNavigationMode)\n  const typedRouter = router as unknown as RouterNavigation<TRouteMap>\n  return typedRouter\n}\n"],"mappings":"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"}

package/dist/dev/router/initialNavigation.mjs

@@ -1,3 +1,4 @@
+import { registerInitialNavigationLifecycle } from "../runtime/navigationLifecycle.mjs";
 import { getActiveRouter } from "./instance.mjs";
 import { WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER } from "@weapp-core/constants";
 import { queueMicrotaskPolyfill } from "@wevu/web-apis";
@@ -22,17 +23,9 @@ function snapshotQuery(query) {
 	for (const [key, value] of Object.entries(query)) snapshot[key] = Array.isArray(value) ? [...value] : value;
 	return snapshot;
 }
-function registerInitialNavigationRunner(router, runner, timeoutMs = DEFAULT_INITIAL_NAVIGATION_TIMEOUT, mode = "blocking") {
-	initialNavigationRunners.set(router, {
-		runner,
-		mode,
-		timeoutMs: normalizeTimeout(timeoutMs)
-	});
-}
 function getInitialNavigationTimeout() {
-	var _initialNavigationRun2, _initialNavigationRun3;
 	const router = getActiveRouter();
-	return router ? (_initialNavigationRun2 = (_initialNavigationRun3 = initialNavigationRunners.get(router)) === null || _initialNavigationRun3 === void 0 ? void 0 : _initialNavigationRun3.timeoutMs) !== null && _initialNavigationRun2 !== void 0 ? _initialNavigationRun2 : DEFAULT_INITIAL_NAVIGATION_TIMEOUT : DEFAULT_INITIAL_NAVIGATION_TIMEOUT;
+	return router ? initialNavigationRunners.get(router)?.timeoutMs ?? 1e4 : DEFAULT_INITIAL_NAVIGATION_TIMEOUT;
 }
 function isNavigationFailureResult(result) {
 	return Boolean(result && typeof result === "object" && result.__wevuNavigationFailure);
@@ -46,9 +39,9 @@ function ensureInitialNavigation(instance, query, options = {}) {
 	}
 	const router = getActiveRouter();
 	const registration = router ? initialNavigationRunners.get(router) : void 0;
-	let pendingRunner = registration === null || registration === void 0 ? void 0 : registration.runner;
+	let pendingRunner = registration?.runner;
 	if (!pendingRunner) return;
-	const blocking = (registration === null || registration === void 0 ? void 0 : registration.mode) === "blocking";
+	const blocking = registration?.mode === "blocking";
 	let page = snapshotPage(instance);
 	let initialQuery = snapshotQuery(query);
 	let currentStatus = "idle";
@@ -105,13 +98,12 @@ function ensureInitialNavigation(instance, query, options = {}) {
 			if (currentStatus !== "idle") return;
 			currentStatus = "running";
 			if (blocking) timeoutHandle = setTimeout(() => {
-				var _ref, _page$route;
 				if (currentStatus !== "running") return;
-				console.warn(`${WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER} initial navigation exceeded ${timeoutMs}ms; mounting page`, (_ref = (_page$route = page === null || page === void 0 ? void 0 : page.route) !== null && _page$route !== void 0 ? _page$route : page === null || page === void 0 ? void 0 : page.__route__) !== null && _ref !== void 0 ? _ref : "");
+				console.warn(`${WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER} initial navigation exceeded ${timeoutMs}ms; mounting page`, page?.route ?? page?.__route__ ?? "");
 				settle("timed-out", true);
 			}, timeoutMs);
 			const runnerPage = page;
-			const runnerQuery = snapshotQuery(startQuery !== null && startQuery !== void 0 ? startQuery : initialQuery);
+			const runnerQuery = snapshotQuery(startQuery ?? initialQuery);
 			const runner = pendingRunner;
 			pendingRunner = void 0;
 			if (!runner || !runnerPage) {
@@ -135,8 +127,18 @@ function ensureInitialNavigation(instance, query, options = {}) {
 	return blocking ? promise : void 0;
 }
 function cancelInitialNavigation(instance) {
-	var _initialNavigationCon3;
-	(_initialNavigationCon3 = initialNavigationControllers.get(instance)) === null || _initialNavigationCon3 === void 0 || _initialNavigationCon3.cancel();
+	initialNavigationControllers.get(instance)?.cancel();
+}
+function registerInitialNavigationRunner(router, runner, timeoutMs = DEFAULT_INITIAL_NAVIGATION_TIMEOUT, mode = "blocking") {
+	registerInitialNavigationLifecycle({
+		ensure: ensureInitialNavigation,
+		cancel: cancelInitialNavigation
+	});
+	initialNavigationRunners.set(router, {
+		runner,
+		mode,
+		timeoutMs: normalizeTimeout(timeoutMs)
+	});
 }
 
 //#endregion

package/dist/dev/router/initialNavigation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"initialNavigation.mjs","names":[],"sources":["../../../src/router/initialNavigation.ts"],"sourcesContent":["import type { MiniProgramPageLike } from '../routerInternal/shared'\nimport type { InitialNavigationMode, LocationQueryRaw, NavigationFailure } from './types'\nimport { WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER } from '@weapp-core/constants'\nimport { queueMicrotaskPolyfill } from '@wevu/web-apis'\nimport { getActiveRouter } from './instance'\n\nexport const DEFAULT_INITIAL_NAVIGATION_TIMEOUT = 10_000\n\nexport type InitialNavigationStatus = 'idle' | 'running' | 'allowed' | 'aborted' | 'timed-out' | 'cancelled'\n\ninterface InitialNavigationRunnerRegistration {\n  runner: InitialNavigationRunner\n  mode: InitialNavigationMode\n  timeoutMs: number\n}\n\nexport type InitialNavigationRunner = (\n  page: MiniProgramPageLike,\n  query?: LocationQueryRaw,\n  isActive?: () => boolean,\n) => Promise<void | NavigationFailure>\n\ninterface InitialNavigationController {\n  readonly promise: Promise<boolean>\n  readonly blocking: boolean\n  readonly status: () => InitialNavigationStatus\n  subscribe: (callback: (shouldMount: boolean) => void) => () => void\n  start: (query?: LocationQueryRaw) => void\n  cancel: () => void\n}\n\nconst initialNavigationRunners = new WeakMap<object, InitialNavigationRunnerRegistration>()\nconst initialNavigationControllers = new WeakMap<object, InitialNavigationController>()\n\nfunction normalizeTimeout(timeoutMs: number) {\n  return Number.isFinite(timeoutMs) && timeoutMs > 0\n    ? Math.max(1, Math.trunc(timeoutMs))\n    : DEFAULT_INITIAL_NAVIGATION_TIMEOUT\n}\n\nfunction snapshotPage(instance: MiniProgramPageLike): MiniProgramPageLike {\n  return {\n    route: typeof instance.route === 'string' ? instance.route : undefined,\n    __route__: typeof instance.__route__ === 'string' ? instance.__route__ : undefined,\n    options: instance.options && typeof instance.options === 'object'\n      ? { ...instance.options }\n      : undefined,\n  }\n}\n\nfunction snapshotQuery(query: LocationQueryRaw | undefined): LocationQueryRaw | undefined {\n  if (!query || typeof query !== 'object') {\n    return undefined\n  }\n  const snapshot: LocationQueryRaw = {}\n  for (const [key, value] of Object.entries(query)) {\n    snapshot[key] = Array.isArray(value) ? [...value] : value\n  }\n  return snapshot\n}\n\nexport function registerInitialNavigationRunner(\n  router: object,\n  runner: InitialNavigationRunner,\n  timeoutMs = DEFAULT_INITIAL_NAVIGATION_TIMEOUT,\n  mode: InitialNavigationMode = 'blocking',\n) {\n  initialNavigationRunners.set(router, {\n    runner,\n    mode,\n    timeoutMs: normalizeTimeout(timeoutMs),\n  })\n}\n\nexport function getInitialNavigationRunner(): InitialNavigationRunner | undefined {\n  const router = getActiveRouter()\n  return router ? initialNavigationRunners.get(router)?.runner : undefined\n}\n\nexport function getInitialNavigationTimeout() {\n  const router = getActiveRouter()\n  return router ? initialNavigationRunners.get(router)?.timeoutMs ?? DEFAULT_INITIAL_NAVIGATION_TIMEOUT : DEFAULT_INITIAL_NAVIGATION_TIMEOUT\n}\n\nexport function getInitialNavigationMode(): InitialNavigationMode {\n  const router = getActiveRouter()\n  return router ? initialNavigationRunners.get(router)?.mode ?? 'eager' : 'eager'\n}\n\nfunction isNavigationFailureResult(result: void | NavigationFailure): result is NavigationFailure {\n  return Boolean(result && typeof result === 'object' && (result as NavigationFailure).__wevuNavigationFailure)\n}\n\nexport function getInitialNavigationPromise(instance: MiniProgramPageLike) {\n  return initialNavigationControllers.get(instance as object)?.promise\n}\n\nexport function getInitialNavigationStatus(instance: MiniProgramPageLike) {\n  return initialNavigationControllers.get(instance as object)?.status()\n}\n\nexport function ensureInitialNavigation(\n  instance: MiniProgramPageLike,\n  query?: LocationQueryRaw,\n  options: { start?: boolean, onComplete?: (shouldMount: boolean) => void } = {},\n) {\n  const existing = initialNavigationControllers.get(instance as object)\n  if (existing) {\n    if (options.onComplete && existing.blocking) {\n      existing.subscribe(options.onComplete)\n    }\n    if (options.start !== false) {\n      existing.start(query)\n    }\n    return existing.blocking ? existing.promise : undefined\n  }\n\n  const router = getActiveRouter()\n  const registration = router ? initialNavigationRunners.get(router) : undefined\n  let pendingRunner = registration?.runner\n  if (!pendingRunner) {\n    return undefined\n  }\n  const blocking = registration?.mode === 'blocking'\n\n  let page: MiniProgramPageLike | undefined = snapshotPage(instance)\n  let initialQuery = snapshotQuery(query)\n  let currentStatus: InitialNavigationStatus = 'idle'\n  let timeoutHandle: ReturnType<typeof setTimeout> | undefined\n  const timeoutMs = getInitialNavigationTimeout()\n  let resolveNavigation!: (shouldMount: boolean) => void\n  const completionCallbacks = new Set<{ callback: (shouldMount: boolean) => void, active: boolean }>()\n  const promise = new Promise<boolean>((resolve) => {\n    resolveNavigation = resolve\n  })\n\n  const settle = (status: Exclude<InitialNavigationStatus, 'idle' | 'running'>, shouldMount: boolean) => {\n    if (currentStatus !== 'idle' && currentStatus !== 'running') {\n      return\n    }\n    currentStatus = status\n    if (timeoutHandle !== undefined) {\n      clearTimeout(timeoutHandle)\n      timeoutHandle = undefined\n    }\n    const callbacks = [...completionCallbacks]\n    completionCallbacks.clear()\n    pendingRunner = undefined\n    page = undefined\n    initialQuery = undefined\n    resolveNavigation(shouldMount)\n    queueMicrotaskPolyfill(() => {\n      if (currentStatus !== 'allowed' && currentStatus !== 'timed-out') {\n        return\n      }\n      for (const entry of callbacks) {\n        if (entry.active) {\n          entry.callback(shouldMount)\n          entry.active = false\n        }\n      }\n    })\n  }\n\n  const controller: InitialNavigationController = {\n    promise,\n    blocking,\n    status: () => currentStatus,\n    subscribe(callback) {\n      const entry = { callback, active: true }\n      if (currentStatus !== 'idle' && currentStatus !== 'running') {\n        queueMicrotaskPolyfill(() => {\n          if (entry.active && (currentStatus === 'allowed' || currentStatus === 'timed-out')) {\n            callback(currentStatus === 'allowed' || currentStatus === 'timed-out')\n            entry.active = false\n          }\n        })\n      }\n      else {\n        completionCallbacks.add(entry)\n      }\n      return () => {\n        entry.active = false\n        completionCallbacks.delete(entry)\n      }\n    },\n    start(startQuery?: LocationQueryRaw) {\n      if (currentStatus !== 'idle') {\n        return\n      }\n      currentStatus = 'running'\n      if (blocking) {\n        timeoutHandle = setTimeout(() => {\n          if (currentStatus !== 'running') {\n            return\n          }\n          // 超时是可恢复的运行时诊断，保留稳定 marker 供宿主和 E2E 观测。\n          // eslint-disable-next-line no-console\n          console.warn(`${WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER} initial navigation exceeded ${timeoutMs}ms; mounting page`, page?.route ?? page?.__route__ ?? '')\n          settle('timed-out', true)\n        }, timeoutMs)\n      }\n      const runnerPage = page\n      const runnerQuery = snapshotQuery(startQuery ?? initialQuery)\n      const runner = pendingRunner\n      pendingRunner = undefined\n      if (!runner || !runnerPage) {\n        settle('aborted', false)\n        return\n      }\n      void runner(runnerPage, runnerQuery, () => currentStatus === 'running').then((result) => {\n        const failed = isNavigationFailureResult(result)\n        settle(failed ? 'aborted' : 'allowed', !failed)\n      }, () => {\n        settle('aborted', false)\n      })\n    },\n    cancel() {\n      settle('cancelled', false)\n    },\n  }\n\n  initialNavigationControllers.set(instance as object, controller)\n  if (options.onComplete && blocking) {\n    controller.subscribe(options.onComplete)\n  }\n  if (options.start !== false) {\n    controller.start(query)\n  }\n  return blocking ? promise : undefined\n}\n\nexport function cancelInitialNavigation(instance: MiniProgramPageLike) {\n  initialNavigationControllers.get(instance as object)?.cancel()\n}\n"],"mappings":"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"}
+{"version":3,"file":"initialNavigation.mjs","names":[],"sources":["../../../src/router/initialNavigation.ts"],"sourcesContent":["import type { MiniProgramPageLike } from '../routerInternal/shared'\nimport type { InitialNavigationMode, LocationQueryRaw, NavigationFailure } from './types'\nimport { WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER } from '@weapp-core/constants'\nimport { queueMicrotaskPolyfill } from '@wevu/web-apis'\nimport { registerInitialNavigationLifecycle } from '../runtime/navigationLifecycle'\nimport { getActiveRouter } from './instance'\n\nexport const DEFAULT_INITIAL_NAVIGATION_TIMEOUT = 10_000\n\nexport type InitialNavigationStatus = 'idle' | 'running' | 'allowed' | 'aborted' | 'timed-out' | 'cancelled'\n\ninterface InitialNavigationRunnerRegistration {\n  runner: InitialNavigationRunner\n  mode: InitialNavigationMode\n  timeoutMs: number\n}\n\nexport type InitialNavigationRunner = (\n  page: MiniProgramPageLike,\n  query?: LocationQueryRaw,\n  isActive?: () => boolean,\n) => Promise<void | NavigationFailure>\n\ninterface InitialNavigationController {\n  readonly promise: Promise<boolean>\n  readonly blocking: boolean\n  readonly status: () => InitialNavigationStatus\n  subscribe: (callback: (shouldMount: boolean) => void) => () => void\n  start: (query?: LocationQueryRaw) => void\n  cancel: () => void\n}\n\nconst initialNavigationRunners = new WeakMap<object, InitialNavigationRunnerRegistration>()\nconst initialNavigationControllers = new WeakMap<object, InitialNavigationController>()\n\nfunction normalizeTimeout(timeoutMs: number) {\n  return Number.isFinite(timeoutMs) && timeoutMs > 0\n    ? Math.max(1, Math.trunc(timeoutMs))\n    : DEFAULT_INITIAL_NAVIGATION_TIMEOUT\n}\n\nfunction snapshotPage(instance: MiniProgramPageLike): MiniProgramPageLike {\n  return {\n    route: typeof instance.route === 'string' ? instance.route : undefined,\n    __route__: typeof instance.__route__ === 'string' ? instance.__route__ : undefined,\n    options: instance.options && typeof instance.options === 'object'\n      ? { ...instance.options }\n      : undefined,\n  }\n}\n\nfunction snapshotQuery(query: LocationQueryRaw | undefined): LocationQueryRaw | undefined {\n  if (!query || typeof query !== 'object') {\n    return undefined\n  }\n  const snapshot: LocationQueryRaw = {}\n  for (const [key, value] of Object.entries(query)) {\n    snapshot[key] = Array.isArray(value) ? [...value] : value\n  }\n  return snapshot\n}\n\nexport function getInitialNavigationRunner(): InitialNavigationRunner | undefined {\n  const router = getActiveRouter()\n  return router ? initialNavigationRunners.get(router)?.runner : undefined\n}\n\nexport function getInitialNavigationTimeout() {\n  const router = getActiveRouter()\n  return router ? initialNavigationRunners.get(router)?.timeoutMs ?? DEFAULT_INITIAL_NAVIGATION_TIMEOUT : DEFAULT_INITIAL_NAVIGATION_TIMEOUT\n}\n\nexport function getInitialNavigationMode(): InitialNavigationMode {\n  const router = getActiveRouter()\n  return router ? initialNavigationRunners.get(router)?.mode ?? 'eager' : 'eager'\n}\n\nfunction isNavigationFailureResult(result: void | NavigationFailure): result is NavigationFailure {\n  return Boolean(result && typeof result === 'object' && (result as NavigationFailure).__wevuNavigationFailure)\n}\n\nexport function getInitialNavigationPromise(instance: MiniProgramPageLike) {\n  return initialNavigationControllers.get(instance as object)?.promise\n}\n\nexport function getInitialNavigationStatus(instance: MiniProgramPageLike) {\n  return initialNavigationControllers.get(instance as object)?.status()\n}\n\nexport function ensureInitialNavigation(\n  instance: MiniProgramPageLike,\n  query?: LocationQueryRaw,\n  options: { start?: boolean, onComplete?: (shouldMount: boolean) => void } = {},\n) {\n  const existing = initialNavigationControllers.get(instance as object)\n  if (existing) {\n    if (options.onComplete && existing.blocking) {\n      existing.subscribe(options.onComplete)\n    }\n    if (options.start !== false) {\n      existing.start(query)\n    }\n    return existing.blocking ? existing.promise : undefined\n  }\n\n  const router = getActiveRouter()\n  const registration = router ? initialNavigationRunners.get(router) : undefined\n  let pendingRunner = registration?.runner\n  if (!pendingRunner) {\n    return undefined\n  }\n  const blocking = registration?.mode === 'blocking'\n\n  let page: MiniProgramPageLike | undefined = snapshotPage(instance)\n  let initialQuery = snapshotQuery(query)\n  let currentStatus: InitialNavigationStatus = 'idle'\n  let timeoutHandle: ReturnType<typeof setTimeout> | undefined\n  const timeoutMs = getInitialNavigationTimeout()\n  let resolveNavigation!: (shouldMount: boolean) => void\n  const completionCallbacks = new Set<{ callback: (shouldMount: boolean) => void, active: boolean }>()\n  const promise = new Promise<boolean>((resolve) => {\n    resolveNavigation = resolve\n  })\n\n  const settle = (status: Exclude<InitialNavigationStatus, 'idle' | 'running'>, shouldMount: boolean) => {\n    if (currentStatus !== 'idle' && currentStatus !== 'running') {\n      return\n    }\n    currentStatus = status\n    if (timeoutHandle !== undefined) {\n      clearTimeout(timeoutHandle)\n      timeoutHandle = undefined\n    }\n    const callbacks = [...completionCallbacks]\n    completionCallbacks.clear()\n    pendingRunner = undefined\n    page = undefined\n    initialQuery = undefined\n    resolveNavigation(shouldMount)\n    queueMicrotaskPolyfill(() => {\n      if (currentStatus !== 'allowed' && currentStatus !== 'timed-out') {\n        return\n      }\n      for (const entry of callbacks) {\n        if (entry.active) {\n          entry.callback(shouldMount)\n          entry.active = false\n        }\n      }\n    })\n  }\n\n  const controller: InitialNavigationController = {\n    promise,\n    blocking,\n    status: () => currentStatus,\n    subscribe(callback) {\n      const entry = { callback, active: true }\n      if (currentStatus !== 'idle' && currentStatus !== 'running') {\n        queueMicrotaskPolyfill(() => {\n          if (entry.active && (currentStatus === 'allowed' || currentStatus === 'timed-out')) {\n            callback(currentStatus === 'allowed' || currentStatus === 'timed-out')\n            entry.active = false\n          }\n        })\n      }\n      else {\n        completionCallbacks.add(entry)\n      }\n      return () => {\n        entry.active = false\n        completionCallbacks.delete(entry)\n      }\n    },\n    start(startQuery?: LocationQueryRaw) {\n      if (currentStatus !== 'idle') {\n        return\n      }\n      currentStatus = 'running'\n      if (blocking) {\n        timeoutHandle = setTimeout(() => {\n          if (currentStatus !== 'running') {\n            return\n          }\n          // 超时是可恢复的运行时诊断，保留稳定 marker 供宿主和 E2E 观测。\n          // eslint-disable-next-line no-console\n          console.warn(`${WEVU_INITIAL_NAVIGATION_TIMEOUT_MARKER} initial navigation exceeded ${timeoutMs}ms; mounting page`, page?.route ?? page?.__route__ ?? '')\n          settle('timed-out', true)\n        }, timeoutMs)\n      }\n      const runnerPage = page\n      const runnerQuery = snapshotQuery(startQuery ?? initialQuery)\n      const runner = pendingRunner\n      pendingRunner = undefined\n      if (!runner || !runnerPage) {\n        settle('aborted', false)\n        return\n      }\n      void runner(runnerPage, runnerQuery, () => currentStatus === 'running').then((result) => {\n        const failed = isNavigationFailureResult(result)\n        settle(failed ? 'aborted' : 'allowed', !failed)\n      }, () => {\n        settle('aborted', false)\n      })\n    },\n    cancel() {\n      settle('cancelled', false)\n    },\n  }\n\n  initialNavigationControllers.set(instance as object, controller)\n  if (options.onComplete && blocking) {\n    controller.subscribe(options.onComplete)\n  }\n  if (options.start !== false) {\n    controller.start(query)\n  }\n  return blocking ? promise : undefined\n}\n\nexport function cancelInitialNavigation(instance: MiniProgramPageLike) {\n  initialNavigationControllers.get(instance as object)?.cancel()\n}\n\nexport function registerInitialNavigationRunner(\n  router: object,\n  runner: InitialNavigationRunner,\n  timeoutMs = DEFAULT_INITIAL_NAVIGATION_TIMEOUT,\n  mode: InitialNavigationMode = 'blocking',\n) {\n  registerInitialNavigationLifecycle({ ensure: ensureInitialNavigation, cancel: cancelInitialNavigation })\n  initialNavigationRunners.set(router, {\n    runner,\n    mode,\n    timeoutMs: normalizeTimeout(timeoutMs),\n  })\n}\n"],"mappings":";;;;;;AAOA,MAAa,qCAAqC;AAyBlD,MAAM,2CAA2B,IAAI,QAAqD;AAC1F,MAAM,+CAA+B,IAAI,QAA6C;AAEtF,SAAS,iBAAiB,WAAmB;CAC3C,OAAO,OAAO,SAAS,SAAS,KAAK,YAAY,IAC7C,KAAK,IAAI,GAAG,KAAK,MAAM,SAAS,CAAC,IACjC;AACN;AAEA,SAAS,aAAa,UAAoD;CACxE,OAAO;EACL,OAAO,OAAO,SAAS,UAAU,WAAW,SAAS,QAAQ;EAC7D,WAAW,OAAO,SAAS,cAAc,WAAW,SAAS,YAAY;EACzE,SAAS,SAAS,WAAW,OAAO,SAAS,YAAY,WACrD,EAAE,GAAG,SAAS,QAAQ,IACtB;CACN;AACF;AAEA,SAAS,cAAc,OAAmE;CACxF,IAAI,CAAC,SAAS,OAAO,UAAU,UAC7B;CAEF,MAAM,WAA6B,CAAC;CACpC,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,KAAK,GAC7C,SAAS,OAAO,MAAM,QAAQ,KAAK,IAAI,CAAC,GAAG,KAAK,IAAI;CAEtD,OAAO;AACT;AAOA,SAAgB,8BAA8B;CAC5C,MAAM,SAAS,gBAAgB;CAC/B,OAAO,SAAS,yBAAyB,IAAI,MAAM,CAAC,EAAE,mBAAkD;AAC1G;AAOA,SAAS,0BAA0B,QAA+D;CAChG,OAAO,QAAQ,UAAU,OAAO,WAAW,YAAa,OAA6B,uBAAuB;AAC9G;AAUA,SAAgB,wBACd,UACA,OACA,UAA4E,CAAC,GAC7E;CACA,MAAM,WAAW,6BAA6B,IAAI,QAAkB;CACpE,IAAI,UAAU;EACZ,IAAI,QAAQ,cAAc,SAAS,UACjC,SAAS,UAAU,QAAQ,UAAU;EAEvC,IAAI,QAAQ,UAAU,OACpB,SAAS,MAAM,KAAK;EAEtB,OAAO,SAAS,WAAW,SAAS,UAAU;CAChD;CAEA,MAAM,SAAS,gBAAgB;CAC/B,MAAM,eAAe,SAAS,yBAAyB,IAAI,MAAM,IAAI;CACrE,IAAI,gBAAgB,cAAc;CAClC,IAAI,CAAC,eACH;CAEF,MAAM,WAAW,cAAc,SAAS;CAExC,IAAI,OAAwC,aAAa,QAAQ;CACjE,IAAI,eAAe,cAAc,KAAK;CACtC,IAAI,gBAAyC;CAC7C,IAAI;CACJ,MAAM,YAAY,4BAA4B;CAC9C,IAAI;CACJ,MAAM,sCAAsB,IAAI,IAAmE;CACnG,MAAM,UAAU,IAAI,SAAkB,YAAY;EAChD,oBAAoB;CACtB,CAAC;CAED,MAAM,UAAU,QAA8D,gBAAyB;EACrG,IAAI,kBAAkB,UAAU,kBAAkB,WAChD;EAEF,gBAAgB;EAChB,IAAI,kBAAkB,QAAW;GAC/B,aAAa,aAAa;GAC1B,gBAAgB;EAClB;EACA,MAAM,YAAY,CAAC,GAAG,mBAAmB;EACzC,oBAAoB,MAAM;EAC1B,gBAAgB;EAChB,OAAO;EACP,eAAe;EACf,kBAAkB,WAAW;EAC7B,6BAA6B;GAC3B,IAAI,kBAAkB,aAAa,kBAAkB,aACnD;GAEF,KAAK,MAAM,SAAS,WAClB,IAAI,MAAM,QAAQ;IAChB,MAAM,SAAS,WAAW;IAC1B,MAAM,SAAS;GACjB;EAEJ,CAAC;CACH;CAEA,MAAM,aAA0C;EAC9C;EACA;EACA,cAAc;EACd,UAAU,UAAU;GAClB,MAAM,QAAQ;IAAE;IAAU,QAAQ;GAAK;GACvC,IAAI,kBAAkB,UAAU,kBAAkB,WAChD,6BAA6B;IAC3B,IAAI,MAAM,WAAW,kBAAkB,aAAa,kBAAkB,cAAc;KAClF,SAAS,kBAAkB,aAAa,kBAAkB,WAAW;KACrE,MAAM,SAAS;IACjB;GACF,CAAC;QAGD,oBAAoB,IAAI,KAAK;GAE/B,aAAa;IACX,MAAM,SAAS;IACf,oBAAoB,OAAO,KAAK;GAClC;EACF;EACA,MAAM,YAA+B;GACnC,IAAI,kBAAkB,QACpB;GAEF,gBAAgB;GAChB,IAAI,UACF,gBAAgB,iBAAiB;IAC/B,IAAI,kBAAkB,WACpB;IAIF,QAAQ,KAAK,GAAG,uCAAuC,+BAA+B,UAAU,oBAAoB,MAAM,SAAS,MAAM,aAAa,EAAE;IACxJ,OAAO,aAAa,IAAI;GAC1B,GAAG,SAAS;GAEd,MAAM,aAAa;GACnB,MAAM,cAAc,cAAc,cAAc,YAAY;GAC5D,MAAM,SAAS;GACf,gBAAgB;GAChB,IAAI,CAAC,UAAU,CAAC,YAAY;IAC1B,OAAO,WAAW,KAAK;IACvB;GACF;GACA,AAAK,OAAO,YAAY,mBAAmB,kBAAkB,SAAS,CAAC,CAAC,MAAM,WAAW;IACvF,MAAM,SAAS,0BAA0B,MAAM;IAC/C,OAAO,SAAS,YAAY,WAAW,CAAC,MAAM;GAChD,SAAS;IACP,OAAO,WAAW,KAAK;GACzB,CAAC;EACH;EACA,SAAS;GACP,OAAO,aAAa,KAAK;EAC3B;CACF;CAEA,6BAA6B,IAAI,UAAoB,UAAU;CAC/D,IAAI,QAAQ,cAAc,UACxB,WAAW,UAAU,QAAQ,UAAU;CAEzC,IAAI,QAAQ,UAAU,OACpB,WAAW,MAAM,KAAK;CAExB,OAAO,WAAW,UAAU;AAC9B;AAEA,SAAgB,wBAAwB,UAA+B;CACrE,6BAA6B,IAAI,QAAkB,CAAC,EAAE,OAAO;AAC/D;AAEA,SAAgB,gCACd,QACA,QACA,YAAY,oCACZ,OAA8B,YAC9B;CACA,mCAAmC;EAAE,QAAQ;EAAyB,QAAQ;CAAwB,CAAC;CACvG,yBAAyB,IAAI,QAAQ;EACnC;EACA;EACA,WAAW,iBAAiB,SAAS;CACvC,CAAC;AACH"}

package/dist/dev/router/instance.mjs

@@ -8,8 +8,7 @@ function setActiveRouter(router) {
 	provideGlobal(ROUTER_INSTANCE_KEY, router);
 }
 function getActiveRouter() {
-	var _activeRouter;
-	return (_activeRouter = activeRouter) !== null && _activeRouter !== void 0 ? _activeRouter : injectGlobal(ROUTER_INSTANCE_KEY, void 0);
+	return activeRouter ?? injectGlobal(ROUTER_INSTANCE_KEY, void 0);
 }
 
 //#endregion

package/dist/dev/router/instance.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"instance.mjs","names":[],"sources":["../../../src/router/instance.ts"],"sourcesContent":["import type { RouterNavigation } from './types'\nimport { injectGlobal, provideGlobal } from '../runtime/provide'\n\nconst ROUTER_INSTANCE_KEY = Symbol('wevu.router.instance')\n\nlet activeRouter: RouterNavigation | undefined\n\nexport function setActiveRouter(router: RouterNavigation) {\n  activeRouter = router\n  provideGlobal(ROUTER_INSTANCE_KEY, router)\n}\n\nexport function clearActiveRouter() {\n  activeRouter = undefined\n  provideGlobal(ROUTER_INSTANCE_KEY, undefined)\n}\n\nexport function getActiveRouter() {\n  return activeRouter ?? injectGlobal<RouterNavigation | undefined>(ROUTER_INSTANCE_KEY, undefined)\n}\n"],"mappings":";;;AAGA,MAAM,sBAAsB,OAAO,sBAAsB;AAEzD,IAAI;AAEJ,SAAgB,gBAAgB,QAA0B;CACxD,eAAe;CACf,cAAc,qBAAqB,MAAM;AAC3C;AAOA,SAAgB,kBAAkB;;CAChC,wBAAO,qEAAgB,aAA2C,qBAAqB,MAAS;AAClG"}
+{"version":3,"file":"instance.mjs","names":[],"sources":["../../../src/router/instance.ts"],"sourcesContent":["import type { RouterNavigation } from './types'\nimport { injectGlobal, provideGlobal } from '../runtime/provide'\n\nconst ROUTER_INSTANCE_KEY = Symbol('wevu.router.instance')\n\nlet activeRouter: RouterNavigation | undefined\n\nexport function setActiveRouter(router: RouterNavigation) {\n  activeRouter = router\n  provideGlobal(ROUTER_INSTANCE_KEY, router)\n}\n\nexport function clearActiveRouter() {\n  activeRouter = undefined\n  provideGlobal(ROUTER_INSTANCE_KEY, undefined)\n}\n\nexport function getActiveRouter() {\n  return activeRouter ?? injectGlobal<RouterNavigation | undefined>(ROUTER_INSTANCE_KEY, undefined)\n}\n"],"mappings":";;;AAGA,MAAM,sBAAsB,OAAO,sBAAsB;AAEzD,IAAI;AAEJ,SAAgB,gBAAgB,QAA0B;CACxD,eAAe;CACf,cAAc,qBAAqB,MAAM;AAC3C;AAOA,SAAgB,kBAAkB;CAChC,OAAO,gBAAgB,aAA2C,qBAAqB,MAAS;AAClG"}

package/dist/dev/router/navigationCore.d.mts

@@ -0,0 +1,7 @@
+import { NavigationFailure, NavigationFailureTypeValue, RouteLocationNormalizedLoaded } from "./types.mjs";
+import { WevuNamedRouteMap } from "../router.mjs";
+//#region src/router/navigationCore.d.ts
+export declare function createNavigationFailure<TRouteMap extends object = WevuNamedRouteMap>(type: NavigationFailureTypeValue, to?: RouteLocationNormalizedLoaded<NoInfer<TRouteMap>>, from?: RouteLocationNormalizedLoaded<NoInfer<TRouteMap>>, cause?: unknown): NavigationFailure<TRouteMap>;
+export declare function isNavigationFailure<TRouteMap extends object = WevuNamedRouteMap>(error: unknown, type?: NavigationFailureTypeValue): error is NavigationFailure<TRouteMap>;
+//#endregion
+//# sourceMappingURL=navigationCore.d.mts.map

package/dist/dev/router/navigationCore.mjs

@@ -112,12 +112,12 @@ function executeNavigationMethod(method, options, to, from) {
 async function runAfterEachHooks(hooks, context) {
 	for (const hook of hooks) try {
 		await hook(context.to, context.from, context.failure, context);
-	} catch (_unused) {}
+	} catch {}
 }
 async function runNavigationErrorHooks(handlers, error, context) {
 	for (const handler of handlers) try {
 		await handler(error, context);
-	} catch (_unused2) {}
+	} catch {}
 }
 function isNativeFailureLikeError(value) {
 	if (!value || typeof value !== "object") return false;

package/dist/dev/router/navigationCore.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"navigationCore.mjs","names":[],"sources":["../../../src/router/navigationCore.ts"],"sourcesContent":["import type { WevuNamedRouteMap } from '../router'\nimport type {\n  NavigationAfterEach,\n  NavigationAfterEachContext,\n  NavigationErrorContext,\n  NavigationErrorHandler,\n  NavigationFailure,\n  NavigationFailureTypeValue,\n  NavigationGuard,\n  NavigationGuardContext,\n  NavigationRedirect,\n  RouteLocationNormalizedLoaded,\n  RouteLocationRaw,\n} from './types'\nimport { NavigationFailureType } from './types'\n\nconst DUPLICATED_RE = /already|same|duplicat|重复/\nconst CANCELLED_RE = /cancel|取消/\nconst ABORTED_RE = /abort|interrupt|中断/\n\nfunction normalizeNavigationErrorMessage(error: unknown): string {\n  if (typeof error === 'string') {\n    return error\n  }\n  if (error && typeof error === 'object') {\n    const message = (error as Record<string, unknown>).errMsg\n    if (typeof message === 'string') {\n      return message\n    }\n    if (error instanceof Error) {\n      return error.message\n    }\n  }\n  return ''\n}\n\nfunction resolveNavigationFailureType(error: unknown): NavigationFailureTypeValue {\n  const normalizedMessage = normalizeNavigationErrorMessage(error).toLowerCase()\n  if (DUPLICATED_RE.test(normalizedMessage)) {\n    return NavigationFailureType.duplicated\n  }\n  if (CANCELLED_RE.test(normalizedMessage)) {\n    return NavigationFailureType.cancelled\n  }\n  if (ABORTED_RE.test(normalizedMessage)) {\n    return NavigationFailureType.aborted\n  }\n  return NavigationFailureType.unknown\n}\n\nexport function createNavigationFailure<TRouteMap extends object = WevuNamedRouteMap>(\n  type: NavigationFailureTypeValue,\n  to?: RouteLocationNormalizedLoaded<NoInfer<TRouteMap>>,\n  from?: RouteLocationNormalizedLoaded<NoInfer<TRouteMap>>,\n  cause?: unknown,\n): NavigationFailure<TRouteMap> {\n  const message = normalizeNavigationErrorMessage(cause) || 'Navigation failed'\n  return Object.assign(new Error(message), {\n    __wevuNavigationFailure: true as const,\n    type,\n    to,\n    from,\n    cause,\n  })\n}\n\nexport function isNavigationFailure<TRouteMap extends object = WevuNamedRouteMap>(\n  error: unknown,\n  type?: NavigationFailureTypeValue,\n): error is NavigationFailure<TRouteMap> {\n  if (!error || typeof error !== 'object') {\n    return false\n  }\n  const navigationError = error as Partial<NavigationFailure>\n  if (navigationError.__wevuNavigationFailure !== true) {\n    return false\n  }\n  if (type === undefined) {\n    return true\n  }\n  return navigationError.type === type\n}\n\ninterface GuardPipelineContinue {\n  status: 'continue'\n}\n\ninterface GuardPipelineFailure {\n  status: 'failure'\n  failure: NavigationFailure\n}\n\ninterface GuardPipelineRedirect {\n  status: 'redirect'\n  target: RouteLocationNormalizedLoaded\n  replace?: boolean\n}\n\nexport type GuardPipelineResult = GuardPipelineContinue | GuardPipelineFailure | GuardPipelineRedirect\n\nexport function isNavigationRedirectCandidate(value: unknown): value is NavigationRedirect {\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  return 'to' in (value as Record<string, unknown>)\n}\n\nfunction isRouteLocationRawCandidate(value: unknown): value is RouteLocationRaw {\n  if (typeof value === 'string') {\n    return true\n  }\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  const candidate = value as Record<string, unknown>\n  return 'path' in candidate\n    || 'fullPath' in candidate\n    || 'query' in candidate\n    || 'hash' in candidate\n    || 'name' in candidate\n    || 'params' in candidate\n}\n\nexport async function runNavigationGuards(\n  guards: ReadonlySet<NavigationGuard>,\n  context: NavigationGuardContext,\n  resolveRoute: (to: RouteLocationRaw, currentPath: string) => RouteLocationNormalizedLoaded,\n): Promise<GuardPipelineResult> {\n  for (const guard of guards) {\n    try {\n      const result = await guard(context.to, context.from, context)\n      if (isNavigationFailure(result)) {\n        return {\n          status: 'failure',\n          failure: result,\n        }\n      }\n      if (result === false) {\n        return {\n          status: 'failure',\n          failure: createNavigationFailure(\n            NavigationFailureType.aborted,\n            context.to,\n            context.from,\n            'Navigation aborted by guard',\n          ),\n        }\n      }\n      if (isNavigationRedirectCandidate(result)) {\n        if (!context.to) {\n          return {\n            status: 'failure',\n            failure: createNavigationFailure(\n              NavigationFailureType.aborted,\n              context.to,\n              context.from,\n              'Redirect is not supported in back navigation guards',\n            ),\n          }\n        }\n        return {\n          status: 'redirect',\n          target: resolveRoute(result.to, context.to.path),\n          replace: result.replace,\n        }\n      }\n      if (isRouteLocationRawCandidate(result)) {\n        if (!context.to) {\n          return {\n            status: 'failure',\n            failure: createNavigationFailure(\n              NavigationFailureType.aborted,\n              context.to,\n              context.from,\n              'Redirect is not supported in back navigation guards',\n            ),\n          }\n        }\n        return {\n          status: 'redirect',\n          target: resolveRoute(result, context.to.path),\n        }\n      }\n    }\n    catch (error) {\n      return {\n        status: 'failure',\n        failure: createNavigationFailure(NavigationFailureType.aborted, context.to, context.from, error),\n      }\n    }\n  }\n  return { status: 'continue' }\n}\n\nexport function executeNavigationMethod(\n  method: (options: Record<string, any>) => unknown,\n  options: Record<string, any>,\n  to?: RouteLocationNormalizedLoaded,\n  from?: RouteLocationNormalizedLoaded,\n): Promise<void | NavigationFailure> {\n  return new Promise((resolve) => {\n    let settled = false\n    const finalize = (result?: void | NavigationFailure) => {\n      if (settled) {\n        return\n      }\n      settled = true\n      resolve(result)\n    }\n\n    try {\n      const maybePromise = method({\n        ...options,\n        success: () => finalize(),\n        fail: (error: unknown) => {\n          finalize(createNavigationFailure(resolveNavigationFailureType(error), to, from, error))\n        },\n      })\n\n      if (maybePromise && typeof (maybePromise as PromiseLike<unknown>).then === 'function') {\n        ;(maybePromise as PromiseLike<unknown>).then(\n          () => finalize(),\n          error => finalize(createNavigationFailure(resolveNavigationFailureType(error), to, from, error)),\n        )\n      }\n    }\n    catch (error) {\n      finalize(createNavigationFailure(resolveNavigationFailureType(error), to, from, error))\n    }\n  })\n}\n\nexport async function runAfterEachHooks(\n  hooks: ReadonlySet<NavigationAfterEach>,\n  context: NavigationAfterEachContext,\n) {\n  for (const hook of hooks) {\n    try {\n      await hook(context.to, context.from, context.failure, context)\n    }\n    catch {\n      // 忽略 afterEach hook 的异常，避免影响导航主流程。\n    }\n  }\n}\n\nexport async function runNavigationErrorHooks(\n  handlers: ReadonlySet<NavigationErrorHandler>,\n  error: unknown,\n  context: NavigationErrorContext,\n) {\n  for (const handler of handlers) {\n    try {\n      await handler(error, context)\n    }\n    catch {\n      // 忽略 onError 回调中的异常，避免影响导航主流程。\n    }\n  }\n}\n\nfunction isNativeFailureLikeError(value: unknown): boolean {\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  const errMsg = (value as Record<string, unknown>).errMsg\n  return typeof errMsg === 'string'\n}\n\nexport function shouldEmitNavigationError(failure: NavigationFailure): boolean {\n  if (failure.type === NavigationFailureType.unknown) {\n    return true\n  }\n  if (failure.cause instanceof Error) {\n    return true\n  }\n  if (failure.type === NavigationFailureType.aborted && failure.cause !== undefined) {\n    if (typeof failure.cause === 'string') {\n      return false\n    }\n    if (isNativeFailureLikeError(failure.cause)) {\n      return false\n    }\n    return true\n  }\n  return false\n}\n"],"mappings":"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"}
+{"version":3,"file":"navigationCore.mjs","names":[],"sources":["../../../src/router/navigationCore.ts"],"sourcesContent":["import type { WevuNamedRouteMap } from '../router'\nimport type {\n  NavigationAfterEach,\n  NavigationAfterEachContext,\n  NavigationErrorContext,\n  NavigationErrorHandler,\n  NavigationFailure,\n  NavigationFailureTypeValue,\n  NavigationGuard,\n  NavigationGuardContext,\n  NavigationRedirect,\n  RouteLocationNormalizedLoaded,\n  RouteLocationRaw,\n} from './types'\nimport { NavigationFailureType } from './types'\n\nconst DUPLICATED_RE = /already|same|duplicat|重复/\nconst CANCELLED_RE = /cancel|取消/\nconst ABORTED_RE = /abort|interrupt|中断/\n\nfunction normalizeNavigationErrorMessage(error: unknown): string {\n  if (typeof error === 'string') {\n    return error\n  }\n  if (error && typeof error === 'object') {\n    const message = (error as Record<string, unknown>).errMsg\n    if (typeof message === 'string') {\n      return message\n    }\n    if (error instanceof Error) {\n      return error.message\n    }\n  }\n  return ''\n}\n\nfunction resolveNavigationFailureType(error: unknown): NavigationFailureTypeValue {\n  const normalizedMessage = normalizeNavigationErrorMessage(error).toLowerCase()\n  if (DUPLICATED_RE.test(normalizedMessage)) {\n    return NavigationFailureType.duplicated\n  }\n  if (CANCELLED_RE.test(normalizedMessage)) {\n    return NavigationFailureType.cancelled\n  }\n  if (ABORTED_RE.test(normalizedMessage)) {\n    return NavigationFailureType.aborted\n  }\n  return NavigationFailureType.unknown\n}\n\nexport function createNavigationFailure<TRouteMap extends object = WevuNamedRouteMap>(\n  type: NavigationFailureTypeValue,\n  to?: RouteLocationNormalizedLoaded<NoInfer<TRouteMap>>,\n  from?: RouteLocationNormalizedLoaded<NoInfer<TRouteMap>>,\n  cause?: unknown,\n): NavigationFailure<TRouteMap> {\n  const message = normalizeNavigationErrorMessage(cause) || 'Navigation failed'\n  return Object.assign(new Error(message), {\n    __wevuNavigationFailure: true as const,\n    type,\n    to,\n    from,\n    cause,\n  })\n}\n\nexport function isNavigationFailure<TRouteMap extends object = WevuNamedRouteMap>(\n  error: unknown,\n  type?: NavigationFailureTypeValue,\n): error is NavigationFailure<TRouteMap> {\n  if (!error || typeof error !== 'object') {\n    return false\n  }\n  const navigationError = error as Partial<NavigationFailure>\n  if (navigationError.__wevuNavigationFailure !== true) {\n    return false\n  }\n  if (type === undefined) {\n    return true\n  }\n  return navigationError.type === type\n}\n\ninterface GuardPipelineContinue {\n  status: 'continue'\n}\n\ninterface GuardPipelineFailure {\n  status: 'failure'\n  failure: NavigationFailure\n}\n\ninterface GuardPipelineRedirect {\n  status: 'redirect'\n  target: RouteLocationNormalizedLoaded\n  replace?: boolean\n}\n\nexport type GuardPipelineResult = GuardPipelineContinue | GuardPipelineFailure | GuardPipelineRedirect\n\nexport function isNavigationRedirectCandidate(value: unknown): value is NavigationRedirect {\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  return 'to' in (value as Record<string, unknown>)\n}\n\nfunction isRouteLocationRawCandidate(value: unknown): value is RouteLocationRaw {\n  if (typeof value === 'string') {\n    return true\n  }\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  const candidate = value as Record<string, unknown>\n  return 'path' in candidate\n    || 'fullPath' in candidate\n    || 'query' in candidate\n    || 'hash' in candidate\n    || 'name' in candidate\n    || 'params' in candidate\n}\n\nexport async function runNavigationGuards(\n  guards: ReadonlySet<NavigationGuard>,\n  context: NavigationGuardContext,\n  resolveRoute: (to: RouteLocationRaw, currentPath: string) => RouteLocationNormalizedLoaded,\n): Promise<GuardPipelineResult> {\n  for (const guard of guards) {\n    try {\n      const result = await guard(context.to, context.from, context)\n      if (isNavigationFailure(result)) {\n        return {\n          status: 'failure',\n          failure: result,\n        }\n      }\n      if (result === false) {\n        return {\n          status: 'failure',\n          failure: createNavigationFailure(\n            NavigationFailureType.aborted,\n            context.to,\n            context.from,\n            'Navigation aborted by guard',\n          ),\n        }\n      }\n      if (isNavigationRedirectCandidate(result)) {\n        if (!context.to) {\n          return {\n            status: 'failure',\n            failure: createNavigationFailure(\n              NavigationFailureType.aborted,\n              context.to,\n              context.from,\n              'Redirect is not supported in back navigation guards',\n            ),\n          }\n        }\n        return {\n          status: 'redirect',\n          target: resolveRoute(result.to, context.to.path),\n          replace: result.replace,\n        }\n      }\n      if (isRouteLocationRawCandidate(result)) {\n        if (!context.to) {\n          return {\n            status: 'failure',\n            failure: createNavigationFailure(\n              NavigationFailureType.aborted,\n              context.to,\n              context.from,\n              'Redirect is not supported in back navigation guards',\n            ),\n          }\n        }\n        return {\n          status: 'redirect',\n          target: resolveRoute(result, context.to.path),\n        }\n      }\n    }\n    catch (error) {\n      return {\n        status: 'failure',\n        failure: createNavigationFailure(NavigationFailureType.aborted, context.to, context.from, error),\n      }\n    }\n  }\n  return { status: 'continue' }\n}\n\nexport function executeNavigationMethod(\n  method: (options: Record<string, any>) => unknown,\n  options: Record<string, any>,\n  to?: RouteLocationNormalizedLoaded,\n  from?: RouteLocationNormalizedLoaded,\n): Promise<void | NavigationFailure> {\n  return new Promise((resolve) => {\n    let settled = false\n    const finalize = (result?: void | NavigationFailure) => {\n      if (settled) {\n        return\n      }\n      settled = true\n      resolve(result)\n    }\n\n    try {\n      const maybePromise = method({\n        ...options,\n        success: () => finalize(),\n        fail: (error: unknown) => {\n          finalize(createNavigationFailure(resolveNavigationFailureType(error), to, from, error))\n        },\n      })\n\n      if (maybePromise && typeof (maybePromise as PromiseLike<unknown>).then === 'function') {\n        ;(maybePromise as PromiseLike<unknown>).then(\n          () => finalize(),\n          error => finalize(createNavigationFailure(resolveNavigationFailureType(error), to, from, error)),\n        )\n      }\n    }\n    catch (error) {\n      finalize(createNavigationFailure(resolveNavigationFailureType(error), to, from, error))\n    }\n  })\n}\n\nexport async function runAfterEachHooks(\n  hooks: ReadonlySet<NavigationAfterEach>,\n  context: NavigationAfterEachContext,\n) {\n  for (const hook of hooks) {\n    try {\n      await hook(context.to, context.from, context.failure, context)\n    }\n    catch {\n      // 忽略 afterEach hook 的异常，避免影响导航主流程。\n    }\n  }\n}\n\nexport async function runNavigationErrorHooks(\n  handlers: ReadonlySet<NavigationErrorHandler>,\n  error: unknown,\n  context: NavigationErrorContext,\n) {\n  for (const handler of handlers) {\n    try {\n      await handler(error, context)\n    }\n    catch {\n      // 忽略 onError 回调中的异常，避免影响导航主流程。\n    }\n  }\n}\n\nfunction isNativeFailureLikeError(value: unknown): boolean {\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  const errMsg = (value as Record<string, unknown>).errMsg\n  return typeof errMsg === 'string'\n}\n\nexport function shouldEmitNavigationError(failure: NavigationFailure): boolean {\n  if (failure.type === NavigationFailureType.unknown) {\n    return true\n  }\n  if (failure.cause instanceof Error) {\n    return true\n  }\n  if (failure.type === NavigationFailureType.aborted && failure.cause !== undefined) {\n    if (typeof failure.cause === 'string') {\n      return false\n    }\n    if (isNativeFailureLikeError(failure.cause)) {\n      return false\n    }\n    return true\n  }\n  return false\n}\n"],"mappings":"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"}

package/dist/dev/router/navigationResult.mjs

@@ -20,16 +20,13 @@ function createNavigationResultController(options) {
 			nativeRouter,
 			failure: result.failure
 		});
-		if (result.failure && shouldEmitNavigationError(result.failure)) {
-			var _result$failure$cause;
-			await runNavigationErrorHooks(errorHandlers, (_result$failure$cause = result.failure.cause) !== null && _result$failure$cause !== void 0 ? _result$failure$cause : result.failure, {
-				mode: result.mode,
-				to: result.to,
-				from: result.from,
-				nativeRouter,
-				failure: result.failure
-			});
-		}
+		if (result.failure && shouldEmitNavigationError(result.failure)) await runNavigationErrorHooks(errorHandlers, result.failure.cause ?? result.failure, {
+			mode: result.mode,
+			to: result.to,
+			from: result.from,
+			nativeRouter,
+			failure: result.failure
+		});
 	}
 	function shouldRejectNavigationFailure(failure) {
 		return rejectOnError && shouldEmitNavigationError(failure);

package/dist/dev/router/navigationResult.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"navigationResult.mjs","names":[],"sources":["../../../src/router/navigationResult.ts"],"sourcesContent":["import type { SetupContextRouter } from '../runtime/types/props'\nimport type {\n  NavigationAfterEach,\n  NavigationErrorHandler,\n  NavigationFailure,\n  NavigationMode,\n  RouteLocationNormalizedLoaded,\n} from './types'\nimport { runAfterEachHooks, runNavigationErrorHooks, shouldEmitNavigationError } from './navigationCore'\nimport { notifyRouteStateSync } from './routeSync'\n\nexport interface NavigationRunResult {\n  mode: NavigationMode\n  from: RouteLocationNormalizedLoaded\n  to?: RouteLocationNormalizedLoaded\n  failure?: NavigationFailure\n}\n\nexport function createNavigationRunResult(\n  mode: NavigationMode,\n  from: RouteLocationNormalizedLoaded,\n  to?: RouteLocationNormalizedLoaded,\n  failure?: NavigationFailure,\n): NavigationRunResult {\n  return {\n    mode,\n    from,\n    to,\n    failure,\n  }\n}\n\nexport function createNavigationResultController(options: {\n  afterEachHooks: ReadonlySet<NavigationAfterEach>\n  errorHandlers: ReadonlySet<NavigationErrorHandler>\n  nativeRouter: SetupContextRouter\n  rejectOnError: boolean\n}) {\n  const {\n    afterEachHooks,\n    errorHandlers,\n    nativeRouter,\n    rejectOnError,\n  } = options\n\n  async function emitNavigationAfterEach(result: NavigationRunResult): Promise<void> {\n    await runAfterEachHooks(afterEachHooks, {\n      mode: result.mode,\n      to: result.to,\n      from: result.from,\n      nativeRouter,\n      failure: result.failure,\n    })\n\n    if (result.failure && shouldEmitNavigationError(result.failure)) {\n      await runNavigationErrorHooks(\n        errorHandlers,\n        result.failure.cause ?? result.failure,\n        {\n          mode: result.mode,\n          to: result.to,\n          from: result.from,\n          nativeRouter,\n          failure: result.failure,\n        },\n      )\n    }\n  }\n\n  function shouldRejectNavigationFailure(failure: NavigationFailure): boolean {\n    return rejectOnError && shouldEmitNavigationError(failure)\n  }\n\n  async function settleNavigationResult(result: NavigationRunResult): Promise<void | NavigationFailure> {\n    if (!result.failure) {\n      notifyRouteStateSync(result.to\n        ? {\n            route: result.to,\n            source: 'router',\n          }\n        : undefined)\n    }\n    await emitNavigationAfterEach(result)\n    if (result.failure && shouldRejectNavigationFailure(result.failure)) {\n      throw result.failure\n    }\n    return result.failure\n  }\n\n  return {\n    emitNavigationAfterEach,\n    settleNavigationResult,\n  }\n}\n"],"mappings":";;;;AAkBA,SAAgB,0BACd,MACA,MACA,IACA,SACqB;CACrB,OAAO;EACL;EACA;EACA;EACA;CACF;AACF;AAEA,SAAgB,iCAAiC,SAK9C;CACD,MAAM,EACJ,gBACA,eACA,cACA,kBACE;CAEJ,eAAe,wBAAwB,QAA4C;EACjF,MAAM,kBAAkB,gBAAgB;GACtC,MAAM,OAAO;GACb,IAAI,OAAO;GACX,MAAM,OAAO;GACb;GACA,SAAS,OAAO;EAClB,CAAC;EAED,IAAI,OAAO,WAAW,0BAA0B,OAAO,OAAO,GAAG;;GAC/D,MAAM,wBACJ,wCACA,OAAO,QAAQ,8EAAS,OAAO,SAC/B;IACE,MAAM,OAAO;IACb,IAAI,OAAO;IACX,MAAM,OAAO;IACb;IACA,SAAS,OAAO;GAClB,CACF;EACF;CACF;CAEA,SAAS,8BAA8B,SAAqC;EAC1E,OAAO,iBAAiB,0BAA0B,OAAO;CAC3D;CAEA,eAAe,uBAAuB,QAAgE;EACpG,IAAI,CAAC,OAAO,SACV,qBAAqB,OAAO,KACxB;GACE,OAAO,OAAO;GACd,QAAQ;EACV,IACA,MAAS;EAEf,MAAM,wBAAwB,MAAM;EACpC,IAAI,OAAO,WAAW,8BAA8B,OAAO,OAAO,GAChE,MAAM,OAAO;EAEf,OAAO,OAAO;CAChB;CAEA,OAAO;EACL;EACA;CACF;AACF"}
+{"version":3,"file":"navigationResult.mjs","names":[],"sources":["../../../src/router/navigationResult.ts"],"sourcesContent":["import type { SetupContextRouter } from '../runtime/types/props'\nimport type {\n  NavigationAfterEach,\n  NavigationErrorHandler,\n  NavigationFailure,\n  NavigationMode,\n  RouteLocationNormalizedLoaded,\n} from './types'\nimport { runAfterEachHooks, runNavigationErrorHooks, shouldEmitNavigationError } from './navigationCore'\nimport { notifyRouteStateSync } from './routeSync'\n\nexport interface NavigationRunResult {\n  mode: NavigationMode\n  from: RouteLocationNormalizedLoaded\n  to?: RouteLocationNormalizedLoaded\n  failure?: NavigationFailure\n}\n\nexport function createNavigationRunResult(\n  mode: NavigationMode,\n  from: RouteLocationNormalizedLoaded,\n  to?: RouteLocationNormalizedLoaded,\n  failure?: NavigationFailure,\n): NavigationRunResult {\n  return {\n    mode,\n    from,\n    to,\n    failure,\n  }\n}\n\nexport function createNavigationResultController(options: {\n  afterEachHooks: ReadonlySet<NavigationAfterEach>\n  errorHandlers: ReadonlySet<NavigationErrorHandler>\n  nativeRouter: SetupContextRouter\n  rejectOnError: boolean\n}) {\n  const {\n    afterEachHooks,\n    errorHandlers,\n    nativeRouter,\n    rejectOnError,\n  } = options\n\n  async function emitNavigationAfterEach(result: NavigationRunResult): Promise<void> {\n    await runAfterEachHooks(afterEachHooks, {\n      mode: result.mode,\n      to: result.to,\n      from: result.from,\n      nativeRouter,\n      failure: result.failure,\n    })\n\n    if (result.failure && shouldEmitNavigationError(result.failure)) {\n      await runNavigationErrorHooks(\n        errorHandlers,\n        result.failure.cause ?? result.failure,\n        {\n          mode: result.mode,\n          to: result.to,\n          from: result.from,\n          nativeRouter,\n          failure: result.failure,\n        },\n      )\n    }\n  }\n\n  function shouldRejectNavigationFailure(failure: NavigationFailure): boolean {\n    return rejectOnError && shouldEmitNavigationError(failure)\n  }\n\n  async function settleNavigationResult(result: NavigationRunResult): Promise<void | NavigationFailure> {\n    if (!result.failure) {\n      notifyRouteStateSync(result.to\n        ? {\n            route: result.to,\n            source: 'router',\n          }\n        : undefined)\n    }\n    await emitNavigationAfterEach(result)\n    if (result.failure && shouldRejectNavigationFailure(result.failure)) {\n      throw result.failure\n    }\n    return result.failure\n  }\n\n  return {\n    emitNavigationAfterEach,\n    settleNavigationResult,\n  }\n}\n"],"mappings":";;;;AAkBA,SAAgB,0BACd,MACA,MACA,IACA,SACqB;CACrB,OAAO;EACL;EACA;EACA;EACA;CACF;AACF;AAEA,SAAgB,iCAAiC,SAK9C;CACD,MAAM,EACJ,gBACA,eACA,cACA,kBACE;CAEJ,eAAe,wBAAwB,QAA4C;EACjF,MAAM,kBAAkB,gBAAgB;GACtC,MAAM,OAAO;GACb,IAAI,OAAO;GACX,MAAM,OAAO;GACb;GACA,SAAS,OAAO;EAClB,CAAC;EAED,IAAI,OAAO,WAAW,0BAA0B,OAAO,OAAO,GAC5D,MAAM,wBACJ,eACA,OAAO,QAAQ,SAAS,OAAO,SAC/B;GACE,MAAM,OAAO;GACb,IAAI,OAAO;GACX,MAAM,OAAO;GACb;GACA,SAAS,OAAO;EAClB,CACF;CAEJ;CAEA,SAAS,8BAA8B,SAAqC;EAC1E,OAAO,iBAAiB,0BAA0B,OAAO;CAC3D;CAEA,eAAe,uBAAuB,QAAgE;EACpG,IAAI,CAAC,OAAO,SACV,qBAAqB,OAAO,KACxB;GACE,OAAO,OAAO;GACd,QAAQ;EACV,IACA,MAAS;EAEf,MAAM,wBAAwB,MAAM;EACpC,IAAI,OAAO,WAAW,8BAA8B,OAAO,OAAO,GAChE,MAAM,OAAO;EAEf,OAAO,OAAO;CAChB;CAEA,OAAO;EACL;EACA;CACF;AACF"}

package/dist/dev/router/navigationTarget.mjs

@@ -13,7 +13,6 @@ async function navigateWithTarget(options) {
 	let currentMode = mode;
 	let redirectCount = 0;
 	while (true) {
-		var _matchedRouteResult$m;
 		const tabBarTarget = tabBarPathSet.has(currentTarget.path);
 		if (createNativeRouteUrl(currentTarget, routeResolveCodec.stringifyQuery) === createNativeRouteUrl(from, routeResolveCodec.stringifyQuery) && currentTarget.hash !== from.hash) return createNavigationRunResult(currentMode, from, currentTarget, createHashOnlyNavigationFailure(currentTarget, from));
 		if (!allowSameLocation && (tabBarTarget ? currentTarget.path === from.path : currentTarget.fullPath === from.fullPath)) return createNavigationRunResult(currentMode, from, currentTarget, createDuplicatedFailure(currentTarget, from));
@@ -37,8 +36,7 @@ async function navigateWithTarget(options) {
 				continue;
 			}
 		}
-		const matchedRouteResult = resolveMatchedRouteRecord(currentTarget, namedRouteLookup);
-		const matchedRouteRecords = (_matchedRouteResult$m = matchedRouteResult === null || matchedRouteResult === void 0 ? void 0 : matchedRouteResult.matchedRecords) !== null && _matchedRouteResult$m !== void 0 ? _matchedRouteResult$m : [];
+		const matchedRouteRecords = resolveMatchedRouteRecord(currentTarget, namedRouteLookup)?.matchedRecords ?? [];
 		let redirectedByRouteRecord = false;
 		for (const matchedRouteRecord of matchedRouteRecords) {
 			if (matchedRouteRecord.redirect === void 0) continue;

package/dist/dev/router/navigationTarget.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"navigationTarget.mjs","names":[],"sources":["../../../src/router/navigationTarget.ts"],"sourcesContent":["import type {\n  NamedRouteLookup,\n  RouteResolveCodec,\n} from '../routerInternal/shared'\nimport type { NavigationRunResult } from './navigationResult'\nimport type {\n  NavigationGuard,\n  NavigationMode,\n  RouteLocationNormalizedLoaded,\n  RouteLocationRaw,\n} from './types'\nimport {\n  createAbsoluteRoutePath,\n  createNativeRouteUrl,\n  hasLocationQuery,\n  resolveMatchedRouteRecord,\n} from '../routerInternal/shared'\nimport {\n  createNavigationFailure,\n  executeNavigationMethod,\n  isNavigationFailure,\n  runNavigationGuards,\n} from './navigationCore'\nimport { createNavigationRunResult } from './navigationResult'\nimport {\n  applyRedirectedFrom,\n  createDuplicatedFailure,\n  createHashOnlyNavigationFailure,\n  createTabBarQueryFailure,\n  createTooManyRedirectsFailure,\n  resolveRouteRecordRedirect,\n} from './navigationTargetHelpers'\nimport { NavigationFailureType } from './types'\n\ninterface NavigateWithTargetOptions {\n  mode: Exclude<NavigationMode, 'back'>\n  target: RouteLocationNormalizedLoaded\n  from: RouteLocationNormalizedLoaded\n  nativeRouter: Record<string, any>\n  routeResolveCodec: RouteResolveCodec\n  namedRouteLookup: NamedRouteLookup\n  beforeEachGuards: ReadonlySet<NavigationGuard>\n  beforeResolveGuards: ReadonlySet<NavigationGuard>\n  maxRedirects: number\n  tabBarPathSet: ReadonlySet<string>\n  resolveWithCodec: (to: RouteLocationRaw, currentPath: string) => RouteLocationNormalizedLoaded\n  executeNative?: boolean\n  allowSameLocation?: boolean\n}\n\nexport async function navigateWithTarget(options: NavigateWithTargetOptions): Promise<NavigationRunResult> {\n  const {\n    mode,\n    target,\n    from,\n    nativeRouter,\n    routeResolveCodec,\n    namedRouteLookup,\n    beforeEachGuards,\n    beforeResolveGuards,\n    maxRedirects,\n    tabBarPathSet,\n    resolveWithCodec,\n    executeNative = true,\n    allowSameLocation = false,\n  } = options\n  let currentTarget = target\n  let currentMode: Exclude<NavigationMode, 'back'> = mode\n  let redirectCount = 0\n\n  while (true) {\n    const tabBarTarget = tabBarPathSet.has(currentTarget.path)\n    const sameNativeLocation = createNativeRouteUrl(currentTarget, routeResolveCodec.stringifyQuery)\n      === createNativeRouteUrl(from, routeResolveCodec.stringifyQuery)\n    if (sameNativeLocation && currentTarget.hash !== from.hash) {\n      return createNavigationRunResult(currentMode, from, currentTarget, createHashOnlyNavigationFailure(currentTarget, from))\n    }\n\n    const duplicated = !allowSameLocation && (tabBarTarget\n      ? currentTarget.path === from.path\n      : currentTarget.fullPath === from.fullPath)\n    if (duplicated) {\n      return createNavigationRunResult(currentMode, from, currentTarget, createDuplicatedFailure(currentTarget, from))\n    }\n\n    if (tabBarTarget && hasLocationQuery(currentTarget.query)) {\n      return createNavigationRunResult(currentMode, from, currentTarget, createTabBarQueryFailure(currentTarget, from))\n    }\n\n    const beforeEachResult = await runNavigationGuards(beforeEachGuards, {\n      mode: currentMode,\n      to: currentTarget,\n      from,\n      nativeRouter: nativeRouter as any,\n    }, resolveWithCodec)\n\n    if (beforeEachResult.status === 'failure') {\n      return createNavigationRunResult(currentMode, from, currentTarget, beforeEachResult.failure)\n    }\n    if (beforeEachResult.status === 'redirect') {\n      const redirectedTarget = beforeEachResult.target\n      const redirectedMode = beforeEachResult.replace === true\n        ? 'replace'\n        : beforeEachResult.replace === false\n          ? 'push'\n          : currentMode\n      if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n        applyRedirectedFrom(redirectedTarget, currentTarget)\n        currentTarget = redirectedTarget\n        currentMode = redirectedMode\n        redirectCount += 1\n        if (redirectCount > maxRedirects) {\n          return createNavigationRunResult(\n            currentMode,\n            from,\n            currentTarget,\n            createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n          )\n        }\n        continue\n      }\n    }\n\n    const matchedRouteResult = resolveMatchedRouteRecord(currentTarget, namedRouteLookup)\n    const matchedRouteRecords = matchedRouteResult?.matchedRecords ?? []\n    let redirectedByRouteRecord = false\n    for (const matchedRouteRecord of matchedRouteRecords) {\n      if (matchedRouteRecord.redirect === undefined) {\n        continue\n      }\n      let redirectedByRecord: { target: RouteLocationNormalizedLoaded, replace?: boolean }\n      try {\n        redirectedByRecord = await resolveRouteRecordRedirect(\n          matchedRouteRecord.redirect,\n          currentTarget,\n          from,\n          resolveWithCodec,\n        )\n      }\n      catch (error) {\n        return createNavigationRunResult(\n          currentMode,\n          from,\n          currentTarget,\n          createNavigationFailure(NavigationFailureType.aborted, currentTarget, from, error),\n        )\n      }\n\n      const redirectedMode = redirectedByRecord.replace === false ? 'push' : 'replace'\n      const redirectedTarget = redirectedByRecord.target\n      if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n        applyRedirectedFrom(redirectedTarget, currentTarget)\n        currentTarget = redirectedTarget\n        currentMode = redirectedMode\n        redirectCount += 1\n        if (redirectCount > maxRedirects) {\n          return createNavigationRunResult(\n            currentMode,\n            from,\n            currentTarget,\n            createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n          )\n        }\n        redirectedByRouteRecord = true\n        break\n      }\n    }\n    if (redirectedByRouteRecord) {\n      continue\n    }\n\n    let redirectedByBeforeEnter = false\n    for (const matchedRouteRecord of matchedRouteRecords) {\n      if (matchedRouteRecord.beforeEnterGuards.length === 0) {\n        continue\n      }\n      const beforeEnterResult = await runNavigationGuards(new Set(matchedRouteRecord.beforeEnterGuards), {\n        mode: currentMode,\n        to: currentTarget,\n        from,\n        nativeRouter: nativeRouter as any,\n      }, resolveWithCodec)\n\n      if (beforeEnterResult.status === 'failure') {\n        return createNavigationRunResult(currentMode, from, currentTarget, beforeEnterResult.failure)\n      }\n      if (beforeEnterResult.status === 'redirect') {\n        const redirectedTarget = beforeEnterResult.target\n        const redirectedMode = beforeEnterResult.replace === true\n          ? 'replace'\n          : beforeEnterResult.replace === false\n            ? 'push'\n            : currentMode\n        if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n          applyRedirectedFrom(redirectedTarget, currentTarget)\n          currentTarget = redirectedTarget\n          currentMode = redirectedMode\n          redirectCount += 1\n          if (redirectCount > maxRedirects) {\n            return createNavigationRunResult(\n              currentMode,\n              from,\n              currentTarget,\n              createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n            )\n          }\n          redirectedByBeforeEnter = true\n          break\n        }\n      }\n    }\n    if (redirectedByBeforeEnter) {\n      continue\n    }\n\n    const beforeResolveResult = await runNavigationGuards(beforeResolveGuards, {\n      mode: currentMode,\n      to: currentTarget,\n      from,\n      nativeRouter: nativeRouter as any,\n    }, resolveWithCodec)\n\n    if (beforeResolveResult.status === 'failure') {\n      return createNavigationRunResult(currentMode, from, currentTarget, beforeResolveResult.failure)\n    }\n    if (beforeResolveResult.status === 'redirect') {\n      const redirectedTarget = beforeResolveResult.target\n      const redirectedMode = beforeResolveResult.replace === true\n        ? 'replace'\n        : beforeResolveResult.replace === false\n          ? 'push'\n          : currentMode\n      if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n        applyRedirectedFrom(redirectedTarget, currentTarget)\n        currentTarget = redirectedTarget\n        currentMode = redirectedMode\n        redirectCount += 1\n        if (redirectCount > maxRedirects) {\n          return createNavigationRunResult(\n            currentMode,\n            from,\n            currentTarget,\n            createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n          )\n        }\n        continue\n      }\n    }\n\n    if (!executeNative) {\n      return createNavigationRunResult(currentMode, from, currentTarget)\n    }\n\n    if (tabBarTarget) {\n      const result = await executeNavigationMethod(\n        nativeRouter.switchTab as (options: Record<string, any>) => unknown,\n        { url: createAbsoluteRoutePath(currentTarget.path) },\n        currentTarget,\n        from,\n      )\n      if (isNavigationFailure(result)) {\n        return createNavigationRunResult(currentMode, from, currentTarget, result)\n      }\n      return createNavigationRunResult(currentMode, from, currentTarget)\n    }\n\n    const nativeMethod = currentMode === 'push'\n      ? nativeRouter.navigateTo\n      : nativeRouter.redirectTo\n    const result = await executeNavigationMethod(\n      nativeMethod as (options: Record<string, any>) => unknown,\n      { url: createNativeRouteUrl(currentTarget, routeResolveCodec.stringifyQuery) },\n      currentTarget,\n      from,\n    )\n    if (isNavigationFailure(result)) {\n      return createNavigationRunResult(currentMode, from, currentTarget, result)\n    }\n    return createNavigationRunResult(currentMode, from, currentTarget)\n  }\n}\n"],"mappings":";;;;;;;;;AAkDA,eAAsB,mBAAmB,SAAkE;CACzG,MAAM,EACJ,MACA,QACA,MACA,cACA,mBACA,kBACA,kBACA,qBACA,cACA,eACA,kBACA,gBAAgB,MAChB,oBAAoB,UAClB;CACJ,IAAI,gBAAgB;CACpB,IAAI,cAA+C;CACnD,IAAI,gBAAgB;CAEpB,OAAO,MAAM;;EACX,MAAM,eAAe,cAAc,IAAI,cAAc,IAAI;EAGzD,IAF2B,qBAAqB,eAAe,kBAAkB,cAAc,MACzF,qBAAqB,MAAM,kBAAkB,cAAc,KACvC,cAAc,SAAS,KAAK,MACpD,OAAO,0BAA0B,aAAa,MAAM,eAAe,gCAAgC,eAAe,IAAI,CAAC;EAMzH,IAHmB,CAAC,sBAAsB,eACtC,cAAc,SAAS,KAAK,OAC5B,cAAc,aAAa,KAAK,WAElC,OAAO,0BAA0B,aAAa,MAAM,eAAe,wBAAwB,eAAe,IAAI,CAAC;EAGjH,IAAI,gBAAgB,iBAAiB,cAAc,KAAK,GACtD,OAAO,0BAA0B,aAAa,MAAM,eAAe,yBAAyB,eAAe,IAAI,CAAC;EAGlH,MAAM,mBAAmB,MAAM,oBAAoB,kBAAkB;GACnE,MAAM;GACN,IAAI;GACJ;GACc;EAChB,GAAG,gBAAgB;EAEnB,IAAI,iBAAiB,WAAW,WAC9B,OAAO,0BAA0B,aAAa,MAAM,eAAe,iBAAiB,OAAO;EAE7F,IAAI,iBAAiB,WAAW,YAAY;GAC1C,MAAM,mBAAmB,iBAAiB;GAC1C,MAAM,iBAAiB,iBAAiB,YAAY,OAChD,YACA,iBAAiB,YAAY,QAC3B,SACA;GACN,IAAI,iBAAiB,aAAa,cAAc,YAAY,mBAAmB,aAAa;IAC1F,oBAAoB,kBAAkB,aAAa;IACnD,gBAAgB;IAChB,cAAc;IACd,iBAAiB;IACjB,IAAI,gBAAgB,cAClB,OAAO,0BACL,aACA,MACA,eACA,8BAA8B,eAAe,MAAM,YAAY,CACjE;IAEF;GACF;EACF;EAEA,MAAM,qBAAqB,0BAA0B,eAAe,gBAAgB;EACpF,MAAM,uHAAsB,mBAAoB,uFAAkB,CAAC;EACnE,IAAI,0BAA0B;EAC9B,KAAK,MAAM,sBAAsB,qBAAqB;GACpD,IAAI,mBAAmB,aAAa,QAClC;GAEF,IAAI;GACJ,IAAI;IACF,qBAAqB,MAAM,2BACzB,mBAAmB,UACnB,eACA,MACA,gBACF;GACF,SACO,OAAO;IACZ,OAAO,0BACL,aACA,MACA,eACA,wBAAwB,sBAAsB,SAAS,eAAe,MAAM,KAAK,CACnF;GACF;GAEA,MAAM,iBAAiB,mBAAmB,YAAY,QAAQ,SAAS;GACvE,MAAM,mBAAmB,mBAAmB;GAC5C,IAAI,iBAAiB,aAAa,cAAc,YAAY,mBAAmB,aAAa;IAC1F,oBAAoB,kBAAkB,aAAa;IACnD,gBAAgB;IAChB,cAAc;IACd,iBAAiB;IACjB,IAAI,gBAAgB,cAClB,OAAO,0BACL,aACA,MACA,eACA,8BAA8B,eAAe,MAAM,YAAY,CACjE;IAEF,0BAA0B;IAC1B;GACF;EACF;EACA,IAAI,yBACF;EAGF,IAAI,0BAA0B;EAC9B,KAAK,MAAM,sBAAsB,qBAAqB;GACpD,IAAI,mBAAmB,kBAAkB,WAAW,GAClD;GAEF,MAAM,oBAAoB,MAAM,oBAAoB,IAAI,IAAI,mBAAmB,iBAAiB,GAAG;IACjG,MAAM;IACN,IAAI;IACJ;IACc;GAChB,GAAG,gBAAgB;GAEnB,IAAI,kBAAkB,WAAW,WAC/B,OAAO,0BAA0B,aAAa,MAAM,eAAe,kBAAkB,OAAO;GAE9F,IAAI,kBAAkB,WAAW,YAAY;IAC3C,MAAM,mBAAmB,kBAAkB;IAC3C,MAAM,iBAAiB,kBAAkB,YAAY,OACjD,YACA,kBAAkB,YAAY,QAC5B,SACA;IACN,IAAI,iBAAiB,aAAa,cAAc,YAAY,mBAAmB,aAAa;KAC1F,oBAAoB,kBAAkB,aAAa;KACnD,gBAAgB;KAChB,cAAc;KACd,iBAAiB;KACjB,IAAI,gBAAgB,cAClB,OAAO,0BACL,aACA,MACA,eACA,8BAA8B,eAAe,MAAM,YAAY,CACjE;KAEF,0BAA0B;KAC1B;IACF;GACF;EACF;EACA,IAAI,yBACF;EAGF,MAAM,sBAAsB,MAAM,oBAAoB,qBAAqB;GACzE,MAAM;GACN,IAAI;GACJ;GACc;EAChB,GAAG,gBAAgB;EAEnB,IAAI,oBAAoB,WAAW,WACjC,OAAO,0BAA0B,aAAa,MAAM,eAAe,oBAAoB,OAAO;EAEhG,IAAI,oBAAoB,WAAW,YAAY;GAC7C,MAAM,mBAAmB,oBAAoB;GAC7C,MAAM,iBAAiB,oBAAoB,YAAY,OACnD,YACA,oBAAoB,YAAY,QAC9B,SACA;GACN,IAAI,iBAAiB,aAAa,cAAc,YAAY,mBAAmB,aAAa;IAC1F,oBAAoB,kBAAkB,aAAa;IACnD,gBAAgB;IAChB,cAAc;IACd,iBAAiB;IACjB,IAAI,gBAAgB,cAClB,OAAO,0BACL,aACA,MACA,eACA,8BAA8B,eAAe,MAAM,YAAY,CACjE;IAEF;GACF;EACF;EAEA,IAAI,CAAC,eACH,OAAO,0BAA0B,aAAa,MAAM,aAAa;EAGnE,IAAI,cAAc;GAChB,MAAM,SAAS,MAAM,wBACnB,aAAa,WACb,EAAE,KAAK,wBAAwB,cAAc,IAAI,EAAE,GACnD,eACA,IACF;GACA,IAAI,oBAAoB,MAAM,GAC5B,OAAO,0BAA0B,aAAa,MAAM,eAAe,MAAM;GAE3E,OAAO,0BAA0B,aAAa,MAAM,aAAa;EACnE;EAEA,MAAM,eAAe,gBAAgB,SACjC,aAAa,aACb,aAAa;EACjB,MAAM,SAAS,MAAM,wBACnB,cACA,EAAE,KAAK,qBAAqB,eAAe,kBAAkB,cAAc,EAAE,GAC7E,eACA,IACF;EACA,IAAI,oBAAoB,MAAM,GAC5B,OAAO,0BAA0B,aAAa,MAAM,eAAe,MAAM;EAE3E,OAAO,0BAA0B,aAAa,MAAM,aAAa;CACnE;AACF"}
+{"version":3,"file":"navigationTarget.mjs","names":[],"sources":["../../../src/router/navigationTarget.ts"],"sourcesContent":["import type {\n  NamedRouteLookup,\n  RouteResolveCodec,\n} from '../routerInternal/shared'\nimport type { NavigationRunResult } from './navigationResult'\nimport type {\n  NavigationGuard,\n  NavigationMode,\n  RouteLocationNormalizedLoaded,\n  RouteLocationRaw,\n} from './types'\nimport {\n  createAbsoluteRoutePath,\n  createNativeRouteUrl,\n  hasLocationQuery,\n  resolveMatchedRouteRecord,\n} from '../routerInternal/shared'\nimport {\n  createNavigationFailure,\n  executeNavigationMethod,\n  isNavigationFailure,\n  runNavigationGuards,\n} from './navigationCore'\nimport { createNavigationRunResult } from './navigationResult'\nimport {\n  applyRedirectedFrom,\n  createDuplicatedFailure,\n  createHashOnlyNavigationFailure,\n  createTabBarQueryFailure,\n  createTooManyRedirectsFailure,\n  resolveRouteRecordRedirect,\n} from './navigationTargetHelpers'\nimport { NavigationFailureType } from './types'\n\ninterface NavigateWithTargetOptions {\n  mode: Exclude<NavigationMode, 'back'>\n  target: RouteLocationNormalizedLoaded\n  from: RouteLocationNormalizedLoaded\n  nativeRouter: Record<string, any>\n  routeResolveCodec: RouteResolveCodec\n  namedRouteLookup: NamedRouteLookup\n  beforeEachGuards: ReadonlySet<NavigationGuard>\n  beforeResolveGuards: ReadonlySet<NavigationGuard>\n  maxRedirects: number\n  tabBarPathSet: ReadonlySet<string>\n  resolveWithCodec: (to: RouteLocationRaw, currentPath: string) => RouteLocationNormalizedLoaded\n  executeNative?: boolean\n  allowSameLocation?: boolean\n}\n\nexport async function navigateWithTarget(options: NavigateWithTargetOptions): Promise<NavigationRunResult> {\n  const {\n    mode,\n    target,\n    from,\n    nativeRouter,\n    routeResolveCodec,\n    namedRouteLookup,\n    beforeEachGuards,\n    beforeResolveGuards,\n    maxRedirects,\n    tabBarPathSet,\n    resolveWithCodec,\n    executeNative = true,\n    allowSameLocation = false,\n  } = options\n  let currentTarget = target\n  let currentMode: Exclude<NavigationMode, 'back'> = mode\n  let redirectCount = 0\n\n  while (true) {\n    const tabBarTarget = tabBarPathSet.has(currentTarget.path)\n    const sameNativeLocation = createNativeRouteUrl(currentTarget, routeResolveCodec.stringifyQuery)\n      === createNativeRouteUrl(from, routeResolveCodec.stringifyQuery)\n    if (sameNativeLocation && currentTarget.hash !== from.hash) {\n      return createNavigationRunResult(currentMode, from, currentTarget, createHashOnlyNavigationFailure(currentTarget, from))\n    }\n\n    const duplicated = !allowSameLocation && (tabBarTarget\n      ? currentTarget.path === from.path\n      : currentTarget.fullPath === from.fullPath)\n    if (duplicated) {\n      return createNavigationRunResult(currentMode, from, currentTarget, createDuplicatedFailure(currentTarget, from))\n    }\n\n    if (tabBarTarget && hasLocationQuery(currentTarget.query)) {\n      return createNavigationRunResult(currentMode, from, currentTarget, createTabBarQueryFailure(currentTarget, from))\n    }\n\n    const beforeEachResult = await runNavigationGuards(beforeEachGuards, {\n      mode: currentMode,\n      to: currentTarget,\n      from,\n      nativeRouter: nativeRouter as any,\n    }, resolveWithCodec)\n\n    if (beforeEachResult.status === 'failure') {\n      return createNavigationRunResult(currentMode, from, currentTarget, beforeEachResult.failure)\n    }\n    if (beforeEachResult.status === 'redirect') {\n      const redirectedTarget = beforeEachResult.target\n      const redirectedMode = beforeEachResult.replace === true\n        ? 'replace'\n        : beforeEachResult.replace === false\n          ? 'push'\n          : currentMode\n      if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n        applyRedirectedFrom(redirectedTarget, currentTarget)\n        currentTarget = redirectedTarget\n        currentMode = redirectedMode\n        redirectCount += 1\n        if (redirectCount > maxRedirects) {\n          return createNavigationRunResult(\n            currentMode,\n            from,\n            currentTarget,\n            createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n          )\n        }\n        continue\n      }\n    }\n\n    const matchedRouteResult = resolveMatchedRouteRecord(currentTarget, namedRouteLookup)\n    const matchedRouteRecords = matchedRouteResult?.matchedRecords ?? []\n    let redirectedByRouteRecord = false\n    for (const matchedRouteRecord of matchedRouteRecords) {\n      if (matchedRouteRecord.redirect === undefined) {\n        continue\n      }\n      let redirectedByRecord: { target: RouteLocationNormalizedLoaded, replace?: boolean }\n      try {\n        redirectedByRecord = await resolveRouteRecordRedirect(\n          matchedRouteRecord.redirect,\n          currentTarget,\n          from,\n          resolveWithCodec,\n        )\n      }\n      catch (error) {\n        return createNavigationRunResult(\n          currentMode,\n          from,\n          currentTarget,\n          createNavigationFailure(NavigationFailureType.aborted, currentTarget, from, error),\n        )\n      }\n\n      const redirectedMode = redirectedByRecord.replace === false ? 'push' : 'replace'\n      const redirectedTarget = redirectedByRecord.target\n      if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n        applyRedirectedFrom(redirectedTarget, currentTarget)\n        currentTarget = redirectedTarget\n        currentMode = redirectedMode\n        redirectCount += 1\n        if (redirectCount > maxRedirects) {\n          return createNavigationRunResult(\n            currentMode,\n            from,\n            currentTarget,\n            createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n          )\n        }\n        redirectedByRouteRecord = true\n        break\n      }\n    }\n    if (redirectedByRouteRecord) {\n      continue\n    }\n\n    let redirectedByBeforeEnter = false\n    for (const matchedRouteRecord of matchedRouteRecords) {\n      if (matchedRouteRecord.beforeEnterGuards.length === 0) {\n        continue\n      }\n      const beforeEnterResult = await runNavigationGuards(new Set(matchedRouteRecord.beforeEnterGuards), {\n        mode: currentMode,\n        to: currentTarget,\n        from,\n        nativeRouter: nativeRouter as any,\n      }, resolveWithCodec)\n\n      if (beforeEnterResult.status === 'failure') {\n        return createNavigationRunResult(currentMode, from, currentTarget, beforeEnterResult.failure)\n      }\n      if (beforeEnterResult.status === 'redirect') {\n        const redirectedTarget = beforeEnterResult.target\n        const redirectedMode = beforeEnterResult.replace === true\n          ? 'replace'\n          : beforeEnterResult.replace === false\n            ? 'push'\n            : currentMode\n        if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n          applyRedirectedFrom(redirectedTarget, currentTarget)\n          currentTarget = redirectedTarget\n          currentMode = redirectedMode\n          redirectCount += 1\n          if (redirectCount > maxRedirects) {\n            return createNavigationRunResult(\n              currentMode,\n              from,\n              currentTarget,\n              createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n            )\n          }\n          redirectedByBeforeEnter = true\n          break\n        }\n      }\n    }\n    if (redirectedByBeforeEnter) {\n      continue\n    }\n\n    const beforeResolveResult = await runNavigationGuards(beforeResolveGuards, {\n      mode: currentMode,\n      to: currentTarget,\n      from,\n      nativeRouter: nativeRouter as any,\n    }, resolveWithCodec)\n\n    if (beforeResolveResult.status === 'failure') {\n      return createNavigationRunResult(currentMode, from, currentTarget, beforeResolveResult.failure)\n    }\n    if (beforeResolveResult.status === 'redirect') {\n      const redirectedTarget = beforeResolveResult.target\n      const redirectedMode = beforeResolveResult.replace === true\n        ? 'replace'\n        : beforeResolveResult.replace === false\n          ? 'push'\n          : currentMode\n      if (redirectedTarget.fullPath !== currentTarget.fullPath || redirectedMode !== currentMode) {\n        applyRedirectedFrom(redirectedTarget, currentTarget)\n        currentTarget = redirectedTarget\n        currentMode = redirectedMode\n        redirectCount += 1\n        if (redirectCount > maxRedirects) {\n          return createNavigationRunResult(\n            currentMode,\n            from,\n            currentTarget,\n            createTooManyRedirectsFailure(currentTarget, from, maxRedirects),\n          )\n        }\n        continue\n      }\n    }\n\n    if (!executeNative) {\n      return createNavigationRunResult(currentMode, from, currentTarget)\n    }\n\n    if (tabBarTarget) {\n      const result = await executeNavigationMethod(\n        nativeRouter.switchTab as (options: Record<string, any>) => unknown,\n        { url: createAbsoluteRoutePath(currentTarget.path) },\n        currentTarget,\n        from,\n      )\n      if (isNavigationFailure(result)) {\n        return createNavigationRunResult(currentMode, from, currentTarget, result)\n      }\n      return createNavigationRunResult(currentMode, from, currentTarget)\n    }\n\n    const nativeMethod = currentMode === 'push'\n      ? nativeRouter.navigateTo\n      : nativeRouter.redirectTo\n    const result = await executeNavigationMethod(\n      nativeMethod as (options: Record<string, any>) => unknown,\n      { url: createNativeRouteUrl(currentTarget, routeResolveCodec.stringifyQuery) },\n      currentTarget,\n      from,\n    )\n    if (isNavigationFailure(result)) {\n      return createNavigationRunResult(currentMode, from, currentTarget, result)\n    }\n    return createNavigationRunResult(currentMode, from, currentTarget)\n  }\n}\n"],"mappings":"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"}

package/dist/dev/router/resolve.d.mts

@@ -0,0 +1,7 @@
+import { RouteResolveCodec } from "../routerInternal/types.mjs";
+import "../routerInternal/shared.mjs";
+import { RouteLocationNormalizedLoaded, RouteLocationRaw, WevuBroadRouteMap } from "./types.mjs";
+//#region src/router/resolve.d.ts
+export declare function resolveRouteLocation(to: RouteLocationRaw<WevuBroadRouteMap>, currentPath?: string, codec?: RouteResolveCodec): RouteLocationNormalizedLoaded<WevuBroadRouteMap>;
+//#endregion
+//# sourceMappingURL=resolve.d.mts.map

package/dist/dev/router/resolve.mjs

@@ -8,17 +8,16 @@ const DEFAULT_ROUTE_RESOLVE_CODEC = {
 	stringifyQuery
 };
 function resolveRouteLocation(to, currentPath = "", codec = DEFAULT_ROUTE_RESOLVE_CODEC) {
-	var _ref, _to$path, _parsedFromFullPath$q, _to$hash;
 	if (typeof to === "string") {
 		const parsed = parsePathInput(to, codec);
 		const path = resolvePath(parsed.path, currentPath);
 		return createRouteLocation(path, parsed.query, parsed.hash, void 0, {}, codec.stringifyQuery);
 	}
 	const parsedFromFullPath = typeof to.fullPath === "string" ? parsePathInput(to.fullPath, codec) : void 0;
-	const rawPath = (_ref = (_to$path = to.path) !== null && _to$path !== void 0 ? _to$path : parsedFromFullPath === null || parsedFromFullPath === void 0 ? void 0 : parsedFromFullPath.path) !== null && _ref !== void 0 ? _ref : currentPath;
+	const rawPath = to.path ?? parsedFromFullPath?.path ?? currentPath;
 	const path = resolvePath(rawPath, currentPath);
-	const query = to.query ? normalizeQuery(to.query) : (_parsedFromFullPath$q = parsedFromFullPath === null || parsedFromFullPath === void 0 ? void 0 : parsedFromFullPath.query) !== null && _parsedFromFullPath$q !== void 0 ? _parsedFromFullPath$q : {};
-	const hash = normalizeHash((_to$hash = to.hash) !== null && _to$hash !== void 0 ? _to$hash : parsedFromFullPath === null || parsedFromFullPath === void 0 ? void 0 : parsedFromFullPath.hash);
+	const query = to.query ? normalizeQuery(to.query) : parsedFromFullPath?.query ?? {};
+	const hash = normalizeHash(to.hash ?? parsedFromFullPath?.hash);
 	const name = typeof to.name === "string" ? to.name : void 0;
 	const params = to.params ? normalizeRouteParams(to.params) : {};
 	return createRouteLocation(path, query, hash, name, params, codec.stringifyQuery);

package/dist/dev/router/resolve.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.mjs","names":[],"sources":["../../../src/router/resolve.ts"],"sourcesContent":["import type { RouteResolveCodec } from '../routerInternal/shared'\nimport type { RouteLocationNormalizedLoaded, RouteLocationRaw, WevuBroadRouteMap } from './types'\nimport {\n  createRouteLocation,\n  normalizeHash,\n  normalizeQuery,\n  normalizeRouteParams,\n  parsePathInput,\n  parseQuery,\n  resolvePath,\n  stringifyQuery,\n} from '../routerInternal/shared'\n\nexport const DEFAULT_ROUTE_RESOLVE_CODEC: RouteResolveCodec = {\n  parseQuery,\n  stringifyQuery,\n}\n\nexport function resolveRouteLocation(\n  to: RouteLocationRaw<WevuBroadRouteMap>,\n  currentPath = '',\n  codec: RouteResolveCodec = DEFAULT_ROUTE_RESOLVE_CODEC,\n): RouteLocationNormalizedLoaded<WevuBroadRouteMap> {\n  if (typeof to === 'string') {\n    const parsed = parsePathInput(to, codec)\n    const path = resolvePath(parsed.path, currentPath)\n    return createRouteLocation(path, parsed.query, parsed.hash, undefined, {}, codec.stringifyQuery)\n  }\n\n  const parsedFromFullPath = typeof to.fullPath === 'string'\n    ? parsePathInput(to.fullPath, codec)\n    : undefined\n\n  const rawPath = to.path ?? parsedFromFullPath?.path ?? currentPath\n  const path = resolvePath(rawPath, currentPath)\n  const query = to.query\n    ? normalizeQuery(to.query)\n    : parsedFromFullPath?.query ?? {}\n  const hash = normalizeHash(to.hash ?? parsedFromFullPath?.hash)\n  const name = typeof to.name === 'string' ? to.name : undefined\n  const params = to.params\n    ? normalizeRouteParams(to.params)\n    : {}\n\n  return createRouteLocation(path, query, hash, name, params, codec.stringifyQuery)\n}\n"],"mappings":";;;;;AAaA,MAAa,8BAAiD;CAC5D;CACA;AACF;AAEA,SAAgB,qBACd,IACA,cAAc,IACd,QAA2B,6BACuB;;CAClD,IAAI,OAAO,OAAO,UAAU;EAC1B,MAAM,SAAS,eAAe,IAAI,KAAK;EACvC,MAAM,OAAO,YAAY,OAAO,MAAM,WAAW;EACjD,OAAO,oBAAoB,MAAM,OAAO,OAAO,OAAO,MAAM,QAAW,CAAC,GAAG,MAAM,cAAc;CACjG;CAEA,MAAM,qBAAqB,OAAO,GAAG,aAAa,WAC9C,eAAe,GAAG,UAAU,KAAK,IACjC;CAEJ,MAAM,8BAAU,GAAG,2HAAQ,mBAAoB,2CAAQ;CACvD,MAAM,OAAO,YAAY,SAAS,WAAW;CAC7C,MAAM,QAAQ,GAAG,QACb,eAAe,GAAG,KAAK,qGACvB,mBAAoB,8EAAS,CAAC;CAClC,MAAM,OAAO,0BAAc,GAAG,2HAAQ,mBAAoB,IAAI;CAC9D,MAAM,OAAO,OAAO,GAAG,SAAS,WAAW,GAAG,OAAO;CACrD,MAAM,SAAS,GAAG,SACd,qBAAqB,GAAG,MAAM,IAC9B,CAAC;CAEL,OAAO,oBAAoB,MAAM,OAAO,MAAM,MAAM,QAAQ,MAAM,cAAc;AAClF"}
+{"version":3,"file":"resolve.mjs","names":[],"sources":["../../../src/router/resolve.ts"],"sourcesContent":["import type { RouteResolveCodec } from '../routerInternal/shared'\nimport type { RouteLocationNormalizedLoaded, RouteLocationRaw, WevuBroadRouteMap } from './types'\nimport {\n  createRouteLocation,\n  normalizeHash,\n  normalizeQuery,\n  normalizeRouteParams,\n  parsePathInput,\n  parseQuery,\n  resolvePath,\n  stringifyQuery,\n} from '../routerInternal/shared'\n\nexport const DEFAULT_ROUTE_RESOLVE_CODEC: RouteResolveCodec = {\n  parseQuery,\n  stringifyQuery,\n}\n\nexport function resolveRouteLocation(\n  to: RouteLocationRaw<WevuBroadRouteMap>,\n  currentPath = '',\n  codec: RouteResolveCodec = DEFAULT_ROUTE_RESOLVE_CODEC,\n): RouteLocationNormalizedLoaded<WevuBroadRouteMap> {\n  if (typeof to === 'string') {\n    const parsed = parsePathInput(to, codec)\n    const path = resolvePath(parsed.path, currentPath)\n    return createRouteLocation(path, parsed.query, parsed.hash, undefined, {}, codec.stringifyQuery)\n  }\n\n  const parsedFromFullPath = typeof to.fullPath === 'string'\n    ? parsePathInput(to.fullPath, codec)\n    : undefined\n\n  const rawPath = to.path ?? parsedFromFullPath?.path ?? currentPath\n  const path = resolvePath(rawPath, currentPath)\n  const query = to.query\n    ? normalizeQuery(to.query)\n    : parsedFromFullPath?.query ?? {}\n  const hash = normalizeHash(to.hash ?? parsedFromFullPath?.hash)\n  const name = typeof to.name === 'string' ? to.name : undefined\n  const params = to.params\n    ? normalizeRouteParams(to.params)\n    : {}\n\n  return createRouteLocation(path, query, hash, name, params, codec.stringifyQuery)\n}\n"],"mappings":";;;;;AAaA,MAAa,8BAAiD;CAC5D;CACA;AACF;AAEA,SAAgB,qBACd,IACA,cAAc,IACd,QAA2B,6BACuB;CAClD,IAAI,OAAO,OAAO,UAAU;EAC1B,MAAM,SAAS,eAAe,IAAI,KAAK;EACvC,MAAM,OAAO,YAAY,OAAO,MAAM,WAAW;EACjD,OAAO,oBAAoB,MAAM,OAAO,OAAO,OAAO,MAAM,QAAW,CAAC,GAAG,MAAM,cAAc;CACjG;CAEA,MAAM,qBAAqB,OAAO,GAAG,aAAa,WAC9C,eAAe,GAAG,UAAU,KAAK,IACjC;CAEJ,MAAM,UAAU,GAAG,QAAQ,oBAAoB,QAAQ;CACvD,MAAM,OAAO,YAAY,SAAS,WAAW;CAC7C,MAAM,QAAQ,GAAG,QACb,eAAe,GAAG,KAAK,IACvB,oBAAoB,SAAS,CAAC;CAClC,MAAM,OAAO,cAAc,GAAG,QAAQ,oBAAoB,IAAI;CAC9D,MAAM,OAAO,OAAO,GAAG,SAAS,WAAW,GAAG,OAAO;CACrD,MAAM,SAAS,GAAG,SACd,qBAAqB,GAAG,MAAM,IAC9B,CAAC;CAEL,OAAO,oBAAoB,MAAM,OAAO,MAAM,MAAM,QAAQ,MAAM,cAAc;AAClF"}