fixes #60 - nesting of options

specta-rs · Apr 24, 2023 · 216cf15 · 216cf15
1 parent 32d7de4
commit 216cf15
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/lang/ts/mod.rs b/src/lang/ts/mod.rs
@@ -151,7 +151,15 @@ fn datatype_inner(ctx: ExportContext, typ: &DataType) -> Result<String, TsExport
             }
         }
         DataType::Literal(literal) => literal.to_ts(),
-        DataType::Nullable(def) => format!("{} | null", datatype_inner(ctx, def)?),
+        DataType::Nullable(def) => {
+            let dt = datatype_inner(ctx, def)?;
+
+            if dt.ends_with(" | null") {
+                dt
+            } else {
+                format!("{dt} | null",)
+            }
+        }
         DataType::Record(def) => {
             let divider = match &def.0 {
                 DataType::Enum(_) => " in",

diff --git a/tests/ts.rs b/tests/ts.rs
@@ -160,6 +160,9 @@ fn typescript_types() {
     // https://github.com/oscartbeaumont/specta/issues/65
     assert_ts!(HashMap<BasicEnum, ()>, r#"{ [key in "A" | "B"]: null }"#);
 
+    // https://github.com/oscartbeaumont/specta/issues/60
+    assert_ts!(Option<Option<Option<Option<i32>>>>, r#"number | null"#);
+
     // assert_ts_export!(DeprecatedType, "");
     // assert_ts_export!(DeprecatedTypeWithMsg, "");
     // assert_ts_export!(DeprecatedFields, "");