@nxtedition/lib 23.4.0 → 23.4.1

package/cache.js

@@ -2,24 +2,44 @@ import { LRU } from 'lru-cache'
 
 export class AsyncCache {
   #lru
-  #keySelector
+  #prefix
   #valueSelector
+  #keySelector
   #dedupe = new Map()
   #ttl
   #stale
 
-  constructor(valueSelector, opts) {
+  constructor(valueSelector, keySelector, opts) {
     this.#lru = new LRU({ max: 1024 })
-    this.#keySelector = opts?.keySelector ?? ((...args) => args[0])
     this.#valueSelector = valueSelector
 
+    if (typeof valueSelector === 'function') {
+      this.#valueSelector = valueSelector
+    } else {
+      throw new TypeError('valueSelector must be a function')
+    }
+
+    if (typeof keySelector === 'function' || keySelector === undefined) {
+      this.#keySelector = keySelector ?? ((...args) => JSON.stringify(args))
+    } else {
+      throw new TypeError('keySelector must be a function')
+    }
+
+    if (opts?.location === undefined) {
+      this.#prefix = (opts?.location ?? Math.random().toString(36)) + ':'
+    } else if (typeof opts?.location === 'string') {
+      this.#prefix = opts.location
+    } else {
+      throw new TypeError('location must be undefined or a string')
+    }
+
     if (typeof opts?.ttl === 'number' || opts?.ttl === undefined) {
       const ttl = opts.ttl
-      return (val, key) => ttl
+      this.#ttl = (val, key) => ttl
     } else if (typeof opts?.ttl === 'function') {
       this.#ttl = opts.ttl
     } else {
-      throw new TypeError('ttl must be a number or a function')
+      throw new TypeError('ttl must be a undefined, number or a function')
     }
 
     if (typeof opts?.stale === 'number' || opts?.stale === undefined) {
@@ -28,17 +48,21 @@ export class AsyncCache {
     } else if (typeof opts?.stale === 'function') {
       this.#stale = opts.stale
     } else {
-      throw new TypeError('stale must be a number or a function')
+      throw new TypeError('stale must be a undefined, number or a function')
     }
   }
 
   async get(...args) {
     const key = this.#keySelector(...args)
 
+    if (typeof key !== 'string' || key.length === 0) {
+      throw new TypeError('keySelector must return a non-empty string')
+    }
+
     let cached = this.#lru.get(key)
 
     if (!cached) {
-      const raw = globalThis.localStorage.getItem(key)
+      const raw = globalThis.localStorage.getItem(this.#prefix + key)
       cached = raw ? JSON.parse(raw) : null
     }
 
@@ -64,7 +88,7 @@ export class AsyncCache {
             value,
           }
 
-          globalThis.localStorage.setItem(key, JSON.stringify(cached))
+          globalThis.localStorage.setItem(this.#prefix + key, JSON.stringify(cached))
           this.#lru.set(key, cached)
 
           return value

package/package.json

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