Update JavaScript IDL generator to remove invalid Closure JSDoc comments (#4873)

* Update JavaScript IDL generator to remove invalid Closure JSDoc comments * Revert erroneous changes * A few more tweaks * Updated generated code
2026-06-18 06:54:26 +00:00 · 2018-08-10 15:27:51 -07:00
parent 12e5cf0b29
commit aaa89429d3
9 changed files with 835 additions and 880 deletions
--- a/tests/monster_test.bfbs
+++ b/tests/monster_test.bfbs
--- a/tests/monster_test_generated.ts
+++ b/tests/monster_test_generated.ts
--- a/tests/monster_test_my_game.example2_generated.dart
+++ b/tests/monster_test_my_game.example2_generated.dart
@@ -6,8 +6,8 @@ library my_game.example2;
 import 'dart:typed_data' show Uint8List;
 import 'package:flat_buffers/flat_buffers.dart' as fb;

-import './monster_test_my_game.example_generated.dart' as my_game_example;
 import './monster_test_my_game_generated.dart' as my_game;
+import './monster_test_my_game.example_generated.dart' as my_game_example;

 class Monster {
  Monster._(this._bc, this._bcOffset);
--- a/tests/monster_test_my_game_generated.dart
+++ b/tests/monster_test_my_game_generated.dart
@@ -6,8 +6,8 @@ library my_game;
 import 'dart:typed_data' show Uint8List;
 import 'package:flat_buffers/flat_buffers.dart' as fb;

-import './monster_test_my_game.example_generated.dart' as my_game_example;
 import './monster_test_my_game.example2_generated.dart' as my_game_example2;
+import './monster_test_my_game.example_generated.dart' as my_game_example;

 class InParentNamespace {
  InParentNamespace._(this._bc, this._bcOffset);
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
@@ -2,13 +2,14 @@

 package NamespaceB

+type EnumInNestedNS = int8
 const (
-	EnumInNestedNSA = 0
-	EnumInNestedNSB = 1
-	EnumInNestedNSC = 2
+	EnumInNestedNSA EnumInNestedNS = 0
+	EnumInNestedNSB EnumInNestedNS = 1
+	EnumInNestedNSC EnumInNestedNS = 2
 )

-var EnumNamesEnumInNestedNS = map[int]string{
+var EnumNamesEnumInNestedNS = map[EnumInNestedNS]string{
 	EnumInNestedNSA:"A",
 	EnumInNestedNSB:"B",
 	EnumInNestedNSC:"C",
--- a/tests/namespace_test/namespace_test1_generated.ts
+++ b/tests/namespace_test/namespace_test1_generated.ts
@@ -15,19 +15,13 @@ export enum EnumInNestedNS{
 */
 export namespace NamespaceA.NamespaceB{
 export class TableInNestedNS {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {TableInNestedNS}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns TableInNestedNS
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):TableInNestedNS {
  this.bb_pos = i;
@@ -36,16 +30,16 @@ __init(i:number, bb:flatbuffers.ByteBuffer):TableInNestedNS {
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @param {TableInNestedNS=} obj
- * @returns {TableInNestedNS}
+ * @param flatbuffers.ByteBuffer bb
+ * @param TableInNestedNS= obj
+ * @returns TableInNestedNS
 */
 static getRootAsTableInNestedNS(bb:flatbuffers.ByteBuffer, obj?:TableInNestedNS):TableInNestedNS {
  return (obj || new TableInNestedNS).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 };

 /**
- * @returns {number}
+ * @returns number
 */
 foo():number {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -53,8 +47,8 @@ foo():number {
 };

 /**
- * @param {number} value
- * @returns {boolean}
+ * @param number value
+ * @returns boolean
 */
 mutate_foo(value:number):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -68,23 +62,23 @@ mutate_foo(value:number):boolean {
 };

 /**
- * @param {flatbuffers.Builder} builder
+ * @param flatbuffers.Builder builder
 */
 static startTableInNestedNS(builder:flatbuffers.Builder) {
  builder.startObject(1);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} foo
+ * @param flatbuffers.Builder builder
+ * @param number foo
 */
 static addFoo(builder:flatbuffers.Builder, foo:number) {
  builder.addFieldInt32(0, foo, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
 */
 static endTableInNestedNS(builder:flatbuffers.Builder):flatbuffers.Offset {
  var offset = builder.endObject();
@@ -98,19 +92,13 @@ static endTableInNestedNS(builder:flatbuffers.Builder):flatbuffers.Offset {
 */
 export namespace NamespaceA.NamespaceB{
 export class StructInNestedNS {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {StructInNestedNS}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns StructInNestedNS
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):StructInNestedNS {
  this.bb_pos = i;
@@ -119,15 +107,15 @@ __init(i:number, bb:flatbuffers.ByteBuffer):StructInNestedNS {
 };

 /**
- * @returns {number}
+ * @returns number
 */
 a():number {
  return this.bb!.readInt32(this.bb_pos);
 };

 /**
- * @param {number} value
- * @returns {boolean}
+ * @param number value
+ * @returns boolean
 */
 mutate_a(value:number):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 0);
@@ -141,15 +129,15 @@ mutate_a(value:number):boolean {
 };

 /**
- * @returns {number}
+ * @returns number
 */
 b():number {
  return this.bb!.readInt32(this.bb_pos + 4);
 };

 /**
- * @param {number} value
- * @returns {boolean}
+ * @param number value
+ * @returns boolean
 */
 mutate_b(value:number):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -163,10 +151,10 @@ mutate_b(value:number):boolean {
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} a
- * @param {number} b
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @param number a
+ * @param number b
+ * @returns flatbuffers.Offset
 */
 static createStructInNestedNS(builder:flatbuffers.Builder, a: number, b: number):flatbuffers.Offset {
  builder.prep(4, 8);
--- a/tests/namespace_test/namespace_test2_generated.ts
+++ b/tests/namespace_test/namespace_test2_generated.ts
@@ -1,24 +1,18 @@
 // automatically generated by the FlatBuffers compiler, do not modify

-import * as NS11563891686210618450 from "./namespace_test1_generated";
+import * as NS4989953370203581498 from "./namespace_test1_generated";
 /**
 * @constructor
 */
 export namespace NamespaceA{
 export class TableInFirstNS {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {TableInFirstNS}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns TableInFirstNS
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):TableInFirstNS {
  this.bb_pos = i;
@@ -27,36 +21,36 @@ __init(i:number, bb:flatbuffers.ByteBuffer):TableInFirstNS {
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @param {TableInFirstNS=} obj
- * @returns {TableInFirstNS}
+ * @param flatbuffers.ByteBuffer bb
+ * @param TableInFirstNS= obj
+ * @returns TableInFirstNS
 */
 static getRootAsTableInFirstNS(bb:flatbuffers.ByteBuffer, obj?:TableInFirstNS):TableInFirstNS {
  return (obj || new TableInFirstNS).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 };

 /**
- * @param {NamespaceA.NamespaceB.TableInNestedNS=} obj
- * @returns {NamespaceA.NamespaceB.TableInNestedNS|null}
+ * @param NamespaceA.NamespaceB.TableInNestedNS= obj
+ * @returns NamespaceA.NamespaceB.TableInNestedNS|null
 */
-fooTable(obj?:NS11563891686210618450.NamespaceA.NamespaceB.TableInNestedNS):NS11563891686210618450.NamespaceA.NamespaceB.TableInNestedNS|null {
+fooTable(obj?:NS4989953370203581498.NamespaceA.NamespaceB.TableInNestedNS):NS4989953370203581498.NamespaceA.NamespaceB.TableInNestedNS|null {
  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? (obj || new NS11563891686210618450.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
+  return offset ? (obj || new NS4989953370203581498.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
 };

 /**
- * @returns {NamespaceA.NamespaceB.EnumInNestedNS}
+ * @returns NamespaceA.NamespaceB.EnumInNestedNS
 */
-fooEnum():NS11563891686210618450.NamespaceA.NamespaceB.EnumInNestedNS {
+fooEnum():NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS {
  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? /** @type {NamespaceA.NamespaceB.EnumInNestedNS} */ (this.bb!.readInt8(this.bb_pos + offset)) : NS11563891686210618450.NamespaceA.NamespaceB.EnumInNestedNS.A;
+  return offset ? /**  */ (this.bb!.readInt8(this.bb_pos + offset)) : NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS.A;
 };

 /**
- * @param {NamespaceA.NamespaceB.EnumInNestedNS} value
- * @returns {boolean}
+ * @param NamespaceA.NamespaceB.EnumInNestedNS value
+ * @returns boolean
 */
-mutate_foo_enum(value:NS11563891686210618450.NamespaceA.NamespaceB.EnumInNestedNS):boolean {
+mutate_foo_enum(value:NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 6);

  if (offset === 0) {
@@ -68,48 +62,48 @@ mutate_foo_enum(value:NS11563891686210618450.NamespaceA.NamespaceB.EnumInNestedN
 };

 /**
- * @param {NamespaceA.NamespaceB.StructInNestedNS=} obj
- * @returns {NamespaceA.NamespaceB.StructInNestedNS|null}
+ * @param NamespaceA.NamespaceB.StructInNestedNS= obj
+ * @returns NamespaceA.NamespaceB.StructInNestedNS|null
 */
-fooStruct(obj?:NS11563891686210618450.NamespaceA.NamespaceB.StructInNestedNS):NS11563891686210618450.NamespaceA.NamespaceB.StructInNestedNS|null {
+fooStruct(obj?:NS4989953370203581498.NamespaceA.NamespaceB.StructInNestedNS):NS4989953370203581498.NamespaceA.NamespaceB.StructInNestedNS|null {
  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? (obj || new NS11563891686210618450.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null;
+  return offset ? (obj || new NS4989953370203581498.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null;
 };

 /**
- * @param {flatbuffers.Builder} builder
+ * @param flatbuffers.Builder builder
 */
 static startTableInFirstNS(builder:flatbuffers.Builder) {
  builder.startObject(3);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} fooTableOffset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset fooTableOffset
 */
 static addFooTable(builder:flatbuffers.Builder, fooTableOffset:flatbuffers.Offset) {
  builder.addFieldOffset(0, fooTableOffset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {NamespaceA.NamespaceB.EnumInNestedNS} fooEnum
+ * @param flatbuffers.Builder builder
+ * @param NamespaceA.NamespaceB.EnumInNestedNS fooEnum
 */
-static addFooEnum(builder:flatbuffers.Builder, fooEnum:NS11563891686210618450.NamespaceA.NamespaceB.EnumInNestedNS) {
-  builder.addFieldInt8(1, fooEnum, NS11563891686210618450.NamespaceA.NamespaceB.EnumInNestedNS.A);
+static addFooEnum(builder:flatbuffers.Builder, fooEnum:NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS) {
+  builder.addFieldInt8(1, fooEnum, NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS.A);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} fooStructOffset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset fooStructOffset
 */
 static addFooStruct(builder:flatbuffers.Builder, fooStructOffset:flatbuffers.Offset) {
  builder.addFieldStruct(2, fooStructOffset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
 */
 static endTableInFirstNS(builder:flatbuffers.Builder):flatbuffers.Offset {
  var offset = builder.endObject();
@@ -123,19 +117,13 @@ static endTableInFirstNS(builder:flatbuffers.Builder):flatbuffers.Offset {
 */
 export namespace NamespaceC{
 export class TableInC {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {TableInC}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns TableInC
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):TableInC {
  this.bb_pos = i;
@@ -144,17 +132,17 @@ __init(i:number, bb:flatbuffers.ByteBuffer):TableInC {
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @param {TableInC=} obj
- * @returns {TableInC}
+ * @param flatbuffers.ByteBuffer bb
+ * @param TableInC= obj
+ * @returns TableInC
 */
 static getRootAsTableInC(bb:flatbuffers.ByteBuffer, obj?:TableInC):TableInC {
  return (obj || new TableInC).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 };

 /**
- * @param {NamespaceA.TableInFirstNS=} obj
- * @returns {NamespaceA.TableInFirstNS|null}
+ * @param NamespaceA.TableInFirstNS= obj
+ * @returns NamespaceA.TableInFirstNS|null
 */
 referToA1(obj?:NamespaceA.TableInFirstNS):NamespaceA.TableInFirstNS|null {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -162,8 +150,8 @@ referToA1(obj?:NamespaceA.TableInFirstNS):NamespaceA.TableInFirstNS|null {
 };

 /**
- * @param {NamespaceA.SecondTableInA=} obj
- * @returns {NamespaceA.SecondTableInA|null}
+ * @param NamespaceA.SecondTableInA= obj
+ * @returns NamespaceA.SecondTableInA|null
 */
 referToA2(obj?:NamespaceA.SecondTableInA):NamespaceA.SecondTableInA|null {
  var offset = this.bb!.__offset(this.bb_pos, 6);
@@ -171,31 +159,31 @@ referToA2(obj?:NamespaceA.SecondTableInA):NamespaceA.SecondTableInA|null {
 };

 /**
- * @param {flatbuffers.Builder} builder
+ * @param flatbuffers.Builder builder
 */
 static startTableInC(builder:flatbuffers.Builder) {
  builder.startObject(2);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} referToA1Offset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset referToA1Offset
 */
 static addReferToA1(builder:flatbuffers.Builder, referToA1Offset:flatbuffers.Offset) {
  builder.addFieldOffset(0, referToA1Offset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} referToA2Offset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset referToA2Offset
 */
 static addReferToA2(builder:flatbuffers.Builder, referToA2Offset:flatbuffers.Offset) {
  builder.addFieldOffset(1, referToA2Offset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
 */
 static endTableInC(builder:flatbuffers.Builder):flatbuffers.Offset {
  var offset = builder.endObject();
@@ -209,19 +197,13 @@ static endTableInC(builder:flatbuffers.Builder):flatbuffers.Offset {
 */
 export namespace NamespaceA{
 export class SecondTableInA {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {SecondTableInA}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns SecondTableInA
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):SecondTableInA {
  this.bb_pos = i;
@@ -230,17 +212,17 @@ __init(i:number, bb:flatbuffers.ByteBuffer):SecondTableInA {
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @param {SecondTableInA=} obj
- * @returns {SecondTableInA}
+ * @param flatbuffers.ByteBuffer bb
+ * @param SecondTableInA= obj
+ * @returns SecondTableInA
 */
 static getRootAsSecondTableInA(bb:flatbuffers.ByteBuffer, obj?:SecondTableInA):SecondTableInA {
  return (obj || new SecondTableInA).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 };

 /**
- * @param {NamespaceC.TableInC=} obj
- * @returns {NamespaceC.TableInC|null}
+ * @param NamespaceC.TableInC= obj
+ * @returns NamespaceC.TableInC|null
 */
 referToC(obj?:NamespaceC.TableInC):NamespaceC.TableInC|null {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -248,23 +230,23 @@ referToC(obj?:NamespaceC.TableInC):NamespaceC.TableInC|null {
 };

 /**
- * @param {flatbuffers.Builder} builder
+ * @param flatbuffers.Builder builder
 */
 static startSecondTableInA(builder:flatbuffers.Builder) {
  builder.startObject(1);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} referToCOffset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset referToCOffset
 */
 static addReferToC(builder:flatbuffers.Builder, referToCOffset:flatbuffers.Offset) {
  builder.addFieldOffset(0, referToCOffset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
 */
 static endSecondTableInA(builder:flatbuffers.Builder):flatbuffers.Offset {
  var offset = builder.endObject();
--- a/tests/union_vector/union_vector_generated.ts
+++ b/tests/union_vector/union_vector_generated.ts
@@ -17,19 +17,13 @@ export enum Character{
 * @constructor
 */
 export class Attacker {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {Attacker}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns Attacker
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):Attacker {
  this.bb_pos = i;
@@ -38,16 +32,16 @@ __init(i:number, bb:flatbuffers.ByteBuffer):Attacker {
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @param {Attacker=} obj
- * @returns {Attacker}
+ * @param flatbuffers.ByteBuffer bb
+ * @param Attacker= obj
+ * @returns Attacker
 */
 static getRootAsAttacker(bb:flatbuffers.ByteBuffer, obj?:Attacker):Attacker {
  return (obj || new Attacker).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 };

 /**
- * @returns {number}
+ * @returns number
 */
 swordAttackDamage():number {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -55,8 +49,8 @@ swordAttackDamage():number {
 };

 /**
- * @param {number} value
- * @returns {boolean}
+ * @param number value
+ * @returns boolean
 */
 mutate_sword_attack_damage(value:number):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -70,23 +64,23 @@ mutate_sword_attack_damage(value:number):boolean {
 };

 /**
- * @param {flatbuffers.Builder} builder
+ * @param flatbuffers.Builder builder
 */
 static startAttacker(builder:flatbuffers.Builder) {
  builder.startObject(1);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} swordAttackDamage
+ * @param flatbuffers.Builder builder
+ * @param number swordAttackDamage
 */
 static addSwordAttackDamage(builder:flatbuffers.Builder, swordAttackDamage:number) {
  builder.addFieldInt32(0, swordAttackDamage, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
 */
 static endAttacker(builder:flatbuffers.Builder):flatbuffers.Offset {
  var offset = builder.endObject();
@@ -98,19 +92,13 @@ static endAttacker(builder:flatbuffers.Builder):flatbuffers.Offset {
 * @constructor
 */
 export class Rapunzel {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {Rapunzel}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns Rapunzel
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):Rapunzel {
  this.bb_pos = i;
@@ -119,15 +107,15 @@ __init(i:number, bb:flatbuffers.ByteBuffer):Rapunzel {
 };

 /**
- * @returns {number}
+ * @returns number
 */
 hairLength():number {
  return this.bb!.readInt32(this.bb_pos);
 };

 /**
- * @param {number} value
- * @returns {boolean}
+ * @param number value
+ * @returns boolean
 */
 mutate_hair_length(value:number):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 0);
@@ -141,9 +129,9 @@ mutate_hair_length(value:number):boolean {
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} hair_length
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @param number hair_length
+ * @returns flatbuffers.Offset
 */
 static createRapunzel(builder:flatbuffers.Builder, hair_length: number):flatbuffers.Offset {
  builder.prep(4, 4);
@@ -156,19 +144,13 @@ static createRapunzel(builder:flatbuffers.Builder, hair_length: number):flatbuff
 * @constructor
 */
 export class BookReader {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {BookReader}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns BookReader
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):BookReader {
  this.bb_pos = i;
@@ -177,15 +159,15 @@ __init(i:number, bb:flatbuffers.ByteBuffer):BookReader {
 };

 /**
- * @returns {number}
+ * @returns number
 */
 booksRead():number {
  return this.bb!.readInt32(this.bb_pos);
 };

 /**
- * @param {number} value
- * @returns {boolean}
+ * @param number value
+ * @returns boolean
 */
 mutate_books_read(value:number):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 0);
@@ -199,9 +181,9 @@ mutate_books_read(value:number):boolean {
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} books_read
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @param number books_read
+ * @returns flatbuffers.Offset
 */
 static createBookReader(builder:flatbuffers.Builder, books_read: number):flatbuffers.Offset {
  builder.prep(4, 4);
@@ -214,19 +196,13 @@ static createBookReader(builder:flatbuffers.Builder, books_read: number):flatbuf
 * @constructor
 */
 export class Movie {
-  /**
-   * @type {flatbuffers.ByteBuffer}
-   */
  bb: flatbuffers.ByteBuffer|null = null;

-  /**
-   * @type {number}
-   */
  bb_pos:number = 0;
 /**
- * @param {number} i
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {Movie}
+ * @param number i
+ * @param flatbuffers.ByteBuffer bb
+ * @returns Movie
 */
 __init(i:number, bb:flatbuffers.ByteBuffer):Movie {
  this.bb_pos = i;
@@ -235,33 +211,33 @@ __init(i:number, bb:flatbuffers.ByteBuffer):Movie {
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @param {Movie=} obj
- * @returns {Movie}
+ * @param flatbuffers.ByteBuffer bb
+ * @param Movie= obj
+ * @returns Movie
 */
 static getRootAsMovie(bb:flatbuffers.ByteBuffer, obj?:Movie):Movie {
  return (obj || new Movie).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 };

 /**
- * @param {flatbuffers.ByteBuffer} bb
- * @returns {boolean}
+ * @param flatbuffers.ByteBuffer bb
+ * @returns boolean
 */
 static bufferHasIdentifier(bb:flatbuffers.ByteBuffer):boolean {
  return bb.__has_identifier('MOVI');
 };

 /**
- * @returns {Character}
+ * @returns Character
 */
 mainCharacterType():Character {
  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /** @type {Character} */ (this.bb!.readUint8(this.bb_pos + offset)) : Character.NONE;
+  return offset ? /**  */ (this.bb!.readUint8(this.bb_pos + offset)) : Character.NONE;
 };

 /**
- * @param {Character} value
- * @returns {boolean}
+ * @param Character value
+ * @returns boolean
 */
 mutate_main_character_type(value:Character):boolean {
  var offset = this.bb!.__offset(this.bb_pos, 4);
@@ -275,8 +251,8 @@ mutate_main_character_type(value:Character):boolean {
 };

 /**
- * @param {flatbuffers.Table} obj
- * @returns {?flatbuffers.Table}
+ * @param flatbuffers.Table obj
+ * @returns ?flatbuffers.Table
 */
 mainCharacter<T extends flatbuffers.Table>(obj:T):T|null {
  var offset = this.bb!.__offset(this.bb_pos, 6);
@@ -284,16 +260,16 @@ mainCharacter<T extends flatbuffers.Table>(obj:T):T|null {
 };

 /**
- * @param {number} index
- * @returns {Character}
+ * @param number index
+ * @returns Character
 */
 charactersType(index: number):Character|null {
  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? /** @type {Character} */ (this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index)) : /** @type {Character} */ (0);
+  return offset ? /**  */ (this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index)) : /**  */ (0);
 };

 /**
- * @returns {number}
+ * @returns number
 */
 charactersTypeLength():number {
  var offset = this.bb!.__offset(this.bb_pos, 8);
@@ -301,7 +277,7 @@ charactersTypeLength():number {
 };

 /**
- * @returns {Uint8Array}
+ * @returns Uint8Array
 */
 charactersTypeArray():Uint8Array|null {
  var offset = this.bb!.__offset(this.bb_pos, 8);
@@ -309,9 +285,9 @@ charactersTypeArray():Uint8Array|null {
 };

 /**
- * @param {number} index
- * @param {flatbuffers.Table=} obj
- * @returns {?flatbuffers.Table}
+ * @param number index
+ * @param flatbuffers.Table= obj
+ * @returns ?flatbuffers.Table
 */
 characters<T extends flatbuffers.Table>(index: number, obj:T):T|null {
  var offset = this.bb!.__offset(this.bb_pos, 10);
@@ -319,7 +295,7 @@ characters<T extends flatbuffers.Table>(index: number, obj:T):T|null {
 };

 /**
- * @returns {number}
+ * @returns number
 */
 charactersLength():number {
  var offset = this.bb!.__offset(this.bb_pos, 10);
@@ -327,40 +303,40 @@ charactersLength():number {
 };

 /**
- * @param {flatbuffers.Builder} builder
+ * @param flatbuffers.Builder builder
 */
 static startMovie(builder:flatbuffers.Builder) {
  builder.startObject(4);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {Character} mainCharacterType
+ * @param flatbuffers.Builder builder
+ * @param Character mainCharacterType
 */
 static addMainCharacterType(builder:flatbuffers.Builder, mainCharacterType:Character) {
  builder.addFieldInt8(0, mainCharacterType, Character.NONE);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} mainCharacterOffset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset mainCharacterOffset
 */
 static addMainCharacter(builder:flatbuffers.Builder, mainCharacterOffset:flatbuffers.Offset) {
  builder.addFieldOffset(1, mainCharacterOffset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} charactersTypeOffset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset charactersTypeOffset
 */
 static addCharactersType(builder:flatbuffers.Builder, charactersTypeOffset:flatbuffers.Offset) {
  builder.addFieldOffset(2, charactersTypeOffset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {Array.<Character>} data
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @param Array.<Character> data
+ * @returns flatbuffers.Offset
 */
 static createCharactersTypeVector(builder:flatbuffers.Builder, data:Character[]):flatbuffers.Offset {
  builder.startVector(1, data.length, 1);
@@ -371,25 +347,25 @@ static createCharactersTypeVector(builder:flatbuffers.Builder, data:Character[])
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} numElems
+ * @param flatbuffers.Builder builder
+ * @param number numElems
 */
 static startCharactersTypeVector(builder:flatbuffers.Builder, numElems:number) {
  builder.startVector(1, numElems, 1);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} charactersOffset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset charactersOffset
 */
 static addCharacters(builder:flatbuffers.Builder, charactersOffset:flatbuffers.Offset) {
  builder.addFieldOffset(3, charactersOffset, 0);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {Array.<flatbuffers.Offset>} data
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @param Array.<flatbuffers.Offset> data
+ * @returns flatbuffers.Offset
 */
 static createCharactersVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
  builder.startVector(4, data.length, 4);
@@ -400,16 +376,16 @@ static createCharactersVector(builder:flatbuffers.Builder, data:flatbuffers.Offs
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {number} numElems
+ * @param flatbuffers.Builder builder
+ * @param number numElems
 */
 static startCharactersVector(builder:flatbuffers.Builder, numElems:number) {
  builder.startVector(4, numElems, 4);
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @returns {flatbuffers.Offset}
+ * @param flatbuffers.Builder builder
+ * @returns flatbuffers.Offset
 */
 static endMovie(builder:flatbuffers.Builder):flatbuffers.Offset {
  var offset = builder.endObject();
@@ -417,8 +393,8 @@ static endMovie(builder:flatbuffers.Builder):flatbuffers.Offset {
 };

 /**
- * @param {flatbuffers.Builder} builder
- * @param {flatbuffers.Offset} offset
+ * @param flatbuffers.Builder builder
+ * @param flatbuffers.Offset offset
 */
 static finishMovieBuffer(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {
  builder.finish(offset, 'MOVI');