Merge pull request #31 from DoclerLabs/develop

prepare 0.30.0
DoclerLabs · Oct 4, 2017 · 89bae50 · 89bae50
2 parents e808219 + fe22349
commit 89bae50
Show file tree

Hide file tree

Showing 14 changed files with 451 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,7 +51,7 @@ install:
   - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexInject.git ./hexinject
   - haxelib dev hexinject ./hexinject
 #tink_macro
-  - haxelib install tink_macro 0.14.1
+  - haxelib install tink_macro 0.15.0
 #hexDSL
   - haxelib dev hexdsl .
   - export DISPLAY=:99.0;

diff --git a/haxelib.json b/haxelib.json
@@ -11,6 +11,6 @@
   "dependencies":
   {
     "hexinject": "git:https://github.com/DoclerLabs/hexInject.git",
-    "tink_macro": "0.14.1"
+    "tink_macro": "0.15.0"
   }
 }
diff --git a/src/hex/compiletime/basic/CompileTimeContextFactory.hx b/src/hex/compiletime/basic/CompileTimeContextFactory.hx
@@ -315,7 +315,7 @@ class CompileTimeContextFactory
 		return null;
 	}
 
-	function _getMappingDefinitions( e : Expr )
+	function _getMappingDefinitions( e : Expr ) : Array<hex.di.mapping.MappingDefinition>
 	{
 		var a = [];
 		switch( e.expr )
@@ -358,21 +358,23 @@ class CompileTimeContextFactory
 			case _:
 		}
 
-		return a;
+		return cast a;
 	}
 
 	function _checkDependencies( constructorVO : ConstructorVO ) : Void
 	{
 		if ( MacroUtil.implementsInterface( this._getClassType( constructorVO.className ), _dependencyInterface ) )
 		{
-			var mappings = constructorVO.arguments.filter(
-				function ( arg ) return arg.ref != null )
-			.map( function ( arg ) return this._coreFactory.locate( arg.ref ) )
-			.flatMap( _getMappingDefinitions );
+			var mappings = constructorVO.arguments
+				.filter( function ( arg ) return arg.ref != null )
+					.map( function ( arg ) return this._coreFactory.locate( arg.ref ) )
+						.filter( function ( arg ) return arg != null )
+							.flatMap( _getMappingDefinitions )
+								.array();
 
-			if ( !hex.di.mapping.MappingChecker.matchForClassName( constructorVO.className, cast mappings ) )
+			if ( !hex.di.mapping.MappingChecker.matchForClassName( constructorVO.className, mappings ) )
 			{
-				var missingMappings = hex.di.mapping.MappingChecker.getMissingMapping( constructorVO.className, cast mappings );
+				var missingMappings = hex.di.mapping.MappingChecker.getMissingMapping( constructorVO.className, mappings );
 				Context.fatalError( "Missing mappings:" + missingMappings, constructorVO.filePosition );
 			}
 		}