0f774df fix(compiler): project using the right directive as component.

tbosch · tbosch · commit 409b6304b38f · 2016-04-30T03:04:37.000Z
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Sat Apr 30 01:44:32 UTC 2016
-5ff31f0713554440ccc91a57d7b52d7209096a10
+Sat Apr 30 03:04:37 UTC 2016
+0f774df81150524c399161272a6cd51d0d54aa7e
diff --git a/lib/src/compiler/identifiers.dart b/lib/src/compiler/identifiers.dart
@@ -12,6 +12,8 @@ import "package:angular2/src/core/linker/view_utils.dart"
         interpolate,
         checkBinding,
         castByValue,
+        EMPTY_ARRAY,
+        EMPTY_MAP,
         pureProxy1,
         pureProxy2,
         pureProxy3,
@@ -84,6 +86,8 @@ var impDevModeEqual = devModeEqual;
 var impInterpolate = interpolate;
 var impCheckBinding = checkBinding;
 var impCastByValue = castByValue;
+var impEMPTY_ARRAY = EMPTY_ARRAY;
+var impEMPTY_MAP = EMPTY_MAP;
 
 class Identifiers {
   static var ViewUtils = new CompileIdentifierMetadata(
@@ -199,6 +203,14 @@ class Identifiers {
       name: "castByValue",
       moduleUrl: VIEW_UTILS_MODULE_URL,
       runtime: impCastByValue);
+  static var EMPTY_ARRAY = new CompileIdentifierMetadata(
+      name: "EMPTY_ARRAY",
+      moduleUrl: VIEW_UTILS_MODULE_URL,
+      runtime: impEMPTY_ARRAY);
+  static var EMPTY_MAP = new CompileIdentifierMetadata(
+      name: "EMPTY_MAP",
+      moduleUrl: VIEW_UTILS_MODULE_URL,
+      runtime: impEMPTY_MAP);
   static var pureProxies = [
     null,
     new CompileIdentifierMetadata(
diff --git a/lib/src/compiler/template_ast.dart b/lib/src/compiler/template_ast.dart
@@ -158,19 +158,6 @@ class ElementAst implements TemplateAst {
   dynamic visit(TemplateAstVisitor visitor, dynamic context) {
     return visitor.visitElement(this, context);
   }
-
-  /**
-   * Get the component associated with this element, if any.
-   */
-  CompileDirectiveMetadata getComponent() {
-    for (var i = 0; i < this.directives.length; i++) {
-      var dirAst = this.directives[i];
-      if (dirAst.directive.isComponent) {
-        return dirAst.directive;
-      }
-    }
-    return null;
-  }
 }
 
 /**
diff --git a/lib/src/compiler/template_parser.dart b/lib/src/compiler/template_parser.dart
@@ -1011,9 +1011,11 @@ class ElementContext {
       List<DirectiveAst> directives, ProviderElementContext providerContext) {
     var matcher = new SelectorMatcher();
     var wildcardNgContentIndex = null;
-    if (directives.length > 0 && directives[0].directive.isComponent) {
-      var ngContentSelectors =
-          directives[0].directive.template.ngContentSelectors;
+    var component = directives.firstWhere(
+        (directive) => directive.directive.isComponent,
+        orElse: () => null);
+    if (isPresent(component)) {
+      var ngContentSelectors = component.directive.template.ngContentSelectors;
       for (var i = 0; i < ngContentSelectors.length; i++) {
         var selector = ngContentSelectors[i];
         if (StringWrapper.equals(selector, "*")) {
diff --git a/lib/src/compiler/view_compiler/compile_element.dart b/lib/src/compiler/view_compiler/compile_element.dart
@@ -388,7 +388,8 @@ class CompileElement extends CompileNode {
           if (identical(requestingProviderType, ProviderAstType.Component)) {
             return this._compViewExpr.prop("ref");
           } else {
-            return o.THIS_EXPR.prop("ref");
+            return getPropertyInView(
+                o.THIS_EXPR.prop("ref"), this.view, this.view.componentView);
           }
         }
       }
diff --git a/lib/src/compiler/view_compiler/compile_pipe.dart b/lib/src/compiler/view_compiler/compile_pipe.dart
@@ -33,7 +33,8 @@ class CompilePipe {
     var deps = this.meta.type.diDeps.map((diDep) {
       if (diDep.token
           .equalsTo(identifierToken(Identifiers.ChangeDetectorRef))) {
-        return o.THIS_EXPR.prop("ref");
+        return getPropertyInView(
+            o.THIS_EXPR.prop("ref"), this.view, this.view.componentView);
       }
       return injectFromViewParentInjector(diDep.token, false);
     }).toList();
diff --git a/lib/src/compiler/view_compiler/compile_view.dart b/lib/src/compiler/view_compiler/compile_view.dart
@@ -27,6 +27,7 @@ import "util.dart"
         createPureProxy;
 import "../config.dart" show CompilerConfig;
 import "compile_binding.dart" show CompileBinding;
+import "../identifiers.dart" show Identifiers;
 
 class CompileView implements NameResolver {
   CompileDirectiveMetadata component;
@@ -159,6 +160,9 @@ class CompileView implements NameResolver {
   }
 
   o.Expression createLiteralArray(List<o.Expression> values) {
+    if (identical(values.length, 0)) {
+      return o.importExpr(Identifiers.EMPTY_ARRAY);
+    }
     var proxyExpr =
         o.THIS_EXPR.prop('''_arr_${ this . literalArrayCount ++}''');
     List<o.FnParam> proxyParams = [];
@@ -179,6 +183,9 @@ class CompileView implements NameResolver {
 
   o.Expression createLiteralMap(
       List<List<dynamic /* String | o . Expression */ >> entries) {
+    if (identical(entries.length, 0)) {
+      return o.importExpr(Identifiers.EMPTY_MAP);
+    }
     var proxyExpr = o.THIS_EXPR.prop('''_map_${ this . literalMapCount ++}''');
     List<o.FnParam> proxyParams = [];
     List<List<dynamic /* String | o . Expression */ >> proxyReturnEntries = [];
diff --git a/lib/src/compiler/view_compiler/event_binder.dart b/lib/src/compiler/view_compiler/event_binder.dart
@@ -103,12 +103,9 @@ class CompileEventListener {
   listenToRenderer() {
     var listenExpr;
     var eventListener = o.THIS_EXPR.callMethod("eventHandler", [
-      o.fn([
-        this._eventParam
-      ], [
-        new o.ReturnStatement(
-            o.THIS_EXPR.callMethod(this._methodName, [EventHandlerVars.event]))
-      ], o.BOOL_TYPE)
+      o.THIS_EXPR
+          .prop(this._methodName)
+          .callMethod(o.BuiltinMethod.bind, [o.THIS_EXPR])
     ]);
     if (isPresent(this.eventTarget)) {
       listenExpr = ViewProperties.renderer.callMethod("listenGlobal", [
@@ -136,12 +133,9 @@ class CompileEventListener {
         '''subscription_${ this . compileElement . view . subscriptions . length}''');
     this.compileElement.view.subscriptions.add(subscription);
     var eventListener = o.THIS_EXPR.callMethod("eventHandler", [
-      o.fn([
-        this._eventParam
-      ], [
-        o.THIS_EXPR
-            .callMethod(this._methodName, [EventHandlerVars.event]).toStmt()
-      ])
+      o.THIS_EXPR
+          .prop(this._methodName)
+          .callMethod(o.BuiltinMethod.bind, [o.THIS_EXPR])
     ]);
     this.compileElement.view.createMethod.addStmt(subscription
         .set(directiveInstance
diff --git a/lib/src/compiler/view_compiler/view_builder.dart b/lib/src/compiler/view_compiler/view_builder.dart
@@ -215,9 +215,10 @@ class ViewBuilderVisitor implements TemplateAstVisitor {
     this.view.createMethod.addStmt(
         o.THIS_EXPR.prop(fieldName).set(createRenderNodeExpr).toStmt());
     var renderNode = o.THIS_EXPR.prop(fieldName);
-    var component = ast.getComponent();
     var directives =
         ast.directives.map((directiveAst) => directiveAst.directive).toList();
+    var component = directives.firstWhere((directive) => directive.isComponent,
+        orElse: () => null);
     var htmlAttrs = _readHtmlAttrs(ast.attrs);
     var attrNameAndValues = _mergeHtmlAndDirectiveAttrs(htmlAttrs, directives);
     for (var i = 0; i < attrNameAndValues.length; i++) {
diff --git a/lib/src/core/linker/component_factory.dart b/lib/src/core/linker/component_factory.dart
@@ -92,7 +92,7 @@ class ComponentRef_ extends ComponentRef {
   }
 
   ChangeDetectorRef get changeDetectorRef {
-    return this.hostView;
+    return this._hostElement.parentView.ref;
   }
 
   Type get componentType {
diff --git a/lib/src/core/linker/view.dart b/lib/src/core/linker/view.dart
@@ -70,7 +70,6 @@ abstract class AppView<T> {
   List<dynamic> subscriptions;
   List<AppView<dynamic>> contentChildren = [];
   List<AppView<dynamic>> viewChildren = [];
-  AppView<dynamic> renderParent;
   AppElement viewContainerElement = null;
   // The names of the below fields must be kept in sync with codegen_name_util.ts or
 
@@ -136,7 +135,6 @@ abstract class AppView<T> {
 
       // in the ViewFactory already.
       this.declarationAppElement.parentView.viewChildren.add(this);
-      this.renderParent = this.declarationAppElement.parentView;
       this.dirtyParentQueriesInternal();
     }
   }
@@ -254,18 +252,6 @@ abstract class AppView<T> {
    * Overwritten by implementations
    */
   void dirtyParentQueriesInternal() {}
-  void addRenderContentChild(AppView<dynamic> view) {
-    this.contentChildren.add(view);
-    view.renderParent = this;
-    view.dirtyParentQueriesInternal();
-  }
-
-  void removeContentChild(AppView<dynamic> view) {
-    ListWrapper.remove(this.contentChildren, view);
-    view.dirtyParentQueriesInternal();
-    view.renderParent = null;
-  }
-
   void detectChanges(bool throwOnChange) {
     var s = _scope_check(this.clazz);
     if (identical(this.cdMode, ChangeDetectionStrategy.Detached) ||
@@ -324,7 +310,10 @@ abstract class AppView<T> {
       if (identical(c.cdMode, ChangeDetectionStrategy.Checked)) {
         c.cdMode = ChangeDetectionStrategy.CheckOnce;
       }
-      c = c.renderParent;
+      var parentEl = identical(c.type, ViewType.COMPONENT)
+          ? c.declarationAppElement
+          : c.viewContainerElement;
+      c = isPresent(parentEl) ? parentEl.parentView : null;
     }
   }
 
diff --git a/lib/src/core/linker/view_ref.dart b/lib/src/core/linker/view_ref.dart
@@ -7,14 +7,7 @@ import "view.dart" show AppView;
 import "package:angular2/src/core/change_detection/constants.dart"
     show ChangeDetectionStrategy;
 
-abstract class ViewRef extends ChangeDetectorRef {
-  /**
-   * @internal
-   */
-  ChangeDetectorRef get changeDetectorRef {
-    return (unimplemented() as ChangeDetectorRef);
-  }
-
+abstract class ViewRef {
   bool get destroyed {
     return (unimplemented() as bool);
   }
@@ -90,7 +83,7 @@ abstract class EmbeddedViewRef<C> extends ViewRef {
   destroy();
 }
 
-class ViewRef_<C> implements EmbeddedViewRef<C> {
+class ViewRef_<C> implements EmbeddedViewRef<C>, ChangeDetectorRef {
   AppView<C> _view;
   ViewRef_(this._view) {
     this._view = _view;
@@ -99,13 +92,6 @@ class ViewRef_<C> implements EmbeddedViewRef<C> {
     return this._view;
   }
 
-  /**
-   * Return `ChangeDetectorRef`
-   */
-  ChangeDetectorRef get changeDetectorRef {
-    return this;
-  }
-
   List<dynamic> get rootNodes {
     return this._view.flatRootNodes;
   }
diff --git a/lib/src/core/linker/view_utils.dart b/lib/src/core/linker/view_utils.dart
@@ -256,6 +256,8 @@ dynamic/*= T */ castByValue/*< T >*/(dynamic input, dynamic/*= T */ value) {
   return (input as dynamic/*= T */);
 }
 
+const EMPTY_ARRAY = const [];
+const EMPTY_MAP = const {};
 dynamic /* (p0: P0) => R */ pureProxy1/*< P0, R >*/(
     dynamic/*= R */ fn(dynamic/*= P0 */ p0)) {
   dynamic/*= R */ result;
diff --git a/test/compiler/template_parser_spec.dart b/test/compiler/template_parser_spec.dart
@@ -1093,6 +1093,13 @@ There is no directive with "exportAs" set to "dirA" ("<div [ERROR ->]#a="dirA"><
             template: new CompileTemplateMetadata(
                 ngContentSelectors: ngContentSelectors));
       }
+      CompileDirectiveMetadata createDir(String selector) {
+        return CompileDirectiveMetadata.create(
+            selector: selector,
+            type: new CompileTypeMetadata(
+                moduleUrl: someModuleUrl,
+                name: '''SomeDir${ compCounter ++}'''));
+      }
       describe("project text nodes", () {
         it("should project text nodes with wildcard selector", () {
           expect(humanizeContentProjection(parse("<div>hello</div>", [
@@ -1268,6 +1275,15 @@ There is no directive with "exportAs" set to "dirA" ("<div [ERROR ->]#a="dirA"><
           ]);
         });
       });
+      it("should support other directives before the component", () {
+        expect(humanizeContentProjection(parse("<div>hello</div>", [
+          createDir("div"),
+          createComp("div", ["*"])
+        ]))).toEqual([
+          ["div", null],
+          ["#text(hello)", 0]
+        ]);
+      });
     });
     describe("splitClasses", () {
       it("should keep an empty class", () {
diff --git a/test/core/linker/change_detection_integration_spec.dart b/test/core/linker/change_detection_integration_spec.dart
@@ -335,6 +335,11 @@ main() {
           [1, 2]
         ]);
       }));
+      it("should support empty literal array", fakeAsync(() {
+        var ctx = _bindSimpleValue("[]");
+        ctx.detectChanges(false);
+        expect(renderLog.loggedValues).toEqual([[]]);
+      }));
       it("should support literal array made of expressions", fakeAsync(() {
         var ctx = _bindSimpleValue("[1, a]", TestData);
         ctx.componentInstance.a = 2;
@@ -362,6 +367,11 @@ main() {
         ctx.detectChanges(false);
         expect(renderLog.loggedValues[0]["z"]).toEqual(1);
       }));
+      it("should support empty literal map", fakeAsync(() {
+        var ctx = _bindSimpleValue("{}");
+        ctx.detectChanges(false);
+        expect(renderLog.loggedValues).toEqual([{}]);
+      }));
       it("should support literal maps made of expressions", fakeAsync(() {
         var ctx = _bindSimpleValue("{z: a}");
         ctx.componentInstance.a = 1;
diff --git a/test/core/linker/integration_spec.dart b/test/core/linker/integration_spec.dart
@@ -871,13 +871,27 @@ declareTests(bool isJit) {
                           ]))
                   .createAsync(MyComp)
                   .then((fixture) {
-                var cmp = fixture.debugElement.children[0].references["cmp"];
-                fixture.debugElement.componentInstance.ctxProp = "one";
+                var cmpEl = fixture.debugElement.children[0];
+                var cmp = cmpEl.componentInstance;
+                fixture.detectChanges();
                 fixture.detectChanges();
                 expect(cmp.numberOfChecks).toEqual(1);
-                fixture.debugElement.componentInstance.ctxProp = "two";
+                cmpEl.children[0].triggerEventHandler("click", ({} as dynamic));
+                // regular element
+                fixture.detectChanges();
                 fixture.detectChanges();
                 expect(cmp.numberOfChecks).toEqual(2);
+                // element inside of an *ngIf
+                cmpEl.children[1].triggerEventHandler("click", ({} as dynamic));
+                fixture.detectChanges();
+                fixture.detectChanges();
+                expect(cmp.numberOfChecks).toEqual(3);
+                // element inside a nested component
+                cmpEl.children[2].children[0]
+                    .triggerEventHandler("click", ({} as dynamic));
+                fixture.detectChanges();
+                fixture.detectChanges();
+                expect(cmp.numberOfChecks).toEqual(4);
                 async.done();
               });
             }));
@@ -2139,18 +2153,26 @@ class DirectiveWithTitleAndHostProperty {
   String title;
 }
 
+@Component(selector: "event-cmp", template: "<div (click)=\"noop()\"></div>")
+class EventCmp {
+  noop() {}
+}
+
 @Component(
     selector: "push-cmp",
     inputs: const ["prop"],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    template: "{{field}}")
+    template:
+        "{{field}}<div (click)=\"noop()\"></div><div *ngIf=\"true\" (click)=\"noop()\"></div><event-cmp></event-cmp>",
+    directives: const [EventCmp, NgIf])
 @Injectable()
 class PushCmp {
   num numberOfChecks;
   var prop;
   PushCmp() {
     this.numberOfChecks = 0;
   }
+  noop() {}
   get field {
     this.numberOfChecks++;
     return "fixed";
diff --git a/test/core/linker/regression_integration_spec.dart b/test/core/linker/regression_integration_spec.dart
diff --git a/test/core/linker/view_injector_integration_spec.dart b/test/core/linker/view_injector_integration_spec.dart

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,8 @@ class CompileElement extends CompileNode {`
`388`	`388`	`if (identical(requestingProviderType, ProviderAstType.Component)) {`
`389`	`389`	`return this._compViewExpr.prop("ref");`
`390`	`390`	`} else {`
`391`		`- return o.THIS_EXPR.prop("ref");`
	`391`	`+ return getPropertyInView(`
	`392`	`+ o.THIS_EXPR.prop("ref"), this.view, this.view.componentView);`
`392`	`393`	`}`
`393`	`394`	`}`
`394`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class ComponentRef_ extends ComponentRef {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`ChangeDetectorRef get changeDetectorRef {`
`95`		`- return this.hostView;`
	`95`	`+ return this._hostElement.parentView.ref;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`Type get componentType {`