refactor: extract formatter and template services

src/IChoiceExecutor.ts

@@ -1,5 +1,6 @@
 import type IChoice from "./types/choices/IChoice";
 import type { MacroAbortError } from "./errors/MacroAbortError";
+import type { FormatterEvaluatorContext } from "./formatters/formatterEvaluators";
 
 export interface IChoiceExecutor {
 	execute(choice: IChoice): Promise<void>;
@@ -15,4 +16,12 @@ export interface IChoiceExecutor {
 	 * awaiting {@link execute} to determine whether the child choice stopped early.
 	 */
 	consumeAbortSignal?(): MacroAbortError | null;
+	evaluateMacroToken?(
+		macroName: string,
+		context: FormatterEvaluatorContext,
+	): Promise<unknown>;
+	evaluateInlineJavaScriptToken?(
+		code: string,
+		context: FormatterEvaluatorContext,
+	): Promise<unknown>;
 }

src/choiceExecutor.ts

@@ -7,7 +7,10 @@ import type IMacroChoice from "./types/choices/IMacroChoice";
 import { TemplateChoiceEngine } from "./engine/TemplateChoiceEngine";
 import { CaptureChoiceEngine } from "./engine/CaptureChoiceEngine";
 import { MacroChoiceEngine } from "./engine/MacroChoiceEngine";
+import { SingleInlineScriptEngine } from "./engine/SingleInlineScriptEngine";
+import { SingleMacroEngine } from "./engine/SingleMacroEngine";
 import type { IChoiceExecutor } from "./IChoiceExecutor";
+import type { FormatterEvaluatorContext } from "./formatters/formatterEvaluators";
 import type IMultiChoice from "./types/choices/IMultiChoice";
 import ChoiceSuggester from "./gui/suggesters/choiceSuggester";
 import { settingsStore } from "./settingsStore";
@@ -32,6 +35,36 @@ export class ChoiceExecutor implements IChoiceExecutor {
 		return abort ?? null;
 	}
 
+	async evaluateMacroToken(
+		macroName: string,
+		context: FormatterEvaluatorContext,
+	): Promise<unknown> {
+		const engine = new SingleMacroEngine(
+			this.app,
+			this.plugin,
+			this.plugin.settings.choices,
+			this,
+			context.variables,
+		);
+		return await engine.runAndGetOutput(
+			macroName,
+			context.label ? { label: context.label } : undefined,
+		);
+	}
+
+	async evaluateInlineJavaScriptToken(
+		code: string,
+		context: FormatterEvaluatorContext,
+	): Promise<unknown> {
+		const executor = new SingleInlineScriptEngine(
+			this.app,
+			this.plugin,
+			this,
+			context.variables,
+		);
+		return await executor.runAndGetOutput(code);
+	}
+
 	async execute(choice: IChoice): Promise<void> {
 		this.pendingAbort = null;
 		const originLeaf = getOpenFileOriginLeaf(this.app);

src/engine/CaptureChoiceEngine.ts

@@ -16,9 +16,14 @@ import {
 	QA_INTERNAL_CAPTURE_TARGET_FILE_PATH,
 	VALUE_SYNTAX,
 } from "../constants";
-import { CaptureChoiceFormatter } from "../formatters/captureChoiceFormatter";
+import type { CaptureChoiceFormatter } from "../formatters/captureChoiceFormatter";
 import { log } from "../logger/logManager";
 import type QuickAdd from "../main";
+import { FormatterFactory } from "../services/FormatterFactory";
+import {
+	TemplateEvaluator,
+	TemplateFileService,
+} from "../services/TemplateFileService";
 import type ICaptureChoice from "../types/choices/ICaptureChoice";
 import { normalizeAppendLinkOptions, type AppendLinkOptions } from "../types/linkPlacement";
 import {
@@ -43,7 +48,6 @@ import { basenameWithoutMdOrCanvas } from "../utils/pathUtils";
 import { QuickAddChoiceEngine } from "./QuickAddChoiceEngine";
 import { ChoiceAbortError } from "../errors/ChoiceAbortError";
 import { MacroAbortError } from "../errors/MacroAbortError";
-import { SingleTemplateEngine } from "./SingleTemplateEngine";
 import { getCaptureAction, type CaptureAction } from "./captureAction";
 import {
 	getCanvasTextCaptureContent,
@@ -61,6 +65,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 	choice: ICaptureChoice;
 	private formatter: CaptureChoiceFormatter;
 	private readonly plugin: QuickAdd;
+	private readonly templateFileService: TemplateFileService;
 	private templatePropertyVars?: Map<string, unknown>;
 	private capturePropertyVars: Map<string, unknown> = new Map();
 
@@ -74,7 +79,11 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 		super(app);
 		this.choice = choice;
 		this.plugin = plugin;
-		this.formatter = new CaptureChoiceFormatter(app, plugin, choiceExecutor);
+		this.formatter = new FormatterFactory(
+			app,
+			plugin,
+		).createCaptureChoiceFormatter(choiceExecutor);
+		this.templateFileService = new TemplateFileService(app);
 	}
 
 	private showSuccessNotice(
@@ -709,22 +718,19 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 
 		let fileContent = "";
 		if (this.choice.createFileIfItDoesntExist.createWithTemplate) {
-			const singleTemplateEngine: SingleTemplateEngine =
-				new SingleTemplateEngine(
-					this.app,
-					this.plugin,
-					this.choice.createFileIfItDoesntExist.template,
-					this.choiceExecutor,
-				);
-
 			if (linkOptions?.enabled && !linkOptions.requireActiveFile) {
-				singleTemplateEngine.setLinkToCurrentFileBehavior("optional");
+				this.formatter.setLinkToCurrentFileBehavior("optional");
 			}
 
-			fileContent = await singleTemplateEngine.run();
-
-			// Get template variables from the template engine's formatter
-			const templateVars = singleTemplateEngine.getAndClearTemplatePropertyVars();
+			const templatePath = this.choice.createFileIfItDoesntExist.template;
+			const templateContent =
+				await this.templateFileService.readTemplateContent(templatePath);
+			const { content, templatePropertyVars: templateVars } =
+				await new TemplateEvaluator(this.formatter).evaluateTemplateContent(
+					templateContent,
+					filePath,
+				);
+			fileContent = content;
 
 			log.logMessage(`CaptureChoiceEngine: Collected ${templateVars.size} template property variables`);
 			if (templateVars.size > 0) {

src/engine/MacroChoiceEngine.ts

@@ -35,7 +35,7 @@ import type { IAIAssistantCommand } from "src/types/macros/QuickCommands/IAIAssi
 import { runAIAssistant } from "src/ai/AIAssistant";
 import { resolveProviderApiKey } from "src/ai/providerSecrets";
 import { settingsStore } from "src/settingsStore";
-import { CompleteFormatter } from "src/formatters/completeFormatter";
+import { FormatterFactory } from "src/services/FormatterFactory";
 import {
 	getModelByName,
 	getModelNames,
@@ -580,11 +580,10 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 			throw new Error(`Model ${modelName} not found with any provider.`);
 		}
 
-		const formatter = new CompleteFormatter(
+		const formatter = new FormatterFactory(
 			this.app,
 			QuickAdd.instance,
-			this.choiceExecutor
-		);
+		).createCompleteFormatter(this.choiceExecutor);
 
 		const modelProvider = getModelProvider(model.name);
 
@@ -725,11 +724,10 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
 
 	private async executeOpenFile(command: IOpenFileCommand) {
 		try {
-			const formatter = new CompleteFormatter(
+			const formatter = new FormatterFactory(
 				this.app,
 				QuickAdd.instance,
-				this.choiceExecutor
-			);
+			).createCompleteFormatter(this.choiceExecutor);
 
 			const resolvedPath = await formatter.formatFileName(command.filePath, "");
 			const normalizedPath = resolvedPath.replace(/\\/g, "/");

src/engine/SingleInlineScriptEngine.ts

@@ -10,7 +10,7 @@ export class SingleInlineScriptEngine extends MacroChoiceEngine {
 		app: App,
 		plugin: QuickAdd,
 		choiceExecutor: IChoiceExecutor,
-		variables: Map<string, string>
+		variables: Map<string, unknown>
 	) {
 		//@ts-ignore
 		super(app, plugin, null, choiceExecutor, variables);