From f5c864c1c9b1f37ef60eb76500715721fb810e68 Mon Sep 17 00:00:00 2001 From: Yunchi Luo Date: Thu, 7 Jan 2016 11:41:05 -0500 Subject: [PATCH] Respect include paths for generated javascript --- compiler/cpp/src/generate/t_js_generator.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc index cb0e181ba29..cb3b12ec9bf 100644 --- a/compiler/cpp/src/generate/t_js_generator.cc +++ b/compiler/cpp/src/generate/t_js_generator.cc @@ -389,8 +389,9 @@ string t_js_generator::render_includes() { if (gen_node_) { const vector& includes = program_->get_includes(); for (size_t i = 0; i < includes.size(); ++i) { - result += "var " + make_valid_nodeJs_identifier(includes[i]->get_name()) + "_ttypes = require('./" + includes[i]->get_name() - + "_types');\n"; + result += "var " + make_valid_nodeJs_identifier(includes[i]->get_name()) + + "_ttypes = require('./" + includes[i]->get_include_prefix() + + includes[i]->get_name() + "_types');\n"; } if (includes.size() > 0) { result += "\n"; @@ -943,6 +944,7 @@ void t_js_generator::generate_service(t_service* tservice) { if (gen_node_) { if (tservice->get_extends() != NULL) { f_service_ << "var " << tservice->get_extends()->get_name() << " = require('./" + << tservice->get_extends()->get_program()->get_include_prefix() << tservice->get_extends()->get_name() << "');" << endl << "var " << tservice->get_extends()->get_name() << "Client = " << tservice->get_extends()->get_name() << ".Client;" << endl