henkan 2.0.1 → 2.0.3

package/dist/index.mjs

@@ -294,14 +294,18 @@ var noteMap = /* @__PURE__ */ new Map([
   ["conjunction", ["conjunction", "Conjunction", "\u63A5\u7D9A\u8A5E"]],
   [
     "expression",
-    ["expression", "Expression", ["\u6210\u8A9E", "\u6210\u53E5", "\u6163\u7528\u53E5", "\u52D5\u8A5E\u53E5"]]
+    [
+      "expression",
+      "Expression",
+      ["\u6210\u8A9E", "\u6210\u53E5", "\u6163\u7528\u53E5", "\u52D5\u8A5E\u53E5", "\u611F\u52D5\u8A5E"]
+    ]
   ],
   [
     "idiomatic expression",
     [
       "idiomatic_expression",
       "Idiomatic expression",
-      ["\u6210\u8A9E", "\u6210\u53E5", "\u6163\u7528\u53E5", "\u52D5\u8A5E\u53E5"]
+      ["\u6210\u8A9E", "\u6210\u53E5", "\u6163\u7528\u53E5", "\u52D5\u8A5E\u53E5", "\u611F\u52D5\u8A5E"]
     ]
   ],
   [
@@ -541,7 +545,7 @@ var noteMap = /* @__PURE__ */ new Map([
     [
       "expression",
       "Expression (phrase, clause, etc.)",
-      ["\u6210\u8A9E", "\u6210\u53E5", "\u6163\u7528\u53E5", "\u52D5\u8A5E\u53E5"]
+      ["\u6210\u8A9E", "\u6210\u53E5", "\u6163\u7528\u53E5", "\u52D5\u8A5E\u53E5", "\u611F\u52D5\u8A5E"]
     ]
   ],
   ["adverbial noun (fukushitekimeishi)", ["adverbial_noun", "Adverbial noun"]],
@@ -1711,7 +1715,7 @@ function getWordDefinitions(entryList, jmDict) {
             for (const gloss of sense.glosses) {
               let reading = void 0;
               if (gloss !== void 0) {
-                if (gloss.trim().includes("\u306E\u6F22\u5B57\u8868\u8A18\u3002") || gloss.trim().includes("\u3092\u53C2\u7167\u3002")) {
+                if (gloss.trim().includes("\u6F22\u5B57\u8868\u8A18") || gloss.trim().includes("\u53C2\u7167")) {
                   for (const r of validReadings)
                     if (gloss.trim().includes(r)) {
                       reading = r;
@@ -1992,7 +1996,7 @@ function getWordDefinitions(entryList, jmDict) {
               for (const gloss of sense.glosses) {
                 let reading = void 0;
                 if (gloss !== void 0) {
-                  if (gloss.trim().includes("\u306E\u6F22\u5B57\u8868\u8A18\u3002") || gloss.trim().includes("\u3092\u53C2\u7167\u3002")) {
+                  if (gloss.trim().includes("\u6F22\u5B57\u8868\u8A18") || gloss.trim().includes("\u53C2\u7167")) {
                     for (const r of pair.readings)
                       if (gloss.trim().includes(r)) {
                         reading = r;
@@ -2371,7 +2375,7 @@ function getWord(word, dict, kanjiDic, examples, definitions, noteTypeName, deck
   } else return void 0;
 }
 function getKanji(kanji, dict, jmDict, svgList, noteTypeName, deckPath) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   let dictKanji = void 0;
   if (typeof kanji === "string" && dict)
     dictKanji = dict.find((entry) => entry.kanji === kanji);
@@ -2419,19 +2423,39 @@ function getKanji(kanji, dict, jmDict, svgList, noteTypeName, deckPath) {
       if (kunyomi.length > 0) kanji2.kunyomi = kunyomi;
     }
     if (jmDict) {
-      const kanjiWords = (_a = Array.isArray(jmDict) ? jmDict : jmDict.get(kanji2.kanji)) == null ? void 0 : _a.filter(
+      let kanjiWords = Array.isArray(
+        jmDict
+      ) ? jmDict : jmDict.get(kanji2.kanji);
+      const firstKfWords = kanjiWords == null ? void 0 : kanjiWords.filter(
         (word) => word.kanjiForms && word.kanjiForms[0].form.includes(kanji2.kanji)
-      ).slice(0, 3);
+      );
+      if (firstKfWords && firstKfWords.length > 0) kanjiWords = firstKfWords;
+      else if (kanjiWords) kanjiWords = kanjiWords;
       if (kanjiWords) {
         const validWords = [];
         for (const word of kanjiWords) {
-          const translation = word.meanings[0].translations[0];
-          const translationText = typeof translation === "object" ? translation.translation : translation;
+          const kanjiForm = (_a = firstKfWords && firstKfWords.length > 0 ? word.kanjiForms[0] : word.kanjiForms.find(
+            (kf) => kf.form.includes(kanji2.kanji)
+          )) == null ? void 0 : _a.form;
+          if (!kanjiForm) continue;
+          const reading = (_b = firstKfWords && firstKfWords.length > 0 ? word.readings[0] : word.readings.find(
+            (reading2) => reading2.kanjiFormRestrictions && reading2.kanjiFormRestrictions.includes(kanjiForm)
+          )) == null ? void 0 : _b.reading;
+          if (!reading) continue;
+          const meaning = firstKfWords && firstKfWords.length > 0 ? (_c = word.meanings[0]) == null ? void 0 : _c.translations[0] : (_d = word.meanings.find(
+            (m) => m.translations && m.kanjiFormRestrictions && m.kanjiFormRestrictions.includes(kanjiForm)
+          )) == null ? void 0 : _d.translations[0];
+          if (!meaning) continue;
           validWords.push({
-            kanjiForms: [{ kanjiForm: word.kanjiForms[0].form }],
-            readings: [{ reading: word.readings[0].reading }],
-            translations: [{ translation: translationText }]
+            kanjiForms: [{ kanjiForm }],
+            readings: [{ reading }],
+            translations: [
+              {
+                translation: typeof meaning === "string" ? meaning : meaning.translation
+              }
+            ]
           });
+          if (validWords.length === 3) break;
         }
         if (validWords.length > 0) kanji2.words = validWords;
       }
@@ -2465,10 +2489,10 @@ function getKanji(kanji, dict, jmDict, svgList, noteTypeName, deckPath) {
         ...kanji2.frequency ? [`kanji::frequency::${kanji2.frequency}`] : [],
         ...kanji2.grade ? [`kanji::grade::${kanji2.grade}`] : [],
         ...kanji2.jlpt ? [`kanji::pre-2010_jlpt::${kanji2.jlpt.toLowerCase()}`] : [],
-        `kanji::onyomi::${((_b = kanji2.onyomi) == null ? void 0 : _b.length) ?? 0}`,
-        `kanji::kunyomi::${((_c = kanji2.kunyomi) == null ? void 0 : _c.length) ?? 0}`,
-        `kanji::nanori::${((_d = kanji2.nanori) == null ? void 0 : _d.length) ?? 0}`,
-        `kanji::words::${((_e = kanji2.words) == null ? void 0 : _e.length) ?? 0}`,
+        `kanji::onyomi::${((_e = kanji2.onyomi) == null ? void 0 : _e.length) ?? 0}`,
+        `kanji::kunyomi::${((_f = kanji2.kunyomi) == null ? void 0 : _f.length) ?? 0}`,
+        `kanji::nanori::${((_g = kanji2.nanori) == null ? void 0 : _g.length) ?? 0}`,
+        `kanji::words::${((_h = kanji2.words) == null ? void 0 : _h.length) ?? 0}`,
         ...kanji2.svg ? ["kanji::has_svg"] : []
       );
     return kanji2;