fix: disallow capture targets with .base extension

Author: chhoumann

docs/docs/Choices/CaptureChoice.md

@@ -18,7 +18,8 @@ You can choose to either enable _Capture to active file_, or you can enter a fil
 
 QuickAdd treats file names as basename-first by default:
 - If you do **not** provide an extension, QuickAdd creates/targets a Markdown file (`.md`).
-- If you provide an explicit extension (for example `Project.base`), QuickAdd keeps that extension.
+- If you provide an explicit supported extension (for example `.md` or `.canvas`), QuickAdd keeps that extension.
+- Capture to `.base` files is not supported. Use a Template choice for `.base` workflows.
 
 This field also supports the [format syntax](/FormatSyntax.md), which allows you to use dynamic file names.
 I have one for my daily journal with the name `bins/daily/{{DATE:gggg-MM-DD - ddd MMM D}}.md`.

src/engine/CaptureChoiceEngine.selection.test.ts

@@ -4,6 +4,8 @@ import { CaptureChoiceEngine } from "./CaptureChoiceEngine";
 import type ICaptureChoice from "../types/choices/ICaptureChoice";
 import type { IChoiceExecutor } from "../IChoiceExecutor";
 import { isFolder, openFile } from "../utilityObsidian";
+import { QA_INTERNAL_CAPTURE_TARGET_FILE_PATH } from "../constants";
+import { ChoiceAbortError } from "../errors/ChoiceAbortError";
 
 const { setUseSelectionAsCaptureValueMock, setTitleMock } = vi.hoisted(() => ({
 	setUseSelectionAsCaptureValueMock: vi.fn(),
@@ -270,7 +272,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 		expect(result).toEqual({ kind: "file", path: "journals" });
 	});
 
-	it("preserves explicit .base capture target paths", async () => {
+	it("rejects explicit .base capture target paths", () => {
 		const app = createApp();
 		const engine = new CaptureChoiceEngine(
 			app,
@@ -279,9 +281,28 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 			createExecutor(),
 		);
 
-		const result = await (engine as any).getFormattedPathToCaptureTo(false);
+		expect(() =>
+			(engine as any).resolveCaptureTarget("Boards/Kanban.base"),
+		).toThrow(ChoiceAbortError);
+	});
 
-		expect(result).toBe("Boards/Kanban.base");
+	it("rejects preselected .base capture target paths", async () => {
+		const app = createApp();
+		const executor = createExecutor();
+		executor.variables.set(
+			QA_INTERNAL_CAPTURE_TARGET_FILE_PATH,
+			"Boards/Kanban.base",
+		);
+		const engine = new CaptureChoiceEngine(
+			app,
+			{ settings: { useSelectionAsCaptureValue: false } } as any,
+			createChoice(),
+			executor,
+		);
+
+		await expect(
+			(engine as any).getFormattedPathToCaptureTo(false),
+		).rejects.toBeInstanceOf(ChoiceAbortError);
 	});
 
 	it("preserves explicit .canvas capture target paths", async () => {
@@ -298,7 +319,7 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 		expect(result).toBe("Boards/Map.canvas");
 	});
 
-	it("uses extensionless title for created .base/.canvas capture files", async () => {
+	it("uses extensionless title for created .canvas capture files", async () => {
 		const app = createApp() as any;
 		app.vault.read = vi.fn(async () => "");
 
@@ -321,16 +342,11 @@ describe("CaptureChoiceEngine capture target resolution", () => {
 			extension: path.endsWith(".base") ? "base" : "canvas",
 		}));
 
-		await (engine as any).onCreateFileIfItDoesntExist(
-			"Boards/Kanban.base",
-			"capture",
-		);
 		await (engine as any).onCreateFileIfItDoesntExist(
 			"Boards/Map.canvas",
 			"capture",
 		);
 
-		expect(setTitleMock).toHaveBeenCalledWith("Kanban");
 		expect(setTitleMock).toHaveBeenCalledWith("Map");
 	});
 });

src/engine/CaptureChoiceEngine.ts

@@ -251,7 +251,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 			typeof preselected === "string" &&
 			preselected.length > 0
 		) {
-			return preselected;
+			return this.normalizeCaptureFilePath(preselected);
 		}
 
 		if (shouldCaptureToActiveFile) {
@@ -308,6 +308,12 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 			};
 		}
 
+		if (BASE_FILE_EXTENSION_REGEX.test(normalizedCaptureTo)) {
+			throw new ChoiceAbortError(
+				`Capture to '.base' files is not supported (${normalizedCaptureTo}). Use a Template choice instead.`,
+			);
+		}
+
 		const endsWithSlash = normalizedCaptureTo.endsWith("/");
 		const folderPath = normalizedCaptureTo.replace(/\/+$/, "");
 
@@ -317,8 +323,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 
 		if (
 			MARKDOWN_FILE_EXTENSION_REGEX.test(normalizedCaptureTo) ||
-			CANVAS_FILE_EXTENSION_REGEX.test(normalizedCaptureTo) ||
-			BASE_FILE_EXTENSION_REGEX.test(normalizedCaptureTo)
+			CANVAS_FILE_EXTENSION_REGEX.test(normalizedCaptureTo)
 		) {
 			return { kind: "file", path: normalizedCaptureTo };
 		}
@@ -562,10 +567,14 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 
 	private normalizeCaptureFilePath(path: string): string {
 		const normalizedPath = this.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.`,
+			);
+		}
 		if (
 			MARKDOWN_FILE_EXTENSION_REGEX.test(normalizedPath) ||
-			CANVAS_FILE_EXTENSION_REGEX.test(normalizedPath) ||
-			BASE_FILE_EXTENSION_REGEX.test(normalizedPath)
+			CANVAS_FILE_EXTENSION_REGEX.test(normalizedPath)
 		) {
 			return normalizedPath;
 		}