@nxtedition/lib 24.0.0 → 24.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "24.0.0",
+  "version": "24.0.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/util/template/index-common.js

@@ -4,8 +4,8 @@ import getNxtpressionsCompiler from './nextpressions.js'
 import getJavascriptCompiler from './javascript.js'
 import JSON5 from 'json5'
 import objectHash from 'object-hash'
-import { makeWeakCache } from '../../weakCache.js'
 import firstValueFrom from '../../rxjs/firstValueFrom.js'
+import { LRUCache } from 'lru-cache'
 
 export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
   const compiler = {
@@ -210,20 +210,35 @@ export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
-  const _compileTemplateCache = makeWeakCache(
-    (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 objCache = new WeakMap()
+  const strCache = new LRUCache({ max: 8192 })
+
+  const _compileTemplateCache = (template) => {
+    if (fp.isPlainObject(template)) {
+      let resolver = objCache.get(template)
+      if (resolver == null) {
+        resolver = compileObjectTemplate(template)
+        objCache.set(template, resolver)
+      }
+      return resolver
+    } else if (Array.isArray(template)) {
+      let resolver = objCache.get(template)
+      if (resolver == null) {
+        resolver = compileArrayTemplate(template)
+        objCache.set(template, resolver)
       }
-    },
-    (template, hash) => hash,
-  )
+      return resolver
+    } else if (isTemplate(template)) {
+      let resolver = strCache.get(template)
+      if (resolver == null) {
+        resolver = compileStringTemplate(template)
+        strCache.set(template, resolver)
+      }
+      return resolver
+    } else {
+      return null
+    }
+  }
 
   function _compileTemplate(template) {
     const hash = hashTemplate(template)

package/yield.js

@@ -14,10 +14,15 @@ export function setYieldTimeout(timeout) {
   yieldTimeout = timeout
 }
 
-export function shouldYield() {
-  if (!yieldActive && performance.now() - yieldTime >= yieldTimeout) {
+export function shouldYield(timeout) {
+  if (timeout === undefined) {
+    timeout = yieldTimeout
+  }
+
+  if (!yieldActive && performance.now() - yieldTime >= timeout) {
     yieldActive = true
   }
+
   return yieldActive
 }