[TS/JS] Upgrade dependencies (#7996)

2026-06-25 02:46:10 +00:00 · 2023-12-14 01:57:46 +01:00
parent 5ba80c24e0
commit 6dfc59dfcc
14 changed files with 364 additions and 335 deletions
--- a/tests/ts/arrays_test_complex/arrays_test_complex_generated.cjs
+++ b/tests/ts/arrays_test_complex/arrays_test_complex_generated.cjs
@@ -207,7 +207,7 @@ var TestEnum;
  TestEnum2[TestEnum2["A"] = 0] = "A";
  TestEnum2[TestEnum2["B"] = 1] = "B";
  TestEnum2[TestEnum2["C"] = 2] = "C";
-})(TestEnum = TestEnum || (TestEnum = {}));
+})(TestEnum || (TestEnum = {}));

 // arrays_test_complex/my-game/example/nested-struct.js
 var NestedStruct = class {
--- a/tests/ts/monster_test_generated.cjs
+++ b/tests/ts/monster_test_generated.cjs
@@ -378,7 +378,7 @@ var AnyAmbiguousAliases;
  AnyAmbiguousAliases2[AnyAmbiguousAliases2["M1"] = 1] = "M1";
  AnyAmbiguousAliases2[AnyAmbiguousAliases2["M2"] = 2] = "M2";
  AnyAmbiguousAliases2[AnyAmbiguousAliases2["M3"] = 3] = "M3";
-})(AnyAmbiguousAliases = AnyAmbiguousAliases || (AnyAmbiguousAliases = {}));
+})(AnyAmbiguousAliases || (AnyAmbiguousAliases = {}));
 function unionToAnyAmbiguousAliases(type, accessor) {
  switch (AnyAmbiguousAliases[type]) {
    case "NONE":
@@ -403,7 +403,7 @@ var Color;
  Color2[Color2["Red"] = 1] = "Red";
  Color2[Color2["Green"] = 2] = "Green";
  Color2[Color2["Blue"] = 8] = "Blue";
-})(Color = Color || (Color = {}));
+})(Color || (Color = {}));

 // my-game/example/test-simple-table-with-enum.js
 var TestSimpleTableWithEnum = class _TestSimpleTableWithEnum {
@@ -482,7 +482,7 @@ var AnyUniqueAliases;
  AnyUniqueAliases2[AnyUniqueAliases2["M"] = 1] = "M";
  AnyUniqueAliases2[AnyUniqueAliases2["TS"] = 2] = "TS";
  AnyUniqueAliases2[AnyUniqueAliases2["M2"] = 3] = "M2";
-})(AnyUniqueAliases = AnyUniqueAliases || (AnyUniqueAliases = {}));
+})(AnyUniqueAliases || (AnyUniqueAliases = {}));
 function unionToAnyUniqueAliases(type, accessor) {
  switch (AnyUniqueAliases[type]) {
    case "NONE":
@@ -505,7 +505,7 @@ var Race;
  Race2[Race2["Human"] = 0] = "Human";
  Race2[Race2["Dwarf"] = 1] = "Dwarf";
  Race2[Race2["Elf"] = 2] = "Elf";
-})(Race = Race || (Race = {}));
+})(Race || (Race = {}));

 // my-game/example/referrable.js
 var flatbuffers6 = __toESM(require("flatbuffers"), 1);
@@ -2093,7 +2093,7 @@ var Any;
  Any2[Any2["Monster"] = 1] = "Monster";
  Any2[Any2["TestSimpleTableWithEnum"] = 2] = "TestSimpleTableWithEnum";
  Any2[Any2["MyGame_Example2_Monster"] = 3] = "MyGame_Example2_Monster";
-})(Any = Any || (Any = {}));
+})(Any || (Any = {}));
 function unionToAny(type, accessor) {
  switch (Any[type]) {
    case "NONE":
@@ -2115,7 +2115,7 @@ var LongEnum;
  LongEnum2["LongOne"] = "2";
  LongEnum2["LongTwo"] = "4";
  LongEnum2["LongBig"] = "1099511627776";
-})(LongEnum = LongEnum || (LongEnum = {}));
+})(LongEnum || (LongEnum = {}));

 // my-game/example/struct-of-structs.js
 var StructOfStructs = class {
@@ -2540,7 +2540,7 @@ __export(other_name_space_exports, {
 var FromInclude;
 (function(FromInclude2) {
  FromInclude2["IncludeVal"] = "0";
-})(FromInclude = FromInclude || (FromInclude = {}));
+})(FromInclude || (FromInclude = {}));

 // my-game/other-name-space/unused.js
 var Unused = class {
--- a/tests/ts/no_import_ext/optional-scalars.js
+++ b/tests/ts/no_import_ext/optional-scalars.js
@@ -1,3 +1,4 @@
 // automatically generated by the FlatBuffers compiler, do not modify
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
 export { OptionalByte } from './optional-scalars/optional-byte';
 export { ScalarStuff } from './optional-scalars/scalar-stuff';
--- a/tests/ts/no_import_ext/optional-scalars/optional-byte.js
+++ b/tests/ts/no_import_ext/optional-scalars/optional-byte.js
@@ -1,4 +1,5 @@
 // automatically generated by the FlatBuffers compiler, do not modify
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
 export var OptionalByte;
 (function (OptionalByte) {
    OptionalByte[OptionalByte["None"] = 0] = "None";
--- a/tests/ts/no_import_ext/optional-scalars/scalar-stuff.js
+++ b/tests/ts/no_import_ext/optional-scalars/scalar-stuff.js
@@ -1,4 +1,5 @@
 // automatically generated by the FlatBuffers compiler, do not modify
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
 import * as flatbuffers from 'flatbuffers';
 import { OptionalByte } from '../optional-scalars/optional-byte';
 export class ScalarStuff {
@@ -175,7 +176,7 @@ export class ScalarStuff {
        builder.addFieldInt8(0, justI8, 0);
    }
    static addMaybeI8(builder, maybeI8) {
-        builder.addFieldInt8(1, maybeI8, 0);
+        builder.addFieldInt8(1, maybeI8, null);
    }
    static addDefaultI8(builder, defaultI8) {
        builder.addFieldInt8(2, defaultI8, 42);
@@ -184,7 +185,7 @@ export class ScalarStuff {
        builder.addFieldInt8(3, justU8, 0);
    }
    static addMaybeU8(builder, maybeU8) {
-        builder.addFieldInt8(4, maybeU8, 0);
+        builder.addFieldInt8(4, maybeU8, null);
    }
    static addDefaultU8(builder, defaultU8) {
        builder.addFieldInt8(5, defaultU8, 42);
@@ -193,7 +194,7 @@ export class ScalarStuff {
        builder.addFieldInt16(6, justI16, 0);
    }
    static addMaybeI16(builder, maybeI16) {
-        builder.addFieldInt16(7, maybeI16, 0);
+        builder.addFieldInt16(7, maybeI16, null);
    }
    static addDefaultI16(builder, defaultI16) {
        builder.addFieldInt16(8, defaultI16, 42);
@@ -202,7 +203,7 @@ export class ScalarStuff {
        builder.addFieldInt16(9, justU16, 0);
    }
    static addMaybeU16(builder, maybeU16) {
-        builder.addFieldInt16(10, maybeU16, 0);
+        builder.addFieldInt16(10, maybeU16, null);
    }
    static addDefaultU16(builder, defaultU16) {
        builder.addFieldInt16(11, defaultU16, 42);
@@ -211,7 +212,7 @@ export class ScalarStuff {
        builder.addFieldInt32(12, justI32, 0);
    }
    static addMaybeI32(builder, maybeI32) {
-        builder.addFieldInt32(13, maybeI32, 0);
+        builder.addFieldInt32(13, maybeI32, null);
    }
    static addDefaultI32(builder, defaultI32) {
        builder.addFieldInt32(14, defaultI32, 42);
@@ -220,7 +221,7 @@ export class ScalarStuff {
        builder.addFieldInt32(15, justU32, 0);
    }
    static addMaybeU32(builder, maybeU32) {
-        builder.addFieldInt32(16, maybeU32, 0);
+        builder.addFieldInt32(16, maybeU32, null);
    }
    static addDefaultU32(builder, defaultU32) {
        builder.addFieldInt32(17, defaultU32, 42);
@@ -229,7 +230,7 @@ export class ScalarStuff {
        builder.addFieldInt64(18, justI64, BigInt('0'));
    }
    static addMaybeI64(builder, maybeI64) {
-        builder.addFieldInt64(19, maybeI64, BigInt(0));
+        builder.addFieldInt64(19, maybeI64, null);
    }
    static addDefaultI64(builder, defaultI64) {
        builder.addFieldInt64(20, defaultI64, BigInt('42'));
@@ -238,7 +239,7 @@ export class ScalarStuff {
        builder.addFieldInt64(21, justU64, BigInt('0'));
    }
    static addMaybeU64(builder, maybeU64) {
-        builder.addFieldInt64(22, maybeU64, BigInt(0));
+        builder.addFieldInt64(22, maybeU64, null);
    }
    static addDefaultU64(builder, defaultU64) {
        builder.addFieldInt64(23, defaultU64, BigInt('42'));
@@ -247,7 +248,7 @@ export class ScalarStuff {
        builder.addFieldFloat32(24, justF32, 0.0);
    }
    static addMaybeF32(builder, maybeF32) {
-        builder.addFieldFloat32(25, maybeF32, 0);
+        builder.addFieldFloat32(25, maybeF32, null);
    }
    static addDefaultF32(builder, defaultF32) {
        builder.addFieldFloat32(26, defaultF32, 42.0);
@@ -256,7 +257,7 @@ export class ScalarStuff {
        builder.addFieldFloat64(27, justF64, 0.0);
    }
    static addMaybeF64(builder, maybeF64) {
-        builder.addFieldFloat64(28, maybeF64, 0);
+        builder.addFieldFloat64(28, maybeF64, null);
    }
    static addDefaultF64(builder, defaultF64) {
        builder.addFieldFloat64(29, defaultF64, 42.0);
@@ -265,7 +266,7 @@ export class ScalarStuff {
        builder.addFieldInt8(30, +justBool, +false);
    }
    static addMaybeBool(builder, maybeBool) {
-        builder.addFieldInt8(31, +maybeBool, 0);
+        builder.addFieldInt8(31, +maybeBool, null);
    }
    static addDefaultBool(builder, defaultBool) {
        builder.addFieldInt8(32, +defaultBool, +true);
@@ -274,7 +275,7 @@ export class ScalarStuff {
        builder.addFieldInt8(33, justEnum, OptionalByte.None);
    }
    static addMaybeEnum(builder, maybeEnum) {
-        builder.addFieldInt8(34, maybeEnum, 0);
+        builder.addFieldInt8(34, maybeEnum, null);
    }
    static addDefaultEnum(builder, defaultEnum) {
        builder.addFieldInt8(35, defaultEnum, OptionalByte.One);
--- a/tests/ts/no_import_ext/optional-scalars/scalar-stuff.ts
+++ b/tests/ts/no_import_ext/optional-scalars/scalar-stuff.ts
@@ -222,7 +222,7 @@ static addJustI8(builder:flatbuffers.Builder, justI8:number) {
 }

 static addMaybeI8(builder:flatbuffers.Builder, maybeI8:number) {
-  builder.addFieldInt8(1, maybeI8, 0);
+  builder.addFieldInt8(1, maybeI8, null);
 }

 static addDefaultI8(builder:flatbuffers.Builder, defaultI8:number) {
@@ -234,7 +234,7 @@ static addJustU8(builder:flatbuffers.Builder, justU8:number) {
 }

 static addMaybeU8(builder:flatbuffers.Builder, maybeU8:number) {
-  builder.addFieldInt8(4, maybeU8, 0);
+  builder.addFieldInt8(4, maybeU8, null);
 }

 static addDefaultU8(builder:flatbuffers.Builder, defaultU8:number) {
@@ -246,7 +246,7 @@ static addJustI16(builder:flatbuffers.Builder, justI16:number) {
 }

 static addMaybeI16(builder:flatbuffers.Builder, maybeI16:number) {
-  builder.addFieldInt16(7, maybeI16, 0);
+  builder.addFieldInt16(7, maybeI16, null);
 }

 static addDefaultI16(builder:flatbuffers.Builder, defaultI16:number) {
@@ -258,7 +258,7 @@ static addJustU16(builder:flatbuffers.Builder, justU16:number) {
 }

 static addMaybeU16(builder:flatbuffers.Builder, maybeU16:number) {
-  builder.addFieldInt16(10, maybeU16, 0);
+  builder.addFieldInt16(10, maybeU16, null);
 }

 static addDefaultU16(builder:flatbuffers.Builder, defaultU16:number) {
@@ -270,7 +270,7 @@ static addJustI32(builder:flatbuffers.Builder, justI32:number) {
 }

 static addMaybeI32(builder:flatbuffers.Builder, maybeI32:number) {
-  builder.addFieldInt32(13, maybeI32, 0);
+  builder.addFieldInt32(13, maybeI32, null);
 }

 static addDefaultI32(builder:flatbuffers.Builder, defaultI32:number) {
@@ -282,7 +282,7 @@ static addJustU32(builder:flatbuffers.Builder, justU32:number) {
 }

 static addMaybeU32(builder:flatbuffers.Builder, maybeU32:number) {
-  builder.addFieldInt32(16, maybeU32, 0);
+  builder.addFieldInt32(16, maybeU32, null);
 }

 static addDefaultU32(builder:flatbuffers.Builder, defaultU32:number) {
@@ -294,7 +294,7 @@ static addJustI64(builder:flatbuffers.Builder, justI64:bigint) {
 }

 static addMaybeI64(builder:flatbuffers.Builder, maybeI64:bigint) {
-  builder.addFieldInt64(19, maybeI64, BigInt(0));
+  builder.addFieldInt64(19, maybeI64, null);
 }

 static addDefaultI64(builder:flatbuffers.Builder, defaultI64:bigint) {
@@ -306,7 +306,7 @@ static addJustU64(builder:flatbuffers.Builder, justU64:bigint) {
 }

 static addMaybeU64(builder:flatbuffers.Builder, maybeU64:bigint) {
-  builder.addFieldInt64(22, maybeU64, BigInt(0));
+  builder.addFieldInt64(22, maybeU64, null);
 }

 static addDefaultU64(builder:flatbuffers.Builder, defaultU64:bigint) {
@@ -318,7 +318,7 @@ static addJustF32(builder:flatbuffers.Builder, justF32:number) {
 }

 static addMaybeF32(builder:flatbuffers.Builder, maybeF32:number) {
-  builder.addFieldFloat32(25, maybeF32, 0);
+  builder.addFieldFloat32(25, maybeF32, null);
 }

 static addDefaultF32(builder:flatbuffers.Builder, defaultF32:number) {
@@ -330,7 +330,7 @@ static addJustF64(builder:flatbuffers.Builder, justF64:number) {
 }

 static addMaybeF64(builder:flatbuffers.Builder, maybeF64:number) {
-  builder.addFieldFloat64(28, maybeF64, 0);
+  builder.addFieldFloat64(28, maybeF64, null);
 }

 static addDefaultF64(builder:flatbuffers.Builder, defaultF64:number) {
@@ -342,7 +342,7 @@ static addJustBool(builder:flatbuffers.Builder, justBool:boolean) {
 }

 static addMaybeBool(builder:flatbuffers.Builder, maybeBool:boolean) {
-  builder.addFieldInt8(31, +maybeBool, 0);
+  builder.addFieldInt8(31, +maybeBool, null);
 }

 static addDefaultBool(builder:flatbuffers.Builder, defaultBool:boolean) {
@@ -354,7 +354,7 @@ static addJustEnum(builder:flatbuffers.Builder, justEnum:OptionalByte) {
 }

 static addMaybeEnum(builder:flatbuffers.Builder, maybeEnum:OptionalByte) {
-  builder.addFieldInt8(34, maybeEnum, 0);
+  builder.addFieldInt8(34, maybeEnum, null);
 }

 static addDefaultEnum(builder:flatbuffers.Builder, defaultEnum:OptionalByte) {
--- a/tests/ts/pnpm-lock.yaml
+++ b/tests/ts/pnpm-lock.yaml
@@ -0,0 +1,10 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+dependencies:
+  flatbuffers:
+    specifier: ../../
+    version: link:../..
--- a/tests/ts/typescript_keywords_generated.cjs
+++ b/tests/ts/typescript_keywords_generated.cjs
@@ -46,7 +46,7 @@ __export(foobar_exports, {
 var Abc;
 (function(Abc2) {
  Abc2[Abc2["a"] = 0] = "a";
-})(Abc = Abc || (Abc = {}));
+})(Abc || (Abc = {}));

 // reflection.js
 var reflection_exports = {};
@@ -81,7 +81,7 @@ var AdvancedFeatures;
  AdvancedFeatures2["AdvancedUnionFeatures"] = "2";
  AdvancedFeatures2["OptionalScalars"] = "4";
  AdvancedFeatures2["DefaultVectorsAndStrings"] = "8";
-})(AdvancedFeatures = AdvancedFeatures || (AdvancedFeatures = {}));
+})(AdvancedFeatures || (AdvancedFeatures = {}));

 // reflection/base-type.js
 var BaseType;
@@ -104,8 +104,9 @@ var BaseType;
  BaseType2[BaseType2["Obj"] = 15] = "Obj";
  BaseType2[BaseType2["Union"] = 16] = "Union";
  BaseType2[BaseType2["Array"] = 17] = "Array";
-  BaseType2[BaseType2["MaxBaseType"] = 18] = "MaxBaseType";
-})(BaseType = BaseType || (BaseType = {}));
+  BaseType2[BaseType2["Vector64"] = 18] = "Vector64";
+  BaseType2[BaseType2["MaxBaseType"] = 19] = "MaxBaseType";
+})(BaseType || (BaseType = {}));

 // reflection/enum.js
 var flatbuffers4 = __toESM(require("flatbuffers"), 1);
@@ -804,11 +805,26 @@ var Field = class _Field {
    this.bb.writeUint16(this.bb_pos + offset, value);
    return true;
  }
+  /**
+   * If the field uses 64-bit offsets.
+   */
+  offset64() {
+    const offset = this.bb.__offset(this.bb_pos, 30);
+    return offset ? !!this.bb.readInt8(this.bb_pos + offset) : false;
+  }
+  mutate_offset64(value) {
+    const offset = this.bb.__offset(this.bb_pos, 30);
+    if (offset === 0) {
+      return false;
+    }
+    this.bb.writeInt8(this.bb_pos + offset, +value);
+    return true;
+  }
  static getFullyQualifiedName() {
    return "reflection.Field";
  }
  static startField(builder) {
-    builder.startObject(13);
+    builder.startObject(14);
  }
  static addName(builder, nameOffset) {
    builder.addFieldOffset(0, nameOffset, 0);
@@ -869,6 +885,9 @@ var Field = class _Field {
  static addPadding(builder, padding) {
    builder.addFieldInt16(12, padding, 0);
  }
+  static addOffset64(builder, offset64) {
+    builder.addFieldInt8(13, +offset64, 0);
+  }
  static endField(builder) {
    const offset = builder.endObject();
    builder.requiredField(offset, 4);
@@ -876,7 +895,7 @@ var Field = class _Field {
    return offset;
  }
  unpack() {
-    return new FieldT(this.name(), this.type() !== null ? this.type().unpack() : null, this.id(), this.offset(), this.defaultInteger(), this.defaultReal(), this.deprecated(), this.required(), this.key(), this.bb.createObjList(this.attributes.bind(this), this.attributesLength()), this.bb.createScalarList(this.documentation.bind(this), this.documentationLength()), this.optional(), this.padding());
+    return new FieldT(this.name(), this.type() !== null ? this.type().unpack() : null, this.id(), this.offset(), this.defaultInteger(), this.defaultReal(), this.deprecated(), this.required(), this.key(), this.bb.createObjList(this.attributes.bind(this), this.attributesLength()), this.bb.createScalarList(this.documentation.bind(this), this.documentationLength()), this.optional(), this.padding(), this.offset64());
  }
  unpackTo(_o) {
    _o.name = this.name();
@@ -892,10 +911,11 @@ var Field = class _Field {
    _o.documentation = this.bb.createScalarList(this.documentation.bind(this), this.documentationLength());
    _o.optional = this.optional();
    _o.padding = this.padding();
+    _o.offset64 = this.offset64();
  }
 };
 var FieldT = class {
-  constructor(name = null, type = null, id = 0, offset = 0, defaultInteger = BigInt("0"), defaultReal = 0, deprecated = false, required = false, key = false, attributes = [], documentation = [], optional = false, padding = 0) {
+  constructor(name = null, type = null, id = 0, offset = 0, defaultInteger = BigInt("0"), defaultReal = 0, deprecated = false, required = false, key = false, attributes = [], documentation = [], optional = false, padding = 0, offset64 = false) {
    this.name = name;
    this.type = type;
    this.id = id;
@@ -909,6 +929,7 @@ var FieldT = class {
    this.documentation = documentation;
    this.optional = optional;
    this.padding = padding;
+    this.offset64 = offset64;
  }
  pack(builder) {
    const name = this.name !== null ? builder.createString(this.name) : 0;
@@ -929,6 +950,7 @@ var FieldT = class {
    Field.addDocumentation(builder, documentation);
    Field.addOptional(builder, this.optional);
    Field.addPadding(builder, this.padding);
+    Field.addOffset64(builder, this.offset64);
    return Field.endField(builder);
  }
 };
@@ -1718,14 +1740,14 @@ var flatbuffers11 = __toESM(require("flatbuffers"), 1);
 var class_;
 (function(class_3) {
  class_3[class_3["arguments_"] = 0] = "arguments_";
-})(class_ = class_ || (class_ = {}));
+})(class_ || (class_ = {}));

 // typescript/class.js
 var class_2;
 (function(class_3) {
  class_3[class_3["new_"] = 0] = "new_";
  class_3[class_3["instanceof_"] = 1] = "instanceof_";
-})(class_2 = class_2 || (class_2 = {}));
+})(class_2 || (class_2 = {}));

 // typescript/object.js
 var Object_2 = class _Object_ {
--- a/tests/ts/union_vector/union_vector_generated.cjs
+++ b/tests/ts/union_vector/union_vector_generated.cjs
@@ -212,7 +212,7 @@ var Character;
  Character2[Character2["BookFan"] = 4] = "BookFan";
  Character2[Character2["Other"] = 5] = "Other";
  Character2[Character2["Unused"] = 6] = "Unused";
-})(Character = Character || (Character = {}));
+})(Character || (Character = {}));
 function unionToCharacter(type, accessor) {
  switch (Character[type]) {
    case "NONE":
@@ -370,7 +370,7 @@ var Gadget;
  Gadget2[Gadget2["NONE"] = 0] = "NONE";
  Gadget2[Gadget2["FallingTub"] = 1] = "FallingTub";
  Gadget2[Gadget2["HandFan"] = 2] = "HandFan";
-})(Gadget = Gadget || (Gadget = {}));
+})(Gadget || (Gadget = {}));

 // union_vector/movie.js
 var flatbuffers3 = __toESM(require("flatbuffers"), 1);