diff options
Diffstat (limited to 'ext/js/templates')
9 files changed, 103 insertions, 29 deletions
diff --git a/ext/js/templates/__mocks__/template-renderer-proxy.js b/ext/js/templates/__mocks__/template-renderer-proxy.js new file mode 100644 index 00000000..bcacf13b --- /dev/null +++ b/ext/js/templates/__mocks__/template-renderer-proxy.js @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2023 Yomitan Authors + * Copyright (C) 2021-2022 Yomichan Authors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +import {AnkiTemplateRenderer} from '../sandbox/anki-template-renderer.js'; + +export class TemplateRendererProxy { + constructor() { + this._preparePromise = null; + this._ankiTemplateRenderer = new AnkiTemplateRenderer(); + } + + async render(template, data, type) { + await this._prepare(); + return await this._ankiTemplateRenderer.templateRenderer.render(template, data, type); + } + + async renderMulti(items) { + await this._prepare(); + return await this._serializeMulti(this._ankiTemplateRenderer.templateRenderer.renderMulti(items)); + } + + _prepare() { + if (this._preparePromise === null) { + this._preparePromise = this._prepareInternal(); + } + return this._preparePromise; + } + + async _prepareInternal() { + await this._ankiTemplateRenderer.prepare(); + } + + _serializeError(error) { + try { + if (typeof error === 'object' && error !== null) { + const result = { + name: error.name, + message: error.message, + stack: error.stack + }; + if (Object.prototype.hasOwnProperty.call(error, 'data')) { + result.data = error.data; + } + return result; + } + } catch (e) { + // NOP + } + return { + value: error, + hasValue: true + }; + } + + _serializeMulti(array) { + for (let i = 0, ii = array.length; i < ii; ++i) { + const value = array[i]; + const {error} = value; + if (typeof error !== 'undefined') { + value.error = this._serializeError(error); + } + } + return array; + } +} diff --git a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js b/ext/js/templates/sandbox/anki-template-renderer-content-manager.js index c51f01b3..596fa499 100644 --- a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js +++ b/ext/js/templates/sandbox/anki-template-renderer-content-manager.js @@ -31,7 +31,7 @@ /** * The content manager which is used when generating content for Anki. */ -class AnkiTemplateRendererContentManager { +export class AnkiTemplateRendererContentManager { /** * Creates a new instance of the class. * @param {TemplateRendererMediaProvider} mediaProvider The media provider for the object. diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js index 766c7798..10f69745 100644 --- a/ext/js/templates/sandbox/anki-template-renderer.js +++ b/ext/js/templates/sandbox/anki-template-renderer.js @@ -16,24 +16,22 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -/* global - * AnkiNoteDataCreator - * AnkiTemplateRendererContentManager - * CssStyleApplier - * DictionaryDataUtil - * Handlebars - * JapaneseUtil - * PronunciationGenerator - * StructuredContentGenerator - * TemplateRenderer - * TemplateRendererMediaProvider - */ +import {Handlebars} from '../../../lib/handlebars.js'; +import {AnkiNoteDataCreator} from '../../data/sandbox/anki-note-data-creator.js'; +import {PronunciationGenerator} from '../../display/sandbox/pronunciation-generator.js'; +import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js'; +import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js'; +import {DictionaryDataUtil} from '../../language/sandbox/dictionary-data-util.js'; +import {JapaneseUtil} from '../../language/sandbox/japanese-util.js'; +import {AnkiTemplateRendererContentManager} from './anki-template-renderer-content-manager.js'; +import {TemplateRendererMediaProvider} from './template-renderer-media-provider.js'; +import {TemplateRenderer} from './template-renderer.js'; /** * This class contains all Anki-specific template rendering functionality. It is built on * the generic TemplateRenderer class and various other Anki-related classes. */ -class AnkiTemplateRenderer { +export class AnkiTemplateRenderer { /** * Creates a new instance of the class. */ diff --git a/ext/js/templates/sandbox/template-renderer-frame-api.js b/ext/js/templates/sandbox/template-renderer-frame-api.js index d8f2714b..7ce2d909 100644 --- a/ext/js/templates/sandbox/template-renderer-frame-api.js +++ b/ext/js/templates/sandbox/template-renderer-frame-api.js @@ -16,7 +16,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -class TemplateRendererFrameApi { +export class TemplateRendererFrameApi { constructor(templateRenderer) { this._templateRenderer = templateRenderer; this._windowMessageHandlers = new Map([ diff --git a/ext/js/templates/sandbox/template-renderer-frame-main.js b/ext/js/templates/sandbox/template-renderer-frame-main.js index df5b65ca..43b17b1e 100644 --- a/ext/js/templates/sandbox/template-renderer-frame-main.js +++ b/ext/js/templates/sandbox/template-renderer-frame-main.js @@ -16,10 +16,8 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -/* globals - * AnkiTemplateRenderer - * TemplateRendererFrameApi - */ +import {AnkiTemplateRenderer} from './anki-template-renderer.js'; +import {TemplateRendererFrameApi} from './template-renderer-frame-api.js'; (async () => { const ankiTemplateRenderer = new AnkiTemplateRenderer(); diff --git a/ext/js/templates/sandbox/template-renderer-media-provider.js b/ext/js/templates/sandbox/template-renderer-media-provider.js index f430fa27..9d77dd1f 100644 --- a/ext/js/templates/sandbox/template-renderer-media-provider.js +++ b/ext/js/templates/sandbox/template-renderer-media-provider.js @@ -20,7 +20,7 @@ * Handlebars */ -class TemplateRendererMediaProvider { +export class TemplateRendererMediaProvider { constructor() { this._requirements = null; } diff --git a/ext/js/templates/sandbox/template-renderer.js b/ext/js/templates/sandbox/template-renderer.js index 7179f366..8d8a2765 100644 --- a/ext/js/templates/sandbox/template-renderer.js +++ b/ext/js/templates/sandbox/template-renderer.js @@ -16,12 +16,9 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -/* global - * Handlebars - * handlebarsCompileFnName - */ +import {Handlebars} from '../../../lib/handlebars.js'; -class TemplateRenderer { +export class TemplateRenderer { constructor() { this._cache = new Map(); this._cacheMaxSize = 5; @@ -31,7 +28,6 @@ class TemplateRenderer { } registerHelpers(helpers) { - Handlebars.partials = Handlebars.templates; for (const [name, helper] of helpers) { this._registerHelper(name, helper); } @@ -84,7 +80,7 @@ class TemplateRenderer { let instance = cache.get(template); if (typeof instance === 'undefined') { this._updateCacheSize(this._cacheMaxSize - 1); - instance = Handlebars[handlebarsCompileFnName](template); + instance = Handlebars.compileAST(template); cache.set(template, instance); } diff --git a/ext/js/templates/template-patcher.js b/ext/js/templates/template-patcher.js index 1e6b0110..6bc012bc 100644 --- a/ext/js/templates/template-patcher.js +++ b/ext/js/templates/template-patcher.js @@ -16,7 +16,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -class TemplatePatcher { +export class TemplatePatcher { constructor() { this._diffPattern1 = /\n?\{\{<<<<<<<\}\}\n/g; this._diffPattern2 = /\n\{\{=======\}\}\n/g; diff --git a/ext/js/templates/template-renderer-proxy.js b/ext/js/templates/template-renderer-proxy.js index b504daf2..c46d05f9 100644 --- a/ext/js/templates/template-renderer-proxy.js +++ b/ext/js/templates/template-renderer-proxy.js @@ -16,7 +16,9 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -class TemplateRendererProxy { +import {deserializeError, generateId} from '../core.js'; + +export class TemplateRendererProxy { constructor() { this._frame = null; this._frameNeedsLoad = true; |