CommandTriggerBuilder should request new reflection process for module and injector annotated properties.

Author: FrancisBourre

src/hex/control/trigger/CommandTriggerBuilder.hx

@@ -34,16 +34,16 @@ class CommandTriggerBuilder
 
 	macro static public function build() : Array<Field> 
 	{
-		var fields 					= Context.getBuildFields();
+		var fields = Context.getBuildFields();
 
 		if ( Context.getLocalClass().get().isInterface )
 		{
 			return fields;
 		}
 
-		var CommandClassType 		= MacroUtil.getClassType( Type.getClassName( Command ) );
-		var MacroCommandClassType 	= MacroUtil.getClassType( Type.getClassName( MacroCommand ) );
-		var IContextModuleClassType 	= MacroUtil.getClassType( Type.getClassName( IContextModule ) );
+		var CommandClassType 				= MacroUtil.getClassType( Type.getClassName( Command ) );
+		var MacroCommandClassType 			= MacroUtil.getClassType( Type.getClassName( MacroCommand ) );
+		var IContextModuleClassType 		= MacroUtil.getClassType( Type.getClassName( IContextModule ) );
 		var IDependencyInjectorClassType 	= MacroUtil.getClassType( Type.getClassName( IDependencyInjector ) );
 
 		for ( f in fields )
@@ -107,7 +107,6 @@ class CommandTriggerBuilder
 								"' annotation) to '" + f.name + "' method in '" + className + "' class", command.pos );
 						}
 
-
 						var typePath = MacroUtil.getTypePath( command.name, command.pos );
 
 						if ( !MacroUtil.isSubClassOf( MacroUtil.getClassType( command.name ), CommandClassType ) )
@@ -116,7 +115,6 @@ class CommandTriggerBuilder
 								"' annotation), but it doesn't extend '" + CommandClassType.module + "' class", command.pos );
 						}
 
-
 						var arguments :Array<Expr> = [];
 						for ( arg in func.args )
 						{
@@ -139,7 +137,6 @@ class CommandTriggerBuilder
 								];
 								arguments.push( { expr: EObjectDecl( fields ), pos: Context.currentPos() } );
 							}
-							
 						}
 
 						var className = MacroUtil.getPack( command.name );
@@ -158,7 +155,7 @@ class CommandTriggerBuilder
 								this.injector.mapClassNameToValue( 'Array<hex.control.payload.ExecutionPayload>', payloads );
 
 								hex.control.payload.PayloadUtil.mapPayload( payloads, this.injector );
-								var command = this.injector.getOrCreateNewInstance( $p { className } );
+								var command = this.injector.instantiateUnmapped( $p { className } );
 								hex.control.payload.PayloadUtil.unmapPayload( payloads, this.injector );
 
 								command.setOwner( this.module );
@@ -173,22 +170,20 @@ class CommandTriggerBuilder
 						{
 							func.expr = macro 
 							{
-								var injections : Array<{value:Dynamic, className:String, mapName:String}> = $a { arguments };
+								var injections : Array<{value: Dynamic, className: String, mapName: String}> = $a { arguments };
 								var payloads = [];
 								for ( injected in injections )
 								{
 									payloads.push( new hex.control.payload.ExecutionPayload( injected.value, null, injected.mapName ).withClassName( injected.className ) );
 								}
 
 								hex.control.payload.PayloadUtil.mapPayload( payloads, this.injector );
-								var command = this.injector.getOrCreateNewInstance( $p { className } );
+								var command = this.injector.instantiateUnmapped( $p { className } );
 								hex.control.payload.PayloadUtil.unmapPayload( payloads, this.injector );
 
 								command.setOwner( this.module );
 								command.execute();
-								
-								
-								
+
 								return command;
 							};
 						}
@@ -220,7 +215,7 @@ class CommandTriggerBuilder
 				pos: Context.currentPos()
 			});
 
-		return fields;
+		return hex.di.annotation.AnnotationTransformer.reflect( macro hex.di.IInjectorContainer, fields );
 	}
 
 	static function _searchForInjection( expr : Expr ) : Void

test/hex/control/trigger/CommandTriggerTest.hx

@@ -118,10 +118,11 @@ class CommandTriggerTest
 		vos[ 6 ] = [ 'hello', 'world' ];
 		vos[ 7 ] = [ 'hello' => 'world' ];
 		vos[ 8 ] = Date.now();
+		vos[ 9 ] = MockEnum.TEST;
 
 		var result = '';
-		controller.doSomething( vos[ 0 ], vos[ 1 ], vos[ 2 ], vos[ 3 ], vos[ 4 ], vos[ 5 ], vos[ 6 ], vos[ 7 ], [3, 4], vos[ 8 ] )
-			.onComplete( function(r) result = r );
+		controller.doSomething( vos[ 0 ], vos[ 1 ], vos[ 2 ], vos[ 3 ], vos[ 4 ], vos[ 5 ], vos[ 6 ], vos[ 7 ], [3, 4], vos[ 8 ], vos[ 9 ] )
+			.onComplete( function(r) { result = r; } );
 
 		Assert.equals( 'string2', result );
 
@@ -135,6 +136,7 @@ class CommandTriggerTest
 		Assert.equals( vos[ 6 ], mo.pArray );
 		Assert.equals( vos[ 7 ], mo.pStringMap );
 		Assert.equals( vos[ 8 ], mo.pDate );
+		Assert.equals( vos[ 9 ], mo.pEnum );
 
 		//
 		var cmd = MockCommand.command;
@@ -147,6 +149,7 @@ class CommandTriggerTest
 		Assert.equals( vos[ 6 ], cmd.pArray );
 		Assert.equals( vos[ 7 ], cmd.pStringMap );
 		Assert.equals( vos[ 8 ], cmd.pDate );
+		Assert.equals( vos[ 9 ], cmd.pEnum );
 
 		//
 		var acmd = AnotherMockCommand.command;
@@ -159,5 +162,6 @@ class CommandTriggerTest
 		Assert.equals( vos[ 6 ], acmd.pArray );
 		Assert.equals( vos[ 7 ], acmd.pStringMap );
 		Assert.equals( vos[ 8 ], acmd.pDate );
+		Assert.equals( vos[ 9 ], acmd.pEnum );
 	}
 }

test/hex/control/trigger/mock/MockMacroController.hx

@@ -1,6 +1,7 @@
 package hex.control.trigger.mock;
 
 import hex.collection.ILocator;
+import hex.control.MockEnum;
 import hex.control.async.Expect;
 
 /**
@@ -12,8 +13,6 @@ class MockMacroController
 {
 	public function new(){}
 
-	
-	
 	@Map( hex.control.trigger.mock.MockMacroCommand )
 	public function doSomething
 	( 
@@ -26,7 +25,8 @@ class MockMacroController
 										a 	: Array<String>,
 		@Type( 'Map<String, String>' )	m 	: Map<Dynamic, Dynamic>,
 		@Ignore							ai	: Array<Int>,
-										d 	: Date
+										d 	: Date,
+										me	: MockEnum
 	) : Expect<String>;
 
 	public function sum( a : Int, b : Int ) : Int