fixes #66

specta-rs · Apr 24, 2023 · 78c07c7 · 78c07c7
1 parent 7b970f1
commit 78c07c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/lang/ts/mod.rs b/src/lang/ts/mod.rs
@@ -161,7 +161,14 @@ fn datatype_inner(ctx: ExportContext, typ: &DataType) -> Result<String, TsExport
             )
         }
         // We use `T[]` instead of `Array<T>` to avoid issues with circular references.
-        DataType::List(def) => format!("{}[]", datatype_inner(ctx, def)?),
+        DataType::List(def) => {
+            let dt = datatype_inner(ctx, def)?;
+            if dt.contains(' ') {
+                format!("({dt})[]")
+            } else {
+                format!("{dt}[]")
+            }
+        }
         DataType::Named(NamedDataType {
             name,
             item: NamedDataTypeItem::Tuple(TupleType { fields, .. }),

diff --git a/tests/ts.rs b/tests/ts.rs
@@ -153,6 +153,9 @@ fn typescript_types() {
     // assert_ts!(() => ..5, r#"{ end: 5 }"#);
     // assert_ts!(() => ..=5, r#"{ end: 5 }"#);
 
+    // https://github.com/oscartbeaumont/specta/issues/66
+    assert_ts!([Option<u8>; 16], r#"(number | null)[]"#);
+
     // assert_ts_export!(DeprecatedType, "");
     // assert_ts_export!(DeprecatedTypeWithMsg, "");
     // assert_ts_export!(DeprecatedFields, "");

diff --git a/tests/ts_rs/generics.rs b/tests/ts_rs/generics.rs
@@ -116,7 +116,7 @@ fn generic_struct() {
 
     assert_ts_export!(
         GenericStruct2::<()>,
-        "export type GenericStruct2<T> = { a: T; b: [T, T]; c: [T, [T, T]]; d: T[]; e: [T, T][]; f: T[]; g: T[][]; h: [T, T][][] }"
+        "export type GenericStruct2<T> = { a: T; b: [T, T]; c: [T, [T, T]]; d: T[]; e: ([T, T])[]; f: T[]; g: T[][]; h: (([T, T])[])[] }"
     )
 }