Skip to content
Merged
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
8 changes: 7 additions & 1 deletion src/to_typescript/structs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ pub fn process_fields<'a>(
let has_flatten_attr = utils::get_attribute_arg("serde", "flatten", &field.attrs).is_some();
let serde_skip = utils::get_attribute_arg("serde", "skip", &field.attrs).is_some();
let serde_rename = utils::get_attribute_arg("serde", "rename", &field.attrs);
let type_override = utils::get_attribute_arg("tsync", "ts_type", &field.attrs);
if has_flatten_attr || serde_skip {
continue;
}
Expand All @@ -123,7 +124,12 @@ pub fn process_fields<'a>(
field.ident.map(|i| i.unraw().to_string()).unwrap()
};

let field_type = convert_type(&field.ty);
let mut field_type = convert_type(&field.ty);

if let Some(type_override) = type_override {
field_type.ts_type = type_override
}

state.types.push_str(&format!(
"{space}{field_name}{optional_parameter_token}: {field_type};\n",
space = space,
Expand Down
7 changes: 7 additions & 0 deletions test/issue-34/rust.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#[tsync]
struct SomeStruct {
#[serde(skip)]
foo: ThisIsARandomExternalType,
#[tsync(ts_type = "any")]
foo2: ThisIsARandomExternalType,
}
8 changes: 8 additions & 0 deletions test/issue-34/tsync.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

cd $SCRIPT_DIR

cargo run -- -i rust.rs -o typescript.d.ts
cargo run -- -i rust.rs -o typescript.ts
5 changes: 5 additions & 0 deletions test/issue-34/typescript.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* This file is generated and managed by tsync */

interface SomeStruct {
foo2: any;
}
5 changes: 5 additions & 0 deletions test/issue-34/typescript.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* This file is generated and managed by tsync */

export interface SomeStruct {
foo2: any;
}
1 change: 1 addition & 0 deletions test/test_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ cd $SCRIPT_DIR
./enum_numeric/tsync.sh
./doc_comments/tsync.sh
./generic/tsync.sh
./issue-34/tsync.sh
./issue-42-serde-rename/tsync.sh
./issue-43/tsync.sh
./issue-55/tsync.sh
Expand Down