Refactor View into Core module

Sources/COpenSwiftUI/empty.c

@@ -0,0 +1 @@
+

Sources/COpenSwiftUI/include/empty.h

@@ -0,0 +1 @@
+

Sources/COpenSwiftUI/ProtocolDescriptor.m → Sources/COpenSwiftUICore/Other/ProtocolDescriptor.c

@@ -1,9 +1,6 @@
 //
 //  ProtocolDescriptor.c
-//  FIXME: Use ProtocolDescriptor.m due to COpenSwiftUICore module contains ObjC symbol.
-//  Solution: Move down to COpenSwiftUICore module.
-//  COpenSwiftUI
-
+//  COpenSwiftUICore
 
 #include "ProtocolDescriptor.h"
 
@@ -13,15 +10,15 @@ void _OpenSwiftUI_callVisitViewType(void *visitor_value,
                                     const void *view_pwt);
 
 OPENSWIFTUI_EXPORT
-const void *$s11OpenSwiftUI4ViewMp;
+const void *$s15OpenSwiftUICore4ViewMp;
 
 const void *_OpenSwiftUI_viewProtocolDescriptor(void) {
-    return &$s11OpenSwiftUI4ViewMp;
+    return &$s15OpenSwiftUICore4ViewMp;
 }
 
 OPENSWIFTUI_EXPORT
-const void *$s11OpenSwiftUI12ViewModifierMp;
+const void *$s15OpenSwiftUICore12ViewModifierMp;
 
 const void *_OpenSwiftUI_viewModifierProtocolDescriptor(void) {
-    return &$s11OpenSwiftUI12ViewModifierMp;
+    return &$s15OpenSwiftUICore12ViewModifierMp;
 }

Sources/OpenSwiftUI/App/AppGraph.swift

@@ -14,7 +14,7 @@ import Glibc
 import WASILibc
 #endif
 internal import OpenGraphShims
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) package import OpenSwiftUICore
 
 package final class AppGraph: GraphHost {
     static var shared: AppGraph? = nil

Sources/OpenSwiftUI/App/OpenSwiftUIApplication.swift

@@ -6,7 +6,7 @@
 //  Status: WIP
 //  ID: ACC2C5639A7D76F611E170E831FCA491
 
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) internal import OpenSwiftUICore
 
 #if os(iOS) || os(tvOS)
 import UIKit

Sources/OpenSwiftUI/Core/Render/DisplayLink.swift

@@ -14,7 +14,7 @@ import UIKit
 import AppKit
 #endif
 
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) internal import OpenSwiftUICore
 
 final class DisplayLink: NSObject {
     private weak var host: AnyUIHostingView?

Sources/OpenSwiftUI/EventHandling/Focus/FocusState.swift

@@ -6,7 +6,7 @@
 //  Status: WIP
 //  ID: 274D264A38B51DC68ACC48A91353B7D0
 
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore
 
 @frozen
 @propertyWrapper

Sources/OpenSwiftUI/EventHandling/Focus/FocusStoreLocation.swift

@@ -1,4 +1,4 @@
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) internal import OpenSwiftUICore
 
 class FocusStoreLocation<A: Hashable>: AnyLocation<A>, @unchecked Sendable {
     override var wasRead: Bool {

Sources/OpenSwiftUI/Export.swift

@@ -9,4 +9,4 @@
 @_spi(DisplayList_ViewSystem)
 @_spi(SystemUI)
 @_spi(DoNotImport)
-import OpenSwiftUICore
+public import OpenSwiftUICore

Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift

@@ -16,6 +16,8 @@ import Foundation
 typealias PlatformView = Void
 #endif
 
+internal import OpenSwiftUICore
+
 protocol PlatformViewRepresentable: View {
     associatedtype PlatformViewProvider
     associatedtype Coordinator

Sources/OpenSwiftUI/Integration/UIKit/AnyUIHostingView.swift

@@ -7,7 +7,7 @@
 
 #if os(iOS)
 
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) internal import OpenSwiftUICore
 
 protocol AnyUIHostingView: AnyObject {
     func displayLinkTimer(timestamp: Time, isAsyncThread: Bool)

Sources/OpenSwiftUI/Integration/UIKit/UIHostingView.swift

@@ -7,17 +7,17 @@
 //  ID: FAF0B683EB49BE9BABC9009857940A1E
 
 #if os(iOS)
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore
 import UIKit
 
 @available(macOS, unavailable)
 @available(watchOS, unavailable)
 open class _UIHostingView<Content>: UIView where Content: View {
     private var _rootView: Content
-    var viewGraph: ViewGraph
-    var currentTimestamp: Time = .zero
-    var propertiesNeedingUpdate: ViewRendererHostProperties = [.rootView] // FIXME
-    var isRendering: Bool = false
+    package var viewGraph: ViewGraph
+    package var currentTimestamp: Time = .zero
+    package var propertiesNeedingUpdate: ViewRendererHostProperties = [.rootView] // FIXME
+    package var isRendering: Bool = false
     var inheritedEnvironment: EnvironmentValues?
     var environmentOverride: EnvironmentValues?
     weak var viewController: UIHostingController<Content>?
@@ -154,30 +154,30 @@ open class _UIHostingView<Content>: UIView where Content: View {
 }
 
 extension _UIHostingView: ViewRendererHost {
-    func addImplicitPropertiesNeedingUpdate(to _: inout ViewRendererHostProperties) {}
+    package func addImplicitPropertiesNeedingUpdate(to _: inout ViewRendererHostProperties) {}
 
-    func updateRootView() {
+    package func updateRootView() {
         let rootView = makeRootView()
         viewGraph.setRootView(rootView)
     }
 
-    func requestUpdate(after: Double) {
+    package func requestUpdate(after: Double) {
         // TODO
     }
 
-    func modifyViewInputs(_ inputs: inout _ViewInputs) {
+    package func modifyViewInputs(_ inputs: inout _ViewInputs) {
         // TODO
     }
 
-    func outputsDidChange(outputs: ViewGraph.Outputs) {
+    package func outputsDidChange(outputs: ViewGraph.Outputs) {
         // TODO
     }
 
-    func focusDidChange() {
+    package func focusDidChange() {
         // TODO
     }
 
-    func rootTransform() -> ViewTransform {
+    package func rootTransform() -> ViewTransform {
         fatalError("TODO")
     }
 

Sources/OpenSwiftUI/Test/TestIDView.swift

@@ -6,6 +6,7 @@
 //  Status: WIP
 
 internal import OpenGraphShims
+internal import OpenSwiftUICore
 
 struct TestIDView<Content, ID>: PrimitiveView, UnaryView {
     var content: Content

Sources/OpenSwiftUI/View/Control/Button/ButtonStyle/ButtonStyleConfiguration.swift

@@ -8,6 +8,8 @@
 public struct ButtonStyleConfiguration {
     public struct Label: ViewAlias {
         public typealias Body = Never
+
+        package init() {}
     }
 
     // 0x0 - 2 Byte

Sources/OpenSwiftUI/View/Control/Button/ButtonStyle/PrimitiveButtonStyleConfiguration.swift

@@ -8,6 +8,8 @@
 public struct PrimitiveButtonStyleConfiguration {
     public struct Label: ViewAlias {
         public typealias Body = Never
+
+        package init() {}
     }
 
     // 0x0 - 2 Byte

Sources/OpenSwiftUI/View/Control/Slider/Slider.swift

@@ -6,7 +6,7 @@
 //  Status: Blocked by Accessibility
 //  ID: F045F16106E380A820CC0B639278A953
 
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore
 
 /// A control for selecting a value from a bounded linear range of values.
 ///

Sources/OpenSwiftUI/Data/Preference/PreferenceBridge.swift → Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift

@@ -7,9 +7,8 @@
 //  ID: A9FAE381E99529D5274BA37A9BC9B074
 
 internal import OpenGraphShims
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
 
-final class PreferenceBridge {
+package final class PreferenceBridge {
     unowned let viewGraph: ViewGraph
     private(set) var children: [Unmanaged<ViewGraph>] = []
     var requestedPreferences = PreferenceKeys()

Sources/OpenSwiftUI/Data/Preference/View_Preference.swift → Sources/OpenSwiftUICore/Data/Preference/View_Preference.swift

@@ -6,9 +6,6 @@
 //  Status: Complete
 //  ID: 6C396F98EFDD04A6B58F2F9112448013
 
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
-@_spi(Private) import OpenSwiftUICore
-
 extension View {
     /// Sets a value for the given preference.
     @inlinable

Sources/OpenSwiftUI/EventHandling/InputEvent/HitTesting/ContentResponder.swift → Sources/OpenSwiftUICore/EventHandling/InputEvent/HitTesting/ContentResponder.swift

@@ -6,8 +6,7 @@
 //  Status: WIP
 
 import Foundation
-internal import COpenSwiftUI
-@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+internal import COpenSwiftUICore
 
 protocol ContentResponder {
     func contains(points: [CGPoint], size: CGSize) -> BitVector64