wip

Author: stephencelis

.github/workflows/ci.yml

@@ -113,7 +113,7 @@ jobs:
         run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Todos" xcodebuild-raw
       - name: VoiceMemos
         run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="VoiceMemos" xcodebuild-raw
-        
+
   check-macro-compatibility:
     name: Check Macro Compatibility
     runs-on: macos-latest

Makefile

@@ -12,6 +12,8 @@ PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS,Watch)
 PLATFORM = IOS
 DESTINATION = platform="$(PLATFORM_$(PLATFORM))"
 
+PLATFORM_ID = $(shell echo "$(DESTINATION)" | sed -E "s/.+,id=(.+)/\1/")
+
 SCHEME = ComposableArchitecture
 
 WORKSPACE = ComposableArchitecture.xcworkspace
@@ -36,11 +38,17 @@ endif
 
 TEST_RUNNER_CI = $(CI)
 
-xcodebuild:
+warm-simulator:
+	@test "$(PLATFORM_ID)" != "" \
+		&& xcrun simctl boot $(PLATFORM_ID) \
+		&& open -a Simulator --args -CurrentDeviceUDID $(PLATFORM_ID) \
+		|| exit 0
+
+xcodebuild: warm-simulator
 	$(XCODEBUILD)
 
 # Workaround for debugging Swift Testing tests: https://github.com/cpisciotta/xcbeautify/issues/313
-xcodebuild-raw:
+xcodebuild-raw: warm-simulator
 	$(XCODEBUILD_COMMAND)
 
 build-for-library-evolution:
@@ -58,7 +66,7 @@ format:
 		-not -path '*/.*' -print0 \
 		| xargs -0 swift format --ignore-unparsable-files --in-place
 
-.PHONY: build-for-library-evolution format xcodebuild
+.PHONY: build-for-library-evolution format warm-simulator xcodebuild xcodebuild-raw
 
 define udid_for
 $(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')

Sources/ComposableArchitecture/SharedState/PersistenceKey/AppStorageKey.swift

@@ -291,7 +291,7 @@ extension AppStorageKey: PersistenceKey {
   ) -> Shared<Value>.Subscription {
     let previousValue = LockIsolated(initialValue)
     let removeObserver: () -> Void
-    if key.contains(".") {
+    if key.hasPrefix("@") || key.contains(".") {
       let userDefaultsDidChange = NotificationCenter.default.addObserver(
         forName: UserDefaults.didChangeNotification,
         object: store.wrappedValue,
@@ -318,10 +318,10 @@ extension AppStorageKey: PersistenceKey {
       }
       removeObserver = { NotificationCenter.default.removeObserver(userDefaultsDidChange) }
     } else {
-      let observer = Observer { newValue in
+      let observer = Observer {
         guard !SharedAppStorageLocals.isSetting
         else { return }
-        didSet(newValue)
+        didSet(load(initialValue: initialValue))
       }
       store.wrappedValue.addObserver(observer, forKeyPath: key, options: .new, context: nil)
       removeObserver = { store.wrappedValue.removeObserver(observer, forKeyPath: key) }
@@ -345,6 +345,22 @@ extension AppStorageKey: PersistenceKey {
       }
     }
   }
+
+  private class Observer: NSObject {
+    let didChange: () -> Void
+    init(didChange: @escaping () -> Void) {
+      self.didChange = didChange
+      super.init()
+    }
+    override func observeValue(
+      forKeyPath keyPath: String?,
+      of object: Any?,
+      change: [NSKeyValueChangeKey: Any]?,
+      context: UnsafeMutableRawPointer?
+    ) {
+      self.didChange()
+    }
+  }
 }
 
 private struct AppStorageKeyID: Hashable {

Sources/ComposableArchitecture/SharedState/PersistenceKey/AppStorageKeyPathKey.swift

@@ -60,22 +60,6 @@ extension AppStorageKeyPathKey: PersistenceKey, Hashable {
       observer.invalidate()
     }
   }
-
-  private class Observer: NSObject {
-    let didChange: (Value?) -> Void
-    init(didChange: @escaping (Value?) -> Void) {
-      self.didChange = didChange
-      super.init()
-    }
-    override func observeValue(
-      forKeyPath keyPath: String?,
-      of object: Any?,
-      change: [NSKeyValueChangeKey: Any]?,
-      context: UnsafeMutableRawPointer?
-    ) {
-      self.didChange(change?[.newKey] as? Value)
-    }
-  }
 }
 
 // NB: This is mainly used for tests, where observer notifications can bleed across cases.