henkan 2.2.4 → 2.2.5

package/dist/index.cjs.js

@@ -1678,11 +1678,10 @@ function createEntryMaps(jmDict, kanjiDic, tanakaExamples, wordDefinitionPairs,
           word.isCommon
         );
         const localPartParts = /* @__PURE__ */ new Set();
-        if (rkf.readings.length > 0)
-          for (const reading of rkf.readings) {
-            entryParts.add(reading.reading);
-            localPartParts.add(reading.reading);
-          }
+        for (const reading of rkf.readings) {
+          entryParts.add(reading.reading);
+          localPartParts.add(reading.reading);
+        }
         if (rkf.kanjiForms && rkf.kanjiForms.length > 0)
           for (const kanjiForm of rkf.kanjiForms) {
             entryParts.add(kanjiForm.form);
@@ -1846,12 +1845,11 @@ function getWordDefinitions(entryList, jmDict) {
       word.kanjiForms,
       word.isCommon
     );
-    if (rkf.readings.length > 0)
-      for (const r of rkf.readings) {
-        validReadings.add(r.reading);
-        wordReadings.add(r.reading);
-        validForms.add(r.reading);
-      }
+    for (const r of rkf.readings) {
+      validReadings.add(r.reading);
+      wordReadings.add(r.reading);
+      validForms.add(r.reading);
+    }
     if (rkf.kanjiForms && rkf.kanjiForms.length > 0)
       for (const kf of rkf.kanjiForms) {
         validKanjiForms.add(kf.form);
@@ -1875,7 +1873,7 @@ function getWordDefinitions(entryList, jmDict) {
     if (validKanjiForms && validKanjiForms.has(entry.word)) {
       valid = true;
       for (const sense of entry.senses) {
-        if (sense.form_of && sense.form_of.some((form) => validReadings.has(form)))
+        if (sense.form_of && sense.form_of.some((form) => validForms.has(form)))
           validFormOfEntries.add(entry.word);
         for (const gloss of sense.glosses) {
           let hasForm = false;
@@ -1891,10 +1889,10 @@ function getWordDefinitions(entryList, jmDict) {
       }
       if (entry.forms) {
         for (const form of entry.forms)
-          if (validReadings.has(form)) validFormsEntries.add(entry.word);
+          if (validForms.has(form)) validFormsEntries.add(entry.word);
       }
     }
-    if (validReadings.has(entry.word)) {
+    if (validForms.has(entry.word)) {
       valid = true;
       const ftEntry = entriesWithFormTitlesGlobal.get(entry.word);
       if (ftEntry) ftEntry.push(entry);
@@ -1905,9 +1903,7 @@ function getWordDefinitions(entryList, jmDict) {
       if (tEntry) tEntry.push(entry);
       else validTitleEntries.set(entry.word, [entry]);
     }
-    if (entry.forms && (validKanjiForms.has(entry.word) || validReadings.has(entry.word)) && entry.forms.some(
-      (form) => validKanjiForms.has(form) || validReadings.has(form)
-    )) {
+    if (entry.forms && validForms.has(entry.word) && entry.forms.some((form) => validForms.has(form))) {
       const wfEntry = entriesWithFormsGlobal.get(entry.word);
       if (wfEntry) wfEntry.push(entry);
       else entriesWithFormsGlobal.set(entry.word, [entry]);
@@ -2034,7 +2030,10 @@ function getWordDefinitions(entryList, jmDict) {
               entriesWithForms.push(
                 ...fe.filter(
                   (ent) => ent.forms && ent.forms.some(
-                    (form) => rkf.kanjiForms.has(form) || rkf.readings.has(form)
+                    (form) => {
+                      var _a2;
+                      return ((_a2 = rkf.kanjiForms) == null ? void 0 : _a2.has(form)) || rkf.readings.has(form);
+                    }
                   )
                 )
               );
@@ -2046,16 +2045,22 @@ function getWordDefinitions(entryList, jmDict) {
           if (te)
             entriesWithTitles.push(
               ...te.filter(
-                (ent) => ent.forms && rkf.kanjiForms && ent.forms.some(
-                  (form) => rkf.kanjiForms.has(form)
-                ) || rkf.kanjiForms === void 0
+                (ent) => ent.forms && ent.forms.some(
+                  (form) => {
+                    var _a2;
+                    return ((_a2 = rkf.kanjiForms) == null ? void 0 : _a2.has(form)) || rkf.readings.has(form);
+                  }
+                )
               )
             );
           if (fe)
             entriesWithForms.push(
               ...fe.filter(
                 (ent) => ent.forms && ent.forms.some(
-                  (form) => rkf.kanjiForms && rkf.kanjiForms.has(form) || rkf.readings.has(form)
+                  (form) => {
+                    var _a2;
+                    return ((_a2 = rkf.kanjiForms) == null ? void 0 : _a2.has(form)) || rkf.readings.has(form);
+                  }
                 )
               )
             );
@@ -2077,7 +2082,10 @@ function getWordDefinitions(entryList, jmDict) {
             entriesWithForms.push(
               ...fe.filter(
                 (ent) => ent.forms && ent.forms.some(
-                  (form) => rkf.kanjiForms.has(form) || rkf.readings.has(form)
+                  (form) => {
+                    var _a2;
+                    return ((_a2 = rkf.kanjiForms) == null ? void 0 : _a2.has(form)) || rkf.readings.has(form);
+                  }
                 )
               )
             );
@@ -2089,16 +2097,22 @@ function getWordDefinitions(entryList, jmDict) {
         if (te)
           entriesWithTitles.push(
             ...te.filter(
-              (ent) => ent.forms && rkf.kanjiForms && ent.forms.some(
-                (form) => rkf.kanjiForms.has(form)
-              ) || rkf.kanjiForms === void 0
+              (ent) => ent.forms && ent.forms.some(
+                (form) => {
+                  var _a2;
+                  return ((_a2 = rkf.kanjiForms) == null ? void 0 : _a2.has(form)) || rkf.readings.has(form);
+                }
+              )
             )
           );
         if (fe)
           entriesWithForms.push(
             ...fe.filter(
               (ent) => ent.forms && ent.forms.some(
-                (form) => rkf.kanjiForms && rkf.kanjiForms.has(form) || rkf.readings.has(form)
+                (form) => {
+                  var _a2;
+                  return ((_a2 = rkf.kanjiForms) == null ? void 0 : _a2.has(form)) || rkf.readings.has(form);
+                }
               )
             )
           );
@@ -2123,19 +2137,19 @@ function getWordDefinitions(entryList, jmDict) {
     const readingEntries = [];
     const titleFormMap = /* @__PURE__ */ new Map();
     const refsMap = /* @__PURE__ */ new Map();
-    const readingForms = /* @__PURE__ */ new Set();
+    const forms = /* @__PURE__ */ new Set();
     for (const ent of pair.entriesWithTitles) {
       const validFormOf = validFormOfEntries.has(ent.word);
       const validGlosses = validGlossesEntries.has(ent.word);
       const validForms2 = validFormsEntries.has(ent.word);
-      const hasKanjiForms = ent.forms !== void 0 && pair.kanjiForms !== void 0 && ent.forms.some((form) => pair.kanjiForms.has(form));
+      const hasForms = ent.forms !== void 0 && ent.forms.some((form) => pair.forms.has(form));
       if (pair.kanjiForms && pair.kanjiForms.has(ent.word) && (validFormOf || validGlosses || validForms2)) {
         kanjiFormEntries.push(ent);
         if ((validFormOf || validGlosses) && ent.senses)
           for (const sense of ent.senses) {
             if (validFormOf && sense.form_of) {
               for (const form of sense.form_of)
-                if (pair.readings.has(form)) {
+                if (pair.forms.has(form)) {
                   const elem = titleFormMap.get(form);
                   if (!elem)
                     titleFormMap.set(form, /* @__PURE__ */ new Set([ent.word]));
@@ -2156,11 +2170,10 @@ function getWordDefinitions(entryList, jmDict) {
           }
         if (validForms2 && ent.forms) {
           for (const form of ent.forms)
-            if (pair.readings.has(form)) readingForms.add(form);
+            if (pair.forms.has(form)) forms.add(form);
         }
       }
-      if (pair.readings.has(ent.word) && hasKanjiForms)
-        entriesWithForms.push(ent);
+      if (pair.readings.has(ent.word) && hasForms) entriesWithForms.push(ent);
       if (pair.kanjiForms === void 0 && pair.readings.has(ent.word))
         readingEntries.push(ent);
     }
@@ -2170,7 +2183,7 @@ function getWordDefinitions(entryList, jmDict) {
         entriesWithForms.push(entry);
     }
     for (const entry of pair.entriesWithFormTitles) {
-      if (readingForms.has(entry.word)) {
+      if (forms.has(entry.word)) {
         entriesWithForms.push(entry);
         continue;
       }
@@ -2191,7 +2204,8 @@ function getWordDefinitions(entryList, jmDict) {
     if (definitions.length > 0)
       japaneseDefinitions.push({
         wordID: pair.word.id,
-        definitions
+        definitions,
+        wordForms: pair.forms
       });
   }
   for (let i = 0; i < japaneseDefinitions.length; i++) {
@@ -2200,9 +2214,17 @@ function getWordDefinitions(entryList, jmDict) {
       const defCount = definitionMap.get(
         pair.definitions[j].definition
       );
-      if (defCount && defCount.count > 1)
-        pair.definitions[j].mayNotBeAccurate = true;
+      if (defCount && defCount.count > 1) {
+        let mnba = true;
+        for (const f of pair.wordForms)
+          if (pair.definitions[j].definition.includes(f)) {
+            mnba = false;
+            break;
+          }
+        if (mnba) pair.definitions[j].mayNotBeAccurate = true;
+      }
     }
+    delete pair.wordForms;
     japaneseDefinitions[i] = pair;
   }
   return japaneseDefinitions;
@@ -2443,6 +2465,9 @@ function getWord(word, dict, kanjiDic, examples, definitions, noteTypeName, deck
       let wordExamples = [
         ...includeKanjiFormExamples ? [...readingMatchingKanjiFormExamples, ...kanjiFormExamples] : readingExamples
       ];
+      wordExamples.sort(
+        (a, b) => a.ex.phrase.length - b.ex.phrase.length
+      );
       readingMatchingKanjiForms.clear();
       const glossSpecificExamples = [];
       const seenPhrases = /* @__PURE__ */ new Set();
@@ -2464,18 +2489,17 @@ function getWord(word, dict, kanjiDic, examples, definitions, noteTypeName, deck
         }
       }
       if (glossSpecificExamples.length > 0) {
-        const exes = glossSpecificExamples;
-        if (exes.length < 5) {
+        if (glossSpecificExamples.length < 5) {
           wordExamples = wordExamples.filter(
             (ex) => !seenPhrases.has(ex.ex.phrase)
           );
           if (wordExamples.length > 0)
             for (const ex of wordExamples) {
-              exes.push(ex);
-              if (exes.length === 5) break;
+              glossSpecificExamples.push(ex);
+              if (glossSpecificExamples.length === 5) break;
             }
         }
-        wordExamples = exes;
+        wordExamples = glossSpecificExamples;
       }
       if (wordExamples.length > 0) {
         word2.phrases = (glossSpecificExamples.length === 0 ? wordExamples.slice(0, 5) : wordExamples).map((ex) => {
@@ -2494,7 +2518,12 @@ function getWord(word, dict, kanjiDic, examples, definitions, noteTypeName, deck
     }
     if (definitions) {
       const defs = Array.isArray(definitions) ? (_b = definitions.find((wdp) => wdp.wordID === word2.id)) == null ? void 0 : _b.definitions : definitions.get(word2.id);
-      if (defs) word2.definitions = [...defs];
+      if (defs)
+        word2.definitions = [
+          ...defs.toSorted(
+            (a, b) => Number(Boolean(a.mayNotBeAccurate)) - Number(Boolean(b.mayNotBeAccurate))
+          )
+        ];
     }
     return word2;
   } else return void 0;
@@ -2670,8 +2699,8 @@ function isGrammar(entry) {
 }
 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 ? " gloss-specific" : ""}">${entry}${notes && notes.length > 0 ? createNotes(notes, phrase) : ""}</div>`;
-var noKanjiForms = '<span class="word word-kanjiform">(no kanji forms)</span>';
 function generateAnkiNote(entry) {
+  var _a, _b;
   const fields = [];
   if (isWord(entry)) {
     const firstReading = createEntry(
@@ -2683,10 +2712,8 @@ function generateAnkiNote(entry) {
         `<span class="word word-reading">${readingEntry.reading}${readingEntry.audio !== void 0 ? `<br>[sound:${readingEntry.audio}]` : ""}</span>`,
         readingEntry.notes
       )
-    ).join("")}</details>` : void 0;
-    const readingsField = [firstReading, ...otherReadings != null ? otherReadings : []].join(
-      ""
-    );
+    ).join("")}</details>` : "";
+    const readingsField = `${firstReading}${otherReadings}`;
     const firstKanjiForm = entry.kanjiForms ? createEntry(
       `<span class="word word-kanjiform"><ruby><rb>${entry.kanjiForms[0].kanjiForm}</rb><rt>${entry.readings[0].reading}</rt></ruby></span>`,
       entry.kanjiForms[0].notes
@@ -2698,42 +2725,78 @@ function generateAnkiNote(entry) {
         )
       );
       return `${createEntry(`<span class="word word-kanjiform">${restrictedReading ? "<ruby><rb>" : ""}${kanjiFormEntry.kanjiForm}${restrictedReading ? `</rb><rt>${restrictedReading.reading}</rt></ruby>` : ""}</span>`, kanjiFormEntry.notes)}`;
-    }).join("")}</details>` : void 0;
-    const kanjiFormsField = firstKanjiForm ? [firstKanjiForm, ...otherKanjiForms != null ? otherKanjiForms : []].join("") : void 0;
+    }).join("")}</details>` : "";
+    const kanjiFormsField = firstKanjiForm ? `${firstKanjiForm}${otherKanjiForms}` : '<span class="word word-kanjiform">(no kanji forms)</span>';
     const firstThreeTranslations = entry.translations.slice(0, 3).map(
-      (translationEntry, index) => `${createEntry(`<span class="word word-translation">${translationEntry.translation}</span>`, translationEntry.notes, void 0, entry.phrases && entry.phrases.some((phrase, index2) => index === index2 && phrase.glossNumber && phrase.glossNumber.wordId === entry.id && phrase.glossNumber.glossNumber === index + 1) ? true : void 0)}`
+      (translationEntry, index) => {
+        var _a2;
+        return createEntry(
+          `<span class="word word-translation">${translationEntry.translation}</span>`,
+          translationEntry.notes,
+          void 0,
+          ((_a2 = entry.phrases) == null ? void 0 : _a2.some(
+            (phrase, index2) => index === index2 && phrase.glossNumber && phrase.glossNumber.wordId === entry.id && phrase.glossNumber.glossNumber === index + 1
+          )) ? true : void 0
+        );
+      }
+    ).join("");
+    const otherTranslations = entry.translations.length > 3 ? `<details><summary>Show other translations</summary>${entry.translations.map((translationEntry, index) => {
+      var _a2;
+      if (index < 3) return "null";
+      return createEntry(
+        `<span class="word word-translation">${translationEntry.translation}</span>`,
+        translationEntry.notes,
+        void 0,
+        ((_a2 = entry.phrases) == null ? void 0 : _a2.some(
+          (phrase, index2) => index === index2 && phrase.glossNumber && phrase.glossNumber.wordId === entry.id && phrase.glossNumber.glossNumber === index + 1
+        )) ? true : void 0
+      );
+    }).filter((translation) => translation !== "null").join("")}</details>` : "";
+    const translationsField = `${firstThreeTranslations}${otherTranslations}`;
+    const firstFivePhrases = (_a = entry.phrases) == null ? void 0 : _a.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],
+        true,
+        entry.translations.some(
+          (_translation, index2) => index === index2 && phraseEntry.glossNumber && phraseEntry.glossNumber.wordId === entry.id && phraseEntry.glossNumber.glossNumber === index2 + 1
+        ) ? true : void 0
+      )
+    ).join("");
+    const otherPhrases = entry.phrases !== void 0 && entry.phrases.length > 5 ? `<details><summary>Show other phrases</summary>${entry.phrases.map((phraseEntry, index) => {
+      if (index < 5) return "null";
+      return 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],
+        true,
+        entry.translations.some(
+          (_translation, index2) => index === index2 && phraseEntry.glossNumber && phraseEntry.glossNumber.wordId === entry.id && phraseEntry.glossNumber.glossNumber === index2 + 1
+        ) ? true : void 0
+      );
+    }).filter((phrase) => phrase !== "null").join("")}</details>` : "";
+    const phrasesField = firstFivePhrases ? `${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 === true ? " mnba" : ""}"><span class="word word-definition-original">${definitionEntry.definition}</span><span class="word word-definition-furigana">${(_a2 = definitionEntry.furigana) != null ? _a2 : definitionEntry.definition}</span></span>`
+        );
+      }
     ).join("");
-    const otherTranslations = entry.translations.length > 3 ? `<details><summary>Show other translations</summary>${entry.translations.map(
-      (translationEntry, index) => index > 2 ? `${createEntry(`<span class="word word-translation">${translationEntry.translation}</span>`, translationEntry.notes, void 0, entry.phrases && entry.phrases.some((phrase, index2) => index === index2 && phrase.glossNumber && phrase.glossNumber.wordId === entry.id && phrase.glossNumber.glossNumber === index + 1) ? true : void 0)}` : "null"
-    ).filter((translation) => translation !== "null").join("")}</details>` : void 0;
-    const translationsField = [
-      firstThreeTranslations,
-      ...otherTranslations != null ? otherTranslations : []
-    ].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 === true ? " mnba" : ""}"><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";
+      }
+    ).filter((definition) => definition !== "null").join("")}</details>` : "";
+    const definitionsField = firstThreeDefinitions ? `${firstThreeDefinitions}${otherDefinitions}` : '<span class="word word-definition">(no definitions)</span>';
     fields.push(
-      ...entry.kanjiForms && kanjiFormsField && !entry.usuallyInKana ? [kanjiFormsField, readingsField] : [
-        readingsField,
-        entry.kanjiForms && kanjiFormsField ? kanjiFormsField : noKanjiForms
-      ],
+      ...entry.kanjiForms && !entry.usuallyInKana ? [kanjiFormsField, readingsField] : [readingsField, kanjiFormsField],
       translationsField,
-      entry.phrases ? entry.phrases.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],
-          true,
-          entry.translations.some(
-            (_translation, index2) => index === index2 && phraseEntry.glossNumber && phraseEntry.glossNumber.wordId === entry.id && phraseEntry.glossNumber.glossNumber === index2 + 1
-          ) ? true : void 0
-        )
-      ).join("") : '<span class="word word-phrase">(no phrases) (Search on dictionaries!)</span>',
-      entry.definitions ? entry.definitions.map(
-        (definitionEntry) => {
-          var _a;
-          return createEntry(
-            `<span class="word word-definition${definitionEntry.mayNotBeAccurate === true ? " mnba" : ""}"><span class="word word-definition-original">${definitionEntry.definition}</span><span class="word word-definition-furigana">${(_a = definitionEntry.furigana) != null ? _a : definitionEntry.definition}</span></span>`
-          );
-        }
-      ).join("") : '<span class="word word-definition">(no definitions)</span>',
+      phrasesField,
+      definitionsField,
       entry.kanji ? entry.kanji.map(
         (kanjiEntry) => createEntry(
           `<span class="word word-kanji">${kanjiEntry.kanji}${kanjiEntry.meanings === void 0 ? " (no meanings)" : ""}</span>`,
@@ -2790,7 +2853,7 @@ function generateAnkiNote(entry) {
         (onyomiEntry) => createEntry(
           `<span class="kanji kanji-onyomi">${onyomiEntry}</span>`
         )
-      ).join("") : `<span class="kanji kanji-onyomi">(no onyomi) ${entry.kokuji === true ? "(kokuji)" : ""}</span`,
+      ).join("") : `<span class="kanji kanji-onyomi">(no onyomi) ${entry.kokuji === true ? "(kokuji)" : ""}</span>`,
       entry.kunyomi ? entry.kunyomi.map(
         (kunyomiEntry) => createEntry(
           `<span class="kanji kanji-kunyomi">${kunyomiEntry}</span>`