Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Generting imports for external enums in TS (#5175)

This commit is contained in:
Kamil Rojewski 2019-02-14 22:08:55 +01:00 committed by Wouter van Oortmerssen
parent a66a88034a
commit 224f7527e3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/idl_gen_js_ts.cpp
View File

@ -763,6 +763,10 @@ class JsTsGenerator : public BaseGenerator {
GenPrefixedTypeName(GenTypeName(field.value.type, false, true), GenPrefixedTypeName(GenTypeName(field.value.type, false, true),
field.value.type.enum_def->file) + field.value.type.enum_def->file) +
" {\n"; " {\n";
if (!parser_.opts.generate_all) {
imported_files.insert(field.value.type.enum_def->file);
}
} else { } else {
code += "):" + GenTypeName(field.value.type, false, true) + " {\n"; code += "):" + GenTypeName(field.value.type, false, true) + " {\n";
} }
@ -1259,7 +1263,7 @@ class JsTsGenerator : public BaseGenerator {
// Generate a convenient CreateX function // Generate a convenient CreateX function
code += "static create" + Verbose(struct_def); code += "static create" + Verbose(struct_def);
code += "(builder:flatbuffers.Builder"; code += "(builder:flatbuffers.Builder";
for (auto it = struct_def.fields.vec.begin(); for (auto it = struct_def.fields.vec.begin();
it != struct_def.fields.vec.end(); ++it) { it != struct_def.fields.vec.end(); ++it) {
const auto &field = **it; const auto &field = **it;
@ -1307,7 +1311,7 @@ class JsTsGenerator : public BaseGenerator {
return argname; return argname;
} }
std::string Verbose(const StructDef &struct_def, std::string Verbose(const StructDef &struct_def,
const char* prefix = "") const char* prefix = "")
{ {
return parser_.opts.js_ts_short_names ? "" : prefix + struct_def.name; return parser_.opts.js_ts_short_names ? "" : prefix + struct_def.name;