Unable to generate flattened enum

[George-Miao]

I have tried both tagged or untagged enum in struct, not working.

Code

Tagged:

use serde::Serialize;
use ts_rs::TS;

#[derive(Serialize, TS)]
#[ts(export)]
struct Foo {
    #[serde(flatten)]
    baz: Bar,
}

#[derive(Serialize, TS)]
#[serde(tag = "tag")]
#[ts(export)]
enum Bar {
    _Baz { a: i32 },
}

Untagged:

use serde::Serialize;
use ts_rs::TS;

#[derive(Serialize, TS)]
#[ts(export)]
struct Foo {
    #[serde(flatten)]
    baz: Bar,
}

#[derive(Serialize, TS)]
#[serde(untagged)]
#[ts(export)]
enum Bar {
    _Baz,
}

Error

---- ts::export_bindings_foo stdout ----
thread 'ts::export_bindings_foo' panicked at 'Bar cannot be flattened', [:REDACTED:]/.cargo/registry/src/github.com-1ecc6299db9ec823/ts-rs-6.1.2/src/lib.rs:243:9

Info

version of ts-rs: 6.1.2
version of rustc: rustc 1.60.0 (7737e0b5c 2022-04-04)

[NyxCode]

thanks for the report! will look into this when I find some time.

[ilyvion]

The untagged variant should be fairly easy to do, at least conceptually. If you have something like

#[derive(Serialize, TS)]
#[ts(export)]
struct Foo {
    one: i32,
    two: String,

    #[serde(flatten)]
    baz: Bar,
}

#[derive(Serialize, TS)]
#[serde(untagged)]
#[ts(export)]
enum Bar {
    Baz(BazStruct),
    Qux(QuxStruct),
}

The generated TS for Bar becomes something like

// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { BazStruct } from "./BazStruct";
import type { QuxStruct } from "./QuxStruct";

export type Bar = BazStruct | QuxStruct;

and it feels like the generated TS for Foo could just be

import type { Bar } from "./Bar";

export type Foo = {
    one: number
    two: string
} & Bar;

or thereabouts.

[NyxCode]

Huge shoutout to @escritorio-gustavo for getting this implemented!