@extra-memoize/memory-cache 0.3.0 → 0.3.1

package/lib/caches/expirable-cache-with-stale-while-revalidate.d.ts

@@ -6,5 +6,4 @@ export declare class ExpirableCacheWithStaleWhileRevalidate<T> implements IStale
     constructor(timeToLive: number, staleWhileRevalidate: number);
     set(key: string, value: T): void;
     get(key: string): [State.Miss] | [State.Hit | State.StaleWhileRevalidate, T];
-    private isStaleWhileRevalidate;
 }

package/lib/caches/expirable-cache-with-stale-while-revalidate.js

@@ -18,18 +18,20 @@ export class ExpirableCacheWithStaleWhileRevalidate {
             return [State.Miss];
         }
         else {
-            if (this.isStaleWhileRevalidate(record)) {
+            const timestamp = Date.now();
+            if (record.updatedAt + this.timeToLive > timestamp) {
+                return [State.Hit, record.value];
+            }
+            else if (record.updatedAt
+                + this.timeToLive
+                + this.staleWhileRevalidate
+                > timestamp) {
                 return [State.StaleWhileRevalidate, record.value];
             }
             else {
-                return [State.Hit, record.value];
+                return [State.Miss];
             }
         }
     }
-    isStaleWhileRevalidate(record) {
-        const timestamp = Date.now();
-        return record.updatedAt + this.timeToLive <= timestamp
-            && record.updatedAt + this.timeToLive + this.staleWhileRevalidate > timestamp;
-    }
 }
 //# sourceMappingURL=expirable-cache-with-stale-while-revalidate.js.map

package/lib/caches/expirable-cache-with-stale-while-revalidate.js.map

@@ -1 +1 @@
-{"version":3,"file":"expirable-cache-with-stale-while-revalidate.js","sourceRoot":"","sources":["../../src/caches/expirable-cache-with-stale-while-revalidate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAA8B,KAAK,EAAE,MAAM,eAAe,CAAA;AAOjE,MAAM,OAAO,sCAAsC;IAGjD,YAAoB,UAAkB,EAAU,oBAA4B;QAAxD,eAAU,GAAV,UAAU,CAAQ;QAAU,yBAAoB,GAApB,oBAAoB,CAAQ;QAC1E,IAAI,CAAC,KAAK,GAAG,IAAI,cAAc,CAAC,UAAU,GAAG,oBAAoB,CAAC,CAAA;IACpE,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAQ;QACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAClB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YACnD,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAEO,sBAAsB,CAAC,MAAkB;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,OAAO,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,IAAI,SAAS;eAC/C,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAA;IACnF,CAAC;CACF"}
+{"version":3,"file":"expirable-cache-with-stale-while-revalidate.js","sourceRoot":"","sources":["../../src/caches/expirable-cache-with-stale-while-revalidate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAA8B,KAAK,EAAE,MAAM,eAAe,CAAA;AAOjE,MAAM,OAAO,sCAAsC;IAGjD,YAAoB,UAAkB,EAAU,oBAA4B;QAAxD,eAAU,GAAV,UAAU,CAAQ;QAAU,yBAAoB,GAApB,oBAAoB,CAAQ;QAC1E,IAAI,CAAC,KAAK,GAAG,IAAI,cAAc,CAAC,UAAU,GAAG,oBAAoB,CAAC,CAAA;IACpE,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAQ;QACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAClB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC5B,IAAI,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,GAAG,SAAS,EAAE,CAAC;gBACnD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YAClC,CAAC;iBAAM,IACL,MAAM,CAAC,SAAS;kBAChB,IAAI,CAAC,UAAU;kBACf,IAAI,CAAC,oBAAoB;kBACzB,SAAS,EACT,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YACnD,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

package/lib/caches/tlru-cache-with-stale-while-revalidate.d.ts

@@ -1,8 +1,4 @@
 import { IStaleWhileRevalidateCache, State } from 'extra-memoize';
-interface IRecord<T> {
-    updatedAt: number;
-    value: T;
-}
 export declare class TLRUCacheWithStaleWhileRevalidate<T> implements IStaleWhileRevalidateCache<T> {
     private timeToLive;
     private staleWhileRevalidate;
@@ -10,6 +6,4 @@ export declare class TLRUCacheWithStaleWhileRevalidate<T> implements IStaleWhile
     constructor(limit: number, timeToLive: number, staleWhileRevalidate: number);
     set(key: string, value: T): void;
     get(key: string): [State.Miss] | [State.Hit | State.StaleWhileRevalidate, T];
-    isStaleWhileRevalidate(record: IRecord<T>): boolean;
 }
-export {};

package/lib/caches/tlru-cache-with-stale-while-revalidate.js

@@ -18,18 +18,20 @@ export class TLRUCacheWithStaleWhileRevalidate {
             return [State.Miss];
         }
         else {
-            if (this.isStaleWhileRevalidate(record)) {
+            const timestamp = Date.now();
+            if (record.updatedAt + this.timeToLive > timestamp) {
+                return [State.Hit, record.value];
+            }
+            else if (record.updatedAt
+                + this.timeToLive
+                + this.staleWhileRevalidate
+                > timestamp) {
                 return [State.StaleWhileRevalidate, record.value];
             }
             else {
-                return [State.Hit, record.value];
+                return [State.Miss];
             }
         }
     }
-    isStaleWhileRevalidate(record) {
-        const timestamp = Date.now();
-        return record.updatedAt + this.timeToLive <= timestamp
-            && record.updatedAt + this.timeToLive + this.staleWhileRevalidate > timestamp;
-    }
 }
 //# sourceMappingURL=tlru-cache-with-stale-while-revalidate.js.map

package/lib/caches/tlru-cache-with-stale-while-revalidate.js.map

@@ -1 +1 @@
-{"version":3,"file":"tlru-cache-with-stale-while-revalidate.js","sourceRoot":"","sources":["../../src/caches/tlru-cache-with-stale-while-revalidate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAA8B,KAAK,EAAE,MAAM,eAAe,CAAA;AAOjE,MAAM,OAAO,iCAAiC;IAG5C,YACE,KAAa,EACL,UAAkB,EAClB,oBAA4B;QAD5B,eAAU,GAAV,UAAU,CAAQ;QAClB,yBAAoB,GAApB,oBAAoB,CAAQ;QAEpC,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,oBAAoB,CAAC,CAAA;IACtE,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAQ;QACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAClB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YACnD,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,sBAAsB,CAAC,MAAkB;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,OAAO,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,IAAI,SAAS;eAC/C,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAA;IACnF,CAAC;CACF"}
+{"version":3,"file":"tlru-cache-with-stale-while-revalidate.js","sourceRoot":"","sources":["../../src/caches/tlru-cache-with-stale-while-revalidate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAA8B,KAAK,EAAE,MAAM,eAAe,CAAA;AAOjE,MAAM,OAAO,iCAAiC;IAG5C,YACE,KAAa,EACL,UAAkB,EAClB,oBAA4B;QAD5B,eAAU,GAAV,UAAU,CAAQ;QAClB,yBAAoB,GAApB,oBAAoB,CAAQ;QAEpC,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,oBAAoB,CAAC,CAAA;IACtE,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAQ;QACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAClB,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC5B,IAAI,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,GAAG,SAAS,EAAE,CAAC;gBACnD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YAClC,CAAC;iBAAM,IACL,MAAM,CAAC,SAAS;kBAChB,IAAI,CAAC,UAAU;kBACf,IAAI,CAAC,oBAAoB;kBACzB,SAAS,EACT,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YACnD,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extra-memoize/memory-cache",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "",
   "keywords": [],
   "files": [

package/src/caches/expirable-cache-with-stale-while-revalidate.ts

@@ -25,17 +25,19 @@ export class ExpirableCacheWithStaleWhileRevalidate<T> implements IStaleWhileRev
     if (state === State.Miss) {
       return [State.Miss]
     } else {
-      if (this.isStaleWhileRevalidate(record)) {
+      const timestamp = Date.now()
+      if (record.updatedAt + this.timeToLive > timestamp) {
+        return [State.Hit, record.value]
+      } else if (
+        record.updatedAt
+      + this.timeToLive
+      + this.staleWhileRevalidate
+      > timestamp
+      ) {
         return [State.StaleWhileRevalidate, record.value]
       } else {
-        return [State.Hit, record.value]
+        return [State.Miss]
       }
     }
   }
-
-  private isStaleWhileRevalidate(record: IRecord<T>): boolean {
-    const timestamp = Date.now()
-    return record.updatedAt + this.timeToLive <= timestamp
-        && record.updatedAt + this.timeToLive + this.staleWhileRevalidate > timestamp
-  }
 }

package/src/caches/tlru-cache-with-stale-while-revalidate.ts

@@ -29,17 +29,19 @@ export class TLRUCacheWithStaleWhileRevalidate<T> implements IStaleWhileRevalida
     if (state === State.Miss) {
       return [State.Miss]
     } else {
-      if (this.isStaleWhileRevalidate(record)) {
+      const timestamp = Date.now()
+      if (record.updatedAt + this.timeToLive > timestamp) {
+        return [State.Hit, record.value]
+      } else if (
+        record.updatedAt
+      + this.timeToLive
+      + this.staleWhileRevalidate
+      > timestamp
+      ) {
         return [State.StaleWhileRevalidate, record.value]
       } else {
-        return [State.Hit, record.value]
+        return [State.Miss]
       }
     }
   }
-
-  isStaleWhileRevalidate(record: IRecord<T>): boolean {
-    const timestamp = Date.now()
-    return record.updatedAt + this.timeToLive <= timestamp
-        && record.updatedAt + this.timeToLive + this.staleWhileRevalidate > timestamp
-  }
 }