henkan 3.0.1 → 3.0.3

package/dist/index.mjs

@@ -1317,33 +1317,27 @@ async function generateFurigana(text, bindedFunction) {
 }
 function getValidForms(readings, kanjiForms, wordIsCommon) {
   const kanjiFormRestrictions = /* @__PURE__ */ new Set();
-  const validReadings = readings.filter(
-    (reading, index) => {
-      if (index === 0) return true;
-      if (reading.notes === void 0 || !reading.notes.some((note) => notSearchedForms.has(note))) {
-        if (reading.kanjiFormRestrictions !== void 0) {
-          for (const kfr of reading.kanjiFormRestrictions)
-            kanjiFormRestrictions.add(kfr);
-          return true;
-        }
-        if (wordIsCommon === void 0 || reading.commonness !== void 0)
+  const existValidReadings = readings.some(
+    (r) => r.commonness !== void 0 || (r.notes === void 0 || !r.notes.some((note) => notSearchedForms.has(note))) && (r.kanjiFormRestrictions !== void 0 || wordIsCommon === void 0)
+  );
+  const validReadings = readings.filter((r) => {
+    if (!existValidReadings || r.commonness !== void 0 || r.notes === void 0 || !r.notes.some((note) => notSearchedForms.has(note))) {
+      if (r.kanjiFormRestrictions !== void 0) {
+        for (const kfr of r.kanjiFormRestrictions)
+          kanjiFormRestrictions.add(kfr);
+        if (r.notes === void 0 || !r.notes.some((note) => notSearchedForms.has(note)))
           return true;
       }
-      return false;
+      if (!existValidReadings || wordIsCommon === void 0 || r.commonness !== void 0)
+        return true;
     }
-  );
-  const existValidKf = kanjiForms?.some(
-    (kf, index) => index !== 0 && (kf.notes === void 0 || !kf.notes.some((note) => notSearchedForms.has(note)) && (wordIsCommon === void 0 || kf.commonness !== void 0) || kanjiFormRestrictions.has(kf.form))
+    return false;
+  });
+  const existValidKanjiForms = kanjiForms?.some(
+    (kf) => kanjiFormRestrictions.has(kf.form) || kf.commonness !== void 0 || (kf.notes === void 0 || !kf.notes.some((note) => notSearchedForms.has(note))) && wordIsCommon === void 0
   );
   const validKanjiForms = kanjiForms?.filter(
-    (kanjiForm, index) => {
-      if (index === 0) return true;
-      if (existValidKf === true)
-        return kanjiForm.notes === void 0 || !kanjiForm.notes.some(
-          (note) => notSearchedForms.has(note)
-        ) && (wordIsCommon === void 0 || kanjiForm.commonness !== void 0) || kanjiFormRestrictions.has(kanjiForm.form);
-      else return true;
-    }
+    (kf) => existValidKanjiForms === false || kanjiFormRestrictions.has(kf.form) || kf.commonness !== void 0 || (kf.notes === void 0 || !kf.notes.some((note) => notSearchedForms.has(note))) && wordIsCommon === void 0
   );
   return {
     readings: validReadings,
@@ -2547,42 +2541,57 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
       deckPath,
       tags: []
     };
-    if (dictWord.isCommon === true) {
-      word.common = true;
-      word.tags.push("word::common");
-    }
+    if (dictWord.isCommon === true) word.common = true;
+    const priorities = /* @__PURE__ */ new Set();
     if (dictWord.kanjiForms !== void 0)
       word.kanjiForms = dictWord.kanjiForms.map(
         (dictKanjiForm) => ({
           kanjiForm: dictKanjiForm.form,
-          ...dictKanjiForm.notes !== void 0 ? {
-            notes: dictKanjiForm.notes.map((note) => {
-              const noteAndTag = lookupWordNote(
-                note,
-                [],
-                word.tags
-              );
-              return capitalizeString(noteAndTag.note);
-            })
+          ...dictKanjiForm.notes !== void 0 || dictKanjiForm.commonness !== void 0 ? {
+            notes: [
+              ...dictKanjiForm.commonness !== void 0 ? ["Common kanji form"].map((commonKf) => {
+                for (const priority of dictKanjiForm.commonness) {
+                  word.tags.push(`word::common::${priority}`);
+                  priorities.add(priority);
+                }
+                return commonKf;
+              }) : [],
+              ...dictKanjiForm.notes?.map((note) => {
+                const noteAndTag = lookupWordNote(
+                  note,
+                  [],
+                  word.tags
+                );
+                return capitalizeString(noteAndTag.note);
+              }) ?? []
+            ]
           } : {},
           ...dictKanjiForm.commonness !== void 0 && dictKanjiForm.commonness.length > 0 ? { common: true } : {}
         })
       );
     word.readings = dictWord.readings.map((dictReading) => ({
       reading: dictReading.reading,
-      ...dictReading.kanjiFormRestrictions !== void 0 || dictReading.notes !== void 0 ? {
+      ...dictReading.kanjiFormRestrictions !== void 0 || dictReading.notes !== void 0 || dictReading.commonness !== void 0 ? {
         notes: [
+          ...dictReading.notes !== void 0 || dictReading.commonness !== void 0 ? [
+            ...dictReading.commonness !== void 0 ? ["Common reading"].map((commonR) => {
+              for (const priority of dictReading.commonness)
+                if (!priorities.has(priority))
+                  word.tags.push(`word::common::${priority}`);
+              return commonR;
+            }) : [],
+            ...dictReading.notes?.map((note) => {
+              const noteAndTag = lookupWordNote(
+                note,
+                [],
+                word.tags
+              );
+              return capitalizeString(noteAndTag.note);
+            }) ?? []
+          ] : [],
           ...dictReading.kanjiFormRestrictions !== void 0 ? dictReading.kanjiFormRestrictions.map(
             (restriction) => `Reading restricted to ${restriction}`
-          ) : [],
-          ...dictReading.notes !== void 0 ? dictReading.notes.map((note) => {
-            const noteAndTag = lookupWordNote(
-              note,
-              [],
-              word.tags
-            );
-            return capitalizeString(noteAndTag.note);
-          }) : []
+          ) : []
         ]
       } : {},
       ...dictReading.commonness !== void 0 && dictReading.commonness.length > 0 ? { common: true } : {}
@@ -2842,10 +2851,7 @@ function getName(searchedName, dict, kanjiDic, examples, noteTypeName, deckPath)
       deckPath,
       tags: []
     };
-    if (dictName.isCommon === true) {
-      name.common = true;
-      name.tags.push("name::common");
-    }
+    if (dictName.isCommon === true) name.common = true;
     if (dictName.kanjiForms !== void 0)
       name.kanjiForms = dictName.kanjiForms.map(
         (dictKanjiForm) => ({
@@ -2855,10 +2861,17 @@ function getName(searchedName, dict, kanjiDic, examples, noteTypeName, deckPath)
     name.nameReadings = dictName.nameReadings.map(
       (dictReading) => ({
         reading: dictReading.reading,
-        ...dictReading.kanjiFormRestrictions !== void 0 ? {
-          notes: dictReading.kanjiFormRestrictions.map(
-            (restriction) => `Reading restricted to ${restriction}`
-          )
+        ...dictReading.kanjiFormRestrictions !== void 0 || dictReading.commonness !== void 0 ? {
+          notes: [
+            ...dictReading.commonness !== void 0 ? ["Common reading"].map((commonR) => {
+              for (const priority of dictReading.commonness)
+                name.tags.push(`name::common::${priority}`);
+              return commonR;
+            }) : [],
+            ...dictReading.kanjiFormRestrictions?.map(
+              (restriction) => `Reading restricted to ${restriction}`
+            ) ?? []
+          ]
         } : {},
         ...dictReading.commonness !== void 0 && dictReading.commonness.length > 0 ? { common: true } : {}
       })