@zhushanwen/pi-ask-user 0.0.4 → 0.2.0

package/src/__tests__/w2-draft-hint.test.ts

@@ -0,0 +1,157 @@
+// src/__tests__/w2-draft-hint.test.ts
+// W2: draftText migration (#2) + handleInput split (#3) + hint line (#4)
+import { describe, expect, it } from "vitest";
+
+import { AskUserComponent } from "../component";
+import type { Question, Result } from "../types";
+import {
+	DOWN,
+	ENTER,
+	ESC,
+	LEFT,
+	mockTui,
+	multiQ,
+	RIGHT,
+	singleQ,
+	singleQWithComment,
+	stubTheme,
+	UP,
+} from "./fixtures";
+
+const make = (
+	questions: Question[],
+): { c: AskUserComponent; result: { val: Result | null | undefined } } => {
+	const result = { val: undefined as Result | null | undefined };
+	const c = new AskUserComponent(questions, mockTui, stubTheme, (r) => (result.val = r));
+	return { c, result };
+};
+
+// ── draftText migration: per-question draft persistence ──
+describe("W2 — draftText migration", () => {
+	it("C-DRAFT-1: freeform draft persists when switching tabs away and back", () => {
+		const { c } = make(multiQ);
+		// Q1: navigate to Other (index 2), open freeform, type "abc"
+		c.handleInput(DOWN); // 0→1
+		c.handleInput(DOWN); // 1→2 (Other)
+		c.handleInput(ENTER);
+		c.handleInput("abc");
+		c.handleInput(ESC); // back to options
+		// Switch to Q2 and back to Q1
+		c.handleInput(RIGHT);
+		c.handleInput(LEFT);
+		// Re-enter freeform
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		const lines = c.render(80);
+		const editorLine = lines.find((l) => l.includes("\x1b[7m"));
+		expect(editorLine).toBeDefined();
+		expect(editorLine).toContain("abc");
+	});
+
+	it("C-DRAFT-2: drafts on different questions are independent", () => {
+		const { c } = make(multiQ);
+		// Q1: type "aaa"
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		c.handleInput("aaa");
+		c.handleInput(ESC);
+		// Navigate to Q3
+		c.handleInput(RIGHT);
+		c.handleInput(RIGHT);
+		// Q3: type "ccc"
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		c.handleInput("ccc");
+		c.handleInput(ESC);
+		// Go back to Q1
+		c.handleInput(LEFT);
+		c.handleInput(LEFT);
+		// Re-enter freeform on Q1
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		const lines1 = c.render(80);
+		const editorLine1 = lines1.find((l) => l.includes("\x1b[7m"));
+		expect(editorLine1).toContain("aaa");
+		expect(editorLine1).not.toContain("ccc");
+	});
+
+	it("C-BC4C: comment flow submits comment with answer", () => {
+		const { c, result } = make([singleQWithComment]);
+		c.handleInput(ENTER); // select A → comment mode
+		c.handleInput("my note");
+		c.handleInput(ENTER); // submit
+		expect(result.val).toBeDefined();
+		expect(result.val!.answers["Which DB? (with comment)"]).toBe("Postgres — my note");
+	});
+});
+
+// ── hint line: append-only UX hint ──
+describe("W2 — hint line", () => {
+	it("C-HINT-1: freeform editor hint contains all expected hints", () => {
+		const { c } = make([singleQ]);
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		const lines = c.render(80);
+		const hintLine = lines.find((l: string) => l.includes("move") && l.includes("Backspace deletes"));
+		expect(hintLine).toBeDefined();
+		expect(hintLine).toContain("Enter submit");
+		expect(hintLine).toContain("Esc back");
+	});
+
+	it("C-HINT-2: comment editor hint contains all expected hints", () => {
+		const { c } = make([singleQWithComment]);
+		c.handleInput(ENTER);
+		const lines = c.render(80);
+		const hintLine = lines.find((l: string) => l.includes("move") && l.includes("Backspace deletes"));
+		expect(hintLine).toBeDefined();
+		expect(hintLine).toContain("Enter submit");
+		expect(hintLine).toContain("Esc back");
+	});
+});
+
+// ── freeDraft 隔离：丢弃的 freeform 草稿不污染答案、不触发 auto-confirm ──
+describe("C-FREEDRAFT: discarded draft isolation", () => {
+	it("C-FREEDRAFT-1: discarded freeform draft blocks submit (Q1 stays unconfirmed)", () => {
+		const { c, result } = make(multiQ);
+		// Q1: 打开 freeform，输入草稿 "abc"，ESC 丢弃（存入 freeDraft，但不 confirmed）
+		c.handleInput(DOWN);  // 0→1
+		c.handleInput(DOWN);  // 1→2 (Other)
+		c.handleInput(ENTER); // 打开 freeform
+		c.handleInput("abc");
+		c.handleInput(ESC);   // freeDraft="abc"，回到 options，Q1 仍未答
+		// 跳到 Submit tab 尝试提交
+		c.handleInput(RIGHT); // → Q2
+		c.handleInput(RIGHT); // → Q3
+		c.handleInput(RIGHT); // → Submit tab
+		c.handleInput(ENTER); // allConfirmed=false → 提交被阻塞
+		expect(result.val).toBeUndefined();
+	});
+
+	it("C-FREEDRAFT-2: discarded draft does not appear in submitted answers", () => {
+		const { c, result } = make(multiQ);
+		// Q1: freeform 草稿 "abc" → ESC 丢弃 → 改选选项 A
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER); // freeform
+		c.handleInput("abc");
+		c.handleInput(ESC);   // 丢弃草稿，光标回到 Other
+		c.handleInput(UP);    // 2→1
+		c.handleInput(UP);    // 1→0 (A)
+		c.handleInput(ENTER); // 选 A → confirmed → advance Q2
+		// Q2 (multiSelect): 选 X → confirmed → advance Q3
+		c.handleInput(ENTER);
+		// Q3: 选 M → confirmed → advance Submit tab
+		c.handleInput(ENTER);
+		// Submit
+		c.handleInput(ENTER);
+		expect(result.val).toBeDefined();
+		expect(result.val!.answers["Q1"]).toBe("A");
+		// 丢弃的草稿 "abc" 不应出现在任何答案中
+		expect(JSON.stringify(result.val!.answers)).not.toContain("abc");
+	});
+});

package/src/__tests__/w3-regression.test.ts

@@ -0,0 +1,128 @@
+// src/__tests__/w3-regression.test.ts
+// W3: Forward regression — freeform/comment/bksp edge cases.
+// No-op keymap coverage moved to component-keymap.test.ts (deduplicated).
+import { describe, expect, it } from "vitest";
+
+import { AskUserComponent } from "../component";
+import type { Question, Result } from "../types";
+import {
+	BACKSPACE,
+	DOWN,
+	ENTER,
+	ESC,
+	HOME,
+	LEFT,
+	mockTui,
+	multiQ,
+	multiQWithComment,
+	RIGHT,
+	singleQ,
+	stubTheme,
+} from "./fixtures";
+
+const make = (
+	questions: Question[] = [singleQ],
+): { c: AskUserComponent; result: { val: Result | null | undefined } } => {
+	const result = { val: undefined as Result | null | undefined };
+	const c = new AskUserComponent(questions, mockTui, stubTheme, (r) => (result.val = r));
+	return { c, result };
+};
+
+/** Helper: open freeform editor on singleQ (navigate to Other → Enter) */
+function openFreeform(c: AskUserComponent): void {
+	c.handleInput(DOWN); // 0→1
+	c.handleInput(DOWN); // 1→2 (Other)
+	c.handleInput(ENTER); // open freeform
+}
+
+// ── C-BC4B: freeform Enter clears selectedIndex (BC-4b regression) ──
+describe("W3 — freeform Enter clears selectedIndex (C-BC4B)", () => {
+	it("C-BC4B: freeform text overrides selected option in result", () => {
+		const { c, result } = make([singleQ]);
+		// Navigate to Other (index 2) and open freeform
+		c.handleInput(DOWN); // 0→1
+		c.handleInput(DOWN); // 1→2 (Other)
+		c.handleInput(ENTER); // open freeform
+		c.handleInput("custom answer");
+		c.handleInput(ENTER); // confirm freeform → afterConfirm → submit
+		expect(result.val).toBeDefined();
+		// The answer should be the freeform text
+		expect(result.val!.answers["Which DB?"]).toBe("custom answer");
+	});
+
+	it("C-BC4B-SELECT: freeform on same question clears selectedIndex", () => {
+		const { c, result } = make(multiQ);
+		// Q1: stay on cursorIndex=0 (A), open freeform via Other
+		c.handleInput(DOWN); // 0→1
+		c.handleInput(DOWN); // 1→2 (Other)
+		c.handleInput(ENTER); // open freeform
+		c.handleInput("override");
+		c.handleInput(ENTER); // confirm freeform → afterConfirm → advance to Q2
+		// Q2: select X
+		c.handleInput(ENTER); // select X
+		c.handleInput(ENTER); // confirm → advance to Q3
+		// Q3: select M
+		c.handleInput(ENTER); // select M
+		c.handleInput(ENTER); // confirm → advance to submit
+		// Submit
+		c.handleInput(ENTER);
+		expect(result.val).toBeDefined();
+		// Q1 answer should be the freeform text only
+		expect(result.val!.answers["Q1"]).toBe("override");
+	});
+});
+
+// ── C-BC4C: comment edge cases ──
+// C-BC4C-REEDIT (initial comment submit) removed — duplicate of w2-draft-hint C-BC4C.
+describe("W3 — comment re-edit (C-BC4C-CLEAR)", () => {
+	it("C-BC4C-CLEAR: Esc in comment mode skips comment, keeps existing commentValue", () => {
+		const { c, result } = make(multiQWithComment);
+		// Q1: select A → comment mode
+		c.handleInput(ENTER);
+		c.handleInput("my note");
+		c.handleInput(ENTER); // submit comment → advance to Q2
+		// Q2: select X
+		c.handleInput(ENTER);
+		c.handleInput(ENTER); // confirm Q2 → advance to submit tab
+		// Go back to Q1
+		c.handleInput(LEFT);
+		// Q1 is already confirmed, re-select A to trigger comment again
+		c.handleInput(ENTER); // re-select A → afterConfirm → comment mode
+		c.handleInput(ESC); // skip comment
+		// Submit
+		c.handleInput(RIGHT);
+		c.handleInput(RIGHT); // navigate to submit tab
+		c.handleInput(ENTER);
+		expect(result.val).toBeDefined();
+		// Comment should still be "my note" (Esc preserved commentValue)
+		expect(result.val!.answers["Q1"]).toBe("A — my note");
+	});
+});
+
+// ── C-BKSP-EDGE: backspace at cursorIndex=0 ──
+
+describe("W3 — backspace at cursorIndex=0 (C-BKSP-EDGE)", () => {
+	it("C-BKSP-EDGE: backspace at cursorIndex=0 is no-op on empty text", () => {
+		const { c } = make();
+		// 打开 freeform 编辑器
+		openFreeform(c);
+		c.handleInput(BACKSPACE); // 空文本 + cursorIndex=0
+		// 不应 crash
+		const lines = c.render(60);
+		// 编辑器仍然可见（反色空格光标）
+		expect(lines.some((l: string) => l.includes("\x1b[7m"))).toBe(true);
+	});
+
+	it("C-BKSP-EDGE-2: backspace at cursorIndex=0 on non-empty text is no-op", () => {
+		const { c } = make();
+		openFreeform(c);
+		c.handleInput("abc");
+		c.handleInput(HOME); // 移到开头
+		c.handleInput(BACKSPACE); // cursorIndex=0，不应删除
+		const lines = c.render(60);
+		const editorLine = lines.find((l: string) => l.includes("\x1b[7m"));
+		// 文本完整保留（去除 ANSI 转义码后检查）
+		const stripped = editorLine!.replace(/\x1b\[[0-9;]*m/g, "");
+		expect(stripped).toContain("abc");
+	});
+});

package/src/answer-format.ts

@@ -0,0 +1,51 @@
+// src/answer-format.ts
+// 答案文本格式的唯一权威模块。
+// TUI 路径（submit-view.ts:getAnswerText）和 RPC 路径（index.ts:protoAnswersToResult）
+// 都调 formatAnswer 产出 "label1, label2 — comment" 格式，确保两条路径一致。
+// renderExpandedOptions（index.ts）调 parseAnswerParts 精确反解析选中项。
+import { ANSWER_COMMENT_SEPARATOR } from "./types";
+
+/**
+ * 把答案各部分拼装为最终文本格式："part1, part2 — comment"。
+ * - parts 为空 → 返回 null（未答）
+ * - comment 有值 → 追加 ANSWER_COMMENT_SEPARATOR + comment
+ */
+export function formatAnswer(parts: string[], comment?: string | null): string | null {
+	if (parts.length === 0) return null;
+	const base = parts.join(", ");
+	return comment ? `${base}${ANSWER_COMMENT_SEPARATOR}${comment}` : base;
+}
+
+/**
+ * 从最终答案文本中精确解析出选中的 labels（不依赖子串匹配）。
+ * 用于 renderExpandedOptions 反向判定哪些选项被选中。
+ *
+ * @param answer 最终答案文本（formatAnswer 产出）
+ * @param labels 候选 label 列表（q.options 的 label），精确匹配
+ * @returns selected=命中的 labels（按 answer 中出现顺序），comment=评论文本（如有）
+ */
+export function parseAnswerParts(
+	answer: string,
+	labels: string[],
+): { selected: string[]; comment?: string } {
+	// 先提取 comment（ANSWER_COMMENT_SEPARATOR 之后的部分）
+	let body = answer;
+	let comment: string | undefined;
+	const sepIdx = answer.indexOf(ANSWER_COMMENT_SEPARATOR);
+	if (sepIdx >= 0) {
+		body = answer.slice(0, sepIdx);
+		comment = answer.slice(sepIdx + ANSWER_COMMENT_SEPARATOR.length).trim();
+	}
+
+	// body 形如 "label1, label2" → 精确匹配候选 label
+	const labelSet = new Set(labels);
+	const tokens = body.split(/[,，]/).map((t) => t.trim()).filter(Boolean);
+	const selected: string[] = [];
+	// 剩余 tokens 不匹配任何 label → 是 Other 自由文本（不返回，调用方自行处理）
+	for (const token of tokens) {
+		if (labelSet.has(token)) {
+			selected.push(token);
+		}
+	}
+	return { selected, comment };
+}