Squashed 'third_party/flatbuffers/' changes from e5f331db9..bc44fad35
bc44fad35 UnPackTo disable merge by default (#7527)
4fca4dc60 [TS/JS] Move TS tests to dedicated folder and deps upgrade (#7508)
036032373 Bump junit from 4.13 to 4.13.1 in /java (#7526)
89dfb43f3 Replace `bash JavaTest.sh` with `mvn test` (#7500)
c49aff4b6 enabled cpp17 tests in CI (#7524)
56e60223c prevent force_align attribute on enums (#7523)
89b1f5aa1 remove travis config (#7522)
b90159823 [Java][Flexbuffers] Add API to add nullables into the buffer. (#7521)
8cdc6a288 Install BuildFlatBuffers.cmake (#7519)
a67e35aff Moves all of the swift test code into tests/swift (#7509)
f124e41ae Updated Readme
4c954181c [Java][FlexBuffers] throwing exception for untyped fixed vectors (#7507)
7f7547737 [Android] Remove maven dependency of flatbuffers and use source folder (#7503)
a79d61ea8 Fixes issue with cocoapods failing to be published because of docc (#7505)
d465b39c3 [CMake]: fix breaking find_package change (#7499) (#7502)
c5a609dc2 [C#] Prepares for official Nuget release (#7496)
5634dc3d0 [ISSUE-6268] returns NaN insteadof nan (#7498)
37e37b8ca Updates cocoapods version (#7497)
8fd4534fb update android multidex setting (#7495)
d5427da52 Disable Android Build (#7494)
06c5c7ed0 FlatBuffers Version 2.0.8 (#7492)
b190ce11b Verifier Refinements (#7490)
bf5d23230 Namer applied to Typescript generator (#7488)
ce382d6dd [TS/JS] Add rollup and config to generate iife flatbuffers bundle (#7449)
41d9add7e C++: Add option to skip verifying nested flatbuffers (#7489)
6a8742754 [C++] support native_inline attribute for vector of tables (#7479)
694add668 Refactor test.cpp (#7487)
7edf8c908 Update scorecard to 1.1.2
b86387442 Fix typos (#7483)
e2eb5ee67 Include <array> head in stl_emulation.h (#7480)
994502b6d Version number in file package.json updated to 2.0.7 (#7476)
fa41e8367 [C++] Fixed crash when copying table with empty shared strings (#7477)
799cc8f7b Use type traits for specialization (#7475)
b7eb44147 Disable RTTI and rework use in idl_gen_ts.cpp (#7474)
8d01c5859 CMake project version detection made more robust (#7473)
237e8b71f Moved compiler warnings around (#7471)
eeb8fd60d Include builder.addOffset for vector of structs (#7470)
fef2ffc4d Use schema include name for keep-prefix (#7469)
8367664f1 Flatbuffers Version 2.0.7 (#7462)
d6f06c33f Reworked keep prefix (#7456)
627e8bf36 update grpc version (#7457)
883c42b7d disabling unpackto optimization (#7459)
7aae0af30 Remove old GRPC bash script and convert to python3 (#7454)
b057aa917 Grouped anonymous namespaces together, (#7455)
f1b26ff7f Change to GetTypeName (#7453)
9610a666b Generate SLSA signatures for Released zip files (#7450)
1e0f75a64 [WIP] speedup (#7452)
82b75407a Wrap types in namespace for --ts-flat-files and --gen-all (#7451)
f7c511957 Audit and fixups for GCC and Clang (#7212)
a66de58af Partial support for --ts-flat-files and --gen-all (#7446)
a3508f36d [Kotlin] Make sure namespace path exist for code generation (#7357)
137fec716 Stop using __has_trivial_copy on recent clang versions. (#7443)
214125e41 [C#] Rework how sorted vectors are looked up (#7441)
44a7dc999 Define minimum buffer size (#7440)
3cc2daa78 make_span overloads for pointer to vector (#7374) (#7435)
fa1174aa7 [TypeScript] Fix namespaceless schema generation (#7432)
83d4e2a10 Add checks to verifier (#7438)
8a09f3fb0 Fix FlexBuffers JS/TS bug https://github.com/google/flatbuffers/issues/6934 (#7434)
9dbe819ef Add flatc python tests to CI (#7437)
67c414958 Update TypeScriptTest.py to work better cross platform (#7436)
8b8c7dbdf Update gitingore to reflect name change (#7431)
2ee20a5f3 Remove auto including locale functions (#7430)
4be605604 [C++] Set StructDef::has_key property when deserializing from binary schema (#7386) (#7428)
fc5d86f1e [C++] Make template parameter in stl_emulation.h more explicit to avoid conflicts with cpprestsdk U macro (#7424)
9dce287ad Issue#6959 :Updated Automatically generated rust files. (#7425)
7798be3bb avoid zero-as-null-pointer warning (#7423)
966362e07 [C++] Vector of Tables equality (#7415)
a89c279ed [golang] Perform keyword escaping after case conversion (#7421)
a212b3c03 Turn of fail fast for C++ CI
9230f600d Remove stringop-overflow from error (#7422)
c79362156 [golang] Add support for text parsing with json struct tags (#7353)
ee2ced236 Moved TypeScriptTests to python script (#7411)
468c00a3f Rebased: grpc/compiler: Respect filename suffix and extension during code generation (#7414)
47c757f71 Add tests for flatc (#7405)
9a5ff8900 Add FLATBUFFERS_STRICT_MODE (#7408)
950444a34 [TS] Use TextEncoder and TextDecoder (#7400)
30d76198c Compilation issue msys2 #7399 (#7409)
cce3a66f0 Delete .travis directory
8d1cc6ac7 Revert "Compilation issue msys2 (#7403)" (#7407)
5b207639a Update readme.md
359e0f9d6 Revert "grpc/compiler: Respect filename suffix and extension during code generation (#7343)" (#7406)
ebbed0513 Delete cpp-linter.yml
aa395e5a5 (#7323) Rename CMake files according to project name (#7378)
32328075d Fix error msg format when generate GRPC failed (#7350)
97e89c5ac grpc/compiler: Respect filename suffix and extension during code generation (#7343)
5f6672be4 Fix Clang-Cl compile on Windows (#7308)
28e858c85 [TS/Bazel] Minor improvements to typescript.bzl (#7300)
987bebe67 [TS] fix incorrect reverse when writting array of structs (#7271)
ec0129369 Fix FlexBuffers Verifier tracking vectors reuse at wrong offset
50dd385b3 Add missing const (#7401)
da702cfd8 Compilation issue msys2 (#7403)
6e2791640 keep-prefix keeps relative pathing (#7394)
52fce5e53 fix(#7360): grpc used deprecated functions (#7361)
b7f13cd8e cpp_generator: comment out unused parameter to avoid warnings (#7381)
e42985e5a Updated Newtonsoft.Json to 13.0.1 (#7393)
0a8064637 Fix references to LICENSE file (#7377)
b9eea76a8 [Dart] Implement putBool to fix errors when serializing structs with bools (#7359)
1b9030015 Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /tests/FlatBuffers.Test (#7363)
83a43fc79 Reenable optional json (#7352)
5f0137602 Only include direct included filed (#7348)
9a1913a87 Revert "Implement optional scalars for JSON (#7322)" (#7351)
b4647beb8 Revert "Move reflection_ts_fbs into a separate directory (#7342)" (#7349)
d6060977a Remove asserting in verifier for flattests
987aa5b5e move -Wextra-semi to GCC 8.0+
42acdb63c [TS] Don't generate self-imports with --ts-flat-file (#7340)
0cc1aeb8c [golang] Create missing namespace directory structure (#7324) (#7325)
ba6c67170 [Kotlin] Remove download benchmark files dependency (#7314)
d2f33fc45 Disable Android on Linux CI build
0d1b72cbc [TS] fix ts import path issue (#7298)
9fce2fbf2 replace io/ioutil to os (#7281)
a18ea40d6 Implement optional scalars for JSON (#7322)
090caa280 Move reflection_ts_fbs into a separate directory (#7342)
49e1ea333 Implement optional scalars for Python (#7318)
11a198870 Started implementation for private flags in rust (#7269)
967df08b1 Adds full supposed for Wasm in the swift lib (#7328)
9aa08a429 Use keep case for Rust union discriminant type. (#7321)
9e8c758f5 Add explicit return types to lobster generated code (#7312)
74a25536b Add size check to fix out of bounds read risk (#7304)
12917af8a Update Rust docs page (#7296)
1ea2472f7 [swift] add had<ArrayName> property for arrays to check presence in a message (#7280)
0fe13cb28 Remove span ConstIterator/cbegin()/cend(). (#7295)
385dddc66 Namerkot (#7245)
750dde766 Make `flatc` generate Rust files not requiring `std` (#7273)
9917a168c [swift] Make swift module public (#7274)
76d3cca19 Rust: fix a name conflict when building with "no_std" feature (#7268)
c86e6d0e3 json inf parsing
d34dc32c2 fix include order
234d86c92 fixed off-by-one in parser
746c73b91 Add Annotations for Monster schema and example buffer
0bbfd4b2e fixes for annotator
716521953 Update readme.md (#7257)
a45f564cf [performance] Add aggressive systematic inlining in ByteBuffer and FlatBufferBuilder (#7253)
9d45a6403 more google merge fixes
ccfb4c20b Handle +/-inf in protos (#7256)
7bcd857b8 Specialize CreateVector with std::initializer_list (#7254)
23c8ab34c Swift update performance benchmark infrastructure (#7255)
70002dc5c various fixes for google merge
6e0e79f24 Add test for nested buffer verifier (#7252)
b856368d7 Turn off go modules temporary until we get a proper fix (#7251)
e37156a30 Keep the underlying storage capacity when clearing the FlatBufferBuilder. Gives a significant performance boost for serialisation of many small messages. (#7250)
a10b0e546 Java namer variable keep case (#7249)
275b73994 allow overriding FLATBUFFERS_MAX_ALIGNMENT
9d1ce9a10 Add parameter back to EndVector (#7246)
79afe6c3d Make Java namespaces keep case by default (#7243)
c6dbb2230 Add write permissions for labeller
18bacd3ea Expand test to make sure {}-initializers are properly understood by template. (#7242)
a2c913aec Add -Wnon-virtual-dtor
67b33b294 set workflows permissions to read-only (#7239)
7b5fd2bd0 [Kotlin] Fix key lookup returning null clashing with default value (#7237)
7181d7770 [Java] Fix key lookup returning null clashing with default value (#7236)
7f663b120 Allow CreateVectorOfStrings() to work with any string-type. (#7238)
173ebb694 Fixes a bug where the create function doesnt optional + required items (#7228)
d65823948 [Kotlin] Update gradle to 7.4.1 and simplify config files. (#7231)
ab4bf59e8 remove toascii (#7234)
eee44bbb2 disable cpp-linter (#7229)
a63fa51a1 Create cpp-linter.yml (#7208)
2049e5210 Adds a way to verify/exposes Entities ids (#7221)
832c618f5 Adds implementation flag for swift (#7202)
14615699f Started to migrate to target_compile_options (#7222)
20aad0c41 [C++] stl_emulation span::count_ is not const anymore (#7226) (#7227)
f083b33f2 code gen flexbuffer verifier (#7207)
bf17df346 [C++] generate sorted #include directives (#7213)
35281dedb Fix for [C++] flatc generates invalid Code in the default constructor for structs, when --cpp-field-case-style is used #7209 (#7211)
c9651b742 Add overloads for C# ByteBuffer/FlatBufferBuilder to allow adding vector blocks from ArraySegments or IntPtr (#7193)
26c3b3ada Update codeql.yml
da6e1b985 Update codeql.yml
ad27d751e Added Oss fuzz badge
0aab623cb Create codeql.yml
6a446bdd8 maximize parallel builds in CI (#7206)
21fb5cbbc Create scorecards.yml
0da6f9486 [C++] Static assert on Flatbuffers Version (#7203)
59e971308 reduce fuzzing time to 1 minute in CI
40866a892 fixed padding in struct for annotated binary (#7199)
b71d968fa Apply Namer prefix/suffix to other generators (#7197)
fac0d7be0 Apply Namer to Java. (#7194)
6c5603fd9 [C#] Fix collision of field name and type name (#7149)
2d21853a7 monster fuzzer fix for json default scalars
fec1a8d01 [swift] Add bazel configuration for Swift (#7195)
7fd857623 structured comments (#7192)
a4cb1599d Namerdart (#7187)
ae4ce7265 fuzzed binary annotator (#7188)
e2be0c0b0 Handle root offset and root table vtable invalidation (#7177)
2ad408697 [TS] Fix generation of struct members in object api (#7148)
4213d9105 VerifySizePrefixed (reflection::Schema) and GetAnySizePrefixedRoot added (#7181)
5a13f622c Correctly parse lists of enums in Dart generated code (#7157)
23a7e4e0b Adds no-includes flags to the swift code generator (#7182)
eeb49c275 Move flatbuffer_ts_library to typescript.bzl (#7183)
824763b31 Typo in flatc options (warning-as-errors instead of warnings-as-errors) (#7180)
d3aeee32b Annotated Flatbuffer Binary (#7174)
0bceba24d [Lua] Apply Namer to Lua (#7171)
b8c77d404 Make inclusion of header <optional> opt-out via macro (#7168)
8468eab83 Namersw (#7167)
2b2e8d4ae Nameroverloads (#7164)
b80b32bfa Use DESCRIPTION only if CMake version >= 3.9 (#7166)
Change-Id: Ic2681dabb1a798b7515e62753ee06aecb9933260
git-subtree-dir: third_party/flatbuffers
git-subtree-split: bc44fad35271e43fd7a79b4d691ac9e41708797f
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>
diff --git a/tests/my-game/example/ability.js b/tests/my-game/example/ability.js
index 9fea3d6..4d7d3db 100644
--- a/tests/my-game/example/ability.js
+++ b/tests/my-game/example/ability.js
@@ -24,7 +24,7 @@
return true;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.Ability';
+ return 'MyGame_Example_Ability';
}
static sizeOf() {
return 8;
diff --git a/tests/my-game/example/ability.ts b/tests/my-game/example/ability.ts
index 26395fb..36b0eb8 100644
--- a/tests/my-game/example/ability.ts
+++ b/tests/my-game/example/ability.ts
@@ -7,7 +7,7 @@
export class Ability {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Ability {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Ability {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -32,7 +32,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.Ability';
+ return 'MyGame_Example_Ability';
}
static sizeOf():number {
diff --git a/tests/my-game/example/any-ambiguous-aliases.ts b/tests/my-game/example/any-ambiguous-aliases.ts
index 6687a41..fb308fc 100644
--- a/tests/my-game/example/any-ambiguous-aliases.ts
+++ b/tests/my-game/example/any-ambiguous-aliases.ts
@@ -3,7 +3,7 @@
import { Monster, MonsterT } from '../../my-game/example/monster';
-export enum AnyAmbiguousAliases{
+export enum AnyAmbiguousAliases {
NONE = 0,
M1 = 1,
M2 = 2,
@@ -36,4 +36,3 @@
default: return null;
}
}
-
diff --git a/tests/my-game/example/any-unique-aliases.js b/tests/my-game/example/any-unique-aliases.js
index b5cc882..98e5597 100644
--- a/tests/my-game/example/any-unique-aliases.js
+++ b/tests/my-game/example/any-unique-aliases.js
@@ -1,5 +1,5 @@
// automatically generated by the FlatBuffers compiler, do not modify
-import { Monster as MyGameExample2Monster } from '../../my-game/example2/monster';
+import { Monster as MyGame_Example2_Monster } from '../../my-game/example2/monster';
import { Monster } from '../../my-game/example/monster';
import { TestSimpleTableWithEnum } from '../../my-game/example/test-simple-table-with-enum';
export var AnyUniqueAliases;
@@ -14,7 +14,7 @@
case 'NONE': return null;
case 'M': return accessor(new Monster());
case 'TS': return accessor(new TestSimpleTableWithEnum());
- case 'M2': return accessor(new MyGameExample2Monster());
+ case 'M2': return accessor(new MyGame_Example2_Monster());
default: return null;
}
}
@@ -23,7 +23,7 @@
case 'NONE': return null;
case 'M': return accessor(index, new Monster());
case 'TS': return accessor(index, new TestSimpleTableWithEnum());
- case 'M2': return accessor(index, new MyGameExample2Monster());
+ case 'M2': return accessor(index, new MyGame_Example2_Monster());
default: return null;
}
}
diff --git a/tests/my-game/example/any-unique-aliases.ts b/tests/my-game/example/any-unique-aliases.ts
index 5106148..7ca769f 100644
--- a/tests/my-game/example/any-unique-aliases.ts
+++ b/tests/my-game/example/any-unique-aliases.ts
@@ -1,11 +1,11 @@
// automatically generated by the FlatBuffers compiler, do not modify
-import { Monster as MyGameExample2Monster, MonsterT as MyGameExample2MonsterT } from '../../my-game/example2/monster';
+import { Monster as MyGame_Example2_Monster, MonsterT as MyGame_Example2_MonsterT } from '../../my-game/example2/monster';
import { Monster, MonsterT } from '../../my-game/example/monster';
import { TestSimpleTableWithEnum, TestSimpleTableWithEnumT } from '../../my-game/example/test-simple-table-with-enum';
-export enum AnyUniqueAliases{
+export enum AnyUniqueAliases {
NONE = 0,
M = 1,
TS = 2,
@@ -14,28 +14,27 @@
export function unionToAnyUniqueAliases(
type: AnyUniqueAliases,
- accessor: (obj:Monster|MyGameExample2Monster|TestSimpleTableWithEnum) => Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null
-): Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null {
+ accessor: (obj:Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum) => Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null
+): Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null {
switch(AnyUniqueAliases[type]) {
case 'NONE': return null;
case 'M': return accessor(new Monster())! as Monster;
case 'TS': return accessor(new TestSimpleTableWithEnum())! as TestSimpleTableWithEnum;
- case 'M2': return accessor(new MyGameExample2Monster())! as MyGameExample2Monster;
+ case 'M2': return accessor(new MyGame_Example2_Monster())! as MyGame_Example2_Monster;
default: return null;
}
}
export function unionListToAnyUniqueAliases(
type: AnyUniqueAliases,
- accessor: (index: number, obj:Monster|MyGameExample2Monster|TestSimpleTableWithEnum) => Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null,
+ accessor: (index: number, obj:Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum) => Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null,
index: number
-): Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null {
+): Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null {
switch(AnyUniqueAliases[type]) {
case 'NONE': return null;
case 'M': return accessor(index, new Monster())! as Monster;
case 'TS': return accessor(index, new TestSimpleTableWithEnum())! as TestSimpleTableWithEnum;
- case 'M2': return accessor(index, new MyGameExample2Monster())! as MyGameExample2Monster;
+ case 'M2': return accessor(index, new MyGame_Example2_Monster())! as MyGame_Example2_Monster;
default: return null;
}
}
-
diff --git a/tests/my-game/example/any.js b/tests/my-game/example/any.js
index 7349c07..47bfb25 100644
--- a/tests/my-game/example/any.js
+++ b/tests/my-game/example/any.js
@@ -1,5 +1,5 @@
// automatically generated by the FlatBuffers compiler, do not modify
-import { Monster as MyGameExample2Monster } from '../../my-game/example2/monster';
+import { Monster as MyGame_Example2_Monster } from '../../my-game/example2/monster';
import { Monster } from '../../my-game/example/monster';
import { TestSimpleTableWithEnum } from '../../my-game/example/test-simple-table-with-enum';
export var Any;
@@ -14,7 +14,7 @@
case 'NONE': return null;
case 'Monster': return accessor(new Monster());
case 'TestSimpleTableWithEnum': return accessor(new TestSimpleTableWithEnum());
- case 'MyGame_Example2_Monster': return accessor(new MyGameExample2Monster());
+ case 'MyGame_Example2_Monster': return accessor(new MyGame_Example2_Monster());
default: return null;
}
}
@@ -23,7 +23,7 @@
case 'NONE': return null;
case 'Monster': return accessor(index, new Monster());
case 'TestSimpleTableWithEnum': return accessor(index, new TestSimpleTableWithEnum());
- case 'MyGame_Example2_Monster': return accessor(index, new MyGameExample2Monster());
+ case 'MyGame_Example2_Monster': return accessor(index, new MyGame_Example2_Monster());
default: return null;
}
}
diff --git a/tests/my-game/example/any.ts b/tests/my-game/example/any.ts
index 9d8b2a6..f7bb94f 100644
--- a/tests/my-game/example/any.ts
+++ b/tests/my-game/example/any.ts
@@ -1,11 +1,11 @@
// automatically generated by the FlatBuffers compiler, do not modify
-import { Monster as MyGameExample2Monster, MonsterT as MyGameExample2MonsterT } from '../../my-game/example2/monster';
+import { Monster as MyGame_Example2_Monster, MonsterT as MyGame_Example2_MonsterT } from '../../my-game/example2/monster';
import { Monster, MonsterT } from '../../my-game/example/monster';
import { TestSimpleTableWithEnum, TestSimpleTableWithEnumT } from '../../my-game/example/test-simple-table-with-enum';
-export enum Any{
+export enum Any {
NONE = 0,
Monster = 1,
TestSimpleTableWithEnum = 2,
@@ -14,28 +14,27 @@
export function unionToAny(
type: Any,
- accessor: (obj:Monster|MyGameExample2Monster|TestSimpleTableWithEnum) => Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null
-): Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null {
+ accessor: (obj:Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum) => Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null
+): Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null {
switch(Any[type]) {
case 'NONE': return null;
case 'Monster': return accessor(new Monster())! as Monster;
case 'TestSimpleTableWithEnum': return accessor(new TestSimpleTableWithEnum())! as TestSimpleTableWithEnum;
- case 'MyGame_Example2_Monster': return accessor(new MyGameExample2Monster())! as MyGameExample2Monster;
+ case 'MyGame_Example2_Monster': return accessor(new MyGame_Example2_Monster())! as MyGame_Example2_Monster;
default: return null;
}
}
export function unionListToAny(
type: Any,
- accessor: (index: number, obj:Monster|MyGameExample2Monster|TestSimpleTableWithEnum) => Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null,
+ accessor: (index: number, obj:Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum) => Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null,
index: number
-): Monster|MyGameExample2Monster|TestSimpleTableWithEnum|null {
+): Monster|MyGame_Example2_Monster|TestSimpleTableWithEnum|null {
switch(Any[type]) {
case 'NONE': return null;
case 'Monster': return accessor(index, new Monster())! as Monster;
case 'TestSimpleTableWithEnum': return accessor(index, new TestSimpleTableWithEnum())! as TestSimpleTableWithEnum;
- case 'MyGame_Example2_Monster': return accessor(index, new MyGameExample2Monster())! as MyGameExample2Monster;
+ case 'MyGame_Example2_Monster': return accessor(index, new MyGame_Example2_Monster())! as MyGame_Example2_Monster;
default: return null;
}
}
-
diff --git a/tests/my-game/example/color.ts b/tests/my-game/example/color.ts
index ceb31f8..8ce58da 100644
--- a/tests/my-game/example/color.ts
+++ b/tests/my-game/example/color.ts
@@ -3,7 +3,7 @@
/**
* Composite components of Monster color.
*/
-export enum Color{
+export enum Color {
Red = 1,
/**
@@ -17,4 +17,3 @@
*/
Blue = 8
}
-
diff --git a/tests/my-game/example/long-enum.ts b/tests/my-game/example/long-enum.ts
index be41819..31ea188 100644
--- a/tests/my-game/example/long-enum.ts
+++ b/tests/my-game/example/long-enum.ts
@@ -1,8 +1,7 @@
// automatically generated by the FlatBuffers compiler, do not modify
-export enum LongEnum{
+export enum LongEnum {
LongOne = '2',
LongTwo = '4',
LongBig = '1099511627776'
}
-
diff --git a/tests/my-game/example/monster.js b/tests/my-game/example/monster.js
index 3c3c23b..f9c8cca 100644
--- a/tests/my-game/example/monster.js
+++ b/tests/my-game/example/monster.js
@@ -527,7 +527,7 @@
return true;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.Monster';
+ return 'MyGame_Example_Monster';
}
static startMonster(builder) {
builder.startObject(54);
diff --git a/tests/my-game/example/monster.ts b/tests/my-game/example/monster.ts
index c6cb33e..d65b7c3 100644
--- a/tests/my-game/example/monster.ts
+++ b/tests/my-game/example/monster.ts
@@ -2,7 +2,7 @@
import * as flatbuffers from 'flatbuffers';
-import { Monster as MyGameExample2Monster, MonsterT as MyGameExample2MonsterT } from '../../my-game/example2/monster';
+import { Monster as MyGame_Example2_Monster, MonsterT as MyGame_Example2_MonsterT } from '../../my-game/example2/monster';
import { Ability, AbilityT } from '../../my-game/example/ability';
import { Any, unionToAny, unionListToAny } from '../../my-game/example/any';
import { AnyAmbiguousAliases, unionToAnyAmbiguousAliases, unionListToAnyAmbiguousAliases } from '../../my-game/example/any-ambiguous-aliases';
@@ -23,7 +23,7 @@
export class Monster {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Monster {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Monster {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -684,7 +684,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.Monster';
+ return 'MyGame_Example_Monster';
}
static startMonster(builder:flatbuffers.Builder) {
@@ -1296,7 +1296,7 @@
public inventory: (number)[] = [],
public color: Color = Color.Blue,
public testType: Any = Any.NONE,
- public test: MonsterT|MyGameExample2MonsterT|TestSimpleTableWithEnumT|null = null,
+ public test: MonsterT|MyGame_Example2_MonsterT|TestSimpleTableWithEnumT|null = null,
public test4: (TestT)[] = [],
public testarrayofstring: (string)[] = [],
public testarrayoftables: (MonsterT)[] = [],
@@ -1332,7 +1332,7 @@
public nonOwningReference: bigint = BigInt('0'),
public vectorOfNonOwningReferences: (bigint)[] = [],
public anyUniqueType: AnyUniqueAliases = AnyUniqueAliases.NONE,
- public anyUnique: MonsterT|MyGameExample2MonsterT|TestSimpleTableWithEnumT|null = null,
+ public anyUnique: MonsterT|MyGame_Example2_MonsterT|TestSimpleTableWithEnumT|null = null,
public anyAmbiguousType: AnyAmbiguousAliases = AnyAmbiguousAliases.NONE,
public anyAmbiguous: MonsterT|null = null,
public vectorOfEnums: (Color)[] = [],
diff --git a/tests/my-game/example/race.ts b/tests/my-game/example/race.ts
index 06ca128..8cb9654 100644
--- a/tests/my-game/example/race.ts
+++ b/tests/my-game/example/race.ts
@@ -1,9 +1,8 @@
// automatically generated by the FlatBuffers compiler, do not modify
-export enum Race{
+export enum Race {
None = -1,
Human = 0,
Dwarf = 1,
Elf = 2
}
-
diff --git a/tests/my-game/example/referrable.js b/tests/my-game/example/referrable.js
index 0370768..367034b 100644
--- a/tests/my-game/example/referrable.js
+++ b/tests/my-game/example/referrable.js
@@ -30,7 +30,7 @@
return true;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.Referrable';
+ return 'MyGame_Example_Referrable';
}
static startReferrable(builder) {
builder.startObject(1);
diff --git a/tests/my-game/example/referrable.ts b/tests/my-game/example/referrable.ts
index fdac6c3..ec02980 100644
--- a/tests/my-game/example/referrable.ts
+++ b/tests/my-game/example/referrable.ts
@@ -7,7 +7,7 @@
export class Referrable {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Referrable {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Referrable {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -39,7 +39,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.Referrable';
+ return 'MyGame_Example_Referrable';
}
static startReferrable(builder:flatbuffers.Builder) {
diff --git a/tests/my-game/example/stat.js b/tests/my-game/example/stat.js
index 46eec43..43b569f 100644
--- a/tests/my-game/example/stat.js
+++ b/tests/my-game/example/stat.js
@@ -46,7 +46,7 @@
return true;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.Stat';
+ return 'MyGame_Example_Stat';
}
static startStat(builder) {
builder.startObject(3);
diff --git a/tests/my-game/example/stat.ts b/tests/my-game/example/stat.ts
index 0082ef8..e452599 100644
--- a/tests/my-game/example/stat.ts
+++ b/tests/my-game/example/stat.ts
@@ -7,7 +7,7 @@
export class Stat {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Stat {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Stat {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -62,7 +62,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.Stat';
+ return 'MyGame_Example_Stat';
}
static startStat(builder:flatbuffers.Builder) {
diff --git a/tests/my-game/example/struct-of-structs-of-structs.ts b/tests/my-game/example/struct-of-structs-of-structs.ts
new file mode 100644
index 0000000..afe869f
--- /dev/null
+++ b/tests/my-game/example/struct-of-structs-of-structs.ts
@@ -0,0 +1,74 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+import * as flatbuffers from 'flatbuffers';
+
+import { StructOfStructs, StructOfStructsT } from '../../my-game/example/struct-of-structs';
+
+
+export class StructOfStructsOfStructs {
+ bb: flatbuffers.ByteBuffer|null = null;
+ bb_pos = 0;
+ __init(i:number, bb:flatbuffers.ByteBuffer):StructOfStructsOfStructs {
+ this.bb_pos = i;
+ this.bb = bb;
+ return this;
+}
+
+a(obj?:StructOfStructs):StructOfStructs|null {
+ return (obj || new StructOfStructs()).__init(this.bb_pos, this.bb!);
+}
+
+static getFullyQualifiedName():string {
+ return 'MyGame_Example_StructOfStructsOfStructs';
+}
+
+static sizeOf():number {
+ return 20;
+}
+
+static createStructOfStructsOfStructs(builder:flatbuffers.Builder, a_a_id: number, a_a_distance: number, a_b_a: number, a_b_b: number, a_c_id: number, a_c_distance: number):flatbuffers.Offset {
+ builder.prep(4, 20);
+ builder.prep(4, 20);
+ builder.prep(4, 8);
+ builder.writeInt32(a_c_distance);
+ builder.writeInt32(a_c_id);
+ builder.prep(2, 4);
+ builder.pad(1);
+ builder.writeInt8(a_b_b);
+ builder.writeInt16(a_b_a);
+ builder.prep(4, 8);
+ builder.writeInt32(a_a_distance);
+ builder.writeInt32(a_a_id);
+ return builder.offset();
+}
+
+
+unpack(): StructOfStructsOfStructsT {
+ return new StructOfStructsOfStructsT(
+ (this.a() !== null ? this.a()!.unpack() : null)
+ );
+}
+
+
+unpackTo(_o: StructOfStructsOfStructsT): void {
+ _o.a = (this.a() !== null ? this.a()!.unpack() : null);
+}
+}
+
+export class StructOfStructsOfStructsT {
+constructor(
+ public a: StructOfStructsT|null = null
+){}
+
+
+pack(builder:flatbuffers.Builder): flatbuffers.Offset {
+ return StructOfStructsOfStructs.createStructOfStructsOfStructs(builder,
+ (this.a?.a?.id ?? 0),
+ (this.a?.a?.distance ?? 0),
+ (this.a?.b?.a ?? 0),
+ (this.a?.b?.b ?? 0),
+ (this.a?.c?.id ?? 0),
+ (this.a?.c?.distance ?? 0)
+ );
+}
+}
diff --git a/tests/my-game/example/struct-of-structs.js b/tests/my-game/example/struct-of-structs.js
index 2debc29..09c7910 100644
--- a/tests/my-game/example/struct-of-structs.js
+++ b/tests/my-game/example/struct-of-structs.js
@@ -21,7 +21,7 @@
return (obj || new Ability()).__init(this.bb_pos + 12, this.bb);
}
static getFullyQualifiedName() {
- return 'MyGame.Example.StructOfStructs';
+ return 'MyGame_Example_StructOfStructs';
}
static sizeOf() {
return 20;
@@ -56,6 +56,7 @@
this.c = c;
}
pack(builder) {
- return StructOfStructs.createStructOfStructs(builder, (this.a === null ? 0 : this.a.id), (this.a === null ? 0 : this.a.distance), (this.b === null ? 0 : this.b.a), (this.b === null ? 0 : this.b.b), (this.c === null ? 0 : this.c.id), (this.c === null ? 0 : this.c.distance));
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+ return StructOfStructs.createStructOfStructs(builder, ((_b = (_a = this.a) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : 0), ((_d = (_c = this.a) === null || _c === void 0 ? void 0 : _c.distance) !== null && _d !== void 0 ? _d : 0), ((_f = (_e = this.b) === null || _e === void 0 ? void 0 : _e.a) !== null && _f !== void 0 ? _f : 0), ((_h = (_g = this.b) === null || _g === void 0 ? void 0 : _g.b) !== null && _h !== void 0 ? _h : 0), ((_k = (_j = this.c) === null || _j === void 0 ? void 0 : _j.id) !== null && _k !== void 0 ? _k : 0), ((_m = (_l = this.c) === null || _l === void 0 ? void 0 : _l.distance) !== null && _m !== void 0 ? _m : 0));
}
}
diff --git a/tests/my-game/example/struct-of-structs.ts b/tests/my-game/example/struct-of-structs.ts
index 11eca7e..0cb87de 100644
--- a/tests/my-game/example/struct-of-structs.ts
+++ b/tests/my-game/example/struct-of-structs.ts
@@ -9,7 +9,7 @@
export class StructOfStructs {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):StructOfStructs {
+ __init(i:number, bb:flatbuffers.ByteBuffer):StructOfStructs {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -28,7 +28,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.StructOfStructs';
+ return 'MyGame_Example_StructOfStructs';
}
static sizeOf():number {
@@ -77,12 +77,12 @@
pack(builder:flatbuffers.Builder): flatbuffers.Offset {
return StructOfStructs.createStructOfStructs(builder,
- (this.a === null ? 0 : this.a.id!),
- (this.a === null ? 0 : this.a.distance!),
- (this.b === null ? 0 : this.b.a!),
- (this.b === null ? 0 : this.b.b!),
- (this.c === null ? 0 : this.c.id!),
- (this.c === null ? 0 : this.c.distance!)
+ (this.a?.id ?? 0),
+ (this.a?.distance ?? 0),
+ (this.b?.a ?? 0),
+ (this.b?.b ?? 0),
+ (this.c?.id ?? 0),
+ (this.c?.distance ?? 0)
);
}
}
diff --git a/tests/my-game/example/test-simple-table-with-enum.js b/tests/my-game/example/test-simple-table-with-enum.js
index b56bda4..a31d011 100644
--- a/tests/my-game/example/test-simple-table-with-enum.js
+++ b/tests/my-game/example/test-simple-table-with-enum.js
@@ -31,7 +31,7 @@
return true;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.TestSimpleTableWithEnum';
+ return 'MyGame_Example_TestSimpleTableWithEnum';
}
static startTestSimpleTableWithEnum(builder) {
builder.startObject(1);
diff --git a/tests/my-game/example/test-simple-table-with-enum.ts b/tests/my-game/example/test-simple-table-with-enum.ts
index 99a541f..86a19aa 100644
--- a/tests/my-game/example/test-simple-table-with-enum.ts
+++ b/tests/my-game/example/test-simple-table-with-enum.ts
@@ -8,7 +8,7 @@
export class TestSimpleTableWithEnum {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):TestSimpleTableWithEnum {
+ __init(i:number, bb:flatbuffers.ByteBuffer):TestSimpleTableWithEnum {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -40,7 +40,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.TestSimpleTableWithEnum';
+ return 'MyGame_Example_TestSimpleTableWithEnum';
}
static startTestSimpleTableWithEnum(builder:flatbuffers.Builder) {
diff --git a/tests/my-game/example/test.js b/tests/my-game/example/test.js
index ba6ebfb..9c43619 100644
--- a/tests/my-game/example/test.js
+++ b/tests/my-game/example/test.js
@@ -24,7 +24,7 @@
return true;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.Test';
+ return 'MyGame_Example_Test';
}
static sizeOf() {
return 4;
diff --git a/tests/my-game/example/test.ts b/tests/my-game/example/test.ts
index afed125..b3d84ee 100644
--- a/tests/my-game/example/test.ts
+++ b/tests/my-game/example/test.ts
@@ -7,7 +7,7 @@
export class Test {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Test {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Test {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -32,7 +32,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.Test';
+ return 'MyGame_Example_Test';
}
static sizeOf():number {
diff --git a/tests/my-game/example/type-aliases.js b/tests/my-game/example/type-aliases.js
index f26f226..a4b5f89 100644
--- a/tests/my-game/example/type-aliases.js
+++ b/tests/my-game/example/type-aliases.js
@@ -162,7 +162,7 @@
return offset ? new Float64Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null;
}
static getFullyQualifiedName() {
- return 'MyGame.Example.TypeAliases';
+ return 'MyGame_Example_TypeAliases';
}
static startTypeAliases(builder) {
builder.startObject(12);
diff --git a/tests/my-game/example/type-aliases.ts b/tests/my-game/example/type-aliases.ts
index edb4567..805c8cf 100644
--- a/tests/my-game/example/type-aliases.ts
+++ b/tests/my-game/example/type-aliases.ts
@@ -7,7 +7,7 @@
export class TypeAliases {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):TypeAliases {
+ __init(i:number, bb:flatbuffers.ByteBuffer):TypeAliases {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -213,7 +213,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.TypeAliases';
+ return 'MyGame_Example_TypeAliases';
}
static startTypeAliases(builder:flatbuffers.Builder) {
diff --git a/tests/my-game/example/vec3.js b/tests/my-game/example/vec3.js
index 5fd2447..82b2eab 100644
--- a/tests/my-game/example/vec3.js
+++ b/tests/my-game/example/vec3.js
@@ -49,7 +49,7 @@
return (obj || new Test()).__init(this.bb_pos + 26, this.bb);
}
static getFullyQualifiedName() {
- return 'MyGame.Example.Vec3';
+ return 'MyGame_Example_Vec3';
}
static sizeOf() {
return 32;
@@ -92,6 +92,7 @@
this.test3 = test3;
}
pack(builder) {
- return Vec3.createVec3(builder, this.x, this.y, this.z, this.test1, this.test2, (this.test3 === null ? 0 : this.test3.a), (this.test3 === null ? 0 : this.test3.b));
+ var _a, _b, _c, _d;
+ return Vec3.createVec3(builder, this.x, this.y, this.z, this.test1, this.test2, ((_b = (_a = this.test3) === null || _a === void 0 ? void 0 : _a.a) !== null && _b !== void 0 ? _b : 0), ((_d = (_c = this.test3) === null || _c === void 0 ? void 0 : _c.b) !== null && _d !== void 0 ? _d : 0));
}
}
diff --git a/tests/my-game/example/vec3.ts b/tests/my-game/example/vec3.ts
index 9756977..3c692e2 100644
--- a/tests/my-game/example/vec3.ts
+++ b/tests/my-game/example/vec3.ts
@@ -9,7 +9,7 @@
export class Vec3 {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Vec3 {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Vec3 {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -65,7 +65,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example.Vec3';
+ return 'MyGame_Example_Vec3';
}
static sizeOf():number {
@@ -130,8 +130,8 @@
this.z,
this.test1,
this.test2,
- (this.test3 === null ? 0 : this.test3.a!),
- (this.test3 === null ? 0 : this.test3.b!)
+ (this.test3?.a ?? 0),
+ (this.test3?.b ?? 0)
);
}
}
diff --git a/tests/my-game/example2/monster.js b/tests/my-game/example2/monster.js
index 17f02b1..f50a2c8 100644
--- a/tests/my-game/example2/monster.js
+++ b/tests/my-game/example2/monster.js
@@ -18,7 +18,7 @@
return (obj || new Monster()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
}
static getFullyQualifiedName() {
- return 'MyGame.Example2.Monster';
+ return 'MyGame_Example2_Monster';
}
static startMonster(builder) {
builder.startObject(0);
diff --git a/tests/my-game/example2/monster.ts b/tests/my-game/example2/monster.ts
index 14d7685..7240476 100644
--- a/tests/my-game/example2/monster.ts
+++ b/tests/my-game/example2/monster.ts
@@ -7,7 +7,7 @@
export class Monster {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):Monster {
+ __init(i:number, bb:flatbuffers.ByteBuffer):Monster {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -23,7 +23,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.Example2.Monster';
+ return 'MyGame_Example2_Monster';
}
static startMonster(builder:flatbuffers.Builder) {
diff --git a/tests/my-game/in-parent-namespace.js b/tests/my-game/in-parent-namespace.js
index 4881741..24b0ed7 100644
--- a/tests/my-game/in-parent-namespace.js
+++ b/tests/my-game/in-parent-namespace.js
@@ -18,7 +18,7 @@
return (obj || new InParentNamespace()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
}
static getFullyQualifiedName() {
- return 'MyGame.InParentNamespace';
+ return 'MyGame_InParentNamespace';
}
static startInParentNamespace(builder) {
builder.startObject(0);
diff --git a/tests/my-game/in-parent-namespace.ts b/tests/my-game/in-parent-namespace.ts
index 8cfe9b6..0de94df 100644
--- a/tests/my-game/in-parent-namespace.ts
+++ b/tests/my-game/in-parent-namespace.ts
@@ -7,7 +7,7 @@
export class InParentNamespace {
bb: flatbuffers.ByteBuffer|null = null;
bb_pos = 0;
-__init(i:number, bb:flatbuffers.ByteBuffer):InParentNamespace {
+ __init(i:number, bb:flatbuffers.ByteBuffer):InParentNamespace {
this.bb_pos = i;
this.bb = bb;
return this;
@@ -23,7 +23,7 @@
}
static getFullyQualifiedName():string {
- return 'MyGame.InParentNamespace';
+ return 'MyGame_InParentNamespace';
}
static startInParentNamespace(builder:flatbuffers.Builder) {