chore: update

vuejs · Jan 4, 2024 · c1b3e7c · c1b3e7c
1 parent 58ceb75
commit c1b3e7c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 24 deletions.
diff --git a/packages/reactivity/__tests__/baseWatch.spec.ts b/packages/reactivity/__tests__/baseWatch.spec.ts
@@ -6,7 +6,7 @@ import {
   baseWatch,
   onEffectCleanup,
   ref,
-} from '../src/index'
+} from '../src'
 
 const queue: SchedulerJob[] = []
 

diff --git a/packages/reactivity/src/baseWatch.ts b/packages/reactivity/src/baseWatch.ts
@@ -58,15 +58,12 @@ export interface SchedulerJob extends Function {
 }
 
 type WatchEffect = (onCleanup: OnCleanup) => void
-
 type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T)
-
 type WatchCallback<V = any, OV = any> = (
   value: V,
   oldValue: OV,
   onCleanup: OnCleanup,
 ) => any
-
 type OnCleanup = (cleanupFn: () => void) => void
 
 export interface BaseWatchOptions<Immediate = boolean> extends DebuggerOptions {
@@ -86,17 +83,14 @@ export type Scheduler = (
   effect: ReactiveEffect,
   isInit: boolean,
 ) => void
-
-const DEFAULT_SCHEDULER: Scheduler = job => job()
-
 export type HandleError = (err: unknown, type: BaseWatchErrorCodes) => void
+export type HandleWarn = (msg: string, ...args: any[]) => void
 
+const DEFAULT_SCHEDULER: Scheduler = job => job()
 const DEFAULT_HANDLE_ERROR: HandleError = (err: unknown) => {
   throw err
 }
 
-export type HandleWarn = (msg: string, ...args: any[]) => void
-
 const cleanupMap: WeakMap<ReactiveEffect, (() => void)[]> = new WeakMap()
 let activeEffect: ReactiveEffect | undefined = undefined
 

diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts
@@ -72,8 +72,8 @@ export { TrackOpTypes, TriggerOpTypes, ReactiveFlags } from './constants'
 export {
   baseWatch,
   onEffectCleanup,
-  BaseWatchErrorCodes,
   traverse,
+  BaseWatchErrorCodes,
   type BaseWatchOptions,
   type Scheduler,
 } from './baseWatch'
diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
@@ -8,7 +8,7 @@ import {
   getCurrentScope,
 } from '@vue/reactivity'
 import {
-  type CreateScheduler,
+  type SchedulerFactory,
   createPreScheduler,
   createSyncScheduler,
 } from './scheduler'
@@ -156,9 +156,7 @@ export function watch<T = any, Immediate extends Readonly<boolean> = false>(
   return doWatch(source as any, cb, options)
 }
 
-function getSchedulerByFlushMode(
-  flush: WatchOptionsBase['flush'],
-): CreateScheduler {
+function getScheduler(flush: WatchOptionsBase['flush']): SchedulerFactory {
   if (flush === 'post') {
     return createPostRenderScheduler
   }
@@ -224,12 +222,9 @@ function doWatch(
   }
 
   const instance = currentInstance
-
   extendOptions.onError = (err: unknown, type: BaseWatchErrorCodes) =>
     handleErrorWithInstance(err, instance, type)
-
-  const scheduler = getSchedulerByFlushMode(flush)(instance)
-  extendOptions.scheduler = scheduler
+  extendOptions.scheduler = getScheduler(flush)(instance)
 
   let effect = baseWatch(source, cb, extend({}, options, extendOptions))
 

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
@@ -942,7 +942,7 @@ export function createWatcher(
     ? createPathGetter(publicThis, key)
     : () => (publicThis as any)[key]
 
-  const options: WatchOptions<false> = {}
+  const options: WatchOptions = {}
   if (__COMPAT__) {
     const instance =
       getCurrentScope() === currentInstance?.scope ? currentInstance : null

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
@@ -38,7 +38,7 @@ import {
   isReservedProp,
 } from '@vue/shared'
 import {
-  type CreateScheduler,
+  type SchedulerFactory,
   type SchedulerJob,
   flushPostFlushCbs,
   flushPreFlushCbs,
@@ -282,7 +282,7 @@ export const queuePostRenderEffect = __FEATURE_SUSPENSE__
     : queueEffectWithSuspense
   : queuePostFlushCb
 
-export const createPostRenderScheduler: CreateScheduler =
+export const createPostRenderScheduler: SchedulerFactory =
   instance => (job, effect, isInit) => {
     if (isInit) {
       queuePostRenderEffect(

diff --git a/packages/runtime-core/src/scheduler.ts b/packages/runtime-core/src/scheduler.ts
@@ -289,11 +289,11 @@ function checkRecursiveUpdates(seen: CountMap, fn: SchedulerJob) {
   }
 }
 
-export type CreateScheduler = (
+export type SchedulerFactory = (
   instance: ComponentInternalInstance | null,
 ) => Scheduler
 
-export const createSyncScheduler: CreateScheduler =
+export const createSyncScheduler: SchedulerFactory =
   instance => (job, effect, isInit) => {
     if (isInit) {
       effect.run()
@@ -302,7 +302,7 @@ export const createSyncScheduler: CreateScheduler =
     }
   }
 
-export const createPreScheduler: CreateScheduler =
+export const createPreScheduler: SchedulerFactory =
   instance => (job, effect, isInit) => {
     if (isInit) {
       effect.run()