Fix generating initialiser when variable has fileprivate access level and create separate test data target

Author: alschmut

Package.swift

@@ -21,7 +21,8 @@ let package = Package(
             ]
         ),
         .target(name: "Buildable", dependencies: ["BuildableMacro"]),
-        .executableTarget(name: "BuildableClient", dependencies: ["Buildable"]),
+        .target(name: "BuildableClientTestData", dependencies: ["Buildable"]),
+        .executableTarget(name: "BuildableClient", dependencies: ["Buildable", "BuildableClientTestData"]),
         .testTarget(
             name: "BuildableMacroTests",
             dependencies: [

Sources/BuildableClient/main.swift

@@ -1,5 +1,6 @@
 import Buildable
 import Foundation
+import BuildableClientTestData
 
 @Buildable
 public struct MyObject {
@@ -97,3 +98,5 @@ public struct Address: Sendable {}
 let anyPerson = PersonBuilder().build()
 let max = PersonBuilder(name: "Max", favouriteSeason: .summer).build()
 let appState = AppStateBuilder(persons: [max]).build()
+
+let myObject = MyObjectBuilder().build()

Sources/BuildableClientTestData/TestData.swift

@@ -0,0 +1,51 @@
+import Buildable
+import Foundation
+
+@Buildable
+public struct MyObject {
+    let m01: String
+    let m02: Int
+    let m03: Int8
+    let m04: Int16
+    let m05: Int32
+    let m06: Int64
+    let m07: UInt
+    let m08: UInt8
+    let m09: UInt16
+    let m10: UInt32
+    let m11: UInt64
+    let m12: Bool
+    let m13: Double
+    let m14: Float
+    let m15: Date
+    let m16: UUID
+    let m17: Data
+    let m18: URL
+    let m19: CGFloat
+    let m20: CGPoint
+    let m21: CGRect
+    let m22: CGSize
+    let m23: CGVector
+    let m24: String?
+    let m25: String!
+    let m26: [String]
+    let m27: [String: String]
+    var m28: String
+    let m29: () -> Void
+    let m30: (() -> Void)?
+    let m31: (() -> Void)!
+    let m32: (String) -> Void
+    let m33: ((String) -> Void)?
+    let m34: (String, Int) -> Void
+    let m35: (String, Int) -> String
+    var myEnum: MyEnum
+}
+
+@MainActor
+let abc = MyObjectBuilder().build()
+
+@Buildable
+public enum MyEnum {
+    case `none`
+    case myCase
+}

Sources/BuildableMacro/StructAndClass/Helper/ExtractMembers.swift

@@ -36,7 +36,7 @@ private func hasStaticModifier(_ variable: VariableDeclSyntax) -> Bool {
 }
 
 private func hasPrivateModifier(_ variable: VariableDeclSyntax) -> Bool {
-    variable.modifiers.contains(where: { $0.name.text.contains("private") })
+    variable.modifiers.contains(where: { $0.name.text == "private" })
 }
 
 private func isConstant(_ variable: VariableDeclSyntax) -> Bool {

Tests/BuildableMacroTests/BuildableStructTests.swift

@@ -260,6 +260,7 @@ class BuildableStructTests: XCTestCase {
                 let m1: String?
                 private var m2: String?
                 public var m3: String?
+                fileprivate var m4: String?
             }
             """,
             expandedSource: """
@@ -268,16 +269,19 @@ class BuildableStructTests: XCTestCase {
                 let m1: String?
                 private var m2: String?
                 public var m3: String?
+                fileprivate var m4: String?
             }
 
             struct MyObjectBuilder {
                 var m1: String?
                 var m3: String?
+                var m4: String?
 
                 func build() -> MyObject {
                     return MyObject(
                         m1: m1,
-                        m3: m3
+                        m3: m3,
+                        m4: m4
                     )
                 }
             }