Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TS] Fix generation of reserved words in object api (#7106) #7115

Merged
merged 16 commits into from
Feb 22, 2022
Merged

[TS] Fix generation of reserved words in object api (#7106) #7115

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
64639a2
Merge pull request #2 from google/master
tira-misu Oct 1, 2019
1d907c5
Fix C/C++ Create<Type>Direct with sorted vectors
tira-misu Oct 2, 2019
7827687
Changes due to code review
tira-misu Oct 7, 2019
a78916b
Improve code readability
tira-misu Oct 8, 2019
0d9e229
Merge branch 'master' of https://github.com/tira-misu/flatbuffers int…
tira-misu Oct 8, 2020
163d43b
Add generate of JSON schema to string to lib
tira-misu Oct 8, 2020
2793d38
Remove unused variables
tira-misu Oct 8, 2020
79cd673
Fix break in test
tira-misu Oct 8, 2020
6085fe1
Fix style to be consistent with rest of the code
tira-misu Oct 12, 2020
7ae0e9d
Merge branch 'master' of https://github.com/tira-misu/flatbuffers int…
tira-misu Dec 1, 2020
0219f66
Merge remote-tracking branch 'upstream/master' into master
tira-misu Feb 8, 2021
8643e11
Merge branch 'master' of https://github.com/google/flatbuffers
tira-misu Jul 26, 2021
b837543
Merge branch 'google:master' into master
tira-misu Nov 25, 2021
eff8031
[TS] Fix reserved words as arguments (#6955)
tira-misu Nov 25, 2021
3aa4f37
Merge remote-tracking branch 'github/master'
tira-misu Feb 17, 2022
fd6a5bb
[TS] Fix generation of reserved words in object api (#7106)
tira-misu Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions src/idl_gen_ts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class TsGenerator : public BaseGenerator {
// https://github.com/microsoft/TypeScript/issues/2536
// One per line to ease comparisons to that list are easier
static const char *const keywords[] = {
"argument",
"break",
"case",
"catch",
Expand Down Expand Up @@ -894,6 +895,7 @@ class TsGenerator : public BaseGenerator {
if (field.deprecated) continue;

const auto field_name = MakeCamel(field.name, false);
const auto field_name_escaped = EscapeKeyword(field_name);
const std::string field_binded_method =
"this." + field_name + ".bind(this)";

Expand All @@ -918,11 +920,11 @@ class TsGenerator : public BaseGenerator {
field_val = "this." + field_name + "()";

if (field.value.type.base_type != BASE_TYPE_STRING) {
field_offset_val = "this." + field_name;
field_offset_val = "this." + field_name_escaped;
} else {
field_offset_decl = GenNullCheckConditional(
"this." + field_name,
"builder.createString(this." + field_name + "!)", "0");
"this." + field_name_escaped,
"builder.createString(this." + field_name_escaped + "!)", "0");
}
}

Expand All @@ -934,11 +936,13 @@ class TsGenerator : public BaseGenerator {
const auto &sd = *field.value.type.struct_def;
field_type += GetObjApiClassName(sd, parser.opts);

const std::string field_accessor = "this." + field_name + "()";
const std::string field_accessor =
"this." + field_name_escaped + "()";
field_val = GenNullCheckConditional(field_accessor,
field_accessor + "!.unpack()");
auto packing = GenNullCheckConditional(
"this." + field_name, "this." + field_name + "!.pack(builder)",
"this." + field_name_escaped,
"this." + field_name_escaped + "!.pack(builder)",
"0");

if (sd.fixed) {
Expand Down Expand Up @@ -970,15 +974,16 @@ class TsGenerator : public BaseGenerator {

if (sd.fixed) {
field_offset_decl =
"builder.createStructOffsetList(this." + field_name +
"builder.createStructOffsetList(this." +
field_name_escaped +
", " + AddImport(imports, struct_def, struct_def) +
".start" + MakeCamel(field_name) + "Vector)";
} else {
field_offset_decl =
AddImport(imports, struct_def, struct_def) + ".create" +
MakeCamel(field_name) +
"Vector(builder, builder.createObjectOffsetList(" +
"this." + field_name + "))";
"this." + field_name_escaped + "))";
}

break;
Expand All @@ -993,7 +998,7 @@ class TsGenerator : public BaseGenerator {
AddImport(imports, struct_def, struct_def) + ".create" +
MakeCamel(field_name) +
"Vector(builder, builder.createObjectOffsetList(" +
"this." + field_name + "))";
"this." + field_name_escaped + "))";
break;
}

Expand All @@ -1008,7 +1013,7 @@ class TsGenerator : public BaseGenerator {
AddImport(imports, struct_def, struct_def) + ".create" +
MakeCamel(field_name) +
"Vector(builder, builder.createObjectOffsetList(" +
"this." + field_name + "))";
"this." + field_name_escaped + "))";

break;
}
Expand All @@ -1026,7 +1031,8 @@ class TsGenerator : public BaseGenerator {

field_offset_decl = AddImport(imports, struct_def, struct_def) +
".create" + MakeCamel(field_name) +
"Vector(builder, this." + field_name + ")";
"Vector(builder, this." +
field_name_escaped + ")";

break;
}
Expand All @@ -1041,7 +1047,7 @@ class TsGenerator : public BaseGenerator {

field_val = GenUnionValTS(imports, field_name, field.value.type);
field_offset_decl =
"builder.createObjectOffset(this." + field_name + ")";
"builder.createObjectOffset(this." + field_name_escaped + ")";
break;
}

Expand All @@ -1054,14 +1060,15 @@ class TsGenerator : public BaseGenerator {

if (!field_offset_decl.empty()) {
field_offset_decl =
" const " + field_name + " = " + field_offset_decl + ";";
" const " + field_name_escaped + " = " + field_offset_decl + ";";
}
if (field_offset_val.empty()) { field_offset_val = field_name; }
if (field_offset_val.empty()) { field_offset_val = field_name_escaped; }

unpack_func += " " + field_val;
unpack_to_func += " _o." + field_name + " = " + field_val + ";";
unpack_to_func += " _o." + field_name_escaped + " = " + field_val + ";";

constructor_func += " public " + field_name + ": " + field_type + " = " +
constructor_func += " public " + field_name_escaped + ": " + field_type +
" = " +
field_default_val;

if (!struct_def.fixed) {
Expand Down