From 2b44f17d958662ce6ed59671bc9697e63cef0058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Korde=C5=BE?= Date: Thu, 23 Oct 2025 17:19:59 +0200 Subject: [PATCH 1/4] Fix unpack function for union --- src/idl_gen_dart.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/idl_gen_dart.cpp b/src/idl_gen_dart.cpp index 52fc8772f24..7aff377d167 100644 --- a/src/idl_gen_dart.cpp +++ b/src/idl_gen_dart.cpp @@ -606,7 +606,7 @@ class DartGenerator : public BaseGenerator { std::string defaultValue = getDefaultValue(field.value); bool isNullable = defaultValue.empty() && !struct_def.fixed; std::string nullableValueAccessOperator = isNullable ? "?" : ""; - if (type.base_type == BASE_TYPE_STRUCT) { + if (type.base_type == BASE_TYPE_STRUCT || type.base_type == BASE_TYPE_UNION) { constructor_args += field_name + nullableValueAccessOperator + ".unpack()"; } else if (type.base_type == BASE_TYPE_VECTOR) { From 904c180baea16608bef2dcb293c6948e3365116e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Korde=C5=BE?= Date: Thu, 23 Oct 2025 20:40:11 +0200 Subject: [PATCH 2/4] Fix struct vector ordering on pack --- src/idl_gen_dart.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/idl_gen_dart.cpp b/src/idl_gen_dart.cpp index 7aff377d167..eeb5969ad46 100644 --- a/src/idl_gen_dart.cpp +++ b/src/idl_gen_dart.cpp @@ -1026,7 +1026,7 @@ class DartGenerator : public BaseGenerator { code += " int? " + offset_name + ";\n"; code += " if (" + field_name + " != null) {\n"; code += - " for (var e in " + field_name + "!) { e.pack(fbBuilder); }\n"; + " for (var e in " + field_name + "!.reversed) { e.pack(fbBuilder); }\n"; code += " " + namer_.Variable(field) + "Offset = fbBuilder.endStructVector(" + field_name + "!.length);\n"; From 6b2d45bb07ee84e3367067a6d01a0bbb5df8d519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Korde=C5=BE?= Date: Fri, 24 Oct 2025 22:33:01 +0200 Subject: [PATCH 3/4] Add missing newline after object builder --- src/idl_gen_dart.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/idl_gen_dart.cpp b/src/idl_gen_dart.cpp index eeb5969ad46..b21dd3f3380 100644 --- a/src/idl_gen_dart.cpp +++ b/src/idl_gen_dart.cpp @@ -1001,7 +1001,7 @@ class DartGenerator : public BaseGenerator { code += " fbBuilder.finish(finish(fbBuilder), fileIdentifier);\n"; code += " return fbBuilder.buffer;\n"; code += " }\n"; - code += "}\n"; + code += "}\n\n"; } std::string GenObjectBuilderImplementation( From c74e34966895bc87cbe2662592ca9174abb5fdb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Korde=C5=BE?= Date: Mon, 27 Oct 2025 17:20:31 +0100 Subject: [PATCH 4/4] Fix dart tests, regenerate test code --- dart/test/flat_buffers_test.dart | 32 +- dart/test/include_test1_generated.dart | 26 +- ...t2_my_game.other_name_space_generated.dart | 38 +- .../keyword_test_keyword_test_generated.dart | 4 +- ...nster_test_my_game.example2_generated.dart | 13 +- ...onster_test_my_game.example_generated.dart | 1362 +++++++---------- dart/test/monster_test_my_game_generated.dart | 13 +- scripts/generate_code.py | 20 + tests/include_test1_generated.dart | 1 + ...t2_my_game.other_name_space_generated.dart | 2 + tests/monster_extra_my_game_generated.dart | 1 + ...nster_test_my_game.example2_generated.dart | 1 + ...onster_test_my_game.example_generated.dart | 22 +- tests/monster_test_my_game_generated.dart | 1 + 14 files changed, 634 insertions(+), 902 deletions(-) diff --git a/dart/test/flat_buffers_test.dart b/dart/test/flat_buffers_test.dart index 275a2ef4092..c408dd156af 100644 --- a/dart/test/flat_buffers_test.dart +++ b/dart/test/flat_buffers_test.dart @@ -868,15 +868,14 @@ class ObjectAPITest { ..name = 'Monstrous' ..inventory = [24, 42] ..color = example.Color.Green - // TODO be smarter for unions and automatically set the `type` field? ..testType = example.AnyTypeId.MyGame_Example2_Monster ..test = example2.MonsterT() ..test4 = [example.TestT(a: 3, b: 4), example.TestT(a: 5, b: 6)] ..testarrayofstring = ["foo", "bar"] - ..testarrayoftables = [example.MonsterT(name: 'Oof')] - ..enemy = example.MonsterT(name: 'Enemy') + ..testarrayoftables = [example.MonsterT(name: 'Oof', testf: 42.5)] + ..enemy = example.MonsterT(name: 'Enemy', testf: 32.75) ..testarrayofbools = [false, true, false] - ..testf = 42.24 + ..testf = 42.25 ..testarrayofsortedstruct = [ example.AbilityT(id: 1, distance: 5), example.AbilityT(id: 3, distance: 7), @@ -894,16 +893,16 @@ class ObjectAPITest { fbBuilder.finish(offset); final data = fbBuilder.buffer; - // TODO currently broken because of struct builder issue, see #6688 - // final monster2 = example.Monster(data); // Monster (reader) - // expect( - // // map Monster => MonsterT, Vec3 => Vec3T, ... - // monster2.toString().replaceAllMapped( - // RegExp('([a-zA-z0-9]+){'), (match) => match.group(1) + 'T{'), - // monster.toString()); - // - // final monster3 = monster2.unpack(); // MonsterT - // expect(monster3.toString(), monster.toString()); + final monster2 = example.Monster(data); // Monster (reader) + expect( + // map Monster => MonsterT, Vec3 => Vec3T, ... + monster2.toString().replaceAllMapped( + RegExp('([a-zA-Z0-9]+){'), (match) => match.group(1)! + 'T{'), + monster.toString(), + ); + + final monster3 = monster2.unpack(); // MonsterT + expect(monster3.toString(), monster.toString()); } void test_Lists() { @@ -942,9 +941,8 @@ class StringListWrapperImpl { StringListWrapperImpl(this.bp, this.offset); - List? get items => const ListReader( - StringReader(), - ).vTableGetNullable(bp, offset, indexToField(0)); + List? get items => const ListReader(StringReader()) + .vTableGetNullable(bp, offset, indexToField(0)); } class StringListWrapperReader extends TableReader { diff --git a/dart/test/include_test1_generated.dart b/dart/test/include_test1_generated.dart index 2309e45722c..df6cdb9bbc9 100644 --- a/dart/test/include_test1_generated.dart +++ b/dart/test/include_test1_generated.dart @@ -2,11 +2,10 @@ // ignore_for_file: unused_import, unused_field, unused_element, unused_local_variable, constant_identifier_names import 'dart:typed_data' show Uint8List; - import 'package:flat_buffers/flat_buffers.dart' as fb; -import './include_test2_my_game.other_name_space_generated.dart' - as my_game_other_name_space; + +import './include_test2_my_game.other_name_space_generated.dart' as my_game_other_name_space; class TableA { TableA._(this._bc, this._bcOffset); @@ -20,17 +19,15 @@ class TableA { final fb.BufferContext _bc; final int _bcOffset; - my_game_other_name_space.TableB? get b => my_game_other_name_space - .TableB - .reader - .vTableGetNullable(_bc, _bcOffset, 4); + my_game_other_name_space.TableB? get b => my_game_other_name_space.TableB.reader.vTableGetNullable(_bc, _bcOffset, 4); @override String toString() { return 'TableA{b: ${b}}'; } - TableAT unpack() => TableAT(b: b?.unpack()); + TableAT unpack() => TableAT( + b: b?.unpack()); static int pack(fb.Builder fbBuilder, TableAT? object) { if (object == null) return 0; @@ -41,7 +38,8 @@ class TableA { class TableAT implements fb.Packable { my_game_other_name_space.TableBT? b; - TableAT({this.b}); + TableAT({ + this.b}); @override int pack(fb.Builder fbBuilder) { @@ -61,7 +59,8 @@ class _TableAReader extends fb.TableReader { const _TableAReader(); @override - TableA createObject(fb.BufferContext bc, int offset) => TableA._(bc, offset); + TableA createObject(fb.BufferContext bc, int offset) => + TableA._(bc, offset); } class TableABuilder { @@ -86,8 +85,10 @@ class TableABuilder { class TableAObjectBuilder extends fb.ObjectBuilder { final my_game_other_name_space.TableBObjectBuilder? _b; - TableAObjectBuilder({my_game_other_name_space.TableBObjectBuilder? b}) - : _b = b; + TableAObjectBuilder({ + my_game_other_name_space.TableBObjectBuilder? b, + }) + : _b = b; /// Finish building, and store into the [fbBuilder]. @override @@ -106,3 +107,4 @@ class TableAObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/dart/test/include_test2_my_game.other_name_space_generated.dart b/dart/test/include_test2_my_game.other_name_space_generated.dart index 975622b8fb4..f4af97b7b1e 100644 --- a/dart/test/include_test2_my_game.other_name_space_generated.dart +++ b/dart/test/include_test2_my_game.other_name_space_generated.dart @@ -4,9 +4,9 @@ library my_game.other_name_space; import 'dart:typed_data' show Uint8List; - import 'package:flat_buffers/flat_buffers.dart' as fb; + import './include_test1_generated.dart'; enum FromInclude { @@ -17,10 +17,8 @@ enum FromInclude { factory FromInclude.fromValue(int value) { switch (value) { - case 0: - return FromInclude.IncludeVal; - default: - throw StateError('Invalid value $value for bit flag enum'); + case 0: return FromInclude.IncludeVal; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -58,7 +56,8 @@ class Unused { return 'Unused{a: ${a}}'; } - UnusedT unpack() => UnusedT(a: a); + UnusedT unpack() => UnusedT( + a: a); static int pack(fb.Builder fbBuilder, UnusedT? object) { if (object == null) return 0; @@ -69,7 +68,8 @@ class Unused { class UnusedT implements fb.Packable { int a; - UnusedT({required this.a}); + UnusedT({ + required this.a}); @override int pack(fb.Builder fbBuilder) { @@ -90,7 +90,8 @@ class _UnusedReader extends fb.StructReader { int get size => 4; @override - Unused createObject(fb.BufferContext bc, int offset) => Unused._(bc, offset); + Unused createObject(fb.BufferContext bc, int offset) => + Unused._(bc, offset); } class UnusedBuilder { @@ -102,12 +103,16 @@ class UnusedBuilder { fbBuilder.putInt32(a); return fbBuilder.offset; } + } class UnusedObjectBuilder extends fb.ObjectBuilder { final int _a; - UnusedObjectBuilder({required int a}) : _a = a; + UnusedObjectBuilder({ + required int a, + }) + : _a = a; /// Finish building, and store into the [fbBuilder]. @override @@ -144,7 +149,8 @@ class TableB { return 'TableB{a: ${a}}'; } - TableBT unpack() => TableBT(a: a?.unpack()); + TableBT unpack() => TableBT( + a: a?.unpack()); static int pack(fb.Builder fbBuilder, TableBT? object) { if (object == null) return 0; @@ -155,7 +161,8 @@ class TableB { class TableBT implements fb.Packable { TableAT? a; - TableBT({this.a}); + TableBT({ + this.a}); @override int pack(fb.Builder fbBuilder) { @@ -175,7 +182,8 @@ class _TableBReader extends fb.TableReader { const _TableBReader(); @override - TableB createObject(fb.BufferContext bc, int offset) => TableB._(bc, offset); + TableB createObject(fb.BufferContext bc, int offset) => + TableB._(bc, offset); } class TableBBuilder { @@ -200,7 +208,10 @@ class TableBBuilder { class TableBObjectBuilder extends fb.ObjectBuilder { final TableAObjectBuilder? _a; - TableBObjectBuilder({TableAObjectBuilder? a}) : _a = a; + TableBObjectBuilder({ + TableAObjectBuilder? a, + }) + : _a = a; /// Finish building, and store into the [fbBuilder]. @override @@ -219,3 +230,4 @@ class TableBObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/dart/test/keyword_test_keyword_test_generated.dart b/dart/test/keyword_test_keyword_test_generated.dart index e0118af1624..05533892b2b 100644 --- a/dart/test/keyword_test_keyword_test_generated.dart +++ b/dart/test/keyword_test_keyword_test_generated.dart @@ -248,6 +248,7 @@ class KeywordsInTableObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class Table2 { Table2._(this._bc, this._bcOffset); factory Table2(List bytes) { @@ -276,7 +277,7 @@ class Table2 { Table2T unpack() => Table2T( typeType: typeType, - type: type); + type: type?.unpack()); static int pack(fb.Builder fbBuilder, Table2T? object) { if (object == null) return 0; @@ -367,3 +368,4 @@ class Table2ObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/dart/test/monster_test_my_game.example2_generated.dart b/dart/test/monster_test_my_game.example2_generated.dart index 8f7893fcd17..06c8e5d062f 100644 --- a/dart/test/monster_test_my_game.example2_generated.dart +++ b/dart/test/monster_test_my_game.example2_generated.dart @@ -4,12 +4,12 @@ library my_game.example2; import 'dart:typed_data' show Uint8List; - import 'package:flat_buffers/flat_buffers.dart' as fb; -import './include_test1_generated.dart'; -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; + +import './include_test1_generated.dart'; class Monster { Monster._(this._bc, this._bcOffset); @@ -23,6 +23,7 @@ class Monster { final fb.BufferContext _bc; final int _bcOffset; + @override String toString() { return 'Monster{}'; @@ -53,11 +54,12 @@ class _MonsterReader extends fb.TableReader { const _MonsterReader(); @override - Monster createObject(fb.BufferContext bc, int offset) => - Monster._(bc, offset); + Monster createObject(fb.BufferContext bc, int offset) => + Monster._(bc, offset); } class MonsterObjectBuilder extends fb.ObjectBuilder { + MonsterObjectBuilder(); /// Finish building, and store into the [fbBuilder]. @@ -75,3 +77,4 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/dart/test/monster_test_my_game.example_generated.dart b/dart/test/monster_test_my_game.example_generated.dart index 7be3afa8906..0b133b53a2d 100644 --- a/dart/test/monster_test_my_game.example_generated.dart +++ b/dart/test/monster_test_my_game.example_generated.dart @@ -4,12 +4,12 @@ library my_game.example; import 'dart:typed_data' show Uint8List; - import 'package:flat_buffers/flat_buffers.dart' as fb; -import './include_test1_generated.dart'; -import './monster_test_my_game.example2_generated.dart' as my_game_example2; import './monster_test_my_game_generated.dart' as my_game; +import './monster_test_my_game.example2_generated.dart' as my_game_example2; + +import './include_test1_generated.dart'; /// Composite components of Monster color. enum Color { @@ -23,16 +23,11 @@ enum Color { factory Color.fromValue(int value) { switch (value) { - case 1: - return Color.Red; - case 2: - return Color.Green; - case 8: - return Color.Blue; - case 0: - return Color._default; - default: - throw StateError('Invalid value $value for bit flag enum'); + case 1: return Color.Red; + case 2: return Color.Green; + case 8: return Color.Blue; + case 0: return Color._default; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -64,16 +59,11 @@ enum Race { factory Race.fromValue(int value) { switch (value) { - case -1: - return Race.None; - case 0: - return Race.Human; - case 1: - return Race.Dwarf; - case 2: - return Race.Elf; - default: - throw StateError('Invalid value $value for bit flag enum'); + case -1: return Race.None; + case 0: return Race.Human; + case 1: return Race.Dwarf; + case 2: return Race.Elf; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -107,16 +97,11 @@ enum LongEnum { factory LongEnum.fromValue(int value) { switch (value) { - case 2: - return LongEnum.LongOne; - case 4: - return LongEnum.LongTwo; - case 1099511627776: - return LongEnum.LongBig; - case 0: - return LongEnum._default; - default: - throw StateError('Invalid value $value for bit flag enum'); + case 2: return LongEnum.LongOne; + case 4: return LongEnum.LongTwo; + case 1099511627776: return LongEnum.LongBig; + case 0: return LongEnum._default; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -148,16 +133,11 @@ enum AnyTypeId { factory AnyTypeId.fromValue(int value) { switch (value) { - case 0: - return AnyTypeId.NONE; - case 1: - return AnyTypeId.Monster; - case 2: - return AnyTypeId.TestSimpleTableWithEnum; - case 3: - return AnyTypeId.MyGame_Example2_Monster; - default: - throw StateError('Invalid value $value for bit flag enum'); + case 0: return AnyTypeId.NONE; + case 1: return AnyTypeId.Monster; + case 2: return AnyTypeId.TestSimpleTableWithEnum; + case 3: return AnyTypeId.MyGame_Example2_Monster; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -191,16 +171,11 @@ enum AnyUniqueAliasesTypeId { factory AnyUniqueAliasesTypeId.fromValue(int value) { switch (value) { - case 0: - return AnyUniqueAliasesTypeId.NONE; - case 1: - return AnyUniqueAliasesTypeId.M; - case 2: - return AnyUniqueAliasesTypeId.TS; - case 3: - return AnyUniqueAliasesTypeId.M2; - default: - throw StateError('Invalid value $value for bit flag enum'); + case 0: return AnyUniqueAliasesTypeId.NONE; + case 1: return AnyUniqueAliasesTypeId.M; + case 2: return AnyUniqueAliasesTypeId.TS; + case 3: return AnyUniqueAliasesTypeId.M2; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -209,8 +184,7 @@ enum AnyUniqueAliasesTypeId { static const int minValue = 0; static const int maxValue = 3; - static const fb.Reader reader = - _AnyUniqueAliasesTypeIdReader(); + static const fb.Reader reader = _AnyUniqueAliasesTypeIdReader(); } class _AnyUniqueAliasesTypeIdReader extends fb.Reader { @@ -235,16 +209,11 @@ enum AnyAmbiguousAliasesTypeId { factory AnyAmbiguousAliasesTypeId.fromValue(int value) { switch (value) { - case 0: - return AnyAmbiguousAliasesTypeId.NONE; - case 1: - return AnyAmbiguousAliasesTypeId.M1; - case 2: - return AnyAmbiguousAliasesTypeId.M2; - case 3: - return AnyAmbiguousAliasesTypeId.M3; - default: - throw StateError('Invalid value $value for bit flag enum'); + case 0: return AnyAmbiguousAliasesTypeId.NONE; + case 1: return AnyAmbiguousAliasesTypeId.M1; + case 2: return AnyAmbiguousAliasesTypeId.M2; + case 3: return AnyAmbiguousAliasesTypeId.M3; + default: throw StateError('Invalid value $value for bit flag enum'); } } @@ -253,12 +222,10 @@ enum AnyAmbiguousAliasesTypeId { static const int minValue = 0; static const int maxValue = 3; - static const fb.Reader reader = - _AnyAmbiguousAliasesTypeIdReader(); + static const fb.Reader reader = _AnyAmbiguousAliasesTypeIdReader(); } -class _AnyAmbiguousAliasesTypeIdReader - extends fb.Reader { +class _AnyAmbiguousAliasesTypeIdReader extends fb.Reader { const _AnyAmbiguousAliasesTypeIdReader(); @override @@ -266,9 +233,7 @@ class _AnyAmbiguousAliasesTypeIdReader @override AnyAmbiguousAliasesTypeId read(fb.BufferContext bc, int offset) => - AnyAmbiguousAliasesTypeId.fromValue( - const fb.Uint8Reader().read(bc, offset), - ); + AnyAmbiguousAliasesTypeId.fromValue(const fb.Uint8Reader().read(bc, offset)); } class Test { @@ -287,7 +252,9 @@ class Test { return 'Test{a: ${a}, b: ${b}}'; } - TestT unpack() => TestT(a: a, b: b); + TestT unpack() => TestT( + a: a, + b: b); static int pack(fb.Builder fbBuilder, TestT? object) { if (object == null) return 0; @@ -299,7 +266,9 @@ class TestT implements fb.Packable { int a; int b; - TestT({required this.a, required this.b}); + TestT({ + required this.a, + required this.b}); @override int pack(fb.Builder fbBuilder) { @@ -322,7 +291,8 @@ class _TestReader extends fb.StructReader { int get size => 4; @override - Test createObject(fb.BufferContext bc, int offset) => Test._(bc, offset); + Test createObject(fb.BufferContext bc, int offset) => + Test._(bc, offset); } class TestBuilder { @@ -336,13 +306,19 @@ class TestBuilder { fbBuilder.putInt16(a); return fbBuilder.offset; } + } class TestObjectBuilder extends fb.ObjectBuilder { final int _a; final int _b; - TestObjectBuilder({required int a, required int b}) : _a = a, _b = b; + TestObjectBuilder({ + required int a, + required int b, + }) + : _a = a, + _b = b; /// Finish building, and store into the [fbBuilder]. @override @@ -369,21 +345,20 @@ class TestSimpleTableWithEnum { return reader.read(rootRef, 0); } - static const fb.Reader reader = - _TestSimpleTableWithEnumReader(); + static const fb.Reader reader = _TestSimpleTableWithEnumReader(); final fb.BufferContext _bc; final int _bcOffset; - Color get color => - Color.fromValue(const fb.Uint8Reader().vTableGet(_bc, _bcOffset, 4, 2)); + Color get color => Color.fromValue(const fb.Uint8Reader().vTableGet(_bc, _bcOffset, 4, 2)); @override String toString() { return 'TestSimpleTableWithEnum{color: ${color}}'; } - TestSimpleTableWithEnumT unpack() => TestSimpleTableWithEnumT(color: color); + TestSimpleTableWithEnumT unpack() => TestSimpleTableWithEnumT( + color: color); static int pack(fb.Builder fbBuilder, TestSimpleTableWithEnumT? object) { if (object == null) return 0; @@ -394,7 +369,8 @@ class TestSimpleTableWithEnum { class TestSimpleTableWithEnumT implements fb.Packable { Color color; - TestSimpleTableWithEnumT({this.color = Color.Green}); + TestSimpleTableWithEnumT({ + this.color = Color.Green}); @override int pack(fb.Builder fbBuilder) { @@ -409,13 +385,12 @@ class TestSimpleTableWithEnumT implements fb.Packable { } } -class _TestSimpleTableWithEnumReader - extends fb.TableReader { +class _TestSimpleTableWithEnumReader extends fb.TableReader { const _TestSimpleTableWithEnumReader(); @override - TestSimpleTableWithEnum createObject(fb.BufferContext bc, int offset) => - TestSimpleTableWithEnum._(bc, offset); + TestSimpleTableWithEnum createObject(fb.BufferContext bc, int offset) => + TestSimpleTableWithEnum._(bc, offset); } class TestSimpleTableWithEnumBuilder { @@ -440,7 +415,10 @@ class TestSimpleTableWithEnumBuilder { class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder { final Color? _color; - TestSimpleTableWithEnumObjectBuilder({Color? color}) : _color = color; + TestSimpleTableWithEnumObjectBuilder({ + Color? color, + }) + : _color = color; /// Finish building, and store into the [fbBuilder]. @override @@ -471,8 +449,7 @@ class Vec3 { double get y => const fb.Float32Reader().read(_bc, _bcOffset + 4); double get z => const fb.Float32Reader().read(_bc, _bcOffset + 8); double get test1 => const fb.Float64Reader().read(_bc, _bcOffset + 16); - Color get test2 => - Color.fromValue(const fb.Uint8Reader().read(_bc, _bcOffset + 24)); + Color get test2 => Color.fromValue(const fb.Uint8Reader().read(_bc, _bcOffset + 24)); Test get test3 => Test.reader.read(_bc, _bcOffset + 26); @override @@ -481,13 +458,12 @@ class Vec3 { } Vec3T unpack() => Vec3T( - x: x, - y: y, - z: z, - test1: test1, - test2: test2, - test3: test3.unpack(), - ); + x: x, + y: y, + z: z, + test1: test1, + test2: test2, + test3: test3.unpack()); static int pack(fb.Builder fbBuilder, Vec3T? object) { if (object == null) return 0; @@ -504,13 +480,12 @@ class Vec3T implements fb.Packable { TestT test3; Vec3T({ - required this.x, - required this.y, - required this.z, - required this.test1, - required this.test2, - required this.test3, - }); + required this.x, + required this.y, + required this.z, + required this.test1, + required this.test2, + required this.test3}); @override int pack(fb.Builder fbBuilder) { @@ -539,7 +514,8 @@ class _Vec3Reader extends fb.StructReader { int get size => 32; @override - Vec3 createObject(fb.BufferContext bc, int offset) => Vec3._(bc, offset); + Vec3 createObject(fb.BufferContext bc, int offset) => + Vec3._(bc, offset); } class Vec3Builder { @@ -547,14 +523,7 @@ class Vec3Builder { final fb.Builder fbBuilder; - int finish( - double x, - double y, - double z, - double test1, - Color test2, - fb.StructBuilder test3, - ) { + int finish(double x, double y, double z, double test1, Color test2, fb.StructBuilder test3) { fbBuilder.pad(2); test3(); fbBuilder.pad(1); @@ -566,6 +535,7 @@ class Vec3Builder { fbBuilder.putFloat32(x); return fbBuilder.offset; } + } class Vec3ObjectBuilder extends fb.ObjectBuilder { @@ -583,12 +553,13 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder { required double test1, required Color test2, required TestObjectBuilder test3, - }) : _x = x, - _y = y, - _z = z, - _test1 = test1, - _test2 = test2, - _test3 = test3; + }) + : _x = x, + _y = y, + _z = z, + _test1 = test1, + _test2 = test2, + _test3 = test3; /// Finish building, and store into the [fbBuilder]. @override @@ -630,7 +601,9 @@ class Ability { return 'Ability{id: ${id}, distance: ${distance}}'; } - AbilityT unpack() => AbilityT(id: id, distance: distance); + AbilityT unpack() => AbilityT( + id: id, + distance: distance); static int pack(fb.Builder fbBuilder, AbilityT? object) { if (object == null) return 0; @@ -642,7 +615,9 @@ class AbilityT implements fb.Packable { int id; int distance; - AbilityT({required this.id, required this.distance}); + AbilityT({ + required this.id, + required this.distance}); @override int pack(fb.Builder fbBuilder) { @@ -664,8 +639,8 @@ class _AbilityReader extends fb.StructReader { int get size => 8; @override - Ability createObject(fb.BufferContext bc, int offset) => - Ability._(bc, offset); + Ability createObject(fb.BufferContext bc, int offset) => + Ability._(bc, offset); } class AbilityBuilder { @@ -678,15 +653,19 @@ class AbilityBuilder { fbBuilder.putUint32(id); return fbBuilder.offset; } + } class AbilityObjectBuilder extends fb.ObjectBuilder { final int _id; final int _distance; - AbilityObjectBuilder({required int id, required int distance}) - : _id = id, - _distance = distance; + AbilityObjectBuilder({ + required int id, + required int distance, + }) + : _id = id, + _distance = distance; /// Finish building, and store into the [fbBuilder]. @override @@ -722,8 +701,10 @@ class StructOfStructs { return 'StructOfStructs{a: ${a}, b: ${b}, c: ${c}}'; } - StructOfStructsT unpack() => - StructOfStructsT(a: a.unpack(), b: b.unpack(), c: c.unpack()); + StructOfStructsT unpack() => StructOfStructsT( + a: a.unpack(), + b: b.unpack(), + c: c.unpack()); static int pack(fb.Builder fbBuilder, StructOfStructsT? object) { if (object == null) return 0; @@ -736,7 +717,10 @@ class StructOfStructsT implements fb.Packable { TestT b; AbilityT c; - StructOfStructsT({required this.a, required this.b, required this.c}); + StructOfStructsT({ + required this.a, + required this.b, + required this.c}); @override int pack(fb.Builder fbBuilder) { @@ -759,8 +743,8 @@ class _StructOfStructsReader extends fb.StructReader { int get size => 20; @override - StructOfStructs createObject(fb.BufferContext bc, int offset) => - StructOfStructs._(bc, offset); + StructOfStructs createObject(fb.BufferContext bc, int offset) => + StructOfStructs._(bc, offset); } class StructOfStructsBuilder { @@ -774,6 +758,7 @@ class StructOfStructsBuilder { a(); return fbBuilder.offset; } + } class StructOfStructsObjectBuilder extends fb.ObjectBuilder { @@ -785,9 +770,10 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder { required AbilityObjectBuilder a, required TestObjectBuilder b, required AbilityObjectBuilder c, - }) : _a = a, - _b = b, - _c = c; + }) + : _a = a, + _b = b, + _c = c; /// Finish building, and store into the [fbBuilder]. @override @@ -810,8 +796,7 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder { class StructOfStructsOfStructs { StructOfStructsOfStructs._(this._bc, this._bcOffset); - static const fb.Reader reader = - _StructOfStructsOfStructsReader(); + static const fb.Reader reader = _StructOfStructsOfStructsReader(); final fb.BufferContext _bc; final int _bcOffset; @@ -823,8 +808,8 @@ class StructOfStructsOfStructs { return 'StructOfStructsOfStructs{a: ${a}}'; } - StructOfStructsOfStructsT unpack() => - StructOfStructsOfStructsT(a: a.unpack()); + StructOfStructsOfStructsT unpack() => StructOfStructsOfStructsT( + a: a.unpack()); static int pack(fb.Builder fbBuilder, StructOfStructsOfStructsT? object) { if (object == null) return 0; @@ -835,7 +820,8 @@ class StructOfStructsOfStructs { class StructOfStructsOfStructsT implements fb.Packable { StructOfStructsT a; - StructOfStructsOfStructsT({required this.a}); + StructOfStructsOfStructsT({ + required this.a}); @override int pack(fb.Builder fbBuilder) { @@ -849,16 +835,15 @@ class StructOfStructsOfStructsT implements fb.Packable { } } -class _StructOfStructsOfStructsReader - extends fb.StructReader { +class _StructOfStructsOfStructsReader extends fb.StructReader { const _StructOfStructsOfStructsReader(); @override int get size => 20; @override - StructOfStructsOfStructs createObject(fb.BufferContext bc, int offset) => - StructOfStructsOfStructs._(bc, offset); + StructOfStructsOfStructs createObject(fb.BufferContext bc, int offset) => + StructOfStructsOfStructs._(bc, offset); } class StructOfStructsOfStructsBuilder { @@ -870,6 +855,7 @@ class StructOfStructsOfStructsBuilder { a(); return fbBuilder.offset; } + } class StructOfStructsOfStructsObjectBuilder extends fb.ObjectBuilder { @@ -877,7 +863,8 @@ class StructOfStructsOfStructsObjectBuilder extends fb.ObjectBuilder { StructOfStructsOfStructsObjectBuilder({ required StructOfStructsObjectBuilder a, - }) : _a = a; + }) + : _a = a; /// Finish building, and store into the [fbBuilder]. @override @@ -907,8 +894,7 @@ class Stat { final fb.BufferContext _bc; final int _bcOffset; - String? get id => - const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 4); + String? get id => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 4); int get val => const fb.Int64Reader().vTableGet(_bc, _bcOffset, 6, 0); int get count => const fb.Uint16Reader().vTableGet(_bc, _bcOffset, 8, 0); @@ -917,7 +903,10 @@ class Stat { return 'Stat{id: ${id}, val: ${val}, count: ${count}}'; } - StatT unpack() => StatT(id: id, val: val, count: count); + StatT unpack() => StatT( + id: id, + val: val, + count: count); static int pack(fb.Builder fbBuilder, StatT? object) { if (object == null) return 0; @@ -930,11 +919,15 @@ class StatT implements fb.Packable { int val; int count; - StatT({this.id, this.val = 0, this.count = 0}); + StatT({ + this.id, + this.val = 0, + this.count = 0}); @override int pack(fb.Builder fbBuilder) { - final int? idOffset = id == null ? null : fbBuilder.writeString(id!); + final int? idOffset = id == null ? null + : fbBuilder.writeString(id!); fbBuilder.startTable(3); fbBuilder.addOffset(0, idOffset); fbBuilder.addInt64(1, val); @@ -952,7 +945,8 @@ class _StatReader extends fb.TableReader { const _StatReader(); @override - Stat createObject(fb.BufferContext bc, int offset) => Stat._(bc, offset); + Stat createObject(fb.BufferContext bc, int offset) => + Stat._(bc, offset); } class StatBuilder { @@ -968,12 +962,10 @@ class StatBuilder { fbBuilder.addOffset(0, offset); return fbBuilder.offset; } - int addVal(int? val) { fbBuilder.addInt64(1, val); return fbBuilder.offset; } - int addCount(int? count) { fbBuilder.addUint16(2, count); return fbBuilder.offset; @@ -989,15 +981,20 @@ class StatObjectBuilder extends fb.ObjectBuilder { final int? _val; final int? _count; - StatObjectBuilder({String? id, int? val, int? count}) - : _id = id, - _val = val, - _count = count; + StatObjectBuilder({ + String? id, + int? val, + int? count, + }) + : _id = id, + _val = val, + _count = count; /// Finish building, and store into the [fbBuilder]. @override int finish(fb.Builder fbBuilder) { - final int? idOffset = _id == null ? null : fbBuilder.writeString(_id!); + final int? idOffset = _id == null ? null + : fbBuilder.writeString(_id!); fbBuilder.startTable(3); fbBuilder.addOffset(0, idOffset); fbBuilder.addInt64(1, _val); @@ -1033,7 +1030,8 @@ class Referrable { return 'Referrable{id: ${id}}'; } - ReferrableT unpack() => ReferrableT(id: id); + ReferrableT unpack() => ReferrableT( + id: id); static int pack(fb.Builder fbBuilder, ReferrableT? object) { if (object == null) return 0; @@ -1044,7 +1042,8 @@ class Referrable { class ReferrableT implements fb.Packable { int id; - ReferrableT({this.id = 0}); + ReferrableT({ + this.id = 0}); @override int pack(fb.Builder fbBuilder) { @@ -1063,8 +1062,8 @@ class _ReferrableReader extends fb.TableReader { const _ReferrableReader(); @override - Referrable createObject(fb.BufferContext bc, int offset) => - Referrable._(bc, offset); + Referrable createObject(fb.BufferContext bc, int offset) => + Referrable._(bc, offset); } class ReferrableBuilder { @@ -1089,7 +1088,10 @@ class ReferrableBuilder { class ReferrableObjectBuilder extends fb.ObjectBuilder { final int? _id; - ReferrableObjectBuilder({int? id}) : _id = id; + ReferrableObjectBuilder({ + int? id, + }) + : _id = id; /// Finish building, and store into the [fbBuilder]. @override @@ -1124,203 +1126,87 @@ class Monster { Vec3? get pos => Vec3.reader.vTableGetNullable(_bc, _bcOffset, 4); int get mana => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 6, 150); int get hp => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 8, 100); - String? get name => - const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10); - List? get inventory => - const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 14); - Color get color => - Color.fromValue(const fb.Uint8Reader().vTableGet(_bc, _bcOffset, 16, 8)); - AnyTypeId? get testType => AnyTypeId._createOrNull( - const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 18), - ); + String? get name => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10); + List? get inventory => const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 14); + Color get color => Color.fromValue(const fb.Uint8Reader().vTableGet(_bc, _bcOffset, 16, 8)); + AnyTypeId? get testType => AnyTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 18)); dynamic get test { switch (testType?.value) { - case 1: - return Monster.reader.vTableGetNullable(_bc, _bcOffset, 20); - case 2: - return TestSimpleTableWithEnum.reader.vTableGetNullable( - _bc, - _bcOffset, - 20, - ); - case 3: - return my_game_example2.Monster.reader.vTableGetNullable( - _bc, - _bcOffset, - 20, - ); - default: - return null; + case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 20); + case 2: return TestSimpleTableWithEnum.reader.vTableGetNullable(_bc, _bcOffset, 20); + case 3: return my_game_example2.Monster.reader.vTableGetNullable(_bc, _bcOffset, 20); + default: return null; } } - - List? get test4 => const fb.ListReader( - Test.reader, - ).vTableGetNullable(_bc, _bcOffset, 22); - List? get testarrayofstring => const fb.ListReader( - fb.StringReader(), - ).vTableGetNullable(_bc, _bcOffset, 24); - + List? get test4 => const fb.ListReader(Test.reader).vTableGetNullable(_bc, _bcOffset, 22); + List? get testarrayofstring => const fb.ListReader(fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 24); /// an example documentation comment: this will end up in the generated code /// multiline too - List? get testarrayoftables => const fb.ListReader( - Monster.reader, - ).vTableGetNullable(_bc, _bcOffset, 26); + List? get testarrayoftables => const fb.ListReader(Monster.reader).vTableGetNullable(_bc, _bcOffset, 26); Monster? get enemy => Monster.reader.vTableGetNullable(_bc, _bcOffset, 28); - List? get testnestedflatbuffer => - const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 30); + List? get testnestedflatbuffer => const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 30); Stat? get testempty => Stat.reader.vTableGetNullable(_bc, _bcOffset, 32); - bool get testbool => - const fb.BoolReader().vTableGet(_bc, _bcOffset, 34, false); - int get testhashs32Fnv1 => - const fb.Int32Reader().vTableGet(_bc, _bcOffset, 36, 0); - int get testhashu32Fnv1 => - const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 38, 0); - int get testhashs64Fnv1 => - const fb.Int64Reader().vTableGet(_bc, _bcOffset, 40, 0); - int get testhashu64Fnv1 => - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 42, 0); - int get testhashs32Fnv1a => - const fb.Int32Reader().vTableGet(_bc, _bcOffset, 44, 0); - int get testhashu32Fnv1a => - const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 46, 0); - int get testhashs64Fnv1a => - const fb.Int64Reader().vTableGet(_bc, _bcOffset, 48, 0); - int get testhashu64Fnv1a => - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 50, 0); - List? get testarrayofbools => const fb.ListReader( - fb.BoolReader(), - ).vTableGetNullable(_bc, _bcOffset, 52); - double get testf => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 54, 3.14159); - double get testf2 => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 56, 3.0); - double get testf3 => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 58, 0.0); - List? get testarrayofstring2 => const fb.ListReader( - fb.StringReader(), - ).vTableGetNullable(_bc, _bcOffset, 60); - List? get testarrayofsortedstruct => const fb.ListReader( - Ability.reader, - ).vTableGetNullable(_bc, _bcOffset, 62); - List? get flex => - const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 64); - List? get test5 => const fb.ListReader( - Test.reader, - ).vTableGetNullable(_bc, _bcOffset, 66); - List? get vectorOfLongs => const fb.ListReader( - fb.Int64Reader(), - ).vTableGetNullable(_bc, _bcOffset, 68); - List? get vectorOfDoubles => const fb.ListReader( - fb.Float64Reader(), - ).vTableGetNullable(_bc, _bcOffset, 70); - my_game.InParentNamespace? get parentNamespaceTest => - my_game.InParentNamespace.reader.vTableGetNullable(_bc, _bcOffset, 72); - List? get vectorOfReferrables => const fb.ListReader( - Referrable.reader, - ).vTableGetNullable(_bc, _bcOffset, 74); - int get singleWeakReference => - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 76, 0); - List? get vectorOfWeakReferences => const fb.ListReader( - fb.Uint64Reader(), - ).vTableGetNullable(_bc, _bcOffset, 78); - List? get vectorOfStrongReferrables => - const fb.ListReader( - Referrable.reader, - ).vTableGetNullable(_bc, _bcOffset, 80); - int get coOwningReference => - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 82, 0); - List? get vectorOfCoOwningReferences => const fb.ListReader( - fb.Uint64Reader(), - ).vTableGetNullable(_bc, _bcOffset, 84); - int get nonOwningReference => - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 86, 0); - List? get vectorOfNonOwningReferences => const fb.ListReader( - fb.Uint64Reader(), - ).vTableGetNullable(_bc, _bcOffset, 88); - AnyUniqueAliasesTypeId? get anyUniqueType => - AnyUniqueAliasesTypeId._createOrNull( - const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 90), - ); + bool get testbool => const fb.BoolReader().vTableGet(_bc, _bcOffset, 34, false); + int get testhashs32Fnv1 => const fb.Int32Reader().vTableGet(_bc, _bcOffset, 36, 0); + int get testhashu32Fnv1 => const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 38, 0); + int get testhashs64Fnv1 => const fb.Int64Reader().vTableGet(_bc, _bcOffset, 40, 0); + int get testhashu64Fnv1 => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 42, 0); + int get testhashs32Fnv1a => const fb.Int32Reader().vTableGet(_bc, _bcOffset, 44, 0); + int get testhashu32Fnv1a => const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 46, 0); + int get testhashs64Fnv1a => const fb.Int64Reader().vTableGet(_bc, _bcOffset, 48, 0); + int get testhashu64Fnv1a => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 50, 0); + List? get testarrayofbools => const fb.ListReader(fb.BoolReader()).vTableGetNullable(_bc, _bcOffset, 52); + double get testf => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 54, 3.14159); + double get testf2 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 56, 3.0); + double get testf3 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 58, 0.0); + List? get testarrayofstring2 => const fb.ListReader(fb.StringReader()).vTableGetNullable(_bc, _bcOffset, 60); + List? get testarrayofsortedstruct => const fb.ListReader(Ability.reader).vTableGetNullable(_bc, _bcOffset, 62); + List? get flex => const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 64); + List? get test5 => const fb.ListReader(Test.reader).vTableGetNullable(_bc, _bcOffset, 66); + List? get vectorOfLongs => const fb.ListReader(fb.Int64Reader()).vTableGetNullable(_bc, _bcOffset, 68); + List? get vectorOfDoubles => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 70); + my_game.InParentNamespace? get parentNamespaceTest => my_game.InParentNamespace.reader.vTableGetNullable(_bc, _bcOffset, 72); + List? get vectorOfReferrables => const fb.ListReader(Referrable.reader).vTableGetNullable(_bc, _bcOffset, 74); + int get singleWeakReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 76, 0); + List? get vectorOfWeakReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 78); + List? get vectorOfStrongReferrables => const fb.ListReader(Referrable.reader).vTableGetNullable(_bc, _bcOffset, 80); + int get coOwningReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 82, 0); + List? get vectorOfCoOwningReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 84); + int get nonOwningReference => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 86, 0); + List? get vectorOfNonOwningReferences => const fb.ListReader(fb.Uint64Reader()).vTableGetNullable(_bc, _bcOffset, 88); + AnyUniqueAliasesTypeId? get anyUniqueType => AnyUniqueAliasesTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 90)); dynamic get anyUnique { switch (anyUniqueType?.value) { - case 1: - return Monster.reader.vTableGetNullable(_bc, _bcOffset, 92); - case 2: - return TestSimpleTableWithEnum.reader.vTableGetNullable( - _bc, - _bcOffset, - 92, - ); - case 3: - return my_game_example2.Monster.reader.vTableGetNullable( - _bc, - _bcOffset, - 92, - ); - default: - return null; + case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 92); + case 2: return TestSimpleTableWithEnum.reader.vTableGetNullable(_bc, _bcOffset, 92); + case 3: return my_game_example2.Monster.reader.vTableGetNullable(_bc, _bcOffset, 92); + default: return null; } } - - AnyAmbiguousAliasesTypeId? get anyAmbiguousType => - AnyAmbiguousAliasesTypeId._createOrNull( - const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 94), - ); + AnyAmbiguousAliasesTypeId? get anyAmbiguousType => AnyAmbiguousAliasesTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 94)); dynamic get anyAmbiguous { switch (anyAmbiguousType?.value) { - case 1: - return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); - case 2: - return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); - case 3: - return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); - default: - return null; + case 1: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); + case 2: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); + case 3: return Monster.reader.vTableGetNullable(_bc, _bcOffset, 96); + default: return null; } } - - List? get vectorOfEnums => const fb.ListReader( - Color.reader, - ).vTableGetNullable(_bc, _bcOffset, 98); - Race get signedEnum => - Race.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 100, -1)); - List? get testrequirednestedflatbuffer => - const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 102); - List? get scalarKeySortedTables => const fb.ListReader( - Stat.reader, - ).vTableGetNullable(_bc, _bcOffset, 104); + List? get vectorOfEnums => const fb.ListReader(Color.reader).vTableGetNullable(_bc, _bcOffset, 98); + Race get signedEnum => Race.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 100, -1)); + List? get testrequirednestedflatbuffer => const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 102); + List? get scalarKeySortedTables => const fb.ListReader(Stat.reader).vTableGetNullable(_bc, _bcOffset, 104); Test? get nativeInline => Test.reader.vTableGetNullable(_bc, _bcOffset, 106); - LongEnum get longEnumNonEnumDefault => LongEnum.fromValue( - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 108, 0), - ); - LongEnum get longEnumNormalDefault => LongEnum.fromValue( - const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 110, 2), - ); - double get nanDefault => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 112, double.nan); - double get infDefault => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 114, double.infinity); - double get positiveInfDefault => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 116, double.infinity); - double get infinityDefault => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 118, double.infinity); - double get positiveInfinityDefault => - const fb.Float32Reader().vTableGet(_bc, _bcOffset, 120, double.infinity); - double get negativeInfDefault => const fb.Float32Reader().vTableGet( - _bc, - _bcOffset, - 122, - double.negativeInfinity, - ); - double get negativeInfinityDefault => const fb.Float32Reader().vTableGet( - _bc, - _bcOffset, - 124, - double.negativeInfinity, - ); - double get doubleInfDefault => - const fb.Float64Reader().vTableGet(_bc, _bcOffset, 126, double.infinity); + LongEnum get longEnumNonEnumDefault => LongEnum.fromValue(const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 108, 0)); + LongEnum get longEnumNormalDefault => LongEnum.fromValue(const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 110, 2)); + double get nanDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 112, double.nan); + double get infDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 114, double.infinity); + double get positiveInfDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 116, double.infinity); + double get infinityDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 118, double.infinity); + double get positiveInfinityDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 120, double.infinity); + double get negativeInfDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 122, double.negativeInfinity); + double get negativeInfinityDefault => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 124, double.negativeInfinity); + double get doubleInfDefault => const fb.Float64Reader().vTableGet(_bc, _bcOffset, 126, double.infinity); @override String toString() { @@ -1328,109 +1214,67 @@ class Monster { } MonsterT unpack() => MonsterT( - pos: pos?.unpack(), - mana: mana, - hp: hp, - name: name, - inventory: const fb.Uint8ListReader( - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 14), - color: color, - testType: testType, - test: test, - test4: test4?.map((e) => e.unpack()).toList(), - testarrayofstring: const fb.ListReader( - fb.StringReader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 24), - testarrayoftables: testarrayoftables?.map((e) => e.unpack()).toList(), - enemy: enemy?.unpack(), - testnestedflatbuffer: const fb.Uint8ListReader( - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 30), - testempty: testempty?.unpack(), - testbool: testbool, - testhashs32Fnv1: testhashs32Fnv1, - testhashu32Fnv1: testhashu32Fnv1, - testhashs64Fnv1: testhashs64Fnv1, - testhashu64Fnv1: testhashu64Fnv1, - testhashs32Fnv1a: testhashs32Fnv1a, - testhashu32Fnv1a: testhashu32Fnv1a, - testhashs64Fnv1a: testhashs64Fnv1a, - testhashu64Fnv1a: testhashu64Fnv1a, - testarrayofbools: const fb.ListReader( - fb.BoolReader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 52), - testf: testf, - testf2: testf2, - testf3: testf3, - testarrayofstring2: const fb.ListReader( - fb.StringReader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 60), - testarrayofsortedstruct: testarrayofsortedstruct - ?.map((e) => e.unpack()) - .toList(), - flex: const fb.Uint8ListReader( - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 64), - test5: test5?.map((e) => e.unpack()).toList(), - vectorOfLongs: const fb.ListReader( - fb.Int64Reader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 68), - vectorOfDoubles: const fb.ListReader( - fb.Float64Reader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 70), - parentNamespaceTest: parentNamespaceTest?.unpack(), - vectorOfReferrables: vectorOfReferrables?.map((e) => e.unpack()).toList(), - singleWeakReference: singleWeakReference, - vectorOfWeakReferences: const fb.ListReader( - fb.Uint64Reader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 78), - vectorOfStrongReferrables: vectorOfStrongReferrables - ?.map((e) => e.unpack()) - .toList(), - coOwningReference: coOwningReference, - vectorOfCoOwningReferences: const fb.ListReader( - fb.Uint64Reader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 84), - nonOwningReference: nonOwningReference, - vectorOfNonOwningReferences: const fb.ListReader( - fb.Uint64Reader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 88), - anyUniqueType: anyUniqueType, - anyUnique: anyUnique, - anyAmbiguousType: anyAmbiguousType, - anyAmbiguous: anyAmbiguous, - vectorOfEnums: const fb.ListReader( - Color.reader, - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 98), - signedEnum: signedEnum, - testrequirednestedflatbuffer: const fb.Uint8ListReader( - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 102), - scalarKeySortedTables: scalarKeySortedTables - ?.map((e) => e.unpack()) - .toList(), - nativeInline: nativeInline?.unpack(), - longEnumNonEnumDefault: longEnumNonEnumDefault, - longEnumNormalDefault: longEnumNormalDefault, - nanDefault: nanDefault, - infDefault: infDefault, - positiveInfDefault: positiveInfDefault, - infinityDefault: infinityDefault, - positiveInfinityDefault: positiveInfinityDefault, - negativeInfDefault: negativeInfDefault, - negativeInfinityDefault: negativeInfinityDefault, - doubleInfDefault: doubleInfDefault, - ); + pos: pos?.unpack(), + mana: mana, + hp: hp, + name: name, + inventory: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 14), + color: color, + testType: testType, + test: test?.unpack(), + test4: test4?.map((e) => e.unpack()).toList(), + testarrayofstring: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), + testarrayoftables: testarrayoftables?.map((e) => e.unpack()).toList(), + enemy: enemy?.unpack(), + testnestedflatbuffer: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 30), + testempty: testempty?.unpack(), + testbool: testbool, + testhashs32Fnv1: testhashs32Fnv1, + testhashu32Fnv1: testhashu32Fnv1, + testhashs64Fnv1: testhashs64Fnv1, + testhashu64Fnv1: testhashu64Fnv1, + testhashs32Fnv1a: testhashs32Fnv1a, + testhashu32Fnv1a: testhashu32Fnv1a, + testhashs64Fnv1a: testhashs64Fnv1a, + testhashu64Fnv1a: testhashu64Fnv1a, + testarrayofbools: const fb.ListReader(fb.BoolReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 52), + testf: testf, + testf2: testf2, + testf3: testf3, + testarrayofstring2: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 60), + testarrayofsortedstruct: testarrayofsortedstruct?.map((e) => e.unpack()).toList(), + flex: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 64), + test5: test5?.map((e) => e.unpack()).toList(), + vectorOfLongs: const fb.ListReader(fb.Int64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 68), + vectorOfDoubles: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 70), + parentNamespaceTest: parentNamespaceTest?.unpack(), + vectorOfReferrables: vectorOfReferrables?.map((e) => e.unpack()).toList(), + singleWeakReference: singleWeakReference, + vectorOfWeakReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 78), + vectorOfStrongReferrables: vectorOfStrongReferrables?.map((e) => e.unpack()).toList(), + coOwningReference: coOwningReference, + vectorOfCoOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 84), + nonOwningReference: nonOwningReference, + vectorOfNonOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88), + anyUniqueType: anyUniqueType, + anyUnique: anyUnique?.unpack(), + anyAmbiguousType: anyAmbiguousType, + anyAmbiguous: anyAmbiguous?.unpack(), + vectorOfEnums: const fb.ListReader(Color.reader, lazy: false).vTableGetNullable(_bc, _bcOffset, 98), + signedEnum: signedEnum, + testrequirednestedflatbuffer: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 102), + scalarKeySortedTables: scalarKeySortedTables?.map((e) => e.unpack()).toList(), + nativeInline: nativeInline?.unpack(), + longEnumNonEnumDefault: longEnumNonEnumDefault, + longEnumNormalDefault: longEnumNormalDefault, + nanDefault: nanDefault, + infDefault: infDefault, + positiveInfDefault: positiveInfDefault, + infinityDefault: infinityDefault, + positiveInfinityDefault: positiveInfinityDefault, + negativeInfDefault: negativeInfDefault, + negativeInfinityDefault: negativeInfinityDefault, + doubleInfDefault: doubleInfDefault); static int pack(fb.Builder fbBuilder, MonsterT? object) { if (object == null) return 0; @@ -1450,7 +1294,6 @@ class MonsterT implements fb.Packable { dynamic test; List? test4; List? testarrayofstring; - /// an example documentation comment: this will end up in the generated code /// multiline too List? testarrayoftables; @@ -1506,168 +1349,127 @@ class MonsterT implements fb.Packable { double doubleInfDefault; MonsterT({ - this.pos, - this.mana = 150, - this.hp = 100, - this.name, - this.inventory, - this.color = Color.Blue, - this.testType, - this.test, - this.test4, - this.testarrayofstring, - this.testarrayoftables, - this.enemy, - this.testnestedflatbuffer, - this.testempty, - this.testbool = false, - this.testhashs32Fnv1 = 0, - this.testhashu32Fnv1 = 0, - this.testhashs64Fnv1 = 0, - this.testhashu64Fnv1 = 0, - this.testhashs32Fnv1a = 0, - this.testhashu32Fnv1a = 0, - this.testhashs64Fnv1a = 0, - this.testhashu64Fnv1a = 0, - this.testarrayofbools, - this.testf = 3.14159, - this.testf2 = 3.0, - this.testf3 = 0.0, - this.testarrayofstring2, - this.testarrayofsortedstruct, - this.flex, - this.test5, - this.vectorOfLongs, - this.vectorOfDoubles, - this.parentNamespaceTest, - this.vectorOfReferrables, - this.singleWeakReference = 0, - this.vectorOfWeakReferences, - this.vectorOfStrongReferrables, - this.coOwningReference = 0, - this.vectorOfCoOwningReferences, - this.nonOwningReference = 0, - this.vectorOfNonOwningReferences, - this.anyUniqueType, - this.anyUnique, - this.anyAmbiguousType, - this.anyAmbiguous, - this.vectorOfEnums, - this.signedEnum = Race.None, - this.testrequirednestedflatbuffer, - this.scalarKeySortedTables, - this.nativeInline, - this.longEnumNonEnumDefault = LongEnum._default, - this.longEnumNormalDefault = LongEnum.LongOne, - this.nanDefault = double.nan, - this.infDefault = double.infinity, - this.positiveInfDefault = double.infinity, - this.infinityDefault = double.infinity, - this.positiveInfinityDefault = double.infinity, - this.negativeInfDefault = double.negativeInfinity, - this.negativeInfinityDefault = double.negativeInfinity, - this.doubleInfDefault = double.infinity, - }); + this.pos, + this.mana = 150, + this.hp = 100, + this.name, + this.inventory, + this.color = Color.Blue, + this.testType, + this.test, + this.test4, + this.testarrayofstring, + this.testarrayoftables, + this.enemy, + this.testnestedflatbuffer, + this.testempty, + this.testbool = false, + this.testhashs32Fnv1 = 0, + this.testhashu32Fnv1 = 0, + this.testhashs64Fnv1 = 0, + this.testhashu64Fnv1 = 0, + this.testhashs32Fnv1a = 0, + this.testhashu32Fnv1a = 0, + this.testhashs64Fnv1a = 0, + this.testhashu64Fnv1a = 0, + this.testarrayofbools, + this.testf = 3.14159, + this.testf2 = 3.0, + this.testf3 = 0.0, + this.testarrayofstring2, + this.testarrayofsortedstruct, + this.flex, + this.test5, + this.vectorOfLongs, + this.vectorOfDoubles, + this.parentNamespaceTest, + this.vectorOfReferrables, + this.singleWeakReference = 0, + this.vectorOfWeakReferences, + this.vectorOfStrongReferrables, + this.coOwningReference = 0, + this.vectorOfCoOwningReferences, + this.nonOwningReference = 0, + this.vectorOfNonOwningReferences, + this.anyUniqueType, + this.anyUnique, + this.anyAmbiguousType, + this.anyAmbiguous, + this.vectorOfEnums, + this.signedEnum = Race.None, + this.testrequirednestedflatbuffer, + this.scalarKeySortedTables, + this.nativeInline, + this.longEnumNonEnumDefault = LongEnum._default, + this.longEnumNormalDefault = LongEnum.LongOne, + this.nanDefault = double.nan, + this.infDefault = double.infinity, + this.positiveInfDefault = double.infinity, + this.infinityDefault = double.infinity, + this.positiveInfinityDefault = double.infinity, + this.negativeInfDefault = double.negativeInfinity, + this.negativeInfinityDefault = double.negativeInfinity, + this.doubleInfDefault = double.infinity}); @override int pack(fb.Builder fbBuilder) { - final int? nameOffset = name == null ? null : fbBuilder.writeString(name!); - final int? inventoryOffset = inventory == null - ? null + final int? nameOffset = name == null ? null + : fbBuilder.writeString(name!); + final int? inventoryOffset = inventory == null ? null : fbBuilder.writeListUint8(inventory!); final int? testOffset = test?.pack(fbBuilder); int? test4Offset; if (test4 != null) { - for (var e in test4!) { - e.pack(fbBuilder); - } + for (var e in test4!.reversed) { e.pack(fbBuilder); } test4Offset = fbBuilder.endStructVector(test4!.length); } - final int? testarrayofstringOffset = testarrayofstring == null - ? null - : fbBuilder.writeList( - testarrayofstring!.map(fbBuilder.writeString).toList(), - ); - final int? testarrayoftablesOffset = testarrayoftables == null - ? null - : fbBuilder.writeList( - testarrayoftables!.map((b) => b.pack(fbBuilder)).toList(), - ); + final int? testarrayofstringOffset = testarrayofstring == null ? null + : fbBuilder.writeList(testarrayofstring!.map(fbBuilder.writeString).toList()); + final int? testarrayoftablesOffset = testarrayoftables == null ? null + : fbBuilder.writeList(testarrayoftables!.map((b) => b.pack(fbBuilder)).toList()); final int? enemyOffset = enemy?.pack(fbBuilder); - final int? testnestedflatbufferOffset = testnestedflatbuffer == null - ? null + final int? testnestedflatbufferOffset = testnestedflatbuffer == null ? null : fbBuilder.writeListUint8(testnestedflatbuffer!); final int? testemptyOffset = testempty?.pack(fbBuilder); - final int? testarrayofboolsOffset = testarrayofbools == null - ? null + final int? testarrayofboolsOffset = testarrayofbools == null ? null : fbBuilder.writeListBool(testarrayofbools!); - final int? testarrayofstring2Offset = testarrayofstring2 == null - ? null - : fbBuilder.writeList( - testarrayofstring2!.map(fbBuilder.writeString).toList(), - ); + final int? testarrayofstring2Offset = testarrayofstring2 == null ? null + : fbBuilder.writeList(testarrayofstring2!.map(fbBuilder.writeString).toList()); int? testarrayofsortedstructOffset; if (testarrayofsortedstruct != null) { - for (var e in testarrayofsortedstruct!) { - e.pack(fbBuilder); - } - testarrayofsortedstructOffset = fbBuilder.endStructVector( - testarrayofsortedstruct!.length, - ); + for (var e in testarrayofsortedstruct!.reversed) { e.pack(fbBuilder); } + testarrayofsortedstructOffset = fbBuilder.endStructVector(testarrayofsortedstruct!.length); } - final int? flexOffset = flex == null - ? null + final int? flexOffset = flex == null ? null : fbBuilder.writeListUint8(flex!); int? test5Offset; if (test5 != null) { - for (var e in test5!) { - e.pack(fbBuilder); - } + for (var e in test5!.reversed) { e.pack(fbBuilder); } test5Offset = fbBuilder.endStructVector(test5!.length); } - final int? vectorOfLongsOffset = vectorOfLongs == null - ? null + final int? vectorOfLongsOffset = vectorOfLongs == null ? null : fbBuilder.writeListInt64(vectorOfLongs!); - final int? vectorOfDoublesOffset = vectorOfDoubles == null - ? null + final int? vectorOfDoublesOffset = vectorOfDoubles == null ? null : fbBuilder.writeListFloat64(vectorOfDoubles!); final int? parentNamespaceTestOffset = parentNamespaceTest?.pack(fbBuilder); - final int? vectorOfReferrablesOffset = vectorOfReferrables == null - ? null - : fbBuilder.writeList( - vectorOfReferrables!.map((b) => b.pack(fbBuilder)).toList(), - ); - final int? vectorOfWeakReferencesOffset = vectorOfWeakReferences == null - ? null + final int? vectorOfReferrablesOffset = vectorOfReferrables == null ? null + : fbBuilder.writeList(vectorOfReferrables!.map((b) => b.pack(fbBuilder)).toList()); + final int? vectorOfWeakReferencesOffset = vectorOfWeakReferences == null ? null : fbBuilder.writeListUint64(vectorOfWeakReferences!); - final int? vectorOfStrongReferrablesOffset = - vectorOfStrongReferrables == null - ? null - : fbBuilder.writeList( - vectorOfStrongReferrables!.map((b) => b.pack(fbBuilder)).toList(), - ); - final int? vectorOfCoOwningReferencesOffset = - vectorOfCoOwningReferences == null - ? null + final int? vectorOfStrongReferrablesOffset = vectorOfStrongReferrables == null ? null + : fbBuilder.writeList(vectorOfStrongReferrables!.map((b) => b.pack(fbBuilder)).toList()); + final int? vectorOfCoOwningReferencesOffset = vectorOfCoOwningReferences == null ? null : fbBuilder.writeListUint64(vectorOfCoOwningReferences!); - final int? vectorOfNonOwningReferencesOffset = - vectorOfNonOwningReferences == null - ? null + final int? vectorOfNonOwningReferencesOffset = vectorOfNonOwningReferences == null ? null : fbBuilder.writeListUint64(vectorOfNonOwningReferences!); final int? anyUniqueOffset = anyUnique?.pack(fbBuilder); final int? anyAmbiguousOffset = anyAmbiguous?.pack(fbBuilder); - final int? vectorOfEnumsOffset = vectorOfEnums == null - ? null + final int? vectorOfEnumsOffset = vectorOfEnums == null ? null : fbBuilder.writeListUint8(vectorOfEnums!.map((f) => f.value).toList()); - final int? testrequirednestedflatbufferOffset = - testrequirednestedflatbuffer == null - ? null + final int? testrequirednestedflatbufferOffset = testrequirednestedflatbuffer == null ? null : fbBuilder.writeListUint8(testrequirednestedflatbuffer!); - final int? scalarKeySortedTablesOffset = scalarKeySortedTables == null - ? null - : fbBuilder.writeList( - scalarKeySortedTables!.map((b) => b.pack(fbBuilder)).toList(), - ); + final int? scalarKeySortedTablesOffset = scalarKeySortedTables == null ? null + : fbBuilder.writeList(scalarKeySortedTables!.map((b) => b.pack(fbBuilder)).toList()); fbBuilder.startTable(62); if (pos != null) { fbBuilder.addStruct(0, pos!.pack(fbBuilder)); @@ -1747,8 +1549,8 @@ class _MonsterReader extends fb.TableReader { const _MonsterReader(); @override - Monster createObject(fb.BufferContext bc, int offset) => - Monster._(bc, offset); + Monster createObject(fb.BufferContext bc, int offset) => + Monster._(bc, offset); } class MonsterBuilder { @@ -1764,302 +1566,242 @@ class MonsterBuilder { fbBuilder.addStruct(0, offset); return fbBuilder.offset; } - int addMana(int? mana) { fbBuilder.addInt16(1, mana); return fbBuilder.offset; } - int addHp(int? hp) { fbBuilder.addInt16(2, hp); return fbBuilder.offset; } - int addNameOffset(int? offset) { fbBuilder.addOffset(3, offset); return fbBuilder.offset; } - int addInventoryOffset(int? offset) { fbBuilder.addOffset(5, offset); return fbBuilder.offset; } - int addColor(Color? color) { fbBuilder.addUint8(6, color?.value); return fbBuilder.offset; } - int addTestType(AnyTypeId? testType) { fbBuilder.addUint8(7, testType?.value); return fbBuilder.offset; } - int addTestOffset(int? offset) { fbBuilder.addOffset(8, offset); return fbBuilder.offset; } - int addTest4Offset(int? offset) { fbBuilder.addOffset(9, offset); return fbBuilder.offset; } - int addTestarrayofstringOffset(int? offset) { fbBuilder.addOffset(10, offset); return fbBuilder.offset; } - int addTestarrayoftablesOffset(int? offset) { fbBuilder.addOffset(11, offset); return fbBuilder.offset; } - int addEnemyOffset(int? offset) { fbBuilder.addOffset(12, offset); return fbBuilder.offset; } - int addTestnestedflatbufferOffset(int? offset) { fbBuilder.addOffset(13, offset); return fbBuilder.offset; } - int addTestemptyOffset(int? offset) { fbBuilder.addOffset(14, offset); return fbBuilder.offset; } - int addTestbool(bool? testbool) { fbBuilder.addBool(15, testbool); return fbBuilder.offset; } - int addTesthashs32Fnv1(int? testhashs32Fnv1) { fbBuilder.addInt32(16, testhashs32Fnv1); return fbBuilder.offset; } - int addTesthashu32Fnv1(int? testhashu32Fnv1) { fbBuilder.addUint32(17, testhashu32Fnv1); return fbBuilder.offset; } - int addTesthashs64Fnv1(int? testhashs64Fnv1) { fbBuilder.addInt64(18, testhashs64Fnv1); return fbBuilder.offset; } - int addTesthashu64Fnv1(int? testhashu64Fnv1) { fbBuilder.addUint64(19, testhashu64Fnv1); return fbBuilder.offset; } - int addTesthashs32Fnv1a(int? testhashs32Fnv1a) { fbBuilder.addInt32(20, testhashs32Fnv1a); return fbBuilder.offset; } - int addTesthashu32Fnv1a(int? testhashu32Fnv1a) { fbBuilder.addUint32(21, testhashu32Fnv1a); return fbBuilder.offset; } - int addTesthashs64Fnv1a(int? testhashs64Fnv1a) { fbBuilder.addInt64(22, testhashs64Fnv1a); return fbBuilder.offset; } - int addTesthashu64Fnv1a(int? testhashu64Fnv1a) { fbBuilder.addUint64(23, testhashu64Fnv1a); return fbBuilder.offset; } - int addTestarrayofboolsOffset(int? offset) { fbBuilder.addOffset(24, offset); return fbBuilder.offset; } - int addTestf(double? testf) { fbBuilder.addFloat32(25, testf); return fbBuilder.offset; } - int addTestf2(double? testf2) { fbBuilder.addFloat32(26, testf2); return fbBuilder.offset; } - int addTestf3(double? testf3) { fbBuilder.addFloat32(27, testf3); return fbBuilder.offset; } - int addTestarrayofstring2Offset(int? offset) { fbBuilder.addOffset(28, offset); return fbBuilder.offset; } - int addTestarrayofsortedstructOffset(int? offset) { fbBuilder.addOffset(29, offset); return fbBuilder.offset; } - int addFlexOffset(int? offset) { fbBuilder.addOffset(30, offset); return fbBuilder.offset; } - int addTest5Offset(int? offset) { fbBuilder.addOffset(31, offset); return fbBuilder.offset; } - int addVectorOfLongsOffset(int? offset) { fbBuilder.addOffset(32, offset); return fbBuilder.offset; } - int addVectorOfDoublesOffset(int? offset) { fbBuilder.addOffset(33, offset); return fbBuilder.offset; } - int addParentNamespaceTestOffset(int? offset) { fbBuilder.addOffset(34, offset); return fbBuilder.offset; } - int addVectorOfReferrablesOffset(int? offset) { fbBuilder.addOffset(35, offset); return fbBuilder.offset; } - int addSingleWeakReference(int? singleWeakReference) { fbBuilder.addUint64(36, singleWeakReference); return fbBuilder.offset; } - int addVectorOfWeakReferencesOffset(int? offset) { fbBuilder.addOffset(37, offset); return fbBuilder.offset; } - int addVectorOfStrongReferrablesOffset(int? offset) { fbBuilder.addOffset(38, offset); return fbBuilder.offset; } - int addCoOwningReference(int? coOwningReference) { fbBuilder.addUint64(39, coOwningReference); return fbBuilder.offset; } - int addVectorOfCoOwningReferencesOffset(int? offset) { fbBuilder.addOffset(40, offset); return fbBuilder.offset; } - int addNonOwningReference(int? nonOwningReference) { fbBuilder.addUint64(41, nonOwningReference); return fbBuilder.offset; } - int addVectorOfNonOwningReferencesOffset(int? offset) { fbBuilder.addOffset(42, offset); return fbBuilder.offset; } - int addAnyUniqueType(AnyUniqueAliasesTypeId? anyUniqueType) { fbBuilder.addUint8(43, anyUniqueType?.value); return fbBuilder.offset; } - int addAnyUniqueOffset(int? offset) { fbBuilder.addOffset(44, offset); return fbBuilder.offset; } - int addAnyAmbiguousType(AnyAmbiguousAliasesTypeId? anyAmbiguousType) { fbBuilder.addUint8(45, anyAmbiguousType?.value); return fbBuilder.offset; } - int addAnyAmbiguousOffset(int? offset) { fbBuilder.addOffset(46, offset); return fbBuilder.offset; } - int addVectorOfEnumsOffset(int? offset) { fbBuilder.addOffset(47, offset); return fbBuilder.offset; } - int addSignedEnum(Race? signedEnum) { fbBuilder.addInt8(48, signedEnum?.value); return fbBuilder.offset; } - int addTestrequirednestedflatbufferOffset(int? offset) { fbBuilder.addOffset(49, offset); return fbBuilder.offset; } - int addScalarKeySortedTablesOffset(int? offset) { fbBuilder.addOffset(50, offset); return fbBuilder.offset; } - int addNativeInline(int offset) { fbBuilder.addStruct(51, offset); return fbBuilder.offset; } - int addLongEnumNonEnumDefault(LongEnum? longEnumNonEnumDefault) { fbBuilder.addUint64(52, longEnumNonEnumDefault?.value); return fbBuilder.offset; } - int addLongEnumNormalDefault(LongEnum? longEnumNormalDefault) { fbBuilder.addUint64(53, longEnumNormalDefault?.value); return fbBuilder.offset; } - int addNanDefault(double? nanDefault) { fbBuilder.addFloat32(54, nanDefault); return fbBuilder.offset; } - int addInfDefault(double? infDefault) { fbBuilder.addFloat32(55, infDefault); return fbBuilder.offset; } - int addPositiveInfDefault(double? positiveInfDefault) { fbBuilder.addFloat32(56, positiveInfDefault); return fbBuilder.offset; } - int addInfinityDefault(double? infinityDefault) { fbBuilder.addFloat32(57, infinityDefault); return fbBuilder.offset; } - int addPositiveInfinityDefault(double? positiveInfinityDefault) { fbBuilder.addFloat32(58, positiveInfinityDefault); return fbBuilder.offset; } - int addNegativeInfDefault(double? negativeInfDefault) { fbBuilder.addFloat32(59, negativeInfDefault); return fbBuilder.offset; } - int addNegativeInfinityDefault(double? negativeInfinityDefault) { fbBuilder.addFloat32(60, negativeInfinityDefault); return fbBuilder.offset; } - int addDoubleInfDefault(double? doubleInfDefault) { fbBuilder.addFloat64(61, doubleInfDefault); return fbBuilder.offset; @@ -2195,167 +1937,120 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { double? negativeInfDefault, double? negativeInfinityDefault, double? doubleInfDefault, - }) : _pos = pos, - _mana = mana, - _hp = hp, - _name = name, - _inventory = inventory, - _color = color, - _testType = testType, - _test = test, - _test4 = test4, - _testarrayofstring = testarrayofstring, - _testarrayoftables = testarrayoftables, - _enemy = enemy, - _testnestedflatbuffer = testnestedflatbuffer, - _testempty = testempty, - _testbool = testbool, - _testhashs32Fnv1 = testhashs32Fnv1, - _testhashu32Fnv1 = testhashu32Fnv1, - _testhashs64Fnv1 = testhashs64Fnv1, - _testhashu64Fnv1 = testhashu64Fnv1, - _testhashs32Fnv1a = testhashs32Fnv1a, - _testhashu32Fnv1a = testhashu32Fnv1a, - _testhashs64Fnv1a = testhashs64Fnv1a, - _testhashu64Fnv1a = testhashu64Fnv1a, - _testarrayofbools = testarrayofbools, - _testf = testf, - _testf2 = testf2, - _testf3 = testf3, - _testarrayofstring2 = testarrayofstring2, - _testarrayofsortedstruct = testarrayofsortedstruct, - _flex = flex, - _test5 = test5, - _vectorOfLongs = vectorOfLongs, - _vectorOfDoubles = vectorOfDoubles, - _parentNamespaceTest = parentNamespaceTest, - _vectorOfReferrables = vectorOfReferrables, - _singleWeakReference = singleWeakReference, - _vectorOfWeakReferences = vectorOfWeakReferences, - _vectorOfStrongReferrables = vectorOfStrongReferrables, - _coOwningReference = coOwningReference, - _vectorOfCoOwningReferences = vectorOfCoOwningReferences, - _nonOwningReference = nonOwningReference, - _vectorOfNonOwningReferences = vectorOfNonOwningReferences, - _anyUniqueType = anyUniqueType, - _anyUnique = anyUnique, - _anyAmbiguousType = anyAmbiguousType, - _anyAmbiguous = anyAmbiguous, - _vectorOfEnums = vectorOfEnums, - _signedEnum = signedEnum, - _testrequirednestedflatbuffer = testrequirednestedflatbuffer, - _scalarKeySortedTables = scalarKeySortedTables, - _nativeInline = nativeInline, - _longEnumNonEnumDefault = longEnumNonEnumDefault, - _longEnumNormalDefault = longEnumNormalDefault, - _nanDefault = nanDefault, - _infDefault = infDefault, - _positiveInfDefault = positiveInfDefault, - _infinityDefault = infinityDefault, - _positiveInfinityDefault = positiveInfinityDefault, - _negativeInfDefault = negativeInfDefault, - _negativeInfinityDefault = negativeInfinityDefault, - _doubleInfDefault = doubleInfDefault; + }) + : _pos = pos, + _mana = mana, + _hp = hp, + _name = name, + _inventory = inventory, + _color = color, + _testType = testType, + _test = test, + _test4 = test4, + _testarrayofstring = testarrayofstring, + _testarrayoftables = testarrayoftables, + _enemy = enemy, + _testnestedflatbuffer = testnestedflatbuffer, + _testempty = testempty, + _testbool = testbool, + _testhashs32Fnv1 = testhashs32Fnv1, + _testhashu32Fnv1 = testhashu32Fnv1, + _testhashs64Fnv1 = testhashs64Fnv1, + _testhashu64Fnv1 = testhashu64Fnv1, + _testhashs32Fnv1a = testhashs32Fnv1a, + _testhashu32Fnv1a = testhashu32Fnv1a, + _testhashs64Fnv1a = testhashs64Fnv1a, + _testhashu64Fnv1a = testhashu64Fnv1a, + _testarrayofbools = testarrayofbools, + _testf = testf, + _testf2 = testf2, + _testf3 = testf3, + _testarrayofstring2 = testarrayofstring2, + _testarrayofsortedstruct = testarrayofsortedstruct, + _flex = flex, + _test5 = test5, + _vectorOfLongs = vectorOfLongs, + _vectorOfDoubles = vectorOfDoubles, + _parentNamespaceTest = parentNamespaceTest, + _vectorOfReferrables = vectorOfReferrables, + _singleWeakReference = singleWeakReference, + _vectorOfWeakReferences = vectorOfWeakReferences, + _vectorOfStrongReferrables = vectorOfStrongReferrables, + _coOwningReference = coOwningReference, + _vectorOfCoOwningReferences = vectorOfCoOwningReferences, + _nonOwningReference = nonOwningReference, + _vectorOfNonOwningReferences = vectorOfNonOwningReferences, + _anyUniqueType = anyUniqueType, + _anyUnique = anyUnique, + _anyAmbiguousType = anyAmbiguousType, + _anyAmbiguous = anyAmbiguous, + _vectorOfEnums = vectorOfEnums, + _signedEnum = signedEnum, + _testrequirednestedflatbuffer = testrequirednestedflatbuffer, + _scalarKeySortedTables = scalarKeySortedTables, + _nativeInline = nativeInline, + _longEnumNonEnumDefault = longEnumNonEnumDefault, + _longEnumNormalDefault = longEnumNormalDefault, + _nanDefault = nanDefault, + _infDefault = infDefault, + _positiveInfDefault = positiveInfDefault, + _infinityDefault = infinityDefault, + _positiveInfinityDefault = positiveInfinityDefault, + _negativeInfDefault = negativeInfDefault, + _negativeInfinityDefault = negativeInfinityDefault, + _doubleInfDefault = doubleInfDefault; /// Finish building, and store into the [fbBuilder]. @override int finish(fb.Builder fbBuilder) { - final int? nameOffset = _name == null - ? null + final int? nameOffset = _name == null ? null : fbBuilder.writeString(_name!); - final int? inventoryOffset = _inventory == null - ? null + final int? inventoryOffset = _inventory == null ? null : fbBuilder.writeListUint8(_inventory!); final int? testOffset = _test?.getOrCreateOffset(fbBuilder); - final int? test4Offset = _test4 == null - ? null + final int? test4Offset = _test4 == null ? null : fbBuilder.writeListOfStructs(_test4!); - final int? testarrayofstringOffset = _testarrayofstring == null - ? null - : fbBuilder.writeList( - _testarrayofstring!.map(fbBuilder.writeString).toList(), - ); - final int? testarrayoftablesOffset = _testarrayoftables == null - ? null - : fbBuilder.writeList( - _testarrayoftables! - .map((b) => b.getOrCreateOffset(fbBuilder)) - .toList(), - ); + final int? testarrayofstringOffset = _testarrayofstring == null ? null + : fbBuilder.writeList(_testarrayofstring!.map(fbBuilder.writeString).toList()); + final int? testarrayoftablesOffset = _testarrayoftables == null ? null + : fbBuilder.writeList(_testarrayoftables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList()); final int? enemyOffset = _enemy?.getOrCreateOffset(fbBuilder); - final int? testnestedflatbufferOffset = _testnestedflatbuffer == null - ? null + final int? testnestedflatbufferOffset = _testnestedflatbuffer == null ? null : fbBuilder.writeListUint8(_testnestedflatbuffer!); final int? testemptyOffset = _testempty?.getOrCreateOffset(fbBuilder); - final int? testarrayofboolsOffset = _testarrayofbools == null - ? null + final int? testarrayofboolsOffset = _testarrayofbools == null ? null : fbBuilder.writeListBool(_testarrayofbools!); - final int? testarrayofstring2Offset = _testarrayofstring2 == null - ? null - : fbBuilder.writeList( - _testarrayofstring2!.map(fbBuilder.writeString).toList(), - ); - final int? testarrayofsortedstructOffset = _testarrayofsortedstruct == null - ? null + final int? testarrayofstring2Offset = _testarrayofstring2 == null ? null + : fbBuilder.writeList(_testarrayofstring2!.map(fbBuilder.writeString).toList()); + final int? testarrayofsortedstructOffset = _testarrayofsortedstruct == null ? null : fbBuilder.writeListOfStructs(_testarrayofsortedstruct!); - final int? flexOffset = _flex == null - ? null + final int? flexOffset = _flex == null ? null : fbBuilder.writeListUint8(_flex!); - final int? test5Offset = _test5 == null - ? null + final int? test5Offset = _test5 == null ? null : fbBuilder.writeListOfStructs(_test5!); - final int? vectorOfLongsOffset = _vectorOfLongs == null - ? null + final int? vectorOfLongsOffset = _vectorOfLongs == null ? null : fbBuilder.writeListInt64(_vectorOfLongs!); - final int? vectorOfDoublesOffset = _vectorOfDoubles == null - ? null + final int? vectorOfDoublesOffset = _vectorOfDoubles == null ? null : fbBuilder.writeListFloat64(_vectorOfDoubles!); - final int? parentNamespaceTestOffset = _parentNamespaceTest - ?.getOrCreateOffset(fbBuilder); - final int? vectorOfReferrablesOffset = _vectorOfReferrables == null - ? null - : fbBuilder.writeList( - _vectorOfReferrables! - .map((b) => b.getOrCreateOffset(fbBuilder)) - .toList(), - ); - final int? vectorOfWeakReferencesOffset = _vectorOfWeakReferences == null - ? null + final int? parentNamespaceTestOffset = _parentNamespaceTest?.getOrCreateOffset(fbBuilder); + final int? vectorOfReferrablesOffset = _vectorOfReferrables == null ? null + : fbBuilder.writeList(_vectorOfReferrables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList()); + final int? vectorOfWeakReferencesOffset = _vectorOfWeakReferences == null ? null : fbBuilder.writeListUint64(_vectorOfWeakReferences!); - final int? vectorOfStrongReferrablesOffset = - _vectorOfStrongReferrables == null - ? null - : fbBuilder.writeList( - _vectorOfStrongReferrables! - .map((b) => b.getOrCreateOffset(fbBuilder)) - .toList(), - ); - final int? vectorOfCoOwningReferencesOffset = - _vectorOfCoOwningReferences == null - ? null + final int? vectorOfStrongReferrablesOffset = _vectorOfStrongReferrables == null ? null + : fbBuilder.writeList(_vectorOfStrongReferrables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList()); + final int? vectorOfCoOwningReferencesOffset = _vectorOfCoOwningReferences == null ? null : fbBuilder.writeListUint64(_vectorOfCoOwningReferences!); - final int? vectorOfNonOwningReferencesOffset = - _vectorOfNonOwningReferences == null - ? null + final int? vectorOfNonOwningReferencesOffset = _vectorOfNonOwningReferences == null ? null : fbBuilder.writeListUint64(_vectorOfNonOwningReferences!); final int? anyUniqueOffset = _anyUnique?.getOrCreateOffset(fbBuilder); final int? anyAmbiguousOffset = _anyAmbiguous?.getOrCreateOffset(fbBuilder); - final int? vectorOfEnumsOffset = _vectorOfEnums == null - ? null - : fbBuilder.writeListUint8( - _vectorOfEnums!.map((f) => f.value).toList(), - ); - final int? testrequirednestedflatbufferOffset = - _testrequirednestedflatbuffer == null - ? null + final int? vectorOfEnumsOffset = _vectorOfEnums == null ? null + : fbBuilder.writeListUint8(_vectorOfEnums!.map((f) => f.value).toList()); + final int? testrequirednestedflatbufferOffset = _testrequirednestedflatbuffer == null ? null : fbBuilder.writeListUint8(_testrequirednestedflatbuffer!); - final int? scalarKeySortedTablesOffset = _scalarKeySortedTables == null - ? null - : fbBuilder.writeList( - _scalarKeySortedTables! - .map((b) => b.getOrCreateOffset(fbBuilder)) - .toList(), - ); + final int? scalarKeySortedTablesOffset = _scalarKeySortedTables == null ? null + : fbBuilder.writeList(_scalarKeySortedTables!.map((b) => b.getOrCreateOffset(fbBuilder)).toList()); fbBuilder.startTable(62); if (_pos != null) { fbBuilder.addStruct(0, _pos!.finish(fbBuilder)); @@ -2456,11 +2151,8 @@ class TypeAliases { int get u64 => const fb.Uint64Reader().vTableGet(_bc, _bcOffset, 18, 0); double get f32 => const fb.Float32Reader().vTableGet(_bc, _bcOffset, 20, 0.0); double get f64 => const fb.Float64Reader().vTableGet(_bc, _bcOffset, 22, 0.0); - List? get v8 => - const fb.Int8ListReader().vTableGetNullable(_bc, _bcOffset, 24); - List? get vf64 => const fb.ListReader( - fb.Float64Reader(), - ).vTableGetNullable(_bc, _bcOffset, 26); + List? get v8 => const fb.Int8ListReader().vTableGetNullable(_bc, _bcOffset, 24); + List? get vf64 => const fb.ListReader(fb.Float64Reader()).vTableGetNullable(_bc, _bcOffset, 26); @override String toString() { @@ -2468,24 +2160,18 @@ class TypeAliases { } TypeAliasesT unpack() => TypeAliasesT( - i8: i8, - u8: u8, - i16: i16, - u16: u16, - i32: i32, - u32: u32, - i64: i64, - u64: u64, - f32: f32, - f64: f64, - v8: const fb.Int8ListReader( - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 24), - vf64: const fb.ListReader( - fb.Float64Reader(), - lazy: false, - ).vTableGetNullable(_bc, _bcOffset, 26), - ); + i8: i8, + u8: u8, + i16: i16, + u16: u16, + i32: i32, + u32: u32, + i64: i64, + u64: u64, + f32: f32, + f64: f64, + v8: const fb.Int8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 24), + vf64: const fb.ListReader(fb.Float64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 26)); static int pack(fb.Builder fbBuilder, TypeAliasesT? object) { if (object == null) return 0; @@ -2508,25 +2194,24 @@ class TypeAliasesT implements fb.Packable { List? vf64; TypeAliasesT({ - this.i8 = 0, - this.u8 = 0, - this.i16 = 0, - this.u16 = 0, - this.i32 = 0, - this.u32 = 0, - this.i64 = 0, - this.u64 = 0, - this.f32 = 0.0, - this.f64 = 0.0, - this.v8, - this.vf64, - }); + this.i8 = 0, + this.u8 = 0, + this.i16 = 0, + this.u16 = 0, + this.i32 = 0, + this.u32 = 0, + this.i64 = 0, + this.u64 = 0, + this.f32 = 0.0, + this.f64 = 0.0, + this.v8, + this.vf64}); @override int pack(fb.Builder fbBuilder) { - final int? v8Offset = v8 == null ? null : fbBuilder.writeListInt8(v8!); - final int? vf64Offset = vf64 == null - ? null + final int? v8Offset = v8 == null ? null + : fbBuilder.writeListInt8(v8!); + final int? vf64Offset = vf64 == null ? null : fbBuilder.writeListFloat64(vf64!); fbBuilder.startTable(12); fbBuilder.addInt8(0, i8); @@ -2554,8 +2239,8 @@ class _TypeAliasesReader extends fb.TableReader { const _TypeAliasesReader(); @override - TypeAliases createObject(fb.BufferContext bc, int offset) => - TypeAliases._(bc, offset); + TypeAliases createObject(fb.BufferContext bc, int offset) => + TypeAliases._(bc, offset); } class TypeAliasesBuilder { @@ -2571,57 +2256,46 @@ class TypeAliasesBuilder { fbBuilder.addInt8(0, i8); return fbBuilder.offset; } - int addU8(int? u8) { fbBuilder.addUint8(1, u8); return fbBuilder.offset; } - int addI16(int? i16) { fbBuilder.addInt16(2, i16); return fbBuilder.offset; } - int addU16(int? u16) { fbBuilder.addUint16(3, u16); return fbBuilder.offset; } - int addI32(int? i32) { fbBuilder.addInt32(4, i32); return fbBuilder.offset; } - int addU32(int? u32) { fbBuilder.addUint32(5, u32); return fbBuilder.offset; } - int addI64(int? i64) { fbBuilder.addInt64(6, i64); return fbBuilder.offset; } - int addU64(int? u64) { fbBuilder.addUint64(7, u64); return fbBuilder.offset; } - int addF32(double? f32) { fbBuilder.addFloat32(8, f32); return fbBuilder.offset; } - int addF64(double? f64) { fbBuilder.addFloat64(9, f64); return fbBuilder.offset; } - int addV8Offset(int? offset) { fbBuilder.addOffset(10, offset); return fbBuilder.offset; } - int addVf64Offset(int? offset) { fbBuilder.addOffset(11, offset); return fbBuilder.offset; @@ -2659,25 +2333,26 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder { double? f64, List? v8, List? vf64, - }) : _i8 = i8, - _u8 = u8, - _i16 = i16, - _u16 = u16, - _i32 = i32, - _u32 = u32, - _i64 = i64, - _u64 = u64, - _f32 = f32, - _f64 = f64, - _v8 = v8, - _vf64 = vf64; + }) + : _i8 = i8, + _u8 = u8, + _i16 = i16, + _u16 = u16, + _i32 = i32, + _u32 = u32, + _i64 = i64, + _u64 = u64, + _f32 = f32, + _f64 = f64, + _v8 = v8, + _vf64 = vf64; /// Finish building, and store into the [fbBuilder]. @override int finish(fb.Builder fbBuilder) { - final int? v8Offset = _v8 == null ? null : fbBuilder.writeListInt8(_v8!); - final int? vf64Offset = _vf64 == null - ? null + final int? v8Offset = _v8 == null ? null + : fbBuilder.writeListInt8(_v8!); + final int? vf64Offset = _vf64 == null ? null : fbBuilder.writeListFloat64(_vf64!); fbBuilder.startTable(12); fbBuilder.addInt8(0, _i8); @@ -2703,3 +2378,4 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/dart/test/monster_test_my_game_generated.dart b/dart/test/monster_test_my_game_generated.dart index 7b856bf725a..d8aa5820195 100644 --- a/dart/test/monster_test_my_game_generated.dart +++ b/dart/test/monster_test_my_game_generated.dart @@ -4,12 +4,12 @@ library my_game; import 'dart:typed_data' show Uint8List; - import 'package:flat_buffers/flat_buffers.dart' as fb; -import './include_test1_generated.dart'; -import './monster_test_my_game.example2_generated.dart' as my_game_example2; 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 './include_test1_generated.dart'; class InParentNamespace { InParentNamespace._(this._bc, this._bcOffset); @@ -23,6 +23,7 @@ class InParentNamespace { final fb.BufferContext _bc; final int _bcOffset; + @override String toString() { return 'InParentNamespace{}'; @@ -53,11 +54,12 @@ class _InParentNamespaceReader extends fb.TableReader { const _InParentNamespaceReader(); @override - InParentNamespace createObject(fb.BufferContext bc, int offset) => - InParentNamespace._(bc, offset); + InParentNamespace createObject(fb.BufferContext bc, int offset) => + InParentNamespace._(bc, offset); } class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { + InParentNamespaceObjectBuilder(); /// Finish building, and store into the [fbBuilder]. @@ -75,3 +77,4 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/scripts/generate_code.py b/scripts/generate_code.py index 94a49ec9104..4bfba9eb501 100755 --- a/scripts/generate_code.py +++ b/scripts/generate_code.py @@ -443,6 +443,26 @@ def glob(path, pattern): dictionary_lookup_schema = "dictionary_lookup.fbs" flatc(["--java", "--kotlin"], schema=dictionary_lookup_schema) +# Dart tests +flatc( + NO_INCL_OPTS + DART_OPTS + ["-o", "../dart/test"], + schema="monster_test.fbs", + include="include_test", + data="monsterdata_test.json", +) + +flatc( + NO_INCL_OPTS + DART_OPTS + ["-o", "../dart/test"], + schema="include_test/include_test1.fbs", + include="include_test/sub", +) + +flatc( + NO_INCL_OPTS + DART_OPTS + ["-o", "../dart/test"], + schema="include_test/sub/include_test2.fbs", + include="include_test", +) + # Swift Tests swift_prefix = "swift/Tests/Flatbuffers" flatc( diff --git a/tests/include_test1_generated.dart b/tests/include_test1_generated.dart index c04bf6b2d22..df6cdb9bbc9 100644 --- a/tests/include_test1_generated.dart +++ b/tests/include_test1_generated.dart @@ -107,3 +107,4 @@ class TableAObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/tests/include_test2_my_game.other_name_space_generated.dart b/tests/include_test2_my_game.other_name_space_generated.dart index 365ed3ceb5d..f4af97b7b1e 100644 --- a/tests/include_test2_my_game.other_name_space_generated.dart +++ b/tests/include_test2_my_game.other_name_space_generated.dart @@ -129,6 +129,7 @@ class UnusedObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class TableB { TableB._(this._bc, this._bcOffset); factory TableB(List bytes) { @@ -229,3 +230,4 @@ class TableBObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/tests/monster_extra_my_game_generated.dart b/tests/monster_extra_my_game_generated.dart index 462d5ac2087..4d9951e6941 100644 --- a/tests/monster_extra_my_game_generated.dart +++ b/tests/monster_extra_my_game_generated.dart @@ -230,3 +230,4 @@ class MonsterExtraObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/tests/monster_test_my_game.example2_generated.dart b/tests/monster_test_my_game.example2_generated.dart index c266f9ce72b..06c8e5d062f 100644 --- a/tests/monster_test_my_game.example2_generated.dart +++ b/tests/monster_test_my_game.example2_generated.dart @@ -77,3 +77,4 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/tests/monster_test_my_game.example_generated.dart b/tests/monster_test_my_game.example_generated.dart index 5554c4c4b1d..0b133b53a2d 100644 --- a/tests/monster_test_my_game.example_generated.dart +++ b/tests/monster_test_my_game.example_generated.dart @@ -337,6 +337,7 @@ class TestObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class TestSimpleTableWithEnum { TestSimpleTableWithEnum._(this._bc, this._bcOffset); factory TestSimpleTableWithEnum(List bytes) { @@ -435,6 +436,7 @@ class TestSimpleTableWithEnumObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class Vec3 { Vec3._(this._bc, this._bcOffset); @@ -582,6 +584,7 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class Ability { Ability._(this._bc, this._bcOffset); @@ -680,6 +683,7 @@ class AbilityObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class StructOfStructs { StructOfStructs._(this._bc, this._bcOffset); @@ -788,6 +792,7 @@ class StructOfStructsObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class StructOfStructsOfStructs { StructOfStructsOfStructs._(this._bc, this._bcOffset); @@ -876,6 +881,7 @@ class StructOfStructsOfStructsObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class Stat { Stat._(this._bc, this._bcOffset); factory Stat(List bytes) { @@ -1004,6 +1010,7 @@ class StatObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class Referrable { Referrable._(this._bc, this._bcOffset); factory Referrable(List bytes) { @@ -1102,6 +1109,7 @@ class ReferrableObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + /// an example documentation comment: "monster object" class Monster { Monster._(this._bc, this._bcOffset); @@ -1213,7 +1221,7 @@ class Monster { inventory: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 14), color: color, testType: testType, - test: test, + test: test?.unpack(), test4: test4?.map((e) => e.unpack()).toList(), testarrayofstring: const fb.ListReader(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24), testarrayoftables: testarrayoftables?.map((e) => e.unpack()).toList(), @@ -1249,9 +1257,9 @@ class Monster { nonOwningReference: nonOwningReference, vectorOfNonOwningReferences: const fb.ListReader(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88), anyUniqueType: anyUniqueType, - anyUnique: anyUnique, + anyUnique: anyUnique?.unpack(), anyAmbiguousType: anyAmbiguousType, - anyAmbiguous: anyAmbiguous, + anyAmbiguous: anyAmbiguous?.unpack(), vectorOfEnums: const fb.ListReader(Color.reader, lazy: false).vTableGetNullable(_bc, _bcOffset, 98), signedEnum: signedEnum, testrequirednestedflatbuffer: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 102), @@ -1412,7 +1420,7 @@ class MonsterT implements fb.Packable { final int? testOffset = test?.pack(fbBuilder); int? test4Offset; if (test4 != null) { - for (var e in test4!) { e.pack(fbBuilder); } + for (var e in test4!.reversed) { e.pack(fbBuilder); } test4Offset = fbBuilder.endStructVector(test4!.length); } final int? testarrayofstringOffset = testarrayofstring == null ? null @@ -1429,14 +1437,14 @@ class MonsterT implements fb.Packable { : fbBuilder.writeList(testarrayofstring2!.map(fbBuilder.writeString).toList()); int? testarrayofsortedstructOffset; if (testarrayofsortedstruct != null) { - for (var e in testarrayofsortedstruct!) { e.pack(fbBuilder); } + for (var e in testarrayofsortedstruct!.reversed) { e.pack(fbBuilder); } testarrayofsortedstructOffset = fbBuilder.endStructVector(testarrayofsortedstruct!.length); } final int? flexOffset = flex == null ? null : fbBuilder.writeListUint8(flex!); int? test5Offset; if (test5 != null) { - for (var e in test5!) { e.pack(fbBuilder); } + for (var e in test5!.reversed) { e.pack(fbBuilder); } test5Offset = fbBuilder.endStructVector(test5!.length); } final int? vectorOfLongsOffset = vectorOfLongs == null ? null @@ -2120,6 +2128,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + class TypeAliases { TypeAliases._(this._bc, this._bcOffset); factory TypeAliases(List bytes) { @@ -2369,3 +2378,4 @@ class TypeAliasesObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } + diff --git a/tests/monster_test_my_game_generated.dart b/tests/monster_test_my_game_generated.dart index 461d06dfa85..d8aa5820195 100644 --- a/tests/monster_test_my_game_generated.dart +++ b/tests/monster_test_my_game_generated.dart @@ -77,3 +77,4 @@ class InParentNamespaceObjectBuilder extends fb.ObjectBuilder { return fbBuilder.buffer; } } +