Pr/1124

sea-orm-cli/src/cli.rs

@@ -236,7 +236,7 @@ pub enum GenerateSubcommands {
             long,
             use_value_delimiter = true,
             takes_value = true,
-            help = "Add extra derive macros to generated model structs (comma separated), ex. `ts_rs::Ts`"
+            help = "Add extra derive macros to generated model structs (comma separated), ex. `--derives 'ts_rs::Ts'`"
         )]
         derives: Vec<String>,
 
@@ -245,7 +245,7 @@ pub enum GenerateSubcommands {
             long,
             use_value_delimiter = true,
             takes_value = true,
-            help = r#"Add extra attributes to generated model struct, no need for `#[]` (comma separated), ex. `-- attributes "serde(rename_all = \"camelCase\")","ts(export)"`"#
+            help = r#"Add extra attributes to generated model struct, no need for `#[]` (comma separated), ex. `--attributes 'serde(rename_all = "camelCase")','ts(export)'`"#
         )]
         attributes: Vec<String>,
     },

sea-orm-codegen/src/entity/writer.rs

@@ -83,27 +83,20 @@ fn bonus_derive(derives: Vec<String>) -> TokenStream {
     derives
         .into_iter()
         .fold(TokenStream::default(), |derives, derive| {
-            if !derive.is_empty() {
-                let tokens: TokenStream = derive.parse().unwrap();
-                quote! { #derives, #tokens }
-            } else {
-                derives
-            }
+            let tokens: TokenStream = derive.parse().unwrap();
+            quote! { #derives, #tokens }
         })
 }
 
 /// convert attributes argument to token stream
 fn bonus_attributes(attributes: Vec<String>) -> TokenStream {
-    println!("{:?}", attributes);
     attributes
         .into_iter()
-        .filter(|attr| !attr.is_empty())
-        .map(|attr| format!("#[{attr}]"))
         .fold(TokenStream::default(), |attributes, attribute| {
             let tokens: TokenStream = attribute.parse().unwrap();
             quote! {
                 #attributes
-                #tokens
+                #[#tokens]
             }
         })
 }