From 12584d156a1ef2bed8129b5da85e716a17ca2069 Mon Sep 17 00:00:00 2001
From: Gronod <gordon@i3omb.com>
Date: Fri, 11 Sep 2026 10:34:36 +0100
Subject: [PATCH] fix(persistence): complete M8 JSON store contracts (#81)

---
 .../ICCeryCore/Files/JSONFileStore.swift      | 13 ++---
 .../Profile/VerificationHistoryStore.swift    |  4 ++
 .../ICCeryCoreTests/JSONFileStoreTests.swift  | 34 ++++++++++++-
 Tests/ICCeryCoreTests/SettingsTests.swift     | 22 ++++++++
 .../VerificationHistoryStoreTests.swift       | 51 +++++++++++++++++++
 Tests/ICCeryCoreTests/WizardGatingTests.swift | 11 ++++
 6 files changed, 127 insertions(+), 8 deletions(-)

diff --git a/Packages/ICCeryCore/Sources/ICCeryCore/Files/JSONFileStore.swift b/Packages/ICCeryCore/Sources/ICCeryCore/Files/JSONFileStore.swift
index 3da31f3..d9a5afe 100644
--- a/Packages/ICCeryCore/Sources/ICCeryCore/Files/JSONFileStore.swift
+++ b/Packages/ICCeryCore/Sources/ICCeryCore/Files/JSONFileStore.swift
@@ -27,10 +27,7 @@ public struct JSONFileStore<T: Codable & Sendable>: Sendable {
         self.fileURL = fileURL
         self.corrupt = corrupt
         self.defaultValue = defaultValue
-        let encoder = JSONEncoder()
-        encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
-        encoder.dateEncodingStrategy = dateEncoding
-        self.encoder = encoder
+        self.encoder = JSONEncoder.icceryPretty(dateEncoding: dateEncoding)
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = dateDecoding
         self.decoder = decoder
@@ -75,10 +72,14 @@ public struct JSONFileStore<T: Codable & Sendable>: Sendable {
 }
 
 extension JSONEncoder {
-    /// Pretty-printed, sorted-keys encoder used by preset export.
-    public static func icceryPretty() -> JSONEncoder {
+    /// Shared pretty-printed, sorted-keys encoder used by `JSONFileStore`
+    /// and preset export.
+    static func icceryPretty(
+        dateEncoding: JSONEncoder.DateEncodingStrategy = .deferredToDate
+    ) -> JSONEncoder {
         let encoder = JSONEncoder()
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
+        encoder.dateEncodingStrategy = dateEncoding
         return encoder
     }
 }
diff --git a/Packages/ICCeryCore/Sources/ICCeryCore/Profile/VerificationHistoryStore.swift b/Packages/ICCeryCore/Sources/ICCeryCore/Profile/VerificationHistoryStore.swift
index fea54c9..707ee7d 100644
--- a/Packages/ICCeryCore/Sources/ICCeryCore/Profile/VerificationHistoryStore.swift
+++ b/Packages/ICCeryCore/Sources/ICCeryCore/Profile/VerificationHistoryStore.swift
@@ -73,7 +73,11 @@ public actor VerificationHistoryStore {
     }
 
     /// Removes all history and updates disk.
+    ///
+    /// Loads the existing history first and propagates any load error so an
+    /// unparseable file is never overwritten.
     public func clear() throws {
+        try load()
         try write([])
         records = []
     }
diff --git a/Tests/ICCeryCoreTests/JSONFileStoreTests.swift b/Tests/ICCeryCoreTests/JSONFileStoreTests.swift
index b9f20c2..550a0fb 100644
--- a/Tests/ICCeryCoreTests/JSONFileStoreTests.swift
+++ b/Tests/ICCeryCoreTests/JSONFileStoreTests.swift
@@ -9,7 +9,17 @@ struct JSONFileStoreTests {
             .appendingPathComponent("json-store-\(UUID().uuidString).json")
     }
 
-    @Test("Corrupt file with replaceWithDefault returns default")
+    @Test("Missing file returns default")
+    func missingFileDefaults() throws {
+        let store = JSONFileStore<AppSettings>(
+            fileURL: tempURL(),
+            corrupt: .throwCorrupt,
+            defaultValue: { .default }
+        )
+        #expect(try store.load() == .default)
+    }
+
+    @Test("Corrupt file with replaceWithDefault returns default and leaves bytes")
     func corruptDefaults() throws {
         let url = tempURL()
         try "{ not json".write(to: url, atomically: true, encoding: .utf8)
@@ -19,7 +29,8 @@ struct JSONFileStoreTests {
             defaultValue: { .default }
         )
         #expect(try store.load() == .default)
-        #expect(FileManager.default.fileExists(atPath: url.path))
+        let kept = try String(contentsOf: url, encoding: .utf8)
+        #expect(kept == "{ not json")
     }
 
     @Test("Corrupt file with throwCorrupt throws and leaves bytes")
@@ -50,6 +61,25 @@ struct JSONFileStoreTests {
         let text = try String(contentsOf: url, encoding: .utf8)
         #expect(text.contains("\n"))
         #expect(text.contains("\"delta_e_good_max\""))
+        // Lexical key sorting: ascending order of top-level keys.
+        let keys = [
+            "ask_before_overwrite_profile",
+            "calibration_stale_days",
+            "custom_presets",
+            "default_install_location",
+            "delta_e_good_max",
+            "delta_e_warning_max",
+            "enable_i1pro2_leds",
+            "open_color_panel_after_install",
+        ]
+        var lastIndex = text.startIndex
+        for key in keys {
+            guard let range = text.range(of: "\"\(key)\"", range: lastIndex..<text.endIndex) else {
+                Issue.record("missing or out-of-order key \(key)")
+                return
+            }
+            lastIndex = range.upperBound
+        }
     }
 }
 
diff --git a/Tests/ICCeryCoreTests/SettingsTests.swift b/Tests/ICCeryCoreTests/SettingsTests.swift
index 5fed795..9b86b15 100644
--- a/Tests/ICCeryCoreTests/SettingsTests.swift
+++ b/Tests/ICCeryCoreTests/SettingsTests.swift
@@ -93,6 +93,28 @@ struct SettingsStoreTests {
         #expect(!FileManager.default.fileExists(atPath: url.path))
     }
 
+    @Test func invalidSaveOverValidFilePreservesBytesAndPostsNothing() throws {
+        let url = tempStoreURL()
+        let store = SettingsStore(fileURL: url)
+        var valid = AppSettings.default
+        valid.deltaEGoodMax = 1.5
+        try store.save(valid)
+        let originalBytes = try Data(contentsOf: url)
+
+        var fired = false
+        let token = NotificationCenter.default.addObserver(
+            forName: SettingsStore.settingsDidChange, object: nil, queue: nil
+        ) { _ in fired = true }
+        defer { NotificationCenter.default.removeObserver(token) }
+
+        var invalid = AppSettings.default
+        invalid.deltaEGoodMax = 9.0
+        #expect(throws: SettingsStore.SettingsError.self) { try store.save(invalid) }
+        #expect(try Data(contentsOf: url) == originalBytes)
+        #expect(!fired)
+        #expect(store.load() == valid)
+    }
+
     @Test func savePostsNotification() async throws {
         let url = tempStoreURL()
         let store = SettingsStore(fileURL: url)
diff --git a/Tests/ICCeryCoreTests/VerificationHistoryStoreTests.swift b/Tests/ICCeryCoreTests/VerificationHistoryStoreTests.swift
index 91a63fc..313b297 100644
--- a/Tests/ICCeryCoreTests/VerificationHistoryStoreTests.swift
+++ b/Tests/ICCeryCoreTests/VerificationHistoryStoreTests.swift
@@ -131,6 +131,57 @@ struct VerificationHistoryStoreTests {
         }
     }
 
+    @Test("Clear does not overwrite an unparseable file")
+    func clearPreservesUnparseableFile() async {
+        let fm = FileManager.default
+        let tmp = fm.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        try? fm.createDirectory(at: tmp, withIntermediateDirectories: true)
+        let url = tmp.appendingPathComponent("verification_history.json")
+
+        let badJSON = "not json"
+        try? badJSON.write(to: url, atomically: true, encoding: .utf8)
+
+        let store = VerificationHistoryStore(url: url)
+        do {
+            try await store.clear()
+            Issue.record("clear() should propagate the load error")
+        } catch {
+            let contents = try? String(contentsOf: url, encoding: .utf8)
+            #expect(contents == badJSON)
+        }
+    }
+
+    @Test("ISO-8601 timestamps round-trip through a fresh store")
+    func iso8601RoundTrip() async throws {
+        let fm = FileManager.default
+        let tmp = fm.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        try fm.createDirectory(at: tmp, withIntermediateDirectories: true)
+        let url = tmp.appendingPathComponent("verification_history.json")
+
+        let timestamp = Date(timeIntervalSince1970: 1_700_000_000)
+        let record = VerificationRecord(
+            id: "vr-iso",
+            profileName: "p",
+            printerName: "",
+            avgDE: 1.0,
+            maxDE: 2.0,
+            rmsDE: 1.5,
+            patchCount: 1,
+            status: .good,
+            timestamp: timestamp
+        )
+        let store1 = VerificationHistoryStore(url: url)
+        _ = try await store1.append(record)
+
+        let text = try String(contentsOf: url, encoding: .utf8)
+        #expect(text.contains(ISO8601DateFormatter().string(from: timestamp)))
+
+        let store2 = VerificationHistoryStore(url: url)
+        let loaded = try await store2.load()
+        #expect(loaded.count == 1)
+        #expect(loaded.first?.timestamp == timestamp)
+    }
+
     @Test("CSV export quoting")
     func csvQuoting() async throws {
         let fm = FileManager.default
diff --git a/Tests/ICCeryCoreTests/WizardGatingTests.swift b/Tests/ICCeryCoreTests/WizardGatingTests.swift
index afd7a91..2f8a6b9 100644
--- a/Tests/ICCeryCoreTests/WizardGatingTests.swift
+++ b/Tests/ICCeryCoreTests/WizardGatingTests.swift
@@ -117,6 +117,17 @@ struct WizardStateStoreTests {
         #expect(WizardStateStore(fileURL: url).load().stage == .generate)
     }
 
+    @Test func corruptJsonReturnsDefaultAndKeepsBytes() throws {
+        let url = tempURL()
+        try FileManager.default.createDirectory(
+            at: url.deletingLastPathComponent(), withIntermediateDirectories: true
+        )
+        try "not json".write(to: url, atomically: true, encoding: .utf8)
+        #expect(WizardStateStore(fileURL: url).load() == .default)
+        let kept = try String(contentsOf: url, encoding: .utf8)
+        #expect(kept == "not json")
+    }
+
     @Test func sessionModeCalibrationRoundTrips() throws {
         var s = WizardState(sessionMode: .calibration)
         let data = try JSONEncoder().encode(s)
-- 
2.39.5