use isPartOfSpeech

yomidevs · Feb 19, 2024 · ddcbf34 · ddcbf34
1 parent 88a0fb6
commit ddcbf34
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 12 deletions.
diff --git a/ext/data/language/japanese-transforms.json b/ext/data/language/japanese-transforms.json
@@ -9,6 +9,7 @@
                     "name": "動詞"
                 }
             ],
+            "isPartOfSpeech": false,
             "subConditions": ["v1", "v5", "vk", "vs", "vz"]
         },
         "v1": {
@@ -19,6 +20,7 @@
                     "name": "一段動詞"
                 }
             ],
+            "isPartOfSpeech": true,
             "subConditions": ["v1d", "v1p"]
         },
         "v1d": {
@@ -28,7 +30,8 @@
                     "language": "ja",
                     "name": "一段動詞、辞書形"
                 }
-            ]
+            ],
+            "isPartOfSpeech": false
         },
         "v1p": {
             "name": "Ichidan verb, progressive or perfect form",
@@ -37,7 +40,8 @@
                     "language": "ja",
                     "name": "一段動詞、進行形または完了形"
                 }
-            ]
+            ],
+            "isPartOfSpeech": false
         },
         "v5": {
             "name": "Godan verb",
@@ -46,7 +50,8 @@
                     "language": "ja",
                     "name": "五段動詞"
                 }
-            ]
+            ],
+            "isPartOfSpeech": true
         },
         "vk": {
             "name": "Kuru verb",
@@ -55,7 +60,8 @@
                     "language": "ja",
                     "name": "来る動詞"
                 }
-            ]
+            ],
+            "isPartOfSpeech": true
         },
         "vs": {
             "name": "Suru verb",
@@ -64,7 +70,8 @@
                     "language": "ja",
                     "name": "する動詞"
                 }
-            ]
+            ],
+            "isPartOfSpeech": true
         },
         "vz": {
             "name": "Zuru verb",
@@ -73,7 +80,8 @@
                     "language": "ja",
                     "name": "ずる動詞"
                 }
-            ]
+            ],
+            "isPartOfSpeech": true
         },
         "adj-i": {
             "name": "Adjective with i ending",
@@ -82,16 +90,20 @@
                     "language": "ja",
                     "name": "形容詞"
                 }
-            ]
+            ],
+            "isPartOfSpeech": true
         },
         "-te": {
-            "name": "Intermediate -te endings for progressive or perfect tense"
+            "name": "Intermediate -te endings for progressive or perfect tense",
+            "isPartOfSpeech": false
         },
         "adv": {
-            "name": "Intermediate -ku endings for adverbs"
+            "name": "Intermediate -ku endings for adverbs",
+            "isPartOfSpeech": false
         },
         "past": {
-            "name": "-ta past form ending"
+            "name": "-ta past form ending",
+            "isPartOfSpeech": false
         }
     },
     "transforms": [

diff --git a/ext/js/language/language-transformer.js b/ext/js/language/language-transformer.js
@@ -25,13 +25,16 @@ export class LanguageTransformer {
         this._transforms = [];
         /** @type {Map<string, number>} */
         this._conditionTypeToConditionFlagsMap = new Map();
+        /** @type {Map<string, number>} */
+        this._partOfSpeechToConditionFlagsMap = new Map();
     }
 
     /** */
     clear() {
         this._nextFlagIndex = 0;
         this._transforms = [];
         this._conditionTypeToConditionFlagsMap.clear();
+        this._partOfSpeechToConditionFlagsMap.clear();
     }
 
     /**
@@ -74,10 +77,13 @@ export class LanguageTransformer {
             this._transforms.push(transform);
         }
 
-        for (const [type] of conditionEntries) {
+        for (const [type, condition] of conditionEntries) {
             const flags = conditionFlagsMap.get(type);
             if (typeof flags === 'undefined') { continue; } // This case should never happen
             this._conditionTypeToConditionFlagsMap.set(type, flags);
+            if (condition.isPartOfSpeech) {
+                this._partOfSpeechToConditionFlagsMap.set(type, flags);
+            }
         }
     }
 
@@ -90,6 +96,27 @@ export class LanguageTransformer {
         return typeof conditionFlags !== 'undefined' ? conditionFlags : 0;
     }
 
+    /**
+     * @param {string} partOfSpeech
+     * @returns {number}
+     */
+    getConditionFlagsFromPartOfSpeech(partOfSpeech) {
+        const conditionFlags = this._partOfSpeechToConditionFlagsMap.get(partOfSpeech);
+        return typeof conditionFlags !== 'undefined' ? conditionFlags : 0;
+    }
+
+    /**
+     * @param {string[]} partsOfSpeech
+     * @returns {number}
+     */
+    getConditionFlagsFromPartsOfSpeech(partsOfSpeech) {
+        let result = 0;
+        for (const partOfSpeech of partsOfSpeech) {
+            result |= this.getConditionFlagsFromPartOfSpeech(partOfSpeech);
+        }
+        return result;
+    }
+
     /**
      * @param {string[]} conditionTypes
      * @returns {number}

diff --git a/ext/js/language/translator.js b/ext/js/language/translator.js
@@ -406,7 +406,7 @@ export class Translator {
             const entryDictionary = /** @type {import('translation').FindTermDictionary} */ (enabledDictionaryMap.get(databaseEntry.dictionary));
             const {partsOfSpeechFilter} = entryDictionary;
 
-            const definitionConditions = this._languageTransformer.getConditionFlagsFromConditionTypes(databaseEntry.rules);
+            const definitionConditions = this._languageTransformer.getConditionFlagsFromPartsOfSpeech(databaseEntry.rules);
             for (const deinflection of uniqueDeinflectionArrays[databaseEntry.index]) {
                 if (!partsOfSpeechFilter || LanguageTransformer.conditionsMatch(deinflection.conditions, definitionConditions)) {
                     deinflection.databaseEntries.push(databaseEntry);

diff --git a/types/ext/language-transformer.d.ts b/types/ext/language-transformer.d.ts
@@ -32,6 +32,7 @@ export type ConditionMapEntries = ConditionMapEntry[];
 export type Condition = {
     name: string;
     i18n?: RuleI18n[];
+    isPartOfSpeech: boolean;
     subConditions?: string[];
 };