Merge branch 'master' into language-select

.eslintrc.json

@@ -684,7 +684,7 @@
                 "ext/js/general/object-property-accessor.js",
                 "ext/js/general/regex-util.js",
                 "ext/js/general/text-source-map.js",
-                "ext/js/language/deinflector.js",
+                "ext/js/language/language-transformer.js",
                 "ext/js/dictionary/dictionary-database.js",
                 "ext/js/dictionary/dictionary-data-util.js",
                 "ext/js/language/sandbox/japanese-util.js",

dev/jsconfig.json

@@ -18,7 +18,6 @@
             "core": ["../types/ext/core"],
             "css-style-applier": ["../types/ext/css-style-applier"],
             "database": ["../types/ext/database"],
-            "deinflector": ["../types/ext/deinflector"],
             "dictionary": ["../types/ext/dictionary"],
             "dictionary-data": ["../types/ext/dictionary-data"],
             "dictionary-data-util": ["../types/ext/dictionary-data-util"],
@@ -31,6 +30,8 @@
             "japanese-util": ["../types/ext/japanese-util"],
             "language": ["../types/ext/language"],
             "ext/json-schema": ["../types/ext/json-schema"],
+            "language-transformer": ["../types/ext/language-transformer"],
+            "language-transformer-internal": ["../types/ext/language-transformer-internal"],
             "log": ["../types/ext/log"],
             "settings": ["../types/ext/settings"],
             "structured-content": ["../types/ext/structured-content"],
@@ -65,7 +66,7 @@
         "../ext/js/general/cache-map.js",
         "../ext/js/general/regex-util.js",
         "../ext/js/general/text-source-map.js",
-        "../ext/js/language/deinflector.js",
+        "../ext/js/language/language-transformer.js",
         "../ext/js/dictionary/dictionary-importer.js",
         "../ext/js/dictionary/dictionary-database.js",
         "../ext/js/dictionary/dictionary-data-util.js",

ext/data/schemas/dictionary-term-bank-v3-schema.json

@@ -278,6 +278,9 @@
                 "color": {
                     "type": "string"
                 },
+                "background": {
+                    "type": "string"
+                },
                 "backgroundColor": {
                     "type": "string"
                 },
@@ -318,6 +321,9 @@
                 "borderWidth": {
                     "type": "string"
                 },
+                "clipPath": {
+                    "type": "string"
+                },
                 "verticalAlign": {
                     "type": "string",
                     "enum": ["baseline", "sub", "super", "text-top", "text-bottom", "middle", "top", "bottom"],
@@ -328,6 +334,9 @@
                     "enum": ["start", "end", "left", "right", "center", "justify", "justify-all", "match-parent"],
                     "default": "start"
                 },
+                "textEmphasis": {
+                    "type": "string"
+                },
                 "textShadow": {
                     "type": "string"
                 },

ext/js/background/backend.js

@@ -295,9 +295,9 @@ export class Backend {
 
             await this._languageUtil.prepare();
 
-            /** @type {import('deinflector').ReasonsRaw} */
-            const deinflectionReasons = await fetchJson('/data/deinflect.json');
-            this._translator.prepare(deinflectionReasons);
+            /** @type {import('language-transformer').LanguageTransformDescriptor} */
+            const descriptor = await fetchJson('/data/language/japanese-transforms.json');
+            this._translator.prepare(descriptor);
 
             this._applyOptions('background');
 

ext/js/background/offscreen-proxy.js

@@ -191,10 +191,10 @@ export class TranslatorProxy {
     }
 
     /**
-     * @param {import('deinflector').ReasonsRaw} deinflectionReasons
+     * @param {import('language-transformer').LanguageTransformDescriptor} descriptor
      */
-    async prepare(deinflectionReasons) {
-        await this._offscreen.sendMessagePromise({action: 'translatorPrepareOffscreen', params: {deinflectionReasons}});
+    async prepare(descriptor) {
+        await this._offscreen.sendMessagePromise({action: 'translatorPrepareOffscreen', params: {descriptor}});
     }
 
     /**

ext/js/background/offscreen.js

@@ -122,8 +122,8 @@ export class Offscreen {
     }
 
     /** @type {import('offscreen').ApiHandler<'translatorPrepareOffscreen'>} */
-    _prepareTranslatorHandler({deinflectionReasons}) {
-        this._translator.prepare(deinflectionReasons);
+    _prepareTranslatorHandler({descriptor}) {
+        this._translator.prepare(descriptor);
     }
 
     /** @type {import('offscreen').ApiHandler<'languageUtilPrepareOffscreen'>}*/

ext/js/display/sandbox/structured-content-generator.js

@@ -347,6 +347,7 @@ export class StructuredContentGenerator {
             fontWeight,
             fontSize,
             color,
+            background,
             backgroundColor,
             textDecorationLine,
             textDecorationStyle,
@@ -355,8 +356,10 @@ export class StructuredContentGenerator {
             borderStyle,
             borderRadius,
             borderWidth,
+            clipPath,
             verticalAlign,
             textAlign,
+            textEmphasis,
             textShadow,
             margin,
             marginTop,
@@ -377,9 +380,11 @@ export class StructuredContentGenerator {
         if (typeof fontWeight === 'string') { style.fontWeight = fontWeight; }
         if (typeof fontSize === 'string') { style.fontSize = fontSize; }
         if (typeof color === 'string') { style.color = color; }
+        if (typeof background === 'string') { style.background = background; }
         if (typeof backgroundColor === 'string') { style.backgroundColor = backgroundColor; }
         if (typeof verticalAlign === 'string') { style.verticalAlign = verticalAlign; }
         if (typeof textAlign === 'string') { style.textAlign = textAlign; }
+        if (typeof textEmphasis === 'string') { style.textEmphasis = textEmphasis; }
         if (typeof textShadow === 'string') { style.textShadow = textShadow; }
         if (typeof textDecorationLine === 'string') {
             style.textDecoration = textDecorationLine;
@@ -396,6 +401,7 @@ export class StructuredContentGenerator {
         if (typeof borderStyle === 'string') { style.borderStyle = borderStyle; }
         if (typeof borderRadius === 'string') { style.borderRadius = borderRadius; }
         if (typeof borderWidth === 'string') { style.borderWidth = borderWidth; }
+        if (typeof clipPath === 'string') { style.clipPath = clipPath; }
         if (typeof margin === 'string') { style.margin = margin; }
         if (typeof marginTop === 'number') { style.marginTop = `${marginTop}em`; }
         if (typeof marginTop === 'string') { style.marginTop = marginTop; }

ext/js/extension/web-extension.js

@@ -91,7 +91,8 @@ export class WebExtension extends EventDispatcher {
      */
     getLastError() {
         const {lastError} = chrome.runtime;
-        if (typeof lastError !== 'undefined') {
+        if (lastError) {
+            if (lastError instanceof Error) { return lastError; }
             const {message} = lastError;
             return new Error(typeof message === 'string' ? message : 'An unknown web extension error occured');
         }