wevu 6.16.5 → 6.16.7

package/dist/dev/router.mjs

@@ -1,5 +1,5 @@
-import { d as reactive } from "./ref-BTTXccLL.mjs";
-import { A as onLoad, Q as getCurrentSetupContext, U as onShow, a as resolveCurrentRoute, c as normalizeRouteParams, d as createAbsoluteRoutePath, f as isDynamicRoutePath, g as injectGlobal, i as parsePathInput, l as parseQuery, n as useNativeRouter$1, o as normalizeHash, p as resolvePath, r as createRouteLocation, s as normalizeQuery, t as useNativePageRouter$1, u as stringifyQuery, ut as readonly, v as provideGlobal, z as onRouteDone } from "./router-BZZnIx32.mjs";
+import { d as reactive } from "./ref-oJCdOWf7.mjs";
+import { K as onRouteDone, L as onLoad, W as onReady, X as onShow, _t as readonly, a as resolveCurrentRoute, at as getCurrentSetupContext, c as normalizeRouteParams, d as createAbsoluteRoutePath, f as isDynamicRoutePath, g as injectGlobal, i as parsePathInput, l as parseQuery, n as useNativeRouter$1, o as normalizeHash, p as resolvePath, r as createRouteLocation, s as normalizeQuery, t as useNativePageRouter$1, u as stringifyQuery, v as provideGlobal } from "./router-CXNNN43P.mjs";
 
 //#region src/routerInternal/params.ts
 const PATH_PARAM_TOKEN_RE = /^:(\w+)(?:\([^)]*\))?([+*?])?$/;
@@ -1083,32 +1083,50 @@ function createRouteRegistry(namedRouteLookup) {
 
 //#endregion
 //#region src/router/useRoute.ts
-function useRoute() {
-	if (!getCurrentSetupContext()) throw new Error("useRoute() 必须在 setup() 的同步阶段调用");
-	const currentRoute = resolveCurrentRoute();
+function applyRouteState(routeState, nextRoute) {
+	routeState.path = nextRoute.path;
+	routeState.fullPath = nextRoute.fullPath;
+	routeState.query = cloneLocationQuery(nextRoute.query);
+	routeState.hash = nextRoute.hash;
+	routeState.params = cloneRouteParams(nextRoute.params);
+	if (nextRoute.name === void 0) delete routeState.name;
+	else routeState.name = nextRoute.name;
+	if (nextRoute.meta === void 0) delete routeState.meta;
+	else routeState.meta = cloneRouteMeta(nextRoute.meta);
+	if (nextRoute.href === void 0) delete routeState.href;
+	else routeState.href = nextRoute.href;
+	if (nextRoute.matched === void 0) delete routeState.matched;
+	else routeState.matched = cloneRouteRecordMatchedList(nextRoute.matched);
+	if (nextRoute.redirectedFrom === void 0) delete routeState.redirectedFrom;
+	else routeState.redirectedFrom = cloneRouteLocationRedirectedFrom(nextRoute.redirectedFrom);
+}
+function useRoute(options = {}) {
+	var _options$resolveRoute;
+	const setupContext = getCurrentSetupContext();
+	if (!setupContext) throw new Error("useRoute() 必须在 setup() 的同步阶段调用");
+	const fallbackPage = setupContext.instance;
+	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 currentRoute = resolveRoute(resolveCurrentRoute(void 0, fallbackPage));
 	const routeState = reactive({
 		path: currentRoute.path,
 		fullPath: currentRoute.fullPath,
-		query: currentRoute.query,
+		query: cloneLocationQuery(currentRoute.query),
 		hash: currentRoute.hash,
-		params: currentRoute.params,
-		name: currentRoute.name
+		params: cloneRouteParams(currentRoute.params)
 	});
-	if (currentRoute.meta !== void 0) routeState.meta = currentRoute.meta;
+	applyRouteState(routeState, currentRoute);
 	function syncRoute(queryOverride) {
-		const nextRoute = resolveCurrentRoute(queryOverride);
-		routeState.path = nextRoute.path;
-		routeState.fullPath = nextRoute.fullPath;
-		routeState.query = nextRoute.query;
-		routeState.hash = nextRoute.hash;
-		if (nextRoute.meta === void 0) delete routeState.meta;
-		else routeState.meta = nextRoute.meta;
-		routeState.params = nextRoute.params;
-		routeState.name = nextRoute.name;
+		applyRouteState(routeState, resolveRoute(resolveCurrentRoute(queryOverride, fallbackPage)));
 	}
 	onLoad((query) => {
 		syncRoute(query);
 	});
+	onReady(() => {
+		syncRoute();
+	});
 	onShow(() => {
 		syncRoute();
 	});
@@ -1138,7 +1156,6 @@ function useNativePageRouter() {
 function createRouter(options = {}) {
 	var _options$maxRedirects, _options$paramsMode, _options$rejectOnErro, _options$parseQuery, _options$stringifyQue, _options$tabBarEntrie;
 	const nativeRouter = useNativeRouter();
-	const route = useRoute();
 	const beforeEachGuards = /* @__PURE__ */ new Set();
 	const beforeResolveGuards = /* @__PURE__ */ new Set();
 	const afterEachHooks = /* @__PURE__ */ new Set();
@@ -1158,8 +1175,8 @@ function createRouter(options = {}) {
 	const tabBarPathSet = new Set(normalizedTabBarEntries);
 	const routeRegistry = createRouteRegistry(namedRouteLookup);
 	const routerOptions = createRouterOptionsSnapshot(normalizedTabBarEntries, routeRegistry.getRoutes(), paramsMode, maxRedirects, routeResolveCodec, rejectOnError);
-	function resolveWithCodec(to, currentPath) {
-		const resolved = resolveRouteLocation(typeof to === "string" ? to : resolveNamedRouteLocation(to, namedRouteLookup, paramsMode), currentPath, routeResolveCodec);
+	function enrichRouteRecordState(routeLocation) {
+		const resolved = { ...routeLocation };
 		resolved.href = resolved.fullPath;
 		const matchedResult = resolveMatchedRouteRecord(resolved, namedRouteLookup);
 		if (matchedResult) {
@@ -1174,6 +1191,10 @@ function createRouter(options = {}) {
 		} else resolved.matched = [];
 		return resolved;
 	}
+	function resolveWithCodec(to, currentPath) {
+		return enrichRouteRecordState(resolveRouteLocation(typeof to === "string" ? to : resolveNamedRouteLocation(to, namedRouteLookup, paramsMode), currentPath, routeResolveCodec));
+	}
+	const route = useRoute({ resolveRoute: enrichRouteRecordState });
 	function resolve(to) {
 		return resolveWithCodec(to, route.path);
 	}