Perception 2.0

Author: stephencelis

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -26,9 +26,9 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
-    .package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-perception", from: "1.3.4"),
-    .package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"),
+    .package(url: "https://github.com/pointfreeco/swift-navigation", branch: "swift-6-2"),
+    .package(url: "https://github.com/pointfreeco/swift-perception", branch: "swift-6-2"),
+    .package(url: "https://github.com/pointfreeco/swift-sharing", branch: "swift-6-2"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
     .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
     .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),

Package.swift

@@ -26,9 +26,10 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
-    .package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-perception", from: "1.3.4"),
-    .package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"),
+    .package(url: "https://github.com/pointfreeco/swift-navigation", branch: "swift-6-2"),
+//    .package(url: "https://github.com/pointfreeco/swift-perception", branch: "swift-6-2"),
+    .package(path: "../swift-perception"),
+    .package(url: "https://github.com/pointfreeco/swift-sharing", branch: "swift-6-2"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
     .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
     .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),

[email protected]

@@ -61,9 +61,13 @@ final class RootCore<Root: Reducer>: Core {
     self.reducer = reducer
   }
   func send(_ action: Root.Action) -> Task<Void, Never>? {
-    _withoutPerceptionChecking {
+    #if DEBUG
+      _PerceptionLocals.$skipPerceptionChecking.withValue(true) {
+        _send(action)
+      }
+    #else
       _send(action)
-    }
+    #endif
   }
   private func _send(_ action: Root.Action) -> Task<Void, Never>? {
     self.bufferedActions.append(action)

Sources/ComposableArchitecture/Core.swift

@@ -92,6 +92,7 @@ extension Store where State: ObservableState {
 public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAccessCollection {
   private let store: Store<IdentifiedArray<ID, State>, IdentifiedAction<ID, Action>>
   private let data: IdentifiedArray<ID, State>
+  private let isInPerceptionTracking = _isInPerceptionTracking
 
   #if swift(<5.10)
     @MainActor(unsafe)
@@ -120,28 +121,37 @@ public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAc
     )
     return MainActor._assumeIsolated { [uncheckedSelf = UncheckedSendable(self)] in
       let `self` = uncheckedSelf.wrappedValue
-      guard self.data.indices.contains(position)
-      else {
-        return Store()
-      }
-      let elementID = self.data.ids[position]
-      let scopeID = self.store.id(state: \.[id: elementID], action: \.[id: elementID])
-      guard let child = self.store.children[scopeID] as? Store<State, Action>
-      else {
-        @MainActor
-        func open(
-          _ core: some Core<IdentifiedArray<ID, State>, IdentifiedAction<ID, Action>>
-        ) -> any Core<State, Action> {
-          IfLetCore(
-            base: core,
-            cachedState: self.data[position],
-            stateKeyPath: \.[id: elementID],
-            actionKeyPath: \.[id: elementID]
-          )
+      var child: Store<State, Action> {
+        guard self.data.indices.contains(position)
+        else {
+          return Store()
+        }
+        let elementID = self.data.ids[position]
+        let scopeID = self.store.id(state: \.[id: elementID], action: \.[id: elementID])
+        guard let child = self.store.children[scopeID] as? Store<State, Action>
+        else {
+          @MainActor
+          func open(
+            _ core: some Core<IdentifiedArray<ID, State>, IdentifiedAction<ID, Action>>
+          ) -> any Core<State, Action> {
+            IfLetCore(
+              base: core,
+              cachedState: self.data[position],
+              stateKeyPath: \.[id: elementID],
+              actionKeyPath: \.[id: elementID]
+            )
+          }
+          return self.store.scope(id: scopeID, childCore: open(self.store.core))
         }
-        return self.store.scope(id: scopeID, childCore: open(self.store.core))
+        return child
       }
-      return child
+      #if DEBUG
+        return _PerceptionLocals.$isInPerceptionTracking.withValue(self.isInPerceptionTracking) {
+          child
+        }
+      #else
+        return child
+      #endif
     }
   }
 }

Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift

@@ -483,7 +483,7 @@ extension Store {
 
 @_spi(Internals)
 public var _isInPerceptionTracking: Bool {
-  #if !os(visionOS)
+  #if DEBUG && !os(visionOS)
     return _PerceptionLocals.isInPerceptionTracking
   #else
     return false

Sources/ComposableArchitecture/Observation/NavigationStack+Observation.swift

@@ -167,7 +167,13 @@ public final class Store<State, Action>: _Store {
   ///   it conforms to ``ObservableState``.
   /// - Returns: The return value, if any, of the `body` closure.
   public func withState<R>(_ body: (_ state: State) -> R) -> R {
-    _withoutPerceptionChecking { body(self.currentState) }
+    #if DEBUG
+      _PerceptionLocals.$skipPerceptionChecking.withValue(true) {
+        body(self.currentState)
+      }
+    #else
+      body(self.currentState)
+    #endif
   }
 
   /// Sends an action to the store.