Squashed 'third_party/flatbuffers/' changes from bc44fad35..8aa8b9139
8aa8b9139 Fix handling of +/-inf defaults in TS/rust/go/dart codegen (#7588)
001adf782 Add support for parsing proto map fields (#7613)
dbc58ab77 Fix help output for --gen-includes (#7611)
2facfeec7 Fix missing spaces in flatc help text (#7612)
4de2814c7 Fix: arduino platform build (#7625)
37b1acdaf Fix current official name of macOS (#7627)
a22434e2a Add missing #include <algorithm> for std::min/std::max uses, and #include <limits> for std::numeric_limits<> (#7624)
214cc9468 Bump Rust version to 22.10.26 before publication (#7622)
a4ff275d9 Added option to not requires an EoF token when parsing JSON (#7620)
15f32c690 python: object generation prefix and suffix (#7565)
051afd882 Add CreateSharedString to python builder (#7608)
728c033ad Add check for presence of realpath to CMakeLists.txt to support more platforms (#7603)
4c514483d Update DartTest.sh golden files (#7606)
c2d9c2080 [TS] Add support for fixed length arrays on Typescript (#5864) (#7021) (#7581)
e34ae4c6b `build.yml`: Fix missing 'v' in version
e54536127 `build.yml` Update to Kotlin Wrapper 1.0.5
49d9f941c `release.yml` Use env var for passphrase
cefc21c1f `release.yml` Add GPG key for Maven
3e64fa724 `release.yml`: Add Maven Steps
b15f3c57e `release_yml` Use new dotnet version
ff802c680 `release.yml` Use NuGet Key directly
b401957d5 `release.yml` Changed Push to follow examples
8c8151f8f `release.yml` Fix nuget push command
ebb7c203d `release.yml` Add Nuget support
203241ed3 FlatBuffers Version 22.10.26 (#7607)
ac485609c `setup.py`: Define version directly
de5b85aa6 `release.yml`: Switch to `python` directory
de3df2d88 `release.yml`: Add publishing to PyPi
043a24f2e [Python] Fixed the issue with nested unions relying on InitFromBuf. (#7576)
5a48b0d7d release.yml: Typo
ce307556f release.yml: Remove `npm ci`
cb616e27c Create release.yml (#7605)
a54ca1e75 FlatBuffers Version 22.10.25 (#7604)
5b3fadcc1 [vector] Allow to iterate with mutables (#7586)
872a49746 [Nim] Bfbs Nim Generator (#7534)
e30170296 Make type conversions explicit. (#7595)
f7b734438 Fix LongEnum definitions (#7596)
5792623df Rust fix compilation for no_std targets #2 (#7553)
0edb27528 Update Rust version (#7574)
acc6a20d3 tests/test.cpp contains a couple of tests that are only executed (#7571)
04cd037ba Fix #7580 by documenting union schema evolution rules (#7585)
e1c5db988 Turn on clippy for Rust and fix lints for non-generated code (#7575)
b80142b90 Update documentation to mention enum value attributes (#7570)
54418f371 Add support for metadata attributes for enum values (#7567) (#7568)
c92e78a9f FlatBuffers Version 22.9.29 (#7557)
d243b904c [TS] Make strict compliant and improve typings (#7549)
374f8fb5f Rust soundness fixes (#7518)
dadbff571 Moves swift package to root of repository so it can be used directly … (#7548)
76ddae006 FlatBuffers Version 22.9.24 (#7547)
cfe157ec5 Emit internal enums when swift_implementation_only (#7545)
413115858 [Python] Python fixed size array (#7529)
88046190e Upgrade grpc to 1.49.0 and make sure it builds (#7538)
72aa85a75 [C++] Rare bad buffer content alignment if sizeof(T) != alignof(T) (#7520)
bfceebb7f Fix conform (#7532)
git-subtree-dir: third_party/flatbuffers
git-subtree-split: 8aa8b9139eb330f27816a5b8b5bbef402fbe3632
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
Change-Id: I943faba499baf58e9f561b1e4734922188ba8626
diff --git a/ts/builder.ts b/ts/builder.ts
index 85f5726..f1a2b41 100644
--- a/ts/builder.ts
+++ b/ts/builder.ts
@@ -549,7 +549,7 @@
*
* @returns offset of obj
*/
- createObjectOffset(obj: string | any): Offset {
+ createObjectOffset(obj: string | IGeneratedObject | null): Offset {
if(obj === null) {
return 0
}
@@ -566,7 +566,7 @@
*
* @returns list of offsets of each non null object
*/
- createObjectOffsetList(list: string[] | any[]): Offset[] {
+ createObjectOffsetList(list: (string | IGeneratedObject)[]): Offset[] {
const ret: number[] = [];
for(let i = 0; i < list.length; ++i) {
@@ -583,7 +583,7 @@
return ret;
}
- createStructOffsetList(list: string[] | any[], startFunc: (builder: Builder, length: number) => void): Offset {
+ createStructOffsetList(list: (string | IGeneratedObject)[], startFunc: (builder: Builder, length: number) => void): Offset {
startFunc(this, list.length);
this.createObjectOffsetList(list.slice().reverse());
return this.endVector();
diff --git a/ts/byte-buffer.ts b/ts/byte-buffer.ts
index 09c55ad..90a1a4d 100644
--- a/ts/byte-buffer.ts
+++ b/ts/byte-buffer.ts
@@ -1,6 +1,6 @@
import { FILE_IDENTIFIER_LENGTH, SIZEOF_INT } from "./constants.js";
import { int32, isLittleEndian, float32, float64 } from "./utils.js";
-import { Offset, Table, IGeneratedObject } from "./types.js";
+import { Offset, Table, IGeneratedObject, IUnpackableObject } from "./types.js";
import { Encoding } from "./encoding.js";
export class ByteBuffer {
@@ -257,33 +257,31 @@
/**
* A helper function for generating list for obj api
*/
- createScalarList(listAccessor: (i: number) => unknown, listLength: number): any[] {
- const ret: any[] = [];
+ createScalarList<T>(listAccessor: (i: number) => T | null, listLength: number): T[] {
+ const ret: T[] = [];
for(let i = 0; i < listLength; ++i) {
- if(listAccessor(i) !== null) {
- ret.push(listAccessor(i));
+ const val = listAccessor(i);
+ if(val !== null) {
+ ret.push(val);
}
}
-
return ret;
}
-
+
/**
* A helper function for generating list for obj api
* @param listAccessor function that accepts an index and return data at that index
* @param listLength listLength
* @param res result list
*/
- createObjList(listAccessor: (i: number) => unknown, listLength: number): any[] {
- const ret: any[] = [];
+ createObjList<T1 extends IUnpackableObject<T2>, T2 extends IGeneratedObject>(listAccessor: (i: number) => T1 | null, listLength: number): T2[] {
+ const ret: T2[] = [];
for(let i = 0; i < listLength; ++i) {
const val = listAccessor(i);
if(val !== null) {
- ret.push((val as IGeneratedObject).unpack());
+ ret.push(val.unpack());
}
}
-
return ret;
}
-
}
diff --git a/ts/flatbuffers.ts b/ts/flatbuffers.ts
new file mode 100644
index 0000000..7c0010b
--- /dev/null
+++ b/ts/flatbuffers.ts
@@ -0,0 +1 @@
+export * as flatbuffers from './index.js'
\ No newline at end of file
diff --git a/ts/index.ts b/ts/index.ts
index 19f44e6..a608512 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -3,7 +3,7 @@
export { FILE_IDENTIFIER_LENGTH } from './constants.js'
export { SIZE_PREFIX_LENGTH } from './constants.js'
-export { Table, Offset } from './types.js'
+export { Table, Offset, IGeneratedObject, IUnpackableObject } from './types.js'
export { int32, float32, float64, isLittleEndian } from './utils.js'
diff --git a/ts/types.ts b/ts/types.ts
index 31fefc1..851486c 100644
--- a/ts/types.ts
+++ b/ts/types.ts
@@ -10,5 +10,8 @@
export interface IGeneratedObject {
pack(builder:Builder): Offset
- unpack(): IGeneratedObject
+}
+
+export interface IUnpackableObject<T> {
+ unpack(): T
}
\ No newline at end of file