Add reconciler stress tests for elaborate testing (#381)

Most of the changes are related to the use of OpenCombineShim (available in upstream OpenCombine now) instead of CombineShim. But there is also a new test added during the investigation of #367, where an app is rendered end-to end, which is a good way to expand our test suite I think. * Use immediate scheduler in TestRenderer This allows running our test suite on WASI too, which doesn't have Dispatch and also can't wait on XCTest expectations. Previously none of our tests (especially runtime reflection tests) ran on WASI. * Run `carton test` and `carton bundle` in separate jobs * Bump year in the `LICENSE` file * Add reconciler stress tests for elaborate testing * Move default App implementation to TestRenderer * Use OpenCombineShim instead of CombineShim
TokamakUI · Jun 15, 2021 · ac69bbc · ac69bbc
1 parent 3302a51
commit ac69bbc
Show file tree

Hide file tree

Showing 29 changed files with 165 additions and 64 deletions.
diff --git a/Package.swift b/Package.swift
@@ -62,17 +62,14 @@ let package = Package(
     // a module or a test suite.
     // Targets can depend on other targets in this package, and on products
     // in packages which this package depends on.
-    .target(
-      name: "CombineShim",
-      dependencies: [.product(
-        name: "OpenCombine",
-        package: "OpenCombine",
-        condition: .when(platforms: [.wasi, .linux])
-      )]
-    ),
     .target(
       name: "TokamakCore",
-      dependencies: ["CombineShim"]
+      dependencies: [
+        .product(
+          name: "OpenCombineShim",
+          package: "OpenCombine"
+        ),
+      ]
     ),
     .target(
       name: "TokamakShim",
@@ -105,7 +102,13 @@ let package = Package(
     ),
     .target(
       name: "TokamakGTK",
-      dependencies: ["TokamakCore", "CGTK", "CGDK", "TokamakGTKCHelpers", "CombineShim"]
+      dependencies: [
+        "TokamakCore", "CGTK", "CGDK", "TokamakGTKCHelpers",
+        .product(
+          name: "OpenCombineShim",
+          package: "OpenCombine"
+        ),
+      ]
     ),
     .target(
       name: "TokamakGTKDemo",
@@ -135,15 +138,18 @@ let package = Package(
     .target(
       name: "TokamakDOM",
       dependencies: [
-        "CombineShim",
-        "OpenCombineJS",
         "TokamakCore",
         "TokamakStaticHTML",
+        .product(
+          name: "OpenCombineShim",
+          package: "OpenCombine"
+        ),
         .product(
           name: "JavaScriptKit",
           package: "JavaScriptKit",
           condition: .when(platforms: [.wasi])
         ),
+        "OpenCombineJS",
       ]
     ),
     .target(

diff --git a/Sources/TokamakCore/App/App.swift b/Sources/TokamakCore/App/App.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/16/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 /// Provides the ability to set the title of the Scene.
 public protocol _TitledApp {

diff --git a/Sources/TokamakCore/App/AppStorage.swift b/Sources/TokamakCore/App/AppStorage.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/16/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 @propertyWrapper public struct AppStorage<Value>: DynamicProperty {
   let provider: _StorageProvider?

diff --git a/Sources/TokamakCore/App/Scenes/SceneStorage.swift b/Sources/TokamakCore/App/Scenes/SceneStorage.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/17/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 /// The renderer must specify a default `_StorageProvider` before any `SceneStorage`
 /// values are accessed.

diff --git a/Sources/TokamakCore/App/_AnyApp.swift b/Sources/TokamakCore/App/_AnyApp.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/19/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 public struct _AnyApp: App {
   var app: Any

diff --git a/Sources/TokamakCore/App/_StorageProvider.swift b/Sources/TokamakCore/App/_StorageProvider.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/22/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 public protocol _StorageProvider {
   func store(key: String, value: Bool?)

diff --git a/Sources/TokamakCore/Environment/EnvironmentObject.swift b/Sources/TokamakCore/Environment/EnvironmentObject.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/7/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 @propertyWrapper public struct EnvironmentObject<ObjectType>: DynamicProperty
   where ObjectType: ObservableObject

diff --git a/Sources/TokamakCore/Environment/EnvironmentValues.swift b/Sources/TokamakCore/Environment/EnvironmentValues.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CombineShim
+import OpenCombineShim
 
 public struct EnvironmentValues: CustomStringConvertible {
   public var description: String {

diff --git a/Sources/TokamakCore/MountedViews/MountedApp.swift b/Sources/TokamakCore/MountedViews/MountedApp.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/19/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 // This is very similar to `MountedCompositeView`. However, the `mountedBody`
 // is the computed content of the specified `Scene`, instead of having child

diff --git a/Sources/TokamakCore/MountedViews/MountedCompositeElement.swift b/Sources/TokamakCore/MountedViews/MountedCompositeElement.swift
@@ -1,4 +1,4 @@
-// Copyright 2018-2020 Tokamak contributors
+// Copyright 2018-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/19/20.
 //
 
-import CombineShim
+import OpenCombineShim
 
 class MountedCompositeElement<R: Renderer>: MountedElement<R> {
   let parentTarget: R.TargetType

diff --git a/Sources/TokamakCore/MountedViews/MountedCompositeView.swift b/Sources/TokamakCore/MountedViews/MountedCompositeView.swift
@@ -15,7 +15,7 @@
 //  Created by Max Desiatov on 03/12/2018.
 //
 
-import CombineShim
+import OpenCombineShim
 
 final class MountedCompositeView<R: Renderer>: MountedCompositeElement<R> {
   override func mount(

diff --git a/Sources/TokamakCore/Reflection/Layouts/FieldDescriptor.swift b/Sources/TokamakCore/Reflection/Layouts/FieldDescriptor.swift
@@ -30,8 +30,7 @@ func _getTypeByMangledNameInContext(
   _ nameLength: UInt,
   _ genericContext: UnsafeRawPointer?,
   _ genericArguments: UnsafeRawPointer?
-)
-  -> Any.Type?
+) -> Any.Type?
 
 /// https://github.com/apple/swift/blob/f2c42509628bed66bf5b8ee02fae778a2ba747a1/include/swift/Reflection/Records.h#L160
 struct FieldDescriptor {

diff --git a/Sources/TokamakCore/StackReconciler.swift b/Sources/TokamakCore/StackReconciler.swift
@@ -15,7 +15,7 @@
 //  Created by Max Desiatov on 28/11/2018.
 //
 
-import CombineShim
+import OpenCombineShim
 
 /** A class that reconciles a "raw" tree of element values (such as `App`, `Scene` and `View`,
  all coming from `body` or `renderedBody` properties) with a tree of mounted element instances

diff --git a/Sources/TokamakCore/State/ObservedObject.swift b/Sources/TokamakCore/State/ObservedObject.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CombineShim
+import OpenCombineShim
 
-public typealias ObservableObject = CombineShim.ObservableObject
-public typealias Published = CombineShim.Published
+public typealias ObservableObject = OpenCombineShim.ObservableObject
+public typealias Published = OpenCombineShim.Published
 
 protocol ObservedProperty: DynamicProperty {
   var objectWillChange: AnyPublisher<(), Never> { get }

diff --git a/Sources/TokamakCore/State/StateObject.swift b/Sources/TokamakCore/State/StateObject.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CombineShim
+import OpenCombineShim
 
 @propertyWrapper
 public struct StateObject<ObjectType: ObservableObject>: DynamicProperty {

diff --git a/Sources/TokamakCore/Views/Containers/List/List+Init.swift b/Sources/TokamakCore/Views/Containers/List/List+Init.swift
@@ -31,7 +31,6 @@ public extension List {
 
   init<Data, ID, RowContent>(
     _ data: Data,
-
     id: KeyPath<Data.Element, ID>,
     selection: Binding<Set<SelectionValue>>?,
     @ViewBuilder rowContent: @escaping (Data.Element) -> RowContent

diff --git a/Sources/TokamakDOM/App/App.swift b/Sources/TokamakDOM/App/App.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 //  Created by Carson Katri on 7/16/20.
 //
 
-import CombineShim
 import JavaScriptKit
+import OpenCombineShim
 import TokamakCore
 import TokamakStaticHTML
 

diff --git a/Sources/TokamakDOM/App/ColorSchemeObserver.swift b/Sources/TokamakDOM/App/ColorSchemeObserver.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CombineShim
 import JavaScriptKit
+import OpenCombineShim
 
 enum ColorSchemeObserver {
   static var publisher = CurrentValueSubject<ColorScheme, Never>(

diff --git a/Sources/TokamakDOM/App/ScenePhaseObserver.swift b/Sources/TokamakDOM/App/ScenePhaseObserver.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import CombineShim
 import JavaScriptKit
+import OpenCombineShim
 
 enum ScenePhaseObserver {
   static var publisher = CurrentValueSubject<ScenePhase, Never>(.active)

diff --git a/Sources/TokamakDOM/Storage/LocalStorage.swift b/Sources/TokamakDOM/Storage/LocalStorage.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 //  Created by Carson Katri on 7/20/20.
 //
 
-import CombineShim
 import JavaScriptKit
+import OpenCombineShim
 import TokamakCore
 
 private let rootPublisher = ObservableObjectPublisher()

diff --git a/Sources/TokamakDOM/Storage/SessionStorage.swift b/Sources/TokamakDOM/Storage/SessionStorage.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 //  Created by Carson Katri on 7/20/20.
 //
 
-import CombineShim
 import JavaScriptKit
+import OpenCombineShim
 import TokamakCore
 
 private let sessionStorage = JSObject.global.sessionStorage.object!

diff --git a/Sources/TokamakDOM/Storage/WebStorage.swift b/Sources/TokamakDOM/Storage/WebStorage.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 //  Created by Carson Katri on 7/21/20.
 //
 
-import CombineShim
 import JavaScriptKit
+import OpenCombineShim
 import TokamakCore
 
 protocol WebStorage {

diff --git a/Sources/TokamakDemo/ButtonStyleDemo.swift b/Sources/TokamakDemo/ButtonStyleDemo.swift
@@ -62,9 +62,9 @@ public struct ButtonStyleDemo: View {
           Text("Label").padding(.leading, 5)
         }
       })
-      .buttonStyle(
-            PressedButtonStyle(pressedColor: Color.red)
-      )
+        .buttonStyle(
+          PressedButtonStyle(pressedColor: Color.red)
+        )
     }
   }
 }
diff --git a/Sources/TokamakGTK/App/App.swift b/Sources/TokamakGTK/App/App.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 //
 
 import CGTK
-import CombineShim
 import Dispatch
+import OpenCombineShim
 import TokamakCore
 
 public extension App {

diff --git a/Sources/TokamakStaticHTML/App.swift b/Sources/TokamakStaticHTML/App.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/31/20.
 //
 
-import CombineShim
+import OpenCombineShim
 import TokamakCore
 
 public extension App {