WIP

ext/bg/js/translator.js

@@ -54,28 +54,27 @@ class Translator {
         });
     }
 
-    findTerm(text) {
+    findTermGroups(text) {
         const groups = {};
+        const promises = [];
+
         for (let i = text.length; i > 0; --i) {
-            const term = text.slice(0, i);
+            promises.append(
-            const dfs = this.deinflector.deinflect(term, t => {
+                this.deinflector.deinflect(text.slice(0, i), term => {
-                const tagSets = [];
+                    return this.dictionary.findTerm(term).then(definitions => definitions.map(def => def.tags));
-                for (const d of this.dictionary.findTerm(t)) {
+                }).then(inflects => {
-                    tagSets.push(d.tags);
+                    for (const inflect of inflects || []) {
-                }
-
-                return tagSets;
-            });
-
-            if (dfs === null) {
-                continue;
-            }
-
-            for (const df of dfs) {
                         this.processTerm(groups, df.source, df.tags, df.rules, df.root);
                     }
+                })
+            );
         }
 
+        return Promise.all(promises).then(Promise.resolve(groups));
+    }
+
+    findTerm(text) {
+        return this.findTermGroups(text).then(groups => {
             let definitions = [];
             for (const key in groups) {
                 definitions.push(groups[key]);
@@ -115,6 +114,7 @@ class Translator {
             }
 
             return {definitions, length};
+        });
     }
 
     findKanji(text) {
@@ -132,14 +132,15 @@ class Translator {
     }
 
     processTerm(groups, source, tags, rules, root) {
-        for (const entry of this.dictionary.findTerm(root)) {
+        return this.dictionary.findTerm(root).then(definitions => {
-            if (entry.id in groups) {
+            for (const definition of definitions) {
+                if (definition.id in groups) {
                     continue;
                 }
 
                 let matched = tags.length === 0;
                 for (const tag of tags) {
-                if (entry.tags.indexOf(tag) !== -1) {
+                    if (definition.tags.indexOf(tag) !== -1) {
                         matched = true;
                         break;
                     }
@@ -150,13 +151,13 @@ class Translator {
                 }
 
                 const tagItems = [];
-            for (const tag of entry.tags) {
+                for (const tag of definition.tags) {
                     const tagItem = {
                         name: tag,
                         class: 'default',
                         order: Number.MAX_SAFE_INTEGER,
                         score: 0,
-                    desc: entry.entities[tag] || '',
+                        desc: definition.entities[tag] || '',
                     };
 
                     this.applyTagMeta(tagItem);
@@ -168,16 +169,17 @@ class Translator {
                     score += tagItem.score;
                 }
 
-            groups[entry.id] = {
+                groups[definition.id] = {
                     score,
                     source,
                     rules,
-                expression: entry.expression,
+                    expression: definition.expression,
-                reading: entry.reading,
+                    reading: definition.reading,
-                glossary: entry.glossary,
+                    glossary: definition.glossary,
                     tags: Translator.sortTags(tagItems)
                 };
             }
+        });
     }
 
     processKanji(entries) {