From 346c72c0d05b83489b4bec10bb4920c9c9ae8bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20J=C3=A4ger?= Date: Thu, 6 May 2021 12:07:40 +0200 Subject: =?UTF-8?q?THRIFT-3508=20Map=20optional=20fields=20from=20thrift?= =?UTF-8?q?=20idl=20to=20optional=20fields=20in=20TypeScript.=20Client:=20?= =?UTF-8?q?node,js=20Patch:=20Axel=20J=C3=A4ger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This closes #2386 --- compiler/cpp/src/thrift/generate/t_js_generator.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'compiler') diff --git a/compiler/cpp/src/thrift/generate/t_js_generator.cc b/compiler/cpp/src/thrift/generate/t_js_generator.cc index fddcef49a..48d7250be 100644 --- a/compiler/cpp/src/thrift/generate/t_js_generator.cc +++ b/compiler/cpp/src/thrift/generate/t_js_generator.cc @@ -909,13 +909,9 @@ void t_js_generator::generate_js_struct_definition(ostream& out, out << indent() << dval << ";" << endl; } if (gen_ts_) { - if (gen_node_) { - f_types_ts_ << ts_indent() << "public " << (*m_iter)->get_name() << ": " - << ts_get_type((*m_iter)->get_type()) << ";" << endl; - } else { - f_types_ts_ << ts_indent() << (*m_iter)->get_name() << ": " - << ts_get_type((*m_iter)->get_type()) << ";" << endl; - } + string ts_access = gen_node_ ? "public " : ""; + f_types_ts_ << ts_indent() << ts_access << (*m_iter)->get_name() << ts_get_req(*m_iter) << ": " + << ts_get_type((*m_iter)->get_type()) << ";" << endl; } } -- cgit v1.2.1