fix language index

yomidevs · Feb 3, 2024 · a9b6f4e · a9b6f4e
1 parent b204d3e
commit a9b6f4e
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 58 deletions.
diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
@@ -290,8 +290,6 @@ export class Backend {
             this._defaultAnkiFieldTemplates = (await fetchText('/data/templates/default-anki-field-templates.handlebars')).trim();
             this._options = await this._optionsUtil.load();
 
-            await this._languageUtil.prepare();
-
             /** @type {import('language-transformer').LanguageTransformDescriptor} */
             const descriptor = await fetchJson('/data/language/japanese-transforms.json');
             this._translator.prepare(descriptor);

diff --git a/ext/js/background/offscreen-proxy.js b/ext/js/background/offscreen-proxy.js
@@ -158,13 +158,6 @@ export class LanguageUtilProxy {
         this._offscreen = offscreen;
     }
 
-    /**
-     * @returns {Promise<void>}
-     */
-    async prepare() {
-        await this._offscreen.sendMessagePromise({action: 'languageUtilPrepareOffscreen'});
-    }
-
     /**
      * @param {string} language
      * @returns {Promise<import('language').TextTransformation[]>}

diff --git a/ext/js/background/offscreen.js b/ext/js/background/offscreen.js
@@ -61,7 +61,6 @@ export class Offscreen {
             ['databasePurgeOffscreen',          this._purgeDatabaseHandler.bind(this)],
             ['databaseGetMediaOffscreen',       this._getMediaHandler.bind(this)],
             ['translatorPrepareOffscreen',      this._prepareTranslatorHandler.bind(this)],
-            ['languageUtilPrepareOffscreen',    this._prepareLanguageUtilHandler.bind(this)],
             ['getLanguagesOffscreen',           this._getLanguagesHandler.bind(this)],
             ['getTextTransformationsOffscreen', this._getTextTransformationsHandler.bind(this)],
             ['findKanjiOffscreen',              this._findKanjiHandler.bind(this)],
@@ -126,11 +125,6 @@ export class Offscreen {
         this._translator.prepare(descriptor);
     }
 
-    /** @type {import('offscreen').ApiHandler<'languageUtilPrepareOffscreen'>}*/
-    _prepareLanguageUtilHandler() {
-        this._languageUtil.prepare();
-    }
-
     /** @type {import('offscreen').ApiHandler<'getLanguagesOffscreen'>}*/
     _getLanguagesHandler() {
         return this._languageUtil.getLanguages();

diff --git a/ext/js/language/index.js b/ext/js/language/index.js
@@ -18,12 +18,20 @@
 import {textTransformations as textTransformationsEN} from './en/text-transformations.js';
 import {textTransformations as textTransformationsJA} from './ja/text-transformations.js';
 
-/** @type {Map<string, import('language').LanguageFeatures>} */
-export const languageFeatures = new Map([
+/** @type {Map<string, import('language').Language>} */
+export const languages = new Map([
     ['ja', {
+        name: 'Japanese',
+        iso: 'ja',
+        flag: '🇯🇵',
+        exampleText: '読め',
         textTransformations: textTransformationsJA
     }],
     ['en', {
+        name: 'English',
+        iso: 'en',
+        flag: '🇬🇧',
+        exampleText: 'read',
         textTransformations: textTransformationsEN
     }]
 ]);

diff --git a/ext/js/language/index.json b/ext/js/language/index.json
diff --git a/ext/js/language/language-util.js b/ext/js/language/language-util.js
@@ -15,36 +15,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {fetchJson} from '../core/utilities.js';
-import {languageFeatures} from './index.js';
+import {languages} from './index.js';
 
 export class LanguageUtil {
     constructor() {
-        /** @type {import('language').LanguageMap}*/
-        this.languages = new Map();
     }
 
-    /** */
-    async prepare() {
-        /** @type {import('language').Language[]} */
-        const languages = await fetchJson('/js/language/index.json');
-        for (const {iso, name, flag, exampleText} of languages) {
-            const features = languageFeatures.get(iso) || {textTransformations: []};
-            this.languages.set(iso, {...features, iso, name, flag, exampleText});
-        }
-    }
 
     /** @returns {import('language').Language[]}*/
     getLanguages() {
-        return [...this.languages.values()];
+        return [...languages.values()];
     }
 
     /**
      * @param {string} iso
      * @returns {import('language').TextTransformation[]}
      */
     getTextTransformations(iso) {
-        return this.languages.get(iso)?.textTransformations || [];
+        return languages.get(iso)?.textTransformations || [];
     }
 }
 
diff --git a/test/data/json.json b/test/data/json.json
@@ -95,11 +95,6 @@
             "typeFile": "types/ext/language-transformer.d.ts",
             "type": "LanguageTransformDescriptor"
         },
-        {
-            "path": "ext/js/language/index.json",
-            "typeFile": "types/ext/language.d.ts",
-            "type": "LanguagePropertiesArray"
-        },
         {
             "path": "test/data/translator-test-inputs.json",
             "typeFile": "types/test/translator.d.ts",

diff --git a/test/fixtures/translator-test.js b/test/fixtures/translator-test.js
@@ -55,7 +55,6 @@ async function createTranslatorContext(dictionaryDirectory, dictionaryName) {
     const dictionaryDatabase = new DictionaryDatabase();
     await dictionaryDatabase.prepare();
     const languageUtil = new LanguageUtil();
-    languageUtil.prepare();
 
     const {errors} = await dictionaryImporter.importDictionary(
         dictionaryDatabase,

diff --git a/types/ext/language.d.ts b/types/ext/language.d.ts
@@ -17,15 +17,6 @@
 
 import {TextSourceMap} from '../../ext/js/general/text-source-map.js';
 
-export type LanguageProperties = {
-    name: string;
-    iso: string;
-    flag: string;
-    exampleText: string;
-};
-
-export type LanguagePropertiesArray = LanguageProperties[];
-
 export type TextTransformationOption<T = unknown> = [
     value: string,
     label: string,
@@ -40,10 +31,12 @@ export type TextTransformation<T = unknown> = {
     transform: (str: string, setting: T, sourceMap?: TextSourceMap) => string;
 };
 
-export type LanguageFeatures = {
+export type Language = {
+    name: string;
+    iso: string;
+    flag: string;
+    exampleText: string;
     textTransformations: TextTransformation[];
 };
 
-export type Language = LanguageProperties & LanguageFeatures;
-
 export type LanguageMap = Map<string, Language>;
diff --git a/types/ext/offscreen.d.ts b/types/ext/offscreen.d.ts
@@ -52,10 +52,6 @@ type ApiSurface = {
         };
         return: DictionaryDatabase.Media<string>[];
     };
-    languageUtilPrepareOffscreen: {
-        params: void;
-        return: void;
-    };
     getLanguagesOffscreen: {
         params: void;
         return: Language.Language[];