Allow and prefer Optional values for StoredState

0xLeif · Nov 5, 2023 · b80175f · b80175f
1 parent a290b0a
commit b80175f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/Sources/AppState/Application+StoredState.swift b/Sources/AppState/Application+StoredState.swift
@@ -33,15 +33,22 @@ extension Application {
             }
             set {
                 let userDefaults = Application.dependency(\.userDefaults)
+                let mirror = Mirror(reflecting: newValue)
 
-                shared.cache.set(
-                    value: Application.State(
-                        initial: newValue,
-                        scope: scope
-                    ),
-                    forKey: scope.key
-                )
-                userDefaults.set(newValue, forKey: scope.key)
+                if mirror.displayStyle == .optional,
+                   mirror.children.isEmpty {
+                    shared.cache.remove(scope.key)
+                    userDefaults.removeObject(forKey: scope.key)
+                } else {
+                    shared.cache.set(
+                        value: Application.State(
+                            initial: newValue,
+                            scope: scope
+                        ),
+                        forKey: scope.key
+                    )
+                    userDefaults.set(newValue, forKey: scope.key)
+                }
             }
         }
 

diff --git a/Tests/AppStateTests/AppStateTests.swift b/Tests/AppStateTests/AppStateTests.swift
@@ -35,8 +35,8 @@ extension Application {
         state(initial: ["primary": CGColor(red: 1, green: 0, blue: 1, alpha: 1)])
     }
 
-    var storedValue: StoredState<Int> {
-        storedState(initial: -1, id: "storedValue")
+    var storedValue: StoredState<Int?> {
+        storedState(initial: nil, id: "storedValue")
     }
 }
 
@@ -141,34 +141,34 @@ final class AppStateTests: XCTestCase {
     }
 
     func testStoredState() {
-        XCTAssertEqual(Application.storedState(\.storedValue).value, -1)
+        XCTAssertNil(Application.storedState(\.storedValue).value)
 
         let storedValue = ExampleStoredValue()
 
-        XCTAssertEqual(storedValue.count, -1)
+        XCTAssertEqual(storedValue.count, nil)
 
-        storedValue.count = 2
+        storedValue.count = 1
 
-        XCTAssertEqual(storedValue.count, 2)
+        XCTAssertEqual(storedValue.count, 1)
 
-        Application.remove(storedState: \.storedValue)
+        storedValue.count = nil
 
-        XCTAssertEqual(Application.storedState(\.storedValue).value, -1)
+        XCTAssertNil(Application.storedState(\.storedValue).value)
     }
 
     func testStoringViewModel() {
-        XCTAssertEqual(Application.storedState(\.storedValue).value, -1)
+        XCTAssertNil(Application.storedState(\.storedValue).value)
 
         let viewModel = ExampleStoringViewModel()
 
-        XCTAssertEqual(viewModel.count, -1)
+        XCTAssertEqual(viewModel.count, nil)
 
         viewModel.count = 2
 
         XCTAssertEqual(viewModel.count, 2)
 
         Application.remove(storedState: \.storedValue)
 
-        XCTAssertEqual(viewModel.count, -1)
+        XCTAssertNil(viewModel.count)
     }
 }