member wiseInit upgrade

Author: winddpan

Sources/CodableWrapperMacros/Codable.swift

@@ -45,7 +45,7 @@ public struct Codable: ExtensionMacro, MemberMacro {
             return [decoder, encoder]
         } else {
             let memberwiseInit = try propertyContainer.genMemberwiseInit(config: .init(isOverride: false))
-            return [decoder, encoder, memberwiseInit]
+            return [decoder, encoder] + memberwiseInit
         }
     }
 }

Sources/CodableWrapperMacros/ModelMemberPropertyContainer.swift

@@ -148,26 +148,52 @@ struct ModelMemberPropertyContainer {
         return encoder
     }
 
-    func genMemberwiseInit(config: GenConfig) throws -> DeclSyntax {
+    func genMemberwiseInit(config: GenConfig) throws -> [DeclSyntax] {
+        var allHasInitializerExpr = true
         let parameters = memberProperties.map { property in
             var text = property.name
             text += ": " + property.type
             if let initializerExpr = property.initializerExpr {
                 text += "= \(initializerExpr)"
             } else if property.isOptional {
                 text += "= nil"
+            } else {
+                allHasInitializerExpr = false
             }
             return text
         }
 
         let overrideInit = config.isOverride ? "super.init()\n" : ""
 
-        return
-            """
-            \(raw: attributesPrefix(option: [.public]))init(\(raw: parameters.joined(separator: ", "))) {
-                \(raw: overrideInit)\(raw: memberProperties.map { "self.\($0.name) = \($0.name)" }.joined(separator: "\n"))
+        var inits: [DeclSyntax] = []
+
+        let initArgs = """
+        \(raw: attributesPrefix(option: [.public]))init(\n\(raw: parameters.joined(separator: ", \n"))\n) {
+            \(raw: overrideInit)\(raw: memberProperties.map { "self.\($0.name) = \($0.name)" }.joined(separator: "\n"))
+        }
+        """ as DeclSyntax
+        inits.append(initArgs)
+
+        if allHasInitializerExpr {
+            let argsInit = memberProperties.map { property in
+                var text = "self.\(property.name)"
+                if let initializerExpr = property.initializerExpr {
+                    text += " = \(initializerExpr)"
+                } else if property.isOptional {
+                    text += " = nil"
+                }
+                return text
+            }
+
+            let initDecl = """
+            \(raw: attributesPrefix(option: [.public]))init() {
+                \(raw: overrideInit)\(raw: argsInit.joined(separator: "\n"))
             }
             """ as DeclSyntax
+            inits.append(initDecl)
+        }
+
+        return inits
     }
 }