@nxtedition/lib 23.15.3 → 23.15.5

package/package.json

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

package/util/template/index.test.js

@@ -22,3 +22,15 @@ test('nexpression', async () => {
 
   assert.strictEqual(await compiler.resolveTemplate('{{ foo }}', { foo: 'bar' }), 'bar')
 })
+
+test('pipe short-circuit', async () => {
+  const compiler = makeTemplateCompiler({
+    ds: {},
+    logger: console,
+  })
+
+  assert.strictEqual(
+    await compiler.resolveTemplate('{{#js _($.id, x => x + "ASD") }}', { foo: 'bar' }),
+    undefined,
+  )
+})

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) {
@@ -244,6 +245,15 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
       this._wrap = null
       this._suspended = false
       this._errored = false
+      this._globalThis = {
+        fp: null,
+        moment: null,
+        Timecode: null,
+        datefns: null,
+        JSON5: null,
+        $: null,
+        nxt: null,
+      }
 
       if (rxjs.isObservable(args)) {
         this._subscription = args.subscribe({
@@ -257,7 +267,7 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
         })
       } else {
         this._args = proxify ? this.wrap(args) : args
-        this._refreshImpl()
+        this._refresh()
       }
     }
 
@@ -361,15 +371,13 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
           throw new Error('expression is already suspended')
         }
 
-        const savedThis = {
-          fp: globalThis.fp,
-          moment: globalThis.moment,
-          Timecode: globalThis.Timecode,
-          datefns: globalThis.datefns,
-          JSON5: globalThis.JSON5,
-          $: globalThis.$,
-          nxt: globalThis.nxt,
-        }
+        this._globalThis.fp = globalThis.fp
+        this._globalThis.moment = globalThis.moment
+        this._globalThis.Timecode = globalThis.Timecode
+        this._globalThis.datefns = globalThis.datefns
+        this._globalThis.JSON5 = globalThis.JSON5
+        this._globalThis.$ = globalThis.$
+        this._globalThis.nxt = globalThis.nxt
 
         let value
         try {
@@ -387,14 +395,13 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
           // - Use https://github.com/tc39/proposal-shadowrealm?
           value = this._script()
         } finally {
-          globalThis.fp = savedThis.fp
-          globalThis._ = savedThis._
-          globalThis.moment = savedThis.moment
-          globalThis.Timecode = savedThis.Timecode
-          globalThis.datefns = savedThis.datefns
-          globalThis.JSON5 = savedThis.JSON5
-          globalThis.$ = savedThis.$
-          globalThis.nxt = savedThis.nxt
+          globalThis.fp = this._globalThis.fp
+          globalThis.moment = this._globalThis.moment
+          globalThis.Timecode = this._globalThis.Timecode
+          globalThis.datefns = this._globalThis.datefns
+          globalThis.JSON5 = this._globalThis.JSON5
+          globalThis.$ = this._globalThis.$
+          globalThis.nxt = this._globalThis.nxt
         }
 
         this._errored = false
@@ -624,10 +631,12 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
       script = new Function(
         transform(`
         const _ = (value, ...fns) => {
-          for (const fn of fns) {
-            value = fn(value)
-            if (value == null) {
-              return value
+          if (value != null) {
+            for (const fn of fns) {
+              value = fn(value)
+              if (value == null) {
+                return value
+              }
             }
           }
           return value

package/yield.js

@@ -2,6 +2,7 @@ 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
@@ -17,7 +18,7 @@ export function maybeYield(opts, callback) {
 export function doYield(opts, 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
     }
   }