Files
OSGKeyboard/OSGKeyboardShared/Models/PersonalDictionary+Merging.swift
T
Rocky bf844caa7f feat(dictionary): add iCloud KVS sync, cloud ASR, and lexicon expansion
Mirror the personal dictionary through iCloud Key-Value Store with
deterministic merge rules, main-app-only sync UI, and App Group as the
keyboard runtime cache. Add cloud-engine ASR with dictionary bias and
expand the bundled custom language model lexicon.
2026-07-06 22:44:14 +08:00

92 lines
3.4 KiB
Swift

// PersonalDictionary+Merging.swift
// OSGKeyboard · Shared
//
// Deterministic merge rules for iCloud KVS sync. Pure logic — no
// NSUbiquitousKeyValueStore dependency so unit tests stay hermetic.
import Foundation
extension PersonalDictionary {
/// Merges two dictionary snapshots for cross-device sync.
///
/// Rules:
/// - Same `id`: keep the entry with the newer `updatedAt`.
/// - Same canonical term (case-insensitive) but different `id`: union
/// aliases, take max `usageCount`, keep the newer entry's fields.
public static func merge(local: PersonalDictionary, remote: PersonalDictionary) -> PersonalDictionary {
var mergedByID: [UUID: Entry] = [:]
var canonicalOwner: [String: UUID] = [:]
func insertOrMerge(_ candidate: Entry) {
let key = candidate.term.lowercased()
if let existingID = canonicalOwner[key], var existing = mergedByID[existingID] {
if candidate.id == existingID {
mergedByID[existingID] = resolveEntryConflict(existing: existing, incoming: candidate)
return
}
existing = mergeSameTerm(existing: existing, incoming: candidate)
mergedByID[existingID] = existing
return
}
if let existing = mergedByID[candidate.id] {
mergedByID[candidate.id] = resolveEntryConflict(existing: existing, incoming: candidate)
canonicalOwner[key] = candidate.id
return
}
mergedByID[candidate.id] = candidate
canonicalOwner[key] = candidate.id
}
for entry in local.entries { insertOrMerge(entry) }
for entry in remote.entries { insertOrMerge(entry) }
let mergedEntries = mergedByID.values.sorted {
if $0.updatedAt != $1.updatedAt {
return $0.updatedAt > $1.updatedAt
}
return $0.term.localizedCaseInsensitiveCompare($1.term) == .orderedAscending
}
let lastSyncedAt = [local.lastSyncedAt, remote.lastSyncedAt]
.compactMap { $0 }
.max()
return PersonalDictionary(
entries: mergedEntries,
version: max(local.version, remote.version) + 1,
lastSyncedAt: lastSyncedAt
)
}
private static func resolveEntryConflict(existing: Entry, incoming: Entry) -> Entry {
incoming.updatedAt >= existing.updatedAt ? incoming : existing
}
private static func mergeSameTerm(existing: Entry, incoming: Entry) -> Entry {
let winner = incoming.updatedAt >= existing.updatedAt ? incoming : existing
let loser = winner.id == existing.id ? incoming : existing
var merged = winner
merged.aliases = unionAliases(
existing: winner.aliases,
incoming: loser.aliases,
excludingTerm: winner.term
)
merged.usageCount = max(winner.usageCount, loser.usageCount)
merged.updatedAt = max(winner.updatedAt, loser.updatedAt)
return merged
}
private static func unionAliases(
existing: [String],
incoming: [String],
excludingTerm: String
) -> [String] {
let termLower = excludingTerm.lowercased()
return Array(
Set((existing + incoming).filter { $0.lowercased() != termLower })
).sorted { $0.localizedCaseInsensitiveCompare($1) == .orderedAscending }
}
}