Merge pull request #7 from DJTB/feat/use-wanakana-odoriji-patch

Refactor: use wanakana odoriji patch

Author: DJTB

package.json

@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "just-zip-it": "^3.0.2",
-    "wanakana": "^4.0.2"
+    "wanakana": "^5.2.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",

src/utils.js

@@ -1,9 +1,4 @@
-import stripOkurigana from 'wanakana/es/stripOkurigana';
-import tokenize from 'wanakana/es/tokenize';
-import isKanji from 'wanakana/es/isKanji';
-import isKana from 'wanakana/es/isKana';
-import isHiragana from 'wanakana/es/isHiragana';
-import isKatakana from 'wanakana/es/isKatakana';
+import { stripOkurigana, tokenize, isKanji, isKana, isHiragana, isKatakana } from 'wanakana';
 import zip from 'just-zip-it';
 
 /**
@@ -59,13 +54,11 @@ export function basicFuri(word = '', reading = '') {
     reading.slice(stripOkurigana(reading, { matchKanji: word }).length),
   ];
 
-  const innerWordTokens = tokenizeWithOdoriji(removeExtraneousKana(word, bikago, okurigana));
+  const innerWordTokens = tokenize(removeExtraneousKana(word, bikago, okurigana));
   let innerReadingChars = removeExtraneousKana(reading, bikago, okurigana);
 
   const kanjiOddKanaEvenRegex = RegExp(
-    innerWordTokens
-      .map((char) => (isKanji(char) || char.includes('々') ? '(.*)' : `(${char})`))
-      .join('')
+    innerWordTokens.map((char) => (isKanji(char) ? '(.*)' : `(${char})`)).join(''),
   );
 
   [, ...innerReadingChars] = innerReadingChars.match(kanjiOddKanaEvenRegex) || [];
@@ -83,23 +76,6 @@ export function basicFuri(word = '', reading = '') {
   return ret;
 }
 
-function tokenizeWithOdoriji(input) {
-  const tokenizedArray = tokenize(input);
-  // merge 々 with previous element
-  for (let i = 0; i < tokenizedArray.length; i += 1) {
-    if (tokenizedArray[i] === '々') {
-      if (i !== 0) {
-        tokenizedArray[i - 1] = tokenizedArray[i - 1] + tokenizedArray[i];
-        tokenizedArray[i] = '';
-      }
-    }
-  }
-  // remove empty element
-  const removedEmpty = tokenizedArray.filter((element) => element !== '');
-
-  return removedEmpty;
-}
-
 function removeExtraneousKana(str = '', leading = '', trailing = '') {
   return str.replace(RegExp(`^${leading}`), '').replace(RegExp(`${trailing}$`), '');
 }

yarn.lock

@@ -10589,10 +10589,10 @@ walker@^1.0.7:
   dependencies:
     makeerror "1.0.12"
 
-wanakana@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/wanakana/-/wanakana-4.0.2.tgz#a7d60186724a56fd50e6e9c224628c09294901d8"
-  integrity sha512-lBFtnLJhTpp5wQBdH7TrOHhLxqmUabAfL86plNN8+iffyhosjZyx+kkO8KEBGR8zWH5nxSQ67oyx3W/lcEC8sg==
+wanakana@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/wanakana/-/wanakana-5.2.0.tgz#697ebd052a2e99146b14766c5f48577b8ca18501"
+  integrity sha512-5oYP9ZLfj181aldBy3JB83UoMH0YRl5QW/AgvXT56ck/n9N6/Zj9N/e04QGBtqNpmME84M3kbV1Ev3KdxXlzGg==
 
 watchpack@^2.3.1:
   version "2.3.1"