changes dart-archive#1

Author: vicb

lib/change_detection/dirty_checking_change_detector.dart

@@ -2,6 +2,7 @@ library dirty_checking_change_detector;
 
 import 'dart:collection';
 import 'package:angular/change_detection/change_detection.dart';
+import 'package:angular/change_detection/watch_group.dart';
 
 /**
  * [DirtyCheckingChangeDetector] determines which object properties have changed
@@ -369,7 +370,7 @@ class _ChangeIterator<H> implements Iterator<Record<H>>{
  * removing efficient. [DirtyCheckingRecord] also has a [nextChange] field which
  * creates a single linked list of all of the changes for efficient traversal.
  */
-class DirtyCheckingRecord<H> implements Record<H>, WatchRecord<H> {
+class DirtyCheckingRecord<H> implements WatchRecord<H> {
   static const List<String> _MODE_NAMES =
       const ['MARKER', 'IDENT', 'GETTER', 'MAP[]', 'ITERABLE', 'MAP'];
   static const int _MODE_MARKER_ = 0;
@@ -456,6 +457,19 @@ class DirtyCheckingRecord<H> implements Record<H>, WatchRecord<H> {
       return;
     }
 
+    while (obj is LocalContext) {
+      var ctx = obj as LocalContext;
+      if (ctx.hasProperty(field)) {
+        _object = obj;
+        _mode =  _MODE_MAP_FIELD_;
+        _getter = null;
+        return;
+      }
+      obj = ctx.parent;
+    }
+
+    if (obj == null) throw "$field property does not exist on $_object";
+
     if (obj is Map) {
       _mode =  _MODE_MAP_FIELD_;
       _getter = null;

lib/change_detection/prototype_map.dart

@@ -1,37 +1,27 @@
 part of angular.watch_group;
 
-class PrototypeMap<K, V> implements Map<K,V> {
-  final Map<K, V> prototype;
-  final Map<K, V> self = new Map();
+// todo(vicb) rename to ContextLocals + rename the file
+class LocalContext {
+  // todo(vicb) _parentContext
+  final Object parent;
+  final Map _locals = <String, Object>{};
 
-  PrototypeMap(this.prototype);
-
-  void operator []=(name, value) {
-    self[name] = value;
+  LocalContext(this.parent, [Map<String, Object> locals = null]) {
+    if (locals != null) _locals.addAll(locals);
+    _locals[r'$parent'] = parent;
   }
-  V operator [](name) => self.containsKey(name) ? self[name] : prototype[name];
 
-  bool get isEmpty => self.isEmpty && prototype.isEmpty;
-  bool get isNotEmpty => self.isNotEmpty || prototype.isNotEmpty;
-  // todo(vbe) include prototype keys ?
-  Iterable<K> get keys => self.keys;
-  // todo(vbe) include prototype values ?
-  Iterable<V> get values => self.values;
-  int get length => self.length;
+  static LocalContext wrapper(context, Map<String, Object> locals) =>
+      new LocalContext(context, locals);
+
+  bool hasProperty(String prop) => _locals.containsKey(prop);
 
-  void forEach(fn) {
-    // todo(vbe) include prototype ?
-    self.forEach(fn);
+  void operator[]=(String prop, value) {
+    _locals[prop] = value;
   }
-  V remove(key) => self.remove(key);
-  clear() => self.clear;
-  // todo(vbe) include prototype ?
-  bool containsKey(key) => self.containsKey(key);
-  // todo(vbe) include prototype ?
-  bool containsValue(key) => self.containsValue(key);
-  void addAll(map) {
-    self.addAll(map);
+
+  dynamic operator[](String prop) {
+    assert(hasProperty(prop));
+    return _locals[prop];
   }
-  // todo(vbe) include prototype ?
-  V putIfAbsent(key, fn) => self.putIfAbsent(key, fn);
 }

lib/change_detection/watch_group.dart

@@ -15,8 +15,10 @@ part 'prototype_map.dart';
  * * [value]: The current value of the watched expression.
  * * [previousValue]: The previous value of the watched expression.
  *
- * If the expression is watching a collection (a list or a map), then [value] is wrapped in
- * a [CollectionChangeItem] that lists all the changes.
+ * Notes:
+ *
+ * * [value] is a [CollectionChangeRecord] when a Collection is being watched
+ * * [value] is a [MapChangeRecord] when a [Map] is being watched
  */
 typedef void ReactionFn(value, previousValue);
 typedef void ChangeLog(String expression, current, previous);

lib/core/module.dart

@@ -63,8 +63,8 @@ export "package:angular/core/module_internal.dart" show
     ExceptionHandler,
     Interpolate,
     VmTurnZone,
-    PrototypeMap,
     RootScope,
+    LocalContext,
     Scope,
     ScopeDigestTTL,
     ScopeEvent,

lib/core/scope.dart

@@ -138,7 +138,16 @@ class Scope {
   /**
    * The default execution context for [watch]es [observe]ers, and [eval]uation.
    */
-  final context;
+  // todo(vicb) was final
+  var _context;
+
+  get context => _context;
+  set context(ctx) {
+
+    print("scope: setting context to $ctx");
+    _context = ctx;
+
+  }
 
   /**
    * The [RootScope] of the application.
@@ -184,9 +193,12 @@ class Scope {
   /// Do not use. Exposes internal state for testing.
   bool get hasOwnStreams => _streams != null  && _streams._scope == this;
 
-  Scope(Object this.context, this.rootScope, this._parentScope,
+  // todo(vicb) this.context
+  Scope(Object _context, this.rootScope, this._parentScope,
         this._readWriteGroup, this._readOnlyGroup, this.id,
-        this._stats);
+        this._stats) {
+    context = _context;
+  }
 
   /**
    * Use [watch] to set up change detection on an expression.
@@ -206,7 +218,7 @@ class Scope {
    *   by reference. When watching a collection, the reaction function receives a
    *   [CollectionChangeItem] that lists all the changes.
    */
-  Watch watch(String expression, ReactionFn reactionFn,  {context,
+  Watch watch(String expression, ReactionFn reactionFn, {context,
       FormatterMap formatters, bool canChangeModel: true, bool collection: false}) {
     assert(isAttached);
     assert(expression is String);
@@ -246,8 +258,8 @@ class Scope {
            expression is String ||
            expression is Function);
     if (expression is String && expression.isNotEmpty) {
-      var obj = locals == null ? context : new ScopeLocals(context, locals);
-      return rootScope._parser(expression).eval(obj);
+      var ctx = locals == null ? context : new LocalContext(context, locals);
+      return rootScope._parser(expression).eval(ctx);
     }
 
     assert(locals == null);
@@ -323,7 +335,7 @@ class Scope {
     _parentScope = null;
   }
 
-  _assertInternalStateConsistency() {
+  void _assertInternalStateConsistency() {
     assert((() {
       rootScope._verifyStreams(null, '', []);
       return true;
@@ -360,7 +372,7 @@ class Scope {
   }
 }
 
-_mapEqual(Map a, Map b) => a.length == b.length &&
+bool _mapEqual(Map a, Map b) => a.length == b.length &&
     a.keys.every((k) => b.containsKey(k) && a[k] == b[k]);
 
 /**
@@ -401,7 +413,7 @@ class ScopeStats {
       processStopwatch.elapsedMicroseconds;
   }
 
-  _stopwatchReset() {
+  void _stopwatchReset() {
     fieldStopwatch.reset();
     evalStopwatch.reset();
     processStopwatch.reset();
@@ -466,9 +478,9 @@ class ScopeStatsEmitter {
 
   static pad(String str, int size) => _PAD_.substring(0, max(size - str.length, 0)) + str;
 
-  _ms(num value) => '${pad(_nfDec.format(value), 9)} ms';
-  _us(num value) => _ms(value / 1000);
-  _tally(num value) => '${pad(_nfInt.format(value), 6)}';
+  String _ms(num value) => '${pad(_nfDec.format(value), 9)} ms';
+  String _us(num value) => _ms(value / 1000);
+  String _tally(num value) => '${pad(_nfInt.format(value), 6)}';
 
   /**
    * Emit a message based on the phase and state of stopwatches.
@@ -492,9 +504,8 @@ class ScopeStatsEmitter {
     return (prefix == '1' ? _HEADER_ : '')  + '     #$prefix:';
   }
 
-  String _stat(AvgStopwatch s) {
-    return '${_tally(s.count)} / ${_us(s.elapsedMicroseconds)} @(${_tally(s.ratePerMs)} #/ms)';
-  }
+  String _stat(AvgStopwatch s) =>
+      '${_tally(s.count)} / ${_us(s.elapsedMicroseconds)} @(${_tally(s.ratePerMs)} #/ms)';
 }
 
 /**
@@ -505,6 +516,7 @@ class ScopeStatsConfig {
   var emit = false;
 
   ScopeStatsConfig();
+
   ScopeStatsConfig.enabled() {
     emit = true;
   }
@@ -570,8 +582,8 @@ class RootScope extends Scope {
    * followed by change detection
    * on non-DOM listeners. Any changes detected are process using the reaction function. The digest
    * phase is repeated as long as at least one change has been detected. By default, after 5
-   * iterations the model is considered unstable and angular exists with an exception. (See
-   * ScopeDigestTTL)
+   * iterations the model is considered unstable and angular exits with an exception. (See
+   * [ScopeDigestTTL])
    *
    * ##flush
    *

lib/core_dom/common.dart

@@ -39,7 +39,8 @@ Injector forceNewDirectivesAndFormatters(Injector injector, List<Module> modules
   modules.add(new Module()
       ..bind(Scope, toFactory: (i) {
         var scope = i.parent.get(Scope);
-        return scope.createChild(new PrototypeMap(scope.context));
+        //todo(vicb)
+        return scope.createChild(scope.context);
       }));
 
   return injector.createChild(modules,

lib/core_dom/element_binder.dart

@@ -200,13 +200,16 @@ class ElementBinder {
         probe.directives.add(controller);
         assert((linkMapTimer = _perf.startTimer('ng.view.link.map', ref.type)) != false);
 
+
         if (ref.annotation is Controller) {
-          scope.context[(ref.annotation as Controller).publishAs] = controller;
+          // todo(vicb)
+          print("_link context = $controller");
+          scope.context = controller;
         }
 
-        var tasks = new _TaskList(controller is AttachAware ? () {
-          if (scope.isAttached) controller.attach();
-        } : null);
+        var tasks = new _TaskList(controller is AttachAware ?
+            () {if (scope.isAttached) controller.attach();} :
+            null);
 
         if (ref.mappings.isNotEmpty) {
           if (nodeAttrs == null) nodeAttrs = new _AnchorAttrs(ref);
@@ -302,16 +305,16 @@ class ElementBinder {
 
       directiveRefs.forEach((DirectiveRef ref) {
         Directive annotation = ref.annotation;
-        var visibility = ref.annotation.visibility;
-        if (ref.annotation is Controller) {
-          scope = scope.createChild(new PrototypeMap(scope.context));
+        if (annotation is Controller) {
+          //todo(vicb)
+          scope = scope.createChild(scope.context);
           nodeModule.bind(Scope, toValue: scope);
         }
 
         _createDirectiveFactories(ref, nodeModule, node, nodesAttrsDirectives, nodeAttrs,
-            visibility);
-        if (ref.annotation.module != null) {
-           nodeModule.install(ref.annotation.module());
+            annotation.visibility);
+        if (annotation.module != null) {
+           nodeModule.install(annotation.module());
         }
       });
 

lib/core_dom/module_internal.dart

@@ -13,7 +13,8 @@ import 'package:angular/core/module_internal.dart';
 import 'package:angular/core/parser/parser.dart';
 import 'package:angular/core_dom/dom_util.dart' as util;
 
-import 'package:angular/change_detection/watch_group.dart' show Watch, PrototypeMap;
+// todo vicb
+import 'package:angular/change_detection/watch_group.dart' show Watch, LocalContext;
 import 'package:angular/core/registry.dart';
 
 import 'package:angular/directive/module.dart' show NgBaseCss;
@@ -62,7 +63,7 @@ class CoreDomModule extends Module {
     bind(TranscludingComponentFactory);
     bind(Content);
     bind(ContentPort, toValue: null);
-    
+
     bind(Http);
     bind(UrlRewriter);
     bind(HttpBackend);

lib/core_dom/mustache.dart

@@ -12,13 +12,16 @@ class TextMustache {
                           FormatterMap formatters) {
     String expression = interpolate(template);
 
+    print('Mustache: watching $expression');
+
     scope.watch(expression,
                 _updateMarkup,
                 canChangeModel: false,
                 formatters: formatters);
   }
 
   void _updateMarkup(text, previousText) {
+    print('Mustache: changed $previousText -> $text');
     _element.text = text;
   }
 }

lib/core_dom/shadow_dom_component_factory.dart

@@ -35,19 +35,19 @@ class ShadowDomComponentFactory implements ComponentFactory {
   FactoryFn call(dom.Node node, DirectiveRef ref) {
     return (Injector injector) {
         var component = ref.annotation as Component;
-        Scope scope = injector.get(Scope);
-        ViewCache viewCache = injector.get(ViewCache);
-        Http http = injector.get(Http);
-        TemplateCache templateCache = injector.get(TemplateCache);
-        DirectiveMap directives = injector.get(DirectiveMap);
-        NgBaseCss baseCss = injector.get(NgBaseCss);
+        final scope = injector.get(Scope);
+        final viewCache = injector.get(ViewCache);
+        final http = injector.get(Http);
+        final templateCache = injector.get(TemplateCache);
+        final directives = injector.get(DirectiveMap);
+        final baseCss = injector.get(NgBaseCss);
         // This is a bit of a hack since we are returning different type then we are.
         var componentFactory = new _ComponentFactory(node, ref.type, component,
             injector.get(dom.NodeTreeSanitizer), _expando, baseCss, _styleElementCache);
         var controller = componentFactory.call(injector, scope, viewCache, http, templateCache,
             directives);
 
-        componentFactory.shadowScope.context[component.publishAs] = controller;
+        componentFactory.shadowScope.context = controller;
         return controller;
       };
   }

lib/core_dom/transcluding_component_factory.dart

@@ -114,7 +114,7 @@ class TranscludingComponentFactory implements ComponentFactory {
       childInjector = injector.createChild([childModule], name: SHADOW_DOM_INJECTOR_NAME);
 
       var controller = childInjector.get(ref.type);
-      shadowScope.context[component.publishAs] = controller;
+      shadowScope.context = controller;
       ComponentFactory._setupOnShadowDomAttach(controller, templateLoader, shadowScope);
       return controller;
     };