perf(copy): use ES6 Map to track source/destination objects

Author: jbedard

src/Angular.js

@@ -740,6 +740,49 @@ function arrayRemove(array, value) {
   return index;
 }
 
+
+function ES6MapShim() {
+  this._keys = [];
+  this._values = [];
+}
+ES6MapShim.prototype = {
+  get: function(key) {
+    var idx = this._keys.indexOf(key);
+    if (idx !== -1) {
+      return this._values[idx];
+    }
+  },
+  set: function(key, value) {
+    var idx = this._keys.indexOf(key);
+    if (idx === -1) {
+      idx = this._keys.length;
+    }
+    this._keys[idx] = key;
+    this._values[idx] = value;
+    return this;
+  }
+};
+
+function testES6Map(Map) {
+  var m, o = {};
+  return isFunction(Map) && (m = new Map())
+
+    // Required functions
+    && isFunction(m.get) && isFunction(m.set)
+
+    // Number keys, must not call toString
+    && m.get(1) === undefined
+    && m.set(1, o) === m
+    && m.get(1) === o
+    && m.get("1") === undefined
+
+    // Object keys, must use instance as key and not call toString
+    && m.set(o, 2) === m && m.get(o) === 2
+    && m.get({}) === undefined;
+}
+
+var ES6Map = testES6Map(window.Map) ? window.Map : ES6MapShim;
+
 /**
  * @ngdoc function
  * @name angular.copy
@@ -799,8 +842,7 @@ function arrayRemove(array, value) {
  </example>
  */
 function copy(source, destination) {
-  var stackSource = [];
-  var stackDest = [];
+  var stack = new ES6Map();
 
   if (destination) {
     if (isTypedArray(destination)) {
@@ -821,8 +863,7 @@ function copy(source, destination) {
       });
     }
 
-    stackSource.push(source);
-    stackDest.push(destination);
+    stack.set(source, destination);
     return copyRecurse(source, destination);
   }
 
@@ -866,9 +907,9 @@ function copy(source, destination) {
     }
 
     // Already copied values
-    var index = stackSource.indexOf(source);
-    if (index !== -1) {
-      return stackDest[index];
+    var existingCopy = stack.get(source);
+    if (existingCopy) {
+      return existingCopy;
     }
 
     if (isWindow(source) || isScope(source)) {
@@ -896,8 +937,7 @@ function copy(source, destination) {
       needsRecurse = true;
     }
 
-    stackSource.push(source);
-    stackDest.push(destination);
+    stack.set(source, destination);
 
     return needsRecurse
       ? copyRecurse(source, destination)

test/.jshintrc

@@ -85,6 +85,8 @@
     "getBlockNodes": false,
     "createMap": false,
     "VALIDITY_STATE_PROPERTY": true,
+    "testES6Map": true,
+    "ES6MapShim": true,
 
     /* AngularPublic.js */
     "version": false,

test/AngularSpec.js

@@ -16,6 +16,39 @@ describe('angular', function() {
     });
   });
 
+  describe("ES6Map", function() {
+    it("should test for bad Map objects", function() {
+      expect(testES6Map()).toBe(false);
+      expect(testES6Map(null)).toBe(false);
+      expect(testES6Map(3)).toBe(false);
+      expect(testES6Map({})).toBe(false);
+    });
+
+    it("should test for bad Map shims", function() {
+      function NoMethods() {}
+
+      function ToStringOnKeys() {
+        this._vals = {};
+      }
+      ToStringOnKeys.prototype = {
+        get: function(key) {
+          return this._vals[key];
+        },
+        set: function(key, val) {
+          this._vals[key] = val;
+          return this;
+        }
+      };
+
+      expect(testES6Map(NoMethods)).toBe(false);
+      expect(testES6Map(ToStringOnKeys)).toBe(false);
+    });
+
+    it("should pass the ES6Map test with ES6MapShim", function() {
+      expect(testES6Map(ES6MapShim)).toBe(true);
+    });
+  });
+
   describe("copy", function() {
     it("should return same object", function() {
       var obj = {};