prepare 0.26.0

src/hex/compiler/parser/flow/FlowCompiler.hx

@@ -24,11 +24,11 @@ import hex.preprocess.flow.MacroConditionalVariablesProcessor;
 class FlowCompiler 
 {
 	#if macro
-	static function _readFile(	fileName 						: String, 
-								?applicationContextName 		: String,
-								?preprocessingVariables 		: Expr, 
-								?conditionalVariables 			: Expr, 
-								?applicationAssemblerExpression : Expr ) : ExprOf<IApplicationAssembler>
+	public static function _readFile(	fileName 						: String,
+										?applicationContextName 		: String,
+										?preprocessingVariables 		: Expr,
+										?conditionalVariables 			: Expr,
+										?applicationAssemblerExpression : Expr ) : ExprOf<IApplicationAssembler>
 	{
 		LogManager.context = new MacroLoggerContext();
 

src/hex/compiler/parser/flow/ObjectParser.hx

@@ -63,6 +63,26 @@ class ObjectParser extends AbstractExprParser<hex.factory.BuildRequest>
 				} );
 				this._builder.build( OBJECT( constructorVO ) );
 
+			/*case macro $keyword( $a { args } ):
+				trace( new haxe.macro.Printer().printExpr( e ) );
+				trace( keyword );
+				trace( args );*/
+
+			case macro when( $a { when } ).then( $a { then } ):
+				var vo = _getDomainListenerVO( when, then );
+				vo.filePosition = e.pos;
+				this._builder.build( DOMAIN_LISTENER( vo ) );
+
+			case macro when( $a { when } ).adapt( $a { adapt } ).then( $a { then } ):
+				var vo = _getDomainListenerVO( when, then, adapt );
+				vo.filePosition = e.pos;
+				this._builder.build( DOMAIN_LISTENER( vo ) );
+
+			case macro when( $a { when } ).execute( $a { adapt } ):
+				var vo = _getDomainListenerVO( when, null, adapt );
+				vo.filePosition = e.pos;
+				this._builder.build( DOMAIN_LISTENER( vo ) );
+
 			case _:
 
 				switch( e.expr )
@@ -84,6 +104,43 @@ class ObjectParser extends AbstractExprParser<hex.factory.BuildRequest>
 		}
 		//logger.debug(e);
 	}
+
+	function _getDomainListenerVO( when, then, ?adapt ) : hex.ioc.vo.DomainListenerVO 
+	{
+		var callback;
+
+		if ( then == null )
+		{
+			callback = 'uniquefuckingID';
+			var cvo = new ConstructorVO( callback, ContextTypeList.OBJECT );
+			cvo.filePosition = Context.currentPos();
+			this._builder.build( OBJECT( cvo ) );
+		}
+		else
+		{
+			callback = ExpressionUtil.compressField( then[0] );
+		}
+
+		var ident = callback.split('.').shift();
+		var vo = new hex.ioc.vo.DomainListenerVO( ident, ExpressionUtil.getIdent( when[0] ) );
+
+		if ( when.length == 2 )
+		{
+			var arg 		= new hex.ioc.vo.DomainListenerVOArguments();
+			arg.staticRef 	= ExpressionUtil.compressField( when[1] );
+			var cb = callback.split('.');
+			if ( cb.length > 1 ) arg.method = cb[ 1 ];
+			if ( adapt != null ) 
+			{
+				arg.strategy = ExpressionUtil.compressField( adapt[ 0 ] );
+				if ( adapt.length == 2 ) arg.injectedInModule = ExpressionUtil.getBool( adapt[1] );
+			}
+			vo.arguments 	= [ arg ];
+			arg.filePosition = when[1].pos;
+		}
+
+		return vo;
+	}
 
 	function _getConstructorVO( ident : String, value : Expr ) : ConstructorVO 
 	{
@@ -166,9 +223,9 @@ class ObjectParser extends AbstractExprParser<hex.factory.BuildRequest>
 				}
 
 			case ECall( _.expr => EConst(CIdent(keyword)), params ):
-				if ( this.parser.methodParser.exists( keyword ) )
+				if ( this.parser.buildMethodParser.exists( keyword ) )
 				{
-					return this.parser.methodParser.get( keyword )( this.parser, new ConstructorVO( ident ), params, value );
+					return this.parser.buildMethodParser.get( keyword )( this.parser, new ConstructorVO( ident ), params, value );
 				}
 				else
 				{

src/hex/compiler/parser/flow/StaticFlowCompiler.hx

@@ -37,12 +37,12 @@ using hex.util.LambdaUtil;
 class StaticFlowCompiler 
 {
 	#if macro
-	static public function _readFile(	fileName 				: String, 
-								?applicationContextName 		: String,
-								?preprocessingVariables 		: Expr, 
-								?conditionalVariables 			: Expr, 
-								?applicationAssemblerExpression : Expr,
-								isExtending 					: Bool = false ) : Expr
+	public static function _readFile(	fileName 				: String,
+										?applicationContextName 		: String,
+										?preprocessingVariables 		: Expr,
+										?conditionalVariables 			: Expr,
+										?applicationAssemblerExpression : Expr,
+										isExtending 					: Bool = false ) : Expr
 	{
 		LogManager.context 				= new MacroLoggerContext();
 

src/hex/compiler/parser/xml/StaticXmlCompiler.hx

@@ -31,12 +31,12 @@ import hex.util.MacroUtil;
 class StaticXmlCompiler 
 {
 	#if macro
-	static public function _readFile(	fileName 				: String, 
-								?applicationContextName 		: String,
-								?preprocessingVariables 		: Expr, 
-								?conditionalVariables 			: Expr, 
-								?applicationAssemblerExpression : Expr,
-								isExtending 					: Bool = false ) : Expr
+	public static function _readFile(	fileName 				: String,
+										?applicationContextName 		: String,
+										?preprocessingVariables 		: Expr,
+										?conditionalVariables 			: Expr,
+										?applicationAssemblerExpression : Expr,
+										isExtending 					: Bool = false ) : Expr
 	{
 		LogManager.context 				= new MacroLoggerContext();
 

src/hex/compiler/parser/xml/XmlCompiler.hx

@@ -26,11 +26,11 @@ using StringTools;
 class XmlCompiler
 {
 	#if macro
-	static function _readXmlFile( 	fileName : String, 
-									?applicationContextName : String, 
-									?preprocessingVariables : Expr, 
-									?conditionalVariables : Expr, 
-									?applicationAssemblerExpression : Expr ) : ExprOf<IApplicationAssembler>
+	public static function _readFile( 	fileName : String,
+										?applicationContextName : String,
+										?preprocessingVariables : Expr,
+										?conditionalVariables : Expr,
+										?applicationAssemblerExpression : Expr ) : ExprOf<IApplicationAssembler>
 	{
 		LogManager.context = new MacroLoggerContext();
 
@@ -57,7 +57,7 @@ class XmlCompiler
 											?preprocessingVariables : Expr, 
 											?conditionalVariables : Expr ) : ExprOf<IApplicationAssembler>
 	{
-		return XmlCompiler._readXmlFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables  );
+		return XmlCompiler._readFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables  );
 	}
 
 	macro public static function compileWithAssembler( 	assemblerExpr : Expr, 
@@ -66,6 +66,6 @@ class XmlCompiler
 														?preprocessingVariables : Expr, 
 														?conditionalVariables : Expr ) : ExprOf<IApplicationAssembler>
 	{
-		return XmlCompiler._readXmlFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables, assemblerExpr );
+		return XmlCompiler._readFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables, assemblerExpr );
 	}
 }

src/hex/ioc/parser/xml/XmlReader.hx

@@ -210,10 +210,10 @@ class XmlReader
 		}
 	}
 
-	static function _readXmlFile( 	fileName : String, 
-									?applicationContextName : String,
-									?preprocessingVariables : Expr, 
-									?conditionalVariables : Expr ) : ExprOf<String>
+	public static function _readFile( 	fileName : String,
+										?applicationContextName : String,
+										?preprocessingVariables : Expr,
+										?conditionalVariables : Expr ) : ExprOf<String>
 	{
 		var conditionalVariablesMap 	= MacroConditionalVariablesProcessor.parse( conditionalVariables );
 		var conditionalVariablesChecker = new ConditionalVariablesChecker( conditionalVariablesMap );
@@ -249,7 +249,7 @@ class XmlReader
 													?preprocessingVariables : Expr,
 													?conditionalVariables : Expr ) : ExprOf<String>
 	{
-		return XmlReader._readXmlFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables );
+		return XmlReader._readFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables );
 	}
 
 	macro public static function getXml( fileName : String,
@@ -258,7 +258,7 @@ class XmlReader
 										 ?conditionalVariables : Expr ) : ExprOf<Xml>
 	{
 		var tp = MacroUtil.getPack( Type.getClassName( Xml ) );
-		var data = XmlReader._readXmlFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables );
+		var data = XmlReader._readFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables );
 		return macro @:pos( Context.currentPos() ){ $p { tp }.parse( $data ); }
 	}
 
@@ -270,7 +270,7 @@ class XmlReader
 		var xmlPack = MacroUtil.getPack( Type.getClassName( Xml ) );
 		var applicationAssemblerTypePath = MacroUtil.getTypePath( "hex.runtime.ApplicationAssembler" );
 		var applicationXMLParserTypePath = MacroUtil.getTypePath( Type.getClassName( ApplicationXMLParser ) );
-		var data = XmlReader._readXmlFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables );
+		var data = XmlReader._readFile( fileName, applicationContextName, preprocessingVariables, conditionalVariables );
 
 		return macro @:pos( Context.currentPos() )
 		{ 

test/context/flow/domainDispatchAfterModuleInitialisation.flow

@@ -0,0 +1,8 @@
+@context( name = 'applicationContext' )
+{
+	sender = new hex.ioc.parser.xml.mock.MockSenderModule();
+	receiver = new hex.ioc.parser.xml.mock.MockReceiverModule();
+
+	when( sender, hex.ioc.parser.xml.mock.MockChatModule.TEXT_INPUT )
+		.then( receiver.onMessage );
+}

test/context/flow/eventProxy.flow

@@ -0,0 +1,19 @@
+@context( name = 'applicationContext' )
+{
+	chat = new hex.ioc.parser.xml.mock.MockChatModule();
+	receiver = new hex.ioc.parser.xml.mock.MockReceiverModule();
+
+	@map_type( 'hex.ioc.parser.xml.mock.IMockMessageParserModule' ) 
+	parser = new hex.ioc.parser.xml.mock.MockMessageParserModule();
+
+	//Don't do that
+	eventProxy = new hex.event.EventProxy( receiver, receiver.onMessage );
+	when( chat, hex.ioc.parser.xml.mock.MockChatModule.TEXT_INPUT )
+		.adapt( hex.ioc.parser.xml.mock.MockChatEventAdapterStrategyMacro )
+		.then( eventProxy );
+
+	//Do that Instead
+	/*when( chat, hex.ioc.parser.xml.mock.MockChatModule.TEXT_INPUT )
+		.adapt( hex.ioc.parser.xml.mock.MockChatEventAdapterStrategyMacro )
+		.then( receiver.onMessage );*/
+}

test/context/flow/eventTrigger.flow

@@ -0,0 +1,13 @@
+@context( name = 'applicationContext' )
+{
+	chat = new hex.ioc.parser.xml.mock.MockChatModule();
+
+	@map_type( 'hex.ioc.parser.xml.mock.MockReceiverModule' ) 
+	receiver = new hex.ioc.parser.xml.mock.MockReceiverModule();
+
+	@map_type( 'hex.ioc.parser.xml.mock.IMockMessageParserModule' ) 
+	parser = new hex.ioc.parser.xml.mock.MockMessageParserModule();
+
+	when( chat, hex.ioc.parser.xml.mock.MockChatModule.TEXT_INPUT )
+		.execute( hex.ioc.parser.xml.mock.MockChatAdapterStrategyMacro );
+}

test/context/flow/macroWithAnnotation.flow

@@ -0,0 +1,8 @@
+/*
+<?xml version="1.0" encoding="utf-8" ?>
+<root name="applicationContext">
+    <state id="assemblingEnd" ref="this.state.ASSEMBLING_END">
+        <enter command-class="hex.ioc.parser.xml.mock.MockMacroWithAnnotation" fire-once="true" />
+    </state>
+</root>
+*/

test/context/flow/moduleListener.flow

@@ -0,0 +1,7 @@
+@context( name = 'applicationContext' )
+{
+	myModule = new hex.ioc.parser.xml.mock.MockModuleWithServiceCallback();
+
+	when( myService, hex.ioc.parser.xml.mock.MockStubStatefulService.BOOLEAN_VO_UPDATE )
+		.then( myModule.onBooleanServiceCallback );
+}

test/context/flow/moduleListeningService.flow

@@ -0,0 +1,8 @@
+@context( name = 'applicationContext' )
+{
+	myService = new hex.ioc.parser.xml.mock.MockStubStatefulService();
+	myModule = new hex.ioc.parser.xml.mock.MockModuleWithServiceCallback();
+
+	when( myService, hex.ioc.parser.xml.mock.MockStubStatefulService.BOOLEAN_VO_UPDATE )
+		.then( myModule.onBooleanServiceCallback );
+}

test/context/flow/moduleListeningServiceWithMapType.flow

@@ -0,0 +1,10 @@
+@context( name = 'applicationContext' )
+{
+	@map_type( 'hex.ioc.parser.xml.mock.IMockStubStatefulService' ) 
+	myService = new hex.ioc.parser.xml.mock.MockStubStatefulService();
+
+	myModule = new hex.ioc.parser.xml.mock.MockModuleWithServiceCallback();
+
+	when( myService, hex.ioc.parser.xml.mock.MockStubStatefulService.BOOLEAN_VO_UPDATE )
+		.then( myModule.onBooleanServiceCallback );
+}

test/context/flow/moduleListeningServiceWithStrategyAndContextInjection.flow

@@ -0,0 +1,17 @@
+@context( name = 'applicationContext' )
+{
+	@map_type( 'hex.ioc.parser.xml.mock.IMockDividerHelper' )
+	mockDividerHelper = new hex.ioc.parser.xml.mock.MockDividerHelper();
+
+	myService = new hex.ioc.parser.xml.mock.MockStubStatefulService();
+	myModuleA = new hex.ioc.parser.xml.mock.MockModuleWithServiceCallback();
+	myModuleB = new hex.ioc.parser.xml.mock.AnotherMockModuleWithServiceCallback();
+
+	when( myService, hex.ioc.parser.xml.mock.MockStubStatefulService.INT_VO_UPDATE )
+		.adapt( hex.ioc.parser.xml.mock.MockIntDividerEventAdapterStrategy, true )
+		.then( myModuleA.onFloatServiceCallback );
+
+	when( myService, hex.ioc.parser.xml.mock.MockStubStatefulService.INT_VO_UPDATE )
+		.adapt( hex.ioc.parser.xml.mock.MockIntDividerEventAdapterStrategy, false )
+		.then( myModuleB.onFloatServiceCallback );
+}

test/context/flow/moduleListeningServiceWithStrategyAndModuleInjection.flow

@@ -0,0 +1,9 @@
+@context( name = 'applicationContext' )
+{
+	myService = new hex.ioc.parser.xml.mock.MockStubStatefulService();
+	myModule = new hex.ioc.parser.xml.mock.MockModuleWithServiceCallback();
+
+	when( myService, hex.ioc.parser.xml.mock.MockStubStatefulService.INT_VO_UPDATE )
+		.adapt( hex.ioc.parser.xml.mock.MockIntDividerEventAdapterStrategy, true )
+		.then( myModule.onFloatServiceCallback );
+}

test/context/flow/serviceToBeListened.flow

@@ -0,0 +1,4 @@
+@context( name = 'applicationContext' )
+{
+	myService = new hex.ioc.parser.xml.mock.MockStubStatefulService();
+}

test/context/flow/testAnnotationProviderWithInheritance.flow

@@ -0,0 +1,4 @@
+@context( name = 'applicationContext' )
+{
+    module = new hex.ioc.parser.xml.mock.MockModuleWithAnnotationProviding();
+}

test/context/flow/testMockObjectWithAnnotation.flow

@@ -0,0 +1,4 @@
+@context( name = 'applicationContext' )
+{
+	mockObjectWithAnnotation = new hex.metadata.MockObjectWithAnnotation();
+}

test/context/flow/triggerInjection.flow

@@ -0,0 +1,23 @@
+/*
+<?xml version="1.0" encoding="utf-8" ?>
+<root name="applicationContext">
+
+	<model id="model" type="hex.mock.MockWeatherModel"/>
+
+    <config id="config" type="hex.di.mapping.MappingConfiguration">
+        <item map-name="temperature"> 
+			<key type="Class" value="hex.event.ITrigger<Int->Void>"/> 
+			<value ref="model.temperature"/>
+		</item>
+		<item map-name="weather"> 
+			<key type="Class" value="hex.event.ITrigger<String->Void>"/> 
+			<value ref="model.weather"/>
+		</item>
+    </config>
+
+	<view id="module" type="hex.mock.MockWeatherListener">
+		<argument ref="config"/>
+	</view>
+
+</root>
+*/

test/context/flow/twoModulesListeningEachOther.flow

@@ -0,0 +1,8 @@
+@context( name = 'applicationContext' )
+{
+	chat = new hex.ioc.parser.xml.mock.MockChatModule();
+	translation = new hex.ioc.parser.xml.mock.MockTranslationModule();
+
+	when( chat, hex.ioc.parser.xml.mock.MockChatModule.TEXT_INPUT ).then( translation.onSomethingToTranslate );
+	when( translation ).then( chat );
+}

test/context/flow/twoModulesListeningEachOtherWithAdapter.flow

@@ -0,0 +1,11 @@
+@context( name = 'applicationContext' )
+{
+	chat = new hex.ioc.parser.xml.mock.MockChatModule();
+	translation = new hex.ioc.parser.xml.mock.MockTranslationModule();
+
+	when( chat, hex.ioc.parser.xml.mock.MockChatModule.TEXT_INPUT )
+		.adapt( hex.ioc.parser.xml.mock.MockChatAdapterStrategy )
+		.then( translation.onTranslateWithTime );
+
+	when( translation ).then( chat );
+}