@nxtedition/lib 23.15.2 → 23.15.4

package/app.js

@@ -391,6 +391,7 @@ export function makeApp(appConfig, onTerminate) {
         {
           userAgent,
           url: isProduction ? 'ws://deepstream:6020/deepstream' : 'ws://127.0.0.1:6020/deepstream',
+          schedule: (fn) => setImmediate(fn),
         },
         appConfig.deepstream,
         config.deepstream,

package/package.json

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

package/util/template/index-web.js

@@ -27,6 +27,7 @@ export function makeTemplateCompiler({ ds, proxify, logger = console }) {
           },
         }
       },
+      schedule: (fn) => setTimeout(fn, 0),
     },
   })
 }

package/util/template/index.js

@@ -3,7 +3,7 @@ import { readFileSync } from 'node:fs'
 import { initSync } from '@swc/wasm-web'
 import { makeTemplateCompiler as commonMakeTemplateCompiler } from './index-common.js'
 import { hashSync } from 'hasha'
-import { request, Agent } from '@nxtedition/nxt-undici'
+import { request } from '@nxtedition/nxt-undici'
 
 export * from './index-common.js'
 
@@ -13,13 +13,9 @@ const wasmBuffer = readFileSync(wasmPath)
 
 initSync({ module: wasmBuffer })
 
-const defaultFetchClient = new Agent({
-  connections: 128,
-})
-
 export function makeTemplateCompiler({
   logger = globalThis.__nxt_lib_app?.logger,
-  dispatcher = defaultFetchClient,
+  dispatcher,
   platform,
   ...args
 }) {
@@ -30,8 +26,9 @@ export function makeTemplateCompiler({
     platform: {
       hasha: hashSync,
       fetch: (resource, options) =>
-        request(resource, options ? { dispatcher, ...options } : defaultOptions),
+        request(resource, options && dispatcher ? { dispatcher, ...options } : defaultOptions),
       ...platform,
+      schedule: (fn) => setImmediate(fn),
     },
   })
 }

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

@@ -223,6 +223,8 @@ function makeWrapper(expression) {
 }
 
 export default function ({ ds, proxify, compiler, logger, platform }) {
+  const schedule = platform?.schedule ?? ((fn) => queueMicrotask(fn))
+
   class Expression {
     constructor(script, expression, args, observer) {
       this._expression = expression
@@ -242,6 +244,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({
@@ -359,15 +370,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 {
@@ -385,14 +394,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
@@ -453,7 +461,7 @@ export default function ({ ds, proxify, compiler, logger, platform }) {
       }
 
       this._refreshing = true
-      setImmediate(this._refreshImpl)
+      schedule(this._refreshImpl)
     }
 
     _getEntry(key, Entry, opaque) {
@@ -622,10 +630,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