@nxtedition/lib 23.15.5 → 23.15.7

package/package.json

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

package/util/template/javascript.js

@@ -631,14 +631,17 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
       script = new Function(
         transform(`
         const _ = (value, ...fns) => {
-          if (value != null) {
-            for (const fn of fns) {
-              value = fn(value)
-              if (value == null) {
-                return value
-              }
+          if (value == null) {
+            return value
+          }
+
+          for (const fn of fns) {
+            value = fn(value)
+            if (value == null) {
+              return value
             }
           }
+
           return value
         };
         _.asset = (type, state, suspend) => (name) => nxt._asset(name, type, state, suspend);

package/yield.js

@@ -1,29 +1,39 @@
 import { FixedQueue } from './fixed-queue.js'
 
-const yieldTimeout = 50
 const yieldQueue = new FixedQueue()
 const yieldSchedule = globalThis.setImmediate ?? ((fn) => setTimeout(fn, 0))
-let yieldScheduled = false
+
+let yieldTimeout = 40
+let yieldState = 0
 let yieldTime = performance.now()
-let yieldActive = false
 
-export function maybeYield(opts, callback) {
+export function setYieldTimeout(timeout) {
+  if (typeof timeout !== 'number' || timeout < 0) {
+    throw new TypeError('timeout must be a positive number')
+  }
+  yieldTimeout = timeout
+}
+
+export function maybeYield(callback) {
   if (callback != null && typeof callback !== 'function') {
     throw new TypeError('callback must be a function')
   }
 
-  return performance.now() - yieldTime < yieldTimeout ? null : doYield(opts, callback)
+  if (performance.now() - yieldTime < yieldTimeout) {
+    return null
+  }
+
+  return doYield(callback) ?? true
 }
 
-export function doYield(opts, callback) {
-  if (!yieldScheduled) {
-    yieldScheduled = true
+export function doYield(callback) {
+  if (yieldState === 0) {
+    yieldState = 1
     yieldSchedule(dispatchYield)
   }
 
   if (callback) {
     yieldQueue.push(callback)
-    return true
   } else {
     return new Promise((resolve) => {
       yieldQueue.push(resolve)
@@ -32,11 +42,11 @@ export function doYield(opts, callback) {
 }
 
 function dispatchYield() {
-  if (yieldActive) {
+  if (yieldState === 2) {
     return
   }
 
-  yieldActive = true
+  yieldState = 2
   yieldTime = performance.now()
 
   while (!yieldQueue.isEmpty()) {
@@ -45,15 +55,11 @@ function dispatchYield() {
     resolve(null)
 
     if (performance.now() - yieldTime > yieldTimeout) {
+      yieldState = 1
       yieldSchedule(dispatchYield)
       return
     }
   }
 
-  yieldActive = false
-  yieldScheduled = false
+  yieldState = 0
 }
-
-setInterval(() => {
-  yieldTime = performance.now()
-}, 500).unref()