add test for #168 and #232, expand e2e dependencies test

e2e/dependencies/consumer/src/main.rs

@@ -12,4 +12,15 @@ struct ConsumerType {
     pub ty2_5: LibraryType2<LibraryType3>,
 }
 
+#[derive(TS)]
+#[ts(export)]
+struct T0;
+
+#[derive(TS)]
+#[ts(export)]
+struct T1 {
+    t0: Option<T0>
+}
+
+
 fn main() {}

ts-rs/tests/issue-168.rs

@@ -0,0 +1,50 @@
+#![allow(unused)]
+
+use std::collections::HashMap;
+use ts_rs::TS;
+
+#[derive(TS)]
+#[ts(export)]
+pub struct Foo {
+    map: HashMap<usize, Bar>,
+}
+
+#[derive(TS)]
+#[ts(export)]
+pub struct FooInlined {
+    #[ts(inline)]
+    map: HashMap<usize, Bar>,
+}
+
+#[derive(TS)]
+#[ts(export)]
+struct Bar {
+    #[ts(inline)]
+    map: HashMap<usize, Baz>,
+}
+
+#[derive(TS)]
+#[ts(export)]
+struct Baz {
+    #[ts(inline)]
+    map: HashMap<usize, String>,
+}
+
+
+#[test]
+#[ignore]
+fn issue_168() {
+    assert_eq!(
+        FooInlined::export_to_string().unwrap(),
+        "// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.\n\
+         \n\
+         export type FooInlined = { map: Record<number, { map: Record<number, { map: Record<number, string>, }>, }>, };"
+    );
+    assert_eq!(
+        Foo::export_to_string().unwrap(),
+        "// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.\n\
+         import type { Bar } from \"./Bar\";\n\
+         \n\
+         export type Foo = { map: Record<number, Bar>, };"
+    );
+}

ts-rs/tests/issue-232.rs

@@ -0,0 +1,67 @@
+#![allow(unused)]
+
+use ts_rs::TS;
+
+#[derive(TS)]
+#[ts(export)]
+struct State {
+    a: Result<EnumWithName, String>,
+    b: Result<EnumWithName, String>,
+}
+
+#[derive(TS)]
+#[ts(export)]
+struct StateInlined {
+    #[ts(inline)]
+    a: Result<EnumWithName, String>,
+    #[ts(inline)]
+    b: Result<EnumWithName, String>,
+}
+
+#[derive(TS)]
+#[ts(export)]
+struct StateInlinedVec {
+    #[ts(inline)]
+    a: Vec<Result<EnumWithName, String>>,
+    #[ts(inline)]
+    b: Vec<Result<EnumWithName, String>>,
+}
+
+#[derive(TS)]
+#[ts(export)]
+struct EnumWithName {
+    name: String,
+    inner: Enum
+}
+
+#[derive(TS)]
+#[ts(export)]
+enum Enum {
+    A,
+    B
+}
+
+#[test]
+fn issue_232() {
+    println!("{}", StateInlinedVec::export_to_string().unwrap());
+    assert_eq!(
+        StateInlined::export_to_string().unwrap(),
+        "// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.\n\
+        import type { Enum } from \"./Enum\";\n\
+        \n\
+        export type StateInlined = { \
+            a: { Ok : { name: string, inner: Enum, } } | { Err : string }, \
+            b: { Ok : { name: string, inner: Enum, } } | { Err : string }, \
+        };"
+    );
+    assert_eq!(
+        State::export_to_string().unwrap(),
+        "// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.\n\
+        import type { EnumWithName } from \"./EnumWithName\";\n\
+        \n\
+        export type State = { \
+            a: { Ok : EnumWithName } | { Err : string }, \
+            b: { Ok : EnumWithName } | { Err : string }, \
+        };"
+    );
+}