Undoing API change as it's breaking things

avoidwork · Dec 5, 2018 · 5378fdb · 5378fdb
1 parent d646940
commit 5378fdb
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 27 deletions.
diff --git a/lib/tiny-lru.js b/lib/tiny-lru.js
@@ -5,32 +5,25 @@
  * @copyright 2018
  * @license BSD-3-Clause
  * @link https://github.com/avoidwork/tiny-lru
- * @version 3.0.6
+ * @version 3.0.7
  */
 "use strict";
 
 (function (global) {
 	const next = typeof process !== "undefined" ? process.nextTick : arg => setTimeout(arg, 1),
 		empty = null;
 
-	function reset () {
-		this.cache = {};
-		this.first = empty;
-		this.last = empty;
-		this.length = 0;
-
-		return this;
-	}
 	class LRU {
 		constructor (max, notify, ttl) {
 			this.max = max;
 			this.notify = notify;
 			this.ttl = ttl;
-			reset.call(this);
+
+			return this.reset();
 		}
 
 		clear (silent = false) {
-			reset.call(this);
+			this.reset();
 
 			if (silent === false && this.notify === true) {
 				next(this.onchange("clear", this.dump()));
@@ -125,6 +118,15 @@
 			return result;
 		}
 
+		reset () {
+			this.cache = {};
+			this.first = empty;
+			this.last = empty;
+			this.length = 0;
+
+			return this;
+		}
+
 		set (key, value, silent = false, bypass = false) {
 			if (bypass === true || this.has(key) === true) {
 				const item = this.cache[key];

diff --git a/lib/tiny-lru.min.js b/lib/tiny-lru.min.js
diff --git a/lib/tiny-lru.min.js.map b/lib/tiny-lru.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tiny-lru",
   "description": "Tiny LRU cache for Client or Server",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "homepage": "https://github.com/avoidwork/tiny-lru",
   "author": "Jason Mulligan <jason.mulligan@avoidwork.com>",
   "repository": {

diff --git a/src/intro.js b/src/intro.js
@@ -3,12 +3,3 @@
 (function (global) {
 	const next = typeof process !== "undefined" ? process.nextTick : arg => setTimeout(arg, 1),
 		empty = null;
-
-	function reset () {
-		this.cache = {};
-		this.first = empty;
-		this.last = empty;
-		this.length = 0;
-
-		return this;
-	}
diff --git a/src/lru.js b/src/lru.js
@@ -3,11 +3,12 @@
 			this.max = max;
 			this.notify = notify;
 			this.ttl = ttl;
-			reset.call(this);
+
+			return this.reset();
 		}
 
 		clear (silent = false) {
-			reset.call(this);
+			this.reset();
 
 			if (silent === false && this.notify === true) {
 				next(this.onchange("clear", this.dump()));
@@ -102,6 +103,15 @@
 			return result;
 		}
 
+		reset () {
+			this.cache = {};
+			this.first = empty;
+			this.last = empty;
+			this.length = 0;
+
+			return this;
+		}
+
 		set (key, value, silent = false, bypass = false) {
 			if (bypass === true || this.has(key) === true) {
 				const item = this.cache[key];