Skip to content

Fix chained promise resolves not correctly passing value #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 1 commit into from
Jul 3, 2022
Merged

Fix chained promise resolves not correctly passing value #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/LuaPrinter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
5 changes: 4 additions & 1 deletion src/lualib/Promise.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
30 changes: 29 additions & 1 deletion test/unit/builtins/promise.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); });
Expand Down Expand Up @@ -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");
});
`;
Expand Down