Merge pull request #173 from darrell-roberts/swift-decorators-generics

Allow swift decorator constraints to apply to generics

Support CSharp

Create basic language implementation.
Start adding tests.

Add snapshot tests

Update slice type to map to IEnumerable instead of Array.
Drop support for Unit type and return an error.

Support anonymous structs

Update slice of user type test snapshot

Support namespace option

Support serialization with json attributes

Remove EnumLabel and use EnumMember attribute instead.
Update all test snapshots according to the new changes.

C# without naming convention option

Add required attribute

For newtonsoft json to require a non optional property, the property has
to have the required attribute. Otherwise, it allows it to be null and a
default value is provided.

Author: charlespierce

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Version 1.10.0-beta
 
+## 1.10.0-beta.5
+
+- Added support for Swift generic constraints via `#[typeshare(swiftGenericConstraints)]` [#174](https://github.com/1Password/typeshare/pull/174)
+- Added Swift config option for defining constraints on `CodableVoid` generated type [#174](https://github.com/1Password/typeshare/pull/174)
+
 ## 1.10.0-beta.4
 
 Fixed a bug involving `#[typeshare(skip)]` on fields in struct variants of enums.
@@ -14,7 +19,7 @@ This release brings support for multiple file generation, allowing splitting gen
 files when used in large projects. This can dramatically increase compilation speed of
 the generated files and increase maintainability.
 
-This is a *pre-release* version which may have bugs or break compatibility.
+This is a _pre-release_ version which may have bugs or break compatibility.
 
 - Multiple file output [#166](https://github.com/1Password/typeshare/pull/166)
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "typeshare-cli"
-version = "1.10.0-beta.4"
+version = "1.10.0-beta.5"
 edition = "2021"
 description = "Command Line Tool for generating language files with typeshare"
 license = "MIT OR Apache-2.0"
@@ -22,5 +22,5 @@ once_cell = "1"
 rayon = "1.10"
 serde = { version = "1", features = ["derive"] }
 toml = "0.8"
-typeshare-core = { path = "../core", version = "1.10.0-beta.4" }
+typeshare-core = { path = "../core", version = "1.10.0-beta.5" }
 anyhow = "1"

cli/Cargo.toml

@@ -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/config.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 {

cli/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "typeshare-core"
-version = "1.10.0-beta.4"
+version = "1.10.0-beta.5"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 description = "The code generator used by Typeshare's command line tool"

core/Cargo.toml

@@ -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_generate_generic_struct/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/can_handle_unit_type/output.swift

@@ -0,0 +1,26 @@
+#[typeshare(
+    swift = "Equatable, Identifiable",
+    swiftGenericConstraints = "T: Equatable & SomeThingElse, V: Equatable"
+)]
+pub struct Button<T, V, I> {
+    /// Label of the button
+    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<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/input.rs

@@ -0,0 +1,36 @@
+import Foundation
+
+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: 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: V?
+	/// Button state
+	public let state: ButtonState
+	/// Button Mode
+	public let 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
+		self.action = action
+		self.icon = icon
+		self.state = state
+		self.style = style
+	}
+}