@nxtedition/lib 14.0.13 → 14.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.0.13",
+  "version": "14.0.15",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

package/util/template/index.js

@@ -10,6 +10,10 @@ const weakCache = require('../../weakCache')
 module.exports = ({ ds, proxify }) => {
   const compiler = {
     current: null,
+    resolveTemplate,
+    onResolveTemplate,
+    compileTemplate,
+    isTemplate,
   }
 
   const compilers = {
@@ -154,19 +158,28 @@ module.exports = ({ ds, proxify }) => {
 
     const { pre, type, body, post } = match
 
-    const compileExpression = compilers[type]
-    if (!compileExpression) {
-      throw new Error('unknown expression type: ' + type)
-    }
+    if (type === 'js') {
+      const expr = compilers.js(body)
 
-    const expr = compileExpression(body)
+      if (!pre && !post) {
+        return (str, args$) => expr(args$)
+      }
 
-    if (!pre && !post) {
-      return (str, args$) => expr(args$)
-    }
+      return (str, args$) => expr(args$).pipe(rx.map((body) => `${pre}${stringify(body)}${post}`))
+    } else if (type === 'nxt') {
+      const expr = compilers.nxt(body)
 
-    return (str, args$) =>
-      expr(args$).pipe(rx.map((body) => `${pre}${stringify(body, type !== 'js')}${post}`))
+      if (!pre && !post) {
+        return (str, args$) => expr(args$)
+      }
+
+      return (str, args$) =>
+        expr(args$).pipe(
+          rx.switchMap((body) => onResolveTemplate(`${pre}${stringify(body, true)}${post}`, args$))
+        )
+    } else {
+      throw new Error('unknown expression type: ' + type)
+    }
   }
 
   function stringify(value, escape) {
@@ -216,10 +229,5 @@ module.exports = ({ ds, proxify }) => {
     }
   }
 
-  return Object.assign(compiler, {
-    resolveTemplate,
-    onResolveTemplate,
-    compileTemplate,
-    isTemplate,
-  })
+  return compiler
 }

package/util/template/javascript.js

@@ -1,3 +1,4 @@
+const assert = require('node:assert')
 const weakCache = require('../../weakCache')
 const rxjs = require('rxjs')
 const vm = require('node:vm')
@@ -174,10 +175,13 @@ const globals = {
 }
 
 function proxify(value, expression, handler) {
+  assert(expression)
+  assert(handler)
+
   if (!value) {
     return value
   } else if (rxjs.isObservable(value)) {
-    return proxify(expression.observe(value), expression)
+    return proxify(expression.observe(value), expression, handler)
   } else if (typeof value?.then === 'function') {
     return proxify(expression.wait(value), expression, handler)
   } else if (typeof value === 'object') {
@@ -191,7 +195,7 @@ const MAP_POOL = []
 
 function makeWrapper(expression) {
   const handler = {
-    get: (target, prop) => proxify(target[prop], this),
+    get: (target, prop) => proxify(target[prop], expression, handler),
   }
   return (value) => proxify(value, expression, handler)
 }
@@ -319,8 +323,11 @@ module.exports = ({ ds, proxify, compiler }) => {
       // TODO (fix): freeze?
       self._context.$ = self._args
       self._context.nxt = self
+
+      const previous = compiler.current
+      compiler.current = self
+
       try {
-        compiler.current = this
         const value = self._script.runInContext(self._context)
         if (value !== self._value) {
           self._value = value
@@ -338,7 +345,7 @@ module.exports = ({ ds, proxify, compiler }) => {
           })
         )
       } finally {
-        compiler.current = null
+        compiler.current = previous
 
         self._context.$ = null
         self._context.nxt = null