Blocking null & undefined indices since that's counter intuitive …

…to finding data
avoidwork · Oct 14, 2015 · 982dd09 · 982dd09
1 parent 9661e09
commit 982dd09
Show file tree

Hide file tree

Showing 6 changed files with 43 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.4
+ * @version 1.7.5
  */
 "use strict";
 
@@ -230,12 +230,22 @@ function setIndexValue (index, key, value) {
 }
 
 function setIndex (index, indexes, delimiter, key, data, indice, pattern) {
+	let idx;
+
 	if (!indice) {
 		index.forEach(function (i) {
-			setIndexValue(indexes.get(i), keyIndex(i, data, delimiter, pattern), key);
+			let lidx = keyIndex(i, data, delimiter, pattern);
+
+			if (lidx !== undefined && lidx !== null) {
+				setIndexValue(indexes.get(i), lidx, key);
+			}
 		});
 	} else {
-		setIndexValue(indexes.get(indice), keyIndex(indice, data, delimiter, pattern), key);
+		idx = keyIndex(indice, data, delimiter, pattern);
+
+		if (idx !== undefined && idx !== null) {
+			setIndexValue(indexes.get(indice), idx, key);
+		}
 	}
 }
 
@@ -1095,7 +1105,7 @@ function factory (data = null, config = {}, indexes = []) {
 }
 
 factory.transform = cast;
-factory.version = "1.7.4";
+factory.version = "1.7.5";
 
 // 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.4
+ * @version 1.7.5
  */
 "use strict";
 
@@ -239,12 +239,22 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 	}
 
 	function setIndex(index, indexes, delimiter, key, data, indice, pattern) {
+		var idx = undefined;
+
 		if (!indice) {
 			index.forEach(function (i) {
-				setIndexValue(indexes.get(i), keyIndex(i, data, delimiter, pattern), key);
+				var lidx = keyIndex(i, data, delimiter, pattern);
+
+				if (lidx !== undefined && lidx !== null) {
+					setIndexValue(indexes.get(i), lidx, key);
+				}
 			});
 		} else {
-			setIndexValue(indexes.get(indice), keyIndex(indice, data, delimiter, pattern), key);
+			idx = keyIndex(indice, data, delimiter, pattern);
+
+			if (idx !== undefined && idx !== null) {
+				setIndexValue(indexes.get(indice), idx, key);
+			}
 		}
 	}
 
@@ -1227,7 +1237,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 	}
 
 	factory.transform = cast;
-	factory.version = "1.7.4";
+	factory.version = "1.7.5";
 
 	// 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.4",
+  "version": "1.7.5",
   "description": "Harō is a modern immutable DataStore using Maps, Sets, Promises, & Tuples",
   "main": "lib/haro.js",
   "scripts": {

diff --git a/src/utility.js b/src/utility.js
@@ -200,12 +200,22 @@ function setIndexValue (index, key, value) {
 }
 
 function setIndex (index, indexes, delimiter, key, data, indice, pattern) {
+	let idx;
+
 	if (!indice) {
 		index.forEach(function (i) {
-			setIndexValue(indexes.get(i), keyIndex(i, data, delimiter, pattern), key);
+			let lidx = keyIndex(i, data, delimiter, pattern);
+
+			if (lidx !== undefined && lidx !== null) {
+				setIndexValue(indexes.get(i), lidx, key);
+			}
 		});
 	} else {
-		setIndexValue(indexes.get(indice), keyIndex(indice, data, delimiter, pattern), key);
+		idx = keyIndex(indice, data, delimiter, pattern);
+
+		if (idx !== undefined && idx !== null) {
+			setIndexValue(indexes.get(indice), idx, key);
+		}
 	}
 }