diff options
| -rw-r--r-- | ext/js/templates/sandbox/anki-template-renderer.js | 58 | ||||
| -rw-r--r-- | types/ext/template-renderer.d.ts | 4 |
2 files changed, 49 insertions, 13 deletions
diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js index d69c7b47..2d3c888c 100644 --- a/ext/js/templates/sandbox/anki-template-renderer.js +++ b/ext/js/templates/sandbox/anki-template-renderer.js @@ -232,7 +232,7 @@ export class AnkiTemplateRenderer { /** @type {import('template-renderer').HelperFunction<string>} */ _multiLine(_args, context, options) { - return this._stringToMultiLineHtml(this._asString(options.fn(context))); + return this._stringToMultiLineHtml(this._computeValueString(options, context)); } /** @type {import('template-renderer').HelperFunction<string>} */ @@ -244,7 +244,7 @@ export class AnkiTemplateRenderer { // flags: optional flags for regular expression // e.g. "i" for case-insensitive, "g" for replace all const argCount = args.length; - let value = this._asString(options.fn(context)); + let value = this._computeValueString(options, context); if (argCount > 3) { value = `${args.slice(3, -1).join('')}${value}`; } @@ -270,7 +270,7 @@ export class AnkiTemplateRenderer { // flags: optional flags for regular expression // e.g. "i" for case-insensitive, "g" for match all const argCount = args.length; - let value = this._asString(options.fn(context)); + let value = this._computeValueString(options, context); if (argCount > 2) { value = `${args.slice(2, -1).join('')}${value}`; } @@ -327,14 +327,14 @@ export class AnkiTemplateRenderer { for (const entry of iterable) { any = true; if (results.length >= maxCount) { break; } - const processedEntry = options.fn(entry); + const processedEntry = this._computeValue(options, entry); results.push(processedEntry); } if (any) { return results.join(''); } } - return this._asString(options.inverse(context)); + return this._computeInverseString(options, context); } /** @type {import('template-renderer').HelperFunction<unknown[]>} */ @@ -446,7 +446,7 @@ export class AnkiTemplateRenderer { case 1: { const [key] = /** @type {[key: string]} */ (args); - const value = options.fn(context); + const value = this._computeValue(options, context); stateStack[stateStack.length - 1].set(key, value); } break; @@ -466,7 +466,7 @@ export class AnkiTemplateRenderer { if (stateStack === null) { throw new Error('Invalid state'); } try { stateStack.push(new Map()); - return options.fn(context); + return this._computeValue(options, context); } finally { if (stateStack.length > 1) { stateStack.pop(); @@ -502,7 +502,7 @@ export class AnkiTemplateRenderer { /** @type {import('template-renderer').HelperFunction<unknown>} */ _noop(_args, context, options) { - return options.fn(context); + return this._computeValue(options, context); } /** @type {import('template-renderer').HelperFunction<boolean>} */ @@ -520,7 +520,7 @@ export class AnkiTemplateRenderer { /** @type {import('template-renderer').HelperFunction<import('core').TypeofResult>} */ _getTypeof(args, context, options) { const ii = args.length; - const value = (ii > 0 ? args[0] : options.fn(context)); + const value = (ii > 0 ? args[0] : this._computeValue(options, context)); return typeof value; } @@ -750,7 +750,7 @@ export class AnkiTemplateRenderer { _hiragana(args, context, options) { const ii = args.length; const {keepProlongedSoundMarks} = options.hash; - const value = (ii > 0 ? args[0] : options.fn(context)); + const value = (ii > 0 ? args[0] : this._computeValue(options, context)); return typeof value === 'string' ? this._japaneseUtil.convertKatakanaToHiragana(value, keepProlongedSoundMarks === true) : ''; } @@ -759,7 +759,7 @@ export class AnkiTemplateRenderer { */ _katakana(args, context, options) { const ii = args.length; - const value = (ii > 0 ? args[0] : options.fn(context)); + const value = (ii > 0 ? args[0] : this._computeValue(options, context)); return typeof value === 'string' ? this._japaneseUtil.convertHiraganaToKatakana(value) : ''; } @@ -770,4 +770,40 @@ export class AnkiTemplateRenderer { _asString(value) { return typeof value === 'string' ? value : `${value}`; } + + /** + * @param {import('template-renderer').HelperOptions} options + * @param {unknown} context + * @returns {unknown} + */ + _computeValue(options, context) { + return typeof options.fn === 'function' ? options.fn(context) : ''; + } + + /** + * @param {import('template-renderer').HelperOptions} options + * @param {unknown} context + * @returns {string} + */ + _computeValueString(options, context) { + return this._asString(this._computeValue(options, context)); + } + + /** + * @param {import('template-renderer').HelperOptions} options + * @param {unknown} context + * @returns {unknown} + */ + _computeInverse(options, context) { + return typeof options.inverse === 'function' ? options.inverse(context) : ''; + } + + /** + * @param {import('template-renderer').HelperOptions} options + * @param {unknown} context + * @returns {string} + */ + _computeInverseString(options, context) { + return this._asString(this._computeInverse(options, context)); + } } diff --git a/types/ext/template-renderer.d.ts b/types/ext/template-renderer.d.ts index 169fee78..52c6f745 100644 --- a/types/ext/template-renderer.d.ts +++ b/types/ext/template-renderer.d.ts @@ -55,8 +55,8 @@ export type DataType = { export type HelperOptionsFunction<TResult = unknown> = (context: unknown) => TResult; export type HelperOptions = { - fn: HelperOptionsFunction; - inverse: HelperOptionsFunction; + fn?: HelperOptionsFunction; + inverse?: HelperOptionsFunction; hash: Core.SafeAny; data?: Core.SafeAny; }; |