@nxtedition/lib 14.0.10 → 14.0.12

package/package.json

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

package/util/template/index.js

@@ -70,144 +70,99 @@ module.exports = (options) => {
     }
   }
 
-  const _compileArrayTemplate = weakCache(
-    (arr, hash) => {
-      if (!fp.isArray(arr)) {
-        throw new Error('invalid argument')
+  function compileArrayTemplate(template) {
+    let resolvers
+    let indices
+
+    for (let i = 0; i < template.length; i++) {
+      const resolver = compileTemplate(template[i])
+      if (resolver) {
+        resolvers ??= []
+        resolvers.push(resolver)
+        indices ??= []
+        indices.push(i)
       }
+    }
 
-      if (!hash) {
-        return null
-      }
-
-      let resolvers
-      let indices
-
-      for (let i = 0; i < arr.length; i++) {
-        const resolver = compileTemplate(arr[i])
-        if (resolver) {
-          resolvers ??= []
-          resolvers.push(resolver)
-          indices ??= []
-          indices.push(i)
+    return resolvers
+      ? (arr, args$) => {
+          const len = resolvers.length
+          const values = new Array(len)
+          for (let n = 0; n < len; n++) {
+            values[n] = resolvers[n](arr[indices[n]], args$)
+          }
+
+          return rxjs.combineLatest(values).pipe(
+            rx.map((values) => {
+              const ret = [...arr]
+              for (let n = 0; n < values.length; n++) {
+                ret[indices[n]] = values[n]
+              }
+              return ret
+            })
+          )
         }
-      }
-
-      return resolvers
-        ? (args$) =>
-            rxjs.combineLatest(resolvers.map((resolver) => resolver(args$))).pipe(
-              rx.map((values) => {
-                const ret = [...arr]
-                for (let n = 0; n < values.length; n++) {
-                  ret[indices[n]] = values[n]
-                }
-                return ret
-              })
-            )
-        : null
-    },
-    (arr, hash) => hash ?? hashTemplate(arr)
-  )
-
-  const compileArrayTemplate = (arr) => {
-    if (!fp.isArray(arr)) {
-      throw new Error('invalid argument')
-    }
-    const hash = hashTemplate(arr)
-    return hash ? _compileArrayTemplate(arr, hash) : null
+      : null
   }
 
-  const _compileObjectTemplate = weakCache(
-    (obj, hash) => {
-      if (!fp.isPlainObject(obj)) {
-        throw new Error('invalid argument')
-      }
+  function compileObjectTemplate(template) {
+    let resolvers
+    let indices
 
-      if (!hash) {
-        return null
-      }
-
-      let resolvers
-      let indices
-
-      const keys = Object.keys(obj)
+    const keys = Object.keys(template)
 
-      for (let i = 0; i < keys.length; i++) {
-        const resolver = compileTemplate(obj[keys[i]])
-        if (resolver) {
-          resolvers ??= []
-          resolvers.push(resolver)
-          indices ??= []
-          indices.push(keys[i])
-        }
+    for (let i = 0; i < keys.length; i++) {
+      const resolver = compileTemplate(template[keys[i]])
+      if (resolver) {
+        resolvers ??= []
+        resolvers.push(resolver)
+        indices ??= []
+        indices.push(keys[i])
       }
-
-      return resolvers
-        ? (args$) =>
-            rxjs.combineLatest(resolvers.map((resolver) => resolver(args$))).pipe(
-              rx.map((values) => {
-                const ret = { ...obj }
-                for (let n = 0; n < values.length; n++) {
-                  ret[indices[n]] = values[n]
-                }
-                return ret
-              })
-            )
-        : null
-    },
-    (obj, hash) => hash ?? hashTemplate(obj)
-  )
-
-  const compileObjectTemplate = (obj) => {
-    if (!fp.isPlainObject(obj)) {
-      throw new Error('invalid argument')
     }
 
-    const hash = hashTemplate(obj)
-    return hash ? _compileObjectTemplate(obj, hash) : null
+    return resolvers
+      ? (obj, args$) => {
+          const len = resolvers.length
+          const values = new Array(len)
+          for (let n = 0; n < len; n++) {
+            values[n] = resolvers[n](obj[indices[n]], args$)
+          }
+
+          return rxjs.combineLatest(values).pipe(
+            rx.map((values) => {
+              const ret = { ...obj }
+              for (let n = 0; n < values.length; n++) {
+                ret[indices[n]] = values[n]
+              }
+              return ret
+            })
+          )
+        }
+      : null
   }
 
-  const _compileStringTemplate = weakCache(
-    (str, hash) => {
-      if (!fp.isString(str)) {
-        throw new Error('invalid argument')
-      }
-
-      if (!hash) {
-        return null
-      }
-
-      const match = inner(str)
-      if (!match) {
-        return null
-      }
-
-      const { pre, type, body, post } = match
-
-      const compileExpression = compilers[type]
-      if (!compileExpression) {
-        throw new Error('unknown expression type: ' + type)
-      }
+  function compileStringTemplate(template) {
+    const match = inner(template)
+    if (!match) {
+      return null
+    }
 
-      const expr = compileExpression(body)
+    const { pre, type, body, post } = match
 
-      if (!pre && !post) {
-        return (args$) => expr(args$)
-      }
+    const compileExpression = compilers[type]
+    if (!compileExpression) {
+      throw new Error('unknown expression type: ' + type)
+    }
 
-      return (args$) =>
-        expr(args$).pipe(rx.map((body) => `${pre}${stringify(body, type !== 'js')}${post}`))
-    },
-    (str, hash) => hash ?? hashTemplate(str)
-  )
+    const expr = compileExpression(body)
 
-  const compileStringTemplate = (obj) => {
-    if (!fp.isString(obj)) {
-      throw new Error('invalid argument')
+    if (!pre && !post) {
+      return (str, args$) => expr(args$)
     }
 
-    const hash = hashTemplate(obj)
-    return hash ? _compileStringTemplate(obj, hash) : null
+    return (str, args$) =>
+      expr(args$).pipe(rx.map((body) => `${pre}${stringify(body, type !== 'js')}${post}`))
   }
 
   function stringify(value, escape) {
@@ -225,16 +180,24 @@ module.exports = (options) => {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
+  const compileTemplateCache = weakCache(
+    (template) => {
+      if (fp.isPlainObject(template)) {
+        return compileObjectTemplate(template)
+      } else if (fp.isArray(template)) {
+        return compileArrayTemplate(template)
+      } else if (isTemplate(template)) {
+        return compileStringTemplate(template)
+      } else {
+        return null
+      }
+    },
+    (template, hash) => hash ?? hashTemplate(template)
+  )
+
   function compileTemplate(template) {
-    if (fp.isPlainObject(template)) {
-      return compileObjectTemplate(template)
-    } else if (fp.isArray(template)) {
-      return compileArrayTemplate(template)
-    } else if (isTemplate(template)) {
-      return compileStringTemplate(template)
-    } else {
-      return null
-    }
+    const hash = hashTemplate(template)
+    return hash ? compileTemplateCache(template, hash) : null
   }
 
   async function resolveTemplate(template, args$) {
@@ -243,7 +206,7 @@ module.exports = (options) => {
 
   function onResolveTemplate(template, args$) {
     try {
-      return compileTemplate(template)?.(args$) ?? rxjs.of(template)
+      return compileTemplate(template)?.(template, args$) ?? rxjs.of(template)
     } catch (err) {
       return rxjs.throwError(() => err)
     }