Fix AnkiTemplateRenderer again (#535)

* Fix args issues in regex functions

* Add tests

3 files changed, 140 insertions, 2 deletions

diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js
index e4822bee..84f28c1a 100644
--- a/ext/js/templates/sandbox/anki-template-renderer.js
+++ b/ext/js/templates/sandbox/anki-template-renderer.js
@@ -248,7 +248,7 @@ export class AnkiTemplateRenderer {
         const argCount = args.length;
         let value = this._computeValueString(options, context);
         if (argCount > 3) {
-            value = `${args.slice(3, -1).join('')}${value}`;
+            value = `${args.slice(3).join('')}${value}`;
         }
         if (argCount > 1) {
             try {
@@ -276,7 +276,7 @@ export class AnkiTemplateRenderer {
         const argCount = args.length;
         let value = this._computeValueString(options, context);
         if (argCount > 2) {
-            value = `${args.slice(2, -1).join('')}${value}`;
+            value = `${args.slice(2).join('')}${value}`;
         }
         if (argCount > 0) {
             try {
diff --git a/test/anki-template-renderer.test.js b/test/anki-template-renderer.test.js
new file mode 100644
index 00000000..7c65b367
--- /dev/null
+++ b/test/anki-template-renderer.test.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2023  Yomitan 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 {describe} from 'vitest';
+import {createAnkiTemplateRendererTest} from './fixtures/anki-template-renderer-test.js';
+
+const test = await createAnkiTemplateRendererTest();
+
+describe('AnkiTemplateRenderer', () => {
+    /** @type {import('template-renderer').CompositeRenderData} */
+    const data = {
+        marker: 'test',
+        commonData: {
+            dictionaryEntry: {
+                type: 'kanji',
+                character: 'c',
+                dictionary: 'dictionary',
+                onyomi: [],
+                kunyomi: [],
+                tags: [],
+                stats: {},
+                definitions: [],
+                frequencies: []
+            },
+            resultOutputMode: 'split',
+            mode: 'test',
+            glossaryLayoutMode: 'default',
+            compactTags: false,
+            context: {
+                url: 'http://localhost/',
+                documentTitle: 'documentTitle',
+                query: 'query',
+                fullQuery: 'query.full',
+                sentence: {
+                    text: 'sentence.query.full',
+                    offset: 9
+                }
+            },
+            media: void 0
+        }
+    };
+    const testCases = [
+        {
+            name: 'regexMatch 1',
+            template: '{{#regexMatch "test" "gu"}}this is a test of regexMatch{{/regexMatch}}',
+            result: 'test'
+        },
+        {
+            name: 'regexMatch 2',
+            template: '{{regexMatch "test" "gu" "this is a test of regexMatch"}}',
+            result: 'test'
+        },
+        {
+            name: 'regexMatch 3',
+            template: '{{#if (regexMatch "test" "gu" "this is a test of regexMatch")}}true{{else}}false{{/if}}',
+            result: 'true'
+        },
+        {
+            name: 'regexReplace 1',
+            template: '{{#regexReplace "test" "TEST" "gu"}}this is a test of regexReplace{{/regexReplace}}',
+            result: 'this is a TEST of regexReplace'
+        },
+        {
+            name: 'regexReplace 2',
+            template: '{{regexReplace "test" "TEST" "gu" "this is a test of regexReplace"}}',
+            result: 'this is a TEST of regexReplace'
+        },
+        {
+            name: 'regexReplace 3',
+            template: '{{#if (regexReplace "test" "" "gu" "test")}}true{{else}}false{{/if}}',
+            result: 'false'
+        }
+    ];
+    describe.each(testCases)('$name', ({template, result: expectedResult}) => {
+        test('Test', ({expect, ankiTemplateRenderer}) => {
+            const {result} = ankiTemplateRenderer.templateRenderer.render(template, data, 'ankiNote');
+            expect(result).toEqual(expectedResult);
+        });
+    });
+});
diff --git a/test/fixtures/anki-template-renderer-test.js b/test/fixtures/anki-template-renderer-test.js
new file mode 100644
index 00000000..fa84dbc7
--- /dev/null
+++ b/test/fixtures/anki-template-renderer-test.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023  Yomitan 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 {vi} from 'vitest';
+import {AnkiTemplateRenderer} from '../../ext/js/templates/sandbox/anki-template-renderer.js';
+import {fetch} from '../mocks/common.js';
+import {createDomTest} from './dom-test.js';
+
+vi.stubGlobal('fetch', fetch);
+
+/**
+ * @returns {Promise<import('vitest').TestAPI<{window: import('jsdom').DOMWindow, ankiTemplateRenderer: AnkiTemplateRenderer}>>}
+ */
+export async function createAnkiTemplateRendererTest() {
+    const test = createDomTest(void 0);
+    const ankiTemplateRenderer = new AnkiTemplateRenderer();
+    await ankiTemplateRenderer.prepare();
+    /** @type {import('vitest').TestAPI<{window: import('jsdom').DOMWindow, ankiTemplateRenderer: AnkiTemplateRenderer}>} */
+    const result = test.extend({
+        window: async ({window}, use) => { await use(window); },
+        // eslint-disable-next-line no-empty-pattern
+        ankiTemplateRenderer: async ({window}, use) => {
+            // The window property needs to be referenced for it to be initialized.
+            // It is needed for DOM access for structured content.
+            void window;
+            await use(ankiTemplateRenderer);
+        }
+    });
+    return result;
+}