Merge pull request #174 from darrell-roberts/swift-generic-constraints-2

allow defining generic type constraints for swift

cli/src/config.rs

@@ -34,6 +34,8 @@ pub struct SwiftParams {
     pub type_mappings: HashMap<String, String>,
     pub default_decorators: Vec<String>,
     pub default_generic_constraints: Vec<String>,
+    /// The contraints to apply to `CodableVoid`.
+    pub codablevoid_constraints: Vec<String>,
 }
 
 #[derive(Default, Serialize, Deserialize, PartialEq, Eq, Debug)]

cli/src/main.rs

@@ -146,6 +146,7 @@ fn language(
                 config.swift.default_generic_constraints,
             ),
             multi_file,
+            codablevoid_constraints: config.swift.codablevoid_constraints,
             ..Default::default()
         }),
         SupportedLanguage::Kotlin => Box::new(Kotlin {

core/data/tests/can_generate_generic_struct/output.swift

@@ -88,4 +88,4 @@ public enum CoreEnumUsingGenericStruct: Codable {
 }
 
 /// () isn't codable, so we use this instead to represent Rust's unit type
-public struct CodableVoid: Codable {}
+public struct CodableVoid: Codable, Equatable {}

core/data/tests/can_handle_unit_type/output.swift

@@ -46,4 +46,4 @@ public enum EnumHasVoidType: Codable {
 }
 
 /// () isn't codable, so we use this instead to represent Rust's unit type
-public struct CodableVoid: Codable {}
+public struct CodableVoid: Codable, Equatable {}

core/data/tests/generic_struct_with_constraints_and_decorators/input.rs

@@ -1,17 +1,26 @@
-#[typeshare(swift = "Equatable")]
-pub struct Button<T> {
+#[typeshare(
+    swift = "Equatable, Identifiable",
+    swiftGenericConstraints = "T: Equatable & SomeThingElse, V: Equatable"
+)]
+pub struct Button<T, V, I> {
     /// Label of the button
-    pub label: String,
+    pub label: I,
     /// Accessibility label if it needed to be different than label
     pub accessibility_label: Option<String>,
     /// Optional tooltips that provide extra explanation for a button
     pub tooltip: Option<String>,
     /// Button action if there one
     pub action: Option<T>,
     /// Icon if there is one
-    pub icon: Option<Icon>,
+    pub icon: Option<V>,
     /// Button state
     pub state: ButtonState,
     /// Button Mode
     pub style: ButtonStyle,
 }
+
+#[typeshare]
+pub struct ButtonState;
+
+#[typeshare]
+pub struct ButtonStyle;

core/data/tests/generic_struct_with_constraints_and_decorators/output.swift

@@ -1,22 +1,30 @@
 import Foundation
 
-public struct Button<T: Codable & Equatable>: Codable, Equatable {
+public struct ButtonState: Codable {
+	public init() {}
+}
+
+public struct ButtonStyle: Codable {
+	public init() {}
+}
+
+public struct Button<T: Codable & Equatable & SomeThingElse, V: Codable & Equatable, I: Codable>: Codable, Equatable, Identifiable {
 	/// Label of the button
-	public let label: String
+	public let label: I
 	/// Accessibility label if it needed to be different than label
 	public let accessibility_label: String?
 	/// Optional tooltips that provide extra explanation for a button
 	public let tooltip: String?
 	/// Button action if there one
 	public let action: T?
 	/// Icon if there is one
-	public let icon: Icon?
+	public let icon: V?
 	/// Button state
 	public let state: ButtonState
 	/// Button Mode
 	public let style: ButtonStyle
 
-	public init(label: String, accessibility_label: String?, tooltip: String?, action: T?, icon: Icon?, state: ButtonState, style: ButtonStyle) {
+	public init(label: I, accessibility_label: String?, tooltip: String?, action: T?, icon: V?, state: ButtonState, style: ButtonStyle) {
 		self.label = label
 		self.accessibility_label = accessibility_label
 		self.tooltip = tooltip

core/src/language/kotlin.rs

@@ -1,6 +1,6 @@
 use super::{Language, ScopedCrateTypes};
 use crate::language::SupportedLanguage;
-use crate::parser::{remove_dash_from_identifier, ParsedData};
+use crate::parser::{remove_dash_from_identifier, DecoratorKind, ParsedData};
 use crate::rust_types::{RustTypeFormatError, SpecialRustType};
 use crate::{
     rename::RenameExt,
@@ -169,7 +169,7 @@ impl Language for Kotlin {
                 writeln!(w)?;
             }
             write!(w, ")")?;
-            if let Some(kotlin_decorators) = rs.decorators.get(&SupportedLanguage::Kotlin) {
+            if let Some(kotlin_decorators) = rs.decorators.get(&DecoratorKind::Kotlin) {
                 let redacted_decorator = String::from(REDACTED_TO_STRING);
                 if kotlin_decorators.iter().any(|d| *d == redacted_decorator) {
                     writeln!(w, " {{")?;