Fix chained promise resolves not correctly passing value when then is empty (#1298)

Perryvw · web-flow · commit 288c1b70c2b2 · 2022-07-03T19:21:57.000+02:00
diff --git a/src/LuaPrinter.ts b/src/LuaPrinter.ts
@@ -241,6 +241,7 @@ export class LuaPrinter {
             // Inline lualib features
             sourceChunks.push("-- Lua Library inline imports\n");
             sourceChunks.push(loadInlineLualibFeatures(file.luaLibFeatures, this.emitHost));
+            sourceChunks.push("-- End of Lua Library inline imports\n");
         }
 
         if (this.options.sourceMapTraceback && !isBundleEnabled(this.options)) {
diff --git a/src/lualib/Promise.ts b/src/lualib/Promise.ts
@@ -85,7 +85,7 @@ export class __TS__Promise<T> implements Promise<T> {
             }
         } else {
             // We always want to resolve our child promise if this promise is resolved, even if we have no handler
-            this.fulfilledCallbacks.push(() => resolve(undefined));
+            this.fulfilledCallbacks.push(v => resolve(v));
         }
 
         if (onRejected) {
@@ -96,6 +96,9 @@ export class __TS__Promise<T> implements Promise<T> {
                 // If promise already rejected, immediately call callback
                 internalCallback(this.rejectionReason);
             }
+        } else {
+            // We always want to reject our child promise if this promise is rejected, even if we have no handler
+            this.rejectedCallbacks.push(err => reject(err));
         }
 
         if (isFulfilled) {
diff --git a/test/unit/builtins/promise.spec.ts b/test/unit/builtins/promise.spec.ts
@@ -523,6 +523,34 @@ test("chained then throws", () => {
         ]);
 });
 
+test("empty then resolves", () => {
+    util.testFunction`
+    const { promise, resolve } = defer<string>();
+
+    promise.then().then(v => { log("then2", v) });
+
+    resolve("mydata");
+
+    return allLogs;
+    `
+        .setTsHeader(promiseTestLib)
+        .expectToEqual(["then2", "mydata"]);
+});
+
+test("empty then rejects", () => {
+    util.testFunction`
+    const { promise, reject } = defer<string>();
+
+    promise.then().catch(err => { log("catch", err) });
+
+    reject("my error");
+
+    return allLogs;
+    `
+        .setTsHeader(promiseTestLib)
+        .expectToEqual(["catch", "my error"]);
+});
+
 test("catch on rejected promise immediately calls callback", () => {
     util.testFunction`
         Promise.reject("already rejected").catch(reason => { log(reason); });
@@ -592,7 +620,7 @@ describe("finally behaves same as then/catch", () => {
                 log("final code");
             })
             .catch(reason => {
-                log("handling error", data);
+                log("handling error", reason);
                 log("final code");
             });
     `;

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ export class LuaPrinter {`
`241`	`241`	`// Inline lualib features`
`242`	`242`	`sourceChunks.push("-- Lua Library inline imports\n");`
`243`	`243`	`sourceChunks.push(loadInlineLualibFeatures(file.luaLibFeatures, this.emitHost));`
	`244`	`+ sourceChunks.push("-- End of Lua Library inline imports\n");`
`244`	`245`	`}`
`245`	`246`
`246`	`247`	`if (this.options.sourceMapTraceback && !isBundleEnabled(this.options)) {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export class __TS__Promise<T> implements Promise<T> {`
`85`	`85`	`}`
`86`	`86`	`} else {`
`87`	`87`	`// We always want to resolve our child promise if this promise is resolved, even if we have no handler`
`88`		`- this.fulfilledCallbacks.push(() => resolve(undefined));`
	`88`	`+ this.fulfilledCallbacks.push(v => resolve(v));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (onRejected) {`
`@@ -96,6 +96,9 @@ export class __TS__Promise<T> implements Promise<T> {`
`96`	`96`	`// If promise already rejected, immediately call callback`
`97`	`97`	`internalCallback(this.rejectionReason);`
`98`	`98`	`}`
	`99`	`+ } else {`
	`100`	`+ // We always want to reject our child promise if this promise is rejected, even if we have no handler`
	`101`	`+ this.rejectedCallbacks.push(err => reject(err));`
`99`	`102`	`}`
`100`	`103`
`101`	`104`	`if (isFulfilled) {`