@nxtedition/lib 23.15.4 → 23.15.6

package/package.json

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

package/util/template/javascript.js

@@ -7,6 +7,7 @@ import fp from 'lodash/fp.js'
 import moment from 'moment-timezone'
 import Timecode from 'smpte-timecode'
 import transform from './transform.js'
+import { doYield } from '../../yield.js'
 
 const SEP = String.fromCharCode(30) // ASCII 1E
 
@@ -223,7 +224,7 @@ function makeWrapper(expression) {
 }
 
 export default function ({ ds, proxify, compiler, logger, platform }) {
-  const schedule = platform?.schedule ?? ((fn) => queueMicrotask(fn))
+  const schedule = platform?.schedule ?? doYield
 
   class Expression {
     constructor(script, expression, args, observer) {
@@ -266,7 +267,7 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
         })
       } else {
         this._args = proxify ? this.wrap(args) : args
-        this._refreshImpl()
+        this._refresh()
       }
     }
 
@@ -630,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

@@ -2,22 +2,23 @@ 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 yieldTime = performance.now()
 let yieldActive = false
 
-export function maybeYield(opts, callback) {
+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)
+  return performance.now() - yieldTime < yieldTimeout ? null : doYield(callback)
 }
 
-export function doYield(opts, callback) {
+export function doYield(callback) {
   if (!yieldScheduled) {
     yieldScheduled = true
-    setImmediate(dispatchYield)
+    yieldSchedule(dispatchYield)
   }
 
   if (callback) {
@@ -44,7 +45,7 @@ function dispatchYield() {
     resolve(null)
 
     if (performance.now() - yieldTime > yieldTimeout) {
-      setImmediate(dispatchYield)
+      yieldSchedule(dispatchYield)
       return
     }
   }