OpenSwiftUIProject · jcmosc · Aug 24, 2025 · Aug 24, 2025 · Aug 24, 2025 · Sep 7, 2025
diff --git a/Sources/OpenAttributeGraph/Attribute/Attribute/Attribute.swift b/Sources/OpenAttributeGraph/Attribute/Attribute/Attribute.swift
@@ -289,11 +289,27 @@ extension Attribute {
         }
     }
 
+    public init<R: Rule>(_ rule: R, initialValue: Value) where R.Value == Value {
+        self = withUnsafePointer(to: rule) { pointer in
+            withUnsafePointer(to: initialValue) { initialValuePointer in
+                Attribute(body: pointer, value: initialValuePointer) { R._update }
+            }
+        }
+    }
+
     public init<R: StatefulRule>(_ rule: R) where R.Value == Value {
         self = withUnsafePointer(to: rule) { pointer in
             Attribute(body: pointer, value: nil) { R._update }
         }
     }
+
+    public init<R: StatefulRule>(_ rule: R, initialValue: Value) where R.Value == Value {
+        self = withUnsafePointer(to: rule) { pointer in
+            withUnsafePointer(to: initialValue) { initialValuePointer in
+                Attribute(body: pointer, value: initialValuePointer) { R._update }
+            }
+        }
+    }
 }
 
 @_silgen_name("OAGGraphCreateAttribute")

diff --git a/Sources/OpenAttributeGraph/Attribute/Body/AttributeBodyVisitor.swift b/Sources/OpenAttributeGraph/Attribute/Body/AttributeBodyVisitor.swift
@@ -5,5 +5,5 @@
 //  Status: WIP
 
 public protocol AttributeBodyVisitor {
-    func visit<Body: _AttributeBody>(body: UnsafePointer<Body>)
+    mutating func visit<Body: _AttributeBody>(body: UnsafePointer<Body>)
 }
diff --git a/Sources/OpenAttributeGraph/Attribute/Indirect/IndirectAttribute.swift b/Sources/OpenAttributeGraph/Attribute/Indirect/IndirectAttribute.swift
@@ -15,11 +15,19 @@ public struct IndirectAttribute<Value> {
         identifier = source.identifier.createIndirect(size: UInt64(MemoryLayout<Value>.size))
     }
 
+    public var attribute: Attribute<Value> {
+        Attribute(identifier: identifier)
+    }
+
     public var source: Attribute<Value> {
         get { Attribute(identifier: identifier.source) }
         nonmutating set { identifier.source = newValue.identifier }
     }
 
+    public func resetSource() {
+        __OAGGraphResetIndirectAttribute(identifier, false)
+    }
+
     public var dependency: AnyAttribute? {
         get {
             let dependency = identifier._indirectDependency

diff --git a/Sources/OpenAttributeGraphCxx/Attribute/OAGAttribute.cpp b/Sources/OpenAttributeGraphCxx/Attribute/OAGAttribute.cpp
@@ -103,6 +103,10 @@ void OAGGraphSetIndirectAttribute(OAGAttribute attribute1, OAGAttribute attribut
     // TODO
 }
 
+void OAGGraphResetIndirectAttribute(OAGAttribute attribute, bool non_nil) {
+    // TODO
+}
+
 OAGAttribute OAGGraphCreateAttribute(long index, const void *body, const void * value) {
     // TODO
     return OAGAttributeNil;

diff --git a/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGAttribute.h b/Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGAttribute.h
@@ -89,6 +89,10 @@ OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
 void OAGGraphSetIndirectAttribute(OAGAttribute attribute1, OAGAttribute attribute2) OAG_SWIFT_NAME(setter:OAGAttribute.source(self:_:));
 
+OAG_EXPORT
+OAG_REFINED_FOR_SWIFT
+void OAGGraphResetIndirectAttribute(OAGAttribute attribute, bool non_nil);
+
 OAG_EXPORT
 OAG_REFINED_FOR_SWIFT
 OAGAttribute OAGGraphCreateAttribute(long index, const void *body, const void * _Nullable value);

diff --git a/...penAttributeGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift b/...penAttributeGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift
@@ -14,6 +14,37 @@ struct AttributeCompatibilityTests {
         #expect(intAttribute.value == 0)
     }
 
+    @Test
+    func initWithRule() {
+        struct TestRule: Rule {
+            var value: Int {
+                return 0
+            }
+        }
+        let attribute1 = Attribute(TestRule())
+        #expect(attribute1.value == 0)
+
+        let attribute2 = Attribute(TestRule(), initialValue: 1)
+        #expect(attribute2.value == 1)
+    }
+
+    @Test
+    func initWithStatefulRule() {
+        struct TestStatefuleRule: StatefulRule {
+            typealias Value = Int
+            func updateValue() {
+                withUnsafePointer(to: 0) { ptr in
+                    Graph.setOutputValue(ptr)
+                }
+            }
+        }
+        let attribute1 = Attribute(TestStatefuleRule())
+        #expect(attribute1.value == 0)
+
+        let attribute2 = Attribute(TestStatefuleRule(), initialValue: 1)
+        #expect(attribute2.value == 1)
+    }
+
     @Test
     func hashableAndEquatable() {
         let a = Attribute<Int>(identifier: .nil)

diff --git a/...ibuteGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeCompatibilityTests.swift b/...ibuteGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeCompatibilityTests.swift
@@ -12,9 +12,24 @@ struct IndirectAttributeCompatibilityTests {
     func basic() {
         let source = Attribute(value: 0)
         let indirect = IndirectAttribute(source: source)
+        #expect(indirect.attribute.identifier == indirect.identifier)
         #expect(indirect.identifier != source.identifier)
         #expect(indirect.source.identifier == source.identifier)
         #expect(indirect.dependency == .init(rawValue: 0))
     }
+
+    @Test
+    func resetSource() {
+        let source1 = Attribute(value: 0)
+        let indirect = IndirectAttribute(source: source1)
+        #expect(indirect.source.identifier == source1.identifier)
+
+        let source2 = Attribute(value: 0)
+        indirect.source = source2
+        #expect(indirect.source.identifier == source2.identifier)
+
+        indirect.resetSource()
+        #expect(indirect.source.identifier == source1.identifier)
+    }
 }
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
         // TODO
     }
+    void OAGGraphResetIndirectAttribute(OAGAttribute attribute, bool non_nil) {
+        // TODO
+    }
     OAGAttribute OAGGraphCreateAttribute(long index, const void *body, const void * value) {
         // TODO
         return OAGAttributeNil;
@@ Expand Down @@