@nxtedition/lib 14.0.0-alpha.1 → 14.0.0-alpha.2

package/package.json

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

package/util/template/index.js

@@ -125,6 +125,7 @@ module.exports = (options) => {
     }
 
     return {
+      input: str,
       pre: str.slice(0, templateStart),
       type,
       body: str.slice(bodyStart, bodyEnd),
@@ -132,39 +133,41 @@ module.exports = (options) => {
     }
   }
 
-  const compileStringTemplateLazy = weakCache(function compileStringTemplatLazy(str) {
-    if (!fp.isString(str)) {
-      throw new Error('invalid argument')
-    }
-
-    const match = inner(str)
+  const _compileStringTemplate = weakCache(
+    function _compileStringTemplate(match) {
+      const { pre, type, body, post } = match
 
-    if (!match) {
-      return null
-    }
+      const compileExpression = compilers[type]
+      if (!compileExpression) {
+        throw new Error('unknown expression type')
+      }
 
-    const { pre, type, body, post } = match
+      const expr = compileExpression(body)
 
-    const compileExpression = compilers[type]
-    if (!compileExpression) {
-      throw new Error('unknown expression type')
-    }
+      if (!pre && !post) {
+        return expr
+      }
 
-    const expr = compileExpression(body)
+      return (...args) =>
+        expr(...args).pipe(
+          rx.switchMap((body) =>
+            compileStringTemplate(`${pre}${stringify(body, type !== 'js')}${post}`)(...args)
+          )
+        )
+    },
+    (match) => match.input
+  )
 
-    if (!pre && !post) {
-      return expr
+  function compileStringTemplateLazy(str) {
+    if (!fp.isString(str)) {
+      throw new Error('invalid argument')
     }
 
-    return (...args) =>
-      expr(...args).pipe(
-        rx.switchMap((body) =>
-          compileStringTemplate(`${pre}${stringify(body, type !== 'js')}${post}`)(...args)
-        )
-      )
-  })
+    const match = inner(str)
+    return match ? _compileStringTemplate(str, match) : null
+  }
 
-  const compileStringTemplate = function compileStringTemplate(str) {
+  function compileStringTemplate(str) {
     return compileStringTemplateLazy(str) ?? (() => rxjs.of(str))
   }