Fix __TS__AsyncAwaiter error handling (#1168)

dicarlo2 · web-flow · commit 028e3f51b6b8 · 2021-11-19T19:55:08.000+01:00
* Fix __TS__AsyncAwaiter error handling

* Add tests
diff --git a/src/lualib/Await.ts b/src/lualib/Await.ts
@@ -30,7 +30,7 @@ function __TS__AsyncAwaiter(this: void, generator: (this: void) => void) {
             if (success) {
                 step(resultOrError, errorOrErrorHandler);
             } else {
-                reject(resultOrError);
+                reject(errorOrErrorHandler);
             }
         }
         function rejected(handler: ErrorHandler | undefined) {
diff --git a/test/unit/builtins/async-await.spec.ts b/test/unit/builtins/async-await.spec.ts
@@ -384,6 +384,64 @@ test("async function can forward varargs", () => {
         .expectToEqual(["resolved", "A", "B", "C"]);
 });
 
+test.each(["async function abc() {", "const abc = async () => {"])(
+    "can throw error after await in async function (%p)",
+    functionHeader => {
+        util.testFunction`
+        const { promise, resolve } = defer<string>();
+        promise.then(data => log("resolving first promise", data));
+
+        ${functionHeader}
+            await promise;
+            log("run abc");
+            throw "test throw";
+        }
+
+        const awaitingPromise = abc();
+        awaitingPromise.catch(error => log("caught error", error));
+
+        resolve("resolved data");
+        return allLogs;
+    `
+            .setTsHeader(promiseTestLib)
+            .expectToEqual(["resolving first promise", "resolved data", "run abc", "caught error", "test throw"]);
+    }
+);
+
+test.each(["async function abc() {", "const abc = async () => {"])(
+    "can throw object after await in async function (%p)",
+    functionHeader => {
+        util.testFunction`
+        const { promise, resolve } = defer<string>();
+        promise.then(data => log("resolving first promise", data));
+
+        ${functionHeader}
+            await promise;
+            log("run abc");
+            throw new Error("test throw");
+        }
+
+        const awaitingPromise = abc();
+        awaitingPromise.catch(error => log("caught error", error));
+
+        resolve("resolved data");
+        return allLogs;
+    `
+            .setTsHeader(promiseTestLib)
+            .expectToEqual([
+                "resolving first promise",
+                "resolved data",
+                "run abc",
+                "caught error",
+                {
+                    message: "test throw",
+                    name: "Error",
+                    stack: expect.stringContaining("stack traceback"),
+                },
+            ]);
+    }
+);
+
 // https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1105
 describe("try/catch in async function", () => {
     util.testEachVersion(

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function __TS__AsyncAwaiter(this: void, generator: (this: void) => void) {`
`30`	`30`	`if (success) {`
`31`	`31`	`step(resultOrError, errorOrErrorHandler);`
`32`	`32`	`} else {`
`33`		`- reject(resultOrError);`
	`33`	`+ reject(errorOrErrorHandler);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`function rejected(handler: ErrorHandler \| undefined) {`