henkan 2.4.9 → 2.4.11

package/dist/index.cjs.js

@@ -2618,13 +2618,17 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
         )
       ).values().toArray();
       let kanjiFormExamples = [];
-      const readingMatchingKanjiFormExamples = [];
+      let readingMatchingKanjiFormExamples = [];
       let readingExamples = [];
-      const readingMatchingKanjiForms = /* @__PURE__ */ new Set();
+      let readingMatchingKanjiForms = /* @__PURE__ */ new Set();
+      const readingMatchingKanjiFormsWithTranslations = /* @__PURE__ */ new Set();
       const seenPhrases = /* @__PURE__ */ new Set();
       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 +2637,19 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
             if (readingAsReadingMatch || readingAsInflectedFormMatch || referenceIDMatch) {
               readingMatchingKanjiFormExamples.push({
                 ex: example,
-                partIndex: i
+                partIndex: i,
+                form: part.baseForm,
+                ...includesTranslation ? { includesTranslation: true } : {}
               });
               readingMatchingKanjiForms.add(part.baseForm);
+              if (includesTranslation)
+                readingMatchingKanjiFormsWithTranslations.add(part.baseForm);
             } 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,18 +2660,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 } : {}
+              ...!referenceIDMatch && 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
+          )
+        );
+      }
       const hasKfExamplesWithTranslation = kanjiFormExamples.some(
         (ex) => ex.includesTranslation === true
       );
       if (kanjiFormExamples.length > 0 && readingMatchingKanjiForms.size > 0)
         kanjiFormExamples = kanjiFormExamples.filter(
-          (ex) => (!hasKfExamplesWithTranslation || ex.includesTranslation === true) && ex.form !== void 0 && readingMatchingKanjiForms.has(ex.form)
+          (ex) => readingMatchingKanjiForms.has(ex.form) && (!hasKfExamplesWithTranslation || ex.includesTranslation === true || ex.ex.parts.some(
+            (part) => readingMatchingKanjiForms.has(part.baseForm) && part.glossNumber !== void 0
+          ))
         );
       if (readingExamples.length > 0 && readingExamples.some(
         (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true
@@ -2752,7 +2768,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(
@@ -2872,12 +2888,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))
@@ -2904,12 +2915,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(
@@ -2950,12 +2956,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(
@@ -2965,12 +2966,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(
@@ -2995,16 +2991,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) {
@@ -3054,7 +3049,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;