feat: allow passing router to getNextPath

slipmatio · Jan 6, 2024 · 7f40c40 · 7f40c40
1 parent a5d8a42
commit 7f40c40
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,17 @@
 # Changelog
 
+## 0.2.2 (2024-01-05)
+
+- Feat: allow passing Router instance to `getNextPath`.
+
+## 0.2.1 (2024-01-05)
+
+- Fix: package.json is now more Vite -compatible.
+
 ## 0.2.0 (2024-01-05)
 
-- Feat: added `getNextPath`
-- Refactor: refactored internals
+- Feat: added `getNextPath`.
+- Refactor: refactored internals.
 - Chore: bumped deps.
 
 ## 0.1.2 (2023-07-17)

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ General utilities for Web development
 
 ### Vue
 
-- `getNextPath(): string` - returns the value of `?next` query param or `/`
+- `getNextPath(router?: Router): string` - returns the value of `?next` query param or `/`
 
 ## Installation
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@slipmatio/toolbelt",
   "type": "module",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "dist/toolbelt.umd.cjs",
   "module": "dist/toolbelt.js",
   "exports": {

diff --git a/src/routes.ts b/src/routes.ts
@@ -1,11 +1,17 @@
-import { useRoute } from 'vue-router'
+import { useRoute, type Router, type RouteLocationNormalizedLoaded } from 'vue-router'
 import { isString } from './type-helpers'
 
 /**
  * Helper for figuring our ?next= query param in a safe way.
+ * Pass the router instance whenever not used directly from script setup block.
  */
-export function getNextPath(): string {
-  const route = useRoute()
+export function getNextPath(router?: Router): string {
+  let route: RouteLocationNormalizedLoaded
+  if (router) {
+    route = router.currentRoute.value
+  } else {
+    route = useRoute()
+  }
 
   let next = '/'
   if (