refactor: remove table-specific implementation

Sources/KanaKanjiConverterModule/InputManagement/Roman2Kana.swift

@@ -283,6 +283,45 @@ enum Roman2Kana {
         "whu": "う",
         "whe": "うぇ",
         "who": "うぉ",
+        "bb": "っb",
+        "cc": "っc",
+        "dd": "っd",
+        "ff": "っf",
+        "gg": "っg",
+        "hh": "っh",
+        "jj": "っj",
+        "kk": "っk",
+        "ll": "っl",
+        "mm": "っm",
+        "pp": "っp",
+        "qq": "っq",
+        "rr": "っr",
+        "ss": "っs",
+        "tt": "っt",
+        "vv": "っv",
+        "ww": "っw",
+        "xx": "っx",
+        "yy": "っy",
+        "zz": "っz",
+        "nb": "んb",
+        "nc": "んc",
+        "nd": "んd",
+        "nf": "んf",
+        "ng": "んg",
+        "nh": "んh",
+        "nj": "んj",
+        "nk": "んk",
+        "nl": "んl",
+        "nm": "んm",
+        "np": "んp",
+        "nq": "んq",
+        "nr": "んr",
+        "ns": "んs",
+        "nt": "んt",
+        "nv": "んv",
+        "nw": "んw",
+        "nx": "んx",
+        "nz": "んz",
         "xn": "ん",
         "zh": "←",
         "zj": "↓",
@@ -290,28 +329,20 @@ enum Roman2Kana {
         "zl": "→"
     ].map {(Array($0.key), Array($0.value))})
 
-    static func toHiragana(currentText: [Character], added: Character) -> [Character] {
+    static let maxKeyCount = hiraganaChanges.lazy.map { $0.key.count }.max() ?? 0
-        let last_3 = currentText.suffix(3)
-        if let kana = Roman2Kana.hiraganaChanges[last_3 + [added]] {
-            return currentText.prefix(currentText.count - last_3.count) + kana
-        }
-        let last_2 = currentText.suffix(2)
-        if let kana = Roman2Kana.hiraganaChanges[last_2 + [added]] {
-            return currentText.prefix(currentText.count - last_2.count) + kana
-        }
-        let last_1 = currentText.suffix(1)
-        if let kana = Roman2Kana.hiraganaChanges[last_1 + [added]] {
-            return currentText.prefix(currentText.count - last_1.count) + kana
-        }
-        if last_1 == [added] && String(added).onlyRomanAlphabet {
-            return currentText.prefix(currentText.count - last_1.count) + ["っ", added]
-        }
-        if last_1 == ["n"] && added != "y"{
-            return currentText.prefix(currentText.count - last_1.count) + ["ん", added]
-        }
 
-        if let kana = Roman2Kana.hiraganaChanges[[added]] {
+    static func toHiragana(currentText: [Character], added: Character) -> [Character] {
-            return currentText + kana
+        for n in (0 ..< maxKeyCount).reversed() {
+            if n == 0 {
+                if let kana = Roman2Kana.hiraganaChanges[[added]] {
+                    return currentText + kana
+                }
+            } else {
+                let last = currentText.suffix(n)
+                if let kana = Roman2Kana.hiraganaChanges[last + [added]] {
+                    return currentText.prefix(currentText.count - last.count) + kana
+                }
+            }
         }
         return currentText + [added]
     }

Tests/KanaKanjiConverterModuleTests/Roman2KanaTests.swift

@@ -0,0 +1,26 @@
+@testable import KanaKanjiConverterModule
+import XCTest
+
+final class Roman2KanaTests: XCTestCase {
+    func testToHiragana() throws {
+        // xtsu -> っ
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array(""), added: "x"), Array("x"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("x"), added: "t"), Array("xt"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("xt"), added: "s"), Array("xts"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("xts"), added: "u"), Array("っ"))
+
+        // kanto -> かんと
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array(""), added: "k"), Array("k"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("k"), added: "a"), Array("か"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("か"), added: "n"), Array("かn"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("かn"), added: "t"), Array("かんt"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("かんt"), added: "o"), Array("かんと"))
+
+        // zl -> →
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array(""), added: "z"), Array("z"))
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("z"), added: "l"), Array("→"))
+
+        // TT -> TT
+        XCTAssertEqual(Roman2Kana.toHiragana(currentText: Array("T"), added: "T"), Array("TT"))
+    }
+}

Tests/KanaKanjiConverterModuleWithDefaultDictionaryTests/DicdataStoreTests/DicdataStoreTests.swift

@@ -332,7 +332,7 @@ final class DicdataStoreTests: XCTestCase {
 
     func testPossibleNexts() throws {
         let possibleNexts = DicdataStore.possibleNexts
-        XCTAssertEqual(Set(possibleNexts["f", default: []]).symmetricDifference(["ファ", "フィ", "フ", "フェ", "フォ", "フャ", "フュ", "フョ", "フゥ"]), [])
+        XCTAssertEqual(Set(possibleNexts["f", default: []]).symmetricDifference(["ファ", "フィ", "フ", "フェ", "フォ", "フャ", "フュ", "フョ", "フゥ", "ッf"]), [])
         XCTAssertEqual(Set(possibleNexts["xy", default: []]).symmetricDifference(["ャ", "ョ", "ュ"]), [])
         XCTAssertEqual(possibleNexts["", default: []], [])
     }