THRIFT-2527 Apache Thrift IDL Compiler code generated for Node.js should be jshint clean
Clieht: NodeJS
Patch: BCG <bgould@users.noreply.github.com>
This closes #1112
diff --git a/compiler/cpp/src/thrift/generate/t_js_generator.cc b/compiler/cpp/src/thrift/generate/t_js_generator.cc
index b0046a0..afe9582 100644
--- a/compiler/cpp/src/thrift/generate/t_js_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_js_generator.cc
@@ -668,9 +668,9 @@
if (gen_node_ && is_exception) {
out << indent() << "Thrift.TException.call(this, \"" << js_namespace(tstruct->get_program())
- << tstruct->get_name() << "\")" << endl;
+ << tstruct->get_name() << "\");" << endl;
out << indent() << "this.name = \"" << js_namespace(tstruct->get_program())
- << tstruct->get_name() << "\"" << endl;
+ << tstruct->get_name() << "\";" << endl;
}
// members with arguments
@@ -994,14 +994,15 @@
scope_up(f_service_);
- f_service_ << indent() << "this._handler = handler" << endl;
+ f_service_ << indent() << "this._handler = handler;" << endl;
scope_down(f_service_);
+ f_service_ << ";" << endl;
if (tservice->get_extends() != NULL) {
indent(f_service_) << "Thrift.inherits(" << js_namespace(tservice->get_program())
<< service_name_ << "Processor, " << tservice->get_extends()->get_name()
- << "Processor)" << endl;
+ << "Processor);" << endl;
}
// Generate the server implementation
@@ -1024,7 +1025,7 @@
<< indent() << "}" << endl;
scope_down(f_service_);
- f_service_ << endl;
+ f_service_ << ";" << endl;
// Generate the process subfunctions
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
@@ -1070,9 +1071,9 @@
f_service_ << "args." << (*f_iter)->get_name();
}
- f_service_ << ")" << endl;
+ f_service_ << ");" << endl;
scope_down(f_service_);
- f_service_ << endl;
+ f_service_ << ";" << endl;
return;
}
@@ -1089,14 +1090,15 @@
indent_up();
indent(f_service_) << ".then(function(result) {" << endl;
indent_up();
- f_service_ << indent() << "var result = new " << resultname << "({success: result});" << endl
+ f_service_ << indent() << "var result_obj = new " << resultname << "({success: result});" << endl
<< indent() << "output.writeMessageBegin(\"" << tfunction->get_name()
<< "\", Thrift.MessageType.REPLY, seqid);" << endl << indent()
- << "result.write(output);" << endl << indent() << "output.writeMessageEnd();" << endl
+ << "result_obj.write(output);" << endl << indent() << "output.writeMessageEnd();" << endl
<< indent() << "output.flush();" << endl;
indent_down();
indent(f_service_) << "}, function (err) {" << endl;
indent_up();
+ indent(f_service_) << "var result;" << endl;
bool has_exception = false;
t_struct* exceptions = tfunction->get_xceptions();
@@ -1120,7 +1122,7 @@
if (has_exception) {
f_service_ << ") {" << endl;
indent_up();
- f_service_ << indent() << "var result = new " << resultname << "(err);" << endl << indent()
+ f_service_ << indent() << "result = new " << resultname << "(err);" << endl << indent()
<< "output.writeMessageBegin(\"" << tfunction->get_name()
<< "\", Thrift.MessageType.REPLY, seqid);" << endl;
@@ -1129,7 +1131,7 @@
indent_up();
}
- f_service_ << indent() << "var result = new "
+ f_service_ << indent() << "result = new "
"Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN,"
" err.message);" << endl << indent() << "output.writeMessageBegin(\""
<< tfunction->get_name() << "\", Thrift.MessageType.EXCEPTION, seqid);" << endl;
@@ -1155,8 +1157,9 @@
f_service_ << "function (err, result) {" << endl;
indent_up();
+ indent(f_service_) << "var result_obj;" << endl;
- indent(f_service_) << "if (err == null";
+ indent(f_service_) << "if ((err === null || typeof err === 'undefined')";
if (has_exception) {
const vector<t_field*>& members = exceptions->get_members();
for (vector<t_field*>::const_iterator it = members.begin(); it != members.end(); ++it) {
@@ -1168,27 +1171,27 @@
}
f_service_ << ") {" << endl;
indent_up();
- f_service_ << indent() << "var result = new " << resultname
- << "((err != null ? err : {success: result}));" << endl << indent()
+ f_service_ << indent() << "result_obj = new " << resultname
+ << "((err !== null || typeof err === 'undefined') ? err : {success: result});" << endl << indent()
<< "output.writeMessageBegin(\"" << tfunction->get_name()
<< "\", Thrift.MessageType.REPLY, seqid);" << endl;
indent_down();
indent(f_service_) << "} else {" << endl;
indent_up();
- f_service_ << indent() << "var result = new "
+ f_service_ << indent() << "result_obj = new "
"Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN,"
" err.message);" << endl << indent() << "output.writeMessageBegin(\""
<< tfunction->get_name() << "\", Thrift.MessageType.EXCEPTION, seqid);" << endl;
indent_down();
- f_service_ << indent() << "}" << endl << indent() << "result.write(output);" << endl << indent()
+ f_service_ << indent() << "}" << endl << indent() << "result_obj.write(output);" << endl << indent()
<< "output.writeMessageEnd();" << endl << indent() << "output.flush();" << endl;
indent_down();
indent(f_service_) << "});" << endl;
indent_down();
indent(f_service_) << "}" << endl;
- scope_down(f_service_);
- f_service_ << endl;
+ indent_down();
+ indent(f_service_) << "};" << endl;
}
/**
@@ -1316,9 +1319,9 @@
// utils for multiplexed services
if (gen_node_) {
indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype.seqid = function() { return this._seqid; }" << endl
+ << "Client.prototype.seqid = function() { return this._seqid; };" << endl
<< js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype.new_seqid = function() { return this._seqid += 1; }"
+ << "Client.prototype.new_seqid = function() { return this._seqid += 1; };"
<< endl;
}
// Generate client method implementations
@@ -1547,7 +1550,7 @@
<< endl;
} else {
if (gen_node_) {
- indent(f_service_) << "callback(null)" << endl;
+ indent(f_service_) << "callback(null);" << endl;
} else {
indent(f_service_) << "return;" << endl;
}