henkan 2.4.10 → 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,24 +2625,16 @@ 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 readingMatchingKanjiFormExamples = [];
       let kanjiFormExamples = [];
-      const readingMatchingKanjiFormExamples = [];
       let readingExamples = [];
-      const readingMatchingKanjiForms = /* @__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;
+          const includesTranslation = meanings.some(
+            (m) => example.translation.includes(m)
+          );
           const part = example.parts[i];
           const readingAsReadingMatch = part.reading !== void 0 && readings.has(part.reading);
           const readingAsInflectedFormMatch = part.inflectedForm !== void 0 && readings.has(part.inflectedForm);
@@ -2633,17 +2643,19 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
             if (readingAsReadingMatch || readingAsInflectedFormMatch || referenceIDMatch) {
               readingMatchingKanjiFormExamples.push({
                 ex: example,
-                partIndex: i
+                partIndex: i,
+                form: part.baseForm,
+                ...referenceIDMatch ? { referenceIDMatch: true } : {},
+                ...includesTranslation ? { includesTranslation: true } : {}
               });
-              readingMatchingKanjiForms.add(part.baseForm);
+              if (!hasReadingMatchingKanjiFormWithTranslation && includesTranslation)
+                hasReadingMatchingKanjiFormWithTranslation = true;
             } else
               kanjiFormExamples.push({
                 ex: example,
                 partIndex: i,
                 form: part.baseForm,
-                ...meanings.some(
-                  (m) => example.translation.includes(m)
-                ) ? { includesTranslation: true } : {}
+                ...includesTranslation ? { includesTranslation: true } : {}
               });
             seenPhrases.add(example.phrase);
             break;
@@ -2654,20 +2666,28 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
               ex: example,
               partIndex: i,
               ...referenceIDMatch ? { referenceIDMatch: true } : {},
-              ...!referenceIDMatch && meanings.some((m) => example.translation.includes(m)) ? { includesTranslation: true } : {}
+              ...includesTranslation ? { includesTranslation: true } : {}
             });
             seenPhrases.add(example.phrase);
             break;
           }
         }
-      const hasKfExamplesWithTranslation = kanjiFormExamples.some(
+      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;
+      }
+      if (kanjiFormExamples.length > 0 && kanjiFormExamples.some(
         (ex) => ex.includesTranslation === true
-      );
-      if (kanjiFormExamples.length > 0 && readingMatchingKanjiForms.size > 0)
+      ))
         kanjiFormExamples = kanjiFormExamples.filter(
-          (ex) => ex.form !== void 0 && 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
@@ -2677,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++)
@@ -2712,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");
@@ -2754,7 +2774,7 @@ 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 === true ? " gloss-specific" : ""}">${entry}${notes !== void 0 && notes.length > 0 ? createNotes(notes, phrase) : ""}</div>`;
-function generateAnkiNote(entry, customData) {
+function generateAnkiNote(entry, customData, additionalTags) {
   const fields = [];
   if (isWord(entry)) {
     const firstReading = createEntry(
@@ -2874,12 +2894,7 @@ function generateAnkiNote(entry, customData) {
           kanjiEntry.meanings
         )
       ).join("") : '<span class="word word-kanji" id="no-kanji">(no kanji)</span>',
-      searchField,
-      ...entry.tags !== void 0 && entry.tags.length > 0 ? [
-        entry.tags.map(
-          (tag) => tag.trim().toLowerCase().replaceAll(" ", "::")
-        ).join(" ")
-      ] : []
+      searchField
     );
   }
   if (isRadical(entry))
@@ -2906,12 +2921,7 @@ function generateAnkiNote(entry, customData) {
       entry.strokes !== void 0 ? createEntry(
         `<span class="radical radical-strokes">${entry.strokes}<br>${entry.svg !== void 0 ? `<img class="radical radical-stroke-order" src="${entry.svg}" alt="${entry.radical} stroke order SVG">` : "(no stroke order SVG available)"}</span>`
       ) : '<span class="radical radical-strokes" id="no-strokes">(no stroke number)</span>',
-      entry.sources !== void 0 ? `<span class="radical radical-source">${entry.sources.map((source, index) => `<a href="${source}" target="_blank">Source ${index + 1}</a>`).join("<br>")}</span>` : '<span class="radical radical-source" id="no-sources">(no sources)</span>',
-      ...entry.tags !== void 0 && entry.tags.length > 0 ? [
-        entry.tags.map(
-          (tag) => tag.trim().toLowerCase().replaceAll(" ", "::")
-        ).join(" ")
-      ] : []
+      entry.sources !== void 0 ? `<span class="radical radical-source">${entry.sources.map((source, index) => `<a href="${source}" target="_blank">Source ${index + 1}</a>`).join("<br>")}</span>` : '<span class="radical radical-source" id="no-sources">(no sources)</span>'
     );
   if (isKanji(entry))
     fields.push(
@@ -2952,12 +2962,7 @@ function generateAnkiNote(entry, customData) {
       entry.strokes !== void 0 ? createEntry(
         `<span class="kanji kanji-strokes">${entry.strokes}<br>${entry.svg !== void 0 ? `<img class="kanji kanji-stroke-order" src="${entry.svg}" alt="${entry.kanji} stroke order SVG">` : "(no stroke order SVG available)"}</span>`
       ) : '<span class="kanji kanji-strokes" id="no-strokes">(no stroke number)</span>',
-      entry.source !== void 0 ? `<span class="kanji kanji-source"><a href="${entry.source}" target="_blank">Source</a></span>` : '<span class="kanji kanji-source" id="no-source">(no components/mnemonic source)</span>',
-      ...entry.tags !== void 0 && entry.tags.length > 0 ? [
-        entry.tags.map(
-          (tag) => tag.trim().toLowerCase().replaceAll(" ", "::")
-        ).join(" ")
-      ] : []
+      entry.source !== void 0 ? `<span class="kanji kanji-source"><a href="${entry.source}" target="_blank">Source</a></span>` : '<span class="kanji kanji-source" id="no-source">(no components/mnemonic source)</span>'
     );
   if (isKana(entry))
     fields.push(
@@ -2967,12 +2972,7 @@ function generateAnkiNote(entry, customData) {
       ),
       entry.svg !== void 0 ? createEntry(
         `<img class="kana kana-stroke-order" src="${entry.svg}" alt="${entry.kana} stroke order SVG">`
-      ) : "(no stroke order SVG available)",
-      ...entry.tags !== void 0 && entry.tags.length > 0 ? [
-        entry.tags.map(
-          (tag) => tag.trim().toLowerCase().replaceAll(" ", "::")
-        ).join(" ")
-      ] : []
+      ) : "(no stroke order SVG available)"
     );
   if (isGrammar(entry))
     fields.push(
@@ -2997,16 +2997,15 @@ function generateAnkiNote(entry, customData) {
           true
         )
       ).join("") : '<span class="grammar grammar-phrase" id="no-phrases">(no phrases)</span>',
-      entry.source !== void 0 ? `<span class="grammar grammar-source"><a href="${entry.source}" target="_blank">Source</a></span>` : '<span class="grammar grammar-source" id="no-source">(no source)</span>',
-      ...entry.tags !== void 0 && entry.tags.length > 0 ? [
-        entry.tags.map(
-          (tag) => tag.trim().toLowerCase().replaceAll(" ", "::")
-        ).join(" ")
-      ] : []
+      entry.source !== void 0 ? `<span class="grammar grammar-source"><a href="${entry.source}" target="_blank">Source</a></span>` : '<span class="grammar grammar-source" id="no-source">(no source)</span>'
+    );
+  if (entry.tags !== void 0 && entry.tags.length > 0 || additionalTags !== void 0 && additionalTags.length > 0)
+    fields.push(
+      [...entry.tags ?? [], ...additionalTags ?? []].map((tag) => tag.trim().toLowerCase().replaceAll(" ", "::")).join(" ")
     );
   return fields.map((field) => field.replaceAll("\n", "<br>"));
 }
-function generateAnkiNotesFile(list, defaultNoteInfo, customData) {
+function generateAnkiNotesFile(list, defaultNoteInfo, customData, additionalTags) {
   const headers = [noteHeaderKeys.separator, noteHeaderKeys.html];
   let ankiNotes = "";
   if (list.length > 0) {
@@ -3056,7 +3055,11 @@ function generateAnkiNotesFile(list, defaultNoteInfo, customData) {
         headers.push(`${noteHeaderKeys.deck}${++headerCount}`);
         hasHeader.deckPath = true;
       }
-      const note = generateAnkiNote(result, customData);
+      const note = generateAnkiNote(
+        result,
+        customData,
+        additionalTags
+      );
       if (!hasHeader.tags) {
         headers.push(`${noteHeaderKeys.tags}${note.length + headerCount}`);
         hasHeader.tags = true;