[TS/JS] BigInt implementation (#6998)

* BigInt implementation * Unit test reading long from existing bytebuffer * Code review
2026-06-27 10:02:19 +00:00 · 2022-01-06 21:35:37 -05:00
parent f28c2b2936
commit ace4a37f22
22 changed files with 225 additions and 256 deletions
--- a/tests/my-game/example/monster.js
+++ b/tests/my-game/example/monster.js
@@ -184,7 +184,7 @@ export class Monster {
    }
    testhashs64Fnv1() {
        const offset = this.bb.__offset(this.bb_pos, 40);
-        return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readInt64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_testhashs64_fnv1(value) {
        const offset = this.bb.__offset(this.bb_pos, 40);
@@ -196,7 +196,7 @@ export class Monster {
    }
    testhashu64Fnv1() {
        const offset = this.bb.__offset(this.bb_pos, 42);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_testhashu64_fnv1(value) {
        const offset = this.bb.__offset(this.bb_pos, 42);
@@ -232,7 +232,7 @@ export class Monster {
    }
    testhashs64Fnv1a() {
        const offset = this.bb.__offset(this.bb_pos, 48);
-        return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readInt64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_testhashs64_fnv1a(value) {
        const offset = this.bb.__offset(this.bb_pos, 48);
@@ -244,7 +244,7 @@ export class Monster {
    }
    testhashu64Fnv1a() {
        const offset = this.bb.__offset(this.bb_pos, 50);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_testhashu64_fnv1a(value) {
        const offset = this.bb.__offset(this.bb_pos, 50);
@@ -340,7 +340,7 @@ export class Monster {
    }
    vectorOfLongs(index) {
        const offset = this.bb.__offset(this.bb_pos, 68);
-        return offset ? this.bb.readInt64(this.bb.__vector(this.bb_pos + offset) + index * 8) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readInt64(this.bb.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
    }
    vectorOfLongsLength() {
        const offset = this.bb.__offset(this.bb_pos, 68);
@@ -372,7 +372,7 @@ export class Monster {
    }
    singleWeakReference() {
        const offset = this.bb.__offset(this.bb_pos, 76);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_single_weak_reference(value) {
        const offset = this.bb.__offset(this.bb_pos, 76);
@@ -384,7 +384,7 @@ export class Monster {
    }
    vectorOfWeakReferences(index) {
        const offset = this.bb.__offset(this.bb_pos, 78);
-        return offset ? this.bb.readUint64(this.bb.__vector(this.bb_pos + offset) + index * 8) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
    }
    vectorOfWeakReferencesLength() {
        const offset = this.bb.__offset(this.bb_pos, 78);
@@ -400,7 +400,7 @@ export class Monster {
    }
    coOwningReference() {
        const offset = this.bb.__offset(this.bb_pos, 82);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_co_owning_reference(value) {
        const offset = this.bb.__offset(this.bb_pos, 82);
@@ -412,7 +412,7 @@ export class Monster {
    }
    vectorOfCoOwningReferences(index) {
        const offset = this.bb.__offset(this.bb_pos, 84);
-        return offset ? this.bb.readUint64(this.bb.__vector(this.bb_pos + offset) + index * 8) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
    }
    vectorOfCoOwningReferencesLength() {
        const offset = this.bb.__offset(this.bb_pos, 84);
@@ -420,7 +420,7 @@ export class Monster {
    }
    nonOwningReference() {
        const offset = this.bb.__offset(this.bb_pos, 86);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_non_owning_reference(value) {
        const offset = this.bb.__offset(this.bb_pos, 86);
@@ -432,7 +432,7 @@ export class Monster {
    }
    vectorOfNonOwningReferences(index) {
        const offset = this.bb.__offset(this.bb_pos, 88);
-        return offset ? this.bb.readUint64(this.bb.__vector(this.bb_pos + offset) + index * 8) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
    }
    vectorOfNonOwningReferencesLength() {
        const offset = this.bb.__offset(this.bb_pos, 88);
@@ -599,10 +599,10 @@ export class Monster {
        builder.addFieldInt32(17, testhashu32Fnv1, 0);
    }
    static addTesthashs64Fnv1(builder, testhashs64Fnv1) {
-        builder.addFieldInt64(18, testhashs64Fnv1, builder.createLong(0, 0));
+        builder.addFieldInt64(18, testhashs64Fnv1, BigInt('0'));
    }
    static addTesthashu64Fnv1(builder, testhashu64Fnv1) {
-        builder.addFieldInt64(19, testhashu64Fnv1, builder.createLong(0, 0));
+        builder.addFieldInt64(19, testhashu64Fnv1, BigInt('0'));
    }
    static addTesthashs32Fnv1a(builder, testhashs32Fnv1a) {
        builder.addFieldInt32(20, testhashs32Fnv1a, 0);
@@ -611,10 +611,10 @@ export class Monster {
        builder.addFieldInt32(21, testhashu32Fnv1a, 0);
    }
    static addTesthashs64Fnv1a(builder, testhashs64Fnv1a) {
-        builder.addFieldInt64(22, testhashs64Fnv1a, builder.createLong(0, 0));
+        builder.addFieldInt64(22, testhashs64Fnv1a, BigInt('0'));
    }
    static addTesthashu64Fnv1a(builder, testhashu64Fnv1a) {
-        builder.addFieldInt64(23, testhashu64Fnv1a, builder.createLong(0, 0));
+        builder.addFieldInt64(23, testhashu64Fnv1a, BigInt('0'));
    }
    static addTestarrayofbools(builder, testarrayofboolsOffset) {
        builder.addFieldOffset(24, testarrayofboolsOffset, 0);
@@ -719,7 +719,7 @@ export class Monster {
        builder.startVector(4, numElems, 4);
    }
    static addSingleWeakReference(builder, singleWeakReference) {
-        builder.addFieldInt64(36, singleWeakReference, builder.createLong(0, 0));
+        builder.addFieldInt64(36, singleWeakReference, BigInt('0'));
    }
    static addVectorOfWeakReferences(builder, vectorOfWeakReferencesOffset) {
        builder.addFieldOffset(37, vectorOfWeakReferencesOffset, 0);
@@ -748,7 +748,7 @@ export class Monster {
        builder.startVector(4, numElems, 4);
    }
    static addCoOwningReference(builder, coOwningReference) {
-        builder.addFieldInt64(39, coOwningReference, builder.createLong(0, 0));
+        builder.addFieldInt64(39, coOwningReference, BigInt('0'));
    }
    static addVectorOfCoOwningReferences(builder, vectorOfCoOwningReferencesOffset) {
        builder.addFieldOffset(40, vectorOfCoOwningReferencesOffset, 0);
@@ -764,7 +764,7 @@ export class Monster {
        builder.startVector(8, numElems, 8);
    }
    static addNonOwningReference(builder, nonOwningReference) {
-        builder.addFieldInt64(41, nonOwningReference, builder.createLong(0, 0));
+        builder.addFieldInt64(41, nonOwningReference, BigInt('0'));
    }
    static addVectorOfNonOwningReferences(builder, vectorOfNonOwningReferencesOffset) {
        builder.addFieldOffset(42, vectorOfNonOwningReferencesOffset, 0);
@@ -943,7 +943,7 @@ export class Monster {
    }
 }
 export class MonsterT {
-    constructor(pos = null, mana = 150, hp = 100, name = null, inventory = [], color = Color.Blue, testType = Any.NONE, test = null, test4 = [], testarrayofstring = [], testarrayoftables = [], enemy = null, testnestedflatbuffer = [], testempty = null, testbool = false, testhashs32Fnv1 = 0, testhashu32Fnv1 = 0, testhashs64Fnv1 = flatbuffers.createLong(0, 0), testhashu64Fnv1 = flatbuffers.createLong(0, 0), testhashs32Fnv1a = 0, testhashu32Fnv1a = 0, testhashs64Fnv1a = flatbuffers.createLong(0, 0), testhashu64Fnv1a = flatbuffers.createLong(0, 0), testarrayofbools = [], testf = 3.14159, testf2 = 3.0, testf3 = 0.0, testarrayofstring2 = [], testarrayofsortedstruct = [], flex = [], test5 = [], vectorOfLongs = [], vectorOfDoubles = [], parentNamespaceTest = null, vectorOfReferrables = [], singleWeakReference = flatbuffers.createLong(0, 0), vectorOfWeakReferences = [], vectorOfStrongReferrables = [], coOwningReference = flatbuffers.createLong(0, 0), vectorOfCoOwningReferences = [], nonOwningReference = flatbuffers.createLong(0, 0), vectorOfNonOwningReferences = [], anyUniqueType = AnyUniqueAliases.NONE, anyUnique = null, anyAmbiguousType = AnyAmbiguousAliases.NONE, anyAmbiguous = null, vectorOfEnums = [], signedEnum = Race.None, testrequirednestedflatbuffer = [], scalarKeySortedTables = []) {
+    constructor(pos = null, mana = 150, hp = 100, name = null, inventory = [], color = Color.Blue, testType = Any.NONE, test = null, test4 = [], testarrayofstring = [], testarrayoftables = [], enemy = null, testnestedflatbuffer = [], testempty = null, testbool = false, testhashs32Fnv1 = 0, testhashu32Fnv1 = 0, testhashs64Fnv1 = BigInt('0'), testhashu64Fnv1 = BigInt('0'), testhashs32Fnv1a = 0, testhashu32Fnv1a = 0, testhashs64Fnv1a = BigInt('0'), testhashu64Fnv1a = BigInt('0'), testarrayofbools = [], testf = 3.14159, testf2 = 3.0, testf3 = 0.0, testarrayofstring2 = [], testarrayofsortedstruct = [], flex = [], test5 = [], vectorOfLongs = [], vectorOfDoubles = [], parentNamespaceTest = null, vectorOfReferrables = [], singleWeakReference = BigInt('0'), vectorOfWeakReferences = [], vectorOfStrongReferrables = [], coOwningReference = BigInt('0'), vectorOfCoOwningReferences = [], nonOwningReference = BigInt('0'), vectorOfNonOwningReferences = [], anyUniqueType = AnyUniqueAliases.NONE, anyUnique = null, anyAmbiguousType = AnyAmbiguousAliases.NONE, anyAmbiguous = null, vectorOfEnums = [], signedEnum = Race.None, testrequirednestedflatbuffer = [], scalarKeySortedTables = []) {
        this.pos = pos;
        this.mana = mana;
        this.hp = hp;
--- a/tests/my-game/example/monster.ts
+++ b/tests/my-game/example/monster.ts
@@ -236,12 +236,12 @@ mutate_testhashu32_fnv1(value:number):boolean {
  return true;
 }

-testhashs64Fnv1():flatbuffers.Long {
+testhashs64Fnv1():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 40);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readInt64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_testhashs64_fnv1(value:flatbuffers.Long):boolean {
+mutate_testhashs64_fnv1(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 40);

  if (offset === 0) {
@@ -252,12 +252,12 @@ mutate_testhashs64_fnv1(value:flatbuffers.Long):boolean {
  return true;
 }

-testhashu64Fnv1():flatbuffers.Long {
+testhashu64Fnv1():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 42);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_testhashu64_fnv1(value:flatbuffers.Long):boolean {
+mutate_testhashu64_fnv1(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 42);

  if (offset === 0) {
@@ -300,12 +300,12 @@ mutate_testhashu32_fnv1a(value:number):boolean {
  return true;
 }

-testhashs64Fnv1a():flatbuffers.Long {
+testhashs64Fnv1a():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 48);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readInt64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_testhashs64_fnv1a(value:flatbuffers.Long):boolean {
+mutate_testhashs64_fnv1a(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 48);

  if (offset === 0) {
@@ -316,12 +316,12 @@ mutate_testhashs64_fnv1a(value:flatbuffers.Long):boolean {
  return true;
 }

-testhashu64Fnv1a():flatbuffers.Long {
+testhashu64Fnv1a():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 50);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_testhashu64_fnv1a(value:flatbuffers.Long):boolean {
+mutate_testhashu64_fnv1a(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 50);

  if (offset === 0) {
@@ -442,9 +442,9 @@ test5Length():number {
  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
 }

-vectorOfLongs(index: number):flatbuffers.Long|null {
+vectorOfLongs(index: number):bigint|null {
  const offset = this.bb!.__offset(this.bb_pos, 68);
-  return offset ? this.bb!.readInt64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readInt64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
 }

 vectorOfLongsLength():number {
@@ -482,12 +482,12 @@ vectorOfReferrablesLength():number {
  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
 }

-singleWeakReference():flatbuffers.Long {
+singleWeakReference():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 76);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_single_weak_reference(value:flatbuffers.Long):boolean {
+mutate_single_weak_reference(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 76);

  if (offset === 0) {
@@ -498,9 +498,9 @@ mutate_single_weak_reference(value:flatbuffers.Long):boolean {
  return true;
 }

-vectorOfWeakReferences(index: number):flatbuffers.Long|null {
+vectorOfWeakReferences(index: number):bigint|null {
  const offset = this.bb!.__offset(this.bb_pos, 78);
-  return offset ? this.bb!.readUint64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
 }

 vectorOfWeakReferencesLength():number {
@@ -518,12 +518,12 @@ vectorOfStrongReferrablesLength():number {
  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
 }

-coOwningReference():flatbuffers.Long {
+coOwningReference():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 82);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_co_owning_reference(value:flatbuffers.Long):boolean {
+mutate_co_owning_reference(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 82);

  if (offset === 0) {
@@ -534,9 +534,9 @@ mutate_co_owning_reference(value:flatbuffers.Long):boolean {
  return true;
 }

-vectorOfCoOwningReferences(index: number):flatbuffers.Long|null {
+vectorOfCoOwningReferences(index: number):bigint|null {
  const offset = this.bb!.__offset(this.bb_pos, 84);
-  return offset ? this.bb!.readUint64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
 }

 vectorOfCoOwningReferencesLength():number {
@@ -544,12 +544,12 @@ vectorOfCoOwningReferencesLength():number {
  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
 }

-nonOwningReference():flatbuffers.Long {
+nonOwningReference():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 86);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_non_owning_reference(value:flatbuffers.Long):boolean {
+mutate_non_owning_reference(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 86);

  if (offset === 0) {
@@ -560,9 +560,9 @@ mutate_non_owning_reference(value:flatbuffers.Long):boolean {
  return true;
 }

-vectorOfNonOwningReferences(index: number):flatbuffers.Long|null {
+vectorOfNonOwningReferences(index: number):bigint|null {
  const offset = this.bb!.__offset(this.bb_pos, 88);
-  return offset ? this.bb!.readUint64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb!.__vector(this.bb_pos + offset) + index * 8) : BigInt(0);
 }

 vectorOfNonOwningReferencesLength():number {
@@ -774,12 +774,12 @@ static addTesthashu32Fnv1(builder:flatbuffers.Builder, testhashu32Fnv1:number) {
  builder.addFieldInt32(17, testhashu32Fnv1, 0);
 }

-static addTesthashs64Fnv1(builder:flatbuffers.Builder, testhashs64Fnv1:flatbuffers.Long) {
-  builder.addFieldInt64(18, testhashs64Fnv1, builder.createLong(0, 0));
+static addTesthashs64Fnv1(builder:flatbuffers.Builder, testhashs64Fnv1:bigint) {
+  builder.addFieldInt64(18, testhashs64Fnv1, BigInt('0'));
 }

-static addTesthashu64Fnv1(builder:flatbuffers.Builder, testhashu64Fnv1:flatbuffers.Long) {
-  builder.addFieldInt64(19, testhashu64Fnv1, builder.createLong(0, 0));
+static addTesthashu64Fnv1(builder:flatbuffers.Builder, testhashu64Fnv1:bigint) {
+  builder.addFieldInt64(19, testhashu64Fnv1, BigInt('0'));
 }

 static addTesthashs32Fnv1a(builder:flatbuffers.Builder, testhashs32Fnv1a:number) {
@@ -790,12 +790,12 @@ static addTesthashu32Fnv1a(builder:flatbuffers.Builder, testhashu32Fnv1a:number)
  builder.addFieldInt32(21, testhashu32Fnv1a, 0);
 }

-static addTesthashs64Fnv1a(builder:flatbuffers.Builder, testhashs64Fnv1a:flatbuffers.Long) {
-  builder.addFieldInt64(22, testhashs64Fnv1a, builder.createLong(0, 0));
+static addTesthashs64Fnv1a(builder:flatbuffers.Builder, testhashs64Fnv1a:bigint) {
+  builder.addFieldInt64(22, testhashs64Fnv1a, BigInt('0'));
 }

-static addTesthashu64Fnv1a(builder:flatbuffers.Builder, testhashu64Fnv1a:flatbuffers.Long) {
-  builder.addFieldInt64(23, testhashu64Fnv1a, builder.createLong(0, 0));
+static addTesthashu64Fnv1a(builder:flatbuffers.Builder, testhashu64Fnv1a:bigint) {
+  builder.addFieldInt64(23, testhashu64Fnv1a, BigInt('0'));
 }

 static addTestarrayofbools(builder:flatbuffers.Builder, testarrayofboolsOffset:flatbuffers.Offset) {
@@ -878,7 +878,7 @@ static addVectorOfLongs(builder:flatbuffers.Builder, vectorOfLongsOffset:flatbuf
  builder.addFieldOffset(32, vectorOfLongsOffset, 0);
 }

-static createVectorOfLongsVector(builder:flatbuffers.Builder, data:flatbuffers.Long[]):flatbuffers.Offset {
+static createVectorOfLongsVector(builder:flatbuffers.Builder, data:bigint[]):flatbuffers.Offset {
  builder.startVector(8, data.length, 8);
  for (let i = data.length - 1; i >= 0; i--) {
    builder.addInt64(data[i]!);
@@ -931,15 +931,15 @@ static startVectorOfReferrablesVector(builder:flatbuffers.Builder, numElems:numb
  builder.startVector(4, numElems, 4);
 }

-static addSingleWeakReference(builder:flatbuffers.Builder, singleWeakReference:flatbuffers.Long) {
-  builder.addFieldInt64(36, singleWeakReference, builder.createLong(0, 0));
+static addSingleWeakReference(builder:flatbuffers.Builder, singleWeakReference:bigint) {
+  builder.addFieldInt64(36, singleWeakReference, BigInt('0'));
 }

 static addVectorOfWeakReferences(builder:flatbuffers.Builder, vectorOfWeakReferencesOffset:flatbuffers.Offset) {
  builder.addFieldOffset(37, vectorOfWeakReferencesOffset, 0);
 }

-static createVectorOfWeakReferencesVector(builder:flatbuffers.Builder, data:flatbuffers.Long[]):flatbuffers.Offset {
+static createVectorOfWeakReferencesVector(builder:flatbuffers.Builder, data:bigint[]):flatbuffers.Offset {
  builder.startVector(8, data.length, 8);
  for (let i = data.length - 1; i >= 0; i--) {
    builder.addInt64(data[i]!);
@@ -967,15 +967,15 @@ static startVectorOfStrongReferrablesVector(builder:flatbuffers.Builder, numElem
  builder.startVector(4, numElems, 4);
 }

-static addCoOwningReference(builder:flatbuffers.Builder, coOwningReference:flatbuffers.Long) {
-  builder.addFieldInt64(39, coOwningReference, builder.createLong(0, 0));
+static addCoOwningReference(builder:flatbuffers.Builder, coOwningReference:bigint) {
+  builder.addFieldInt64(39, coOwningReference, BigInt('0'));
 }

 static addVectorOfCoOwningReferences(builder:flatbuffers.Builder, vectorOfCoOwningReferencesOffset:flatbuffers.Offset) {
  builder.addFieldOffset(40, vectorOfCoOwningReferencesOffset, 0);
 }

-static createVectorOfCoOwningReferencesVector(builder:flatbuffers.Builder, data:flatbuffers.Long[]):flatbuffers.Offset {
+static createVectorOfCoOwningReferencesVector(builder:flatbuffers.Builder, data:bigint[]):flatbuffers.Offset {
  builder.startVector(8, data.length, 8);
  for (let i = data.length - 1; i >= 0; i--) {
    builder.addInt64(data[i]!);
@@ -987,15 +987,15 @@ static startVectorOfCoOwningReferencesVector(builder:flatbuffers.Builder, numEle
  builder.startVector(8, numElems, 8);
 }

-static addNonOwningReference(builder:flatbuffers.Builder, nonOwningReference:flatbuffers.Long) {
-  builder.addFieldInt64(41, nonOwningReference, builder.createLong(0, 0));
+static addNonOwningReference(builder:flatbuffers.Builder, nonOwningReference:bigint) {
+  builder.addFieldInt64(41, nonOwningReference, BigInt('0'));
 }

 static addVectorOfNonOwningReferences(builder:flatbuffers.Builder, vectorOfNonOwningReferencesOffset:flatbuffers.Offset) {
  builder.addFieldOffset(42, vectorOfNonOwningReferencesOffset, 0);
 }

-static createVectorOfNonOwningReferencesVector(builder:flatbuffers.Builder, data:flatbuffers.Long[]):flatbuffers.Offset {
+static createVectorOfNonOwningReferencesVector(builder:flatbuffers.Builder, data:bigint[]):flatbuffers.Offset {
  builder.startVector(8, data.length, 8);
  for (let i = data.length - 1; i >= 0; i--) {
    builder.addInt64(data[i]!);
@@ -1251,12 +1251,12 @@ constructor(
  public testbool: boolean = false,
  public testhashs32Fnv1: number = 0,
  public testhashu32Fnv1: number = 0,
-  public testhashs64Fnv1: flatbuffers.Long = flatbuffers.createLong(0, 0),
-  public testhashu64Fnv1: flatbuffers.Long = flatbuffers.createLong(0, 0),
+  public testhashs64Fnv1: bigint = BigInt('0'),
+  public testhashu64Fnv1: bigint = BigInt('0'),
  public testhashs32Fnv1a: number = 0,
  public testhashu32Fnv1a: number = 0,
-  public testhashs64Fnv1a: flatbuffers.Long = flatbuffers.createLong(0, 0),
-  public testhashu64Fnv1a: flatbuffers.Long = flatbuffers.createLong(0, 0),
+  public testhashs64Fnv1a: bigint = BigInt('0'),
+  public testhashu64Fnv1a: bigint = BigInt('0'),
  public testarrayofbools: (boolean)[] = [],
  public testf: number = 3.14159,
  public testf2: number = 3.0,
@@ -1265,17 +1265,17 @@ constructor(
  public testarrayofsortedstruct: (AbilityT)[] = [],
  public flex: (number)[] = [],
  public test5: (TestT)[] = [],
-  public vectorOfLongs: (flatbuffers.Long)[] = [],
+  public vectorOfLongs: (bigint)[] = [],
  public vectorOfDoubles: (number)[] = [],
  public parentNamespaceTest: InParentNamespaceT|null = null,
  public vectorOfReferrables: (ReferrableT)[] = [],
-  public singleWeakReference: flatbuffers.Long = flatbuffers.createLong(0, 0),
-  public vectorOfWeakReferences: (flatbuffers.Long)[] = [],
+  public singleWeakReference: bigint = BigInt('0'),
+  public vectorOfWeakReferences: (bigint)[] = [],
  public vectorOfStrongReferrables: (ReferrableT)[] = [],
-  public coOwningReference: flatbuffers.Long = flatbuffers.createLong(0, 0),
-  public vectorOfCoOwningReferences: (flatbuffers.Long)[] = [],
-  public nonOwningReference: flatbuffers.Long = flatbuffers.createLong(0, 0),
-  public vectorOfNonOwningReferences: (flatbuffers.Long)[] = [],
+  public coOwningReference: bigint = BigInt('0'),
+  public vectorOfCoOwningReferences: (bigint)[] = [],
+  public nonOwningReference: bigint = BigInt('0'),
+  public vectorOfNonOwningReferences: (bigint)[] = [],
  public anyUniqueType: AnyUniqueAliases = AnyUniqueAliases.NONE,
  public anyUnique: MonsterT|MyGameExample2MonsterT|TestSimpleTableWithEnumT|null = null,
  public anyAmbiguousType: AnyAmbiguousAliases = AnyAmbiguousAliases.NONE,
--- a/tests/my-game/example/referrable.js
+++ b/tests/my-game/example/referrable.js
@@ -19,7 +19,7 @@ export class Referrable {
    }
    id() {
        const offset = this.bb.__offset(this.bb_pos, 4);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_id(value) {
        const offset = this.bb.__offset(this.bb_pos, 4);
@@ -36,7 +36,7 @@ export class Referrable {
        builder.startObject(1);
    }
    static addId(builder, id) {
-        builder.addFieldInt64(0, id, builder.createLong(0, 0));
+        builder.addFieldInt64(0, id, BigInt('0'));
    }
    static endReferrable(builder) {
        const offset = builder.endObject();
@@ -61,7 +61,7 @@ export class Referrable {
    }
 }
 export class ReferrableT {
-    constructor(id = flatbuffers.createLong(0, 0)) {
+    constructor(id = BigInt('0')) {
        this.id = id;
    }
    pack(builder) {
--- a/tests/my-game/example/referrable.ts
+++ b/tests/my-game/example/referrable.ts
@@ -22,12 +22,12 @@ static getSizePrefixedRootAsReferrable(bb:flatbuffers.ByteBuffer, obj?:Referrabl
  return (obj || new Referrable()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
 }

-id():flatbuffers.Long {
+id():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_id(value:flatbuffers.Long):boolean {
+mutate_id(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 4);

  if (offset === 0) {
@@ -46,8 +46,8 @@ static startReferrable(builder:flatbuffers.Builder) {
  builder.startObject(1);
 }

-static addId(builder:flatbuffers.Builder, id:flatbuffers.Long) {
-  builder.addFieldInt64(0, id, builder.createLong(0, 0));
+static addId(builder:flatbuffers.Builder, id:bigint) {
+  builder.addFieldInt64(0, id, BigInt('0'));
 }

 static endReferrable(builder:flatbuffers.Builder):flatbuffers.Offset {
@@ -55,7 +55,7 @@ static endReferrable(builder:flatbuffers.Builder):flatbuffers.Offset {
  return offset;
 }

-static createReferrable(builder:flatbuffers.Builder, id:flatbuffers.Long):flatbuffers.Offset {
+static createReferrable(builder:flatbuffers.Builder, id:bigint):flatbuffers.Offset {
  Referrable.startReferrable(builder);
  Referrable.addId(builder, id);
  return Referrable.endReferrable(builder);
@@ -83,7 +83,7 @@ unpackTo(_o: ReferrableT): void {

 export class ReferrableT {
 constructor(
-  public id: flatbuffers.Long = flatbuffers.createLong(0, 0)
+  public id: bigint = BigInt('0')
 ){}


--- a/tests/my-game/example/stat.js
+++ b/tests/my-game/example/stat.js
@@ -23,7 +23,7 @@ export class Stat {
    }
    val() {
        const offset = this.bb.__offset(this.bb_pos, 6);
-        return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readInt64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_val(value) {
        const offset = this.bb.__offset(this.bb_pos, 6);
@@ -55,7 +55,7 @@ export class Stat {
        builder.addFieldOffset(0, idOffset, 0);
    }
    static addVal(builder, val) {
-        builder.addFieldInt64(1, val, builder.createLong(0, 0));
+        builder.addFieldInt64(1, val, BigInt('0'));
    }
    static addCount(builder, count) {
        builder.addFieldInt16(2, count, 0);
@@ -87,7 +87,7 @@ export class Stat {
    }
 }
 export class StatT {
-    constructor(id = null, val = flatbuffers.createLong(0, 0), count = 0) {
+    constructor(id = null, val = BigInt('0'), count = 0) {
        this.id = id;
        this.val = val;
        this.count = count;
--- a/tests/my-game/example/stat.ts
+++ b/tests/my-game/example/stat.ts
@@ -29,12 +29,12 @@ id(optionalEncoding?:any):string|Uint8Array|null {
  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
 }

-val():flatbuffers.Long {
+val():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readInt64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_val(value:flatbuffers.Long):boolean {
+mutate_val(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 6);

  if (offset === 0) {
@@ -73,8 +73,8 @@ static addId(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset) {
  builder.addFieldOffset(0, idOffset, 0);
 }

-static addVal(builder:flatbuffers.Builder, val:flatbuffers.Long) {
-  builder.addFieldInt64(1, val, builder.createLong(0, 0));
+static addVal(builder:flatbuffers.Builder, val:bigint) {
+  builder.addFieldInt64(1, val, BigInt('0'));
 }

 static addCount(builder:flatbuffers.Builder, count:number) {
@@ -86,7 +86,7 @@ static endStat(builder:flatbuffers.Builder):flatbuffers.Offset {
  return offset;
 }

-static createStat(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset, val:flatbuffers.Long, count:number):flatbuffers.Offset {
+static createStat(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset, val:bigint, count:number):flatbuffers.Offset {
  Stat.startStat(builder);
  Stat.addId(builder, idOffset);
  Stat.addVal(builder, val);
@@ -121,7 +121,7 @@ unpackTo(_o: StatT): void {
 export class StatT {
 constructor(
  public id: string|Uint8Array|null = null,
-  public val: flatbuffers.Long = flatbuffers.createLong(0, 0),
+  public val: bigint = BigInt('0'),
  public count: number = 0
 ){}

--- a/tests/my-game/example/type-aliases.js
+++ b/tests/my-game/example/type-aliases.js
@@ -91,7 +91,7 @@ export class TypeAliases {
    }
    i64() {
        const offset = this.bb.__offset(this.bb_pos, 16);
-        return offset ? this.bb.readInt64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readInt64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_i64(value) {
        const offset = this.bb.__offset(this.bb_pos, 16);
@@ -103,7 +103,7 @@ export class TypeAliases {
    }
    u64() {
        const offset = this.bb.__offset(this.bb_pos, 18);
-        return offset ? this.bb.readUint64(this.bb_pos + offset) : this.bb.createLong(0, 0);
+        return offset ? this.bb.readUint64(this.bb_pos + offset) : BigInt('0');
    }
    mutate_u64(value) {
        const offset = this.bb.__offset(this.bb_pos, 18);
@@ -186,10 +186,10 @@ export class TypeAliases {
        builder.addFieldInt32(5, u32, 0);
    }
    static addI64(builder, i64) {
-        builder.addFieldInt64(6, i64, builder.createLong(0, 0));
+        builder.addFieldInt64(6, i64, BigInt('0'));
    }
    static addU64(builder, u64) {
-        builder.addFieldInt64(7, u64, builder.createLong(0, 0));
+        builder.addFieldInt64(7, u64, BigInt('0'));
    }
    static addF32(builder, f32) {
        builder.addFieldFloat32(8, f32, 0.0);
@@ -268,7 +268,7 @@ export class TypeAliases {
    }
 }
 export class TypeAliasesT {
-    constructor(i8 = 0, u8 = 0, i16 = 0, u16 = 0, i32 = 0, u32 = 0, i64 = flatbuffers.createLong(0, 0), u64 = flatbuffers.createLong(0, 0), f32 = 0.0, f64 = 0.0, v8 = [], vf64 = []) {
+    constructor(i8 = 0, u8 = 0, i16 = 0, u16 = 0, i32 = 0, u32 = 0, i64 = BigInt('0'), u64 = BigInt('0'), f32 = 0.0, f64 = 0.0, v8 = [], vf64 = []) {
        this.i8 = i8;
        this.u8 = u8;
        this.i16 = i16;
--- a/tests/my-game/example/type-aliases.ts
+++ b/tests/my-game/example/type-aliases.ts
@@ -118,12 +118,12 @@ mutate_u32(value:number):boolean {
  return true;
 }

-i64():flatbuffers.Long {
+i64():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 16);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readInt64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_i64(value:flatbuffers.Long):boolean {
+mutate_i64(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 16);

  if (offset === 0) {
@@ -134,12 +134,12 @@ mutate_i64(value:flatbuffers.Long):boolean {
  return true;
 }

-u64():flatbuffers.Long {
+u64():bigint {
  const offset = this.bb!.__offset(this.bb_pos, 18);
-  return offset ? this.bb!.readUint64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
+  return offset ? this.bb!.readUint64(this.bb_pos + offset) : BigInt('0');
 }

-mutate_u64(value:flatbuffers.Long):boolean {
+mutate_u64(value:bigint):boolean {
  const offset = this.bb!.__offset(this.bb_pos, 18);

  if (offset === 0) {
@@ -244,12 +244,12 @@ static addU32(builder:flatbuffers.Builder, u32:number) {
  builder.addFieldInt32(5, u32, 0);
 }

-static addI64(builder:flatbuffers.Builder, i64:flatbuffers.Long) {
-  builder.addFieldInt64(6, i64, builder.createLong(0, 0));
+static addI64(builder:flatbuffers.Builder, i64:bigint) {
+  builder.addFieldInt64(6, i64, BigInt('0'));
 }

-static addU64(builder:flatbuffers.Builder, u64:flatbuffers.Long) {
-  builder.addFieldInt64(7, u64, builder.createLong(0, 0));
+static addU64(builder:flatbuffers.Builder, u64:bigint) {
+  builder.addFieldInt64(7, u64, BigInt('0'));
 }

 static addF32(builder:flatbuffers.Builder, f32:number) {
@@ -307,7 +307,7 @@ static endTypeAliases(builder:flatbuffers.Builder):flatbuffers.Offset {
  return offset;
 }

-static createTypeAliases(builder:flatbuffers.Builder, i8:number, u8:number, i16:number, u16:number, i32:number, u32:number, i64:flatbuffers.Long, u64:flatbuffers.Long, f32:number, f64:number, v8Offset:flatbuffers.Offset, vf64Offset:flatbuffers.Offset):flatbuffers.Offset {
+static createTypeAliases(builder:flatbuffers.Builder, i8:number, u8:number, i16:number, u16:number, i32:number, u32:number, i64:bigint, u64:bigint, f32:number, f64:number, v8Offset:flatbuffers.Offset, vf64Offset:flatbuffers.Offset):flatbuffers.Offset {
  TypeAliases.startTypeAliases(builder);
  TypeAliases.addI8(builder, i8);
  TypeAliases.addU8(builder, u8);
@@ -374,8 +374,8 @@ constructor(
  public u16: number = 0,
  public i32: number = 0,
  public u32: number = 0,
-  public i64: flatbuffers.Long = flatbuffers.createLong(0, 0),
-  public u64: flatbuffers.Long = flatbuffers.createLong(0, 0),
+  public i64: bigint = BigInt('0'),
+  public u64: bigint = BigInt('0'),
  public f32: number = 0.0,
  public f64: number = 0.0,
  public v8: (number)[] = [],