add support for structs with custom init

Author: David Scheutz

Binaries/Sourcery.artifactbundle/sourcery-2.1.7/Templates/SwiftCopy.stencil

@@ -30,67 +30,96 @@ public enum OptionalCopy<T> {
     }
 }
 
+{% macro funcParameter type property isLast %}
+        {% ifnot property.isOptional %}
+        {{ property.name }}: {{ property.typeName }}? = nil{% ifnot isLast %}, {% endif %}
+        {% else %}
+        {{ property.name }}: {{ type.name }}OptionalCopy<{{ property.typeName.unwrappedTypeName }}> = .noChange{% ifnot isLast %}, {% endif %}
+        {% endif %}
+{% endmacro %}
+
+{% macro initParameter type property isLast %}
+            {% ifnot property.isOptional %}
+            {{ property.name }}: {{ property.name }} ?? self.{{ property.name }}{% ifnot isLast %}, {% endif %}
+            {% else %}
+            {{ property.name }}: {{ property.name }}.update(using: self.{{ property.name }}){% ifnot isLast %}, {% endif %}
+            {% endif %}
+{% endmacro %}
+
+{% macro iterate type generate %}
+    {% if type.allMethods|initializer|count == 0 %}
+        {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" and property.defaultValue == nil %}
+            {% call generate type property forloop.last %}
+        {% endfor %}
+    {% endif %}
+    
+    {% for initializer in type.allMethods|initializer %}
+        {% for parameter in initializer.parameters %}
+            {% call generate type parameter forloop.last %}
+        {% endfor %}
+    {% endfor %}
+{% endmacro %}
+
 import SwiftUI
 
 {% for type in types.based.Copyable %}
 {% if type.variables.count > 0 %}
 {% call includeImports type %}
-    
+
 // MARK: {{ type.name }} - Copy
 
 extension {{ type.name }} {
     public typealias {{ type.name }}OptionalCopy<T> = OptionalCopy<T>
 
     public func copy(
-        {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" and property.defaultValue == nil %}
-        
-        {% ifnot property.isOptional %}
-        {{ property.name }}: {{ property.typeName }}? = nil{% ifnot forloop.last %}, {% endif %}
-        {% else %}
-        {{ property.name }}: {{ type.name }}OptionalCopy<{{ property.typeName.unwrappedTypeName }}> = .noChange{% ifnot forloop.last %}, {% endif %}
-        {% endif %}
-        {% endfor %}
+        {% call iterate type funcParameter %}
     ) -> {{ type.name }} {
         return {{ type.name }}(
-            {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" and property.defaultValue == nil %}
-            {% ifnot property.isOptional %}
-            {{ property.name }}: {{ property.name }} ?? self.{{ property.name }}{% ifnot forloop.last %}, {% endif %}
-            {% else %}
-            {{ property.name }}: {{ property.name }}.update(using: self.{{ property.name }}){% ifnot forloop.last %}, {% endif %}
-            {% endif %}
-            {% endfor %}
+            {% call iterate type initParameter %}
         )
     }
 }
 
+{% macro privateValueCheck type property isLast %}
+            {% if property.isOptional %}
+            true {% ifnot forloop.last %} &&{% endif %} // optional '{{ property.name }}' not required to check
+            {% else %}
+            _{{ property.name }} != nil {% ifnot forloop.last %} &&{% endif %}
+            {% endif %}
+{% endmacro %}
+
+{% macro privateInitAssignment type property isLast %}
+                {{ property.name }}: _{{ property.name }}{% ifnot forloop.last %}, {% endif %}
+{% endmacro %}
+
 // MARK: {{ type.name }} - Builder
 
-extension {{ type.name }} {
-    final class Builder: ObservableObject {
-        let objectDidChange = PassthroughSubject<Void, Never>()
-    
-    {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" and property.defaultValue == nil %}
+{% macro builderSetter type property isLast %}
         private var _{{ property.name }}: {{ property.typeName }}{% ifnot property.isOptional %}!{% endif %} {
             willSet { objectWillChange.send() }
             didSet { objectDidChange.send() }
         }
-    
+
         var {{ property.name }}: {{ property.typeName }}{% ifnot property.isOptional %}?{% endif %} {
             get { _{{ property.name }} }
             set { _{{ property.name }} = newValue }
         }
-    
+
         @discardableResult
         func with({{ property.name }}: {{ property.typeName }}) -> Self {
             _{{ property.name }} = {{ property.name }}
             return self
         }
-    {% endfor %}
+{% endmacro %}
+
+extension {{ type.name }} {
+    final class Builder: ObservableObject {
+        let objectDidChange = PassthroughSubject<Void, Never>()
+    
+        {% call iterate type builderSetter %}
 
         func readyToBuild() -> Bool {
-    {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" and property.defaultValue == nil and       property.isOptional == false %}
-            _{{ property.name }} != nil{% ifnot forloop.last %} &&{% endif %}
-    {% endfor %}
+            {% call iterate type privateValueCheck %}
         }
 
         func buildSafely() throws -> {{ type.name }} {
@@ -103,9 +132,7 @@ extension {{ type.name }} {
 
         func build() -> {{ type.name }} {
             {{ type.name }}(
-            {%- for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" and property.defaultValue == nil %}
-            {{ property.name }}: _{{ property.name }}{% ifnot forloop.last %}, {% endif %}
-            {% endfor -%}
+                {% call iterate type privateInitAssignment %}
             )
         }
     }
@@ -115,31 +142,23 @@ extension {{ type.name }} {
 
 import Combine
 
-{% macro assignProperties type source %}
-    {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" %}
-        _{{ property.name }} = {{ source }}.{{ property.name }}
-    {% endfor %}
+{% macro privateAssignment type property isLast %}
+                {{ property.name }}: _{{ property.name }}{% ifnot forloop.last %}, {% endif %}
 {% endmacro %}
 
-extension {{ type.name }} {
-
-    protocol Changeable: ObservableObject {
-        {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" %}
+{% macro protocolMembers type property isLast %}
         var {{ property.name }}: {{ property.typeName }} { get set }
-        {% endfor %}
-    }
-    
-    func updater() -> Updater {
-        .init({{ type.name|lowerFirstLetter }}: self)
-    }
+{% endmacro %}
 
-    final class Updater: Changeable {
-        private let initial: {{ type.name }}
-        private var notifyUpdates = true
-    
-        let objectDidChange = PassthroughSubject<Void, Never>()
-    
-    {% for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" %}
+{% macro sourceAssignment type property isLast %}
+            _{{ property.name }} = {{ type.name|lowerFirstLetter }}.{{ property.name }}
+{% endmacro %}
+
+{% macro assignProperties type %}
+    {% call iterate type sourceAssignment %}
+{% endmacro %}
+
+{% macro updaterSetter type property isLast %}
         private var _{{ property.name }}: {{ property.typeName }} {
             willSet { if notifyUpdates { objectWillChange.send() } }
             didSet { if notifyUpdates { objectDidChange.send() } }
@@ -155,11 +174,29 @@ extension {{ type.name }} {
             _{{ property.name }} = {{ property.name }}
             return self
         }
-    {% endfor %}
+{% endmacro %}
+
+extension {{ type.name }} {
+
+    protocol Changeable: ObservableObject {
+        {% call iterate type protocolMembers %}
+    }
+    
+    func updater() -> Updater {
+        .init({{ type.name|lowerFirstLetter }}: self)
+    }
+
+    final class Updater: Changeable {
+        private let initial: {{ type.name }}
+        private var notifyUpdates = true
+    
+        let objectDidChange = PassthroughSubject<Void, Never>()
+    
+        {% call iterate type updaterSetter %}
 
         init({{ type.name|lowerFirstLetter }}: {{ type.name }}) {
             self.initial = {{ type.name|lowerFirstLetter }}
-            {% call assignProperties type type.name|lowerFirstLetter %}
+            {% call assignProperties type %}
         }
 
     {% if type.based.Equatable %}
@@ -172,7 +209,7 @@ extension {{ type.name }} {
             notifyUpdates = false
             objectWillChange.send()
 
-            {% call assignProperties type type.name|lowerFirstLetter %}
+            {% call assignProperties type %}
 
             notifyUpdates = true
             objectDidChange.send()
@@ -184,9 +221,7 @@ extension {{ type.name }} {
 
         func build() -> {{ type.name }} {
             {{ type.name }}(
-                {%- for property in type.variables|instance|!computed where property.readAccess != "private" and property.readAccess != "fileprivate" %}
-                {{ property.name }}: _{{ property.name }}{% ifnot forloop.last %}, {% endif %}
-                {% endfor -%}
+                {% call iterate type privateInitAssignment %}
             )
         }
     }

SwiftCopyDemo/SwiftCopyDemo/Models.swift

@@ -23,9 +23,12 @@ struct User2: Equatable, Copyable {
 
 struct User3: Equatable, Copyable {
     let id: Int
-
+    /// This should not generate a copy function because this property can't be assigned via constructor
+    let hash: String
+    
     init(id: Int) {
         self.id = id
+        hash = "\(id.hashValue)"
     }
 
     /// This should not generate a copy function because it's a private property