Remove TemplateRendererProxy mock

yomidevs · Dec 19, 2023 · e89f6e9 · e89f6e9
1 parent 6b07b1e
commit e89f6e9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 75 deletions.
diff --git a/ext/js/data/anki-note-builder.js b/ext/js/data/anki-note-builder.js
@@ -18,7 +18,6 @@
 
 import {deferPromise} from '../core.js';
 import {ExtensionError} from '../core/extension-error.js';
-import {TemplateRendererProxy} from '../templates/template-renderer-proxy.js';
 import {yomitan} from '../yomitan.js';
 import {AnkiUtil} from './anki-util.js';
 
@@ -28,18 +27,19 @@ import {AnkiUtil} from './anki-util.js';
 export class AnkiNoteBuilder {
     /**
      * Initiate an instance of AnkiNoteBuilder.
-     * @param {{japaneseUtil: import('../language/sandbox/japanese-util.js').JapaneseUtil}} details
+     * @param {import('../language/sandbox/japanese-util.js').JapaneseUtil} japaneseUtil
+     * @param {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/sandbox/template-renderer.js').TemplateRenderer} templateRenderer
      * @example
      * const japaneseUtil = new JapaneseUtil(null);
-     * const ankiNoteBuilder = new AnkiNoteBuilder({japaneseUtil});
+     * const ankiNoteBuilder = new AnkiNoteBuilder(japaneseUtil, new TemplateRendererProxy());
      */
-    constructor({japaneseUtil}) {
+    constructor(japaneseUtil, templateRenderer) {
         /** @type {import('../language/sandbox/japanese-util.js').JapaneseUtil} */
         this._japaneseUtil = japaneseUtil;
         /** @type {RegExp} */
         this._markerPattern = AnkiUtil.cloneFieldMarkerPattern(true);
-        /** @type {TemplateRendererProxy} */
-        this._templateRenderer = new TemplateRendererProxy();
+        /** @type {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/sandbox/template-renderer.js').TemplateRenderer} */
+        this._templateRenderer = templateRenderer;
         /** @type {import('anki-note-builder').BatchedRequestGroup[]} */
         this._batchedRequests = [];
         /** @type {boolean} */

diff --git a/ext/js/display/display-anki.js b/ext/js/display/display-anki.js
@@ -21,6 +21,7 @@ import {AnkiNoteBuilder} from '../data/anki-note-builder.js';
 import {AnkiUtil} from '../data/anki-util.js';
 import {PopupMenu} from '../dom/popup-menu.js';
 import {querySelectorNotNull} from '../dom/query-selector.js';
+import {TemplateRendererProxy} from '../templates/template-renderer-proxy.js';
 import {yomitan} from '../yomitan.js';
 
 export class DisplayAnki {
@@ -39,7 +40,7 @@ export class DisplayAnki {
         /** @type {?string} */
         this._ankiFieldTemplatesDefault = null;
         /** @type {AnkiNoteBuilder} */
-        this._ankiNoteBuilder = new AnkiNoteBuilder({japaneseUtil});
+        this._ankiNoteBuilder = new AnkiNoteBuilder(japaneseUtil, new TemplateRendererProxy());
         /** @type {?import('./display-notification.js').DisplayNotification} */
         this._errorNotification = null;
         /** @type {?EventListenerCollection} */

diff --git a/ext/js/pages/settings/anki-templates-controller.js b/ext/js/pages/settings/anki-templates-controller.js
@@ -20,6 +20,7 @@ import {ExtensionError} from '../../core/extension-error.js';
 import {AnkiNoteBuilder} from '../../data/anki-note-builder.js';
 import {querySelectorNotNull} from '../../dom/query-selector.js';
 import {JapaneseUtil} from '../../language/sandbox/japanese-util.js';
+import {TemplateRendererProxy} from '../../templates/template-renderer-proxy.js';
 import {yomitan} from '../../yomitan.js';
 
 export class AnkiTemplatesController {
@@ -54,7 +55,7 @@ export class AnkiTemplatesController {
         /** @type {?import('./modal.js').Modal} */
         this._fieldTemplateResetModal = null;
         /** @type {AnkiNoteBuilder} */
-        this._ankiNoteBuilder = new AnkiNoteBuilder({japaneseUtil: new JapaneseUtil(null)});
+        this._ankiNoteBuilder = new AnkiNoteBuilder(new JapaneseUtil(null), new TemplateRendererProxy());
     }
 
     /** */

diff --git a/test/anki-note-builder.test.js b/test/anki-note-builder.test.js
@@ -21,16 +21,15 @@
 import {readFileSync} from 'fs';
 import {fileURLToPath} from 'node:url';
 import path from 'path';
-import {describe, vi} from 'vitest';
+import {describe} from 'vitest';
 import {AnkiNoteBuilder} from '../ext/js/data/anki-note-builder.js';
 import {JapaneseUtil} from '../ext/js/language/sandbox/japanese-util.js';
+import {AnkiTemplateRenderer} from '../ext/js/templates/sandbox/anki-template-renderer.js';
 import {createTranslatorTest} from './fixtures/translator-test.js';
 import {createFindOptions} from './utilities/translator.js';
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 
-vi.mock('../ext/js/templates/template-renderer-proxy.js', async () => await import('../test/mocks/template-renderer-proxy.js'));
-
 /**
  * @param {'terms'|'kanji'} type
  * @returns {string[]}
@@ -111,6 +110,8 @@ async function getRenderResults(dictionaryEntries, type, mode, template, expect)
         fields.push([marker, `{${marker}}`]);
     }
 
+    const ankiTemplateRenderer = new AnkiTemplateRenderer();
+    await ankiTemplateRenderer.prepare();
     const japaneseUtil = new JapaneseUtil(null);
     const clozePrefix = 'cloze-prefix';
     const clozeSuffix = 'cloze-suffix';
@@ -127,7 +128,7 @@ async function getRenderResults(dictionaryEntries, type, mode, template, expect)
                 }
                 break;
         }
-        const ankiNoteBuilder = new AnkiNoteBuilder({japaneseUtil});
+        const ankiNoteBuilder = new AnkiNoteBuilder(japaneseUtil, ankiTemplateRenderer.templateRenderer);
         const context = {
             url: 'url:',
             sentence: {

diff --git a/test/mocks/template-renderer-proxy.js b/test/mocks/template-renderer-proxy.js