Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ fn main() {
destinations: [
TypeScript(
"./type_reflect/examples/declare_and_export/output/type_2.ts"
prefix: "import { Bar } from './bar.ts'",
prefix: "import { Bar } from './bar.ts';",
tab_size: 2,

),
Expand Down
78 changes: 0 additions & 78 deletions type_reflect/examples/declare_and_export/output/zod.ts

This file was deleted.

3 changes: 0 additions & 3 deletions type_reflect/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#![allow(incomplete_features)]
#![feature(specialization)]
#![feature(let_chains)]
pub use core::convert::AsRef;
use std::ffi::OsStr;
use type_reflect_macros;
Expand Down
37 changes: 18 additions & 19 deletions type_reflect/src/type_script/untagged_enum_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,12 @@ fn emit_tuple_case_type_name(
tuple_fields: &Vec<Type>,
parent_name: &str,
) -> String {
if let Some(field) = tuple_fields.first()
&& tuple_fields.len() == 1
{
to_ts_type(&field)
} else {
union_case_type_name(case, parent_name)
if let Some(field) = tuple_fields.first() {
if tuple_fields.len() == 1 {
return to_ts_type(&field);
}
}
union_case_type_name(case, parent_name)
}

fn emit_case_type(case: &EnumCase, parent_name: &str) -> String {
Expand Down Expand Up @@ -152,21 +151,21 @@ fn emit_tuple_case_type_contentns(
tuple_fields: &Vec<Type>,
parent_name: &str,
) -> String {
if let Some(field) = tuple_fields.first()
&& tuple_fields.len() == 1
{
to_ts_type(&field)
} else {
let members: Vec<String> = tuple_fields
.into_iter()
.map(|field| to_ts_type(&field))
.collect();
let members = members.join(", ");

ts_string! {
[ #members ]
if let Some(field) = tuple_fields.first() {
if tuple_fields.len() == 1 {
return to_ts_type(&field);
}
}

let members: Vec<String> = tuple_fields
.into_iter()
.map(|field| to_ts_type(&field))
.collect();
let members = members.join(", ");

ts_string! {
[ #members ]
}
}

fn emit_struct_case_type_contentns(case: &EnumCase, named_fields: &Vec<NamedField>) -> String {
Expand Down
2 changes: 0 additions & 2 deletions type_reflect_macros/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![allow(incomplete_features)]
#![feature(specialization)]
#![macro_use]
// #![deny(unused)]

Expand Down