Fixing a key error in set()

avoidwork · Oct 15, 2015 · 19f99af · 19f99af
1 parent d926351
commit 19f99af
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/lib/haro.es6.js b/lib/haro.es6.js
@@ -5,7 +5,7 @@
  * @copyright 2015
  * @license BSD-3-Clause
  * @link http://haro.rocks
- * @version 1.7.6
+ * @version 1.7.7
  */
 "use strict";
 
@@ -804,8 +804,10 @@ class Haro {
 		};
 
 		if (lkey === undefined || lkey === null) {
-			lkey = null;
-		} else if (this.data.has(lkey)) {
+			lkey = ldata[this.key] || null;
+		}
+
+		if (lkey && this.data.has(lkey)) {
 			method = "put";
 			ogdata = this.data.get(lkey);
 
@@ -1107,7 +1109,7 @@ function factory (data = null, config = {}, indexes = []) {
 }
 
 factory.transform = cast;
-factory.version = "1.7.6";
+factory.version = "1.7.7";
 
 // Node, AMD & window supported
 if (typeof exports !== "undefined") {

diff --git a/lib/haro.js b/lib/haro.js
@@ -5,7 +5,7 @@
  * @copyright 2015
  * @license BSD-3-Clause
  * @link http://haro.rocks
- * @version 1.7.6
+ * @version 1.7.7
  */
 "use strict";
 
@@ -898,8 +898,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				};
 
 				if (lkey === undefined || lkey === null) {
-					lkey = null;
-				} else if (this.data.has(lkey)) {
+					lkey = ldata[this.key] || null;
+				}
+
+				if (lkey && this.data.has(lkey)) {
 					method = "put";
 					ogdata = this.data.get(lkey);
 
@@ -1239,7 +1241,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 	}
 
 	factory.transform = cast;
-	factory.version = "1.7.6";
+	factory.version = "1.7.7";
 
 	// Node, AMD & window supported
 	if (typeof exports !== "undefined") {

diff --git a/lib/haro.min.js b/lib/haro.min.js
diff --git a/lib/haro.min.js.map b/lib/haro.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haro",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "Harō is a modern immutable DataStore using Maps, Sets, Promises, & Tuples",
   "main": "lib/haro.js",
   "scripts": {

diff --git a/src/haro.js b/src/haro.js
@@ -539,8 +539,10 @@ class Haro {
 		};
 
 		if (lkey === undefined || lkey === null) {
-			lkey = null;
-		} else if (this.data.has(lkey)) {
+			lkey = ldata[this.key] || null;
+		}
+
+		if (lkey && this.data.has(lkey)) {
 			method = "put";
 			ogdata = this.data.get(lkey);