Merge remote-tracking branch 'refs/remotes/origin/support_untagged_variant'

This commit is contained in:
Gustavo
2024-02-08 14:17:43 -03:00
5 changed files with 49 additions and 28 deletions
+2
View File
@@ -16,6 +16,8 @@
- Add `semver-impl` cargo feature with support for the *semver* crate ([#176](https://github.com/Aleph-Alpha/ts-rs/pull/176))
- Support `HashMap` with custom hashers ([#173](https://github.com/Aleph-Alpha/ts-rs/pull/173))
- Add `import-esm` cargo feature to import files with a `.js` extension ([#192](https://github.com/Aleph-Alpha/ts-rs/pull/192))
- Implement `#[ts(...)]` equivalents for `#[serde(tag = "...")]`, `#[serde(tag = "...", content = "...")]` and `#[serde(untagged)]` ([#227](https://github.com/Aleph-Alpha/ts-rs/pull/227))
- Support `#[serde(untagged)]` on individual enum variants ((#226)[https://github.com/Aleph-Alpha/ts-rs/pull/226])
### Fixes
- `rename_all` with `camelCase` produces wrong names if fields were already in camelCase ([#198](https://github.com/Aleph-Alpha/ts-rs/pull/198))
+4 -1
View File
@@ -76,7 +76,10 @@ impl_parse! {
"rename" => out.rename = Some(parse_assign_str(input)?),
"rename_all" => out.rename_all = Some(parse_assign_inflection(input)?),
"export_to" => out.export_to = Some(parse_assign_str(input)?),
"export" => out.export = true
"export" => out.export = true,
"tag" => out.tag = Some(parse_assign_str(input)?),
"content" => out.content = Some(parse_assign_str(input)?),
"untagged" => out.untagged = true
}
}
+26 -16
View File
@@ -1,3 +1,5 @@
#![allow(dead_code)]
#[cfg(feature = "serde-compat")]
use serde::Serialize;
use ts_rs::TS;
@@ -31,19 +33,22 @@ fn externally_tagged() {
}
#[test]
#[cfg(feature = "serde-compat")]
fn adjacently_tagged() {
#[derive(Serialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
struct Foo {
one: i32,
#[serde(flatten)]
#[cfg_attr(feature = "serde-compat", serde(flatten))]
#[cfg_attr(not(feature = "serde-compat"), ts(flatten))]
baz: Bar,
qux: Option<String>,
}
#[derive(Serialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
#[allow(dead_code)]
#[serde(tag = "type", content = "stuff")]
#[cfg_attr(feature = "serde-compat", serde(tag = "type", content = "stuff"))]
#[cfg_attr(not(feature = "serde-compat"), ts(tag = "type", content = "stuff"))]
enum Bar {
Baz {
a: i32,
@@ -67,19 +72,22 @@ fn adjacently_tagged() {
}
#[test]
#[cfg(feature = "serde-compat")]
fn internally_tagged() {
#[derive(Serialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
struct Foo {
qux: Option<String>,
#[serde(flatten)]
#[cfg_attr(feature = "serde-compat", serde(flatten))]
#[cfg_attr(not(feature = "serde-compat"), ts(flatten))]
baz: Bar,
}
#[derive(Serialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
#[allow(dead_code)]
#[serde(tag = "type")]
#[cfg_attr(feature = "serde-compat", serde(tag = "type"))]
#[cfg_attr(not(feature = "serde-compat"), ts(tag = "type"))]
enum Bar {
Baz { a: i32, a2: String },
Biz { b: bool },
@@ -93,17 +101,19 @@ fn internally_tagged() {
}
#[test]
#[cfg(feature = "serde-compat")]
fn untagged() {
#[derive(Serialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
struct Foo {
#[serde(flatten)]
#[cfg_attr(feature = "serde-compat", serde(flatten))]
#[cfg_attr(not(feature = "serde-compat"), ts(flatten))]
baz: Bar,
}
#[derive(Serialize, TS)]
#[allow(dead_code)]
#[serde(untagged)]
#[derive(TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[cfg_attr(feature = "serde-compat", serde(untagged))]
#[cfg_attr(not(feature = "serde-compat"), ts(untagged))]
enum Bar {
Baz { a: i32, a2: String },
Biz { b: bool },
+4 -2
View File
@@ -1,8 +1,10 @@
use serde::{Deserialize, Serialize};
#[cfg(feature = "serde-compat")]
use serde::Serialize;
use ts_rs::TS;
#[derive(Serialize, Deserialize, TS, Clone)]
#[derive(TS)]
#[ts(export)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[cfg_attr(feature = "serde-compat", serde(rename_all = "camelCase"))]
#[cfg_attr(not(feature = "serde-compat"), ts(rename_all = "camelCase"))]
pub enum TaskStatus {
+13 -9
View File
@@ -1,9 +1,11 @@
#![allow(dead_code)]
use serde::{Deserialize, Serialize};
#[cfg(feature = "serde-compat")]
use serde::Serialize;
use ts_rs::TS;
#[derive(Serialize, Deserialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
#[cfg_attr(feature = "serde-compat", serde(rename_all = "SCREAMING_SNAKE_CASE"))]
#[cfg_attr(not(feature = "serde-compat"), ts(rename_all = "SCREAMING_SNAKE_CASE"))]
#[ts(export)]
@@ -28,7 +30,8 @@ fn test_enum_variant_rename_all() {
);
}
#[derive(Serialize, Deserialize, TS)]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
#[ts(export)]
enum B {
#[cfg_attr(feature = "serde-compat", serde(rename = "SnakeMessage"))]
@@ -53,22 +56,23 @@ fn test_enum_variant_rename() {
);
}
#[cfg(feature = "serde")]
#[derive(Serialize, Deserialize, TS)]
#[serde(tag = "kind")]
#[cfg_attr(feature = "serde-compat", derive(Serialize))]
#[derive(TS)]
#[cfg_attr(feature = "serde-compat", serde(tag = "kind"))]
#[cfg_attr(not(feature = "serde-compat"), ts(tag = "kind"))]
#[ts(export)]
pub enum C {
#[serde(rename = "SQUARE_THING")]
#[cfg_attr(feature = "serde-compat", serde(rename = "SQUARE_THING"))]
#[cfg_attr(not(feature = "serde-compat"), ts(rename = "SQUARE_THING"))]
SquareThing {
name: String,
// ...
},
}
#[cfg(feature = "serde")]
#[test]
fn test_enum_variant_with_tag() {
assert_eq!(C::inline(), "{ kind: \"SQUARE_THING\", name: string, }");
assert_eq!(C::inline(), r#"{ "kind": "SQUARE_THING", name: string, }"#);
}
#[cfg(feature = "serde-compat")]