refactor(runtime-core): decouple pre type scheduler job processing

Author: johnsoncodehk

packages/runtime-core/__tests__/scheduler.spec.ts

@@ -125,9 +125,8 @@ describe('scheduler', () => {
         calls.push('cb1')
         queueJob(job1)
       }
-      cb1.flags! |= SchedulerJobFlags.PRE
 
-      queueJob(cb1)
+      queueJob(cb1, true)
       await nextTick()
       expect(calls).toEqual(['cb1', 'job1'])
     })
@@ -143,24 +142,21 @@ describe('scheduler', () => {
         calls.push('cb1')
         queueJob(job1)
         // cb2 should execute before the job
-        queueJob(cb2)
-        queueJob(cb3)
+        queueJob(cb2, true)
+        queueJob(cb3, true)
       }
-      cb1.flags! |= SchedulerJobFlags.PRE
 
       const cb2: SchedulerJob = () => {
         calls.push('cb2')
       }
-      cb2.flags! |= SchedulerJobFlags.PRE
       cb2.id = 1
 
       const cb3: SchedulerJob = () => {
         calls.push('cb3')
       }
-      cb3.flags! |= SchedulerJobFlags.PRE
       cb3.id = 1
 
-      queueJob(cb1)
+      queueJob(cb1, true)
       await nextTick()
       expect(calls).toEqual(['cb1', 'cb2', 'cb3', 'job1'])
     })
@@ -171,24 +167,20 @@ describe('scheduler', () => {
         calls.push('job1')
       }
       job1.id = 1
-      job1.flags! |= SchedulerJobFlags.PRE
       const job2: SchedulerJob = () => {
         calls.push('job2')
         queueJob(job5)
-        queueJob(job6)
+        queueJob(job6, true)
       }
       job2.id = 2
-      job2.flags! |= SchedulerJobFlags.PRE
       const job3: SchedulerJob = () => {
         calls.push('job3')
       }
       job3.id = 2
-      job3.flags! |= SchedulerJobFlags.PRE
       const job4: SchedulerJob = () => {
         calls.push('job4')
       }
       job4.id = 3
-      job4.flags! |= SchedulerJobFlags.PRE
       const job5: SchedulerJob = () => {
         calls.push('job5')
       }
@@ -197,14 +189,13 @@ describe('scheduler', () => {
         calls.push('job6')
       }
       job6.id = 2
-      job6.flags! |= SchedulerJobFlags.PRE
 
       // We need several jobs to test this properly, otherwise
       // findInsertionIndex can yield the correct index by chance
-      queueJob(job4)
-      queueJob(job2)
-      queueJob(job3)
-      queueJob(job1)
+      queueJob(job4, true)
+      queueJob(job2, true)
+      queueJob(job3, true)
+      queueJob(job1, true)
 
       await nextTick()
       expect(calls).toEqual(['job1', 'job2', 'job3', 'job6', 'job5', 'job4'])
@@ -217,8 +208,8 @@ describe('scheduler', () => {
         // when updating the props of a child component. This is handled
         // directly inside `updateComponentPreRender` to avoid non atomic
         // cb triggers (#1763)
-        queueJob(cb1)
-        queueJob(cb2)
+        queueJob(cb1, true)
+        queueJob(cb2, true)
         flushPreFlushCbs()
         calls.push('job1')
       }
@@ -227,11 +218,9 @@ describe('scheduler', () => {
         // a cb triggers its parent job, which should be skipped
         queueJob(job1)
       }
-      cb1.flags! |= SchedulerJobFlags.PRE
       const cb2: SchedulerJob = () => {
         calls.push('cb2')
       }
-      cb2.flags! |= SchedulerJobFlags.PRE
 
       queueJob(job1)
       await nextTick()
@@ -242,29 +231,25 @@ describe('scheduler', () => {
       const calls: string[] = []
       const job1: SchedulerJob = () => {
         calls.push('job1')
-        queueJob(job3)
-        queueJob(job4)
+        queueJob(job3, true)
+        queueJob(job4, true)
       }
       // job1 has no id
-      job1.flags! |= SchedulerJobFlags.PRE
       const job2: SchedulerJob = () => {
         calls.push('job2')
       }
       job2.id = 1
-      job2.flags! |= SchedulerJobFlags.PRE
       const job3: SchedulerJob = () => {
         calls.push('job3')
       }
       // job3 has no id
-      job3.flags! |= SchedulerJobFlags.PRE
       const job4: SchedulerJob = () => {
         calls.push('job4')
       }
       // job4 has no id
-      job4.flags! |= SchedulerJobFlags.PRE
 
-      queueJob(job1)
-      queueJob(job2)
+      queueJob(job1, true)
+      queueJob(job2, true)
       await nextTick()
       expect(calls).toEqual(['job1', 'job3', 'job4', 'job2'])
     })
@@ -273,9 +258,8 @@ describe('scheduler', () => {
     it('queue preFlushCb inside postFlushCb', async () => {
       const spy = vi.fn()
       const cb: SchedulerJob = () => spy()
-      cb.flags! |= SchedulerJobFlags.PRE
       queuePostFlushCb(() => {
-        queueJob(cb)
+        queueJob(cb, true)
       })
       await nextTick()
       expect(spy).toHaveBeenCalled()
@@ -476,16 +460,14 @@ describe('scheduler', () => {
     job3.id = 1
     const job4: SchedulerJob = () => calls.push('job4')
     job4.id = 2
-    job4.flags! |= SchedulerJobFlags.PRE
     const job5: SchedulerJob = () => calls.push('job5')
     // job5 has no id
-    job5.flags! |= SchedulerJobFlags.PRE
 
     queueJob(job1)
     queueJob(job2)
     queueJob(job3)
-    queueJob(job4)
-    queueJob(job5)
+    queueJob(job4, true)
+    queueJob(job5, true)
     await nextTick()
     expect(calls).toEqual(['job5', 'job3', 'job4', 'job2', 'job1'])
   })
@@ -685,40 +667,38 @@ describe('scheduler', () => {
     let recurse = true
 
     const job1: SchedulerJob = vi.fn(() => {
-      queueJob(job3)
-      queueJob(job3)
+      queueJob(job3, true)
+      queueJob(job3, true)
       flushPreFlushCbs()
     })
     job1.id = 1
-    job1.flags = SchedulerJobFlags.PRE
 
     const job2: SchedulerJob = vi.fn(() => {
       if (recurse) {
         // job2 does not allow recurse, so this shouldn't do anything
-        queueJob(job2)
+        queueJob(job2, true)
 
         // job3 is already queued, so this shouldn't do anything
-        queueJob(job3)
+        queueJob(job3, true)
         recurse = false
       }
     })
     job2.id = 2
-    job2.flags = SchedulerJobFlags.PRE
 
     const job3: SchedulerJob = vi.fn(() => {
       if (recurse) {
-        queueJob(job2)
-        queueJob(job3)
+        queueJob(job2, true)
+        queueJob(job3, true)
 
         // The jobs are already queued, so these should have no effect
-        queueJob(job2)
-        queueJob(job3)
+        queueJob(job2, true)
+        queueJob(job3, true)
       }
     })
     job3.id = 3
-    job3.flags = SchedulerJobFlags.ALLOW_RECURSE | SchedulerJobFlags.PRE
+    job3.flags = SchedulerJobFlags.ALLOW_RECURSE
 
-    queueJob(job1)
+    queueJob(job1, true)
 
     await nextTick()
 
@@ -775,8 +755,7 @@ describe('scheduler', () => {
       spy()
       flushPreFlushCbs()
     }
-    job.flags! |= SchedulerJobFlags.PRE
-    queueJob(job)
+    queueJob(job, true)
     await nextTick()
     expect(spy).toHaveBeenCalledTimes(1)
   })
@@ -789,17 +768,15 @@ describe('scheduler', () => {
       calls.push('job1')
     }
     job1.id = 1
-    job1.flags! |= SchedulerJobFlags.PRE
 
     const job2: SchedulerJob = () => {
       calls.push('job2')
     }
     job2.id = 2
-    job2.flags! |= SchedulerJobFlags.PRE
 
     queuePostFlushCb(() => {
-      queueJob(job2)
-      queueJob(job1)
+      queueJob(job2, true)
+      queueJob(job1, true)
 
       // e.g. nested app.mount() call
       flushPreFlushCbs()

packages/runtime-core/src/apiWatch.ts

@@ -203,7 +203,7 @@ function doWatch(
       if (isFirstRun) {
         job()
       } else {
-        queueJob(job)
+        queueJob(job, true)
       }
     }
   }
@@ -214,12 +214,9 @@ function doWatch(
     if (cb) {
       job.flags! |= SchedulerJobFlags.ALLOW_RECURSE
     }
-    if (isPre) {
-      job.flags! |= SchedulerJobFlags.PRE
-      if (instance) {
-        job.id = instance.uid
-        ;(job as SchedulerJob).i = instance
-      }
+    if (isPre && instance) {
+      job.id = instance.uid
+      ;(job as SchedulerJob).i = instance
     }
   }