henkan 3.0.0 → 3.0.2

package/README.md

@@ -33,7 +33,7 @@ pnpm add henkan
 ```
 
 # Features
- - JMdict, KANJIDIC, Tanaka Corpus, RADK and KRAD conversion
+ - JMdict, JMnedict, KANJIDIC, Tanaka Corpus, RADK and KRAD conversion
  - User-friendly schemas for dictionary entries
  - Anki note generation
  - "Japanese definition"-"JMdict entry" pairing (using `ja.wiktionary.org` dumps)

package/dist/index.cjs.js

@@ -1383,33 +1383,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,
@@ -1430,7 +1424,6 @@ function convertJMdict(xmlString, examples) {
         (example) => example.parts.flatMap((part) => [
           part.baseForm,
           ...part.reading !== void 0 ? [part.reading] : [],
-          ...part.inflectedForm !== void 0 ? [part.inflectedForm] : [],
           ...part.referenceID !== void 0 ? [part.referenceID] : []
         ])
       )
@@ -1556,7 +1549,6 @@ function convertJMnedict(xmlString, examples) {
         (example) => example.parts.flatMap((part) => [
           part.baseForm,
           ...part.reading !== void 0 ? [part.reading] : [],
-          ...part.inflectedForm !== void 0 ? [part.inflectedForm] : [],
           ...part.referenceID !== void 0 ? [part.referenceID] : []
         ])
       )
@@ -1900,14 +1892,6 @@ function createEntryMaps(jmDict, jmNedict, kanjiDic, tanakaExamples, wordDefinit
             if (exList === void 0) partExamplesMap.set(part.reading, [ex]);
             else exList.push(ex);
           }
-          if (part.inflectedForm !== void 0 && entryParts.has(part.inflectedForm)) {
-            const exList = partExamplesMap.get(
-              part.inflectedForm
-            );
-            if (exList === void 0)
-              partExamplesMap.set(part.inflectedForm, [ex]);
-            else exList.push(ex);
-          }
           if (part.referenceID !== void 0 && entryParts.has(part.referenceID)) {
             const exList = partExamplesMap.get(
               part.referenceID
@@ -1977,14 +1961,6 @@ function createEntryMaps(jmDict, jmNedict, kanjiDic, tanakaExamples, wordDefinit
             if (exList === void 0) partExamplesMap.set(part.reading, [ex]);
             else exList.push(ex);
           }
-          if (part.inflectedForm !== void 0 && entryParts.has(part.inflectedForm)) {
-            const exList = partExamplesMap.get(
-              part.inflectedForm
-            );
-            if (exList === void 0)
-              partExamplesMap.set(part.inflectedForm, [ex]);
-            else exList.push(ex);
-          }
         }
       for (const name of jmNedict) {
         const seenEx = /* @__PURE__ */ new Set();
@@ -2788,37 +2764,42 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
       const readingMatchingKanjiFormExamples = [];
       let kanjiFormExamples = [];
       let readingExamples = [];
+      let hasKanjiFormExamplesWithTranslation = false;
+      let hasReadingExamplesWithTranslation = 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);
           const referenceIDMatch = part.referenceID === dictWord.id;
           if (kanjiForms !== void 0 && kanjiForms.has(part.baseForm)) {
-            if (readingAsReadingMatch || readingAsInflectedFormMatch || referenceIDMatch)
+            if (readingAsReadingMatch || referenceIDMatch)
               readingMatchingKanjiFormExamples.push({
                 ex: example,
-                partIndex: i,
-                form: part.baseForm,
-                ...referenceIDMatch ? { referenceIDMatch: true } : {},
-                ...includesTranslation ? { includesTranslation: true } : {}
+                partIndex: i
               });
-            else
+            else {
+              const includesTranslation = meanings.some(
+                (m) => example.translation.includes(m)
+              );
+              if (!hasKanjiFormExamplesWithTranslation && includesTranslation)
+                hasKanjiFormExamplesWithTranslation = true;
               kanjiFormExamples.push({
                 ex: example,
                 partIndex: i,
-                form: part.baseForm,
                 ...includesTranslation ? { includesTranslation: true } : {}
               });
+            }
             seenPhrases.add(example.phrase);
             break;
           }
           const readingAsBaseFormMatch = readings.has(part.baseForm);
           if ((readingAsBaseFormMatch || referenceIDMatch) && kanjiForms === void 0) {
+            const includesTranslation = meanings.some(
+              (m) => example.translation.includes(m)
+            );
+            if (!hasReadingExamplesWithTranslation && includesTranslation)
+              hasReadingExamplesWithTranslation = true;
             readingExamples.push({
               ex: example,
               partIndex: i,
@@ -2829,21 +2810,13 @@ function getWord(searchedWord, dict, kanjiDic, examples, definitions, noteTypeNa
             break;
           }
         }
-      if (kanjiFormExamples.length > 0 && kanjiFormExamples.some(
-        (ex) => ex.includesTranslation === true || ex.ex.parts.some(
-          (part) => ex.form === part.baseForm && part.glossNumber !== void 0
-        )
-      ))
+      if (kanjiFormExamples.length > 0 && hasKanjiFormExamplesWithTranslation)
         kanjiFormExamples = kanjiFormExamples.filter(
-          (ex) => ex.includesTranslation === true || ex.ex.parts.some(
-            (part) => ex.form === part.baseForm && part.glossNumber !== void 0
-          )
+          (ex) => ex.includesTranslation === true
         );
       else if (kanjiFormExamples.length > 0 && readingMatchingKanjiFormExamples.length > 0)
         kanjiFormExamples.length = 0;
-      if (readingExamples.length > 0 && readingExamples.some(
-        (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true
-      ))
+      if (readingExamples.length > 0 && hasReadingExamplesWithTranslation)
         readingExamples = readingExamples.filter(
           (ex) => ex.includesTranslation === true || ex.referenceIDMatch === true
         );
@@ -3020,29 +2993,32 @@ function getName(searchedName, dict, kanjiDic, examples, noteTypeName, deckPath)
       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);
           if (kanjiForms !== void 0 && kanjiForms.has(part.baseForm) && readingAsReadingMatch) {
+            const includesTranslation = meanings.some(
+              (m) => example.translation.includes(m)
+            );
+            if (!hasReadingMatchingKanjiFormWithTranslation && includesTranslation)
+              hasReadingMatchingKanjiFormWithTranslation = true;
             readingMatchingKanjiFormExamples.push({
               ex: example,
               ...includesTranslation ? { includesTranslation: true } : {}
             });
-            if (!hasReadingMatchingKanjiFormWithTranslation && includesTranslation)
-              hasReadingMatchingKanjiFormWithTranslation = true;
             seenPhrases.add(example.phrase);
             break;
           }
           const readingAsBaseFormMatch = readings.has(part.baseForm);
           if (readingAsBaseFormMatch && kanjiForms === void 0) {
+            const includesTranslation = meanings.some(
+              (m) => example.translation.includes(m)
+            );
+            if (!hasReadingWithTranslation && includesTranslation)
+              hasReadingWithTranslation = true;
             readingExamples.push({
               ex: example,
               ...includesTranslation ? { includesTranslation: true } : {}
             });
-            if (!hasReadingWithTranslation && includesTranslation)
-              hasReadingWithTranslation = true;
             seenPhrases.add(example.phrase);
             break;
           }