BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-02 17:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using proper symbol name for reexport (#6021)

Browse Source 
Co-authored-by: Kamil Rojewski <kamil.rojewski@gmail.com>
This commit is contained in:
Kamil Rojewski
2020-07-06 17:40:56 +02:00
committed by GitHub
parent 515a4052a7
commit 969d0f7a63
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/idl_gen_js_ts.cpp
View File

@@ -134,12 +134,14 @@ class JsTsGenerator : public BaseGenerator {
return; return;
} }
std::unordered_set<std::string> imported;
std::string &code = *code_ptr; std::string &code = *code_ptr;
for (auto it = reexports.begin(); it != reexports.end(); ++it) { for (auto it = reexports.begin(); it != reexports.end(); ++it) {
const auto &file = *it; const auto &file = *it;
const auto basename = const auto basename =
flatbuffers::StripPath(flatbuffers::StripExtension(file.first)); flatbuffers::StripPath(flatbuffers::StripExtension(file.first));
if (basename != file_name_) { if (basename != file_name_ && imported.find(file.second.symbol) == imported.end()) {
if (imported_files.find(file.first) == imported_files.end()) { if (imported_files.find(file.first) == imported_files.end()) {
code += GenPrefixedImport(file.first, basename); code += GenPrefixedImport(file.first, basename);
imported_files.emplace(file.first); imported_files.emplace(file.first);
@@ -155,6 +157,8 @@ class JsTsGenerator : public BaseGenerator {
} }
code += file.second.symbol + ";\n"; code += file.second.symbol + ";\n";
if (!file.second.target_namespace.empty()) { code += "}\n"; } if (!file.second.target_namespace.empty()) { code += "}\n"; }
imported.emplace(file.second.symbol);
} }
} }
} }
@@ -366,7 +370,7 @@ class JsTsGenerator : public BaseGenerator {
code += (it + 1) != enum_def.Vals().end() ? ",\n" : "\n"; code += (it + 1) != enum_def.Vals().end() ? ",\n" : "\n";
if (ev.union_type.struct_def) { if (ev.union_type.struct_def) {
ReexportDescription desc = { ev.name, ReexportDescription desc = { ev.union_type.struct_def->name,
GetNameSpace(*ev.union_type.struct_def), GetNameSpace(*ev.union_type.struct_def),
GetNameSpace(enum_def) }; GetNameSpace(enum_def) };
reexports.insert( reexports.insert(
@@ -977,7 +981,7 @@ class JsTsGenerator : public BaseGenerator {
GenTypeAnnotation(kParam, "flatbuffers.Builder", "builder") + " * " + GenTypeAnnotation(kParam, "flatbuffers.Builder", "builder") + " * " +
GenTypeAnnotation(kReturns, "flatbuffers.Offset", "") + GenTypeAnnotation(kReturns, "flatbuffers.Offset", "") +
" */\npack(builder:flatbuffers.Builder): flatbuffers.Offset {\n"; " */\npack(builder:flatbuffers.Builder): flatbuffers.Offset {\n";
std::string pack_func_offset_decl; std::string pack_func_offset_decl;
std::string pack_func_create_call; std::string pack_func_create_call;
@@ -992,7 +996,7 @@ class JsTsGenerator : public BaseGenerator {
} else { } else {
pack_func_create_call = " " + struct_name + ".start(builder);\n"; pack_func_create_call = " " + struct_name + ".start(builder);\n";
} }
if (struct_def.fixed) { if (struct_def.fixed) {
// when packing struct, nested struct's members instead of the struct's // when packing struct, nested struct's members instead of the struct's
// offset are used // offset are used