Repair converting -0 to +0 in native collections

zloirock · Dec 11, 2014 · 280fcfe · 280fcfe
1 parent 116a57b
commit 280fcfe
Show file tree

Hide file tree

Showing 21 changed files with 162 additions and 90 deletions.
diff --git a/README.md b/README.md
@@ -1150,6 +1150,8 @@ var core = require('core-js/library');
 require('core-js/shim');
 ```
 ## Changelog
+**0.2.1** - *2014.12.12* - **Repair converting -0 to +0 in [native collections](#ecmascript-6-collections)**
+
 **0.2.0** - *2014.12.06*
   * added [`es7`](#ecmascript-7), [`es7_refs`](#ecmascript-7-abstract-references) modules
   * added [`String#at`](#ecmascript-7)

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "core.js",
   "main": "client/core.js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Standard Library",
   "keywords": [
     "ES6",

diff --git a/build/config.ls b/build/config.ls
@@ -1,5 +1,5 @@
 config = module.exports = {}
-  ..version = '0.2.0'
+  ..version = '0.2.1'
   ..year    = new Date!getFullYear!
   ..banner  = """
     /**

diff --git a/client/core.js b/client/core.js
@@ -1,5 +1,5 @@
 /**
- * Core.js 0.2.0
+ * Core.js 0.2.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
  * © 2014 Denis Pushkarev
@@ -1296,9 +1296,9 @@ $define(GLOBAL + BIND, {
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -1307,10 +1307,14 @@ $define(GLOBAL + BIND, {
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }
@@ -1493,14 +1497,14 @@ $define(GLOBAL + BIND, {
     referenceDelete: REFERENCE_DELETE
   });
 
-  FunctionProto[REFERENCE_GET] || hidden(FunctionProto, REFERENCE_GET, returnThis);
+  hidden(FunctionProto, REFERENCE_GET, returnThis);
 
   function setMapMethods(Constructor){
     if(Constructor){
       var MapProto = Constructor[PROTOTYPE];
-      MapProto[REFERENCE_GET] || hidden(MapProto, REFERENCE_GET, MapProto.get);
-      MapProto[REFERENCE_SET] || hidden(MapProto, REFERENCE_SET, MapProto.set);
-      MapProto[REFERENCE_DELETE] || hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
+      hidden(MapProto, REFERENCE_GET, MapProto.get);
+      hidden(MapProto, REFERENCE_SET, MapProto.set);
+      hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
     }
   }
   setMapMethods(Map);

diff --git a/client/core.min.js b/client/core.min.js
diff --git a/client/core.min.map b/client/core.min.map
diff --git a/client/library.js b/client/library.js
@@ -1,5 +1,5 @@
 /**
- * Core.js 0.2.0
+ * Core.js 0.2.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
  * © 2014 Denis Pushkarev
@@ -1296,9 +1296,9 @@ $define(GLOBAL + BIND, {
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -1307,10 +1307,14 @@ $define(GLOBAL + BIND, {
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }
@@ -1493,14 +1497,14 @@ $define(GLOBAL + BIND, {
     referenceDelete: REFERENCE_DELETE
   });
 
-  FunctionProto[REFERENCE_GET] || hidden(FunctionProto, REFERENCE_GET, returnThis);
+  hidden(FunctionProto, REFERENCE_GET, returnThis);
 
   function setMapMethods(Constructor){
     if(Constructor){
       var MapProto = Constructor[PROTOTYPE];
-      MapProto[REFERENCE_GET] || hidden(MapProto, REFERENCE_GET, MapProto.get);
-      MapProto[REFERENCE_SET] || hidden(MapProto, REFERENCE_SET, MapProto.set);
-      MapProto[REFERENCE_DELETE] || hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
+      hidden(MapProto, REFERENCE_GET, MapProto.get);
+      hidden(MapProto, REFERENCE_SET, MapProto.set);
+      hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
     }
   }
   setMapMethods(Map);

diff --git a/client/library.min.js b/client/library.min.js
diff --git a/client/library.min.map b/client/library.min.map
diff --git a/client/shim.js b/client/shim.js
@@ -1,5 +1,5 @@
 /**
- * Core.js 0.2.0
+ * Core.js 0.2.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
  * © 2014 Denis Pushkarev
@@ -1296,9 +1296,9 @@ $define(GLOBAL + BIND, {
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -1307,10 +1307,14 @@ $define(GLOBAL + BIND, {
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }
@@ -1493,14 +1497,14 @@ $define(GLOBAL + BIND, {
     referenceDelete: REFERENCE_DELETE
   });
 
-  FunctionProto[REFERENCE_GET] || hidden(FunctionProto, REFERENCE_GET, returnThis);
+  hidden(FunctionProto, REFERENCE_GET, returnThis);
 
   function setMapMethods(Constructor){
     if(Constructor){
       var MapProto = Constructor[PROTOTYPE];
-      MapProto[REFERENCE_GET] || hidden(MapProto, REFERENCE_GET, MapProto.get);
-      MapProto[REFERENCE_SET] || hidden(MapProto, REFERENCE_SET, MapProto.set);
-      MapProto[REFERENCE_DELETE] || hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
+      hidden(MapProto, REFERENCE_GET, MapProto.get);
+      hidden(MapProto, REFERENCE_SET, MapProto.set);
+      hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
     }
   }
   setMapMethods(Map);

diff --git a/client/shim.min.js b/client/shim.min.js
diff --git a/client/shim.min.map b/client/shim.min.map
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 /**
- * Core.js 0.2.0
+ * Core.js 0.2.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
  * © 2014 Denis Pushkarev
@@ -1089,9 +1089,9 @@ $define(GLOBAL + BIND, {
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -1100,10 +1100,14 @@ $define(GLOBAL + BIND, {
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }
@@ -1286,14 +1290,14 @@ $define(GLOBAL + BIND, {
     referenceDelete: REFERENCE_DELETE
   });
 
-  FunctionProto[REFERENCE_GET] || hidden(FunctionProto, REFERENCE_GET, returnThis);
+  hidden(FunctionProto, REFERENCE_GET, returnThis);
 
   function setMapMethods(Constructor){
     if(Constructor){
       var MapProto = Constructor[PROTOTYPE];
-      MapProto[REFERENCE_GET] || hidden(MapProto, REFERENCE_GET, MapProto.get);
-      MapProto[REFERENCE_SET] || hidden(MapProto, REFERENCE_SET, MapProto.set);
-      MapProto[REFERENCE_DELETE] || hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
+      hidden(MapProto, REFERENCE_GET, MapProto.get);
+      hidden(MapProto, REFERENCE_SET, MapProto.set);
+      hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
     }
   }
   setMapMethods(Map);

diff --git a/library.js b/library.js
@@ -1,5 +1,5 @@
 /**
- * Core.js 0.2.0
+ * Core.js 0.2.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
  * © 2014 Denis Pushkarev
@@ -1089,9 +1089,9 @@ $define(GLOBAL + BIND, {
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -1100,10 +1100,14 @@ $define(GLOBAL + BIND, {
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }
@@ -1286,14 +1290,14 @@ $define(GLOBAL + BIND, {
     referenceDelete: REFERENCE_DELETE
   });
 
-  FunctionProto[REFERENCE_GET] || hidden(FunctionProto, REFERENCE_GET, returnThis);
+  hidden(FunctionProto, REFERENCE_GET, returnThis);
 
   function setMapMethods(Constructor){
     if(Constructor){
       var MapProto = Constructor[PROTOTYPE];
-      MapProto[REFERENCE_GET] || hidden(MapProto, REFERENCE_GET, MapProto.get);
-      MapProto[REFERENCE_SET] || hidden(MapProto, REFERENCE_SET, MapProto.set);
-      MapProto[REFERENCE_DELETE] || hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
+      hidden(MapProto, REFERENCE_GET, MapProto.get);
+      hidden(MapProto, REFERENCE_SET, MapProto.set);
+      hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
     }
   }
   setMapMethods(Map);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "core-js",
   "description": "Standard library",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/zloirock/core-js.git"

diff --git a/shim.js b/shim.js
@@ -1,5 +1,5 @@
 /**
- * Core.js 0.2.0
+ * Core.js 0.2.1
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
  * © 2014 Denis Pushkarev
@@ -1089,9 +1089,9 @@ $define(GLOBAL + BIND, {
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -1100,10 +1100,14 @@ $define(GLOBAL + BIND, {
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }
@@ -1286,14 +1290,14 @@ $define(GLOBAL + BIND, {
     referenceDelete: REFERENCE_DELETE
   });
 
-  FunctionProto[REFERENCE_GET] || hidden(FunctionProto, REFERENCE_GET, returnThis);
+  hidden(FunctionProto, REFERENCE_GET, returnThis);
 
   function setMapMethods(Constructor){
     if(Constructor){
       var MapProto = Constructor[PROTOTYPE];
-      MapProto[REFERENCE_GET] || hidden(MapProto, REFERENCE_GET, MapProto.get);
-      MapProto[REFERENCE_SET] || hidden(MapProto, REFERENCE_SET, MapProto.set);
-      MapProto[REFERENCE_DELETE] || hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
+      hidden(MapProto, REFERENCE_GET, MapProto.get);
+      hidden(MapProto, REFERENCE_SET, MapProto.set);
+      hidden(MapProto, REFERENCE_DELETE, MapProto['delete']);
     }
   }
   setMapMethods(Map);

diff --git a/src/es6_collections.js b/src/es6_collections.js
@@ -31,9 +31,9 @@
       }});
     } else {
       var Native     = C
-        , test_key   = {}
         , collection = new C
-        , adder      = collection[ADDER_KEY];
+        , adder      = collection[ADDER_KEY]
+        , buggyChaining, buggyZero;
       // wrap to init collections from iterable
       if(!(SYMBOL_ITERATOR in ArrayProto && C.length)){
         C = function(iterable){
@@ -42,10 +42,14 @@
         }
         C[PROTOTYPE] = Native[PROTOTYPE];
       }
-      // fix .add & .set for chaining
-      if(framework && collection[ADDER_KEY](test_key, 1) !== collection){
+      buggyChaining = collection[ADDER_KEY](isWeak ? {} : -0, 1) !== collection;
+      isWeak || collection.forEach(function(val, key){
+        if(same(key, -0))buggyZero = true;
+      });
+      // fix .add & .set for chaining & converting -0 key to +0
+      if(framework && (buggyChaining || buggyZero)){
         hidden(C[PROTOTYPE], ADDER_KEY, function(a, b){
-          adder.call(this, a, b);
+          adder.call(this, same(a, -0) ? 0 : a, b);
           return this;
         });
       }