Merge pull request #23 from koculu/22-bug-generic-valuetasks-are-not-…

…awaitable

Await tasks, runtime tasks and valuetasks with correct return type.

src/Topaz.Test/AwaitTests.cs

@@ -0,0 +1,101 @@
+using NUnit.Framework;
+using System.Collections;
+using System.Threading.Tasks;
+using Tenray.Topaz.API;
+
+namespace Tenray.Topaz.Test;
+
+public sealed class AwaitTests
+{
+    public async ValueTask<int> GenericValueTask()
+    {
+        await Task.Delay(1);
+        return 33;
+    }
+
+    public async ValueTask SimpleValueTask()
+    {
+        await Task.Delay(1);
+        return;
+    }
+
+    public async Task<int> GenericTask()
+    {
+        await Task.Delay(1);
+        return 33;
+    }
+
+    public async Task SimpleTask()
+    {
+        await Task.Delay(1);
+        return;
+    }
+
+    [Test]
+    public void GenericValueTaskAwait()
+    {
+        var engine = new TopazEngine();
+        dynamic model = new JsObject();
+        engine.SetValue("test", this);
+        engine.SetValue("model", model);
+        engine.ExecuteScriptAsync(@"
+model.result1 = await test.GenericValueTask();
+").Wait();
+        Assert.That(model.result1, Is.EqualTo(33));
+        engine.ExecuteScript(@"
+model.result2 = await test.GenericValueTask();
+");
+        Assert.That(model.result2, Is.EqualTo(33));
+    }
+
+    [Test]
+    public void SimpleValueTaskAwait()
+    {
+        var engine = new TopazEngine();
+        dynamic model = new JsObject();
+        engine.SetValue("test", this);
+        engine.SetValue("model", model);
+        engine.ExecuteScriptAsync(@"
+model.result1 = await test.SimpleValueTask();
+").Wait();
+        Assert.That(model.result1, Is.EqualTo(null));
+        engine.ExecuteScript(@"
+model.result2 = await test.SimpleValueTask();
+");
+        Assert.That(model.result2, Is.EqualTo(null));
+    }
+
+    [Test]
+    public void GenericTaskAwait()
+    {
+        var engine = new TopazEngine();
+        dynamic model = new JsObject();
+        engine.SetValue("test", this);
+        engine.SetValue("model", model);
+        engine.ExecuteScriptAsync(@"
+model.result1 = await test.GenericTask();
+").Wait();
+        Assert.That(model.result1, Is.EqualTo(33));
+        engine.ExecuteScript(@"
+model.result2 = await test.GenericTask();
+");
+        Assert.That(model.result2, Is.EqualTo(33));
+    }
+
+    [Test]
+    public void SimpleTaskAwait()
+    {
+        var engine = new TopazEngine();
+        dynamic model = new JsObject();
+        engine.SetValue("test", this);
+        engine.SetValue("model", model);
+        engine.ExecuteScriptAsync(@"
+model.result1 = await test.SimpleTask();
+").Wait();
+        Assert.That(model.result1, Is.EqualTo(null));
+        engine.ExecuteScript(@"
+model.result2 = await test.SimpleTask();
+");
+        Assert.That(model.result2, Is.EqualTo(null));
+    }
+}

src/Topaz/AstHandlers/AsyncHandlers/Expressions/AwaitExpressionHandler.cs

@@ -13,12 +13,30 @@ internal async static ValueTask<object> ExecuteAsync(ScriptExecutor scriptExecut
         var result = await scriptExecutor.ExecuteStatementAsync(expr.Argument, token);
         if (result == null)
             return null;
-        if (result is Task || result is ValueTask)
+        if (result is Task task)
+        {
+            var type = task.GetType();
+            var returnType = type.GetMethod("GetAwaiter").ReturnType.GetMethod("GetResult").ReturnType;
+            if (returnType != typeof(void) && returnType.FullName != "System.Threading.Tasks.VoidTaskResult")
+                return await (dynamic)task;
+            await task;
+            return null;
+        }
+
+        if (result is ValueTask valueTask)
+        {
+            await valueTask;
+            return null;
+        }
+
+        var type2 = result.GetType();
+        if (type2.IsGenericType && typeof(ValueTask<>) == type2.GetGenericTypeDefinition())
         {
             dynamic awaitable = result;
             if (result.GetType().IsGenericType)
                 return await awaitable;
             await awaitable;
+            return null;
         }
         return result;
     }

src/Topaz/AstHandlers/Expressions/AwaitExpressionHandler.cs

@@ -14,18 +14,32 @@ internal static object Execute(ScriptExecutor scriptExecutor, Node expression, C
         var result = scriptExecutor.ExecuteStatement(expr.Argument, token);
         if (result is Task task)
         {
-            return GetTaskResult(task);
+            task.Wait(token);
+            var type = task.GetType();
+            var returnType = type.GetMethod("GetAwaiter").ReturnType.GetMethod("GetResult").ReturnType;
+            if (returnType != typeof(void) && returnType.FullName != "System.Threading.Tasks.VoidTaskResult")
+                return GetTaskResult(task);
+            return null;
+        }
+
+        if (result is ValueTask valueTask)
+        {
+            valueTask.AsTask().Wait(token);
+            return null;
         }
-        else if (result is ValueTask valueTask)
+
+        var type2 = result.GetType();
+        if (type2.IsGenericType && typeof(ValueTask<>) == type2.GetGenericTypeDefinition())
         {
-            return GetTaskResult(valueTask.AsTask());
+            dynamic r = result;
+            r.AsTask().Wait(token);
+            return r.Result;
         }
         return result;
     }
 
     internal static object GetTaskResult(Task task)
     {
-        task.Wait();
         var property = task.GetType().GetProperty("Result",
             BindingFlags.Public | BindingFlags.Instance);
         if (property == null)

src/Topaz/Directory.Build.props

@@ -5,8 +5,8 @@
     <Authors>Ahmed Yasin Koculu</Authors>
     <PackageId>Topaz</PackageId>
     <Title>Topaz</Title>
-    <ProductVersion>1.3.7.0</ProductVersion>
-    <Version>1.3.7.0</Version>
+    <ProductVersion>1.3.8.0</ProductVersion>
+    <Version>1.3.8.0</Version>
     <Authors>Ahmed Yasin Koculu</Authors>
     <AssemblyTitle>Topaz</AssemblyTitle>
     <Description>Multithreaded Javascript Engine for .NET</Description>