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

[typescript] Size-prefixed root accessors not taking into account size prefix (#5717)

Browse Source 
* [typescript/javascript] Size-prefixed root accessor needs to account for the size prefix.

* [typescript] Add parentheses after "new" expression.

* Update generated test files
This commit is contained in:
Max Burke
2020-01-20 21:20:52 -08:00
committed by Wouter van Oortmerssen
parent 6da1cf79d9
commit 9cadf05d89
9 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/idl_gen_js_ts.cpp
View File

@@ -600,6 +600,10 @@ class JsTsGenerator : public BaseGenerator {
}
}
std::string GenerateNewExpression(const std::string &object_name) {
return "new " + object_name + (lang_.language == IDLOptions::kTs ? "()" : "");
}
void GenerateRootAccessor(StructDef &struct_def, std::string *code_ptr,
std::string &code, std::string &object_name,
bool size_prefixed) {
@@ -619,7 +623,10 @@ class JsTsGenerator : public BaseGenerator {
"Root" + Verbose(struct_def, "As");
code += " = function(bb, obj) {\n";
}
code += " return (obj || new " + object_name;
if (size_prefixed) {
code += " bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);\n";
}
code += " return (obj || " + GenerateNewExpression(object_name);
code += ").__init(bb.readInt32(bb.position()) + bb.position(), bb);\n";
code += "};\n\n";
}
@@ -858,12 +865,12 @@ class JsTsGenerator : public BaseGenerator {
}
if (struct_def.fixed) {
code += " return (obj || new " + type;
code += " return (obj || " + GenerateNewExpression(type);
code += ").__init(this.bb_pos";
code +=
MaybeAdd(field.value.offset) + ", " + GenBBAccess() + ");\n";
} else {
code += offset_prefix + "(obj || new " + type + ").__init(";
code += offset_prefix + "(obj || " + GenerateNewExpression(type) + ").__init(";
code += field.value.type.struct_def->fixed
? "this.bb_pos + offset"
: GenBBAccess() + ".__indirect(this.bb_pos + offset)";
@@ -945,7 +952,7 @@ class JsTsGenerator : public BaseGenerator {
}
if (vectortype.base_type == BASE_TYPE_STRUCT) {
code += offset_prefix + "(obj || new " + vectortypename;
code += offset_prefix + "(obj || " + GenerateNewExpression(vectortypename);
code += ").__init(";
code += vectortype.struct_def->fixed
? index