henkan 2.4.11 → 2.4.12

package/dist/index.cjs.js

@@ -2512,17 +2512,34 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
       ...dictReading.commonness !== void 0 && dictReading.commonness.length > 0 ? { common: true } : {}
     }));
     word.translations = [];
+    const meanings = dictWord.hasPhrases === true && examples !== void 0 ? [] : void 0;
+    const seenPhrases = /* @__PURE__ */ new Set();
     for (const dictMeaning of dictWord.meanings) {
       const translationTypes = [];
       const translations = dictMeaning.translations.map(
         (translation) => {
-          if (typeof translation === "string") return translation;
-          else {
+          if (typeof translation === "string") {
+            if (meanings !== void 0) {
+              const cleanTranslation = translation.replaceAll(/\([^)]*\)|\[[^\]]*\]|\{[^}]*\}/g, "").trim();
+              if (!seenPhrases.has(cleanTranslation)) {
+                seenPhrases.add(cleanTranslation);
+                meanings.push(cleanTranslation);
+              }
+            }
+            return translation;
+          } else {
             const translationNoteAndTag = noteMap.get(
               translation.type
             );
             translationTypes.push(translationNoteAndTag[1]);
             word.tags.push(`word::${translationNoteAndTag[0]}`);
+            if (meanings !== void 0) {
+              const cleanTranslation = translation.translation.replaceAll(/\([^)]*\)|\[[^\]]*\]|\{[^}]*\}/g, "").trim();
+              if (!seenPhrases.has(cleanTranslation)) {
+                seenPhrases.add(cleanTranslation);
+                meanings.push(cleanTranslation);
+              }
+            }
             return translation.translation;
           }
         }
@@ -2576,6 +2593,7 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
       word.usuallyInKana = true;
       word.tags.push("word::usually_in_kana_for_all_senses");
     }
+    seenPhrases.clear();
     if (kanjiDic !== void 0 && word.kanjiForms !== void 0) {
       const kanji = [];
       const seenChars = /* @__PURE__ */ new Set();
@@ -2596,7 +2614,7 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
         }
       if (kanji.length > 0) word.kanji = kanji;
     }
-    if (dictWord.hasPhrases === true && examples !== void 0) {
+    if (meanings !== void 0) {
       const exampleList = examples instanceof Map ? examples.get(dictWord.id) ?? [] : examples;
       const rkf = getValidForms(
         dictWord.readings,
@@ -2607,22 +2625,10 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
         rkf.readings.map((r) => r.reading)
       );
       const kanjiForms = rkf.kanjiForms !== void 0 ? new Set(rkf.kanjiForms.map((kf) => kf.form)) : void 0;
-      const meanings = new Set(
-        dictWord.meanings.flatMap(
-          (m) => m.translations.map((t) => {
-            if (typeof t === "string")
-              return t.replaceAll(/\([^)]*\)|\[[^\]]*\]|\{[^}]*\}/g, "").trim();
-            else
-              return t.translation.replaceAll(/\([^)]*\)|\[[^\]]*\]|\{[^}]*\}/g, "").trim();
-          })
-        )
-      ).values().toArray();
-      let kanjiFormExamples = [];
       let readingMatchingKanjiFormExamples = [];
+      let kanjiFormExamples = [];
       let readingExamples = [];
-      let readingMatchingKanjiForms = /* @__PURE__ */ new Set();
-      const readingMatchingKanjiFormsWithTranslations = /* @__PURE__ */ new Set();
-      const seenPhrases = /* @__PURE__ */ new Set();
+      let hasReadingMatchingKanjiFormWithTranslation = false;
       for (const example of exampleList)
         for (let i = 0; i < example.parts.length; i++) {
           if (seenPhrases.has(example.phrase)) break;
@@ -2639,11 +2645,11 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
                 ex: example,
                 partIndex: i,
                 form: part.baseForm,
+                ...referenceIDMatch ? { referenceIDMatch: true } : {},
                 ...includesTranslation ? { includesTranslation: true } : {}
               });
-              readingMatchingKanjiForms.add(part.baseForm);
-              if (includesTranslation)
-                readingMatchingKanjiFormsWithTranslations.add(part.baseForm);
+              if (!hasReadingMatchingKanjiFormWithTranslation && includesTranslation)
+                hasReadingMatchingKanjiFormWithTranslation = true;
             } else
               kanjiFormExamples.push({
                 ex: example,
@@ -2660,28 +2666,28 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
               ex: example,
               partIndex: i,
               ...referenceIDMatch ? { referenceIDMatch: true } : {},
-              ...!referenceIDMatch && includesTranslation ? { includesTranslation: true } : {}
+              ...includesTranslation ? { includesTranslation: true } : {}
             });
             seenPhrases.add(example.phrase);
             break;
           }
         }
-      if (readingMatchingKanjiFormsWithTranslations.size > 0) {
-        readingMatchingKanjiForms = readingMatchingKanjiFormsWithTranslations;
-        readingMatchingKanjiFormExamples = readingMatchingKanjiFormExamples.filter(
-          (ex) => ex.includesTranslation === true || ex.ex.parts.some(
-            (part) => readingMatchingKanjiForms.has(part.baseForm) && part.glossNumber !== void 0
-          )
-        );
+      if (readingMatchingKanjiFormExamples.length > 0) {
+        if (hasReadingMatchingKanjiFormWithTranslation)
+          readingMatchingKanjiFormExamples = readingMatchingKanjiFormExamples.filter(
+            (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true || ex.ex.parts.some(
+              (part) => ex.form === part.baseForm && part.glossNumber !== void 0
+            )
+          );
+        kanjiFormExamples.length = 0;
       }
-      const hasKfExamplesWithTranslation = kanjiFormExamples.some(
+      if (kanjiFormExamples.length > 0 && kanjiFormExamples.some(
         (ex) => ex.includesTranslation === true
-      );
-      if (kanjiFormExamples.length > 0 && readingMatchingKanjiForms.size > 0)
+      ))
         kanjiFormExamples = kanjiFormExamples.filter(
-          (ex) => readingMatchingKanjiForms.has(ex.form) && (!hasKfExamplesWithTranslation || ex.includesTranslation === true || ex.ex.parts.some(
-            (part) => readingMatchingKanjiForms.has(part.baseForm) && part.glossNumber !== void 0
-          ))
+          (ex) => ex.includesTranslation === true || ex.ex.parts.some(
+            (part) => ex.form === part.baseForm && part.glossNumber !== void 0
+          )
         );
       if (readingExamples.length > 0 && readingExamples.some(
         (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true
@@ -2691,9 +2697,7 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
         );
       let wordExamples = [
         ...word.kanjiForms !== void 0 ? [...readingMatchingKanjiFormExamples, ...kanjiFormExamples] : readingExamples
-      ].toSorted(
-        (a, b) => a.ex.phrase.length - b.ex.phrase.length
-      );
+      ];
       seenPhrases.clear();
       const glossSpecificExamples = [];
       for (let i = 0; i < word.translations.length; i++)
@@ -2726,12 +2730,14 @@ 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) => ({
-          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.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");