diff --git a/src/idl_gen_js_ts.cpp b/src/idl_gen_js_ts.cpp index 199e20abf..6c6f2f0aa 100644 --- a/src/idl_gen_js_ts.cpp +++ b/src/idl_gen_js_ts.cpp @@ -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; } diff --git a/tests/monster_test_generated.ts b/tests/monster_test_generated.ts index 75688e343..34e09bcea 100644 --- a/tests/monster_test_generated.ts +++ b/tests/monster_test_generated.ts @@ -234,7 +234,7 @@ constructor(){}; * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return InParentNamespace.createInParentNamespace(builder); + return MyGame.InParentNamespace.createInParentNamespace(builder); }; } } @@ -321,7 +321,7 @@ constructor(){}; * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return Monster.createMonster(builder); + return MyGame.Example2.Monster.createMonster(builder); }; } } @@ -438,7 +438,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return Test.createTest(builder, + return MyGame.Example.Test.createTest(builder, this.a, this.b ); @@ -567,7 +567,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return TestSimpleTableWithEnum.createTestSimpleTableWithEnum(builder, + return MyGame.Example.TestSimpleTableWithEnum.createTestSimpleTableWithEnum(builder, this.color ); }; @@ -790,7 +790,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return Vec3.createVec3(builder, + return MyGame.Example.Vec3.createVec3(builder, this.x, this.y, this.z, @@ -914,7 +914,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return Ability.createAbility(builder, + return MyGame.Example.Ability.createAbility(builder, this.id, this.distance ); @@ -1105,7 +1105,7 @@ constructor( pack(builder:flatbuffers.Builder): flatbuffers.Offset { const id = (this.id !== null ? builder.createString(this.id!) : 0); - return Stat.createStat(builder, + return MyGame.Example.Stat.createStat(builder, id, this.val, this.count @@ -1235,7 +1235,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return Referrable.createReferrable(builder, + return MyGame.Example.Referrable.createReferrable(builder, this.id ); }; @@ -3246,29 +3246,29 @@ constructor( */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { const name = (this.name !== null ? builder.createString(this.name!) : 0); - const inventory = Monster.createInventoryVector(builder, this.inventory); + const inventory = MyGame.Example.Monster.createInventoryVector(builder, this.inventory); const test = builder.createObjectOffset(this.test); - const test4 = builder.createStructOffsetList(this.test4, Monster.startTest4Vector); - const testarrayofstring = Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring)); - const testarrayoftables = Monster.createTestarrayoftablesVector(builder, builder.createObjectOffsetList(this.testarrayoftables)); - const testnestedflatbuffer = Monster.createTestnestedflatbufferVector(builder, this.testnestedflatbuffer); - const testarrayofbools = Monster.createTestarrayofboolsVector(builder, this.testarrayofbools); - const testarrayofstring2 = Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2)); - const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, Monster.startTestarrayofsortedstructVector); - const flex = Monster.createFlexVector(builder, this.flex); - const test5 = builder.createStructOffsetList(this.test5, Monster.startTest5Vector); - const vectorOfLongs = Monster.createVectorOfLongsVector(builder, this.vectorOfLongs); - const vectorOfDoubles = Monster.createVectorOfDoublesVector(builder, this.vectorOfDoubles); - const vectorOfReferrables = Monster.createVectorOfReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfReferrables)); - const vectorOfWeakReferences = Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences); - const vectorOfStrongReferrables = Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables)); - const vectorOfCoOwningReferences = Monster.createVectorOfCoOwningReferencesVector(builder, this.vectorOfCoOwningReferences); - const vectorOfNonOwningReferences = Monster.createVectorOfNonOwningReferencesVector(builder, this.vectorOfNonOwningReferences); + const test4 = builder.createStructOffsetList(this.test4, MyGame.Example.Monster.startTest4Vector); + const testarrayofstring = MyGame.Example.Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring)); + const testarrayoftables = MyGame.Example.Monster.createTestarrayoftablesVector(builder, builder.createObjectOffsetList(this.testarrayoftables)); + const testnestedflatbuffer = MyGame.Example.Monster.createTestnestedflatbufferVector(builder, this.testnestedflatbuffer); + const testarrayofbools = MyGame.Example.Monster.createTestarrayofboolsVector(builder, this.testarrayofbools); + const testarrayofstring2 = MyGame.Example.Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2)); + const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, MyGame.Example.Monster.startTestarrayofsortedstructVector); + const flex = MyGame.Example.Monster.createFlexVector(builder, this.flex); + const test5 = builder.createStructOffsetList(this.test5, MyGame.Example.Monster.startTest5Vector); + const vectorOfLongs = MyGame.Example.Monster.createVectorOfLongsVector(builder, this.vectorOfLongs); + const vectorOfDoubles = MyGame.Example.Monster.createVectorOfDoublesVector(builder, this.vectorOfDoubles); + const vectorOfReferrables = MyGame.Example.Monster.createVectorOfReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfReferrables)); + const vectorOfWeakReferences = MyGame.Example.Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences); + const vectorOfStrongReferrables = MyGame.Example.Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables)); + const vectorOfCoOwningReferences = MyGame.Example.Monster.createVectorOfCoOwningReferencesVector(builder, this.vectorOfCoOwningReferences); + const vectorOfNonOwningReferences = MyGame.Example.Monster.createVectorOfNonOwningReferencesVector(builder, this.vectorOfNonOwningReferences); const anyUnique = builder.createObjectOffset(this.anyUnique); const anyAmbiguous = builder.createObjectOffset(this.anyAmbiguous); - const vectorOfEnums = Monster.createVectorOfEnumsVector(builder, this.vectorOfEnums); + const vectorOfEnums = MyGame.Example.Monster.createVectorOfEnumsVector(builder, this.vectorOfEnums); - return Monster.createMonster(builder, + return MyGame.Example.Monster.createMonster(builder, (this.pos !== null ? this.pos!.pack(builder) : 0), this.mana, this.hp, @@ -3885,10 +3885,10 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - const v8 = TypeAliases.createV8Vector(builder, this.v8); - const vf64 = TypeAliases.createVf64Vector(builder, this.vf64); + const v8 = MyGame.Example.TypeAliases.createV8Vector(builder, this.v8); + const vf64 = MyGame.Example.TypeAliases.createVf64Vector(builder, this.vf64); - return TypeAliases.createTypeAliases(builder, + return MyGame.Example.TypeAliases.createTypeAliases(builder, this.i8, this.u8, this.i16, diff --git a/tests/namespace_test/namespace_test1_generated.ts b/tests/namespace_test/namespace_test1_generated.ts index 344893974..eb59054d0 100644 --- a/tests/namespace_test/namespace_test1_generated.ts +++ b/tests/namespace_test/namespace_test1_generated.ts @@ -133,7 +133,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return TableInNestedNS.createTableInNestedNS(builder, + return NamespaceA.NamespaceB.TableInNestedNS.createTableInNestedNS(builder, this.foo ); }; @@ -251,7 +251,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return StructInNestedNS.createStructInNestedNS(builder, + return NamespaceA.NamespaceB.StructInNestedNS.createStructInNestedNS(builder, this.a, this.b ); diff --git a/tests/namespace_test/namespace_test2_generated.ts b/tests/namespace_test/namespace_test2_generated.ts index b8983b17b..6b4549d02 100644 --- a/tests/namespace_test/namespace_test2_generated.ts +++ b/tests/namespace_test/namespace_test2_generated.ts @@ -167,7 +167,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return TableInFirstNS.createTableInFirstNS(builder, + return NamespaceA.TableInFirstNS.createTableInFirstNS(builder, (this.fooTable !== null ? this.fooTable!.pack(builder) : 0), this.fooEnum, (this.fooStruct !== null ? this.fooStruct!.pack(builder) : 0) @@ -305,7 +305,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return TableInC.createTableInC(builder, + return NamespaceC.TableInC.createTableInC(builder, (this.referToA1 !== null ? this.referToA1!.pack(builder) : 0), (this.referToA2 !== null ? this.referToA2!.pack(builder) : 0) ); @@ -420,7 +420,7 @@ constructor( * @returns flatbuffers.Offset */ pack(builder:flatbuffers.Builder): flatbuffers.Offset { - return SecondTableInA.createSecondTableInA(builder, + return NamespaceA.SecondTableInA.createSecondTableInA(builder, (this.referToC !== null ? this.referToC!.pack(builder) : 0) ); };