@nxtedition/lib 23.16.0 → 23.16.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.16.0",
+  "version": "23.16.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/yield.js

@@ -4,7 +4,8 @@ const yieldQueue = new FixedQueue()
 const yieldSchedule = globalThis.setImmediate ?? ((fn) => setTimeout(fn, 0))
 
 let yieldTimeout = 40
-let yieldState = 0
+let yieldActive = false
+let yieldScheduled = false
 let yieldTime = performance.now()
 
 export function setYieldTimeout(timeout) {
@@ -15,7 +16,10 @@ export function setYieldTimeout(timeout) {
 }
 
 export function shouldYield() {
-  return yieldState > 0 || performance.now() - yieldTime >= yieldTimeout
+  if (!yieldActive && performance.now() - yieldTime >= yieldTimeout) {
+    yieldActive = true
+  }
+  return yieldActive
 }
 
 export function maybeYield(callback) {
@@ -23,12 +27,16 @@ export function maybeYield(callback) {
     throw new TypeError('callback must be a function')
   }
 
-  return shouldYield() ? (doYield(callback) ?? true) : null
+  if (shouldYield()) {
+    doYield(callback)
+  } else if (callback != null) {
+    callback(null)
+  }
 }
 
 export function doYield(callback) {
-  if (yieldState === 0) {
-    yieldState = 1
+  if (!yieldScheduled) {
+    yieldScheduled = true
     yieldSchedule(dispatchYield)
   }
 
@@ -42,24 +50,19 @@ export function doYield(callback) {
 }
 
 function dispatchYield() {
-  if (yieldState === 2) {
-    return
-  }
-
-  yieldState = 2
   yieldTime = performance.now()
+  yieldActive = false
 
   while (!yieldQueue.isEmpty()) {
     const resolve = yieldQueue.shift()
 
     resolve(null)
 
-    if (performance.now() - yieldTime > yieldTimeout) {
-      yieldState = 1
+    if (shouldYield()) {
       yieldSchedule(dispatchYield)
       return
     }
   }
 
-  yieldState = 0
+  yieldScheduled = false
 }