Skip to content

Fix chainable p5 instance methods returning void instead of p5 #8426

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

Open
guan404ming wants to merge 1 commit into
base: dev-2.0
Choose a base branch
from
+7 −3
Open

Fix chainable p5 instance methods returning void instead of p5 #8426

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
10 changes: 7 additions & 3 deletions utils/typescript.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,13 @@ function generateMethodDeclaration(method, options = {}) {
.join(', ');

let returnType = 'void';
if (method.chainable && !globalFunction && options.currentClass !== 'p5') {
returnType = options.currentClass || 'this';
// TODO: Decide what should be chainable. Many of these are accidental / not thought through
if (method.chainable && !globalFunction) {
// In global mode, use P5 (the imported class type) instead of p5 (the namespace)
if (options.inGlobalMode && options.currentClass === 'p5') {
returnType = 'P5';
} else {
returnType = options.currentClass || 'this';
}
} else if (overload.return && overload.return.type) {
returnType = convertTypeToTypeScript(overload.return.type, options);
} else if (method.return && method.return.type) {
Expand Down