minors

Author: vicb

lib/core/annotation_src.dart

@@ -300,14 +300,6 @@ class Component extends Directive {
   }
   final bool _resetStyleInheritance;
 
-  /**
-   * An expression under which the component's controller instance will be
-   * published into. This allows the expressions in the template to be referring
-   * to controller instance and its properties.
-   */
-  @deprecated
-  final String publishAs;
-
   /**
    * If set to true, this component will always use shadow DOM.
    * If set to false, this component will never use shadow DOM.
@@ -321,7 +313,6 @@ class Component extends Directive {
     cssUrl,
     applyAuthorStyles,
     resetStyleInheritance,
-    this.publishAs,
     module,
     map,
     selector,
@@ -351,7 +342,6 @@ class Component extends Directive {
           cssUrl: cssUrls,
           applyAuthorStyles: applyAuthorStyles,
           resetStyleInheritance: resetStyleInheritance,
-          publishAs: publishAs,
           map: newMap,
           module: module,
           selector: selector,
@@ -420,16 +410,8 @@ class Decorator extends Directive {
  */
 @deprecated
 class Controller extends Decorator {
-  /**
-   * An expression under which the controller instance will be published into.
-   * This allows the expressions in the template to be referring to controller
-   * instance and its properties.
-   */
-  final String publishAs;
-
   const Controller({
                     children: Directive.COMPILE_CHILDREN,
-                    this.publishAs,
                     map,
                     module,
                     selector,
@@ -448,7 +430,6 @@ class Controller extends Decorator {
   Directive _cloneWithNewMap(newMap) =>
       new Controller(
           children: children,
-          publishAs: publishAs,
           module: module,
           map: newMap,
           selector: selector,

test/core/annotation_src_spec.dart

@@ -39,7 +39,6 @@ void main() => describe('annotations', () {
         cssUrl: [''],
         applyAuthorStyles: true,
         resetStyleInheritance: true,
-        publishAs: '',
         module: (){},
         map: {},
         selector: '',
@@ -80,7 +79,6 @@ void main() => describe('annotations', () {
   describe('controller', () {
     it('should set all fields on clone when all the fields are set', () {
       var controller = new Controller(
-          publishAs: '',
           children: 'xxx',
           map: {},
           selector: '',

test/core/core_directive_spec.dart

@@ -23,7 +23,6 @@ void main() {
       expect(annotation.template).toEqual('template');
       expect(annotation.templateUrl).toEqual('templateUrl');
       expect(annotation.cssUrls).toEqual(['cssUrls']);
-      expect(annotation.publishAs).toEqual('ctrl');
       expect(annotation.map).toEqual({
           'foo': '=>foo',
           'attr': '@attr',
@@ -104,15 +103,14 @@ class NullParser implements Parser {
     template: 'template',
     templateUrl: 'templateUrl',
     cssUrl: const ['cssUrls'],
-    publishAs: 'ctrl',
     module: AnnotatedIoComponent.module,
     visibility: Directive.LOCAL_VISIBILITY,
     exportExpressions: const ['exportExpressions'],
-    map: const {
-      'foo': '=>foo'
-    })
+    map: const {'foo': '=>foo'})
 class AnnotatedIoComponent {
-  static module() => new Module()..bind(String, toFactory: (i) => i.get(AnnotatedIoComponent),
+  static module() => new Module()..bind(
+      String,
+      toFactory: (i) => i.get(AnnotatedIoComponent),
       visibility: Directive.LOCAL_VISIBILITY);
 
   AnnotatedIoComponent(Scope scope) {

test/core_dom/compiler_spec.dart

@@ -758,18 +758,12 @@ void main() {
 }
 
 
-@Controller(
-  selector: '[my-parent-controller]',
-  publishAs: 'my_parent')
+@Controller(selector: '[my-parent-controller]')
 class MyParentController {
-  data() {
-    return "my data";
-  }
+  String data() => "my data";
 }
 
-@Controller(
-  selector: '[my-child-controller]',
-  publishAs: 'my_child')
+@Controller(selector: '[my-child-controller]')
 class MyChildController {}
 
 @Component(
@@ -882,8 +876,7 @@ class SimpleComponent {
 @Component(
   selector: 'shadowy',
   template: r'With shadow DOM',
-  useShadowDom: true
-)
+  useShadowDom: true)
 class ShadowyComponent {
   ShadowyComponent(Logger log) {
     log('shadowy');
@@ -893,8 +886,7 @@ class ShadowyComponent {
 @Component(
     selector: 'shadowless',
     template: r'Without shadow DOM',
-    useShadowDom: false
-)
+    useShadowDom: false)
 class ShadowlessComponent {
   ShadowlessComponent(Logger log) {
     log('shadowless');
@@ -903,13 +895,13 @@ class ShadowlessComponent {
 
 @Component(
   selector: 'sometimes',
-  template: r'<div ng-if="ctrl.sometimes"><content></content></div>',
-  publishAs: 'ctrl')
+  template: r'<div ng-if="sometimes"><content></content></div>')
 class SometimesComponent {
   @NgTwoWay('sometimes')
   var sometimes;
 }
 
+// todo(vicb)
 @Component(
     selector: 'io',
     template: r'<content></content>',
@@ -920,8 +912,7 @@ class SometimesComponent {
     })
 class IoComponent {
   Scope scope;
-  IoComponent(Scope scope) {
-    this.scope = scope;
+  IoComponent(this.scope) {
     scope.rootScope.context['ioComponent'] = this;
     scope.context['expr'] = 'initialExpr';
   }
@@ -930,7 +921,6 @@ class IoComponent {
 @Component(
     selector: 'io-controller',
     template: r'<content></content>',
-    publishAs: 'ctrl',
     map: const {
         'attr': '@attr',
         'expr': '<=>expr',
@@ -945,8 +935,7 @@ class IoControllerComponent {
   var exprOnce;
   var onDone;
   var onOptional;
-  IoControllerComponent(Scope scope) {
-    this.scope = scope;
+  IoControllerComponent(this.scope) {
     scope.rootScope.context['ioComponent'] = this;
   }
 }
@@ -1010,24 +999,20 @@ class ParentExpressionComponent {
 
 @Component(
     selector: 'publish-me',
-    template: r'{{ctrlName.value}}',
-    publishAs: 'ctrlName')
+    template: r'{{ctrlName.value}}')
 class PublishMeComponent {
   String value = 'WORKED';
 }
 
-@Controller (
-    selector: '[publish-me]',
-    publishAs: 'ctrlName')
+@Controller (selector: '[publish-me]')
 class PublishMeDirective {
   String value = 'WORKED';
 }
 
 
 @Component(
     selector: 'log',
-    template: r'<content></content>',
-    publishAs: 'ctrlName')
+    template: r'<content></content>')
 class LogComponent {
   LogComponent(Scope scope, Logger logger) {
     logger(scope);
@@ -1058,17 +1043,17 @@ class AttachDetachComponent implements AttachAware, DetachAware, ShadowRootAware
     templateLoader.template.then((_) => logger('templateLoaded'));
   }
 
-  attach() => logger('attach:@$attrValue; =>$exprValue; =>!$onceValue');
-  detach() => logger('detach');
-  onShadowRoot(shadowRoot) {
+  void attach() => logger('attach:@$attrValue; =>$exprValue; =>!$onceValue');
+
+  void detach() => logger('detach');
+
+  void onShadowRoot(shadowRoot) {
     scope.rootScope.context['shadowRoot'] = shadowRoot;
     logger(shadowRoot);
   }
 }
 
-@Controller(
-    selector: '[my-controller]',
-    publishAs: 'myCtrl')
+@Controller(selector: '[my-controller]')
 class MyController {
   MyController(Scope scope) {
     scope.context['name'] = 'MyController';
@@ -1083,15 +1068,12 @@ class InvalidSelector {}
 
 @Formatter(name:'hello')
 class SayHelloFormatter {
-  call(String str) {
-    return 'Hello, $str!';
-  }
+  String call(String str) => 'Hello, $str!';
 }
 
 @Component(
     selector: 'expr-attr-component',
     template: r'<content></content>',
-    publishAs: 'ctrl',
     map: const {
         'expr': '<=>expr',
         'one-way': '=>oneWay',
@@ -1115,16 +1097,16 @@ class SimpleAttachComponent implements AttachAware, ShadowRootAware {
   SimpleAttachComponent(this.logger) {
     logger('SimpleAttachComponent');
   }
-  attach() => logger('attach');
-  onShadowRoot(_) => logger('onShadowRoot');
+  void attach() => logger('attach');
+  void onShadowRoot(_) => logger('onShadowRoot');
 }
 
 @Component(
     selector: 'log-element',
     templateUrl: 'foo.html')
 class LogElementComponent{
   LogElementComponent(Logger logger, Element element, Node node,
-                        ShadowRoot shadowRoot) {
+                      ShadowRoot shadowRoot) {
     logger(element);
     logger(node);
     logger(shadowRoot);

test/core_dom/event_handler_spec.dart

@@ -2,7 +2,7 @@ library event_handler_spec;
 
 import '../_specs.dart';
 
-@Controller(selector: '[foo]', publishAs: 'ctrl')
+@Controller(selector: '[foo]')
 class FooController {
   var description = "desc";
   var invoked = false;
@@ -11,14 +11,14 @@ class FooController {
 @Component(selector: 'bar',
     template: '''
               <div>
-                <span on-abc="ctrl.invoked=true;"></span>
+                <span on-abc="invoked=true;"></span>
                 <content></content>
               </div>
-              ''',
-    publishAs: 'ctrl')
+              ''')
 class BarComponent {
   var invoked = false;
   BarComponent(RootScope scope) {
+    // todo(vicb)
     scope.context['ctrl'] = this;
   }
 }
@@ -58,7 +58,7 @@ main() {
     it('shoud register and handle event with long name', inject((TestBed _) {
       var e = compile(_,
         '''<div foo>
-          <div on-my-new-event="ctrl.invoked=true;"></div>
+          <div on-my-new-event="invoked=true;"></div>
         </div>''');
 
       _.triggerEvent(e.querySelector('[on-my-new-event]'), 'myNewEvent');
@@ -69,7 +69,7 @@ main() {
     it('shoud have model updates applied correctly', inject((TestBed _) {
       var e = compile(_,
         '''<div foo>
-          <div on-abc='ctrl.description="new description";'>{{ctrl.description}}</div>
+          <div on-abc='description="new description";'>{{description}}</div>
         </div>''');
       var el = document.querySelector('[on-abc]');
       el.dispatchEvent(new Event('abc'));
@@ -93,7 +93,7 @@ main() {
       var e = compile(_,
         '''<div foo>
              <bar>
-               <div on-abc="ctrl.invoked=true;"></div>
+               <div on-abc="invoked=true;"></div>
              </bar>
            </div>''');