Suppress more potential perception checks/warnings

Author: stephencelis

Sources/ComposableArchitecture/Core.swift

@@ -205,7 +205,7 @@ final class ScopedCore<Base: Core, State, Action>: Core {
   let stateKeyPath: KeyPath<Base.State, State>
   let actionKeyPath: CaseKeyPath<Base.Action, Action>
   #if DEBUG
-    let isInPerceptionTracking = _PerceptionLocals.isInPerceptionTracking
+    let isInPerceptionTracking = _isInPerceptionTracking
   #endif
   init(
     base: Base,
@@ -220,7 +220,9 @@ final class ScopedCore<Base: Core, State, Action>: Core {
   @inline(__always)
   var state: State {
     #if DEBUG
-      return _PerceptionLocals.$skipPerceptionChecking.withValue(isInPerceptionTracking) {
+      return _PerceptionLocals.$skipPerceptionChecking.withValue(
+        isInPerceptionTracking || _isInPerceptionTracking
+      ) {
         base.state[keyPath: stateKeyPath]
       }
     #else

Sources/ComposableArchitecture/Store.swift

@@ -336,7 +336,7 @@ public final class Store<State, Action>: _Store {
       func subscribeToDidSet<T: ObservableState>(_ type: T.Type) -> AnyCancellable {
         return core.didSet
           .prefix { [weak self] _ in self?.core.isInvalid == false }
-          .compactMap { [weak self] in (self?.currentState as? T)?._$id }
+          .compactMap { [weak self] in (self?.withState(\.self) as? T)?._$id }
           .removeDuplicates()
           .dropFirst()
           .sink { [weak self, weak parent] _ in