Derive Default on structs

Cargo.toml

@@ -91,6 +91,7 @@ serde_qs = "0.8"
 smol_str = "0.1"
 surf = { version = "2.1", optional = true }
 tokio = { version = "1.2", optional = true }
+smart-default = "0.6.0"
 
 # webhook support
 hmac = { version = "0.12", optional = true }

openapi/src/main.rs

@@ -119,7 +119,7 @@ fn main() -> Result<()> {
                 meta.schema_to_id_type(schema).unwrap_or_else(|| ("()".into(), CopyOrClone::Copy));
             let struct_type = meta.schema_to_rust_type(schema);
             out.push_str(&format!("#[cfg(not(feature = \"{}\"))]\n", feature));
-            out.push_str("#[derive(Clone, Debug, Deserialize, Serialize)]\n");
+            out.push_str("#[derive(Clone, Debug, Default, Deserialize, Serialize)]\n");
             out.push_str(&format!("pub struct {} {{\n", struct_type));
             out.push_str(&format!("\tpub id: {},\n", id_type));
             out.push_str("}\n\n");
@@ -380,7 +380,7 @@ fn gen_struct(
         out.push_str(&doc_url);
         out.push_str(">\n");
     }
-    out.push_str("#[derive(Clone, Debug, Deserialize, Serialize)]\n");
+    out.push_str("#[derive(Clone, Debug, Default, Deserialize, Serialize)]\n");
     out.push_str("pub struct ");
     out.push_str(&struct_name);
     out.push_str(" {\n");
@@ -511,7 +511,7 @@ fn gen_generated_schemas(
     {
         let struct_name = meta.schema_to_rust_type(&schema_name);
         out.push('\n');
-        out.push_str("#[derive(Clone, Debug, Deserialize, Serialize)]\n");
+        out.push_str("#[derive(Clone, Debug, Default, Deserialize, Serialize)]\n");
         out.push_str("pub struct ");
         out.push_str(&struct_name);
         out.push_str(" {\n");
@@ -1084,7 +1084,7 @@ fn gen_emitted_structs(
                 }
             };
             out.push('\n');
-            out.push_str("#[derive(Clone, Debug, Deserialize, Serialize)]\n");
+            out.push_str("#[derive(Clone, Debug, Default, Deserialize, Serialize)]\n");
             out.push_str("pub struct ");
             out.push_str(&struct_name.to_camel_case());
             out.push_str(" {\n");
@@ -1141,6 +1141,25 @@ fn gen_unions(out: &mut String, state: &mut Generated, meta: &Metadata) {
             out.push_str("),\n");
         }
         out.push_str("}\n");
+
+        if let Some(first) = union_
+            .schema_variants
+            .iter()
+            .filter_map(|var| match var.trim() {
+                "" => None,
+                n => Some(n),
+            })
+            .map(|s| gen_variant_name(&s, meta))
+            .next()
+        {
+            out.push_str("impl std::default::Default for ");
+            out.push_str(&union_name.to_camel_case());
+            out.push_str(" {\n");
+            out.push_str("    fn default() -> Self {\n");
+            out.push_str(&format!("        Self::{}(Default::default())\n", first));
+            out.push_str("    }\n");
+            out.push_str("}\n");
+        }
     }
 }
 
@@ -1175,7 +1194,7 @@ fn gen_enums(out: &mut String, state: &mut Generated, meta: &Metadata) {
             if wire_name.trim().is_empty() {
                 continue;
             }
-            let variant_name = gen_variant_name(&wire_name.as_str(), meta);
+            let variant_name = gen_variant_name(&wire_name, meta);
             if variant_name.trim().is_empty() {
                 panic!("unhandled enum variant: {:?}", wire_name)
             }
@@ -1199,7 +1218,7 @@ fn gen_enums(out: &mut String, state: &mut Generated, meta: &Metadata) {
             if wire_name.trim().is_empty() {
                 continue;
             }
-            let variant_name = gen_variant_name(&wire_name.as_str(), meta);
+            let variant_name = gen_variant_name(&wire_name, meta);
             out.push_str("            ");
             out.push_str(&enum_name);
             out.push_str("::");
@@ -1227,6 +1246,25 @@ fn gen_enums(out: &mut String, state: &mut Generated, meta: &Metadata) {
         out.push_str("        self.as_str().fmt(f)\n");
         out.push_str("    }\n");
         out.push_str("}\n");
+
+        if let Some(first) = enum_
+            .options
+            .iter()
+            .filter_map(|var| match var.trim() {
+                "" => None,
+                n => Some(n),
+            })
+            .map(|s| gen_variant_name(&s, meta))
+            .next()
+        {
+            out.push_str("impl std::default::Default for ");
+            out.push_str(&enum_name);
+            out.push_str(" {\n");
+            out.push_str("    fn default() -> Self {\n");
+            out.push_str(&format!("        Self::{}\n", first));
+            out.push_str("    }\n");
+            out.push_str("}\n");
+        }
     }
 }
 

src/ids.rs

@@ -1,3 +1,5 @@
+use smart_default::SmartDefault;
+
 macro_rules! def_id_serde_impls {
     ($struct_name:ident) => {
         impl serde::Serialize for $struct_name {
@@ -24,7 +26,7 @@ macro_rules! def_id_serde_impls {
 
 macro_rules! def_id {
     ($struct_name:ident: String) => {
-        #[derive(Clone, Debug, Eq, PartialEq, Hash)]
+        #[derive(Clone, Debug, Default, Eq, PartialEq, Hash)]
         pub struct $struct_name(smol_str::SmolStr);
 
         impl $struct_name {
@@ -117,7 +119,7 @@ macro_rules! def_id {
         ///
         /// This type _typically_ will not allocate and
         /// therefore is usually cheaply clonable.
-        #[derive(Clone, Debug, Eq, PartialEq, Hash)]
+        #[derive(Clone, Debug, Default, Eq, PartialEq, Hash)]
         pub struct $struct_name(smol_str::SmolStr);
 
         impl $struct_name {
@@ -268,6 +270,12 @@ macro_rules! def_id {
             }
         }
 
+        impl std::default::Default for $enum_name {
+            fn default() -> Self {
+                $enum_name::None
+            }
+        }
+
         impl std::str::FromStr for $enum_name {
             type Err = ParseIdError;
 
@@ -318,10 +326,11 @@ macro_rules! def_id {
             }
         )*
     };
-    (enum $enum_name:ident { $( $variant_name:ident($($variant_type:tt)*) ),* $(,)* }) => {
+    (enum $enum_name:ident { $( $(#[$test:meta])? $variant_name:ident($($variant_type:tt)*) ),+ $(,)? }) => {
         #[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+        #[derive(SmartDefault)]
         pub enum $enum_name {
-            $( $variant_name($($variant_type)*), )*
+            $( $(#[$test])* $variant_name($($variant_type)*), )*
         }
 
         impl $enum_name {
@@ -487,6 +496,7 @@ def_id!(InvoiceLineItemIdWebhook, "il_");
 
 def_id!(
     enum InvoiceLineItemId {
+        #[default]
         Item(InvoiceItemId),
         Subscription(SubscriptionLineId),
         InvoiceLineItemIdWebhook(InvoiceLineItemIdWebhook),
@@ -505,6 +515,7 @@ def_id!(PaymentLinkId: String);
 def_id!(PaymentMethodId, "pm_" | "card_" | "src_" | "ba_");
 def_id!(
     enum PaymentSourceId {
+        #[default]
         Account(AccountId),
         AlipayAccount(AlipayAccountId),
         BankAccount(BankAccountId),
@@ -515,6 +526,7 @@ def_id!(
 def_id!(PayoutId, "po_");
 def_id!(
     enum PayoutDestinationId {
+        #[default]
         BankAccount(BankAccountId),
         Card(CardId),
     }
@@ -543,6 +555,7 @@ def_id!(TaxCodeId, "txcd_");
 def_id!(TaxRateId, "txr_");
 def_id!(
     enum TokenId {
+        #[default]
         Card(CardTokenId),
         Bank(BankTokenId),
     }

src/params.rs

@@ -76,7 +76,7 @@ pub enum Expandable<T: Object> {
 impl<T> Expandable<T>
 where
     T: Object,
-    T::Id: Clone,
+    T::Id: Clone + Default,
 {
     pub fn id(&self) -> T::Id {
         match self {
@@ -86,6 +86,15 @@ where
     }
 }
 
+impl<T: Object> Default for Expandable<T>
+where
+    T::Id: Default,
+{
+    fn default() -> Self {
+        Expandable::Id(Default::default())
+    }
+}
+
 impl<T: Object> Expandable<T> {
     pub fn is_object(&self) -> bool {
         match self {

src/resources.rs

@@ -171,6 +171,7 @@ pub use {
         invoice_payment_method_options_acss_debit::*,
         invoice_payment_method_options_bancontact::*,
         invoice_payment_method_options_card::*,
+        invoice_payment_method_options_konbini::*,
         invoiceitem::*,
         line_item::*,
         plan::*,

src/resources/balance_transaction_ext.rs

@@ -82,6 +82,12 @@ impl std::fmt::Display for BalanceTransactionStatus {
     }
 }
 
+impl std::default::Default for BalanceTransactionStatus {
+    fn default() -> Self {
+        Self::Pending
+    }
+}
+
 /// An enum representing the possible values of an `Fee`'s `type` field.
 #[derive(Copy, Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(rename_all = "snake_case")]
@@ -112,3 +118,9 @@ impl std::fmt::Display for FeeType {
         self.as_str().fmt(f)
     }
 }
+
+impl std::default::Default for FeeType {
+    fn default() -> Self {
+        FeeType::ApplicationFee
+    }
+}

src/resources/card.rs

@@ -25,6 +25,12 @@ pub enum CardBrand {
     Unknown,
 }
 
+impl std::default::Default for CardBrand {
+    fn default() -> Self {
+        Self::Unknown
+    }
+}
+
 #[derive(Copy, Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub enum CardType {
     #[serde(rename = "credit")]
@@ -41,3 +47,9 @@ pub enum CardType {
     #[serde(rename = "unknown")]
     Unknown,
 }
+
+impl std::default::Default for CardType {
+    fn default() -> Self {
+        Self::Unknown
+    }
+}

src/resources/generated.rs

@@ -67,6 +67,7 @@ pub mod billing {
     pub mod invoice_payment_method_options_acss_debit;
     pub mod invoice_payment_method_options_bancontact;
     pub mod invoice_payment_method_options_card;
+    pub mod invoice_payment_method_options_konbini;
     pub mod invoiceitem;
     pub mod line_item;
     pub mod plan;