Merge pull request #20 from botsman/fix-call-with-await

fix call with await function as an argument

haxelib.json

@@ -10,9 +10,9 @@
         "javascript"
     ],
     "description": "This library provides a macros to add 'async' and 'await' keywords for Python and JavaScript and does nothing for other platoforms.",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "classPath": "src",
-    "releasenote": "Remove development files",
+    "releasenote": "Fix call with await function as an argument",
     "contributors": [
         "botsman"
     ],

src/hxasync/AsyncMacro.hx

@@ -95,7 +95,6 @@ class AsyncMacro {
   }
 
   public static function handleAny(expr: Expr, isAsyncContext: Bool) {
-    // TODO: handle more Expr types
     if (expr == null) {
       return null;
     }
@@ -110,6 +109,9 @@ class AsyncMacro {
         }
       case ECall(e, params):
         handleAny(e, isAsyncContext);
+        for (param in params) {
+          handleAny(param, isAsyncContext);
+        }
       case EConst(s):
         null;
       case EField(e, field):

tests/Tests.hx

@@ -57,6 +57,43 @@ class Cases {
     return (@await nestedFunction()).a;
   }
 
+  @async public static function testAnonymousStructure() {
+    var someAsyncFunction = @async function() {
+      return 1;
+    }
+    return {
+      a: @await someAsyncFunction()
+    }
+  }
+
+  @async public static function testAnonymousStructureInArray() {
+    var someAsyncFunction = @async function() {
+      return 1;
+    }
+    var arr: Array<Dynamic> = [];
+    arr.push({
+      a: @await someAsyncFunction()
+    });
+    return arr;
+  }
+
+  @async public static function testStringInterpolation() {
+    var someAsyncFunction = @async function() {
+      return 1;
+    }
+    return 'asd ${@await someAsyncFunction()}';
+  }
+
+  @async public static function testAsyncCallAsArgument() {
+    var someAsyncFunction = @async function() {
+      return 1;
+    }
+    var anotherFunction = function(arg: Int) {
+      return arg;
+    }
+    return anotherFunction(@await someAsyncFunction());
+  }
+
   @async public function returnDynamic() {
     var a = 10;
     return {
@@ -72,6 +109,10 @@ class Cases {
     @await testFunctionWithDefaultArgs();
     @await testNestedFunction();
     @await testBrackets();
+    @await testAnonymousStructure();
+    @await testAnonymousStructureInArray();
+    @await testStringInterpolation();
+    @await testAsyncCallAsArgument();
   }
 }