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

Wrap types in namespace for --ts-flat-files and --gen-all (#7451)

Browse Source 
* Wrap types in namespace for --ts-flat-files and --gen-all

* Fixes for escaping object types

* Added to generate_code
This commit is contained in:
Derek Bailey
2022-08-16 12:52:26 -07:00
committed by GitHub
parent f7c511957f
commit 82b75407a3
48 changed files with 2152 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/my-game/example/ability.js
View File

@@ -24,7 +24,7 @@ export class Ability {
return true;
}
static getFullyQualifiedName() {
return 'MyGame.Example.Ability';
return 'MyGame_Example_Ability';
}
static sizeOf() {
return 8;

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

@@ -32,7 +32,7 @@ mutate_distance(value:number):boolean {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.Ability';
return 'MyGame_Example_Ability';
}
static sizeOf():number {

1
tests/my-game/example/any-ambiguous-aliases.ts
View File

@@ -36,4 +36,3 @@ export function unionListToAnyAmbiguousAliases(
default: return null;
}
}

6
tests/my-game/example/any-unique-aliases.js
View File

@@ -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 @@ export function unionToAnyUniqueAliases(type, accessor) {
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 @@ export function unionListToAnyUniqueAliases(type, accessor, index) {
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;
}
}

15
tests/my-game/example/any-unique-aliases.ts
View File

@@ -1,6 +1,6 @@
// 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';
@@ -14,28 +14,27 @@ export enum AnyUniqueAliases {
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;
}
}

6
tests/my-game/example/any.js
View File

@@ -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 @@ export function unionToAny(type, accessor) {
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 @@ export function unionListToAny(type, accessor, index) {
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;
}
}

15
tests/my-game/example/any.ts
View File

@@ -1,6 +1,6 @@
// 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';
@@ -14,28 +14,27 @@ export enum Any {
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;
}
}

1
tests/my-game/example/color.ts
View File

@@ -17,4 +17,3 @@ export enum Color {
*/
Blue = 8
}

1
tests/my-game/example/long-enum.ts
View File

@@ -5,4 +5,3 @@ export enum LongEnum {
LongTwo = '4',
LongBig = '1099511627776'
}

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

@@ -527,7 +527,7 @@ export class Monster {
return true;
}
static getFullyQualifiedName() {
return 'MyGame.Example.Monster';
return 'MyGame_Example_Monster';
}
static startMonster(builder) {
builder.startObject(54);

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

@@ -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';
@@ -684,7 +684,7 @@ mutate_long_enum_normal_default(value:bigint):boolean {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.Monster';
return 'MyGame_Example_Monster';
}
static startMonster(builder:flatbuffers.Builder) {
@@ -1296,7 +1296,7 @@ constructor(
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 @@ constructor(
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)[] = [],

1
tests/my-game/example/race.ts
View File

@@ -6,4 +6,3 @@ export enum Race {
Dwarf = 1,
Elf = 2
}

2
tests/my-game/example/referrable.js
View File

@@ -30,7 +30,7 @@ export class Referrable {
return true;
}
static getFullyQualifiedName() {
return 'MyGame.Example.Referrable';
return 'MyGame_Example_Referrable';
}
static startReferrable(builder) {
builder.startObject(1);

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

@@ -39,7 +39,7 @@ mutate_id(value:bigint):boolean {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.Referrable';
return 'MyGame_Example_Referrable';
}
static startReferrable(builder:flatbuffers.Builder) {

2
tests/my-game/example/stat.js
View File

@@ -46,7 +46,7 @@ export class Stat {
return true;
}
static getFullyQualifiedName() {
return 'MyGame.Example.Stat';
return 'MyGame_Example_Stat';
}
static startStat(builder) {
builder.startObject(3);

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

@@ -62,7 +62,7 @@ mutate_count(value:number):boolean {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.Stat';
return 'MyGame_Example_Stat';
}
static startStat(builder:flatbuffers.Builder) {

2
tests/my-game/example/struct-of-structs-of-structs.ts
View File

@@ -19,7 +19,7 @@ a(obj?:StructOfStructs):StructOfStructs|null {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.StructOfStructsOfStructs';
return 'MyGame_Example_StructOfStructsOfStructs';
}
static sizeOf():number {

2
tests/my-game/example/struct-of-structs.js
View File

@@ -21,7 +21,7 @@ export class StructOfStructs {
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;

2
tests/my-game/example/struct-of-structs.ts
View File

@@ -28,7 +28,7 @@ c(obj?:Ability):Ability|null {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.StructOfStructs';
return 'MyGame_Example_StructOfStructs';
}
static sizeOf():number {

2
tests/my-game/example/test-simple-table-with-enum.js
View File

@@ -31,7 +31,7 @@ export class TestSimpleTableWithEnum {
return true;
}
static getFullyQualifiedName() {
return 'MyGame.Example.TestSimpleTableWithEnum';
return 'MyGame_Example_TestSimpleTableWithEnum';
}
static startTestSimpleTableWithEnum(builder) {
builder.startObject(1);

2
tests/my-game/example/test-simple-table-with-enum.ts
View File

@@ -40,7 +40,7 @@ mutate_color(value:Color):boolean {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.TestSimpleTableWithEnum';
return 'MyGame_Example_TestSimpleTableWithEnum';
}
static startTestSimpleTableWithEnum(builder:flatbuffers.Builder) {

2
tests/my-game/example/test.js
View File

@@ -24,7 +24,7 @@ export class Test {
return true;
}
static getFullyQualifiedName() {
return 'MyGame.Example.Test';
return 'MyGame_Example_Test';
}
static sizeOf() {
return 4;

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

@@ -32,7 +32,7 @@ mutate_b(value:number):boolean {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.Test';
return 'MyGame_Example_Test';
}
static sizeOf():number {

2
tests/my-game/example/type-aliases.js
View File

@@ -162,7 +162,7 @@ export class TypeAliases {
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);

2
tests/my-game/example/type-aliases.ts
View File

@@ -213,7 +213,7 @@ vf64Array():Float64Array|null {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.TypeAliases';
return 'MyGame_Example_TypeAliases';
}
static startTypeAliases(builder:flatbuffers.Builder) {

2
tests/my-game/example/vec3.js
View File

@@ -49,7 +49,7 @@ export class Vec3 {
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;

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

@@ -65,7 +65,7 @@ test3(obj?:Test):Test|null {
}
static getFullyQualifiedName():string {
return 'MyGame.Example.Vec3';
return 'MyGame_Example_Vec3';
}
static sizeOf():number {