@wot-ui/router 1.1.0 → 1.1.2

package/dist/index.cjs

@@ -58,8 +58,8 @@ function normalizeUrl(url) {
 
 //#endregion
 //#region src/router.ts
-const routerKey = Symbol("router");
-const routeKey = Symbol("route");
+const routerKey = Symbol("__ROUTER__");
+const routeKey = Symbol("__ROUTE__");
 function createRouter(options) {
 	const currentRoute = (0, vue.shallowRef)(START_LOCATION_NORMALIZED);
 	const routes = options.routes || [];
@@ -157,8 +157,6 @@ function createRouter(options) {
 		const finalType = typeof to === "object" && to.navType || type || "push";
 		try {
 			await performUniNavigate(finalType, url);
-			currentRoute.value = targetLocation;
-			afterGuards.forEach((guard) => guard(targetLocation, fromLocation));
 			return Promise.resolve();
 		} catch (error) {
 			return Promise.reject(error);
@@ -327,10 +325,19 @@ function createRouter(options) {
 //#endregion
 //#region src/index.ts
 function useRouter() {
-	return (0, vue.inject)(routerKey);
+	const router = (0, vue.inject)(routerKey);
+	if (router) return router;
+	else throw new Error("useRouter 只可以在 Vue 上下文中使用，请确保你已经正确地注册了 \"uni-mini-router\" 并且当前正处于 Vue 上下文中");
 }
 function useRoute() {
-	return (0, vue.inject)(routeKey);
+	const currentRoute = (0, vue.inject)(routeKey);
+	if (currentRoute) {
+		const route = (0, vue.reactive)(currentRoute.value);
+		(0, vue.watch)(currentRoute, (to) => {
+			Object.assign(route, to);
+		});
+		return route;
+	} else throw new Error("useRoute 只可以在 Vue 上下文中使用，请确保你已经正确地注册了 \"uni-mini-router\" 并且当前正处于 Vue 上下文中");
 }
 
 //#endregion

package/dist/index.d.cts

@@ -252,7 +252,7 @@ interface GlobalStyle {
 }
 interface RouteLocationNormalized {
   path: string;
-  name?: string | symbol;
+  name?: string;
   params: RouteParams;
   query: LocationQuery;
   hash: string;

package/dist/index.d.mts

@@ -252,7 +252,7 @@ interface GlobalStyle {
 }
 interface RouteLocationNormalized {
   path: string;
-  name?: string | symbol;
+  name?: string;
   params: RouteParams;
   query: LocationQuery;
   hash: string;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { inject, shallowRef, unref } from "vue";
+import { inject, reactive, shallowRef, unref, watch } from "vue";
 
 //#region src/types.ts
 const START_LOCATION_NORMALIZED = {
@@ -58,8 +58,8 @@ function normalizeUrl(url) {
 
 //#endregion
 //#region src/router.ts
-const routerKey = Symbol("router");
-const routeKey = Symbol("route");
+const routerKey = Symbol("__ROUTER__");
+const routeKey = Symbol("__ROUTE__");
 function createRouter(options) {
 	const currentRoute = shallowRef(START_LOCATION_NORMALIZED);
 	const routes = options.routes || [];
@@ -157,8 +157,6 @@ function createRouter(options) {
 		const finalType = typeof to === "object" && to.navType || type || "push";
 		try {
 			await performUniNavigate(finalType, url);
-			currentRoute.value = targetLocation;
-			afterGuards.forEach((guard) => guard(targetLocation, fromLocation));
 			return Promise.resolve();
 		} catch (error) {
 			return Promise.reject(error);
@@ -327,10 +325,19 @@ function createRouter(options) {
 //#endregion
 //#region src/index.ts
 function useRouter() {
-	return inject(routerKey);
+	const router = inject(routerKey);
+	if (router) return router;
+	else throw new Error("useRouter 只可以在 Vue 上下文中使用，请确保你已经正确地注册了 \"uni-mini-router\" 并且当前正处于 Vue 上下文中");
 }
 function useRoute() {
-	return inject(routeKey);
+	const currentRoute = inject(routeKey);
+	if (currentRoute) {
+		const route = reactive(currentRoute.value);
+		watch(currentRoute, (to) => {
+			Object.assign(route, to);
+		});
+		return route;
+	} else throw new Error("useRoute 只可以在 Vue 上下文中使用，请确保你已经正确地注册了 \"uni-mini-router\" 并且当前正处于 Vue 上下文中");
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wot-ui/router",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "轻量级 uni-app vue3 路由库",
   "repository": {
     "type": "git",