From d260a05a7de8eb90af5166cd4d4c99d4f29b7bda Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Tue, 13 Oct 2015 17:43:15 -0700
Subject: [PATCH] fix(compiler): explicitly support event bindings also on
 `<template>` elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although these events don’t fire events themselves, there might be directives on them that fire events.
---
 .../src/core/compiler/template_parser.ts      | 21 +++++++++++----
 .../core/compiler/template_parser_spec.ts     | 19 ++++++++++---
 .../test/core/linker/integration_spec.ts      | 27 ++++++++++++++++++-
 3 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/modules/angular2/src/core/compiler/template_parser.ts b/modules/angular2/src/core/compiler/template_parser.ts
index c68991f962f6..31faf8cac41a 100644
--- a/modules/angular2/src/core/compiler/template_parser.ts
+++ b/modules/angular2/src/core/compiler/template_parser.ts
@@ -212,7 +212,8 @@ class TemplateParseVisitor implements HtmlAstVisitor {
       parsedElement =
           new NgContentAst(this.ngContentCount++, elementNgContentIndex, element.sourceInfo);
     } else if (isTemplateElement) {
-      this._assertNoComponentsNorElementBindingsOnTemplate(directives, elementProps, events,
+      this._assertAllEventsPublishedByDirectives(directives, events, element.sourceInfo);
+      this._assertNoComponentsNorElementBindingsOnTemplate(directives, elementProps,
                                                            element.sourceInfo);
       parsedElement = new EmbeddedTemplateAst(attrs, vars, directives, children,
                                               elementNgContentIndex, element.sourceInfo);
@@ -231,7 +232,7 @@ class TemplateParseVisitor implements HtmlAstVisitor {
       var templateElementProps: BoundElementPropertyAst[] = this._createElementPropertyAsts(
           element.name, templateElementOrDirectiveProps, templateDirectives);
       this._assertNoComponentsNorElementBindingsOnTemplate(templateDirectives, templateElementProps,
-                                                           [], element.sourceInfo);
+                                                           element.sourceInfo);
       parsedElement = new EmbeddedTemplateAst([], templateVars, templateDirectives, [parsedElement],
                                               component.findNgContentIndex(templateCssSelector),
                                               element.sourceInfo);
@@ -559,7 +560,6 @@ class TemplateParseVisitor implements HtmlAstVisitor {
 
   private _assertNoComponentsNorElementBindingsOnTemplate(directives: DirectiveAst[],
                                                           elementProps: BoundElementPropertyAst[],
-                                                          events: BoundEventAst[],
                                                           sourceInfo: string) {
     var componentTypeNames: string[] = this._findComponentDirectiveNames(directives);
     if (componentTypeNames.length > 0) {
@@ -570,9 +570,20 @@ class TemplateParseVisitor implements HtmlAstVisitor {
       this._reportError(
           `Property binding ${prop.name} not used by any directive on an embedded template in ${prop.sourceInfo}`);
     });
+  }
+
+  private _assertAllEventsPublishedByDirectives(directives: DirectiveAst[], events: BoundEventAst[],
+                                                sourceInfo: string) {
+    var allDirectiveEvents = new Set<string>();
+    directives.forEach(directive => {
+      StringMapWrapper.forEach(directive.directive.outputs,
+                               (eventName, _) => { allDirectiveEvents.add(eventName); });
+    });
     events.forEach(event => {
-      this._reportError(
-          `Event binding ${event.name} on an embedded template in ${event.sourceInfo}`);
+      if (isPresent(event.target) || !SetWrapper.has(allDirectiveEvents, event.name)) {
+        this._reportError(
+            `Event binding ${event.fullName} not emitted by any directive on an embedded template in ${sourceInfo}`);
+      }
     });
   }
 }
diff --git a/modules/angular2/test/core/compiler/template_parser_spec.ts b/modules/angular2/test/core/compiler/template_parser_spec.ts
index 37ec67711f01..82bf8ebe882c 100644
--- a/modules/angular2/test/core/compiler/template_parser_spec.ts
+++ b/modules/angular2/test/core/compiler/template_parser_spec.ts
@@ -267,6 +267,19 @@ export function main() {
               ]);
         });
 
+        it('should allow events on explicit embedded templates that are emitted by a directive',
+           () => {
+             var dirA = CompileDirectiveMetadata.create({
+               selector: 'template',
+               outputs: ['e'],
+               type: new CompileTypeMetadata({name: 'DirA'})
+             });
+             expect(humanizeTemplateAsts(parse('<template (e)="f"></template>', [dirA])))
+                 .toEqual([
+                   [EmbeddedTemplateAst, 'TestComp > template:nth-child(0)'],
+                   [DirectiveAst, dirA, 'TestComp > template:nth-child(0)'],
+                 ]);
+           });
       });
 
       describe('bindon', () => {
@@ -804,7 +817,7 @@ Parser Error: Unexpected token 'b' at column 3 in [a b] in TestComp > div:nth-ch
 More than one component: DirB,DirA in TestComp > div:nth-child(0)`);
       });
 
-      it('should not allow components or element nor event bindings on explicit embedded templates',
+      it('should not allow components or element bindings nor dom events on explicit embedded templates',
          () => {
            var dirA = CompileDirectiveMetadata.create({
              selector: '[a]',
@@ -814,9 +827,9 @@ More than one component: DirB,DirA in TestComp > div:nth-child(0)`);
            });
            expect(() => parse('<template [a]="b" (e)="f"></template>', [dirA]))
                .toThrowError(`Template parse errors:
+Event binding e not emitted by any directive on an embedded template in TestComp > template:nth-child(0)
 Components on an embedded template: DirA in TestComp > template:nth-child(0)
-Property binding a not used by any directive on an embedded template in TestComp > template:nth-child(0)[[a]=b]
-Event binding e on an embedded template in TestComp > template:nth-child(0)[(e)=f]`);
+Property binding a not used by any directive on an embedded template in TestComp > template:nth-child(0)[[a]=b]`);
          });
 
       it('should not allow components or element bindings on inline embedded templates', () => {
diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts
index d7b3c8901da9..af984b6d73e4 100644
--- a/modules/angular2/test/core/linker/integration_spec.ts
+++ b/modules/angular2/test/core/linker/integration_spec.ts
@@ -800,7 +800,7 @@ export function main() {
                });
          }));
 
-      it('should support events via EventEmitter',
+      it('should support events via EventEmitter on regular elements',
          inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
            tcb.overrideView(MyComp, new ViewMetadata({
                               template: '<div emitter listener></div>',
@@ -825,6 +825,31 @@ export function main() {
                });
          }));
 
+      it('should support events via EventEmitter on template elements',
+         inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
+           tcb.overrideView(MyComp, new ViewMetadata({
+                              template: '<template emitter listener></template>',
+                              directives: [DirectiveEmitingEvent, DirectiveListeningEvent]
+                            }))
+
+               .createAsync(MyComp)
+               .then((rootTC) => {
+
+                 var tc = rootTC.debugElement.componentViewChildren[0];
+                 var emitter = tc.inject(DirectiveEmitingEvent);
+                 var listener = tc.inject(DirectiveListeningEvent);
+
+                 expect(listener.msg).toEqual('');
+
+                 ObservableWrapper.subscribe(emitter.event, (_) => {
+                   expect(listener.msg).toEqual('fired !');
+                   async.done();
+                 });
+
+                 emitter.fireEvent('fired !');
+               });
+         }));
+
       it('should support [()] syntax',
          inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
            tcb.overrideView(MyComp, new ViewMetadata({