Merge pull request #117 from canjs/116-haskey-primitives

Fixes issue with hasKey not working on primitives
canjs · Jun 14, 2018 · 2f69d04 · 2f69d04
2 parents 56ae882 + aa89ed5
commit 2f69d04
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/reflections/shape/shape-test.js b/reflections/shape/shape-test.js
@@ -518,7 +518,7 @@ QUnit.test("updateDeep recurses correctly (#73)", function(){
 QUnit.module('can-reflect: shape reflections: proto chain');
 
 QUnit.test("hasKey", function() {
-	var objHasKey = {};
+	/*var objHasKey = {};
 	Object.defineProperty(objHasKey, "_keys", {
 		value: { foo: true }
 	});
@@ -539,7 +539,14 @@ QUnit.test("hasKey", function() {
 	QUnit.ok(!shapeReflections.hasKey(objHasOwnKey, "bar") , "returns false when hasOwnKey Symbol returns false");
 
 	objHasOwnKey.bar = "baz";
-	QUnit.ok(shapeReflections.hasKey(objHasOwnKey, "bar") , "returns true when hasOwnKey Symbol returns false but `in` returns true");
+	QUnit.ok(shapeReflections.hasKey(objHasOwnKey, "bar") , "returns true when hasOwnKey Symbol returns false but `in` returns true");*/
+	debugger;
+
+	QUnit.ok(shapeReflections.hasKey(55, "toFixed") , "works on primitives");
+	QUnit.ok(shapeReflections.hasKey(true, "valueOf") , "works on primitives");
+	QUnit.ok(shapeReflections.hasKey('foo', "length") , "works on primitives");
+	QUnit.notOk(shapeReflections.hasKey(null, "length") , "works on null");
+	QUnit.notOk(shapeReflections.hasKey(undefined, "length") , "works on undefined");
 });
 
 QUnit.test("serialize clones", function(){

diff --git a/reflections/shape/shape.js b/reflections/shape/shape.js
@@ -3,6 +3,16 @@ var getSetReflections = require("../get-set/get-set");
 var typeReflections = require("../type/type");
 var helpers = require("../helpers");
 
+
+
+var getPrototypeOfWorksWithPrimitives = true;
+try {
+	Object.getPrototypeOf(1);
+} catch(e) {
+	getPrototypeOfWorksWithPrimitives = false;
+}
+
+
 var ArrayMap;
 if(typeof Map === "function") {
 	ArrayMap = Map;
@@ -982,7 +992,22 @@ shapeReflections = {
 	 * @param  {String} key The key to look up on `obj`
 	 * @return {Boolean} `true` if `obj`'s key set contains `key` or an object on its prototype chain's key set contains `key`, `false` otherwise
 	 */
-	"hasKey": function(obj, key) {
+	hasKey: function(obj, key) {
+		if( obj == null ) {
+			return false;
+		}
+		if (typeReflections.isPrimitive(obj)) {
+			if (Object.prototype.hasOwnProperty.call(obj, key)) {
+				return true;
+			} else {
+				var proto = (getPrototypeOfWorksWithPrimitives ? Object.getPrototypeOf(obj) : obj.__proto__);
+				if(proto !== undefined) {
+					return key in proto;
+				} else {
+					return obj[key] !== undefined;
+				}
+			}
+		}
 		var hasKey = obj[canSymbol.for("can.hasKey")];
 		if(hasKey) {
 			return hasKey.call(obj, key);