From d2e9841f96ebff61d4a5c26a322484f6268115f1 Mon Sep 17 00:00:00 2001 From: StefanVukovic99 Date: Fri, 22 Mar 2024 15:27:35 +0100 Subject: expand deinflection format (#745) * abstract deinflections * undo redundant changes * remove cast * switch to js * MultiLanguageTransformer * comments * comments * fix test * suffixInflection * fix bench * substring instead of replace * without heuristic * suffixMap * add other language deinflections * wip * catch cycles * fix tests * uninflect to deinflect * use less regex * add suru masu stem deinflection --- ext/js/background/backend.js | 13 ++----------- ext/js/background/offscreen-proxy.js | 8 +++----- ext/js/background/offscreen.js | 4 ++-- 3 files changed, 7 insertions(+), 18 deletions(-) (limited to 'ext/js/background') diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js index cd44a07f..6cae9cea 100644 --- a/ext/js/background/backend.js +++ b/ext/js/background/backend.js @@ -23,7 +23,7 @@ import {ClipboardReader} from '../comm/clipboard-reader.js'; import {Mecab} from '../comm/mecab.js'; import {createApiMap, invokeApiMapHandler} from '../core/api-map.js'; import {ExtensionError} from '../core/extension-error.js'; -import {fetchJson, fetchText} from '../core/fetch-utilities.js'; +import {fetchText} from '../core/fetch-utilities.js'; import {logErrorLevelToNumber} from '../core/log-utilities.js'; import {log} from '../core/log.js'; import {isObjectNotArray} from '../core/object-utilities.js'; @@ -275,16 +275,7 @@ export class Backend { log.error(e); } - /** @type {import('language-transformer').LanguageTransformDescriptor[]} */ - const descriptors = []; - const languageSummaries = getLanguageSummaries(); - for (const {languageTransformsFile} of languageSummaries) { - if (!languageTransformsFile) { continue; } - /** @type {import('language-transformer').LanguageTransformDescriptor} */ - const descriptor = await fetchJson(languageTransformsFile); - descriptors.push(descriptor); - } - void this._translator.prepare(descriptors); + void this._translator.prepare(); await this._optionsUtil.prepare(); this._defaultAnkiFieldTemplates = (await fetchText('/data/templates/default-anki-field-templates.handlebars')).trim(); diff --git a/ext/js/background/offscreen-proxy.js b/ext/js/background/offscreen-proxy.js index 30c6862a..e65ec65e 100644 --- a/ext/js/background/offscreen-proxy.js +++ b/ext/js/background/offscreen-proxy.js @@ -183,11 +183,9 @@ export class TranslatorProxy { this._offscreen = offscreen; } - /** - * @param {import('language-transformer').LanguageTransformDescriptor[]} descriptors - */ - async prepare(descriptors) { - await this._offscreen.sendMessagePromise({action: 'translatorPrepareOffscreen', params: {descriptors}}); + /** */ + async prepare() { + await this._offscreen.sendMessagePromise({action: 'translatorPrepareOffscreen'}); } /** diff --git a/ext/js/background/offscreen.js b/ext/js/background/offscreen.js index b0b11c93..bab4d0c9 100644 --- a/ext/js/background/offscreen.js +++ b/ext/js/background/offscreen.js @@ -111,8 +111,8 @@ export class Offscreen { } /** @type {import('offscreen').ApiHandler<'translatorPrepareOffscreen'>} */ - _prepareTranslatorHandler({descriptors}) { - this._translator.prepare(descriptors); + _prepareTranslatorHandler() { + this._translator.prepare(); } /** @type {import('offscreen').ApiHandler<'findKanjiOffscreen'>} */ -- cgit v1.2.3