Fix macros (#13)

Author: muukii

Sources/StateStructMacros/COWTrackingPropertyMacro.swift

@@ -41,22 +41,19 @@ extension COWTrackingPropertyMacro: PeerMacro {
       }
     }
 
-    var _variableDecl = variableDecl
+    var _variableDecl = variableDecl.trimmed
     _variableDecl.attributes = [.init(.init(stringLiteral: "@TrackingIgnored"))]
 
     _variableDecl = _variableDecl
       .renamingIdentifier(with: "_backing_")
-      .withPrivateModifier()
       .modifyingTypeAnnotation({ type in
         return "_BackingStorage<\(type.trimmed)>"
       })
       .modifyingInit({ initializer in                
         return .init(value: "_BackingStorage.init(\(initializer.value))" as ExprSyntax)        
       })
 
-    _variableDecl.leadingTrivia = .spaces(2)
-
-    newMembers.append(_variableDecl.trimmed.formatted(using: .init(indentationWidth: .spaces(2), initialIndentation: [])).as(DeclSyntax.self)!)
+    newMembers.append(DeclSyntax(_variableDecl))
 
     return newMembers
   }

Sources/StateStructMacros/TrackingMacro.swift

@@ -23,9 +23,11 @@ extension TrackingMacro: MemberMacro {
     in context: some MacroExpansionContext
   ) throws -> [DeclSyntax] {
 
+    let isPublic = declaration.modifiers.contains(where: { $0.name.tokenKind == .keyword(.public) })
+    
     return [
       """
-      let _tracking_context: _TrackingContext = .init()
+      \(raw: isPublic ? "public" : "internal") let _tracking_context: _TrackingContext = .init()
       """ as DeclSyntax
     ]
   }
@@ -76,15 +78,6 @@ extension TrackingMacro: ExtensionMacro {
       extension \(structDecl.name.trimmed): TrackingObject {      
       }
       """ as DeclSyntax).cast(ExtensionDeclSyntax.self),
-//      ("""
-//      extension \(structDecl.name.trimmed) {
-//      
-//        func _tracking_propagate(path: PropertyPath) {
-//          _tracking_context.path = path
-//          \(raw: operation)
-//        }
-//      }
-//      """ as DeclSyntax).formatted().cast(ExtensionDeclSyntax.self)
     ]
   }
 }

Tests/StateStructMacroTests/COWTrackingProperyMacroTests.swift

@@ -27,6 +27,9 @@ final class COWTrackingProperyMacroTests: XCTestCase {
         @COWTrackingProperty  
         private var stored_0: Int = 18
       
+        @COWTrackingProperty  
+        public var stored_1: Int = 18
+      
         func compute() {
         }
       }
@@ -69,6 +72,40 @@ final class COWTrackingProperyMacroTests: XCTestCase {
         }
           private var _backing_stored_0: _BackingStorage<Int> = _BackingStorage.init(18)
 
+
+        public var stored_1: Int {
+          _read {
+            (_backing_stored_1.value as? TrackingObject)?._tracking_context.path = _tracking_context.path?.pushed(.init("stored_1"))
+            _Tracking._tracking_modifyStorage {
+              $0.accessorRead(path: _tracking_context.path?.pushed(.init("stored_1")))
+            }
+            yield _backing_stored_1.value
+          }
+          set {
+            (_backing_stored_1.value as? TrackingObject)?._tracking_context.path = _tracking_context.path?.pushed(.init("stored_1"))
+            _Tracking._tracking_modifyStorage {
+              $0.accessorSet(path: _tracking_context.path?.pushed(.init("stored_1")))
+            }
+            if !isKnownUniquelyReferenced(&_backing_stored_1) {
+              _backing_stored_1 = .init(newValue)
+            } else {
+              _backing_stored_1.value = newValue
+            }
+
+          }
+          _modify {
+            (_backing_stored_1.value as? TrackingObject)?._tracking_context.path = _tracking_context.path?.pushed(.init("stored_1"))
+            _Tracking._tracking_modifyStorage {
+              $0.accessorModify(path: _tracking_context.path?.pushed(.init("stored_1")))
+            }
+            if !isKnownUniquelyReferenced(&_backing_stored_1) {
+              _backing_stored_1 = .init(_backing_stored_1.value)
+            }
+            yield &_backing_stored_1.value
+          }
+        }
+          public var _backing_stored_1: _BackingStorage<Int> = _BackingStorage.init(18)
+
         func compute() {
         }
       }

Tests/StateStructMacroTests/TrackingMacroTests.swift

@@ -14,6 +14,66 @@ final class TrackingMacroTests: XCTestCase {
       super.invokeTest()
     }
   }
+  
+  func test_public() {
+    assertMacro {
+      """
+      @Tracking
+      public struct MyState {
+      
+        private var stored_0: Int = 18
+      
+        var stored_1: String
+      
+        let stored_2: Int = 0
+      
+        var age: Int { 0 }
+      
+        var age2: Int {
+          get { 0 }
+          set { }
+        }
+      
+        var height: Int
+      
+        func compute() {
+        }
+      }
+      """
+    } expansion: {
+      """
+      public struct MyState {
+        @COWTrackingProperty
+
+        private var stored_0: Int = 18
+        @COWTrackingProperty
+
+        var stored_1: String
+        @COWTrackingProperty
+
+        let stored_2: Int = 0
+
+        var age: Int { 0 }
+
+        var age2: Int {
+          get { 0 }
+          set { }
+        }
+        @COWTrackingProperty
+
+        var height: Int
+
+        func compute() {
+        }
+
+        public let _tracking_context: _TrackingContext = .init()
+      }
+
+      extension MyState: TrackingObject {
+      }
+      """
+    }
+  }
 
   func test_macro() {
 
@@ -67,7 +127,7 @@ final class TrackingMacroTests: XCTestCase {
         func compute() {
         }
 
-        let _tracking_context: _TrackingContext = .init()
+        internal let _tracking_context: _TrackingContext = .init()
       }
 
       extension MyState: TrackingObject {

Tests/StateStructTests/TrackingTests.swift

@@ -250,9 +250,7 @@ struct TrackingTests {
 
     #expect(
       result.graph.prettyPrint() == """
-        StateStructTests.Nesting {
-          _1-(1)
-        }
+        StateStructTests.Nesting
         """
     )