Skip to content

Commit

Permalink
feat(runtime-vapor): onErrorCaptured (#71)
Browse files Browse the repository at this point in the history
Co-authored-by: 三咲智子 Kevin Deng <sxzz@sxzz.moe>
  • Loading branch information
GaoNeng-wWw and sxzz authored Dec 24, 2023
1 parent d3a86cf commit 3d4bc01
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 25 deletions.
74 changes: 51 additions & 23 deletions packages/runtime-vapor/src/apiLifecycle.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,53 @@
import { type ComponentInternalInstance, currentInstance } from './component'

export enum VaporLifecycleHooks {
BEFORE_CREATE = 'bc',
CREATED = 'c',
BEFORE_MOUNT = 'bm',
MOUNTED = 'm',
BEFORE_UPDATE = 'bu',
UPDATED = 'u',
BEFORE_UNMOUNT = 'bum',
UNMOUNTED = 'um',
DEACTIVATED = 'da',
ACTIVATED = 'a',
RENDER_TRIGGERED = 'rtg',
RENDER_TRACKED = 'rtc',
ERROR_CAPTURED = 'ec',
// SERVER_PREFETCH = 'sp',
}
import {
type ComponentInternalInstance,
currentInstance,
setCurrentInstance,
unsetCurrentInstance,
} from './component'
import { warn } from './warning'
import { pauseTracking, resetTracking } from '@vue/reactivity'
import { ErrorTypeStrings, callWithAsyncErrorHandling } from './errorHandling'
import { toHandlerKey } from '@vue/shared'
import { VaporLifecycleHooks } from './enums'

export const injectHook = (
type: VaporLifecycleHooks,
hook: Function,
hook: Function & { __weh?: Function },
target: ComponentInternalInstance | null = currentInstance,
prepend: boolean = false,
) => {
if (target) {
const hooks = target[type] || (target[type] = [])
const wrappedHook =
hook.__weh ||
(hook.__weh = (...args: unknown[]) => {
if (target.isUnmounted) {
return
}
pauseTracking()
setCurrentInstance(target)
const res = callWithAsyncErrorHandling(hook, target, type, args)
unsetCurrentInstance()
resetTracking()
return res
})
if (prepend) {
hooks.unshift(hook)
hooks.unshift(wrappedHook)
} else {
hooks.push(hook)
hooks.push(wrappedHook)
}
return hook
return wrappedHook
} else if (__DEV__) {
// TODO: warn need
const apiName = toHandlerKey(ErrorTypeStrings[type].replace(/ hook$/, ''))
warn(
`${apiName} is called when there is no active component instance to be ` +
`associated with. ` +
`Lifecycle injection APIs can only be used during execution of setup().` +
(__FEATURE_SUSPENSE__
? ` If you are using async setup(), make sure to register lifecycle ` +
`hooks before the first await statement.`
: ``),
)
}
}
export const createHook =
Expand All @@ -46,3 +61,16 @@ export const onBeforeUpdate = createHook(VaporLifecycleHooks.BEFORE_UPDATE)
export const onUpdated = createHook(VaporLifecycleHooks.UPDATED)
export const onBeforeUnmount = createHook(VaporLifecycleHooks.BEFORE_UNMOUNT)
export const onUnmounted = createHook(VaporLifecycleHooks.UNMOUNTED)

export type ErrorCapturedHook<TError = unknown> = (
err: TError,
instance: ComponentInternalInstance | null,
info: string,
) => boolean | void

export function onErrorCaptured<TError = Error>(
hook: ErrorCapturedHook<TError>,
target: ComponentInternalInstance | null = currentInstance,
) {
injectHook(VaporLifecycleHooks.ERROR_CAPTURED, hook, target)
}
2 changes: 1 addition & 1 deletion packages/runtime-vapor/src/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from './componentProps'

import type { Data } from '@vue/shared'
import { VaporLifecycleHooks } from './apiLifecycle'
import { VaporLifecycleHooks } from './enums'

export type Component = FunctionalComponent | ObjectComponent

Expand Down
16 changes: 16 additions & 0 deletions packages/runtime-vapor/src/enums.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export enum VaporLifecycleHooks {
BEFORE_CREATE = 'bc',
CREATED = 'c',
BEFORE_MOUNT = 'bm',
MOUNTED = 'm',
BEFORE_UPDATE = 'bu',
UPDATED = 'u',
BEFORE_UNMOUNT = 'bum',
UNMOUNTED = 'um',
DEACTIVATED = 'da',
ACTIVATED = 'a',
RENDER_TRIGGERED = 'rtg',
RENDER_TRACKED = 'rtc',
ERROR_CAPTURED = 'ec',
// SERVER_PREFETCH = 'sp',
}
2 changes: 1 addition & 1 deletion packages/runtime-vapor/src/errorHandling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// The ultimate aim is to uncouple this replicated code and
// facilitate its shared use between two runtimes.

import { VaporLifecycleHooks } from './apiLifecycle'
import { type ComponentInternalInstance } from './component'
import { isFunction, isPromise } from '@vue/shared'
import { warn } from './warning'
import { VaporLifecycleHooks } from './enums'

// contexts where user provided function may be executed, in addition to
// lifecycle hooks.
Expand Down

0 comments on commit 3d4bc01

Please sign in to comment.