henkan 2.3.0 → 2.3.1

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Ronokof
+Copyright (c) 2026 Ronokof
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.cjs.js

@@ -1357,10 +1357,10 @@ function getValidForms(readings, kanjiForms, wordIsCommon) {
       return false;
     }
   );
-  const existValidKf = kanjiForms == null ? void 0 : kanjiForms.some(
+  const existValidKf = kanjiForms?.some(
     (kf, index) => index !== 0 && (kf.notes === void 0 || !kf.notes.some((note) => notSearchedForms.has(note)) && (wordIsCommon === void 0 || kf.commonness !== void 0) || kanjiFormRestrictions.has(kf.form))
   );
-  const validKanjiForms = kanjiForms == null ? void 0 : kanjiForms.filter(
+  const validKanjiForms = kanjiForms?.filter(
     (kanjiForm, index) => {
       if (index === 0) return true;
       if (existValidKf === true)
@@ -1563,7 +1563,6 @@ function convertKanjiDic(xmlString) {
   return dict;
 }
 function convertTanakaCorpus(tanakaString) {
-  var _a, _b;
   const tanakaArray = [];
   const tanakaParsed = tanakaString.split("\n");
   for (let i = 0; i <= tanakaParsed.length; i += 2) {
@@ -1572,7 +1571,7 @@ function convertTanakaCorpus(tanakaString) {
     if (a !== void 0 && b !== void 0 && a.startsWith("A: ") && b.startsWith("B: ")) {
       a = a.replace("A: ", "");
       b = b.replace("B: ", "");
-      const idMatch = (_b = (_a = regexps.tanakaID.exec(a)) == null ? void 0 : _a.groups["id"]) == null ? void 0 : _b.trim();
+      const idMatch = regexps.tanakaID.exec(a)?.groups["id"]?.trim();
       const idParts = String(idMatch).split("_");
       const id = `${Number(idParts[0])}_${Number(idParts[1])}`;
       const aParts = a.replace(regexps.tanakaID, "").split("	");
@@ -1580,16 +1579,16 @@ function convertTanakaCorpus(tanakaString) {
       const bParts = [];
       for (const part of bRawParts) {
         const partMatches = regexps.tanakaPart.exec(part);
-        const baseForm = partMatches == null ? void 0 : partMatches.groups["base"];
+        const baseForm = partMatches?.groups["base"];
         const examplePart = { baseForm };
-        const reading = partMatches == null ? void 0 : partMatches.groups["reading"];
-        const glossNumber = partMatches == null ? void 0 : partMatches.groups["glossnum"];
-        const inflectedForm = partMatches == null ? void 0 : partMatches.groups["inflection"];
+        const reading = partMatches?.groups["reading"];
+        const glossNumber = partMatches?.groups["glossnum"];
+        const inflectedForm = partMatches?.groups["inflection"];
         if (reading !== void 0)
           if (regexps.tanakaReferenceID.test(reading)) {
             const referenceID = regexps.tanakaReferenceID.exec(reading);
             examplePart.referenceID = `${Number(
-              referenceID == null ? void 0 : referenceID.groups["entryid"]
+              referenceID?.groups["entryid"]
             )}`;
           } else examplePart.reading = reading;
         if (glossNumber !== void 0)
@@ -1679,7 +1678,7 @@ function convertKradFile(kradBuffer, kanjiDic, katakanaList) {
         const foundRadical = kanjiDic.find(
           (dictKanji) => dictKanji.kanji === radical
         );
-        let radicalObj = foundRadical != null ? foundRadical : { kanji: radical };
+        let radicalObj = foundRadical ?? { kanji: radical };
         if (foundRadical === void 0) {
           const katakanaChar = katakanaList.find(
             (kana) => kana.kana === radical
@@ -1707,7 +1706,6 @@ function convertKradFile(kradBuffer, kanjiDic, katakanaList) {
   return kanjiWithRadicals;
 }
 function createEntryMaps(jmDict, kanjiDic, tanakaExamples, wordDefinitionPairs, svgList) {
-  var _a;
   const kanjiEntryMap = /* @__PURE__ */ new Map();
   const wordIDEntryMap = /* @__PURE__ */ new Map();
   const kanjiWordsMap = /* @__PURE__ */ new Map();
@@ -1808,7 +1806,7 @@ function createEntryMaps(jmDict, kanjiDic, tanakaExamples, wordDefinitionPairs,
         const seenEx = /* @__PURE__ */ new Set();
         const validExamples = [];
         for (const p of wordPartsMap.get(word.id)) {
-          const examplesForPart = (_a = partExamplesMap.get(p)) == null ? void 0 : _a.filter((ex) => !seenEx.has(ex.id));
+          const examplesForPart = partExamplesMap.get(p)?.filter((ex) => !seenEx.has(ex.id));
           if (examplesForPart === void 0) continue;
           for (const ex of examplesForPart) {
             seenEx.add(ex.id);
@@ -1845,11 +1843,10 @@ function mapEntry(entry) {
   };
 }
 function convertJawiktionarySync(buffer) {
-  var _a;
   const lines = buffer.toString("utf-8").split("\n");
   const entries = [];
   for (let i = 0; i < lines.length; i++) {
-    const line = (_a = lines[i]) == null ? void 0 : _a.trim();
+    const line = lines[i]?.trim();
     if (line === void 0 || line.length === 0) continue;
     const obj = JSON.parse(line);
     if (typeof obj === "object" && (obj.lang === "\u65E5\u672C\u8A9E" || obj.lang === "\u53E4\u5178\u65E5\u672C\u8A9E"))
@@ -1885,7 +1882,6 @@ function parseEntry(entry, definitions, definitionMap) {
   }
 }
 function getWordDefinitions(wiktionaryEntries, jmDict) {
-  var _a, _b, _c, _d, _e;
   const entries = /* @__PURE__ */ new Map();
   for (const entry of wiktionaryEntries) {
     const ent = entries.get(entry.word);
@@ -2023,7 +2019,7 @@ function getWordDefinitions(wiktionaryEntries, jmDict) {
     for (const m of word.meanings)
       for (const note of m.partOfSpeech) {
         const noteEntry = noteMap.get(note);
-        if ((noteEntry == null ? void 0 : noteEntry.length) === 3) {
+        if (noteEntry?.length === 3) {
           const notePos = noteEntry[2];
           if (Array.isArray(notePos))
             for (const pos of notePos) {
@@ -2042,8 +2038,8 @@ function getWordDefinitions(wiktionaryEntries, jmDict) {
         const posEntries = posMap.get(pos);
         if (rkf.kanjiForms !== void 0)
           for (const kf of rkf.kanjiForms) {
-            const te = (_a = posEntries.title) == null ? void 0 : _a.get(kf);
-            const fe = (_b = posEntries.form) == null ? void 0 : _b.get(kf);
+            const te = posEntries.title?.get(kf);
+            const fe = posEntries.form?.get(kf);
             if (te !== void 0)
               entriesWithTitles.push(
                 ...te.filter(
@@ -2060,9 +2056,9 @@ function getWordDefinitions(wiktionaryEntries, jmDict) {
               );
           }
         for (const r of rkf.readings) {
-          const te = (_c = posEntries.title) == null ? void 0 : _c.get(r);
-          const fe = (_d = posEntries.form) == null ? void 0 : _d.get(r);
-          const fte = (_e = posEntries.formTitle) == null ? void 0 : _e.get(r);
+          const te = posEntries.title?.get(r);
+          const fe = posEntries.form?.get(r);
+          const fte = posEntries.formTitle?.get(r);
           if (te !== void 0)
             entriesWithTitles.push(
               ...te.filter(
@@ -2276,7 +2272,6 @@ var wordAddNoteArray = (arr, cb) => {
   for (const v of arr) cb(v);
 };
 function getKanji(searchedKanji, dict, jmDict, svgList, noteTypeName, deckPath) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   let dictKanji = void 0;
   if (typeof searchedKanji === "string" && dict !== void 0)
     dictKanji = dict instanceof Map ? dict.get(searchedKanji) : dict.find((entry) => entry.kanji === searchedKanji);
@@ -2285,9 +2280,9 @@ function getKanji(searchedKanji, dict, jmDict, svgList, noteTypeName, deckPath)
     const kanji = {
       kanji: dictKanji.kanji,
       strokes: dictKanji.misc.strokeNumber,
-      ...((_a = dictKanji.misc) == null ? void 0 : _a.grade) !== void 0 ? { grade: dictKanji.misc.grade } : {},
-      ...((_b = dictKanji.misc) == null ? void 0 : _b.frequency) !== void 0 ? { frequency: dictKanji.misc.frequency } : {},
-      ...((_c = dictKanji.misc) == null ? void 0 : _c.jlpt) !== void 0 ? { jlpt: dictKanji.misc.jlpt } : {},
+      ...dictKanji.misc?.grade !== void 0 ? { grade: dictKanji.misc.grade } : {},
+      ...dictKanji.misc?.frequency !== void 0 ? { frequency: dictKanji.misc.frequency } : {},
+      ...dictKanji.misc?.jlpt !== void 0 ? { jlpt: dictKanji.misc.jlpt } : {},
       noteID: `kanji_${dictKanji.kanji}`,
       ...noteTypeName !== void 0 ? { noteTypeName } : {},
       ...deckPath !== void 0 ? { deckPath } : {},
@@ -2323,7 +2318,7 @@ function getKanji(searchedKanji, dict, jmDict, svgList, noteTypeName, deckPath)
     }
     if (jmDict !== void 0) {
       let kanjiWords = jmDict instanceof Map ? jmDict.get(kanji.kanji) : jmDict;
-      const firstKfWords = kanjiWords == null ? void 0 : kanjiWords.filter(
+      const firstKfWords = kanjiWords?.filter(
         (word) => word.kanjiForms !== void 0 && word.kanjiForms[0].form.includes(kanji.kanji)
       );
       if (firstKfWords !== void 0 && firstKfWords.length > 0)
@@ -2331,17 +2326,17 @@ function getKanji(searchedKanji, dict, jmDict, svgList, noteTypeName, deckPath)
       if (kanjiWords !== void 0) {
         const validWords = [];
         for (const word of kanjiWords) {
-          const kanjiForm = (_d = firstKfWords !== void 0 && firstKfWords.length > 0 ? word.kanjiForms[0] : word.kanjiForms.find(
+          const kanjiForm = (firstKfWords !== void 0 && firstKfWords.length > 0 ? word.kanjiForms[0] : word.kanjiForms.find(
             (kf) => kf.form.includes(kanji.kanji)
-          )) == null ? void 0 : _d.form;
+          ))?.form;
           if (kanjiForm !== void 0) {
-            const reading = (_e = firstKfWords !== void 0 && firstKfWords.length > 0 ? word.readings[0] : word.readings.find(
+            const reading = (firstKfWords !== void 0 && firstKfWords.length > 0 ? word.readings[0] : word.readings.find(
               (r) => r.kanjiFormRestrictions !== void 0 && r.kanjiFormRestrictions.includes(kanjiForm)
-            )) == null ? void 0 : _e.reading;
+            ))?.reading;
             if (reading === void 0) continue;
-            const translation = (_f = firstKfWords !== void 0 && firstKfWords.length > 0 ? word.meanings[0] : word.meanings.find(
+            const translation = (firstKfWords !== void 0 && firstKfWords.length > 0 ? word.meanings[0] : word.meanings.find(
               (m) => m.kanjiFormRestrictions !== void 0 && m.kanjiFormRestrictions.includes(kanjiForm)
-            )) == null ? void 0 : _f.translations.map(
+            ))?.translations.map(
               (t) => typeof t === "string" ? t : t.translation
             )[0];
             if (translation === void 0) continue;
@@ -2378,10 +2373,10 @@ function getKanji(searchedKanji, dict, jmDict, svgList, noteTypeName, deckPath)
       ...kanji.frequency !== void 0 ? [`kanji::frequency::${kanji.frequency}`] : [],
       ...kanji.grade !== void 0 ? [`kanji::grade::${kanji.grade}`] : [],
       ...kanji.jlpt !== void 0 ? [`kanji::pre-2010_jlpt::${kanji.jlpt.toLowerCase()}`] : [],
-      `kanji::onyomi::${(_h = (_g = kanji.onyomi) == null ? void 0 : _g.length) != null ? _h : 0}`,
-      `kanji::kunyomi::${(_j = (_i = kanji.kunyomi) == null ? void 0 : _i.length) != null ? _j : 0}`,
-      `kanji::nanori::${(_l = (_k = kanji.nanori) == null ? void 0 : _k.length) != null ? _l : 0}`,
-      `kanji::words::${(_n = (_m = kanji.words) == null ? void 0 : _m.length) != null ? _n : 0}`,
+      `kanji::onyomi::${kanji.onyomi?.length ?? 0}`,
+      `kanji::kunyomi::${kanji.kunyomi?.length ?? 0}`,
+      `kanji::nanori::${kanji.nanori?.length ?? 0}`,
+      `kanji::words::${kanji.words?.length ?? 0}`,
       ...kanji.svg !== void 0 ? ["kanji::has_svg"] : []
     );
     return kanji;
@@ -2426,7 +2421,6 @@ function getKanjiExtended(info, kanji, dict, useWords, jmDict, svgList, noteType
   } else return void 0;
 }
 function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeName, deckPath) {
-  var _a, _b;
   let dictWord = void 0;
   if (typeof searchedWord === "string" && dict !== void 0) {
     if (Array.isArray(dict))
@@ -2560,7 +2554,7 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
           seenChars.add(char);
           const kanjiEntry = kanjiDic instanceof Map ? kanjiDic.get(char) : void 0;
           const kanjiObj = getKanji(
-            kanjiEntry != null ? kanjiEntry : char,
+            kanjiEntry ?? char,
             !(kanjiDic instanceof Map) ? kanjiDic : void 0
           );
           if (kanjiObj !== void 0)
@@ -2572,7 +2566,7 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
       if (kanji.length > 0) word.kanji = kanji;
     }
     if (dictWord.hasPhrases === true && examples !== void 0) {
-      const exampleList = examples instanceof Map ? (_a = examples.get(dictWord.id)) != null ? _a : [] : examples;
+      const exampleList = examples instanceof Map ? examples.get(dictWord.id) ?? [] : examples;
       const rkf = getValidForms(
         dictWord.readings,
         dictWord.kanjiForms,
@@ -2657,31 +2651,25 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
         wordExamples = glossSpecificExamples;
       }
       if (wordExamples.length > 0) {
-        word.phrases = (glossSpecificExamples.length === 0 ? wordExamples.slice(0, 5) : wordExamples).map((ex) => {
-          var _a2;
-          return {
-            phrase: (_a2 = ex.ex.furigana) != null ? _a2 : ex.ex.phrase,
-            translation: ex.ex.translation,
-            originalPhrase: ex.ex.phrase,
-            ...ex.ex.glossNumber !== void 0 ? { glossNumber: ex.ex.glossNumber } : {}
-          };
-        });
+        word.phrases = (glossSpecificExamples.length === 0 ? wordExamples.slice(0, 5) : wordExamples).map((ex) => ({
+          phrase: ex.ex.furigana ?? ex.ex.phrase,
+          translation: ex.ex.translation,
+          originalPhrase: ex.ex.phrase,
+          ...ex.ex.glossNumber !== void 0 ? { glossNumber: ex.ex.glossNumber } : {}
+        }));
         word.tags.push("word::has_phrases");
         if (glossSpecificExamples.length > 0)
           word.tags.push("word::has_meaning-specific_phrases");
       }
     }
     if (definitions !== void 0) {
-      const defs = definitions instanceof Map ? definitions.get(word.id) : (_b = definitions.find(
+      const defs = definitions instanceof Map ? definitions.get(word.id) : definitions.find(
         (wdp) => wdp.wordID === word.id
-      )) == null ? void 0 : _b.definitions;
+      )?.definitions;
       if (defs !== void 0)
         word.definitions = [
           ...defs.toSorted(
-            (a, b) => {
-              var _a2, _b2;
-              return ((_a2 = a.mayNotBeAccurate) != null ? _a2 : 0) - ((_b2 = b.mayNotBeAccurate) != null ? _b2 : 0);
-            }
+            (a, b) => (a.mayNotBeAccurate ?? 0) - (b.mayNotBeAccurate ?? 0)
           )
         ];
     }
@@ -2689,29 +2677,23 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
   } else return void 0;
 }
 function isWord(entry) {
-  var _a, _b;
-  return isObjectArray((_a = Object.getOwnPropertyDescriptor(entry, "readings")) == null ? void 0 : _a.value) && isObjectArray((_b = Object.getOwnPropertyDescriptor(entry, "translations")) == null ? void 0 : _b.value);
+  return isObjectArray(Object.getOwnPropertyDescriptor(entry, "readings")?.value) && isObjectArray(Object.getOwnPropertyDescriptor(entry, "translations")?.value);
 }
 function isRadical(entry) {
-  var _a;
-  return typeof ((_a = Object.getOwnPropertyDescriptor(entry, "radical")) == null ? void 0 : _a.value) === "string";
+  return typeof Object.getOwnPropertyDescriptor(entry, "radical")?.value === "string";
 }
 function isKanji(entry) {
-  var _a;
-  return !Object.hasOwn(entry, "translations") && !Object.hasOwn(entry, "readings") && !Object.hasOwn(entry, "radical") && typeof ((_a = Object.getOwnPropertyDescriptor(entry, "kanji")) == null ? void 0 : _a.value) === "string";
+  return !Object.hasOwn(entry, "translations") && !Object.hasOwn(entry, "readings") && !Object.hasOwn(entry, "radical") && typeof Object.getOwnPropertyDescriptor(entry, "kanji")?.value === "string";
 }
 function isKana(entry) {
-  var _a;
-  return typeof ((_a = Object.getOwnPropertyDescriptor(entry, "kana")) == null ? void 0 : _a.value) === "string";
+  return typeof Object.getOwnPropertyDescriptor(entry, "kana")?.value === "string";
 }
 function isGrammar(entry) {
-  var _a;
-  return typeof ((_a = Object.getOwnPropertyDescriptor(entry, "point")) == null ? void 0 : _a.value) === "string";
+  return typeof Object.getOwnPropertyDescriptor(entry, "point")?.value === "string";
 }
 var createNotes = (notes, phrase) => `${phrase === true ? "<details><summary>Show translation</summary>" : ""}<ul class="note-list">${notes.map((note) => `<li class="note">${note}</li>`).join("")}</ul>${phrase === true ? "</details>" : ""}`;
 var createEntry = (entry, notes, phrase, glossSpecific) => `<div class="entry${glossSpecific === true ? " gloss-specific" : ""}">${entry}${notes !== void 0 && notes.length > 0 ? createNotes(notes, phrase) : ""}</div>`;
 function generateAnkiNote(entry) {
-  var _a, _b;
   const fields = [];
   if (isWord(entry)) {
     const firstReading = createEntry(
@@ -2763,7 +2745,7 @@ function generateAnkiNote(entry) {
       );
     }).filter((translation) => translation !== "null").join("")}</details>` : "";
     const translationsField = `${firstThreeTranslations}${otherTranslations}`;
-    const firstFivePhrases = (_a = entry.phrases) == null ? void 0 : _a.slice(0, 5).map(
+    const firstFivePhrases = entry.phrases?.slice(0, 5).map(
       (phraseEntry, index) => createEntry(
         `<span class="word word-phrase"><span class="word word-phrase-original">${phraseEntry.originalPhrase}</span><span class="word word-phrase-furigana">${phraseEntry.phrase}</span></span>`,
         [phraseEntry.translation],
@@ -2785,21 +2767,15 @@ function generateAnkiNote(entry) {
       );
     }).filter((phrase) => phrase !== "null").join("")}</details>` : "";
     const phrasesField = firstFivePhrases !== void 0 ? `${firstFivePhrases}${otherPhrases}` : '<span class="word word-phrase">(no phrases) (Search on dictionaries!)</span>';
-    const firstThreeDefinitions = (_b = entry.definitions) == null ? void 0 : _b.slice(0, 3).map(
-      (definitionEntry) => {
-        var _a2;
-        return createEntry(
-          `<span class="word word-definition${definitionEntry.mayNotBeAccurate === 2 ? " mnba2" : definitionEntry.mayNotBeAccurate === 1 ? " mnba1" : ""}"><span class="word word-definition-original">${definitionEntry.definition}</span><span class="word word-definition-furigana">${(_a2 = definitionEntry.furigana) != null ? _a2 : definitionEntry.definition}</span></span>`
-        );
-      }
+    const firstThreeDefinitions = entry.definitions?.slice(0, 3).map(
+      (definitionEntry) => createEntry(
+        `<span class="word word-definition${definitionEntry.mayNotBeAccurate === 2 ? " mnba2" : definitionEntry.mayNotBeAccurate === 1 ? " mnba1" : ""}"><span class="word word-definition-original">${definitionEntry.definition}</span><span class="word word-definition-furigana">${definitionEntry.furigana ?? definitionEntry.definition}</span></span>`
+      )
     ).join("");
     const otherDefinitions = entry.definitions !== void 0 && entry.definitions.length > 3 ? `<details><summary>Show other definitions</summary>${entry.definitions.map(
-      (definitionEntry, index) => {
-        var _a2;
-        return index > 2 ? createEntry(
-          `<span class="word word-definition${definitionEntry.mayNotBeAccurate === 2 ? " mnba2" : definitionEntry.mayNotBeAccurate === 1 ? " mnba1" : ""}"><span class="word word-definition-original">${definitionEntry.definition}</span><span class="word word-definition-furigana">${(_a2 = definitionEntry.furigana) != null ? _a2 : definitionEntry.definition}</span></span>`
-        ) : "null";
-      }
+      (definitionEntry, index) => index > 2 ? createEntry(
+        `<span class="word word-definition${definitionEntry.mayNotBeAccurate === 2 ? " mnba2" : definitionEntry.mayNotBeAccurate === 1 ? " mnba1" : ""}"><span class="word word-definition-original">${definitionEntry.definition}</span><span class="word word-definition-furigana">${definitionEntry.furigana ?? definitionEntry.definition}</span></span>`
+      ) : "null"
     ).filter((definition) => definition !== "null").join("")}</details>` : "";
     const definitionsField = firstThreeDefinitions !== void 0 ? `${firstThreeDefinitions}${otherDefinitions}` : '<span class="word word-definition">(no definitions)</span>';
     fields.push(