hl-valdemar/conjure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

feat: complete translation language controls and styling

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-10-17 23:49:36 +02:00
parent 038a5b78a0
commit 11e604e79e
9 changed files with 310 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/ConjureKitTests/TranslationExecutionTests.swift
+54 -10
View File
@@ -5,13 +5,13 @@ import Testing
@MainActor
private final class TranslationRequests {
var inputs: [(text: String, key: String?)] = []
var inputs: [(text: String, source: String, target: String, key: String?)] = []
var pending: [CheckedContinuation<String, any Error>] = []
var returned = 0
// Deliberately ignore cancellation: the controller must reject late completions itself.
func translate(_ text: String, key: String? = nil) async throws -> String {
inputs.append((text, key))
func translate(_ text: String, source: String, target: String, key: String? = nil) async throws -> String {
inputs.append((text, source, target, key))
defer { returned += 1 }
return try await withCheckedThrowingContinuation { pending.append($0) }
}
@@ -58,6 +58,50 @@ private func descendants(_ view: NSView) -> [NSView] { [view] + view.subviews.fl
@Suite(.serialized)
struct TranslationExecutionTests {
@Test @MainActor
func languageActionsInvalidateOldResultsAndApplyTheSelectedPair() async throws {
_ = NSApplication.shared
let suite = "TranslateLanguages.\(UUID().uuidString)"
let defaults = UserDefaults(suiteName: suite)!
defer { defaults.removePersistentDomain(forName: suite) }
let requests = TranslationRequests()
let tool = TranslationController(defaults: defaults,
myMemory: { try await requests.translate($0, source: $1, target: $2) })
tool.input = { "こんにちは" }
let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 750, height: 474),
styleMask: .borderless, backing: .buffered, defer: false)
window.isReleasedWhenClosed = false
window.contentView = tool.view
defer { tool.close(); window.orderOut(nil) }
let output = try #require(descendants(tool.view).compactMap { $0 as? NSTextView }.first)
tool.performPrimaryAction()
try await waitForTranslation { requests.pending.count == 1 }
let languages = try #require(descendants(tool.view).compactMap { $0 as? NSButton }
.first { $0.accessibilityLabel() == "Translation languages" })
languages.performClick(nil)
let host = try #require(window.contentView)
let search = try #require(descendants(host).compactMap { $0 as? NSSearchField }.first)
search.stringValue = "swap"
search.delegate?.controlTextDidChange?(Notification(name: NSControl.textDidChangeNotification, object: search))
#expect(tool.handle(#selector(NSResponder.insertNewline(_:))))
#expect(tool.sourceLanguage == "ja")
#expect(tool.targetLanguage == "en")
requests.pending[0].resume(returning: "obsolete")
try await waitForTranslation { requests.returned == 1 }
#expect(output.string.isEmpty)
tool.performPrimaryAction()
try await waitForTranslation { requests.pending.count == 2 }
#expect(requests.inputs[1].source == "ja")
#expect(requests.inputs[1].target == "en")
requests.pending[1].resume(returning: "Hello")
try await waitForTranslation { output.string == "Hello" }
tool.setLanguages(source: "de", target: "fr")
#expect(output.string.isEmpty)
let reopened = TranslationController(defaults: defaults)
#expect(reopened.sourceLanguage == "de")
#expect(reopened.targetLanguage == "fr")
}
@Test @MainActor
func primaryActionCopiesCompletedTranslationAndResetsAfterEditing() async throws {
_ = NSApplication.shared
@@ -70,7 +114,7 @@ func primaryActionCopiesCompletedTranslationAndResetsAfterEditing() async throws
}
let requests = TranslationRequests()
let tool = TranslationController(defaults: defaults,
myMemory: { try await requests.translate($0) }, pasteboard: pasteboard)
myMemory: { try await requests.translate($0, source: $1, target: $2) }, pasteboard: pasteboard)
tool.input = { "Hello" }
var dismissed = false
tool.dismiss = { dismissed = true }
@@ -107,8 +151,8 @@ func translationExecutionIsExplicitAndMyMemoryNeverTouchesCredentials() async th
keys.value = "private-key"
let requests = TranslationRequests()
let tool = TranslationController(defaults: defaults, credentials: keys.store,
myMemory: { try await requests.translate($0) },
openAI: { try await requests.translate($0, key: $1) })
myMemory: { try await requests.translate($0, source: $1, target: $2) },
openAI: { try await requests.translate($0, source: $1, target: $2, key: $3) })
tool.input = { "Hello" }
let views = descendants(tool.view)
let output = try #require(views.compactMap { $0 as? NSTextView }.first)
@@ -135,8 +179,8 @@ func translationExecutionRejectsOldCompletionsWithoutClearingNewRequests() async
keys.value = "saved-key"
let requests = TranslationRequests()
let tool = TranslationController(defaults: defaults, credentials: keys.store,
myMemory: { try await requests.translate($0) },
openAI: { try await requests.translate($0, key: $1) })
myMemory: { try await requests.translate($0, source: $1, target: $2) },
openAI: { try await requests.translate($0, source: $1, target: $2, key: $3) })
var input = "first"
tool.input = { input }
let views = descendants(tool.view)
@@ -190,8 +234,8 @@ func translationExecutionRecoversFromCredentialAndRequestFailures() async throws
let keys = TranslationKeys()
let requests = TranslationRequests()
let tool = TranslationController(defaults: defaults, credentials: keys.store,
myMemory: { try await requests.translate($0) },
openAI: { try await requests.translate($0, key: $1) })
myMemory: { try await requests.translate($0, source: $1, target: $2) },
openAI: { try await requests.translate($0, source: $1, target: $2, key: $3) })
tool.input = { "Hello" }
let views = descendants(tool.view)
let settings = TranslationSettingsController(credentials: keys.store)