feat: allow true in next

posva · posva · commit d76c6aae1151 · 2020-03-17T13:37:13.000+01:00
diff --git a/__tests__/guards/component-beforeRouteEnter.spec.ts b/__tests__/guards/component-beforeRouteEnter.spec.ts
@@ -215,8 +215,8 @@ describe('beforeRouteEnter', () => {
         expect(router.currentRoute.value.fullPath).toBe('/foo')
       })
 
-      // not implemented yet as it depends on Vue 3 Suspense
-      it.skip('calls next callback', done => {
+      // TODO:
+      it.skip('calls next callback', async done => {
         const router = createRouter({ routes })
         beforeRouteEnter.mockImplementationOnce((to, from, next) => {
           next(vm => {
@@ -225,6 +225,9 @@ describe('beforeRouteEnter', () => {
             done()
           })
         })
+
+        await router.push('/')
+        await router.push('/guard/2')
       })
 
       it.skip('calls next callback after waiting', async done => {
diff --git a/playground/views/User.vue b/playground/views/User.vue
@@ -10,5 +10,13 @@ export default defineComponent({
   props: {
     id: String,
   },
+
+  beforeRouteUpdate(to, from, next) {
+    // TODO: these do not work yet
+    console.log('this', this)
+    next(vm => {
+      console.log('in next', vm)
+    })
+  },
 })
 </script>
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -217,10 +217,12 @@ export interface MatcherLocationRedirect {
 export interface NavigationGuardCallback {
   (): void
   (location: RouteLocation): void
-  (valid: false): void
+  (valid: boolean): void
   (cb: (vm: any) => void): void
 }
 
+export type NavigationGuardNextCallback = (vm: any) => any
+
 export interface NavigationGuard<V = void> {
   (
     this: V,
diff --git a/src/utils/guardToPromiseFn.ts b/src/utils/guardToPromiseFn.ts
@@ -3,6 +3,8 @@ import {
   RouteLocationNormalized,
   NavigationGuardCallback,
   RouteLocation,
+  RouteLocationNormalizedResolved,
+  NavigationGuardNextCallback,
 } from '../types'
 
 import { isRouteLocation } from '../types'
@@ -11,18 +13,24 @@ import { NavigationGuardRedirect, NavigationAborted } from '../errors'
 export function guardToPromiseFn(
   guard: NavigationGuard,
   to: RouteLocationNormalized,
-  from: RouteLocationNormalized
+  from: RouteLocationNormalizedResolved
+  // record?: RouteRecordNormalized
 ): () => Promise<void> {
   return () =>
     new Promise((resolve, reject) => {
       const next: NavigationGuardCallback = (
-        valid?: boolean | RouteLocation
+        valid?: boolean | RouteLocation | NavigationGuardNextCallback
       ) => {
-        // TODO: handle callback
         if (valid === false) reject(new NavigationAborted(to, from))
         else if (isRouteLocation(valid)) {
           reject(new NavigationGuardRedirect(to, valid))
-        } else resolve()
+        } else if (!valid || valid === true) {
+          resolve()
+        } else {
+          // TODO: call the in component enter callbacks. Maybe somewhere else
+          // record && record.enterCallbacks.push(valid)
+          resolve()
+        }
       }
 
       guard(to, from, next)
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -3,6 +3,7 @@ import {
   RouteParams,
   Immutable,
   RouteComponent,
+  RouteLocationNormalizedResolved,
 } from '../types'
 import { guardToPromiseFn } from './guardToPromiseFn'
 import { RouteRecordNormalized } from '../matcher/types'
@@ -23,7 +24,7 @@ export function extractComponentsGuards(
   matched: RouteRecordNormalized[],
   guardType: GuardType,
   to: RouteLocationNormalized,
-  from: RouteLocationNormalized
+  from: RouteLocationNormalizedResolved
 ) {
   const guards: Array<() => Promise<void>> = []
 

Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,12 @@ export interface MatcherLocationRedirect {`
`217`	`217`	`export interface NavigationGuardCallback {`
`218`	`218`	`(): void`
`219`	`219`	`(location: RouteLocation): void`
`220`		`- (valid: false): void`
	`220`	`+ (valid: boolean): void`
`221`	`221`	`(cb: (vm: any) => void): void`
`222`	`222`	`}`
`223`	`223`
	`224`	`+export type NavigationGuardNextCallback = (vm: any) => any`
	`225`	`+`
`224`	`226`	`export interface NavigationGuard<V = void> {`
`225`	`227`	`(`
`226`	`228`	`this: V,`