feat: v2.1.0, attempt to fix waa edge-case, upgrade dependencies

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.24.1"
+}

.gitignore

@@ -31,3 +31,6 @@ build/
 **/coverage/
 **/coverage_badge.svg
 **/.test_coverage.dart
+
+# FVM
+.fvm/

.mergify.yml

@@ -1,45 +1,43 @@
 pull_request_rules:
-- name: "Assign author"
-  conditions: []
-  actions:
-    assign:
-      users:
-        - "{{author}}"
+  - name: 'Assign author'
+    conditions: []
+    actions:
+      assign:
+        users:
+          - '{{author}}'
 
-# Merge flow for contributors
-- name: "Request review"
-  conditions:
-    - "author!=jeroen-meijer"
-  actions:
-    request_reviews:
-      users:
-        - "jeroen-meijer"
-- name: "Merge when CI passes & has one approval"
-  conditions:
-    - "author!=jeroen-meijer"
-    - "label!=wip"
-    - "status-success~=kana_kit"
-    - "#approved-reviews-by>=1"
-  actions: 
-    merge:
-      method: squash
-      strict: smart
-      commit_message: default
+  # Merge flow for contributors
+  - name: 'Request review'
+    conditions:
+      - 'author!=jeroen-meijer'
+    actions:
+      request_reviews:
+        users:
+          - 'jeroen-meijer'
+  - name: 'Merge when CI passes & has one approval'
+    conditions:
+      - 'author!=jeroen-meijer'
+      - 'label!=wip'
+      - 'status-success~=kana_kit'
+      - '#approved-reviews-by>=1'
+    actions:
+      merge:
+        method: squash
+        commit_message: default
 
-# Merge flow for non-contributors
-- name: "Merge when CI passes"
-  conditions:
-    - "author=jeroen-meijer"
-    - "label!=wip"
-    - "status-success~=kana_kit"
-  actions: 
-    merge:
-      method: squash
-      strict: smart
-      commit_message: default
+  # Merge flow for non-contributors
+  - name: 'Merge when CI passes'
+    conditions:
+      - 'author=jeroen-meijer'
+      - 'label!=wip'
+      - 'status-success~=kana_kit'
+    actions:
+      merge:
+        method: squash
+        commit_message: default
 
-- name: Delete branch post merge
-  conditions:
-    - merged
-  actions:
-    delete_head_branch: {}
+  - name: Delete branch post merge
+    conditions:
+      - merged
+    actions:
+      delete_head_branch: {}

.vscode/settings.json

@@ -7,5 +7,6 @@
     "mkdir",
     "toukyou",
     "ｚｅｎｋａｋｕ"
-  ]
-}
+  ],
+  "dart.flutterSdkPath": ".fvm/versions/3.24.1"
+}

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## 2.0.0
 
+- Fix シークヮーサー and シマウヮー conversion edge-cases (thanks to @Moseco and @HighLiuk)
+- Change minimum required Dart version to `2.12.0`.
+- Add CSpell spell checking config.
+- Remove `package:equatable` dependency.
+- Upgrade dependencies.
+- Upgrade all dev dependencies and linter.
+
+## 2.0.0
+
 - Add NNBD support.
 - Change minimum required Dart version to `2.12.0`.
 - Change linter to `package:very_good_analysis`.

analysis_options.yaml

@@ -1,19 +1 @@
 include: package:very_good_analysis/analysis_options.yaml
-# linter:
-#   rules:
-#     await_only_futures: true
-#     prefer_const_constructors: true
-#     prefer_const_literals_to_create_immutables: true
-#     prefer_relative_imports: false
-#     prefer_single_quotes: true
-#     public_member_api_docs: true
-#     sort_child_properties_last: true
-#     sort_constructors_first: true
-#     unawaited_futures: true
-# analyzer:
-#   strong-mode:
-#     implicit-casts: false
-#   errors:
-#     close_sinks: ignore
-#   exclude:
-#     - '**/.test_coverage.dart'

codecov.yml

@@ -1,10 +1,10 @@
 codecov:
   require_ci_to_pass: true
-  
+
 coverage:
   precision: 3
-  range: "99...100"
+  range: '99...100'
 
 ignore:
-  - "**/*.g.dart"
-  - "lib/src/models/romanization/**"
+  - '**/*.g.dart'
+  - 'lib/src/models/romanization/**'

cspell.yaml

@@ -0,0 +1,19 @@
+ignoreWords:
+  - transform
+words:
+  - codecov
+  - hankaku
+  - hepburn
+  - HighLiuk
+  - hira
+  - initializers
+  - japanese
+  - Moseco
+  - NNBD
+  - Ōsaka
+  - pubspec
+  - romaji
+  - Tōkyō
+  - unicode
+  - zenkaku
+  - Zenkaku

lib/kana_kit.dart

@@ -50,7 +50,7 @@ class KanaKit {
   /// isRomaji('a！b&cーd'); // false (zenkaku punctuation is not allowed)
   /// ```
   bool isRomaji(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     return input.chars.every(_isCharRomaji);
   }
@@ -68,7 +68,7 @@ class KanaKit {
   /// isJapanese('A泣き虫'); // false
   /// ```
   bool isJapanese(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     return input.chars.every(_isCharJapanese);
   }
@@ -85,7 +85,7 @@ class KanaKit {
   /// isKana('あAア'); // false
   /// ```
   bool isKana(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     return input.chars.every(_isCharKana);
   }
@@ -100,7 +100,7 @@ class KanaKit {
   /// isHiragana('あア'); // false
   /// ```
   bool isHiragana(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     return input.chars.every(_isCharHiragana);
   }
@@ -116,7 +116,7 @@ class KanaKit {
   /// isKatakana('あア'); // false
   /// ```
   bool isKatakana(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     return input.chars.every(_isCharKatakana);
   }
@@ -133,7 +133,7 @@ class KanaKit {
   /// isKanji('🐸'); // false
   /// ```
   bool isKanji(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     return input.chars.every(_isCharKanji);
   }
@@ -153,12 +153,17 @@ class KanaKit {
   /// isMixed('あア'); // false
   /// ```
   bool isMixed(String input) {
-    assert(input.isNotEmpty);
+    assert(input.isNotEmpty, 'input cannot be empty');
 
     final chars = input.chars;
 
     final hasRomaji = chars.any(_isCharRomaji);
     final hasKana = chars.any(_isCharHiragana) || chars.any(_isCharKatakana);
+
+    // FIXME: This can be simplified but I can't get my brain
+    //  to do it right now.
+
+    // ignore: avoid_bool_literals_in_conditional_expressions
     final hasKanji = !(!config.passKanji ? chars.any(_isCharKanji) : false);
 
     return hasKana && hasRomaji && hasKanji;
@@ -173,6 +178,7 @@ class KanaKit {
   /// characters will be converted to uppercase characters.
   /// ignored.
   ///
+  // cspell: disable
   /// ```dart
   /// // With KanaKitConfig.upcaseKatakana == false (default)
   /// toRomaji('ひらがな　カタカナ'); // "hiragana katakana"
@@ -181,6 +187,7 @@ class KanaKit {
   /// toRomaji('ひらがな　カタカナ'); // "hiragana KATAKANA"
   /// toRomaji('げーむ　ゲーム'); // "ge-mu GEEMU"
   /// ```
+  // cspell: enable
   String toRomaji(String input) {
     if (input.isEmpty) {
       return input;
@@ -218,13 +225,15 @@ class KanaKit {
   /// The [input] `String` cannot be null. If an empty `String` is provided,
   /// an empty `String` will be returned immediately.
   ///
+  // cspell: disable
   /// ```dart
   /// toKana('onaji BUTTSUUJI'); // "おなじ ブッツウジ"
   /// toKana('ONAJI buttsuuji'); // "オナジ ぶっつうじ"
   /// toKana('座禅‘zazen’スタイル'); // "座禅「ざぜん」スタイル"
   /// toKana('batsuge-mu'); // "ばつげーむ"
   /// toKana('!?.:/,~-‘’“”[](){}'); // "！？。：・、〜ー「」『』［］（）｛｝"
   /// ```
+  // cspell: enable
   String toKana(String input) {
     if (input.isEmpty) {
       return input;