Merge branch 'release/4.0.0'

Author: Bryan Donovan

History.md

@@ -1,3 +1,7 @@
+- 4.0.0
+  - Upgrade to lru-cache 7.x (#193). - @orgads
+    - This has a breaking change in memoryCache.dump().
+
 - 3.6.3 2022-05-20
   - Remove import from the code in order to be able to bundle and minify the module (#191) - @ricardomozartlino
 

lib/stores/memory.js

@@ -33,11 +33,13 @@ var memoryStore = function(args) {
     var ttl = args.ttl;
     var lruOpts = {
         max: args.max || 500,
-        maxAge: (ttl || ttl === 0) ? ttl * 1000 : null,
+        maxSize: args.maxSize,
+        ttl: (ttl || ttl === 0) ? ttl * 1000 : null,
         dispose: args.dispose,
-        length: args.length,
-        stale: args.stale,
-        updateAgeOnGet: args.updateAgeOnGet || false
+        sizeCalculation: args.sizeCalculation || args.length,
+        allowStale: args.allowStale || args.stale,
+        updateAgeOnGet: args.updateAgeOnGet,
+        updateAgeOnHas: args.updateAgeOnHas
     };
 
     var lruCache = new Lru(lruOpts);
@@ -156,7 +158,7 @@ var memoryStore = function(args) {
         }
 
         args.forEach(function(key) {
-            lruCache.del(key);
+            lruCache.delete(key);
         });
 
         if (cb) {
@@ -167,7 +169,7 @@ var memoryStore = function(args) {
     };
 
     self.reset = function(cb) {
-        lruCache.reset();
+        lruCache.clear();
         if (cb) {
             process.nextTick(cb.bind(null, null));
         } else if (self.usePromises) {
@@ -176,7 +178,7 @@ var memoryStore = function(args) {
     };
 
     self.keys = function(cb) {
-        var keys = lruCache.keys();
+        var keys = [...lruCache.keys()];
         if (cb) {
             process.nextTick(cb.bind(null, null, keys));
         } else if (self.usePromises) {
@@ -190,7 +192,7 @@ var memoryStore = function(args) {
      * This method is not available in the caching modules.
      */
     self.keyCount = function() {
-        return lruCache.length;
+        return lruCache.size;
     };
 
     /**

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "3.6.3",
+  "version": "4.0.0",
   "description": "Cache module for Node.js",
   "main": "index.js",
   "files": [
@@ -27,7 +27,7 @@
   "dependencies": {
     "async": "3.2.3",
     "lodash.clonedeep": "^4.5.0",
-    "lru-cache": "6.0.0"
+    "lru-cache": "^7.10.1"
   },
   "devDependencies": {
     "coveralls": "3.1.0",

package.json

@@ -314,10 +314,10 @@ describe("memory store", function() {
             memoryCache.set(key2, value2);
 
             const data = memoryCache.dump();
-            assert.equal(data[0].k, key2);
-            assert.equal(data[0].v, value2);
-            assert.equal(data[1].k, key1);
-            assert.equal(data[1].v, value1);
+            assert.equal(data[0][0], key1);
+            assert.equal(data[0][1].value, value1);
+            assert.equal(data[1][0], key2);
+            assert.equal(data[1][1].value, value2);
         });
 
         it("lets us dump data with callback", function() {
@@ -327,10 +327,10 @@ describe("memory store", function() {
 
             memoryCache.dump((err, data) => {
                 checkErr(err);
-                assert.equal(data[0].k, key2);
-                assert.equal(data[0].v, value2);
-                assert.equal(data[1].k, key1);
-                assert.equal(data[1].v, value1);
+                assert.equal(data[0][0], key1);
+                assert.equal(data[0][1].value, value1);
+                assert.equal(data[1][0], key2);
+                assert.equal(data[1][1].value, value2);
             });
         });
 
@@ -340,10 +340,10 @@ describe("memory store", function() {
             memoryCache.set(key2, value2);
 
             const data = await memoryCache.dump();
-            assert.equal(data[0].k, key2);
-            assert.equal(data[0].v, value2);
-            assert.equal(data[1].k, key1);
-            assert.equal(data[1].v, value1);
+            assert.equal(data[0][0], key1);
+            assert.equal(data[0][1].value, value1);
+            assert.equal(data[1][0], key2);
+            assert.equal(data[1][1].value, value2);
         });
     });
 
@@ -361,14 +361,8 @@ describe("memory store", function() {
             key2 = support.random.string(20);
             value2 = support.random.string();
             data = [
-                {
-                    k: key1,
-                    v: value1
-                },
-                {
-                    k: key2,
-                    v: value2
-                }
+                [key1, {value: value1}],
+                [key2, {value: value2}]
             ];
         });