Fix generic impl (#281)

* Fix rename impl for generics
* Add regression test

CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### Fixes
 
+- Macro expansion for types with generic parameters now works without the `TS` trait in scope ([#281](https://github.com/Aleph-Alpha/ts-rs/pull/281))
+
 # v8.0.0
 
 ### Breaking

macros/src/attr/struct.rs

@@ -3,9 +3,8 @@ use std::collections::HashMap;
 use syn::{parse_quote, Attribute, Ident, Path, Result, Type, WherePredicate};
 
 use super::{parse_assign_from_str, parse_bound, parse_concrete};
-use crate::attr::EnumAttr;
 use crate::{
-    attr::{parse_assign_str, Inflection, VariantAttr},
+    attr::{parse_assign_str, EnumAttr, Inflection, VariantAttr},
     utils::{parse_attrs, parse_docs},
 };
 

macros/src/lib.rs

@@ -140,6 +140,7 @@ impl DerivedTS {
     /// impl ts_rs::TS for B { /* .. */ }
     /// ```
     fn generate_generic_types(&self, generics: &Generics) -> TokenStream {
+        let crate_rename = &self.crate_rename;
         let generics = generics
             .type_params()
             .filter(|ty| !self.concrete.contains_key(&ty.ident))
@@ -154,7 +155,7 @@ impl DerivedTS {
                         write!(f, "{:?}", self)
                     }
                 }
-                impl TS for #generics {
+                impl #crate_rename::TS for #generics {
                     type WithoutGenerics = #generics;
                     fn name() -> String { stringify!(#generics).to_owned() }
                     fn inline() -> String { panic!("{} cannot be inlined", Self::name()) }

ts-rs/src/lib.rs

@@ -138,11 +138,11 @@ pub use ts_rs_macros::TS;
 pub use crate::export::ExportError;
 use crate::typelist::TypeList;
 
-#[cfg(feature = "serde-json-impl")]
-mod serde_json;
 #[cfg(feature = "chrono-impl")]
 mod chrono;
 mod export;
+#[cfg(feature = "serde-json-impl")]
+mod serde_json;
 pub mod typelist;
 
 /// A type which can be represented in TypeScript.  

ts-rs/tests/generic_without_import.rs

@@ -0,0 +1,6 @@
+#![allow(dead_code)]
+
+#[derive(ts_rs::TS)]
+struct Test<T> {
+    field: T,
+}

ts-rs/tests/serde_json.rs

@@ -61,5 +61,5 @@ fn inlined_value() {
 #[derive(TS)]
 #[ts(export, export_to = "serde_json_impl/")]
 struct Simple {
-    json: serde_json::Value
+    json: serde_json::Value,
 }