Merge branch 'master' into grpc_callbackservice

Author: aardappel

src/idl_gen_ts.cpp

@@ -1944,11 +1944,15 @@ class TsGenerator : public BaseGenerator {
 
     // Emit the fully qualified name
     if (parser_.opts.generate_name_strings) {
+      const std::string fullyQualifiedName = struct_def.defined_namespace->GetFullyQualifiedName(struct_def.name);
+
       GenDocComment(code_ptr);
-      code += "static getFullyQualifiedName():string {\n";
+      code += "static getFullyQualifiedName(): \"";
+      code += fullyQualifiedName;
+      code += "\" {\n";
       code +=
           "  return '" +
-          struct_def.defined_namespace->GetFullyQualifiedName(struct_def.name) +
+          fullyQualifiedName +
           "';\n";
       code += "}\n\n";
     }

tests/ts/my-game/example/ability.ts

@@ -33,7 +33,7 @@ mutate_distance(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Ability" {
   return 'MyGame.Example.Ability';
 }
 

tests/ts/my-game/example/monster.ts

@@ -813,7 +813,7 @@ mutate_double_inf_default(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Monster" {
   return 'MyGame.Example.Monster';
 }
 

tests/ts/my-game/example/referrable.ts

@@ -40,7 +40,7 @@ mutate_id(value:bigint):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Referrable" {
   return 'MyGame.Example.Referrable';
 }
 

tests/ts/my-game/example/stat.ts

@@ -63,7 +63,7 @@ mutate_count(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Stat" {
   return 'MyGame.Example.Stat';
 }
 

tests/ts/my-game/example/struct-of-structs-of-structs.ts

@@ -20,7 +20,7 @@ a(obj?:StructOfStructs):StructOfStructs|null {
   return (obj || new StructOfStructs()).__init(this.bb_pos, this.bb!);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.StructOfStructsOfStructs" {
   return 'MyGame.Example.StructOfStructsOfStructs';
 }
 

tests/ts/my-game/example/struct-of-structs.ts

@@ -29,7 +29,7 @@ c(obj?:Ability):Ability|null {
   return (obj || new Ability()).__init(this.bb_pos + 12, this.bb!);
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.StructOfStructs" {
   return 'MyGame.Example.StructOfStructs';
 }
 

tests/ts/my-game/example/test-simple-table-with-enum.ts

@@ -41,7 +41,7 @@ mutate_color(value:Color):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.TestSimpleTableWithEnum" {
   return 'MyGame.Example.TestSimpleTableWithEnum';
 }
 

tests/ts/my-game/example/test.ts

@@ -33,7 +33,7 @@ mutate_b(value:number):boolean {
   return true;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.Test" {
   return 'MyGame.Example.Test';
 }
 

tests/ts/my-game/example/type-aliases.ts

@@ -214,7 +214,7 @@ vf64Array():Float64Array|null {
   return offset ? new Float64Array(this.bb!.bytes().buffer, this.bb!.bytes().byteOffset + this.bb!.__vector(this.bb_pos + offset), this.bb!.__vector_len(this.bb_pos + offset)) : null;
 }
 
-static getFullyQualifiedName():string {
+static getFullyQualifiedName(): "MyGame.Example.TypeAliases" {
   return 'MyGame.Example.TypeAliases';
 }