Reapply change that makes path-observer more agressive with property lookups.

pkg/observe/lib/src/path_observer.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library observe.src.path_observer;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:math' show min;
 
@@ skipping 64 matching lines @@
     var oldValue = _value;
     _value = _path.getValueFrom(_object);
     if (skipChanges || _value == oldValue) return false;
 
     _report(_value, oldValue);
     return true;
   }
 }
 
 /// A dot-delimieted property path such as "foo.bar" or "foo.10.bar".
+///
 /// The path specifies how to get a particular value from an object graph, where
-/// the graph can include arrays.
+/// the graph can include arrays and maps. Each segment of the path describes
+/// how to take a single step in the object graph. Properties like 'foo' or
+/// 'bar' are read as properties on objects, or as keys if the object is a [Map]
+/// or a [Indexable], while integer values are read as indexes in a [List].
 // TODO(jmesserly): consider specialized subclasses for:
 // * empty path
 // * "value"
 // * single token in path, e.g. "foo"
 class PropertyPath {
   /// The segments of the path.
   final List<Object> _segments;
 
   /// Creates a new [PropertyPath]. These can be stored to avoid excessive
   /// parsing of path strings.
@@ skipping 76 matching lines @@
     for (int i = 0, len = _segments.length; i < len; i++) {
       hash = 0x1fffffff & (hash + _segments[i].hashCode);
       hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
       hash = hash ^ (hash >> 6);
     }
     hash = 0x1fffffff & (hash + ((0x03ffffff & hash) <<  3));
     hash = hash ^ (hash >> 11);
     return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
   }
 
-  /// Returns the current of the path from the provided [obj]ect.
+  /// Returns the current value of the path from the provided [obj]ect.
   getValueFrom(Object obj) {
     if (!isValid) return null;
     for (var segment in _segments) {
       if (obj == null) return null;
       obj = _getObjectProperty(obj, segment);
     }
     return obj;
   }
 
   /// Attempts to set the [value] of the path from the provided [obj]ect.
@@ skipping 32 matching lines @@
   if (record is PropertyChangeRecord) {
     return (record as PropertyChangeRecord).name == key;
   }
   if (record is MapChangeRecord) {
     if (key is Symbol) key = smoke.symbolToName(key);
     return (record as MapChangeRecord).key == key;
   }
   return false;
 }
 
+/// Properties in [Map] that need to be read as properties and not as keys in
+/// the map. We exclude methods ('containsValue', 'containsKey', 'putIfAbsent',
+/// 'addAll', 'remove', 'clear', 'forEach') because there is no use in reading
+/// them as part of path-observer segments.
+const _MAP_PROPERTIES = const [#keys, #values, #length, #isEmpty, #isNotEmpty];
+
 _getObjectProperty(object, property) {
   if (object == null) return null;
 
   if (property is int) {
     if (object is List && property >= 0 && property < object.length) {
       return object[property];
     }
   } else if (property is Symbol) {
-    final type = object.runtimeType;
+    // Support indexer if available, e.g. Maps or polymer_expressions Scope.
+    // This is the default syntax used by polymer/nodebind and
+    // polymer/observe-js PathObserver.
+    // TODO(sigmund): should we also support using checking dynamically for
+    // whether the type practically implements the indexer API
+    // (smoke.hasInstanceMethod(type, const Symbol('[]')))?
+    if (object is Indexable<String, dynamic> ||
+        object is Map<String, dynamic> && !_MAP_PROPERTIES.contains(property)) {
+      return object[smoke.symbolToName(property)];
+    }
     try {
-      if (smoke.hasGetter(type, property) || smoke.hasNoSuchMethod(type)) {
-        return smoke.read(object, property);
-      }
-      // Support indexer if available, e.g. Maps or polymer_expressions Scope.
-      // This is the default syntax used by polymer/nodebind and
-      // polymer/observe-js PathObserver.
-      if (smoke.hasInstanceMethod(type, const Symbol('[]'))) {
-        return object[smoke.symbolToName(property)];
-      }
+      return smoke.read(object, property);
     } on NoSuchMethodError catch (e) {
       // Rethrow, unless the type implements noSuchMethod, in which case we
       // interpret the exception as a signal that the method was not found.
-      if (!smoke.hasNoSuchMethod(type)) rethrow;
+      // Dart note: getting invalid properties is an error, unlike in JS where
+      // it returns undefined.
+      if (!smoke.hasNoSuchMethod(object.runtimeType)) rethrow;
     }
   }
 
   if (_logger.isLoggable(Level.FINER)) {
     _logger.finer("can't get $property in $object");
   }
   return null;
 }
 
 bool _setObjectProperty(object, property, value) {
   if (object == null) return false;
 
   if (property is int) {
     if (object is List && property >= 0 && property < object.length) {
       object[property] = value;
       return true;
     }
   } else if (property is Symbol) {
-    final type = object.runtimeType;
+    // Support indexer if available, e.g. Maps or polymer_expressions Scope.
+    if (object is Indexable<String, dynamic> ||
+        object is Map<String, dynamic> && !_MAP_PROPERTIES.contains(property)) {
+      object[smoke.symbolToName(property)] = value;
+      return true;
+    }
     try {
-      if (smoke.hasSetter(type, property) || smoke.hasNoSuchMethod(type)) {
-        smoke.write(object, property, value);
-        return true;
-      }
-      // Support indexer if available, e.g. Maps or polymer_expressions Scope.
-      if (smoke.hasInstanceMethod(type, const Symbol('[]='))) {
-        object[smoke.symbolToName(property)] = value;
-        return true;
-      }
-    } on NoSuchMethodError catch (e) {
-      if (!smoke.hasNoSuchMethod(type)) rethrow;
+      smoke.write(object, property, value);
+      return true;
+    } on NoSuchMethodError catch (e, s) {
+      if (!smoke.hasNoSuchMethod(object.runtimeType)) rethrow;
     }
   }
 
   if (_logger.isLoggable(Level.FINER)) {
     _logger.finer("can't set $property in $object");
   }
   return false;
 }
 
 // From: https://github.com/rafaelw/ChangeSummary/blob/master/change_summary.js
@@ skipping 163 matching lines @@
 
     if (!changed) return false;
 
     // TODO(rafaelw): Having _observed as the third callback arg here is
     // pretty lame API. Fix.
     _report(_value, oldValues, _observed);
     return true;
   }
 }
 
+/// An object accepted by [PropertyPath] where properties are read and written
+/// as indexing operations, just like a [Map].
+abstract class Indexable<K, V> {
+  V operator [](K key);
+  operator []=(K key, V value);
+}
+
 const _observerSentinel = const _ObserverSentinel();
 class _ObserverSentinel { const _ObserverSentinel(); }
 
 // A base class for the shared API implemented by PathObserver and
 // CompoundObserver and used in _ObservedSet.
 abstract class _Observer extends Bindable {
   static int _nextBirthId = 0;
 
   /// A number indicating when the object was created.
   final int _birthId = _nextBirthId++;
@@ skipping 169 matching lines @@
     for (var observer in _observers.values.toList(growable: false)) {
       if (observer._isOpen) observer._check();
     }
 
     _resetNeeded = true;
     scheduleMicrotask(reset);
   }
 }
 
 const int _MAX_DIRTY_CHECK_CYCLES = 1000;