feat(directives): Custom inject for BlockLists

Author: jbdeboer

lib/block.dart

@@ -52,11 +52,11 @@ class BlockFactory {
                BlockListFactory this.$blockListFactory,
                Injector this.$injector);
 
-  call(List<dom.Node> blockNodeList, List directivePositions, List<BlockCache> blockCaches, String group) {
+  call(List<dom.Node> blockNodeList, List directivePositions, List<BlockCache> blockCaches, String group, {injector: null}) {
     ASSERT(blockNodeList != null);
     ASSERT(directivePositions != null);
     ASSERT(blockCaches != null);
-    return new Block($exceptionHandler, $blockListFactory, $injector,
+    return new Block($exceptionHandler, $blockListFactory, injector != null ? injector : $injector,
               blockNodeList, directivePositions, blockCaches, group);
   }
 }
@@ -191,6 +191,9 @@ class Block implements ElementWrapper {
             new DirectiveValue.fromString(directiveRef.value);
         locals[BlockList] = anchorsByName[directiveName];
 
+        if (locals[BlockList] != null)
+          locals[BlockList].customInjector = injector;
+
         Type directiveType = directiveRef.directive.type;
 
         try {

lib/block_list.dart

@@ -20,6 +20,7 @@ class BlockList extends ElementWrapper {
   List<dom.Node> elements;
   Map<String, BlockType> blockTypes;
   BlockCache blockCache;
+  Injector customInjector;
 
   ElementWrapper previous;
   ElementWrapper next;
@@ -49,7 +50,7 @@ class BlockList extends ElementWrapper {
         throw new ArgumentError("Unknown block type: '$type'.");
       }
 
-      block = this.blockTypes[type]();
+      block = this.blockTypes[type](null, null, customInjector);
     }
 
     return block;

lib/block_type.dart

@@ -25,14 +25,14 @@ class BlockType {
     ASSERT(group != null);
   }
 
-  Block call([List<dom.Node> elements, List<BlockCache> blockCaches]) {
-    if (!?elements) {
+  Block call([List<dom.Node> elements, List<BlockCache> blockCaches, Injector injector]) {
+    if (!?elements || elements == null) {
       elements = cloneElements(templateElements);
     }
     if (!?blockCaches || blockCaches == null) {
       blockCaches = [];
     }
-    return blockFactory(elements, directivePositions, blockCaches, group);
+    return blockFactory(elements, directivePositions, blockCaches, group, injector: injector);
   }
 
   ClassMirror _getClassMirror(Type type) {

test/compiler_spec.dart

@@ -37,6 +37,27 @@ class LocalAttrDirective {
   }
 }
 
+class SimpleTranscludeInAttachAttrDirective {
+  static String $transclude = '.';
+  static String $visibility = DirectiveVisibility.CHILDREN;
+
+  Log log;
+  BlockList blockList;
+
+  SimpleTranscludeInAttachAttrDirective(BlockList this.blockList, Log this.log);
+
+  attach(Scope scope) {
+    var block = blockList.newBlock();
+    block.insertAfter(blockList);
+    log('SimpleTransclude');
+  }
+}
+
+class IncludeTranscludeAttrDirective {
+  IncludeTranscludeAttrDirective(SimpleTranscludeInAttachAttrDirective simple, Log log) {
+    log('IncludeTransclude');
+  }
+}
 
 main() {
 
@@ -51,6 +72,8 @@ main() {
         ..register(NgRepeatAttrDirective)
         ..register(TabComponent)
         ..register(PaneComponent)
+        ..register(SimpleTranscludeInAttachAttrDirective)
+        ..register(IncludeTranscludeAttrDirective)
         ..register(LocalAttrDirective);
 
       $rootScope = injector.get(Scope);
@@ -508,6 +531,12 @@ main() {
         expect(log.result()).toEqual('TabComponent-0; LocalAttrDirective-0; PaneComponent-1; LocalAttrDirective-0; PaneComponent-2; LocalAttrDirective-0');
       }));
 
+      it('should reuse controllers for transclusions', inject((Compiler $compile, Scope $rootScope, Log log) {
+        var element = $('<div simple-transclude-in-attach include-transclude>block</div>');
+        $compile(element)(element)..attach($rootScope);
+        expect(log.result()).toEqual('IncludeTransclude; SimpleTransclude');
+      }));
+
       it('should throw an exception if required directive is missing', inject((Compiler $compile, Scope $rootScope) {
         expect(() {
           var element = $('<tab local><pane></pane><pane local></pane></tab>');