wevu 7.2.2 → 7.3.0

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":"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"}

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.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":"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"}
+{"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.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"}

package/dist/dev/router/routeRegistry.mjs

@@ -28,7 +28,7 @@ function createRouteRegistry(namedRouteLookup) {
 		const parentRouteName = typeof parentNameOrRoute === "string" ? parentNameOrRoute : void 0;
 		const parentRouteRecord = parentRouteName ? namedRouteLookup.recordByName.get(parentRouteName) : void 0;
 		if (parentRouteName && !parentRouteRecord) throw new Error(`Parent route "${parentRouteName}" is not defined in createRouter({ routes | namedRoutes })`);
-		const routeRecords = flattenNamedRouteRecords([route], parentRouteRecord === null || parentRouteRecord === void 0 ? void 0 : parentRouteRecord.path, parentRouteName, parentRouteRecord === null || parentRouteRecord === void 0 ? void 0 : parentRouteRecord.aliasPaths, void 0, "addRoute");
+		const routeRecords = flattenNamedRouteRecords([route], parentRouteRecord?.path, parentRouteName, parentRouteRecord?.aliasPaths, void 0, "addRoute");
 		if (routeRecords.length === 0) throw new Error("Route name and path are required when adding a named route");
 		const addedRoutes = [];
 		for (const routeRecord of routeRecords) {

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

@@ -1 +1 @@
-{"version":3,"file":"routeRegistry.mjs","names":[],"sources":["../../../src/router/routeRegistry.ts"],"sourcesContent":["import type {\n  NamedRouteLookup,\n  RouteRecordNormalized,\n} from '../routerInternal/shared'\nimport type { AddRoute, RouteRecordRaw } from './types'\nimport {\n  assertValidAddRouteInput,\n  cloneRouteMeta,\n  collectRouteNamesForRemoval,\n  createAbsoluteRoutePath,\n  createNamedRouteNameByStaticPath,\n  flattenNamedRouteRecords,\n  normalizeRouteRecordRaw,\n  warnRouteConfig,\n} from '../routerInternal/shared'\n\nfunction normalizeRouteRecordForOutput(record: RouteRecordNormalized): RouteRecordRaw {\n  const normalizedRoute: RouteRecordRaw = {\n    name: record.name,\n    path: record.path ? `/${record.path}` : '/',\n  }\n  if (record.meta !== undefined) {\n    normalizedRoute.meta = cloneRouteMeta(record.meta)\n  }\n  if (record.aliasPaths.length === 1) {\n    normalizedRoute.alias = createAbsoluteRoutePath(record.aliasPaths[0])\n  }\n  else if (record.aliasPaths.length > 1) {\n    normalizedRoute.alias = record.aliasPaths.map(aliasPath => createAbsoluteRoutePath(aliasPath))\n  }\n  if (record.beforeEnterGuards.length === 1) {\n    normalizedRoute.beforeEnter = record.beforeEnterGuards[0]\n  }\n  else if (record.beforeEnterGuards.length > 1) {\n    normalizedRoute.beforeEnter = record.beforeEnterGuards.slice()\n  }\n  if (record.redirect !== undefined) {\n    normalizedRoute.redirect = record.redirect\n  }\n  return normalizedRoute\n}\n\nexport function createRouteRegistry(namedRouteLookup: NamedRouteLookup) {\n  const hasRoute = (name: string) => namedRouteLookup.recordByName.has(name)\n  const getRoutes = (): readonly RouteRecordRaw[] =>\n    Array.from(namedRouteLookup.recordByName.values(), normalizeRouteRecordForOutput)\n\n  const addRoute: AddRoute = ((parentNameOrRoute: string | RouteRecordRaw, maybeRoute?: RouteRecordRaw) => {\n    const route = typeof parentNameOrRoute === 'string'\n      ? maybeRoute\n      : parentNameOrRoute\n    if (!route) {\n      throw new Error('Route record is required when adding a child route')\n    }\n    assertValidAddRouteInput(route)\n\n    const parentRouteName = typeof parentNameOrRoute === 'string'\n      ? parentNameOrRoute\n      : undefined\n    const parentRouteRecord = parentRouteName\n      ? namedRouteLookup.recordByName.get(parentRouteName)\n      : undefined\n    if (parentRouteName && !parentRouteRecord) {\n      throw new Error(`Parent route \"${parentRouteName}\" is not defined in createRouter({ routes | namedRoutes })`)\n    }\n\n    const routeRecords = flattenNamedRouteRecords(\n      [route],\n      parentRouteRecord?.path,\n      parentRouteName,\n      parentRouteRecord?.aliasPaths,\n      undefined,\n      'addRoute',\n    )\n    if (routeRecords.length === 0) {\n      throw new Error('Route name and path are required when adding a named route')\n    }\n    const addedRoutes: RouteRecordNormalized[] = []\n    for (const routeRecord of routeRecords) {\n      const normalizedRoute = normalizeRouteRecordRaw(routeRecord.route, routeRecord.parentName)\n      if (!normalizedRoute) {\n        continue\n      }\n      const existingRoute = namedRouteLookup.recordByName.get(normalizedRoute.name)\n      if (existingRoute) {\n        const namesToRemove = collectRouteNamesForRemoval(existingRoute.name, namedRouteLookup.recordByName)\n        for (const routeName of namesToRemove) {\n          namedRouteLookup.recordByName.delete(routeName)\n        }\n        warnRouteConfig(\n          `addRoute() replaced existing route \"${normalizedRoute.name}\" (${createAbsoluteRoutePath(existingRoute.path)} -> ${createAbsoluteRoutePath(normalizedRoute.path)}) and removed ${namesToRemove.size - 1} nested route(s)`,\n        )\n      }\n      namedRouteLookup.recordByName.set(normalizedRoute.name, normalizedRoute)\n      addedRoutes.push(normalizedRoute)\n    }\n    namedRouteLookup.nameByStaticPath = createNamedRouteNameByStaticPath(namedRouteLookup.recordByName)\n\n    return () => {\n      let changed = false\n      for (const addedRoute of addedRoutes) {\n        const currentRoute = namedRouteLookup.recordByName.get(addedRoute.name)\n        if (currentRoute === addedRoute) {\n          namedRouteLookup.recordByName.delete(addedRoute.name)\n          changed = true\n        }\n      }\n      if (changed) {\n        namedRouteLookup.nameByStaticPath = createNamedRouteNameByStaticPath(namedRouteLookup.recordByName)\n      }\n    }\n  }) as AddRoute\n\n  function removeRoute(name: string): void {\n    const namesToRemove = collectRouteNamesForRemoval(name, namedRouteLookup.recordByName)\n    if (namesToRemove.size === 0) {\n      return\n    }\n\n    let changed = false\n    for (const routeName of namesToRemove) {\n      changed = namedRouteLookup.recordByName.delete(routeName) || changed\n    }\n    if (changed) {\n      namedRouteLookup.nameByStaticPath = createNamedRouteNameByStaticPath(namedRouteLookup.recordByName)\n    }\n  }\n\n  function clearRoutes(): void {\n    namedRouteLookup.recordByName.clear()\n    namedRouteLookup.nameByStaticPath.clear()\n  }\n\n  return {\n    hasRoute,\n    getRoutes,\n    addRoute,\n    removeRoute,\n    clearRoutes,\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"routeRegistry.mjs","names":[],"sources":["../../../src/router/routeRegistry.ts"],"sourcesContent":["import type {\n  NamedRouteLookup,\n  RouteRecordNormalized,\n} from '../routerInternal/shared'\nimport type { AddRoute, RouteRecordRaw } from './types'\nimport {\n  assertValidAddRouteInput,\n  cloneRouteMeta,\n  collectRouteNamesForRemoval,\n  createAbsoluteRoutePath,\n  createNamedRouteNameByStaticPath,\n  flattenNamedRouteRecords,\n  normalizeRouteRecordRaw,\n  warnRouteConfig,\n} from '../routerInternal/shared'\n\nfunction normalizeRouteRecordForOutput(record: RouteRecordNormalized): RouteRecordRaw {\n  const normalizedRoute: RouteRecordRaw = {\n    name: record.name,\n    path: record.path ? `/${record.path}` : '/',\n  }\n  if (record.meta !== undefined) {\n    normalizedRoute.meta = cloneRouteMeta(record.meta)\n  }\n  if (record.aliasPaths.length === 1) {\n    normalizedRoute.alias = createAbsoluteRoutePath(record.aliasPaths[0])\n  }\n  else if (record.aliasPaths.length > 1) {\n    normalizedRoute.alias = record.aliasPaths.map(aliasPath => createAbsoluteRoutePath(aliasPath))\n  }\n  if (record.beforeEnterGuards.length === 1) {\n    normalizedRoute.beforeEnter = record.beforeEnterGuards[0]\n  }\n  else if (record.beforeEnterGuards.length > 1) {\n    normalizedRoute.beforeEnter = record.beforeEnterGuards.slice()\n  }\n  if (record.redirect !== undefined) {\n    normalizedRoute.redirect = record.redirect\n  }\n  return normalizedRoute\n}\n\nexport function createRouteRegistry(namedRouteLookup: NamedRouteLookup) {\n  const hasRoute = (name: string) => namedRouteLookup.recordByName.has(name)\n  const getRoutes = (): readonly RouteRecordRaw[] =>\n    Array.from(namedRouteLookup.recordByName.values(), normalizeRouteRecordForOutput)\n\n  const addRoute: AddRoute = ((parentNameOrRoute: string | RouteRecordRaw, maybeRoute?: RouteRecordRaw) => {\n    const route = typeof parentNameOrRoute === 'string'\n      ? maybeRoute\n      : parentNameOrRoute\n    if (!route) {\n      throw new Error('Route record is required when adding a child route')\n    }\n    assertValidAddRouteInput(route)\n\n    const parentRouteName = typeof parentNameOrRoute === 'string'\n      ? parentNameOrRoute\n      : undefined\n    const parentRouteRecord = parentRouteName\n      ? namedRouteLookup.recordByName.get(parentRouteName)\n      : undefined\n    if (parentRouteName && !parentRouteRecord) {\n      throw new Error(`Parent route \"${parentRouteName}\" is not defined in createRouter({ routes | namedRoutes })`)\n    }\n\n    const routeRecords = flattenNamedRouteRecords(\n      [route],\n      parentRouteRecord?.path,\n      parentRouteName,\n      parentRouteRecord?.aliasPaths,\n      undefined,\n      'addRoute',\n    )\n    if (routeRecords.length === 0) {\n      throw new Error('Route name and path are required when adding a named route')\n    }\n    const addedRoutes: RouteRecordNormalized[] = []\n    for (const routeRecord of routeRecords) {\n      const normalizedRoute = normalizeRouteRecordRaw(routeRecord.route, routeRecord.parentName)\n      if (!normalizedRoute) {\n        continue\n      }\n      const existingRoute = namedRouteLookup.recordByName.get(normalizedRoute.name)\n      if (existingRoute) {\n        const namesToRemove = collectRouteNamesForRemoval(existingRoute.name, namedRouteLookup.recordByName)\n        for (const routeName of namesToRemove) {\n          namedRouteLookup.recordByName.delete(routeName)\n        }\n        warnRouteConfig(\n          `addRoute() replaced existing route \"${normalizedRoute.name}\" (${createAbsoluteRoutePath(existingRoute.path)} -> ${createAbsoluteRoutePath(normalizedRoute.path)}) and removed ${namesToRemove.size - 1} nested route(s)`,\n        )\n      }\n      namedRouteLookup.recordByName.set(normalizedRoute.name, normalizedRoute)\n      addedRoutes.push(normalizedRoute)\n    }\n    namedRouteLookup.nameByStaticPath = createNamedRouteNameByStaticPath(namedRouteLookup.recordByName)\n\n    return () => {\n      let changed = false\n      for (const addedRoute of addedRoutes) {\n        const currentRoute = namedRouteLookup.recordByName.get(addedRoute.name)\n        if (currentRoute === addedRoute) {\n          namedRouteLookup.recordByName.delete(addedRoute.name)\n          changed = true\n        }\n      }\n      if (changed) {\n        namedRouteLookup.nameByStaticPath = createNamedRouteNameByStaticPath(namedRouteLookup.recordByName)\n      }\n    }\n  }) as AddRoute\n\n  function removeRoute(name: string): void {\n    const namesToRemove = collectRouteNamesForRemoval(name, namedRouteLookup.recordByName)\n    if (namesToRemove.size === 0) {\n      return\n    }\n\n    let changed = false\n    for (const routeName of namesToRemove) {\n      changed = namedRouteLookup.recordByName.delete(routeName) || changed\n    }\n    if (changed) {\n      namedRouteLookup.nameByStaticPath = createNamedRouteNameByStaticPath(namedRouteLookup.recordByName)\n    }\n  }\n\n  function clearRoutes(): void {\n    namedRouteLookup.recordByName.clear()\n    namedRouteLookup.nameByStaticPath.clear()\n  }\n\n  return {\n    hasRoute,\n    getRoutes,\n    addRoute,\n    removeRoute,\n    clearRoutes,\n  }\n}\n"],"mappings":"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"}

package/dist/dev/router/routeSync.mjs

@@ -19,7 +19,7 @@ function registerRouteStateSyncHandler(handler) {
 function notifyRouteStateSync(payload) {
 	for (const handler of routeStateSyncHandlers) try {
 		handler(payload);
-	} catch (_unused) {}
+	} catch {}
 }
 function createNativeRouteStateSyncPayload(methodName, option, sourcePage) {
 	if (methodName === "navigateBack") return {

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

@@ -1 +1 @@
-{"version":3,"file":"routeSync.mjs","names":[],"sources":["../../../src/router/routeSync.ts"],"sourcesContent":["import type { MiniProgramPageLike } from '../routerInternal/shared'\nimport type { RouteLocationNormalizedLoaded } from './types'\nimport { getCurrentMiniProgramPages } from '../runtime/platform'\n\nexport interface RouteStateSyncPayload {\n  page?: MiniProgramPageLike\n  route?: RouteLocationNormalizedLoaded\n  url?: string\n  source?: 'native' | 'page' | 'router'\n  method?: NativeRouterMethodName\n}\n\ntype RouteStateSyncHandler = (payload?: RouteStateSyncPayload) => void\ntype NativeRouterMethodName = 'switchTab' | 'reLaunch' | 'redirectTo' | 'navigateTo' | 'navigateBack'\n\nconst ROUTE_SYNC_NATIVE_METHODS: readonly NativeRouterMethodName[] = ['switchTab', 'reLaunch', 'redirectTo', 'navigateTo', 'navigateBack']\nconst routeStateSyncHandlers = new Set<RouteStateSyncHandler>()\nconst patchedNativeRouters = new WeakSet<Record<string, any>>()\n\nexport function registerRouteStateSyncHandler(handler: RouteStateSyncHandler): () => void {\n  routeStateSyncHandlers.add(handler)\n  return () => {\n    routeStateSyncHandlers.delete(handler)\n  }\n}\n\nexport function notifyRouteStateSync(payload?: RouteStateSyncPayload) {\n  for (const handler of routeStateSyncHandlers) {\n    try {\n      handler(payload)\n    }\n    catch {\n      // 忽略单个 route 订阅者异常，避免阻塞原生导航成功回调。\n    }\n  }\n}\n\nfunction createNativeRouteStateSyncPayload(\n  methodName: NativeRouterMethodName,\n  option: unknown,\n  sourcePage: MiniProgramPageLike | undefined,\n): RouteStateSyncPayload | undefined {\n  if (methodName === 'navigateBack') {\n    return {\n      method: methodName,\n      source: 'native',\n    }\n  }\n  if (option && typeof option === 'object') {\n    const url = (option as Record<string, unknown>).url\n    if (typeof url === 'string') {\n      return {\n        method: methodName,\n        page: sourcePage,\n        source: 'native',\n        url,\n      }\n    }\n  }\n  return {\n    method: methodName,\n    page: sourcePage,\n    source: 'native',\n  }\n}\n\nexport function installRouteStateSyncOnNativeRouter(nativeRouter: unknown) {\n  if (!nativeRouter || typeof nativeRouter !== 'object') {\n    return\n  }\n  const router = nativeRouter as Record<string, any>\n  if (patchedNativeRouters.has(router)) {\n    return\n  }\n  patchedNativeRouters.add(router)\n\n  for (const methodName of ROUTE_SYNC_NATIVE_METHODS) {\n    const original = router[methodName]\n    if (typeof original !== 'function') {\n      continue\n    }\n\n    router[methodName] = function routeStateSyncNativeRouterMethod(this: unknown, option?: unknown, ...args: any[]) {\n      const pages = getCurrentMiniProgramPages() as MiniProgramPageLike[]\n      const sourcePage = pages[pages.length - 1]\n      let synced = false\n      const syncRouteState = () => {\n        if (synced) {\n          return\n        }\n        synced = true\n        notifyRouteStateSync(createNativeRouteStateSyncPayload(methodName, option, sourcePage))\n      }\n\n      const nextOption = option && typeof option === 'object'\n        ? {\n            ...(option as Record<string, any>),\n            success: (...successArgs: any[]) => {\n              syncRouteState()\n              const originalSuccess = (option as Record<string, any>).success\n              return typeof originalSuccess === 'function'\n                ? originalSuccess(...successArgs)\n                : undefined\n            },\n          }\n        : option\n\n      const result = original.call(this, nextOption, ...args)\n      if (result && typeof (result as PromiseLike<unknown>).then === 'function') {\n        ;(result as PromiseLike<unknown>).then(syncRouteState, () => {})\n      }\n      return result\n    }\n  }\n}\n"],"mappings":";;;AAeA,MAAM,4BAA+D;CAAC;CAAa;CAAY;CAAc;CAAc;AAAc;AACzI,MAAM,yCAAyB,IAAI,IAA2B;AAC9D,MAAM,uCAAuB,IAAI,QAA6B;AAE9D,SAAgB,8BAA8B,SAA4C;CACxF,uBAAuB,IAAI,OAAO;CAClC,aAAa;EACX,uBAAuB,OAAO,OAAO;CACvC;AACF;AAEA,SAAgB,qBAAqB,SAAiC;CACpE,KAAK,MAAM,WAAW,wBACpB,IAAI;EACF,QAAQ,OAAO;CACjB,kBACM,CAEN;AAEJ;AAEA,SAAS,kCACP,YACA,QACA,YACmC;CACnC,IAAI,eAAe,gBACjB,OAAO;EACL,QAAQ;EACR,QAAQ;CACV;CAEF,IAAI,UAAU,OAAO,WAAW,UAAU;EACxC,MAAM,MAAO,OAAmC;EAChD,IAAI,OAAO,QAAQ,UACjB,OAAO;GACL,QAAQ;GACR,MAAM;GACN,QAAQ;GACR;EACF;CAEJ;CACA,OAAO;EACL,QAAQ;EACR,MAAM;EACN,QAAQ;CACV;AACF;AAEA,SAAgB,oCAAoC,cAAuB;CACzE,IAAI,CAAC,gBAAgB,OAAO,iBAAiB,UAC3C;CAEF,MAAM,SAAS;CACf,IAAI,qBAAqB,IAAI,MAAM,GACjC;CAEF,qBAAqB,IAAI,MAAM;CAE/B,KAAK,MAAM,cAAc,2BAA2B;EAClD,MAAM,WAAW,OAAO;EACxB,IAAI,OAAO,aAAa,YACtB;EAGF,OAAO,cAAc,SAAS,iCAAgD,QAAkB,GAAG,MAAa;GAC9G,MAAM,QAAQ,2BAA2B;GACzC,MAAM,aAAa,MAAM,MAAM,SAAS;GACxC,IAAI,SAAS;GACb,MAAM,uBAAuB;IAC3B,IAAI,QACF;IAEF,SAAS;IACT,qBAAqB,kCAAkC,YAAY,QAAQ,UAAU,CAAC;GACxF;GAEA,MAAM,aAAa,UAAU,OAAO,WAAW,WAC3C;IACE,GAAI;IACJ,UAAU,GAAG,gBAAuB;KAClC,eAAe;KACf,MAAM,kBAAmB,OAA+B;KACxD,OAAO,OAAO,oBAAoB,aAC9B,gBAAgB,GAAG,WAAW,IAC9B;IACN;GACF,IACA;GAEJ,MAAM,SAAS,SAAS,KAAK,MAAM,YAAY,GAAG,IAAI;GACtD,IAAI,UAAU,OAAQ,OAAgC,SAAS,YAC5D,AAAC,OAAgC,KAAK,sBAAsB,CAAC,CAAC;GAEjE,OAAO;EACT;CACF;AACF"}
+{"version":3,"file":"routeSync.mjs","names":[],"sources":["../../../src/router/routeSync.ts"],"sourcesContent":["import type { MiniProgramPageLike } from '../routerInternal/shared'\nimport type { RouteLocationNormalizedLoaded } from './types'\nimport { getCurrentMiniProgramPages } from '../runtime/platform'\n\nexport interface RouteStateSyncPayload {\n  page?: MiniProgramPageLike\n  route?: RouteLocationNormalizedLoaded\n  url?: string\n  source?: 'native' | 'page' | 'router'\n  method?: NativeRouterMethodName\n}\n\ntype RouteStateSyncHandler = (payload?: RouteStateSyncPayload) => void\ntype NativeRouterMethodName = 'switchTab' | 'reLaunch' | 'redirectTo' | 'navigateTo' | 'navigateBack'\n\nconst ROUTE_SYNC_NATIVE_METHODS: readonly NativeRouterMethodName[] = ['switchTab', 'reLaunch', 'redirectTo', 'navigateTo', 'navigateBack']\nconst routeStateSyncHandlers = new Set<RouteStateSyncHandler>()\nconst patchedNativeRouters = new WeakSet<Record<string, any>>()\n\nexport function registerRouteStateSyncHandler(handler: RouteStateSyncHandler): () => void {\n  routeStateSyncHandlers.add(handler)\n  return () => {\n    routeStateSyncHandlers.delete(handler)\n  }\n}\n\nexport function notifyRouteStateSync(payload?: RouteStateSyncPayload) {\n  for (const handler of routeStateSyncHandlers) {\n    try {\n      handler(payload)\n    }\n    catch {\n      // 忽略单个 route 订阅者异常，避免阻塞原生导航成功回调。\n    }\n  }\n}\n\nfunction createNativeRouteStateSyncPayload(\n  methodName: NativeRouterMethodName,\n  option: unknown,\n  sourcePage: MiniProgramPageLike | undefined,\n): RouteStateSyncPayload | undefined {\n  if (methodName === 'navigateBack') {\n    return {\n      method: methodName,\n      source: 'native',\n    }\n  }\n  if (option && typeof option === 'object') {\n    const url = (option as Record<string, unknown>).url\n    if (typeof url === 'string') {\n      return {\n        method: methodName,\n        page: sourcePage,\n        source: 'native',\n        url,\n      }\n    }\n  }\n  return {\n    method: methodName,\n    page: sourcePage,\n    source: 'native',\n  }\n}\n\nexport function installRouteStateSyncOnNativeRouter(nativeRouter: unknown) {\n  if (!nativeRouter || typeof nativeRouter !== 'object') {\n    return\n  }\n  const router = nativeRouter as Record<string, any>\n  if (patchedNativeRouters.has(router)) {\n    return\n  }\n  patchedNativeRouters.add(router)\n\n  for (const methodName of ROUTE_SYNC_NATIVE_METHODS) {\n    const original = router[methodName]\n    if (typeof original !== 'function') {\n      continue\n    }\n\n    router[methodName] = function routeStateSyncNativeRouterMethod(this: unknown, option?: unknown, ...args: any[]) {\n      const pages = getCurrentMiniProgramPages() as MiniProgramPageLike[]\n      const sourcePage = pages[pages.length - 1]\n      let synced = false\n      const syncRouteState = () => {\n        if (synced) {\n          return\n        }\n        synced = true\n        notifyRouteStateSync(createNativeRouteStateSyncPayload(methodName, option, sourcePage))\n      }\n\n      const nextOption = option && typeof option === 'object'\n        ? {\n            ...(option as Record<string, any>),\n            success: (...successArgs: any[]) => {\n              syncRouteState()\n              const originalSuccess = (option as Record<string, any>).success\n              return typeof originalSuccess === 'function'\n                ? originalSuccess(...successArgs)\n                : undefined\n            },\n          }\n        : option\n\n      const result = original.call(this, nextOption, ...args)\n      if (result && typeof (result as PromiseLike<unknown>).then === 'function') {\n        ;(result as PromiseLike<unknown>).then(syncRouteState, () => {})\n      }\n      return result\n    }\n  }\n}\n"],"mappings":";;;AAeA,MAAM,4BAA+D;CAAC;CAAa;CAAY;CAAc;CAAc;AAAc;AACzI,MAAM,yCAAyB,IAAI,IAA2B;AAC9D,MAAM,uCAAuB,IAAI,QAA6B;AAE9D,SAAgB,8BAA8B,SAA4C;CACxF,uBAAuB,IAAI,OAAO;CAClC,aAAa;EACX,uBAAuB,OAAO,OAAO;CACvC;AACF;AAEA,SAAgB,qBAAqB,SAAiC;CACpE,KAAK,MAAM,WAAW,wBACpB,IAAI;EACF,QAAQ,OAAO;CACjB,QACM,CAEN;AAEJ;AAEA,SAAS,kCACP,YACA,QACA,YACmC;CACnC,IAAI,eAAe,gBACjB,OAAO;EACL,QAAQ;EACR,QAAQ;CACV;CAEF,IAAI,UAAU,OAAO,WAAW,UAAU;EACxC,MAAM,MAAO,OAAmC;EAChD,IAAI,OAAO,QAAQ,UACjB,OAAO;GACL,QAAQ;GACR,MAAM;GACN,QAAQ;GACR;EACF;CAEJ;CACA,OAAO;EACL,QAAQ;EACR,MAAM;EACN,QAAQ;CACV;AACF;AAEA,SAAgB,oCAAoC,cAAuB;CACzE,IAAI,CAAC,gBAAgB,OAAO,iBAAiB,UAC3C;CAEF,MAAM,SAAS;CACf,IAAI,qBAAqB,IAAI,MAAM,GACjC;CAEF,qBAAqB,IAAI,MAAM;CAE/B,KAAK,MAAM,cAAc,2BAA2B;EAClD,MAAM,WAAW,OAAO;EACxB,IAAI,OAAO,aAAa,YACtB;EAGF,OAAO,cAAc,SAAS,iCAAgD,QAAkB,GAAG,MAAa;GAC9G,MAAM,QAAQ,2BAA2B;GACzC,MAAM,aAAa,MAAM,MAAM,SAAS;GACxC,IAAI,SAAS;GACb,MAAM,uBAAuB;IAC3B,IAAI,QACF;IAEF,SAAS;IACT,qBAAqB,kCAAkC,YAAY,QAAQ,UAAU,CAAC;GACxF;GAEA,MAAM,aAAa,UAAU,OAAO,WAAW,WAC3C;IACE,GAAI;IACJ,UAAU,GAAG,gBAAuB;KAClC,eAAe;KACf,MAAM,kBAAmB,OAA+B;KACxD,OAAO,OAAO,oBAAoB,aAC9B,gBAAgB,GAAG,WAAW,IAC9B;IACN;GACF,IACA;GAEJ,MAAM,SAAS,SAAS,KAAK,MAAM,YAAY,GAAG,IAAI;GACtD,IAAI,UAAU,OAAQ,OAAgC,SAAS,YAC5D,AAAC,OAAgC,KAAK,sBAAsB,CAAC,CAAC;GAEjE,OAAO;EACT;CACF;AACF"}

package/dist/dev/router/useRoute.mjs

@@ -3,11 +3,11 @@ import { readonly } from "../reactivity/readonly.mjs";
 import { getCurrentMiniProgramPages } from "../runtime/platform.mjs";
 import { getCurrentSetupContext } from "../runtime/hooks/base.mjs";
 import { onLoad, onReady, onRouteDone, onShow, onUnload } from "../runtime/hooks/register.mjs";
-import { getActiveRouter } from "./instance.mjs";
 import { registerRouteStateSyncHandler } from "./routeSync.mjs";
 import { resolveCurrentRoute, resolvePageRoute } from "../routerInternal/location.mjs";
 import { cloneLocationQuery, cloneRouteLocationRedirectedFrom, cloneRouteMeta, cloneRouteParams, cloneRouteRecordMatchedList } from "../routerInternal/snapshots.mjs";
 import { useNativePageRouter as useNativePageRouter$1, useNativeRouter as useNativeRouter$1 } from "../runtime/vueCompat/router.mjs";
+import { getActiveRouter } from "./instance.mjs";
 import { resolveRouteLocation } from "./resolve.mjs";
 import { WEVU_NATIVE_INSTANCE_KEY } from "@weapp-core/constants";
 
@@ -20,10 +20,10 @@ function resolveRouteControllerInstance(instance) {
 	return nativeInstance && typeof nativeInstance === "object" ? nativeInstance : instance;
 }
 function shouldSyncRouteStateForInstance(instance, isPageController, payload) {
-	if ((payload === null || payload === void 0 ? void 0 : payload.source) === "router") return true;
+	if (payload?.source === "router") return true;
 	if (!isPageController) return true;
 	const routeControllerInstance = resolveRouteControllerInstance(instance);
-	if (payload === null || payload === void 0 ? void 0 : payload.page) return payload.page === routeControllerInstance;
+	if (payload?.page) return payload.page === routeControllerInstance;
 	const pages = getCurrentMiniProgramPages();
 	return pages[pages.length - 1] === routeControllerInstance;
 }
@@ -45,13 +45,9 @@ function applyRouteState(routeState, nextRoute) {
 	else routeState.redirectedFrom = cloneRouteLocationRedirectedFrom(nextRoute.redirectedFrom);
 }
 function createRouteStateController(options = {}) {
-	var _options$resolveRoute;
 	const setupContext = getCurrentSetupContext();
-	const fallbackPage = (setupContext === null || setupContext === void 0 ? void 0 : setupContext.instance) && typeof setupContext.instance === "object" ? setupContext.instance : void 0;
-	const resolveRoute = (_options$resolveRoute = options.resolveRoute) !== null && _options$resolveRoute !== void 0 ? _options$resolveRoute : ((route) => {
-		var _getActiveRouter$reso, _getActiveRouter;
-		return (_getActiveRouter$reso = (_getActiveRouter = getActiveRouter()) === null || _getActiveRouter === void 0 ? void 0 : _getActiveRouter.resolve(route)) !== null && _getActiveRouter$reso !== void 0 ? _getActiveRouter$reso : route;
-	});
+	const fallbackPage = setupContext?.instance && typeof setupContext.instance === "object" ? setupContext.instance : void 0;
+	const resolveRoute = options.resolveRoute ?? ((route) => getActiveRouter()?.resolve(route) ?? route);
 	const currentRoute = resolveRoute(resolveCurrentRoute(void 0, fallbackPage));
 	const routeState = reactive({
 		path: currentRoute.path,
@@ -63,23 +59,20 @@ function createRouteStateController(options = {}) {
 	applyRouteState(routeState, currentRoute);
 	function syncRoute(queryOverride, routeOverride, payload) {
 		const nextRoute = routeOverride ? resolveRoute(routeOverride) : resolveRoute(resolveCurrentRoute(queryOverride, fallbackPage));
-		if (payload) {
-			var _options$beforeRouteS;
-			(_options$beforeRouteS = options.beforeRouteStateSync) === null || _options$beforeRouteS === void 0 || _options$beforeRouteS.call(options, nextRoute, payload);
-		}
+		if (payload) options.beforeRouteStateSync?.(nextRoute, payload);
 		applyRouteState(routeState, nextRoute);
 	}
 	if (!fallbackPage) {
 		registerRouteStateSyncHandler((payload) => {
-			if (payload === null || payload === void 0 ? void 0 : payload.route) {
+			if (payload?.route) {
 				syncRoute(void 0, payload.route, payload);
 				return;
 			}
-			if (payload === null || payload === void 0 ? void 0 : payload.url) {
+			if (payload?.url) {
 				syncRoute(void 0, resolveRouteLocation(payload.url, routeState.path), payload);
 				return;
 			}
-			if (payload === null || payload === void 0 ? void 0 : payload.page) {
+			if (payload?.page) {
 				syncRoute(void 0, resolvePageRoute(payload.page), payload);
 				return;
 			}
@@ -104,15 +97,15 @@ function createRouteStateController(options = {}) {
 	});
 	const unregisterRouteStateSync = registerRouteStateSyncHandler((payload) => {
 		if (!shouldSyncRouteStateForInstance(pageInstance, isPageController, payload)) return;
-		if (payload === null || payload === void 0 ? void 0 : payload.route) {
+		if (payload?.route) {
 			syncRoute(void 0, payload.route, payload);
 			return;
 		}
-		if (payload === null || payload === void 0 ? void 0 : payload.url) {
+		if (payload?.url) {
 			syncRoute(void 0, resolveRouteLocation(payload.url, routeState.path), payload);
 			return;
 		}
-		if (payload === null || payload === void 0 ? void 0 : payload.page) {
+		if (payload?.page) {
 			syncRoute(void 0, resolvePageRoute(payload.page), payload);
 			return;
 		}

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

@@ -1 +1 @@
-{"version":3,"file":"useRoute.mjs","names":["runtimeOptions","useNativeRouterInternal","useNativePageRouterInternal"],"sources":["../../../src/router/useRoute.ts"],"sourcesContent":["import type { WevuNamedRouteMap } from '../router'\nimport type { MiniProgramPageLike } from '../routerInternal/types'\nimport type { MiniProgramPageLifetime } from '../runtime/types'\nimport type { SetupContextRouter } from '../runtime/types/props'\nimport type { RouteStateSyncPayload } from './routeSync'\nimport type { LocationQueryRaw, RouteLocationNormalizedLoaded } from './types'\nimport { WEVU_NATIVE_INSTANCE_KEY } from '@weapp-core/constants'\nimport { reactive, readonly } from '../reactivity'\nimport { cloneLocationQuery, cloneRouteLocationRedirectedFrom, cloneRouteMeta, cloneRouteParams, cloneRouteRecordMatchedList, resolveCurrentRoute, resolvePageRoute } from '../routerInternal/shared'\nimport { getCurrentSetupContext, onLoad, onReady, onRouteDone, onShow, onUnload } from '../runtime/hooks'\nimport { getCurrentMiniProgramPages } from '../runtime/platform'\nimport {\n  useNativePageRouter as useNativePageRouterInternal,\n  useNativeRouter as useNativeRouterInternal,\n} from '../runtime/vueCompat'\nimport { getActiveRouter } from './instance'\nimport { resolveRouteLocation } from './resolve'\nimport { registerRouteStateSyncHandler } from './routeSync'\n\nexport interface UseRouteOptions<TRouteMap extends object = WevuNamedRouteMap> {\n  resolveRoute?: (\n    route: RouteLocationNormalizedLoaded<TRouteMap>,\n  ) => RouteLocationNormalizedLoaded<TRouteMap>\n}\n\ninterface RouteStateControllerOptions extends UseRouteOptions {\n  beforeRouteStateSync?: (\n    nextRoute: RouteLocationNormalizedLoaded,\n    payload: RouteStateSyncPayload,\n  ) => void\n}\n\nexport interface RouteStateController {\n  route: Readonly<RouteLocationNormalizedLoaded>\n}\n\nfunction isPageLikeInstance(instance: Record<string, any>): boolean {\n  return typeof instance.route === 'string' || typeof instance.__route__ === 'string'\n}\n\nfunction resolveRouteControllerInstance(instance: Record<string, any>): Record<string, any> {\n  const nativeInstance = instance[WEVU_NATIVE_INSTANCE_KEY]\n  return nativeInstance && typeof nativeInstance === 'object'\n    ? nativeInstance\n    : instance\n}\n\nfunction shouldSyncRouteStateForInstance(\n  instance: Record<string, any>,\n  isPageController: boolean,\n  payload: RouteStateSyncPayload | undefined,\n): boolean {\n  if (payload?.source === 'router') {\n    return true\n  }\n\n  // 页面级 route controller 只处理当前页面的广播，避免 DevTools 在 onUnload/onShow\n  // 交错时让隐藏页面重复执行导航守卫。组件级 controller 仍接收全局同步。\n  if (!isPageController) {\n    return true\n  }\n\n  const routeControllerInstance = resolveRouteControllerInstance(instance)\n  if (payload?.page) {\n    return payload.page === routeControllerInstance\n  }\n\n  const pages = getCurrentMiniProgramPages()\n  return pages[pages.length - 1] === routeControllerInstance\n}\n\nfunction applyRouteState(\n  routeState: RouteLocationNormalizedLoaded,\n  nextRoute: RouteLocationNormalizedLoaded,\n) {\n  routeState.path = nextRoute.path\n  routeState.fullPath = nextRoute.fullPath\n  routeState.query = cloneLocationQuery(nextRoute.query)\n  routeState.hash = nextRoute.hash\n  routeState.params = cloneRouteParams(nextRoute.params)\n  if (nextRoute.name === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).name\n  }\n  else {\n    routeState.name = nextRoute.name\n  }\n  if (nextRoute.meta === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).meta\n  }\n  else {\n    routeState.meta = cloneRouteMeta(nextRoute.meta)\n  }\n  if (nextRoute.href === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).href\n  }\n  else {\n    routeState.href = nextRoute.href\n  }\n  if (nextRoute.matched === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).matched\n  }\n  else {\n    routeState.matched = cloneRouteRecordMatchedList(nextRoute.matched)\n  }\n  if (nextRoute.redirectedFrom === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).redirectedFrom\n  }\n  else {\n    routeState.redirectedFrom = cloneRouteLocationRedirectedFrom(nextRoute.redirectedFrom)\n  }\n}\n\nexport function createRouteStateController(options: RouteStateControllerOptions = {}): RouteStateController {\n  const setupContext = getCurrentSetupContext<{ instance?: unknown }>()\n  const fallbackPage = setupContext?.instance && typeof setupContext.instance === 'object'\n    ? setupContext.instance as MiniProgramPageLike & Record<string, unknown>\n    : undefined\n  const resolveRoute = options.resolveRoute\n    ?? ((route: RouteLocationNormalizedLoaded) => getActiveRouter()?.resolve(route) ?? route)\n  const currentRoute = resolveRoute(resolveCurrentRoute(undefined, fallbackPage))\n  const routeState = reactive<RouteLocationNormalizedLoaded>({\n    path: currentRoute.path,\n    fullPath: currentRoute.fullPath,\n    query: cloneLocationQuery(currentRoute.query),\n    hash: currentRoute.hash,\n    params: cloneRouteParams(currentRoute.params),\n  })\n  applyRouteState(routeState, currentRoute)\n\n  function syncRoute(\n    queryOverride?: LocationQueryRaw,\n    routeOverride?: RouteLocationNormalizedLoaded,\n    payload?: RouteStateSyncPayload,\n  ) {\n    const nextRoute = routeOverride\n      ? resolveRoute(routeOverride)\n      : resolveRoute(resolveCurrentRoute(queryOverride, fallbackPage))\n    if (payload) {\n      options.beforeRouteStateSync?.(nextRoute, payload)\n    }\n    applyRouteState(routeState, nextRoute)\n  }\n\n  if (!fallbackPage) {\n    const unregisterRouteStateSync = registerRouteStateSyncHandler((payload) => {\n      if (payload?.route) {\n        syncRoute(undefined, payload.route, payload)\n        return\n      }\n      if (payload?.url) {\n        syncRoute(undefined, resolveRouteLocation(payload.url, routeState.path), payload)\n        return\n      }\n      if (payload?.page) {\n        syncRoute(undefined, resolvePageRoute(payload.page), payload)\n        return\n      }\n      syncRoute(undefined, undefined, payload)\n    })\n    void unregisterRouteStateSync\n    return {\n      route: readonly(routeState) as Readonly<RouteLocationNormalizedLoaded>,\n    }\n  }\n\n  const pageInstance = fallbackPage\n  const initialRouteControllerInstance = resolveRouteControllerInstance(pageInstance)\n  const isPageController = isPageLikeInstance(initialRouteControllerInstance)\n    || getCurrentMiniProgramPages().includes(initialRouteControllerInstance)\n\n  onLoad((query: Parameters<NonNullable<MiniProgramPageLifetime['onLoad']>>[0]) => {\n    syncRoute(query as unknown as LocationQueryRaw)\n  })\n  onReady(() => {\n    syncRoute()\n  })\n  onShow(() => {\n    syncRoute()\n  })\n  onRouteDone(() => {\n    syncRoute()\n  })\n  const unregisterRouteStateSync = registerRouteStateSyncHandler((payload) => {\n    if (!shouldSyncRouteStateForInstance(pageInstance, isPageController, payload)) {\n      return\n    }\n    if (payload?.route) {\n      syncRoute(undefined, payload.route, payload)\n      return\n    }\n    if (payload?.url) {\n      syncRoute(undefined, resolveRouteLocation(payload.url, routeState.path), payload)\n      return\n    }\n    if (payload?.page) {\n      syncRoute(undefined, resolvePageRoute(payload.page), payload)\n      return\n    }\n    syncRoute(undefined, undefined, payload)\n  })\n  onUnload(() => {\n    unregisterRouteStateSync()\n  })\n\n  return {\n    route: readonly(routeState) as Readonly<RouteLocationNormalizedLoaded>,\n  }\n}\n\nexport function useRoute<TRouteMap extends object = WevuNamedRouteMap>(\n  options: UseRouteOptions<NoInfer<TRouteMap>> = {},\n): Readonly<RouteLocationNormalizedLoaded<TRouteMap>> {\n  // 路由表泛型只收窄公开快照；状态同步仍复用同一个运行时控制器。\n  const runtimeOptions = options as unknown as UseRouteOptions\n  const route = createRouteStateController(runtimeOptions).route\n  return route as unknown as Readonly<RouteLocationNormalizedLoaded<TRouteMap>>\n}\n\n/**\n * @description 获取当前组件路径语义的原生 Router\n */\nexport function useNativeRouter(): SetupContextRouter {\n  return useNativeRouterInternal()\n}\n\n/**\n * @description 获取当前页面路径语义的原生 Page Router\n */\nexport function useNativePageRouter(): SetupContextRouter {\n  return useNativePageRouterInternal()\n}\n"],"mappings":"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"}
+{"version":3,"file":"useRoute.mjs","names":["runtimeOptions","useNativeRouterInternal","useNativePageRouterInternal"],"sources":["../../../src/router/useRoute.ts"],"sourcesContent":["import type { WevuNamedRouteMap } from '../router'\nimport type { MiniProgramPageLike } from '../routerInternal/types'\nimport type { MiniProgramPageLifetime } from '../runtime/types'\nimport type { SetupContextRouter } from '../runtime/types/props'\nimport type { RouteStateSyncPayload } from './routeSync'\nimport type { LocationQueryRaw, RouteLocationNormalizedLoaded } from './types'\nimport { WEVU_NATIVE_INSTANCE_KEY } from '@weapp-core/constants'\nimport { reactive, readonly } from '../reactivity'\nimport { cloneLocationQuery, cloneRouteLocationRedirectedFrom, cloneRouteMeta, cloneRouteParams, cloneRouteRecordMatchedList, resolveCurrentRoute, resolvePageRoute } from '../routerInternal/shared'\nimport { getCurrentSetupContext, onLoad, onReady, onRouteDone, onShow, onUnload } from '../runtime/hooks'\nimport { getCurrentMiniProgramPages } from '../runtime/platform'\nimport {\n  useNativePageRouter as useNativePageRouterInternal,\n  useNativeRouter as useNativeRouterInternal,\n} from '../runtime/vueCompat'\nimport { getActiveRouter } from './instance'\nimport { resolveRouteLocation } from './resolve'\nimport { registerRouteStateSyncHandler } from './routeSync'\n\nexport interface UseRouteOptions<TRouteMap extends object = WevuNamedRouteMap> {\n  resolveRoute?: (\n    route: RouteLocationNormalizedLoaded<TRouteMap>,\n  ) => RouteLocationNormalizedLoaded<TRouteMap>\n}\n\ninterface RouteStateControllerOptions extends UseRouteOptions {\n  beforeRouteStateSync?: (\n    nextRoute: RouteLocationNormalizedLoaded,\n    payload: RouteStateSyncPayload,\n  ) => void\n}\n\nexport interface RouteStateController {\n  route: Readonly<RouteLocationNormalizedLoaded>\n}\n\nfunction isPageLikeInstance(instance: Record<string, any>): boolean {\n  return typeof instance.route === 'string' || typeof instance.__route__ === 'string'\n}\n\nfunction resolveRouteControllerInstance(instance: Record<string, any>): Record<string, any> {\n  const nativeInstance = instance[WEVU_NATIVE_INSTANCE_KEY]\n  return nativeInstance && typeof nativeInstance === 'object'\n    ? nativeInstance\n    : instance\n}\n\nfunction shouldSyncRouteStateForInstance(\n  instance: Record<string, any>,\n  isPageController: boolean,\n  payload: RouteStateSyncPayload | undefined,\n): boolean {\n  if (payload?.source === 'router') {\n    return true\n  }\n\n  // 页面级 route controller 只处理当前页面的广播，避免 DevTools 在 onUnload/onShow\n  // 交错时让隐藏页面重复执行导航守卫。组件级 controller 仍接收全局同步。\n  if (!isPageController) {\n    return true\n  }\n\n  const routeControllerInstance = resolveRouteControllerInstance(instance)\n  if (payload?.page) {\n    return payload.page === routeControllerInstance\n  }\n\n  const pages = getCurrentMiniProgramPages()\n  return pages[pages.length - 1] === routeControllerInstance\n}\n\nfunction applyRouteState(\n  routeState: RouteLocationNormalizedLoaded,\n  nextRoute: RouteLocationNormalizedLoaded,\n) {\n  routeState.path = nextRoute.path\n  routeState.fullPath = nextRoute.fullPath\n  routeState.query = cloneLocationQuery(nextRoute.query)\n  routeState.hash = nextRoute.hash\n  routeState.params = cloneRouteParams(nextRoute.params)\n  if (nextRoute.name === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).name\n  }\n  else {\n    routeState.name = nextRoute.name\n  }\n  if (nextRoute.meta === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).meta\n  }\n  else {\n    routeState.meta = cloneRouteMeta(nextRoute.meta)\n  }\n  if (nextRoute.href === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).href\n  }\n  else {\n    routeState.href = nextRoute.href\n  }\n  if (nextRoute.matched === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).matched\n  }\n  else {\n    routeState.matched = cloneRouteRecordMatchedList(nextRoute.matched)\n  }\n  if (nextRoute.redirectedFrom === undefined) {\n    delete (routeState as Partial<RouteLocationNormalizedLoaded>).redirectedFrom\n  }\n  else {\n    routeState.redirectedFrom = cloneRouteLocationRedirectedFrom(nextRoute.redirectedFrom)\n  }\n}\n\nexport function createRouteStateController(options: RouteStateControllerOptions = {}): RouteStateController {\n  const setupContext = getCurrentSetupContext<{ instance?: unknown }>()\n  const fallbackPage = setupContext?.instance && typeof setupContext.instance === 'object'\n    ? setupContext.instance as MiniProgramPageLike & Record<string, unknown>\n    : undefined\n  const resolveRoute = options.resolveRoute\n    ?? ((route: RouteLocationNormalizedLoaded) => getActiveRouter()?.resolve(route) ?? route)\n  const currentRoute = resolveRoute(resolveCurrentRoute(undefined, fallbackPage))\n  const routeState = reactive<RouteLocationNormalizedLoaded>({\n    path: currentRoute.path,\n    fullPath: currentRoute.fullPath,\n    query: cloneLocationQuery(currentRoute.query),\n    hash: currentRoute.hash,\n    params: cloneRouteParams(currentRoute.params),\n  })\n  applyRouteState(routeState, currentRoute)\n\n  function syncRoute(\n    queryOverride?: LocationQueryRaw,\n    routeOverride?: RouteLocationNormalizedLoaded,\n    payload?: RouteStateSyncPayload,\n  ) {\n    const nextRoute = routeOverride\n      ? resolveRoute(routeOverride)\n      : resolveRoute(resolveCurrentRoute(queryOverride, fallbackPage))\n    if (payload) {\n      options.beforeRouteStateSync?.(nextRoute, payload)\n    }\n    applyRouteState(routeState, nextRoute)\n  }\n\n  if (!fallbackPage) {\n    const unregisterRouteStateSync = registerRouteStateSyncHandler((payload) => {\n      if (payload?.route) {\n        syncRoute(undefined, payload.route, payload)\n        return\n      }\n      if (payload?.url) {\n        syncRoute(undefined, resolveRouteLocation(payload.url, routeState.path), payload)\n        return\n      }\n      if (payload?.page) {\n        syncRoute(undefined, resolvePageRoute(payload.page), payload)\n        return\n      }\n      syncRoute(undefined, undefined, payload)\n    })\n    void unregisterRouteStateSync\n    return {\n      route: readonly(routeState) as Readonly<RouteLocationNormalizedLoaded>,\n    }\n  }\n\n  const pageInstance = fallbackPage\n  const initialRouteControllerInstance = resolveRouteControllerInstance(pageInstance)\n  const isPageController = isPageLikeInstance(initialRouteControllerInstance)\n    || getCurrentMiniProgramPages().includes(initialRouteControllerInstance)\n\n  onLoad((query: Parameters<NonNullable<MiniProgramPageLifetime['onLoad']>>[0]) => {\n    syncRoute(query as unknown as LocationQueryRaw)\n  })\n  onReady(() => {\n    syncRoute()\n  })\n  onShow(() => {\n    syncRoute()\n  })\n  onRouteDone(() => {\n    syncRoute()\n  })\n  const unregisterRouteStateSync = registerRouteStateSyncHandler((payload) => {\n    if (!shouldSyncRouteStateForInstance(pageInstance, isPageController, payload)) {\n      return\n    }\n    if (payload?.route) {\n      syncRoute(undefined, payload.route, payload)\n      return\n    }\n    if (payload?.url) {\n      syncRoute(undefined, resolveRouteLocation(payload.url, routeState.path), payload)\n      return\n    }\n    if (payload?.page) {\n      syncRoute(undefined, resolvePageRoute(payload.page), payload)\n      return\n    }\n    syncRoute(undefined, undefined, payload)\n  })\n  onUnload(() => {\n    unregisterRouteStateSync()\n  })\n\n  return {\n    route: readonly(routeState) as Readonly<RouteLocationNormalizedLoaded>,\n  }\n}\n\nexport function useRoute<TRouteMap extends object = WevuNamedRouteMap>(\n  options: UseRouteOptions<NoInfer<TRouteMap>> = {},\n): Readonly<RouteLocationNormalizedLoaded<TRouteMap>> {\n  // 路由表泛型只收窄公开快照；状态同步仍复用同一个运行时控制器。\n  const runtimeOptions = options as unknown as UseRouteOptions\n  const route = createRouteStateController(runtimeOptions).route\n  return route as unknown as Readonly<RouteLocationNormalizedLoaded<TRouteMap>>\n}\n\n/**\n * @description 获取当前组件路径语义的原生 Router\n */\nexport function useNativeRouter(): SetupContextRouter {\n  return useNativeRouterInternal()\n}\n\n/**\n * @description 获取当前页面路径语义的原生 Page Router\n */\nexport function useNativePageRouter(): SetupContextRouter {\n  return useNativePageRouterInternal()\n}\n"],"mappings":"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"}

package/dist/dev/routerInternal/location.mjs

@@ -41,7 +41,7 @@ function createRouteLocation(path, query, hash = "", name, params = {}, queryStr
 	return location;
 }
 function hasPageRoute(page) {
-	return typeof (page === null || page === void 0 ? void 0 : page.route) === "string" && page.route.length > 0 || typeof (page === null || page === void 0 ? void 0 : page.__route__) === "string" && page.__route__.length > 0;
+	return typeof page?.route === "string" && page.route.length > 0 || typeof page?.__route__ === "string" && page.__route__.length > 0;
 }
 function getCurrentMiniProgramPage(fallbackPage) {
 	const pages = getCurrentMiniProgramPages();
@@ -53,10 +53,9 @@ function getCurrentMiniProgramPage(fallbackPage) {
 	return hasPageRoute(currentPageInstance) ? currentPageInstance : fallbackPage;
 }
 function resolvePageRoute(page, queryOverride) {
-	var _page$options;
 	if (!page) return createRouteLocation("", {});
 	const rawPath = typeof page.route === "string" ? page.route : typeof page.__route__ === "string" ? page.__route__ : "";
-	const querySource = queryOverride !== null && queryOverride !== void 0 ? queryOverride : (_page$options = page.options) !== null && _page$options !== void 0 ? _page$options : {};
+	const querySource = queryOverride ?? page.options ?? {};
 	return createRouteLocation(rawPath, normalizeQuery(querySource), "", void 0, {});
 }
 function resolveCurrentRoute(queryOverride, fallbackPage) {