diff --git a/.codex-tasks/form-validation-epic/EPIC.md b/.codex-tasks/form-validation-epic/EPIC.md new file mode 100644 index 0000000..6d7b8b3 --- /dev/null +++ b/.codex-tasks/form-validation-epic/EPIC.md @@ -0,0 +1,12 @@ +# 表单配置校验收口 + +## 目标 + +把动态表单的字段定义变成可靠的 Runtime 合同:类型、key、label、required 和选项在 API 边界统一校验,错误在后台配置时明确反馈,不把坏配置发布到小程序。 + +## 验收 + +- 字段类型使用 allow-list。 +- `select`、`radio`、`multi-select` 的 options 结构经过运行时校验。 +- 重复 key、非法 key、空选项标签或值被拒绝。 +- API 测试覆盖成功和失败路径,前端构建及小程序 fixture 通过。 diff --git a/.codex-tasks/form-validation-epic/PROGRESS.md b/.codex-tasks/form-validation-epic/PROGRESS.md new file mode 100644 index 0000000..2ae3a1a --- /dev/null +++ b/.codex-tasks/form-validation-epic/PROGRESS.md @@ -0,0 +1,13 @@ +# 进度 + +- 任务:表单配置校验收口 +- 形态:epic +- 进度:3/3 +- 当前:全部子任务完成 +- 真相文件:`SUBTASKS.csv` + +## 验证 + +- API integration tests:26 passed。 +- Admin production build:通过。 +- Miniapp fixture 和 visual fixture:通过。 diff --git a/.codex-tasks/form-validation-epic/SUBTASKS.csv b/.codex-tasks/form-validation-epic/SUBTASKS.csv new file mode 100644 index 0000000..14de70f --- /dev/null +++ b/.codex-tasks/form-validation-epic/SUBTASKS.csv @@ -0,0 +1,4 @@ +id,title,task_type,depends_on,status,task_dir,acceptance_criteria,validation_command,notes +1,字段 schema 强化,single-full,,DONE,tasks/schema,validation package 拒绝非法字段定义,pnpm --filter @personal-brand/api test:integration,已完成 +2,后台错误反馈,single-full,1,DONE,tasks/schema,配置失败时保留输入并显示可读错误,pnpm --filter @personal-brand/admin build,已完成 +3,回归验证,single-full,2,DONE,tasks/regression,API 与 miniapp fixture 全通过,pnpm --filter @personal-brand/miniapp test:fixture && pnpm --filter @personal-brand/miniapp test:visual-fixture,已完成 diff --git a/.codex-tasks/form-validation-epic/tasks/regression/PROGRESS.md b/.codex-tasks/form-validation-epic/tasks/regression/PROGRESS.md new file mode 100644 index 0000000..ffd9fb8 --- /dev/null +++ b/.codex-tasks/form-validation-epic/tasks/regression/PROGRESS.md @@ -0,0 +1,8 @@ +# 回归验证 + +状态:DONE + +- API 集成测试:26 passed。 +- Admin production build:通过。 +- Miniapp fixture:通过。 +- Miniapp visual fixture:通过。 diff --git a/.codex-tasks/form-validation-epic/tasks/schema/PROGRESS.md b/.codex-tasks/form-validation-epic/tasks/schema/PROGRESS.md new file mode 100644 index 0000000..c6dce53 --- /dev/null +++ b/.codex-tasks/form-validation-epic/tasks/schema/PROGRESS.md @@ -0,0 +1,7 @@ +# 字段 schema 强化 + +状态:DONE + +- 字段 key、type、label、options 统一运行时校验。 +- 选择类字段必须配置非空 options。 +- 非法定义在 API 边界返回 400。 diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 14f3a04..ac0b39b 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -486,7 +486,7 @@ test("admin can create and version an inquiry form", async () => { fieldsSnapshot: [ { key: "budget", type: "number", label: "预算", required: true }, { - key: "contactMethod", + key: "contact_method", type: "select", label: "联系渠道", options: [{ label: "微信", value: "wechat" }], @@ -615,6 +615,23 @@ test("admin can create and version an inquiry form", async () => { } }); +test("admin rejects invalid dynamic inquiry field definitions", async () => { + const login = await request("/admin/session/login", { + method: "POST", + payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD }, + }); + const token = JSON.parse(login.body).token; + const invalid = await request("/admin/workspace/forms", { + method: "POST", + headers: { authorization: `Bearer ${token}` }, + payload: { + name: "非法字段表单", + fieldsSnapshot: [{ key: "ContactMethod", type: "select", label: "渠道", options: [] }], + }, + }); + assert.equal(invalid.statusCode, 400); +}); + test("admin can manage offerings and public endpoint hides disabled offerings", async () => { const login = await request("/admin/session/login", { method: "POST", diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.ts index cdc8b69..b786186 100644 --- a/packages/validation/src/index.ts +++ b/packages/validation/src/index.ts @@ -2,14 +2,43 @@ import { z } from "zod"; export const validationPackageName = "personal-brand-validation"; +const inquiryFieldTypeSchema = z.enum([ + "text", + "tel", + "phone", + "number", + "select", + "radio", + "multi-select", + "textarea", + "date", + "image", + "url", +]); + +const inquiryFieldOptionSchema = z.object({ + label: z.string().min(1), + value: z.string().min(1), +}); + export const inquiryFieldSchema = z .object({ - key: z.string().min(1), - type: z.string().min(1), + key: z.string().regex(/^[a-z][a-z0-9_]*$/), + type: inquiryFieldTypeSchema, label: z.string().min(1), required: z.boolean().optional(), + options: z.array(inquiryFieldOptionSchema).optional(), }) - .passthrough(); + .passthrough() + .superRefine((field, context) => { + if (["select", "radio", "multi-select"].includes(field.type) && !field.options?.length) { + context.addIssue({ + code: z.ZodIssueCode.custom, + path: ["options"], + message: "选择类字段必须配置 options", + }); + } + }); export const fieldSnapshotSchema = z.array(inquiryFieldSchema).superRefine((fields, context) => { const seen = new Set();