codex: address PR review feedback (#1129)

Author: chhoumann

src/preflight/collectChoiceRequirements.test.ts

@@ -1,20 +1,29 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { App } from "obsidian";
 import type { IChoiceExecutor } from "src/IChoiceExecutor";
+import type ICaptureChoice from "src/types/choices/ICaptureChoice";
 import type IMacroChoice from "src/types/choices/IMacroChoice";
 import { CommandType } from "src/types/macros/CommandType";
 import type { IUserScript } from "src/types/macros/IUserScript";
 import { collectChoiceRequirements } from "./collectChoiceRequirements";
 
-const { getUserScriptMock } = vi.hoisted(() => ({
+const {
+	getMarkdownFilesInFolderMock,
+	getMarkdownFilesWithTagMock,
+	getUserScriptMock,
+	isFolderMock,
+} = vi.hoisted(() => ({
+	getMarkdownFilesInFolderMock: vi.fn(() => []),
+	getMarkdownFilesWithTagMock: vi.fn(() => []),
 	getUserScriptMock: vi.fn(),
+	isFolderMock: vi.fn(() => false),
 }));
 
 vi.mock("src/utilityObsidian", () => ({
-	getMarkdownFilesInFolder: vi.fn(() => []),
-	getMarkdownFilesWithTag: vi.fn(() => []),
+	getMarkdownFilesInFolder: getMarkdownFilesInFolderMock,
+	getMarkdownFilesWithTag: getMarkdownFilesWithTagMock,
 	getUserScript: getUserScriptMock,
-	isFolder: vi.fn(() => false),
+	isFolder: isFolderMock,
 }));
 
 function createMacroChoice(script: IUserScript): IMacroChoice {
@@ -32,6 +41,45 @@ function createMacroChoice(script: IUserScript): IMacroChoice {
 	};
 }
 
+function createCaptureChoice(captureTo: string): ICaptureChoice {
+	return {
+		id: "capture-choice",
+		name: "Capture Choice",
+		type: "Capture",
+		command: false,
+		captureTo,
+		captureToActiveFile: false,
+		createFileIfItDoesntExist: {
+			enabled: false,
+			createWithTemplate: false,
+			template: "",
+		},
+		format: { enabled: false, format: "" },
+		prepend: false,
+		appendLink: false,
+		task: false,
+		insertAfter: {
+			enabled: false,
+			after: "",
+			insertAtEnd: false,
+			considerSubsections: false,
+			createIfNotFound: false,
+			createIfNotFoundLocation: "",
+		},
+		newLineCapture: {
+			enabled: false,
+			direction: "below",
+		},
+		openFile: false,
+		fileOpening: {
+			location: "tab",
+			direction: "vertical",
+			mode: "default",
+			focus: true,
+		},
+	};
+}
+
 describe("collectChoiceRequirements - macro script metadata", () => {
 	const app = {} as App;
 	const plugin = {} as any;
@@ -49,7 +97,13 @@ describe("collectChoiceRequirements - macro script metadata", () => {
 	};
 
 	beforeEach(() => {
+		getMarkdownFilesInFolderMock.mockReset();
+		getMarkdownFilesWithTagMock.mockReset();
 		getUserScriptMock.mockReset();
+		isFolderMock.mockReset();
+		getMarkdownFilesInFolderMock.mockReturnValue([]);
+		getMarkdownFilesWithTagMock.mockReturnValue([]);
+		isFolderMock.mockReturnValue(false);
 	});
 
 	it("reads quickadd.inputs from function exports", async () => {
@@ -80,6 +134,32 @@ describe("collectChoiceRequirements - macro script metadata", () => {
 		);
 	});
 
+	it("reads quickadd.inputs from object exports", async () => {
+		getUserScriptMock.mockResolvedValue({
+			quickadd: {
+				inputs: [{ id: "project", type: "text", label: "Project" }],
+			},
+		});
+
+		const requirements = await collectChoiceRequirements(
+			app,
+			plugin,
+			choiceExecutor,
+			createMacroChoice(scriptCommand),
+		);
+
+		expect(requirements).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					id: "project",
+					type: "text",
+					label: "Project",
+					source: "script",
+				}),
+			]),
+		);
+	});
+
 	it("ignores malformed input entries", async () => {
 		const exported = (() => {}) as ((...args: unknown[]) => unknown) & {
 			quickadd?: unknown;
@@ -99,3 +179,42 @@ describe("collectChoiceRequirements - macro script metadata", () => {
 		expect(requirements).toEqual([]);
 	});
 });
+
+describe("collectChoiceRequirements - capture targets", () => {
+	const app = {} as App;
+	const plugin = {
+		settings: {
+			inputPrompt: "single-line",
+			globalVariables: {},
+			useSelectionAsCaptureValue: true,
+		},
+	} as any;
+	const choiceExecutor: IChoiceExecutor = {
+		execute: vi.fn(),
+		variables: new Map<string, unknown>(),
+	};
+
+	beforeEach(() => {
+		getMarkdownFilesInFolderMock.mockReset();
+		getMarkdownFilesWithTagMock.mockReset();
+		isFolderMock.mockReset();
+		getMarkdownFilesInFolderMock.mockReturnValue([]);
+		getMarkdownFilesWithTagMock.mockReturnValue([]);
+	});
+
+	it("normalizes capture folder paths ending in .md", async () => {
+		isFolderMock.mockReturnValue(true);
+
+		await collectChoiceRequirements(
+			app,
+			plugin,
+			choiceExecutor,
+			createCaptureChoice("Projects.md"),
+		);
+
+		expect(getMarkdownFilesInFolderMock).toHaveBeenCalledWith(
+			app,
+			"Projects/",
+		);
+	});
+});

src/preflight/collectChoiceRequirements.ts

@@ -187,7 +187,7 @@ async function collectForCaptureChoice(
 		if (isTagTarget) {
 			files = getMarkdownFilesWithTag(app, normalizedTarget);
 		} else {
-			const folder = normalizedTarget.replace(/^\/$|\/\.md$|^\.md$/, "");
+			const folder = normalizedTarget.replace(/(?:\/|\.md)+$/g, "");
 			const base =
 				folder === "" ? "" : folder.endsWith("/") ? folder : `${folder}/`;
 			files = getMarkdownFilesInFolder(app, base);