From 85d8a3a7276a00c4e6a584bc05826a98540f1492 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Mon, 27 Jul 2015 23:00:48 -0700
Subject: [PATCH] Denote keys with # to disambiguate from index. Fixes #2007.

---
 src/lib/collection.html             | 20 ++++++++--
 src/standard/notify-path.html       | 18 +++++++--
 test/unit/notify-path-elements.html |  2 +
 test/unit/notify-path.html          | 62 ++++++++++++++++++++++-------
 4 files changed, 79 insertions(+), 23 deletions(-)

diff --git a/src/lib/collection.html b/src/lib/collection.html
index 0e68e38b39..e89fc1d2ad 100644
--- a/src/lib/collection.html
+++ b/src/lib/collection.html
@@ -46,10 +46,11 @@
       } else {
         this.pmap[item] = key;
       }
-      return key;
+      return '#' + key;
     },
 
     removeKey: function(key) {
+      key = this._parseKey(key);
       this._removeFromMap(this.store[key]);
       delete this.store[key];
     },
@@ -70,17 +71,27 @@
 
     getKey: function(item) {
       if (item && typeof item == 'object') {
-        return this.omap.get(item);
+        return '#' + this.omap.get(item);
       } else {
-        return this.pmap[item];
+        return '#' + this.pmap[item];
       }
     },
 
     getKeys: function() {
-      return Object.keys(this.store);
+      return Object.keys(this.store).map(function(key) {
+        return '#' + key;
+      });
+    },
+
+    _parseKey: function(key) {
+      if (key[0] == '#') {
+        return key.slice(1);
+      }
+      throw new Error('unexpected key ' + key);
     },
 
     setItem: function(key, item) {
+      key = this._parseKey(key);
       var old = this.store[key];
       if (old) {
         this._removeFromMap(old);
@@ -94,6 +105,7 @@
     },
 
     getItem: function(key) {
+      key = this._parseKey(key);
       return this.store[key];
     },
 
diff --git a/src/standard/notify-path.html b/src/standard/notify-path.html
index 3c804acdd0..af58b91d5e 100644
--- a/src/standard/notify-path.html
+++ b/src/standard/notify-path.html
@@ -195,14 +195,20 @@
       get: function(path, root) {
         var prop = root || this;
         var parts = this._getPathParts(path);
-        var last = parts.pop();
-        while (parts.length) {
-          prop = prop[parts.shift()];
+        var array;
+        for (var i=0; i<parts.length; i++) {
           if (!prop) {
             return;
           }
+          var part = parts[i];
+          if (array && part[0] == '#') {
+            prop = Polymer.Collection.get(array).getItem(part);
+          } else {
+            prop = prop[part];
+          }
+          array = Array.isArray(prop) ? prop : null;
         }
-        return prop[last];
+        return prop;
       },
 
       _pathEffector: function(path, value) {
@@ -342,6 +348,10 @@
           keySplices: Polymer.Collection.applySplices(array, splices),
           indexSplices: splices
         };
+        if (!array.hasOwnProperty('splices')) {
+          Object.defineProperty(array, 'splices',
+            {configurable: true, writable: true});
+        }
         this.set(path + '.splices', change);
         if (added != removed.length) {
           this.notifyPath(path + '.length', array.length);
diff --git a/test/unit/notify-path-elements.html b/test/unit/notify-path-elements.html
index 4afbae4a85..c10d2f05e5 100644
--- a/test/unit/notify-path-elements.html
+++ b/test/unit/notify-path-elements.html
@@ -124,6 +124,7 @@
         'multipleChanged(a, b, nested.obj.*)',
         'multiplePathsChanged(a, nested.b, nested.obj.c)',
         'arrayChanged(array.splices)',
+        'arrayChangedDeep(array.*)',
         'arrayNoCollChanged(arrayNoColl.splices)',
         'arrayOrPropChanged(prop, array.splices)',
         'aChanged(a.*)',
@@ -210,6 +211,7 @@
             'arrayChanged keySplices incorrect');
         }
       },
+      arrayChangedDeep: function(info) { },
       arrayNoCollChanged: function(splices) {
         this.observerCounts.arrayNoCollChanged++;
         if (this.arrayNoColl.length) {
diff --git a/test/unit/notify-path.html b/test/unit/notify-path.html
index 0408a543e7..73d1a25ef9 100644
--- a/test/unit/notify-path.html
+++ b/test/unit/notify-path.html
@@ -915,8 +915,8 @@
       assert.strictEqual(change.indexSplices[0].removed.length, 0);
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 2);
-      assert.equal(change.keySplices[0].added[0], key);
-      assert.equal(change.keySplices[0].added[1], key+1);
+      assert.strictEqual(change.keySplices[0].added[0], '#' + key);
+      assert.strictEqual(change.keySplices[0].added[1], '#' + (key+1));
       assert.strictEqual(change.keySplices[0].removed.length, 0);
     };
     var ret = el.push('array', 'new1', 'new2');
@@ -943,7 +943,7 @@
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 0);
       assert.strictEqual(change.keySplices[0].removed.length, 1);
-      assert.equal(change.keySplices[0].removed[0], key);
+      assert.strictEqual(change.keySplices[0].removed[0], '#' + key);
     };
     var ret = el.pop('array');
     assert.strictEqual(ret, 'orig3');
@@ -964,8 +964,8 @@
       assert.strictEqual(change.indexSplices[0].removed.length, 0);
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 2);
-      assert.equal(change.keySplices[0].added[0], key);
-      assert.equal(change.keySplices[0].added[1], key+1);
+      assert.strictEqual(change.keySplices[0].added[0], '#' + key);
+      assert.strictEqual(change.keySplices[0].added[1], '#' + (key+1));
       assert.strictEqual(change.keySplices[0].removed.length, 0);
     };
     var ret = el.unshift('array', 'new1', 'new2');
@@ -991,7 +991,7 @@
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 0);
       assert.strictEqual(change.keySplices[0].removed.length, 1);
-      assert.equal(change.keySplices[0].removed[0], 0);
+      assert.strictEqual(change.keySplices[0].removed[0], '#' + 0);
     };
     var ret = el.shift('array');
     assert.strictEqual(ret, 'orig1');
@@ -1013,10 +1013,10 @@
       assert.strictEqual(change.indexSplices[0].removed[0], 'orig2');
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 2);
-      assert.equal(change.keySplices[0].added[0], key);
-      assert.equal(change.keySplices[0].added[1], key+1);
+      assert.strictEqual(change.keySplices[0].added[0], '#' + key);
+      assert.strictEqual(change.keySplices[0].added[1], '#' + (key+1));
       assert.strictEqual(change.keySplices[0].removed.length, 1);
-      assert.equal(change.keySplices[0].removed[0], 1);
+      assert.strictEqual(change.keySplices[0].removed[0], '#' + 1);
     };
     var ret = el.splice('array', 1, 1, 'new1', 'new2');
     assert.deepEqual(ret, ['orig2']);
@@ -1112,10 +1112,10 @@
       assert.strictEqual(change.indexSplices[0].removed[0], 'orig2');
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 2);
-      assert.equal(change.keySplices[0].added[0], key);
-      assert.equal(change.keySplices[0].added[1], key+1);
+      assert.strictEqual(change.keySplices[0].added[0], '#' + key);
+      assert.strictEqual(change.keySplices[0].added[1], '#' + (key+1));
       assert.strictEqual(change.keySplices[0].removed.length, 1);
-      assert.equal(change.keySplices[0].removed[0], 1);
+      assert.strictEqual(change.keySplices[0].removed[0], '#' + 1);
     };
     var ret = el.splice('array', '1', '1', 'new1', 'new2');
     assert.deepEqual(ret, ['orig2']);
@@ -1139,10 +1139,10 @@
       assert.strictEqual(change.indexSplices[0].removed[0], 'orig2');
       assert.strictEqual(change.keySplices.length, 1);
       assert.strictEqual(change.keySplices[0].added.length, 2);
-      assert.equal(change.keySplices[0].added[0], key);
-      assert.equal(change.keySplices[0].added[1], key+1);
+      assert.strictEqual(change.keySplices[0].added[0], '#' + key);
+      assert.strictEqual(change.keySplices[0].added[1], '#' + (key+1));
       assert.strictEqual(change.keySplices[0].removed.length, 1);
-      assert.equal(change.keySplices[0].removed[0], 1);
+      assert.strictEqual(change.keySplices[0].removed[0], '#' + 1);
     };
     var ret = el.splice('array', '-2', '1', 'new1', 'new2');
     assert.deepEqual(ret, ['orig2']);
@@ -1153,6 +1153,7 @@
     assert.strictEqual(el.array[3], 'orig3');
   });
 
+<<<<<<< HEAD
   test('link two objects', function() {
     var aChanged = 0;
     var bChanged = 0;
@@ -1229,6 +1230,37 @@
     assert.equal(cChanged, 4);
   });
 
+  test('get from path in deep observer', function() {
+    el.arrayChanged = nop;
+    var array = [1, 2, 3];
+    // Initialize array
+    el.arrayChangedDeep = function(info) {
+      assert.strictEqual(el.get(info.path), array);
+    };
+    el.array = array;
+    // Change index 0
+    el.arrayChangedDeep = function(info) {
+      assert.strictEqual(el.get(info.path), 99);
+    };
+    el.set('array.0', 99);
+    // Unshift value
+    el.arrayChangedDeep = function(info) {
+      if (info.path == 'array.splices') {
+        assert.strictEqual(el.get(info.path), array.splices);
+      } else {
+        assert.strictEqual(el.get(info.path), 4);
+      }
+    };
+    el.unshift('array', 0);
+    // Change index 0
+    el.arrayChangedDeep = function(info) {
+      assert.strictEqual(el.get(info.path), -1);
+    };
+    el.set('array.0', -1);
+    // Verify array contents
+    assert.deepEqual(el.array, [-1, 99, 2, 3]);
+  });
+
 });
 
 </script>