refactor: extract vault and frontmatter services

src/engine/CaptureChoiceEngine.selection.test.ts

@@ -199,7 +199,7 @@ describe("CaptureChoiceEngine selection-as-value resolution", () => {
 		(engine as any).getFormattedPathToCaptureTo = vi
 			.fn()
 			.mockResolvedValue("Test.md");
-		(engine as any).fileExists = vi.fn().mockResolvedValue(true);
+		(engine as any).vaultFileService.fileExists = vi.fn().mockResolvedValue(true);
 		(engine as any).onFileExists = vi.fn().mockResolvedValue({
 			file,
 			newFileContent: "content",
@@ -355,7 +355,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 			createExecutor(),
 		);
 
-		(engine as any).createFileWithInput = vi.fn(async (path: string) => ({
+		(engine as any).vaultFileService.createFileWithInput = vi.fn(async (path: string) => ({
 			path,
 			basename: path.split("/").pop()?.replace(/\.(base|canvas)$/i, "") ?? "",
 			extension: path.endsWith(".base") ? "base" : "canvas",
@@ -414,7 +414,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 			newFileContent: "updated",
 			captureContent: "capture",
 		}));
-		(engine as any).fileExists = fileExistsMock;
+		(engine as any).vaultFileService.fileExists = fileExistsMock;
 		(engine as any).onFileExists = onFileExistsMock;
 
 		await engine.run();
@@ -473,7 +473,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 			createExecutor(),
 		);
 
-		(engine as any).fileExists = vi.fn(async () => true);
+		(engine as any).vaultFileService.fileExists = vi.fn(async () => true);
 		(engine as any).onFileExists = vi.fn(async () => ({
 			file: linkedFile,
 			newFileContent: "updated",
@@ -588,7 +588,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 			}),
 		);
 
-		(engine as any).fileExists = fileExistsMock;
+		(engine as any).vaultFileService.fileExists = fileExistsMock;
 		(engine as any).onCreateFileIfItDoesntExist =
 			onCreateFileIfItDoesntExistMock;
 
@@ -636,7 +636,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 
 		const fileExistsMock = vi.fn();
 		const onFileExistsMock = vi.fn();
-		(engine as any).fileExists = fileExistsMock;
+		(engine as any).vaultFileService.fileExists = fileExistsMock;
 		(engine as any).onFileExists = onFileExistsMock;
 
 		await engine.run();

src/engine/CaptureChoiceEngine.ts

@@ -241,7 +241,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 				linkOptions?: AppendLinkOptions,
 			) => Promise<{ file: TFile; newFileContent: string; captureContent: string }>;
 			let getFileAndAddContentFn: GetFileAndAddContentFn;
-			const fileAlreadyExists = await this.fileExists(filePath);
+			const fileAlreadyExists = await this.vaultFileService.fileExists(filePath);
 
 			if (fileAlreadyExists) {
 				getFileAndAddContentFn =
@@ -504,7 +504,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 		// 3) trailing "/" => folder picker (explicit)
 		// 4) known file extension => file
 		// 5) ambiguous => folder if it exists and no same-name file exists; else file
-		const normalizedCaptureTo = this.stripLeadingSlash(
+		const normalizedCaptureTo = this.vaultFileService.stripLeadingSlash(
 			formattedCaptureTo.trim(),
 		);
 
@@ -540,7 +540,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 		}
 
 		// Guard against ambiguity where a folder and file share the same name.
-		const fileCandidatePath = this.normalizeMarkdownFilePath("", folderPath);
+		const fileCandidatePath = this.vaultFileService.normalizeMarkdownFilePath("", folderPath);
 		const fileCandidate = this.app.vault.getAbstractFileByPath(
 			fileCandidatePath,
 		);
@@ -631,7 +631,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 		newFileContent: string;
 		captureContent: string;
 	}> {
-		const file: TFile = this.getFileByPath(filePath);
+		const file: TFile = this.vaultFileService.getFileByPath(filePath);
 		if (!file) throw new Error("File not found");
 
 		// Set the title to the existing file's basename
@@ -736,16 +736,16 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 		}
 
 		// Create the new file with the (optional) template content
-		const file: TFile = await this.createFileWithInput(filePath, fileContent, {
+		const file: TFile = await this.vaultFileService.createFileWithInput(filePath, fileContent, {
 			suppressTemplaterOnCreate:
 				this.choice.createFileIfItDoesntExist.createWithTemplate,
 		});
 
 		// Post-process front matter for template property types if we used a template
 		if (this.choice.createFileIfItDoesntExist.createWithTemplate &&
 			this.templatePropertyVars &&
-			this.shouldPostProcessFrontMatter(file, this.templatePropertyVars)) {
-			await this.postProcessFrontMatter(file, this.templatePropertyVars);
+			this.frontmatterPropertyService.shouldPostProcessFrontMatter(file, this.templatePropertyVars)) {
+			await this.frontmatterPropertyService.postProcessFrontMatter(file, this.templatePropertyVars);
 		}
 
 		// Process Templater commands in the template if a template was used
@@ -786,7 +786,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 	}
 
 	private normalizeCaptureFilePath(path: string): string {
-		const normalizedPath = this.stripLeadingSlash(path);
+		const normalizedPath = this.vaultFileService.stripLeadingSlash(path);
 		if (BASE_FILE_EXTENSION_REGEX.test(normalizedPath)) {
 			throw new ChoiceAbortError(
 				`Capture to '.base' files is not supported (${normalizedPath}). Use a Template choice instead.`,
@@ -799,7 +799,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 			return normalizedPath;
 		}
 
-		return this.normalizeMarkdownFilePath("", normalizedPath);
+		return this.vaultFileService.normalizeMarkdownFilePath("", normalizedPath);
 	}
 
 	private mergeCapturePropertyVars(vars: Map<string, unknown>): void {
@@ -821,15 +821,15 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 			return;
 		}
 
-		if (!this.shouldPostProcessFrontMatter(file, this.capturePropertyVars)) {
+		if (!this.frontmatterPropertyService.shouldPostProcessFrontMatter(file, this.capturePropertyVars)) {
 			this.capturePropertyVars.clear();
 			return;
 		}
 
 		log.logMessage(
 			`CaptureChoiceEngine: Post-processing front matter with ${this.capturePropertyVars.size} capture variables`
 		);
-		await this.postProcessFrontMatter(file, this.capturePropertyVars);
+		await this.frontmatterPropertyService.postProcessFrontMatter(file, this.capturePropertyVars);
 		this.capturePropertyVars.clear();
 	}
 }

src/engine/QuickAddEngine.test.ts

@@ -1,26 +1,25 @@
 import { describe, expect, it } from "vitest";
-import { QuickAddEngine } from "./QuickAddEngine";
+import { VaultFileService } from "../services/VaultFileService";
 
-class TestEngine extends QuickAddEngine {
-	public constructor() {
-		super({} as any);
-	}
-
-	public normalize(folderPath: string, fileName: string): string {
-		return this.normalizeMarkdownFilePath(folderPath, fileName);
-	}
-
-	public run(): void {}
-}
-
-describe("QuickAddEngine path normalization", () => {
-	const engine = new TestEngine();
+describe("VaultFileService path normalization", () => {
+	const service = new VaultFileService({} as any);
 
 	it("strips leading slashes from folder and file", () => {
-		expect(engine.normalize("/daily", "/note")).toBe("daily/note.md");
+		expect(service.normalizeMarkdownFilePath("/daily", "/note")).toBe(
+			"daily/note.md",
+		);
 	});
 
 	it("strips leading slashes from file-only paths", () => {
-		expect(engine.normalize("", "/review/daily")).toBe("review/daily.md");
+		expect(service.normalizeMarkdownFilePath("", "/review/daily")).toBe(
+			"review/daily.md",
+		);
+	});
+
+	it("omits empty folder prefixes and de-duplicates markdown suffixes", () => {
+		expect(service.normalizeMarkdownFilePath("", "note.md")).toBe("note.md");
+		expect(service.normalizeMarkdownFilePath("/folder", "note.md")).toBe(
+			"folder/note.md",
+		);
 	});
 });