@nxtedition/lib 14.0.7 → 14.0.8

package/package.json

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

package/util/template/index.js

@@ -42,165 +42,102 @@ module.exports = (options) => {
     }
   }
 
-  const hashTemplate = (template, prefix) => {
-    if (fp.isPlainObject(template)) {
-      let hashes
-      for (const key of Object.keys(template)) {
-        const hash = hashTemplate(template[key], key)
-        if (hash) {
-          hashes ??= []
-          hashes.push(hash)
-        }
-      }
-      return hashes ? objectHash([prefix, hashes]) : ''
-    } else if (fp.isArray(template)) {
-      let hashes
-      for (let idx = 0; idx < template.length; idx++) {
-        const hash = hashTemplate(template[idx], idx)
-        if (hash) {
-          hashes ??= []
-          hashes.push(hash)
-        }
-      }
-      return hashes ? objectHash([prefix, hashes]) : ''
-    } else if (isTemplate(template)) {
-      return objectHash([prefix, template])
-    } else {
-      return ''
-    }
-  }
-
-  const _compileArrayTemplate = weakCache(
-    (arr, hash) => {
-      if (!fp.isArray(arr)) {
-        throw new Error('invalid argument')
-      }
-
-      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
-        ? (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) => {
+  function compileArrayTemplate(arr) {
     if (!fp.isArray(arr)) {
       throw new Error('invalid argument')
     }
-    const hash = hashTemplate(arr)
-    return hash ? _compileArrayTemplate(arr, hash) : null
-  }
-
-  const _compileObjectTemplate = weakCache(
-    (obj) => {
-      if (!fp.isPlainObject(obj)) {
-        throw new Error('invalid argument')
-      }
 
-      let resolvers
-      let indices
+    let resolvers
+    let indices
 
-      const keys = Object.keys(obj)
-
-      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 < arr.length; i++) {
+      const resolver = _compileTemplate(arr[i])
+      if (resolver) {
+        resolvers ??= []
+        resolvers.push(resolver)
+        indices ??= []
+        indices.push(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)
-  )
+    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
+  }
 
-  const compileObjectTemplate = (obj) => {
+  function compileObjectTemplate(obj) {
     if (!fp.isPlainObject(obj)) {
       throw new Error('invalid argument')
     }
 
-    const hash = hashTemplate(obj)
-    return hash ? _compileObjectTemplate(obj, hash) : null
-  }
+    let resolvers
+    let indices
 
-  const _compileStringTemplate = weakCache(
-    (str, hash) => {
-      if (!fp.isString(str)) {
-        throw new Error('invalid argument')
-      }
+    const keys = Object.keys(obj)
 
-      const match = inner(str)
-      if (!match) {
-        return null
+    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])
       }
+    }
 
-      const { pre, type, body, post } = match
+    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
+  }
 
-      const compileExpression = compilers[type]
-      if (!compileExpression) {
-        throw new Error('unknown expression type: ' + type)
-      }
+  function compileStringTemplate(str) {
+    if (!fp.isString(str)) {
+      throw new Error('invalid argument')
+    }
 
-      const expr = compileExpression(body)
+    const match = inner(str)
+    if (!match) {
+      return null
+    }
 
-      if (!pre && !post) {
-        return (args$) => expr(args$)
-      }
+    const { pre, type, body, post } = match
 
-      return (args$) =>
-        expr(args$).pipe(
-          rx.switchMap((body) => {
-            const str = `${pre}${stringify(body, type !== 'js')}${post}`
-            return compileStringTemplate(str)?.(args$) ?? rxjs.of(str)
-          })
-        )
-    },
-    (str, hash) => hash ?? hashTemplate(str)
-  )
+    const compileExpression = compilers[type]
+    if (!compileExpression) {
+      throw new Error('unknown expression type: ' + type)
+    }
 
-  const compileStringTemplate = (obj) => {
-    if (!fp.isString(obj)) {
-      throw new Error('invalid argument')
+    const expr = compileExpression(body)
+
+    if (!pre && !post) {
+      return (args$) => expr(args$)
     }
 
-    const hash = hashTemplate(obj)
-    return hash ? _compileStringTemplate(obj, hash) : null
+    return (args$) =>
+      expr(args$).pipe(
+        rx.switchMap((body) => {
+          const str = `${pre}${stringify(body, type !== 'js')}${post}`
+          return compileStringTemplate(str)?.(args$) ?? rxjs.of(str)
+        })
+      )
   }
 
   function stringify(value, escape) {
@@ -218,7 +155,35 @@ module.exports = (options) => {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
-  function compileTemplate(template, args$ = null) {
+  function hashTemplate(template, prefix) {
+    if (fp.isPlainObject(template)) {
+      let hashes
+      for (const key of Object.keys(template)) {
+        const hash = hashTemplate(template[key], key)
+        if (hash) {
+          hashes ??= []
+          hashes.push(hash)
+        }
+      }
+      return hashes ? objectHash([prefix, hashes]) : ''
+    } else if (fp.isArray(template)) {
+      let hashes
+      for (let idx = 0; idx < template.length; idx++) {
+        const hash = hashTemplate(template[idx], idx)
+        if (hash) {
+          hashes ??= []
+          hashes.push(hash)
+        }
+      }
+      return hashes ? objectHash([prefix, hashes]) : ''
+    } else if (isTemplate(template)) {
+      return objectHash([prefix, template])
+    } else {
+      return ''
+    }
+  }
+
+  function _compileTemplate(template) {
     if (fp.isPlainObject(template)) {
       return compileObjectTemplate(template)
     } else if (fp.isArray(template)) {
@@ -230,6 +195,11 @@ module.exports = (options) => {
     }
   }
 
+  const compileTemplate = weakCache(
+    (template) => _compileTemplate(template),
+    (template) => hashTemplate(template)
+  )
+
   async function resolveTemplate(template, args$) {
     return rxjs.firstValueFrom(onResolveTemplate(template, args$))
   }