henkan 2.4.6 → 2.4.8

package/dist/index.cjs.js

@@ -2607,9 +2607,19 @@ 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 = [];
       const readingMatchingKanjiFormExamples = [];
-      const readingExamples = [];
+      let readingExamples = [];
       const readingMatchingKanjiForms = /* @__PURE__ */ new Set();
       const seenPhrases = /* @__PURE__ */ new Set();
       for (const example of exampleList)
@@ -2630,29 +2640,42 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
               kanjiFormExamples.push({
                 ex: example,
                 partIndex: i,
-                form: part.baseForm
+                form: part.baseForm,
+                ...meanings.some(
+                  (m) => example.translation.includes(m)
+                ) ? { includesTranslation: true } : {}
               });
             seenPhrases.add(example.phrase);
             break;
           }
           const readingAsBaseFormMatch = readings.has(part.baseForm);
           if ((readingAsBaseFormMatch || referenceIDMatch) && kanjiForms === void 0) {
-            readingExamples.push({ ex: example, partIndex: i });
+            readingExamples.push({
+              ex: example,
+              partIndex: i,
+              ...referenceIDMatch ? { referenceIDMatch: true } : {},
+              ...!referenceIDMatch && meanings.some((m) => example.translation.includes(m)) ? { includesTranslation: true } : {}
+            });
             seenPhrases.add(example.phrase);
             break;
           }
         }
-      if (readingMatchingKanjiForms.size > 0)
+      if (kanjiFormExamples.length > 0 && readingMatchingKanjiForms.size > 0)
         kanjiFormExamples = kanjiFormExamples.filter(
-          (ex) => ex.form !== void 0 && readingMatchingKanjiForms.has(ex.form)
+          (ex) => ex.includesTranslation === true && ex.form !== void 0 && readingMatchingKanjiForms.has(ex.form)
+        );
+      else kanjiFormExamples.length = 0;
+      if (readingExamples.length > 0 && readingExamples.some(
+        (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true
+      ))
+        readingExamples = readingExamples.filter(
+          (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true
         );
-      const includeKanjiFormExamples = word.kanjiForms !== void 0;
       let wordExamples = [
-        ...includeKanjiFormExamples ? [...readingMatchingKanjiFormExamples, ...kanjiFormExamples] : readingExamples
+        ...word.kanjiForms !== void 0 ? [...readingMatchingKanjiFormExamples, ...kanjiFormExamples] : readingExamples
       ].toSorted(
         (a, b) => a.ex.phrase.length - b.ex.phrase.length
       );
-      readingMatchingKanjiForms.clear();
       seenPhrases.clear();
       const glossSpecificExamples = [];
       for (let i = 0; i < word.translations.length; i++)
@@ -2727,7 +2750,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) {
+function generateAnkiNote(entry, customData) {
   const fields = [];
   if (isWord(entry)) {
     const firstReading = createEntry(
@@ -2831,10 +2854,10 @@ function generateAnkiNote(entry) {
     const searchField = `${entry.readings.map((r) => r.reading).join(" ")}${entry.kanjiForms !== void 0 ? ` ${entry.kanjiForms.map((kf) => kf.kanjiForm).join(" ")}` : ""} ${entry.id}`;
     fields.push(
       ...entry.kanjiForms !== void 0 && !entry.usuallyInKana ? [
-        `${kanjiFormsField}<div id="kf-pos" style="display: none" data-pos="1"></div>`,
+        `${customData !== void 0 ? `<div id="custom-data" style="display: none" data-custom="${customData}"></div>` : ""}${kanjiFormsField}<div id="kf-pos" style="display: none" data-pos="1"></div>`,
         `${hasAudio ? readingsFieldWithoutAudio : readingsField}<div id="r-pos" style="display: none" data-pos="2"></div>`
       ] : [
-        `${kanjiFormsField}<div id="kf-pos" style="display: none" data-pos="2"></div>`,
+        `${customData !== void 0 ? `<div id="custom-data" style="display: none" data-custom="${customData}"></div>` : ""}${kanjiFormsField}<div id="kf-pos" style="display: none" data-pos="2"></div>`,
         `${hasAudio ? readingsFieldWithoutAudio : readingsField}<div id="r-pos" style="display: none" data-pos="1"></div>`
       ],
       `${hasAudio ? readingsField : readingsFieldWithoutAudio}<div id="r-pos" style="display: none" data-pos="${entry.kanjiForms !== void 0 && !entry.usuallyInKana ? "2" : "1"}"></div>`,
@@ -2857,9 +2880,9 @@ function generateAnkiNote(entry) {
   }
   if (isRadical(entry))
     fields.push(
-      createEntry(
+      `${customData !== void 0 ? `<div id="custom-data" style="display: none" data-custom="${customData}"></div>` : ""}${createEntry(
         `<span class="radical radical-character">${entry.radical}</span>`
-      ),
+      )}`,
       createEntry(
         `<span class="radical radical-reading">${entry.reading}</span>`
       ),
@@ -2888,7 +2911,7 @@ function generateAnkiNote(entry) {
     );
   if (isKanji(entry))
     fields.push(
-      createEntry(`<span class="kanji kanji-character">${entry.kanji}</span>`),
+      `${customData !== void 0 ? `<div id="custom-data" style="display: none" data-custom="${customData}"></div>` : ""}${createEntry(`<span class="kanji kanji-character">${entry.kanji}</span>`)}`,
       entry.meanings !== void 0 ? entry.meanings.map(
         (meaningEntry) => createEntry(
           `<span class="kanji kanji-meaning">${meaningEntry}</span>`
@@ -2934,7 +2957,7 @@ function generateAnkiNote(entry) {
     );
   if (isKana(entry))
     fields.push(
-      createEntry(`<span class="kana kana-character">${entry.kana}</span>`),
+      `${customData !== void 0 ? `<div id="custom-data" style="display: none" data-custom="${customData}"></div>` : ""}${createEntry(`<span class="kana kana-character">${entry.kana}</span>`)}`,
       createEntry(
         `<span class="kana kana-reading">${entry.reading}${entry.audio !== void 0 ? `<br>[sound:${entry.audio}]` : ""}</span>`
       ),
@@ -2949,7 +2972,7 @@ function generateAnkiNote(entry) {
     );
   if (isGrammar(entry))
     fields.push(
-      createEntry(`<span class="grammar grammar-point">${entry.point}</span>`),
+      `${customData !== void 0 ? `<div id="custom-data" style="display: none" data-custom="${customData}"></div>` : ""}${createEntry(`<span class="grammar grammar-point">${entry.point}</span>`)}`,
       entry.readings !== void 0 ? entry.readings.map(
         (readingEntry) => createEntry(
           `<span class="grammar grammar-reading">${readingEntry.reading}</span>`
@@ -2979,7 +3002,7 @@ function generateAnkiNote(entry) {
     );
   return fields.map((field) => field.replaceAll("\n", "<br>"));
 }
-function generateAnkiNotesFile(list, defaultNoteInfo) {
+function generateAnkiNotesFile(list, defaultNoteInfo, customData) {
   const headers = [noteHeaderKeys.separator, noteHeaderKeys.html];
   let ankiNotes = "";
   if (list.length > 0) {
@@ -3029,7 +3052,7 @@ function generateAnkiNotesFile(list, defaultNoteInfo) {
         headers.push(`${noteHeaderKeys.deck}${++headerCount}`);
         hasHeader.deckPath = true;
       }
-      const note = generateAnkiNote(result);
+      const note = generateAnkiNote(result, customData);
       if (!hasHeader.tags) {
         headers.push(`${noteHeaderKeys.tags}${note.length + headerCount}`);
         hasHeader.tags = true;