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

60
tests/monster_test_generated.ts
View File

@@ -234,7 +234,7 @@ constructor(){};
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): 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 * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): 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 * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return Test.createTest(builder, return MyGame.Example.Test.createTest(builder,
this.a, this.a,
this.b this.b
); );
@@ -567,7 +567,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return TestSimpleTableWithEnum.createTestSimpleTableWithEnum(builder, return MyGame.Example.TestSimpleTableWithEnum.createTestSimpleTableWithEnum(builder,
this.color this.color
); );
}; };
@@ -790,7 +790,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return Vec3.createVec3(builder, return MyGame.Example.Vec3.createVec3(builder,
this.x, this.x,
this.y, this.y,
this.z, this.z,
@@ -914,7 +914,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return Ability.createAbility(builder, return MyGame.Example.Ability.createAbility(builder,
this.id, this.id,
this.distance this.distance
); );
@@ -1105,7 +1105,7 @@ constructor(
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const id = (this.id !== null ? builder.createString(this.id!) : 0); const id = (this.id !== null ? builder.createString(this.id!) : 0);
return Stat.createStat(builder, return MyGame.Example.Stat.createStat(builder,
id, id,
this.val, this.val,
this.count this.count
@@ -1235,7 +1235,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return Referrable.createReferrable(builder, return MyGame.Example.Referrable.createReferrable(builder,
this.id this.id
); );
}; };
@@ -3246,29 +3246,29 @@ constructor(
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const name = (this.name !== null ? builder.createString(this.name!) : 0); 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 test = builder.createObjectOffset(this.test);
const test4 = builder.createStructOffsetList(this.test4, Monster.startTest4Vector); const test4 = builder.createStructOffsetList(this.test4, MyGame.Example.Monster.startTest4Vector);
const testarrayofstring = Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring)); const testarrayofstring = MyGame.Example.Monster.createTestarrayofstringVector(builder, builder.createObjectOffsetList(this.testarrayofstring));
const testarrayoftables = Monster.createTestarrayoftablesVector(builder, builder.createObjectOffsetList(this.testarrayoftables)); const testarrayoftables = MyGame.Example.Monster.createTestarrayoftablesVector(builder, builder.createObjectOffsetList(this.testarrayoftables));
const testnestedflatbuffer = Monster.createTestnestedflatbufferVector(builder, this.testnestedflatbuffer); const testnestedflatbuffer = MyGame.Example.Monster.createTestnestedflatbufferVector(builder, this.testnestedflatbuffer);
const testarrayofbools = Monster.createTestarrayofboolsVector(builder, this.testarrayofbools); const testarrayofbools = MyGame.Example.Monster.createTestarrayofboolsVector(builder, this.testarrayofbools);
const testarrayofstring2 = Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2)); const testarrayofstring2 = MyGame.Example.Monster.createTestarrayofstring2Vector(builder, builder.createObjectOffsetList(this.testarrayofstring2));
const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, Monster.startTestarrayofsortedstructVector); const testarrayofsortedstruct = builder.createStructOffsetList(this.testarrayofsortedstruct, MyGame.Example.Monster.startTestarrayofsortedstructVector);
const flex = Monster.createFlexVector(builder, this.flex); const flex = MyGame.Example.Monster.createFlexVector(builder, this.flex);
const test5 = builder.createStructOffsetList(this.test5, Monster.startTest5Vector); const test5 = builder.createStructOffsetList(this.test5, MyGame.Example.Monster.startTest5Vector);
const vectorOfLongs = Monster.createVectorOfLongsVector(builder, this.vectorOfLongs); const vectorOfLongs = MyGame.Example.Monster.createVectorOfLongsVector(builder, this.vectorOfLongs);
const vectorOfDoubles = Monster.createVectorOfDoublesVector(builder, this.vectorOfDoubles); const vectorOfDoubles = MyGame.Example.Monster.createVectorOfDoublesVector(builder, this.vectorOfDoubles);
const vectorOfReferrables = Monster.createVectorOfReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfReferrables)); const vectorOfReferrables = MyGame.Example.Monster.createVectorOfReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfReferrables));
const vectorOfWeakReferences = Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences); const vectorOfWeakReferences = MyGame.Example.Monster.createVectorOfWeakReferencesVector(builder, this.vectorOfWeakReferences);
const vectorOfStrongReferrables = Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables)); const vectorOfStrongReferrables = MyGame.Example.Monster.createVectorOfStrongReferrablesVector(builder, builder.createObjectOffsetList(this.vectorOfStrongReferrables));
const vectorOfCoOwningReferences = Monster.createVectorOfCoOwningReferencesVector(builder, this.vectorOfCoOwningReferences); const vectorOfCoOwningReferences = MyGame.Example.Monster.createVectorOfCoOwningReferencesVector(builder, this.vectorOfCoOwningReferences);
const vectorOfNonOwningReferences = Monster.createVectorOfNonOwningReferencesVector(builder, this.vectorOfNonOwningReferences); const vectorOfNonOwningReferences = MyGame.Example.Monster.createVectorOfNonOwningReferencesVector(builder, this.vectorOfNonOwningReferences);
const anyUnique = builder.createObjectOffset(this.anyUnique); const anyUnique = builder.createObjectOffset(this.anyUnique);
const anyAmbiguous = builder.createObjectOffset(this.anyAmbiguous); 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.pos !== null ? this.pos!.pack(builder) : 0),
this.mana, this.mana,
this.hp, this.hp,
@@ -3885,10 +3885,10 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
const v8 = TypeAliases.createV8Vector(builder, this.v8); const v8 = MyGame.Example.TypeAliases.createV8Vector(builder, this.v8);
const vf64 = TypeAliases.createVf64Vector(builder, this.vf64); const vf64 = MyGame.Example.TypeAliases.createVf64Vector(builder, this.vf64);
return TypeAliases.createTypeAliases(builder, return MyGame.Example.TypeAliases.createTypeAliases(builder,
this.i8, this.i8,
this.u8, this.u8,
this.i16, this.i16,

4
tests/namespace_test/namespace_test1_generated.ts
View File

@@ -133,7 +133,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return TableInNestedNS.createTableInNestedNS(builder, return NamespaceA.NamespaceB.TableInNestedNS.createTableInNestedNS(builder,
this.foo this.foo
); );
}; };
@@ -251,7 +251,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): flatbuffers.Offset { pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return StructInNestedNS.createStructInNestedNS(builder, return NamespaceA.NamespaceB.StructInNestedNS.createStructInNestedNS(builder,
this.a, this.a,
this.b this.b
); );

6
tests/namespace_test/namespace_test2_generated.ts
View File

@@ -167,7 +167,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): 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.fooTable !== null ? this.fooTable!.pack(builder) : 0),
this.fooEnum, this.fooEnum,
(this.fooStruct !== null ? this.fooStruct!.pack(builder) : 0) (this.fooStruct !== null ? this.fooStruct!.pack(builder) : 0)
@@ -305,7 +305,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): 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.referToA1 !== null ? this.referToA1!.pack(builder) : 0),
(this.referToA2 !== null ? this.referToA2!.pack(builder) : 0) (this.referToA2 !== null ? this.referToA2!.pack(builder) : 0)
); );
@@ -420,7 +420,7 @@ constructor(
* @returns flatbuffers.Offset * @returns flatbuffers.Offset
*/ */
pack(builder:flatbuffers.Builder): 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) (this.referToC !== null ? this.referToC!.pack(builder) : 0)
); );
}; };