@nxtedition/cache 1.0.15 → 2.0.0

package/lib/index.d.ts

@@ -23,7 +23,7 @@ export declare class AsyncCache<V = unknown, A extends unknown[] = unknown[]> {
     close(): void;
     get(...args: A): CacheResult<V>;
     peek(...args: A): CacheResult<V>;
-    refresh(...args: A): Promise<V>;
+    refresh(...args: A): CacheResult<V>;
     delete(...args: A): void;
     purgeStale(): void;
 }

package/lib/index.js

@@ -203,7 +203,7 @@ export class AsyncCache                                               {
     return this.#load(args, false)
   }
 
-  refresh(...args   )             {
+  refresh(...args   )                 {
     return this.#refresh(args)
   }
 
@@ -278,20 +278,16 @@ export class AsyncCache                                               {
       }
     }
 
-    const promise = refresh ? this.#refresh(args, key) : undefined
+    const result = refresh ? this.#refresh(args, key) : ({ value: undefined, async: false }         )
 
-    if (cached !== undefined) {
+    if (result.async && cached !== undefined) {
       return { value: cached.value, async: false }
     }
 
-    if (promise !== undefined) {
-      return { value: promise, async: true }
-    }
-
-    return { value: undefined, async: false }
+    return result
   }
 
-  #refresh(args   , key         = this.#keySelector(...args))             {
+  #refresh(args   , key         = this.#keySelector(...args))                 {
     if (typeof key !== 'string' || key.length === 0) {
       throw new TypeError('keySelector must return a non-empty string')
     }
@@ -299,11 +295,23 @@ export class AsyncCache                                               {
     // TODO (fix): cross process/thread dedupe...
     const existing = this.#dedupe.get(key)
     if (existing !== undefined) {
-      return existing
+      return { async: true, value: existing }
+    }
+
+    const value = this.#valueSelector(...args)
+
+    if (!(value instanceof Promise)) {
+      this.#dedupe.delete(key)
+      if (value === undefined) {
+        this.#delete(key)
+      } else {
+        this.#set(key, value)
+      }
+      return { async: false, value }
     }
 
     // eslint-disable-next-line: no-unsafe-argument
-    const promise = Promise.resolve(this.#valueSelector(...args)).then(
+    const promise = value.then(
       (value) => {
         if (this.#dedupe.get(key) === promise) {
           this.#dedupe.delete(key)
@@ -325,7 +333,7 @@ export class AsyncCache                                               {
     promise.catch(noop)
     this.#dedupe.set(key, promise)
 
-    return promise
+    return { async: true, value: promise }
   }
 
   #set(key        , value   )       {
@@ -372,7 +380,7 @@ export class AsyncCache                                               {
     try {
       this.#setQuery?.run(key, data                 , ttl, stale)
     } catch (err) {
-      if ((err                                   )?.errcode === 13 /* SQLITE_FULL */) {
+      if ((err                        )?.errcode === 13 /* SQLITE_FULL */) {
         try {
           this.#evictQuery?.run(256)
           this.#setQuery?.run(key, data                 , ttl, stale)

package/lib/memory.js

@@ -13,6 +13,8 @@
                  
  
 
+const maxInt = 2147483647
+
 export class MemoryCache    {
   #map                                   = new Map()
   #arr                             = []
@@ -39,6 +41,8 @@ export class MemoryCache    {
   }
 
   set(key        , entry                     ) {
+    this.#counter = (this.#counter + 1) & maxInt
+
     const existing = this.#map.get(key)
     if (existing != null) {
       this.#delete(existing)
@@ -47,7 +51,7 @@ export class MemoryCache    {
     this.#map.set(key, entry)
     entry.key = key
     entry.index = this.#arr.push(entry) - 1
-    entry.counter = this.#counter++
+    entry.counter = this.#counter
 
     this.#size += entry.size ?? 0
     this.#count += 1
@@ -58,7 +62,8 @@ export class MemoryCache    {
   get(key        ) {
     const entry = this.#map.get(key)
     if (entry != null) {
-      entry.counter = this.#counter++
+      this.#counter = (this.#counter + 1) & maxInt
+      entry.counter = this.#counter
     }
     return entry
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/cache",
-  "version": "1.0.15",
+  "version": "2.0.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,5 +28,5 @@
     "rimraf": "^6.1.3",
     "typescript": "^5.9.3"
   },
-  "gitHead": "77e80c4b792deef25cceb104410d498a86b06985"
+  "gitHead": "05f9f940c3b262e4c5431c953ac93bc159ade0a0"
 }