Skip to content
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

Jump to bottom

Use outputVar instead of hard coding this.output in JS codegen #2950

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use outputVar instead of hard coding this.output in JS codegen #2950

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d97c8
Use `outputVar` instead of hard coding `this.output` in JS codegen
ben-harris-5 Mar 22, 2024
045fe74
Merge branch 'apache:master' into js-codegen-use-outputVar
ben-harris-5 Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions compiler/cpp/src/thrift/generate/t_js_generator.cc
View file
Open in desktop
Expand Up @@ -919,9 +919,9 @@ void t_js_generator::generate_js_struct_definition(ostream& out,

// Special case. Exceptions derive from Error, and error has a non optional message field.
// Ignore the optional flag in this case, otherwise we will generate a incompatible field
// in the eyes of typescript.
// in the eyes of typescript.
string optional_flag = is_exception && member_name == "message" ? "" : ts_get_req(*m_iter);

f_types_ts_ << ts_indent() << ts_access << member_name << optional_flag << ": "
<< ts_get_type((*m_iter)->get_type()) << ";" << endl;
}
Expand Down Expand Up @@ -2019,23 +2019,23 @@ void t_js_generator::generate_service_client(t_service* tservice) {

if (gen_node_) {
if((*f_iter)->is_oneway()) {
f_service_ << indent() << "this.output.flush();" << endl;
f_service_ << indent() << outputVar << ".flush();" << endl;
f_service_ << indent() << js_const_type_ << "callback = this._reqs[this.seqid()] || function() {};" << endl;
f_service_ << indent() << "delete this._reqs[this.seqid()];" << endl;
f_service_ << indent() << "callback(null);" << endl;
} else {
f_service_ << indent() << "return this.output.flush();" << endl;
f_service_ << indent() << "return " << outputVar << ".flush();" << endl;
}
} else {
if (gen_jquery_) {
f_service_ << indent() << "return this.output.getTransport().flush(callback);" << endl;
f_service_ << indent() << "return " << outputVar << ".getTransport().flush(callback);" << endl;
} else if (gen_es6_) {
f_service_ << indent() << js_const_type_ << "self = this;" << endl;
if((*f_iter)->is_oneway()) {
f_service_ << indent() << "this.output.getTransport().flush(true, null);" << endl;
f_service_ << indent() << outputVar << ".getTransport().flush(true, null);" << endl;
f_service_ << indent() << "callback();" << endl;
} else {
f_service_ << indent() << "this.output.getTransport().flush(true, () => {" << endl;
f_service_ << indent() << outputVar << ".getTransport().flush(true, () => {" << endl;
indent_up();
f_service_ << indent() << js_let_type_ << "error = null, result = null;" << endl;
f_service_ << indent() << "try {" << endl;
Expand All @@ -2051,11 +2051,11 @@ void t_js_generator::generate_service_client(t_service* tservice) {
f_service_ << indent() << "if (callback) {" << endl;
indent_up();
if((*f_iter)->is_oneway()) {
f_service_ << indent() << "this.output.getTransport().flush(true, null);" << endl;
f_service_ << indent() << outputVar << ".getTransport().flush(true, null);" << endl;
f_service_ << indent() << "callback();" << endl;
} else {
f_service_ << indent() << js_const_type_ << "self = this;" << endl;
f_service_ << indent() << "this.output.getTransport().flush(true, function() {" << endl;
f_service_ << indent() << outputVar << ".getTransport().flush(true, function() {" << endl;
indent_up();
f_service_ << indent() << js_let_type_ << "result = null;" << endl;
f_service_ << indent() << "try {" << endl;
Expand All @@ -2069,7 +2069,7 @@ void t_js_generator::generate_service_client(t_service* tservice) {
}
indent_down();
f_service_ << indent() << "} else {" << endl;
f_service_ << indent() << " return this.output.getTransport().flush();" << endl;
f_service_ << indent() << " return " << outputVar << ".getTransport().flush();" << endl;
f_service_ << indent() << "}" << endl;
}
}
Expand Down