From 48cf09ec32f5f650f8ed8a4e2c6d2c0be03882eb Mon Sep 17 00:00:00 2001 From: Didier Villevalois Date: Sat, 6 Feb 2021 13:53:26 +0100 Subject: [PATCH 1/2] [TS/JS] Fix TS code gen after #6420 --- src/idl_gen_ts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/idl_gen_ts.cpp b/src/idl_gen_ts.cpp index 915b05e41fd..f8829e48c2c 100644 --- a/src/idl_gen_ts.cpp +++ b/src/idl_gen_ts.cpp @@ -1489,7 +1489,7 @@ class TsGenerator : public BaseGenerator { it != struct_def.fields.vec.end(); ++it) { auto &field = **it; if (!field.deprecated && field.IsRequired()) { - code += " builder.IsRequired()Field(offset, "; + code += " builder.requiredField(offset, "; code += NumToString(field.value.offset); code += ") // " + field.name + "\n"; } From cf782edfa0f7a4b95b28d86570509da660b3909e Mon Sep 17 00:00:00 2001 From: Didier Villevalois Date: Sat, 6 Feb 2021 14:04:07 +0100 Subject: [PATCH 2/2] Outdated generated file by make --- .../namespace_test/namespace_test1_generated.h | 9 --------- .../namespace_test/namespace_test2_generated.h | 18 ------------------ tests/union_vector/union_vector_generated.h | 18 ------------------ 3 files changed, 45 deletions(-) diff --git a/tests/namespace_test/namespace_test1_generated.h b/tests/namespace_test/namespace_test1_generated.h index 540fa251746..05186fe6bf3 100644 --- a/tests/namespace_test/namespace_test1_generated.h +++ b/tests/namespace_test/namespace_test1_generated.h @@ -170,9 +170,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS static const flatbuffers::TypeTable *MiniReflectTypeTable() { return StructInNestedNSTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.NamespaceB.StructInNestedNS"; - } StructInNestedNS() : a_(0), b_(0) { @@ -209,9 +206,6 @@ inline bool operator!=(const StructInNestedNS &lhs, const StructInNestedNS &rhs) struct TableInNestedNST : public flatbuffers::NativeTable { typedef TableInNestedNS TableType; - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.NamespaceB.TableInNestedNST"; - } int32_t foo = 0; }; @@ -231,9 +225,6 @@ struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return TableInNestedNSTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.NamespaceB.TableInNestedNS"; - } enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_FOO = 4 }; diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h index 968e240ccb1..b7fc67209f2 100644 --- a/tests/namespace_test/namespace_test2_generated.h +++ b/tests/namespace_test/namespace_test2_generated.h @@ -59,9 +59,6 @@ inline const flatbuffers::TypeTable *SecondTableInATypeTable(); struct TableInFirstNST : public flatbuffers::NativeTable { typedef TableInFirstNS TableType; - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.TableInFirstNST"; - } flatbuffers::unique_ptr foo_table{}; NamespaceA::NamespaceB::EnumInNestedNS foo_enum = NamespaceA::NamespaceB::EnumInNestedNS_A; NamespaceA::NamespaceB::UnionInNestedNSUnion foo_union{}; @@ -87,9 +84,6 @@ struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return TableInFirstNSTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.TableInFirstNS"; - } enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_FOO_TABLE = 4, VT_FOO_ENUM = 6, @@ -202,9 +196,6 @@ namespace NamespaceC { struct TableInCT : public flatbuffers::NativeTable { typedef TableInC TableType; - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceC.TableInCT"; - } flatbuffers::unique_ptr refer_to_a1{}; flatbuffers::unique_ptr refer_to_a2{}; }; @@ -226,9 +217,6 @@ struct TableInC FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return TableInCTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceC.TableInC"; - } enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_REFER_TO_A1 = 4, VT_REFER_TO_A2 = 6 @@ -297,9 +285,6 @@ namespace NamespaceA { struct SecondTableInAT : public flatbuffers::NativeTable { typedef SecondTableInA TableType; - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.SecondTableInAT"; - } flatbuffers::unique_ptr refer_to_c{}; }; @@ -319,9 +304,6 @@ struct SecondTableInA FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return SecondTableInATypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "NamespaceA.SecondTableInA"; - } enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_REFER_TO_C = 4 }; diff --git a/tests/union_vector/union_vector_generated.h b/tests/union_vector/union_vector_generated.h index c819c98ad52..eba87a80195 100644 --- a/tests/union_vector/union_vector_generated.h +++ b/tests/union_vector/union_vector_generated.h @@ -202,9 +202,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return RapunzelTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "Rapunzel"; - } Rapunzel() : hair_length_(0) { } @@ -238,9 +235,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return BookReaderTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "BookReader"; - } BookReader() : books_read_(0) { } @@ -268,9 +262,6 @@ inline bool operator!=(const BookReader &lhs, const BookReader &rhs) { struct AttackerT : public flatbuffers::NativeTable { typedef Attacker TableType; - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "AttackerT"; - } int32_t sword_attack_damage = 0; }; @@ -290,9 +281,6 @@ struct Attacker FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return AttackerTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "Attacker"; - } enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SWORD_ATTACK_DAMAGE = 4 }; @@ -342,9 +330,6 @@ flatbuffers::Offset CreateAttacker(flatbuffers::FlatBufferBuilder &_fb struct MovieT : public flatbuffers::NativeTable { typedef Movie TableType; - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "MovieT"; - } CharacterUnion main_character{}; std::vector characters{}; }; @@ -366,9 +351,6 @@ struct Movie FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { static const flatbuffers::TypeTable *MiniReflectTypeTable() { return MovieTypeTable(); } - static FLATBUFFERS_CONSTEXPR const char *GetFullyQualifiedName() { - return "Movie"; - } enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_MAIN_CHARACTER_TYPE = 4, VT_MAIN_CHARACTER = 6,