@nxtedition/lib 14.0.14 → 14.0.15

package/package.json

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

package/util/template/index.js

@@ -158,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) {