From c57e43ae1a708930590fd24d9d70ef0855cab75f Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 21 Sep 2025 19:50:11 +0800
Subject: [PATCH 1/4] Add ViewStyle API

---
 .../View/Style/ViewStyle.swift                | 229 ++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 Sources/OpenSwiftUICore/View/Style/ViewStyle.swift

diff --git a/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift b/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
new file mode 100644
index 000000000..fc4eb38e3
--- /dev/null
+++ b/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
@@ -0,0 +1,229 @@
+//
+//  ViewStyle.swift
+//  OpenSwiftUICore
+//
+//  Audited for 6.5.4
+//  Status: Complete
+//  ID: AC03956538119E2820390436C305EBF1 (SwiftUI)
+//  ID: AC59074524C298808AAD87A4737AEFFC (SwiftUICore)
+
+import OpenAttributeGraphShims
+
+// MARK: - StyleableView
+
+package protocol StyleableView: View where Configuration == DefaultStyleModifier.StyleConfiguration {
+    associatedtype Configuration
+
+    associatedtype DefaultStyleModifier: StyleModifier
+
+    var configuration: Configuration { get }
+
+    static var defaultStyleModifier: DefaultStyleModifier { get }
+}
+
+// MARK: - StyleModifier
+
+package protocol StyleModifier: MultiViewModifier, PrimitiveViewModifier {
+    associatedtype Style
+
+    associatedtype StyleConfiguration
+
+    associatedtype StyleBody: View
+
+    init(style: Style)
+
+    var style: Style { get set }
+
+    func styleBody(configuration: StyleConfiguration) -> StyleBody
+}
+
+// MARK: - AnyStyleModifierType
+
+private protocol AnyStyleModifierType {
+    static func makeView<V>(
+        view: _GraphValue<V>,
+        modifier: AnyStyleModifier,
+        inputs: _ViewInputs
+    ) -> _ViewOutputs where V: StyleableView
+
+    static func makeViewList<V>(
+        view: _GraphValue<V>,
+        modifier: AnyStyleModifier,
+        inputs: _ViewListInputs
+    ) -> _ViewListOutputs where V: StyleableView
+
+    static func viewListCount(inputs: _ViewListCountInputs) -> Int?
+}
+
+// MARK: - AutomaticStyleOverrideModifier
+
+struct AutomaticStyleOverrideModifier<I, M>: PrimitiveViewModifier, _GraphInputsModifier where M: StyleModifier {
+    var styleModifier: M
+
+    init(_: I.Type, modifier: M) {
+        self.styleModifier = modifier
+    }
+
+    static func _makeInputs(modifier: _GraphValue<Self>, inputs: inout _GraphInputs) {
+        inputs[StyleOverrideInput<I>.self] = AnyStyleModifier(
+            value: modifier[offset: { .of(&$0.styleModifier) }].value.identifier,
+            _type: StyleModifierType<M>.self
+        )
+    }
+}
+
+// MARK: - StyleOverrideInput
+
+private struct StyleOverrideInput<I>: ViewInput {
+    static var defaultValue: AnyStyleModifier? {
+        nil
+    }
+}
+
+// MARK: - MakeDefaultRepresentation
+
+private struct MakeDefaultRepresentation<V>: Rule where V: StyleableView {
+    @Attribute var view: V
+
+    typealias Value = ModifiedContent<V, V.DefaultStyleModifier>
+
+    var value: Value {
+        view.modifier(V.defaultStyleModifier)
+    }
+}
+
+// MARK: - AnyStyleModifier
+
+struct AnyStyleModifier {
+    var value: AnyAttribute
+    let _type: Any.Type
+}
+
+// MARK: - StyleInput
+
+private struct StyleInput<I>: ViewInput {
+    static var defaultValue: Stack<AnyStyleModifier> {
+        .init()
+    }
+}
+
+// MARK: - MakeResolvedRepresentation
+
+private struct MakeResolvedRepresentation<V>: Rule where V: StyleableView {
+    @Attribute var view: V
+
+    var value: V.Body {
+        view.body
+    }
+}
+
+// MARK: - StyleModifierType
+
+private struct StyleModifierType<M>: AnyStyleModifierType where M: StyleModifier {
+    static func makeView<V>(
+        view: _GraphValue<V>,
+        modifier: AnyStyleModifier,
+        inputs: _ViewInputs
+    ) -> _ViewOutputs where V: StyleableView {
+        var inputs = inputs
+        let fields = DynamicPropertyCache.fields(of: M.Style.self)
+        let (styleBody, buffer) = makeStyleBody(
+            view: view,
+            modifier: modifier,
+            inputs: &inputs.base,
+            fields: fields
+        )
+        let outputs = M.StyleBody.makeDebuggableView(
+            view: styleBody,
+            inputs: inputs
+        )
+        if let buffer {
+            buffer.traceMountedProperties(
+                to: view,
+                fields: fields
+            )
+        }
+        return outputs
+    }
+
+    static func makeStyleBody<V>(
+        view: _GraphValue<V>,
+        modifier: AnyStyleModifier,
+        inputs: inout _GraphInputs,
+        fields: DynamicPropertyCache.Fields
+    ) -> (_GraphValue<M.StyleBody>, _DynamicPropertyBuffer?) where V: StyleableView {
+        if Semantics.ViewStylesMustBeValueTypes.isEnabled {
+            guard Metadata(M.Style.self).isValueType else {
+                preconditionFailure("styles must be value types (either a struct or an enum); \(M.Style.self) is a class.")
+            }
+        }
+        let styleModifier = modifier.value.unsafeCast(to: M.self)
+        let accessor = StyleBodyAccessor<V, M>(
+            view: view.value,
+            styleModifier: styleModifier
+        )
+        return accessor
+            .makeBody(
+                container: .init(styleModifier[offset: { .of(&$0.style) }]),
+                inputs: &inputs,
+                fields: fields
+            )
+    }
+
+    static func makeViewList<V>(
+        view: _GraphValue<V>,
+        modifier: AnyStyleModifier,
+        inputs: _ViewListInputs
+    ) -> _ViewListOutputs where V: StyleableView {
+        var inputs = inputs
+        let fields = DynamicPropertyCache.fields(of: M.Style.self)
+        let (styleBody, buffer) = makeStyleBody(
+            view: view,
+            modifier: modifier,
+            inputs: &inputs.base,
+            fields: fields
+        )
+        let outputs = M.StyleBody.makeDebuggableViewList(
+            view: styleBody,
+            inputs: inputs
+        )
+        if let buffer {
+            buffer.traceMountedProperties(
+                to: view,
+                fields: fields
+            )
+        }
+        return outputs
+    }
+
+    static func viewListCount(inputs: _ViewListCountInputs) -> Int? {
+        M.StyleBody._viewListCount(inputs: inputs)
+    }
+}
+
+// MARK: - StyleableViewContextInput
+
+private struct StyleableViewContextInput: ViewInput {
+    static var defaultValue: Any.Type? { nil }
+}
+
+// MARK: - StyleBodyAccessor
+
+private struct StyleBodyAccessor<V, M>: BodyAccessor where V: StyleableView, M: StyleModifier {
+    @Attribute var view: V
+    @Attribute var styleModifier: M
+
+    typealias Container = M.Style
+
+    typealias Body = M.StyleBody
+
+    func updateBody(of container: Container, changed: Bool) {
+        let (view, viewChanged) = $view.changedValue()
+        guard changed || viewChanged else {
+            return
+        }
+        setBody {
+            styleModifier.styleBody(configuration: view.configuration as! M.StyleConfiguration)
+        }
+    }
+}

From 90e5815b5fdb6a4b18187c1fd2409ab1411ec756 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 21 Sep 2025 21:00:37 +0800
Subject: [PATCH 2/4] Update StyleableView and StyleModifier attribute
 implementation

---
 .../View/Style/ViewStyle.swift                | 149 ++++++++++++++++++
 1 file changed, 149 insertions(+)

diff --git a/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift b/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
index fc4eb38e3..9aa3ef029 100644
--- a/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
+++ b/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
@@ -21,6 +21,74 @@ package protocol StyleableView: View where Configuration == DefaultStyleModifier
     static var defaultStyleModifier: DefaultStyleModifier { get }
 }
 
+extension StyleableView {
+    package var body: some View { self }
+
+    nonisolated package static func _makeView(
+        view: _GraphValue<Self>,
+        inputs: _ViewInputs
+    ) -> _ViewOutputs {
+        var inputs = inputs
+        guard inputs.base.isCurrentStyleableView(Self.self) else {
+            inputs.base.setCurrentStyleableView(Self.self)
+            return Body._makeView(
+                view: _GraphValue(MakeResolvedRepresentation(view: view.value)),
+                inputs: inputs
+            )
+        }
+        guard let modifier = inputs.base.popLast(StyleInput<Configuration>.self) else {
+            return MakeDefaultRepresentation<Self>.Value.makeDebuggableView(
+                view: _GraphValue(MakeDefaultRepresentation(view: view.value)),
+                inputs: inputs
+            )
+        }
+        return (modifier._type as! AnyStyleModifierType.Type).makeView(
+            view: view,
+            modifier: modifier,
+            inputs: inputs
+        )
+    }
+    
+    nonisolated package static func _makeViewList(
+        view: _GraphValue<Self>,
+        inputs: _ViewListInputs
+    ) -> _ViewListOutputs {
+        var inputs = inputs
+        guard inputs.base.isCurrentStyleableView(Self.self) else {
+            inputs.base.setCurrentStyleableView(Self.self)
+            return Body._makeViewList(
+                view: _GraphValue(MakeResolvedRepresentation(view: view.value)),
+                inputs: inputs
+            )
+        }
+        guard let modifier = inputs.base.popLast(StyleInput<Configuration>.self) else {
+            return MakeDefaultRepresentation<Self>.Value.makeDebuggableViewList(
+                view: _GraphValue(MakeDefaultRepresentation(view: view.value)),
+                inputs: inputs
+            )
+        }
+        return (modifier._type as! AnyStyleModifierType.Type).makeViewList(
+            view: view,
+            modifier: modifier,
+            inputs: inputs
+        )
+    }
+    
+    nonisolated package static func _viewListCount(
+        inputs: _ViewListCountInputs
+    ) -> Int? {
+        var inputs = inputs
+        guard inputs.isCurrentStyleableView(Self.self) else {
+            inputs.setCurrentStyleableView(Self.self)
+            return Body._viewListCount(inputs: inputs)
+        }
+        guard let modifier = inputs.popLast(StyleInput<Configuration>.self) else {
+            return MakeDefaultRepresentation<Self>.Value._viewListCount(inputs: inputs)
+        }
+        return (modifier._type as! AnyStyleModifierType.Type).viewListCount(inputs: inputs)
+    }
+}
+
 // MARK: - StyleModifier
 
 package protocol StyleModifier: MultiViewModifier, PrimitiveViewModifier {
@@ -37,6 +105,57 @@ package protocol StyleModifier: MultiViewModifier, PrimitiveViewModifier {
     func styleBody(configuration: StyleConfiguration) -> StyleBody
 }
 
+extension StyleModifier {
+    nonisolated package static func _makeView(
+        modifier: _GraphValue<Self>,
+        inputs: _ViewInputs,
+        body: @escaping (_Graph, _ViewInputs) -> _ViewOutputs
+    ) -> _ViewOutputs {
+        var inputs = inputs
+        let override = inputs[StyleOverrideInput<Style>.self]
+        inputs.append(
+            override ?? AnyStyleModifier(
+                value: modifier.value.identifier,
+                _type: StyleModifierType<Self>.self
+            ),
+            to: StyleInput<StyleConfiguration>.self
+        )
+        return body(_Graph(), inputs)
+    }
+    
+    nonisolated package static func _makeViewList(
+        modifier: _GraphValue<Self>,
+        inputs: _ViewListInputs,
+        body: @escaping (_Graph, _ViewListInputs) -> _ViewListOutputs
+    ) -> _ViewListOutputs {
+        var inputs = inputs
+        let override = inputs[StyleOverrideInput<Style>.self]
+        inputs.base.append(
+            override ?? AnyStyleModifier(
+                value: modifier.value.identifier,
+                _type: StyleModifierType<Self>.self
+            ),
+            to: StyleInput<StyleConfiguration>.self
+        )
+        return body(_Graph(), inputs)
+    }
+    
+    nonisolated package static func _viewListCount(
+        inputs: _ViewListCountInputs,
+        body: (_ViewListCountInputs) -> Int?
+    ) -> Int? {
+        var inputs = inputs
+        inputs.append(
+            AnyStyleModifier(
+                value: .nil,
+                _type: StyleModifierType<Self>.self
+            ),
+            to: StyleInput<StyleConfiguration>.self
+        )
+        return body(inputs)
+    }
+}
+
 // MARK: - AnyStyleModifierType
 
 private protocol AnyStyleModifierType {
@@ -97,6 +216,8 @@ private struct MakeDefaultRepresentation<V>: Rule where V: StyleableView {
 struct AnyStyleModifier {
     var value: AnyAttribute
     let _type: Any.Type
+
+
 }
 
 // MARK: - StyleInput
@@ -207,6 +328,34 @@ private struct StyleableViewContextInput: ViewInput {
     static var defaultValue: Any.Type? { nil }
 }
 
+extension _GraphInputs {
+    fileprivate func isCurrentStyleableView<V>(_: V.Type) -> Bool where V: StyleableView {
+        self[StyleableViewContextInput.self] == V.self
+    }
+
+    fileprivate mutating func setCurrentStyleableView<V>(_: V.Type) where V: StyleableView {
+        self[StyleableViewContextInput.self] = V.self
+    }
+
+    package mutating func resetCurrentStyleableView() {
+        self[StyleableViewContextInput.self] = nil
+    }
+}
+
+extension _ViewListCountInputs {
+    fileprivate func isCurrentStyleableView<V>(_: V.Type) -> Bool where V: StyleableView {
+        self[StyleableViewContextInput.self] == V.self
+    }
+
+    fileprivate mutating func setCurrentStyleableView<V>(_: V.Type) where V: StyleableView {
+        self[StyleableViewContextInput.self] = V.self
+    }
+
+    package mutating func resetCurrentStyleableView() {
+        self[StyleableViewContextInput.self] = nil
+    }
+}
+
 // MARK: - StyleBodyAccessor
 
 private struct StyleBodyAccessor<V, M>: BodyAccessor where V: StyleableView, M: StyleModifier {

From 6d30f3a501c6c495c0700394139e87adedf62e55 Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 21 Sep 2025 21:03:38 +0800
Subject: [PATCH 3/4] Optimize AnyStyleModifier API

---
 .../View/Style/ViewStyle.swift                | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift b/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
index 9aa3ef029..6cf0f9c19 100644
--- a/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
+++ b/Sources/OpenSwiftUICore/View/Style/ViewStyle.swift
@@ -42,7 +42,7 @@ extension StyleableView {
                 inputs: inputs
             )
         }
-        return (modifier._type as! AnyStyleModifierType.Type).makeView(
+        return modifier.type.makeView(
             view: view,
             modifier: modifier,
             inputs: inputs
@@ -67,7 +67,7 @@ extension StyleableView {
                 inputs: inputs
             )
         }
-        return (modifier._type as! AnyStyleModifierType.Type).makeViewList(
+        return modifier.type.makeViewList(
             view: view,
             modifier: modifier,
             inputs: inputs
@@ -85,7 +85,7 @@ extension StyleableView {
         guard let modifier = inputs.popLast(StyleInput<Configuration>.self) else {
             return MakeDefaultRepresentation<Self>.Value._viewListCount(inputs: inputs)
         }
-        return (modifier._type as! AnyStyleModifierType.Type).viewListCount(inputs: inputs)
+        return modifier.type.viewListCount(inputs: inputs)
     }
 }
 
@@ -116,7 +116,7 @@ extension StyleModifier {
         inputs.append(
             override ?? AnyStyleModifier(
                 value: modifier.value.identifier,
-                _type: StyleModifierType<Self>.self
+                type: StyleModifierType<Self>.self
             ),
             to: StyleInput<StyleConfiguration>.self
         )
@@ -133,7 +133,7 @@ extension StyleModifier {
         inputs.base.append(
             override ?? AnyStyleModifier(
                 value: modifier.value.identifier,
-                _type: StyleModifierType<Self>.self
+                type: StyleModifierType<Self>.self
             ),
             to: StyleInput<StyleConfiguration>.self
         )
@@ -148,7 +148,7 @@ extension StyleModifier {
         inputs.append(
             AnyStyleModifier(
                 value: .nil,
-                _type: StyleModifierType<Self>.self
+                type: StyleModifierType<Self>.self
             ),
             to: StyleInput<StyleConfiguration>.self
         )
@@ -186,7 +186,7 @@ struct AutomaticStyleOverrideModifier<I, M>: PrimitiveViewModifier, _GraphInputs
     static func _makeInputs(modifier: _GraphValue<Self>, inputs: inout _GraphInputs) {
         inputs[StyleOverrideInput<I>.self] = AnyStyleModifier(
             value: modifier[offset: { .of(&$0.styleModifier) }].value.identifier,
-            _type: StyleModifierType<M>.self
+            type: StyleModifierType<M>.self
         )
     }
 }
@@ -213,11 +213,18 @@ private struct MakeDefaultRepresentation<V>: Rule where V: StyleableView {
 
 // MARK: - AnyStyleModifier
 
-struct AnyStyleModifier {
+private struct AnyStyleModifier {
     var value: AnyAttribute
     let _type: Any.Type
 
+    init(value: AnyAttribute, type: any AnyStyleModifierType.Type) {
+        self.value = value
+        self._type = type
+    }
 
+    var type: any AnyStyleModifierType.Type {
+        _type as! any AnyStyleModifierType.Type
+    }
 }
 
 // MARK: - StyleInput

From 06f67f429a6107b344ec5075b8c7f70005a276de Mon Sep 17 00:00:00 2001
From: Kyle <kyle201817146@gmail.com>
Date: Sun, 21 Sep 2025 21:16:17 +0800
Subject: [PATCH 4/4] Add DefaultStyle API

---
 .../View/Input/ViewInputPredicate.swift       | 12 ++++
 .../View/Style/DefaultStyle.swift             | 64 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 Sources/OpenSwiftUICore/View/Style/DefaultStyle.swift

diff --git a/Sources/OpenSwiftUICore/View/Input/ViewInputPredicate.swift b/Sources/OpenSwiftUICore/View/Input/ViewInputPredicate.swift
index f7c9083a5..ffeea2d4e 100644
--- a/Sources/OpenSwiftUICore/View/Input/ViewInputPredicate.swift
+++ b/Sources/OpenSwiftUICore/View/Input/ViewInputPredicate.swift
@@ -9,6 +9,18 @@
 
 package protocol ViewInputPredicate {
     static func evaluate(inputs: _GraphInputs) -> Bool
+
+    static func evaluate(listInputs: _ViewListInputs) -> Bool
+}
+
+extension ViewInputPredicate {
+    package static func evaluate(inputs: _ViewInputs) -> Bool {
+        evaluate(inputs: inputs.base)
+    }
+
+    package static func evaluate(listInputs: _ViewListInputs) -> Bool {
+        evaluate(inputs: listInputs.base)
+    }
 }
 
 // MARK: - ViewInputFlag
diff --git a/Sources/OpenSwiftUICore/View/Style/DefaultStyle.swift b/Sources/OpenSwiftUICore/View/Style/DefaultStyle.swift
new file mode 100644
index 000000000..46fb4cbb2
--- /dev/null
+++ b/Sources/OpenSwiftUICore/View/Style/DefaultStyle.swift
@@ -0,0 +1,64 @@
+//
+//  DefaultStyle.swift
+//  OpenSwiftUICore
+//
+//  Audited for 6.5.4
+//  Status: Complete
+
+// MARK: - AnyDefaultStyle
+
+package protocol AnyDefaultStyle {
+    init()
+}
+
+// MARK: - DefaultStyleModifier
+
+package protocol DefaultStyleModifier: StyleModifier where Style: AnyDefaultStyle {}
+
+// MARK: - StyleOverrideModifier
+
+package protocol StyleOverrideModifier: DefaultStyleModifier where Style == OverrideStyleModifier.Style {
+    associatedtype OriginalStyle
+
+    associatedtype OverrideStyleModifier: StyleModifier
+}
+
+// MARK: - StyleWriterOverrideModifier
+
+package protocol StyleWriterOverrideModifier: AnyDefaultStyle {
+    associatedtype OriginalStyle
+
+    associatedtype StyleOverride
+
+    static func injectStyleOverride(in inputs: inout _ViewInputs) -> ()
+}
+
+extension StyleWriterOverrideModifier {
+    package static func injectStyleOverride<P>(
+        in inputs: inout _ViewInputs,
+        requiring: P.Type
+    ) where P: ViewInputPredicate {
+        guard requiring.evaluate(inputs: inputs) else {
+            return
+        }
+        injectStyleOverride(in: &inputs)
+    }
+}
+
+// MARK: - DefaultStyleModifierTypeVisitor
+
+package protocol DefaultStyleModifierTypeVisitor {
+    func visit<T>(type: T.Type) where T: DefaultStyleModifier
+}
+
+// MARK: - StyleOverrideModifierTypeVisitor
+
+package protocol StyleOverrideModifierTypeVisitor {
+    func visit<T>(type: T.Type) where T: StyleOverrideModifier
+}
+
+// MARK: - StyleWriterOverrideModifierTypeVisitor
+
+package protocol StyleWriterOverrideModifierTypeVisitor {
+    func visit<T>(type: T.Type) where T: StyleWriterOverrideModifier
+}