fix: fix the access levels

Author: helbertgs

Sources/OpenSwiftUI/App Structure/App Organization/Supporting types/Application.swift

@@ -3,24 +3,24 @@ import OpenGLFW
 import OpenSpatial
 
 /// An object that manages an app’s main event loop and resources used by all of that app’s objects.
-@MainActor package class Application {
+@MainActor class Application {
 
-    package var globalEnvironmentValues = EnvironmentValues()
+    var globalEnvironmentValues = EnvironmentValues()
 
     // MARK: - Getting the shared app object
 
     /// Accessing the shared application
-    package static let shared = Application()
+    static let shared = Application()
 
-    package var appGraph: GraphHost? = nil
+    var appGraph: GraphHost? = nil
 
     // MARK: - Managing the event loop
 
     /// A Boolean value indicating whether the main event loop is running.
-    package var isRunning: Bool = false
+    var isRunning: Bool = false
 
     /// Starts the main event loop.
-    package func run<T: App>(_ app: T) {
+    func run<T: App>(_ app: T) {
         print("\(Self.self).\(#function)")
 
         guard glfwInit() == GLFW_TRUE else {
@@ -65,7 +65,7 @@ import OpenSpatial
     // MARK: - Terminating the app
 
     /// Terminates the receiver.
-    package func terminate(_ sender: Any?) {
+    func terminate(_ sender: Any?) {
         isRunning = false
     }
 }

Sources/OpenSwiftUI/Framework Integration/Windows and Linux/AppGraph.swift

@@ -3,29 +3,30 @@ import OpenCombine
 import OpenSpatial
 
 /// A graph host for an app.
-package final class AppGraph<AppType: App> : GraphHost {
+@MainActor
+class AppGraph<AppType: App> : GraphHost {
 
     /// The app instance.
-    package let app: AppType
+    let app: AppType
 
     /// The environment values for the app.
-    package var environmentValues: EnvironmentValues
+    let environmentValues: EnvironmentValues
 
     // /// The root scene graph for the app (built from `app.body`).
     // package private(set) var sceneGraph: SceneGraph? = nil
 
     /// Creates an app graph with the given value.
     ///
     /// - Parameter value: The value of the app graph.
-    package init(_ app: AppType, environmentValues: EnvironmentValues) {
+    init(_ app: AppType, environmentValues: EnvironmentValues) {
         self.app = app
         self.environmentValues = environmentValues
         super.init()
 
         self.mount()
     }
 
-    override package func mount() {
+    override func mount() {
         var inputs = _SceneInputs()
         inputs.environmentValues = environmentValues
 

Sources/OpenSwiftUI/Framework Integration/Windows and Linux/GraphHost.swift

@@ -1,25 +1,25 @@
 import Foundation
 
 /// A graph host.
-package class GraphHost {
+@MainActor class GraphHost {
 
     /// The parent of the graph host.
-    package weak var parent: GraphHost? = nil
+    weak var parent: GraphHost? = nil
 
     /// The children of the graph host.
-    package var children: [GraphHost] = []
+    var children: [GraphHost] = []
 
-    @inlinable package func appendChild(_ child: GraphHost) {
+    func appendChild(_ child: GraphHost) {
         child.parent = self
         children.append(child)
     }
 
-    package func mount() {
+    func mount() {
     }
 
-    package func unmount() {
+    func unmount() {
     }
 
-    package func update() {
+    func update() {
     }
 }

Sources/OpenSwiftUI/Framework Integration/Windows and Linux/SceneGraph.swift

@@ -3,42 +3,43 @@ import OpenCombine
 import OpenSpatial
 
 /// A graph host for a scene.
-package final class SceneGraph : GraphHost {
+@MainActor 
+class SceneGraph : GraphHost {
 
     // MARK: - Represented object
 
     /// The scene outputs snapshot for this node.
-    package private(set) var outputs: _SceneOutputs
+    private(set) var outputs: _SceneOutputs
 
     // MARK : - Window Associated objects
 
     /// Runtime window for renderable scenes (e.g. `Window`).
-    package private(set) var window: _Window? = nil
+    private(set) var window: _Window? = nil
 
     // MARK: - Runtime Associated objects
 
     /// The environment values for the scene.
-    package var environmentValues: EnvironmentValues
+    var environmentValues: EnvironmentValues
 
     /// Whether this scene is the main scene.
-    package var isMain: Bool = false
+    var isMain: Bool = false
 
     /// The title of the scene.
-    package var title: PassthroughSubject<String, Never> = PassthroughSubject<String, Never>()
+    var title: PassthroughSubject<String, Never> = PassthroughSubject<String, Never>()
 
     /// The phase of the scene.
-    package var scenePhase: PassthroughSubject<ScenePhase, Never> = PassthroughSubject<ScenePhase, Never>()
+    var scenePhase: PassthroughSubject<ScenePhase, Never> = PassthroughSubject<ScenePhase, Never>()
 
     /// The runtime subscriptions for this node.
-    private var cancellables: Set<AnyCancellable> = []
+    var cancellables: Set<AnyCancellable> = []
 
     /// The runtime view graph for this scene's root view.
-    @MainActor package private(set) var viewGraph: ViewGraph? = nil
+    private(set) var viewGraph: ViewGraph? = nil
 
     /// Creates a scene graph with the given outputs.
     ///
     /// - Parameter outputs: The outputs of the scene.
-    package init(outputs: _SceneOutputs) {
+    init(outputs: _SceneOutputs) {
         self.outputs = outputs
         self.environmentValues = outputs.environmentValues
 
@@ -61,7 +62,7 @@ package final class SceneGraph : GraphHost {
     // MARK: - Runtime lifecycle
 
     /// Creates runtime objects for this scene node and its descendants.
-    @MainActor package func mountRuntime() {
+    func mountRuntime() {
         if let content = outputs.content {
             // Create window from scene outputs (runtime lives in the graph, not in outputs).
             let title = outputs.title ?? String(describing: outputs.type)
@@ -88,7 +89,7 @@ package final class SceneGraph : GraphHost {
         }
     }
 
-    @MainActor package func unmountRuntime() {
+    func unmountRuntime() {
         cancellables.removeAll()
         if let w = window {
             w.destroy()
@@ -101,7 +102,7 @@ package final class SceneGraph : GraphHost {
         }
     }
 
-    override package func mount() {
+    override func mount() {
         let window = _Window(frame: Rect3D(center: Point3D.zero, size: Size3D(width: 900, height: 450, depth: 0)), title: "\(Self.self)")
         self.window = window
         window.delegate = self
@@ -116,7 +117,7 @@ package final class SceneGraph : GraphHost {
     /// Reconciles this node with a new `_SceneOutputs` snapshot.
     ///
     /// Identity is based on `outputs.id`. For nodes without stable IDs, this will recreate.
-    @MainActor package func reconcile(newOutputs: _SceneOutputs) {
+    func reconcile(newOutputs: _SceneOutputs) {
         let oldHadWindow = (outputs.content != nil)
         let newHasWindow = (newOutputs.content != nil)
 
@@ -186,15 +187,15 @@ package final class SceneGraph : GraphHost {
 
     // MARK: - Queries
 
-    @MainActor package func firstWindow() -> _Window? {
+    func firstWindow() -> _Window? {
         if let w = window { return w }
         for child in children {
             if let w = (child as? SceneGraph)?.firstWindow() { return w }
         }
         return nil
     }
 
-    @MainActor package func collectWindowScenes(into result: inout [SceneGraph]) {
+    func collectWindowScenes(into result: inout [SceneGraph]) {
         if window != nil {
             result.append(self)
         }
@@ -204,7 +205,7 @@ package final class SceneGraph : GraphHost {
     }
 }
 
-extension SceneGraph : CustomStringConvertible {
+extension SceneGraph : @MainActor CustomStringConvertible {
     package var description: String {
         """
         - SceneGraph<outputs: \(outputs.type)>
@@ -214,7 +215,7 @@ extension SceneGraph : CustomStringConvertible {
     }
 }
 
-extension SceneGraph : WindowDelegate {
+extension SceneGraph : @MainActor WindowDelegate {
 
     /// Tells the delegate that the window is about to be minimized.
     package func windowWillMiniaturize(_ window: _Window) {

Sources/OpenSwiftUI/Framework Integration/Windows and Linux/ViewGraph.swift

@@ -1,27 +1,27 @@
 import Foundation
 
 /// A graph host for a view.
-package final class ViewGraph : GraphHost {
+class ViewGraph : GraphHost {
 
     /// The last built outputs snapshot.
-    package private(set) var outputs: _ViewOutputs
+    private(set) var outputs: _ViewOutputs
 
     /// Whether this view graph needs to be re-built/re-rendered.
-    package var isDirty: Bool = true
+    var isDirty: Bool = true
 
-    package init(outputs: _ViewOutputs) {
+    init(outputs: _ViewOutputs) {
         self.outputs = outputs
     }
 
-    package func markDirty() {
+    func markDirty() {
         isDirty = true
     }
 
-    package func clearDirty() {
+    func clearDirty() {
         isDirty = false
     }
 
-    package func updateOutputs(_ newOutputs: _ViewOutputs) {
+    func updateOutputs(_ newOutputs: _ViewOutputs) {
         outputs = newOutputs
         markDirty()
     }