one more fix for #124 - undefined on .get

zloirock · Oct 26, 2015 · ed8d9f9 · ed8d9f9
1 parent 0f4435b
commit ed8d9f9
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 23 deletions.
diff --git a/library/modules/$.collection.js b/library/modules/$.collection.js
@@ -27,7 +27,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
     $.each.call('add,clear,delete,forEach,get,has,set,keys,values,entries'.split(','),function(KEY){
       var IS_ADDER = KEY == 'add' || KEY == 'set';
       if(KEY in proto && !(IS_WEAK && KEY == 'clear'))hide(C.prototype, KEY, function(a, b){
-        if(!IS_ADDER && IS_WEAK && !isObject(a))return false;
+        if(!IS_ADDER && IS_WEAK && !isObject(a))return KEY == 'get' ? undefined : false;
         var result = this._c[KEY](a === 0 ? 0 : a, b);
         return IS_ADDER ? this : result;
       });

diff --git a/modules/$.collection.js b/modules/$.collection.js
@@ -20,7 +20,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
       } : KEY == 'has' ? function has(a){
         return IS_WEAK && !isObject(a) ? false : fn.call(this, a === 0 ? 0 : a);
       } : KEY == 'get' ? function get(a){
-        return IS_WEAK && !isObject(a) ? false : fn.call(this, a === 0 ? 0 : a);
+        return IS_WEAK && !isObject(a) ? undefined : fn.call(this, a === 0 ? 0 : a);
       } : KEY == 'add' ? function add(a){ fn.call(this, a === 0 ? 0 : a); return this; }
         : function set(a, b){ fn.call(this, a === 0 ? 0 : a, b); return this; }
     );
@@ -34,7 +34,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
   } else {
     var instance             = new C
       // early implementations not supports chaining
-      , CHAINING             = instance[ADDER](IS_WEAK ? {} : -0, 1)
+      , HASNT_CHAINING       = instance[ADDER](IS_WEAK ? {} : -0, 1) != instance
       // V8 ~  Chromium 40- weak-collections throws on primitives, but should return false
       , THROWS_ON_PRIMITIVES = fails(function(){ instance.has(1); })
       // most early implementations doesn't supports iterables, most modern - not close it correctly
@@ -59,7 +59,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
       fixMethod('has');
       IS_MAP && fixMethod('get');
     }
-    if(BUGGY_ZERO || CHAINING !== instance)fixMethod(ADDER);
+    if(BUGGY_ZERO || HASNT_CHAINING)fixMethod(ADDER);
     // weak collections should not contains .clear method
     if(IS_WEAK && proto.clear)delete proto.clear;
   }

diff --git a/modules/library/$.collection.js b/modules/library/$.collection.js
@@ -27,7 +27,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
     $.each.call('add,clear,delete,forEach,get,has,set,keys,values,entries'.split(','),function(KEY){
       var IS_ADDER = KEY == 'add' || KEY == 'set';
       if(KEY in proto && !(IS_WEAK && KEY == 'clear'))hide(C.prototype, KEY, function(a, b){
-        if(!IS_ADDER && IS_WEAK && !isObject(a))return false;
+        if(!IS_ADDER && IS_WEAK && !isObject(a))return KEY == 'get' ? undefined : false;
         var result = this._c[KEY](a === 0 ? 0 : a, b);
         return IS_ADDER ? this : result;
       });

diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/library.js b/tests/library.js
diff --git a/tests/library/es6.weak-map.ls b/tests/library/es6.weak-map.ls
@@ -53,7 +53,7 @@ test 'WeakMap#get' (assert)!->
   assert.strictEqual M.get(a), 42, 'WeakMap .get() return value'
   M.delete a
   assert.strictEqual M.get(a), void, 'WeakMap .get() after .delete() return undefined'
-  assert.ok (try !M.get 1), 'return false on primitive'
+  assert.ok (try void is M.get 1), 'return undefined on primitive'
 
 test 'WeakMap#has' (assert)!->
   assert.isFunction WeakMap::has

diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.weak-map.ls b/tests/tests/es6.weak-map.ls
@@ -63,7 +63,7 @@ test 'WeakMap#get' (assert)!->
   assert.strictEqual M.get(a), 42, 'WeakMap .get() return value'
   M.delete a
   assert.strictEqual M.get(a), void, 'WeakMap .get() after .delete() return undefined'
-  assert.ok (try !M.get 1), 'return false on primitive'
+  assert.ok (try void is M.get 1), 'return undefined on primitive'
 
 test 'WeakMap#has' (assert)!->
   assert.isFunction WeakMap::has