BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 17:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TS] Enum value default null (#8619)

Browse Source 
* [TS] Enum value default null

* Re-gen
This commit is contained in:
Björn Harrtell
2025-06-22 07:25:56 +02:00
committed by GitHub
parent 5822c1c8dd
commit 595ac94a6a
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/idl_gen_ts.cpp
View File

@@ -257,7 +257,7 @@ class TsGenerator : public BaseGenerator {
for (const auto &it : ns_defs_) { for (const auto &it : ns_defs_) {
code = "// " + std::string(FlatBuffersGeneratedWarning()) + "\n\n" + code = "// " + std::string(FlatBuffersGeneratedWarning()) + "\n\n" +
"/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */\n\n"; "/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */\n\n";
// export all definitions in ns entry point module // export all definitions in ns entry point module
int export_counter = 0; int export_counter = 0;
for (const auto &def : it.second.definitions) { for (const auto &def : it.second.definitions) {
@@ -567,7 +567,7 @@ class TsGenerator : public BaseGenerator {
static Type GetUnionUnderlyingType(const Type &type) static Type GetUnionUnderlyingType(const Type &type)
{ {
if (type.enum_def != nullptr && if (type.enum_def != nullptr &&
type.enum_def->underlying_type.base_type != type.base_type) { type.enum_def->underlying_type.base_type != type.base_type) {
return type.enum_def->underlying_type; return type.enum_def->underlying_type;
} else { } else {
@@ -1849,7 +1849,7 @@ class TsGenerator : public BaseGenerator {
code += "BigInt(0)"; code += "BigInt(0)";
} else if (IsScalar(field.value.type.element)) { } else if (IsScalar(field.value.type.element)) {
if (field.value.type.enum_def) { if (field.value.type.enum_def) {
code += field.value.constant; code += "null";
} else { } else {
code += "0"; code += "0";
} }

2
tests/ts/my-game/example/monster.js
View File

@@ -457,7 +457,7 @@ export class Monster {
} }
vectorOfEnums(index) { vectorOfEnums(index) {
const offset = this.bb.__offset(this.bb_pos, 98); const offset = this.bb.__offset(this.bb_pos, 98);
return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : null;
} }
vectorOfEnumsLength() { vectorOfEnumsLength() {
const offset = this.bb.__offset(this.bb_pos, 98); const offset = this.bb.__offset(this.bb_pos, 98);

2
tests/ts/my-game/example/monster.ts
View File

@@ -594,7 +594,7 @@ anyAmbiguous<T extends flatbuffers.Table>(obj:any):any|null {
vectorOfEnums(index: number):Color|null { vectorOfEnums(index: number):Color|null {
const offset = this.bb!.__offset(this.bb_pos, 98); const offset = this.bb!.__offset(this.bb_pos, 98);
return offset ? this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index) : 0; return offset ? this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index) : null;
} }
vectorOfEnumsLength():number { vectorOfEnumsLength():number {

2
tests/ts/union-underlying-type/d.js
View File

@@ -29,7 +29,7 @@ export class D {
} }
testVectorOfUnionType(index) { testVectorOfUnionType(index) {
const offset = this.bb.__offset(this.bb_pos, 8); const offset = this.bb.__offset(this.bb_pos, 8);
return offset ? this.bb.readInt32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; return offset ? this.bb.readInt32(this.bb.__vector(this.bb_pos + offset) + index * 4) : null;
} }
testVectorOfUnionTypeLength() { testVectorOfUnionTypeLength() {
const offset = this.bb.__offset(this.bb_pos, 8); const offset = this.bb.__offset(this.bb_pos, 8);

2
tests/ts/union-underlying-type/d.ts
View File

@@ -40,7 +40,7 @@ testUnion<T extends flatbuffers.Table>(obj:any):any|null {
testVectorOfUnionType(index: number):ABC|null { testVectorOfUnionType(index: number):ABC|null {
const offset = this.bb!.__offset(this.bb_pos, 8); const offset = this.bb!.__offset(this.bb_pos, 8);
return offset ? this.bb!.readInt32(this.bb!.__vector(this.bb_pos + offset) + index * 4) : 0; return offset ? this.bb!.readInt32(this.bb!.__vector(this.bb_pos + offset) + index * 4) : null;
} }
testVectorOfUnionTypeLength():number { testVectorOfUnionTypeLength():number {

2
tests/ts/union_vector/movie.js
View File

@@ -32,7 +32,7 @@ export class Movie {
} }
charactersType(index) { charactersType(index) {
const offset = this.bb.__offset(this.bb_pos, 8); const offset = this.bb.__offset(this.bb_pos, 8);
return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : null;
} }
charactersTypeLength() { charactersTypeLength() {
const offset = this.bb.__offset(this.bb_pos, 8); const offset = this.bb.__offset(this.bb_pos, 8);

2
tests/ts/union_vector/movie.ts
View File

@@ -44,7 +44,7 @@ mainCharacter<T extends flatbuffers.Table>(obj:any|string):any|string|null {
charactersType(index: number):Character|null { charactersType(index: number):Character|null {
const offset = this.bb!.__offset(this.bb_pos, 8); const offset = this.bb!.__offset(this.bb_pos, 8);
return offset ? this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index) : 0; return offset ? this.bb!.readUint8(this.bb!.__vector(this.bb_pos + offset) + index) : null;
} }
charactersTypeLength():number { charactersTypeLength():number {