BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-12 16:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TS] Make Obj-API work with --short-names (#5898)

Browse Source 
* changed function used for getting struct name

* re-generated code
This commit is contained in:
Khoi Dinh Trinh
2020-05-11 14:55:57 -07:00
committed by GitHub
parent 12ed1fe4a9
commit e7f3b16905
4 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/idl_gen_js_ts.cpp
View File

@@ -153,9 +153,7 @@ class JsTsGenerator : public BaseGenerator {
code += file.second.source_namespace + ".";
}
code += file.second.symbol + ";\n";
if (!file.second.target_namespace.empty()) {
code += "}\n";
}
if (!file.second.target_namespace.empty()) { code += "}\n"; }
}
}
}
@@ -977,8 +975,10 @@ class JsTsGenerator : public BaseGenerator {
" */\npack(builder:flatbuffers.Builder): flatbuffers.Offset {\n";
std::string pack_func_offset_decl;
std::string pack_func_create_call =
" return " + Verbose(struct_def) + ".create" + Verbose(struct_def) +
"(builder" + (struct_def.fields.vec.empty() ? "" : ",\n ");
" return " +
GenPrefixedTypeName(WrapInNameSpace(struct_def), struct_def.file) +
".create" + Verbose(struct_def) + "(builder" +
(struct_def.fields.vec.empty() ? "" : ",\n ");
if (struct_def.fixed) {
// when packing struct, nested struct's members instead of the struct's
// offset are used
@@ -1070,13 +1070,17 @@ class JsTsGenerator : public BaseGenerator {
"Length())";
if (sd.fixed) {
field_offset_decl = "builder.createStructOffsetList(this." +
field_name + ", " + Verbose(struct_def) +
".start" + MakeCamel(field_name) +
"Vector)";
field_offset_decl =
"builder.createStructOffsetList(this." + field_name +
", " +
GenPrefixedTypeName(WrapInNameSpace(struct_def),
struct_def.file) +
".start" + MakeCamel(field_name) + "Vector)";
} else {
field_offset_decl =
Verbose(struct_def) + ".create" + MakeCamel(field_name) +
GenPrefixedTypeName(WrapInNameSpace(struct_def),
struct_def.file) +
".create" + MakeCamel(field_name) +
"Vector(builder, builder.createObjectOffsetList(" +
"this." + field_name + "))";
}
@@ -1090,7 +1094,9 @@ class JsTsGenerator : public BaseGenerator {
field_binded_method + ", this." + field_name +
"Length())";
field_offset_decl =
Verbose(struct_def) + ".create" + MakeCamel(field_name) +
GenPrefixedTypeName(WrapInNameSpace(struct_def),
struct_def.file) +
".create" + MakeCamel(field_name) +
"Vector(builder, builder.createObjectOffsetList(" +
"this." + field_name + "))";
break;
@@ -1103,7 +1109,9 @@ class JsTsGenerator : public BaseGenerator {
field_val = GenUnionValTS(field_name, vectortype, true);
field_offset_decl =
Verbose(struct_def) + ".create" + MakeCamel(field_name) +
GenPrefixedTypeName(WrapInNameSpace(struct_def),
struct_def.file) +
".create" + MakeCamel(field_name) +
"Vector(builder, builder.createObjectOffsetList(" +
"this." + field_name + "))";
@@ -1122,9 +1130,11 @@ class JsTsGenerator : public BaseGenerator {
field_binded_method + ", this." + field_name +
"Length())";
field_offset_decl = Verbose(struct_def) + ".create" +
MakeCamel(field_name) +
"Vector(builder, this." + field_name + ")";
field_offset_decl =
GenPrefixedTypeName(WrapInNameSpace(struct_def),
struct_def.file) +
".create" + MakeCamel(field_name) +
"Vector(builder, this." + field_name + ")";
break;
}