fix: sync code changes according to the review in PR #82

Author: LittleSound

packages/runtime-vapor/src/apiWatch.ts

@@ -10,10 +10,10 @@ import {
 import { EMPTY_OBJ, NOOP, extend, isFunction, remove } from '@vue/shared'
 import { currentInstance } from './component'
 import {
-  type SchedulerJob,
-  useVaporPostScheduler,
-  useVaporPreScheduler,
-  useVaporSyncScheduler,
+  type CreateScheduler,
+  createVaporPostScheduler,
+  createVaporPreScheduler,
+  createVaporSyncScheduler,
 } from './scheduler'
 import { handleError as handleErrorWithInstance } from './errorHandling'
 import { warn } from './warning'
@@ -143,15 +143,15 @@ export function watch<T = any, Immediate extends Readonly<boolean> = false>(
 
 function getSchedulerByFlushMode(
   flush: WatchOptionsBase['flush'],
-): SchedulerJob {
+): CreateScheduler {
   if (flush === 'post') {
-    return useVaporPostScheduler
+    return createVaporPostScheduler
   }
   if (flush === 'sync') {
-    return useVaporSyncScheduler
+    return createVaporSyncScheduler
   }
   // default: 'pre'
-  return useVaporPreScheduler
+  return createVaporPreScheduler
 }
 
 function doWatch(
@@ -160,6 +160,15 @@ function doWatch(
   options: WatchOptions = EMPTY_OBJ,
 ): WatchStopHandle {
   const { immediate, deep, flush, once } = options
+
+  // TODO remove in 3.5
+  if (__DEV__ && deep !== void 0 && typeof deep === 'number') {
+    warn(
+      `watch() "deep" option with number value will be used as watch depth in future versions. ` +
+        `Please use a boolean instead to avoid potential breakage.`,
+    )
+  }
+
   if (__DEV__ && !cb) {
     if (immediate !== undefined) {
       warn(
@@ -200,23 +209,23 @@ function doWatch(
   //   }
   // }
 
-  const instance =
-    getCurrentScope() === currentInstance?.scope ? currentInstance : null
+  const instance = currentInstance
 
   extendOptions.onError = (err: unknown, type: BaseWatchErrorCodes) =>
     handleErrorWithInstance(err, instance, type)
 
-  const scheduler = getSchedulerByFlushMode(flush)({ instance })
+  const scheduler = getSchedulerByFlushMode(flush)(instance)
   extendOptions.scheduler = scheduler
 
   let effect = baseWatch(source, cb, extend({}, options, extendOptions))
 
+  const scope = getCurrentScope()
   const unwatch = !effect
     ? NOOP
     : () => {
         effect!.stop()
-        if (instance && instance.scope) {
-          remove(instance.scope.effects!, effect)
+        if (scope) {
+          remove(scope.effects, effect)
         }
       }
 

packages/runtime-vapor/src/renderWatch.ts

@@ -6,7 +6,7 @@ import {
 } from '@vue/reactivity'
 import { NOOP, remove } from '@vue/shared'
 import { currentInstance } from './component'
-import { useVaporRenderingScheduler } from './scheduler'
+import { createVaporRenderingScheduler } from './scheduler'
 import { handleError as handleErrorWithInstance } from './errorHandling'
 import { warn } from './warning'
 
@@ -40,7 +40,7 @@ function doWatch(source: any, cb?: any): WatchStopHandle {
   extendOptions.onError = (err: unknown, type: BaseWatchErrorCodes) =>
     handleErrorWithInstance(err, instance, type)
 
-  const scheduler = useVaporRenderingScheduler({ instance })
+  const scheduler = createVaporRenderingScheduler(instance)
   extendOptions.scheduler = scheduler
 
   let effect = baseWatch(source, cb, extendOptions)

packages/runtime-vapor/src/scheduler.ts

@@ -1,4 +1,4 @@
-import type { ReactiveEffect } from '@vue/reactivity'
+import type { Scheduler } from '@vue/reactivity'
 import type { ComponentInternalInstance } from './component'
 
 export interface SchedulerJob extends Function {
@@ -197,33 +197,21 @@ const comparator = (a: SchedulerJob, b: SchedulerJob): number => {
   return diff
 }
 
-export type Scheduler = (options: {
-  instance: ComponentInternalInstance | null
-}) => (context: {
-  effect: ReactiveEffect
-  job: SchedulerJob
-  isInit: boolean
-}) => void
-
-export const useVaporSyncScheduler: Scheduler =
-  ({ instance }) =>
-  ({ isInit, effect, job }) => {
-    if (instance && instance.isUnmounted) {
-      return
-    }
+export type CreateScheduler = (
+  instance: ComponentInternalInstance | null,
+) => Scheduler
+
+export const createVaporSyncScheduler: CreateScheduler =
+  (instance) => (job, effect, isInit) => {
     if (isInit) {
       effect.run()
     } else {
       job()
     }
   }
 
-export const useVaporPreScheduler: Scheduler =
-  ({ instance }) =>
-  ({ isInit, effect, job }) => {
-    if (instance && instance.isUnmounted) {
-      return
-    }
+export const createVaporPreScheduler: CreateScheduler =
+  (instance) => (job, effect, isInit) => {
     if (isInit) {
       effect.run()
     } else {
@@ -233,12 +221,8 @@ export const useVaporPreScheduler: Scheduler =
     }
   }
 
-export const useVaporRenderingScheduler: Scheduler =
-  ({ instance }) =>
-  ({ isInit, effect, job }) => {
-    if (instance && instance.isUnmounted) {
-      return
-    }
+export const createVaporRenderingScheduler: CreateScheduler =
+  (instance) => (job, effect, isInit) => {
     if (isInit) {
       effect.run()
     } else {
@@ -248,9 +232,8 @@ export const useVaporRenderingScheduler: Scheduler =
     }
   }
 
-export const useVaporPostScheduler: Scheduler =
-  () =>
-  ({ isInit, effect, job }) => {
+export const createVaporPostScheduler: CreateScheduler =
+  (instance) => (job, effect, isInit) => {
     if (isInit) {
       queuePostRenderEffect(effect.run.bind(effect))
     } else {