+36 -144

components/public-form-runner.tsx

reviewed

··· 29 29 import { Textarea } from "@/components/ui/textarea"; 30 30 import { 31 31 AGREEMENT_ANSWER_VALUES, 32 32 - getTextValidationPattern, 33 33 - isValidDateAnswer, 34 34 - isValidLinkAnswer, 35 35 - parseNumericAnswer, 36 32 type ChoiceBlockConfig, 37 33 type LinkBlockConfig, 38 34 type LongTextBlockConfig, ··· 40 36 type ShortTextBlockConfig, 41 37 type TextBlockConfig, 42 38 } from "@/lib/blocks"; 39 39 + import { validateAndNormalizeAnswer } from "@/lib/answer-validation"; 43 40 import { resolveNextBlockId } from "@/lib/branching"; 44 41 import { 45 42 isLegacyDefaultCompletionMessage, ··· 242 239 return true; 243 240 } 244 241 245 245 - const value = answerSet[currentBlock.id]; 246 246 - 247 247 - if ( 248 248 - currentBlock.type === "SHORT_TEXT" || 249 249 - currentBlock.type === "LONG_TEXT" 250 250 - ) { 251 251 - const textValue = typeof value === "string" ? value.trim() : ""; 252 252 - 253 253 - if (!textValue) { 254 254 - if (!currentBlock.required) { 255 255 - return true; 256 256 - } 257 257 - 258 258 - showToast(t("publicRunner.answerRequired"), "error"); 259 259 - return false; 260 260 - } 261 261 - 262 262 - const validationRegex = getTextValidationPattern( 263 263 - currentBlock.config as ShortTextBlockConfig | LongTextBlockConfig, 264 264 - ); 265 265 - 266 266 - if (validationRegex && !new RegExp(validationRegex).test(textValue)) { 267 267 - showToast(t("publicRunner.invalidTextFormat"), "error"); 268 268 - return false; 269 269 - } 242 242 + const result = validateAndNormalizeAnswer( 243 243 + currentBlock, 244 244 + answerSet[currentBlock.id], 245 245 + ); 270 246 247 247 + if (result.ok) { 271 248 return true; 272 249 } 273 250 274 274 - if (currentBlock.type === "SINGLE_CHOICE") { 275 275 - if (typeof value === "string" && value.trim()) { 276 276 - return true; 277 277 - } 278 278 - 279 279 - if (currentBlock.required) { 251 251 + switch (result.error.code) { 252 252 + case "answer_required": 253 253 + showToast(t("publicRunner.answerRequired"), "error"); 254 254 + return false; 255 255 + case "single_choice_required": 280 256 showToast(t("publicRunner.singleChoiceRequired"), "error"); 281 257 return false; 282 282 - } 283 283 - 284 284 - return true; 285 285 - } 286 286 - 287 287 - if (currentBlock.type === "MULTIPLE_CHOICE") { 288 288 - if (Array.isArray(value) && value.length > 0) { 289 289 - return true; 290 290 - } 291 291 - 292 292 - if (currentBlock.required) { 258 258 + case "multi_choice_required": 293 259 showToast(t("publicRunner.multiChoiceRequired"), "error"); 294 260 return false; 295 295 - } 296 296 - 297 297 - return true; 298 298 - } 299 299 - 300 300 - if (currentBlock.type === "NUMBER") { 301 301 - const textValue = typeof value === "string" ? value.trim() : ""; 302 302 - const config = currentBlock.config as NumberBlockConfig; 303 303 - 304 304 - if (!textValue) { 305 305 - if (!currentBlock.required) { 306 306 - return true; 307 307 - } 308 308 - 309 309 - showToast(t("publicRunner.answerRequired"), "error"); 261 261 + case "invalid_option": 262 262 + showToast( 263 263 + t( 264 264 + currentBlock.type === "MULTIPLE_CHOICE" 265 265 + ? "publicRunner.multiChoiceRequired" 266 266 + : "publicRunner.singleChoiceRequired", 267 267 + ), 268 268 + "error", 269 269 + ); 310 270 return false; 311 311 - } 312 312 - 313 313 - const numericValue = parseNumericAnswer(textValue); 314 314 - 315 315 - if (numericValue === null) { 271 271 + case "agreement_required": 272 272 + case "invalid_agreement": 273 273 + showToast(t("publicRunner.agreementRequired"), "error"); 274 274 + return false; 275 275 + case "invalid_text_format": 276 276 + showToast(t("publicRunner.invalidTextFormat"), "error"); 277 277 + return false; 278 278 + case "invalid_number": 316 279 showToast(t("publicRunner.invalidNumber"), "error"); 317 280 return false; 318 318 - } 319 319 - 320 320 - if (!config.allowFloat && !Number.isInteger(numericValue)) { 281 281 + case "whole_number_required": 321 282 showToast(t("publicRunner.wholeNumberRequired"), "error"); 322 283 return false; 323 323 - } 324 324 - 325 325 - if (config.min !== null && numericValue < config.min) { 284 284 + case "number_below_min": 326 285 showToast( 327 327 - t("publicRunner.numberAtLeast", { min: config.min }), 286 286 + t("publicRunner.numberAtLeast", { min: result.error.min }), 328 287 "error", 329 288 ); 330 289 return false; 331 331 - } 332 332 - 333 333 - if (config.max !== null && numericValue > config.max) { 290 290 + case "number_above_max": 334 291 showToast( 335 335 - t("publicRunner.numberAtMost", { max: config.max }), 292 292 + t("publicRunner.numberAtMost", { max: result.error.max }), 336 293 "error", 337 294 ); 338 295 return false; 339 339 - } 340 340 - 341 341 - return true; 342 342 - } 343 343 - 344 344 - if (currentBlock.type === "LINK") { 345 345 - const textValue = typeof value === "string" ? value.trim() : ""; 346 346 - 347 347 - if (!textValue) { 348 348 - if (!currentBlock.required) { 349 349 - return true; 350 350 - } 351 351 - 352 352 - showToast(t("publicRunner.answerRequired"), "error"); 353 353 - return false; 354 354 - } 355 355 - 356 356 - if (!isValidLinkAnswer(textValue)) { 296 296 + case "invalid_link": 357 297 showToast(t("publicRunner.invalidLink"), "error"); 358 298 return false; 359 359 - } 360 360 - 361 361 - return true; 362 362 - } 363 363 - 364 364 - if (currentBlock.type === "DATE") { 365 365 - const textValue = typeof value === "string" ? value.trim() : ""; 366 366 - 367 367 - if (!textValue) { 368 368 - if (!currentBlock.required) { 369 369 - return true; 370 370 - } 371 371 - 372 372 - showToast(t("publicRunner.answerRequired"), "error"); 373 373 - return false; 374 374 - } 375 375 - 376 376 - if (!isValidDateAnswer(textValue)) { 299 299 + case "invalid_date": 377 300 showToast(t("publicRunner.invalidDate"), "error"); 378 301 return false; 379 379 - } 380 380 - 381 381 - return true; 382 302 } 383 383 - 384 384 - if (currentBlock.type === "AGREEMENT") { 385 385 - const textValue = typeof value === "string" ? value.trim() : ""; 386 386 - 387 387 - if (!textValue) { 388 388 - if (!currentBlock.required) { 389 389 - return true; 390 390 - } 391 391 - 392 392 - showToast(t("publicRunner.agreementRequired"), "error"); 393 393 - return false; 394 394 - } 395 395 - 396 396 - if ( 397 397 - currentBlock.required && 398 398 - textValue !== AGREEMENT_ANSWER_VALUES.AGREED 399 399 - ) { 400 400 - showToast(t("publicRunner.agreementRequired"), "error"); 401 401 - return false; 402 402 - } 403 403 - 404 404 - return ( 405 405 - textValue === AGREEMENT_ANSWER_VALUES.AGREED || 406 406 - textValue === AGREEMENT_ANSWER_VALUES.NOT_AGREED 407 407 - ); 408 408 - } 409 409 - 410 410 - return true; 411 303 }, 412 304 [answers, currentBlock, showToast, t], 413 305 );

+197

lib/answer-validation.test.ts

reviewed

··· 1 1 + import { describe, expect, test } from "bun:test"; 2 2 + 3 3 + import type { SerializedBlock } from "@/lib/blocks"; 4 4 + import { validateAndNormalizeAnswer } from "@/lib/answer-validation"; 5 5 + 6 6 + function createBlock( 7 7 + overrides: Partial<SerializedBlock> & Pick<SerializedBlock, "id" | "type">, 8 8 + ): SerializedBlock { 9 9 + const now = new Date("2026-04-14T00:00:00.000Z"); 10 10 + 11 11 + return { 12 12 + id: overrides.id, 13 13 + formId: "form-1", 14 14 + type: overrides.type, 15 15 + title: overrides.title ?? overrides.id, 16 16 + description: overrides.description ?? "", 17 17 + required: overrides.required ?? false, 18 18 + position: overrides.position ?? 0, 19 19 + createdAt: overrides.createdAt ?? now, 20 20 + updatedAt: overrides.updatedAt ?? now, 21 21 + config: 22 22 + overrides.config ?? 23 23 + (overrides.type === "TEXT" 24 24 + ? { body: "Intro" } 25 25 + : overrides.type === "SINGLE_CHOICE" 26 26 + ? { 27 27 + options: ["yes", "no"], 28 28 + branchRules: [], 29 29 + defaultNextBlockId: null, 30 30 + } 31 31 + : overrides.type === "MULTIPLE_CHOICE" 32 32 + ? { 33 33 + options: ["red", "blue", "green"], 34 34 + branchRules: [], 35 35 + defaultNextBlockId: null, 36 36 + } 37 37 + : overrides.type === "NUMBER" 38 38 + ? { 39 39 + placeholder: "", 40 40 + allowFloat: false, 41 41 + min: null, 42 42 + max: null, 43 43 + branchRules: [], 44 44 + defaultNextBlockId: null, 45 45 + } 46 46 + : overrides.type === "AGREEMENT" 47 47 + ? { 48 48 + label: "I agree", 49 49 + branchRules: [], 50 50 + defaultNextBlockId: null, 51 51 + } 52 52 + : { 53 53 + placeholder: "", 54 54 + validationRegex: null, 55 55 + branchRules: [], 56 56 + defaultNextBlockId: null, 57 57 + }), 58 58 + }; 59 59 + } 60 60 + 61 61 + describe("validateAndNormalizeAnswer", () => { 62 62 + test("normalizes valid text answers", () => { 63 63 + const block = createBlock({ 64 64 + id: "name", 65 65 + type: "SHORT_TEXT", 66 66 + required: true, 67 67 + config: { 68 68 + placeholder: "", 69 69 + validationRegex: null, 70 70 + branchRules: [], 71 71 + defaultNextBlockId: null, 72 72 + }, 73 73 + }); 74 74 + 75 75 + const result = validateAndNormalizeAnswer(block, " Ada "); 76 76 + 77 77 + expect(result.ok).toBe(true); 78 78 + if (!result.ok) { 79 79 + return; 80 80 + } 81 81 + 82 82 + expect(result.value).toBe("Ada"); 83 83 + }); 84 84 + 85 85 + test("rejects text that does not match regex", () => { 86 86 + const block = createBlock({ 87 87 + id: "code", 88 88 + type: "SHORT_TEXT", 89 89 + required: true, 90 90 + config: { 91 91 + placeholder: "", 92 92 + validationRegex: "^[A-Z]+$", 93 93 + branchRules: [], 94 94 + defaultNextBlockId: null, 95 95 + }, 96 96 + }); 97 97 + 98 98 + const result = validateAndNormalizeAnswer(block, "abc"); 99 99 + 100 100 + expect(result.ok).toBe(false); 101 101 + if (result.ok) { 102 102 + return; 103 103 + } 104 104 + 105 105 + expect(result.error.code).toBe("invalid_text_format"); 106 106 + }); 107 107 + 108 108 + test("rejects invalid single-choice options", () => { 109 109 + const block = createBlock({ id: "choice", type: "SINGLE_CHOICE" }); 110 110 + 111 111 + const result = validateAndNormalizeAnswer(block, "maybe"); 112 112 + 113 113 + expect(result.ok).toBe(false); 114 114 + if (result.ok) { 115 115 + return; 116 116 + } 117 117 + 118 118 + expect(result.error.code).toBe("invalid_option"); 119 119 + }); 120 120 + 121 121 + test("deduplicates multiple-choice values", () => { 122 122 + const block = createBlock({ id: "colors", type: "MULTIPLE_CHOICE" }); 123 123 + 124 124 + const result = validateAndNormalizeAnswer(block, ["red", "blue", "red"]); 125 125 + 126 126 + expect(result.ok).toBe(true); 127 127 + if (!result.ok) { 128 128 + return; 129 129 + } 130 130 + 131 131 + expect(JSON.stringify(result.value)).toBe(JSON.stringify(["red", "blue"])); 132 132 + }); 133 133 + 134 134 + test("normalizes valid links", () => { 135 135 + const block = createBlock({ 136 136 + id: "site", 137 137 + type: "LINK", 138 138 + required: true, 139 139 + config: { 140 140 + placeholder: "", 141 141 + branchRules: [], 142 142 + defaultNextBlockId: null, 143 143 + }, 144 144 + }); 145 145 + 146 146 + const result = validateAndNormalizeAnswer(block, "https://example.com"); 147 147 + 148 148 + expect(result.ok).toBe(true); 149 149 + if (!result.ok) { 150 150 + return; 151 151 + } 152 152 + 153 153 + expect(result.value).toBe("https://example.com/"); 154 154 + }); 155 155 + 156 156 + test("enforces required agreement", () => { 157 157 + const block = createBlock({ 158 158 + id: "terms", 159 159 + type: "AGREEMENT", 160 160 + required: true, 161 161 + }); 162 162 + 163 163 + const result = validateAndNormalizeAnswer(block, "not_agreed"); 164 164 + 165 165 + expect(result.ok).toBe(false); 166 166 + if (result.ok) { 167 167 + return; 168 168 + } 169 169 + 170 170 + expect(result.error.code).toBe("agreement_required"); 171 171 + }); 172 172 + 173 173 + test("validates number limits", () => { 174 174 + const block = createBlock({ 175 175 + id: "age", 176 176 + type: "NUMBER", 177 177 + required: true, 178 178 + config: { 179 179 + placeholder: "", 180 180 + allowFloat: false, 181 181 + min: 18, 182 182 + max: 99, 183 183 + branchRules: [], 184 184 + defaultNextBlockId: null, 185 185 + }, 186 186 + }); 187 187 + 188 188 + const result = validateAndNormalizeAnswer(block, "17"); 189 189 + 190 190 + expect(result.ok).toBe(false); 191 191 + if (result.ok) { 192 192 + return; 193 193 + } 194 194 + 195 195 + expect(result.error.code).toBe("number_below_min"); 196 196 + }); 197 197 + });

+230

lib/answer-validation.ts

reviewed

··· 1 1 + import { 2 2 + AGREEMENT_ANSWER_VALUES, 3 3 + isAgreementAnswerValue, 4 4 + isQuestionBlock, 5 5 + isTextAnswerBlock, 6 6 + isValidDateAnswer, 7 7 + isValidLinkAnswer, 8 8 + parseNumericAnswer, 9 9 + type ChoiceBlockConfig, 10 10 + type NumberBlockConfig, 11 11 + type SerializedBlock, 12 12 + type TextAnswerBlockConfig, 13 13 + } from "@/lib/blocks"; 14 14 + import type { AnswerValue } from "@/lib/form-types"; 15 15 + 16 16 + export type AnswerValidationError = 17 17 + | { 18 18 + code: "answer_required"; 19 19 + } 20 20 + | { 21 21 + code: "single_choice_required"; 22 22 + } 23 23 + | { 24 24 + code: "multi_choice_required"; 25 25 + } 26 26 + | { 27 27 + code: "agreement_required"; 28 28 + } 29 29 + | { 30 30 + code: "invalid_text_format"; 31 31 + } 32 32 + | { 33 33 + code: "invalid_option"; 34 34 + } 35 35 + | { 36 36 + code: "invalid_number"; 37 37 + } 38 38 + | { 39 39 + code: "whole_number_required"; 40 40 + } 41 41 + | { 42 42 + code: "number_below_min"; 43 43 + min: number; 44 44 + } 45 45 + | { 46 46 + code: "number_above_max"; 47 47 + max: number; 48 48 + } 49 49 + | { 50 50 + code: "invalid_link"; 51 51 + } 52 52 + | { 53 53 + code: "invalid_date"; 54 54 + } 55 55 + | { 56 56 + code: "invalid_agreement"; 57 57 + }; 58 58 + 59 59 + export type AnswerValidationResult = 60 60 + | { 61 61 + ok: true; 62 62 + value: AnswerValue | undefined; 63 63 + } 64 64 + | { 65 65 + ok: false; 66 66 + error: AnswerValidationError; 67 67 + }; 68 68 + 69 69 + export function validateAndNormalizeAnswer( 70 70 + block: SerializedBlock, 71 71 + rawValue: unknown, 72 72 + ): AnswerValidationResult { 73 73 + if (!isQuestionBlock(block.type)) { 74 74 + return { ok: true, value: undefined }; 75 75 + } 76 76 + 77 77 + if (isTextAnswerBlock(block.type)) { 78 78 + const value = typeof rawValue === "string" ? rawValue.trim() : ""; 79 79 + const validationRegex = (block.config as TextAnswerBlockConfig) 80 80 + .validationRegex; 81 81 + 82 82 + if (!value) { 83 83 + return block.required 84 84 + ? { ok: false, error: { code: "answer_required" } } 85 85 + : { ok: true, value: undefined }; 86 86 + } 87 87 + 88 88 + if (validationRegex && !new RegExp(validationRegex).test(value)) { 89 89 + return { ok: false, error: { code: "invalid_text_format" } }; 90 90 + } 91 91 + 92 92 + return { ok: true, value }; 93 93 + } 94 94 + 95 95 + if (block.type === "SINGLE_CHOICE") { 96 96 + const value = typeof rawValue === "string" ? rawValue.trim() : ""; 97 97 + const options = (block.config as ChoiceBlockConfig).options; 98 98 + 99 99 + if (!value) { 100 100 + return block.required 101 101 + ? { ok: false, error: { code: "single_choice_required" } } 102 102 + : { ok: true, value: undefined }; 103 103 + } 104 104 + 105 105 + if (!options.includes(value)) { 106 106 + return { ok: false, error: { code: "invalid_option" } }; 107 107 + } 108 108 + 109 109 + return { ok: true, value }; 110 110 + } 111 111 + 112 112 + if (block.type === "MULTIPLE_CHOICE") { 113 113 + const values = Array.isArray(rawValue) 114 114 + ? rawValue.filter((value): value is string => typeof value === "string") 115 115 + : []; 116 116 + const options = (block.config as ChoiceBlockConfig).options; 117 117 + const uniqueValues = [ 118 118 + ...new Set(values.map((value) => value.trim()).filter(Boolean)), 119 119 + ]; 120 120 + 121 121 + if (!uniqueValues.length) { 122 122 + return block.required 123 123 + ? { ok: false, error: { code: "multi_choice_required" } } 124 124 + : { ok: true, value: undefined }; 125 125 + } 126 126 + 127 127 + if (!uniqueValues.every((value) => options.includes(value))) { 128 128 + return { ok: false, error: { code: "invalid_option" } }; 129 129 + } 130 130 + 131 131 + return { ok: true, value: uniqueValues }; 132 132 + } 133 133 + 134 134 + if (block.type === "NUMBER") { 135 135 + const value = typeof rawValue === "string" ? rawValue.trim() : ""; 136 136 + const config = block.config as NumberBlockConfig; 137 137 + 138 138 + if (!value) { 139 139 + return block.required 140 140 + ? { ok: false, error: { code: "answer_required" } } 141 141 + : { ok: true, value: undefined }; 142 142 + } 143 143 + 144 144 + const numericValue = parseNumericAnswer(value); 145 145 + 146 146 + if (numericValue === null) { 147 147 + return { ok: false, error: { code: "invalid_number" } }; 148 148 + } 149 149 + 150 150 + if (!config.allowFloat && !Number.isInteger(numericValue)) { 151 151 + return { ok: false, error: { code: "whole_number_required" } }; 152 152 + } 153 153 + 154 154 + if (config.min !== null && numericValue < config.min) { 155 155 + return { 156 156 + ok: false, 157 157 + error: { 158 158 + code: "number_below_min", 159 159 + min: config.min, 160 160 + }, 161 161 + }; 162 162 + } 163 163 + 164 164 + if (config.max !== null && numericValue > config.max) { 165 165 + return { 166 166 + ok: false, 167 167 + error: { 168 168 + code: "number_above_max", 169 169 + max: config.max, 170 170 + }, 171 171 + }; 172 172 + } 173 173 + 174 174 + return { ok: true, value: String(numericValue) }; 175 175 + } 176 176 + 177 177 + if (block.type === "LINK") { 178 178 + const value = typeof rawValue === "string" ? rawValue.trim() : ""; 179 179 + 180 180 + if (!value) { 181 181 + return block.required 182 182 + ? { ok: false, error: { code: "answer_required" } } 183 183 + : { ok: true, value: undefined }; 184 184 + } 185 185 + 186 186 + if (!isValidLinkAnswer(value)) { 187 187 + return { ok: false, error: { code: "invalid_link" } }; 188 188 + } 189 189 + 190 190 + return { ok: true, value: new URL(value).toString() }; 191 191 + } 192 192 + 193 193 + if (block.type === "DATE") { 194 194 + const value = typeof rawValue === "string" ? rawValue.trim() : ""; 195 195 + 196 196 + if (!value) { 197 197 + return block.required 198 198 + ? { ok: false, error: { code: "answer_required" } } 199 199 + : { ok: true, value: undefined }; 200 200 + } 201 201 + 202 202 + if (!isValidDateAnswer(value)) { 203 203 + return { ok: false, error: { code: "invalid_date" } }; 204 204 + } 205 205 + 206 206 + return { ok: true, value }; 207 207 + } 208 208 + 209 209 + if (block.type === "AGREEMENT") { 210 210 + const value = typeof rawValue === "string" ? rawValue.trim() : ""; 211 211 + 212 212 + if (!value) { 213 213 + return block.required 214 214 + ? { ok: false, error: { code: "agreement_required" } } 215 215 + : { ok: true, value: undefined }; 216 216 + } 217 217 + 218 218 + if (!isAgreementAnswerValue(value)) { 219 219 + return { ok: false, error: { code: "invalid_agreement" } }; 220 220 + } 221 221 + 222 222 + if (block.required && value !== AGREEMENT_ANSWER_VALUES.AGREED) { 223 223 + return { ok: false, error: { code: "agreement_required" } }; 224 224 + } 225 225 + 226 226 + return { ok: true, value }; 227 227 + } 228 228 + 229 229 + return { ok: true, value: undefined }; 230 230 + }

+39 -165

lib/forms.ts

reviewed

··· 12 12 AGREEMENT_ANSWER_VALUES, 13 13 blockTypeSchema, 14 14 getDefaultBlockConfig, 15 15 - isAgreementAnswerValue, 16 15 isChoiceBlock, 17 16 isQuestionBlock, 18 18 - isTextAnswerBlock, 19 19 - isValidDateAnswer, 20 20 - isValidLinkAnswer, 21 17 parseBlockConfig, 22 22 - parseNumericAnswer, 23 18 serializeBlock, 24 19 type BlockConfig, 25 20 type ChoiceBlockConfig, 26 26 - type NumberBlockConfig, 27 21 type SerializedBlock, 28 28 - type TextAnswerBlockConfig, 29 22 } from "@/lib/blocks"; 30 23 import { 31 24 getBranchValidationIssueI18n, 32 25 validateBranchingGraph, 33 26 resolveNextBlockId, 34 27 } from "@/lib/branching"; 28 28 + import { validateAndNormalizeAnswer } from "@/lib/answer-validation"; 35 29 import { db } from "@/lib/db"; 36 30 import { AppError } from "@/lib/errors"; 37 31 import { getLocalizedCompletionDefaults } from "@/lib/form-defaults"; ··· 398 392 block: SerializedBlock, 399 393 rawValue: unknown, 400 394 ): string | string[] | undefined { 401 401 - const config = block.config; 402 395 const questionLabel = getQuestionLabel(block); 396 396 + const result = validateAndNormalizeAnswer(block, rawValue); 403 397 404 404 - if (!isQuestionBlock(block.type)) { 405 405 - return undefined; 398 398 + if (result.ok) { 399 399 + return result.value; 406 400 } 407 401 408 408 - if (isTextAnswerBlock(block.type)) { 409 409 - const value = typeof rawValue === "string" ? rawValue.trim() : ""; 410 410 - const validationRegex = (config as TextAnswerBlockConfig).validationRegex; 402 402 + switch (result.error.code) { 403 403 + case "answer_required": 404 404 + if (block.type === FORM_BLOCK_TYPES.NUMBER) { 405 405 + throw new AppError( 406 406 + `Please enter a number for “${questionLabel}”.`, 407 407 + 422, 408 408 + ); 409 409 + } 411 410 412 412 - if (!value) { 413 413 - if (block.required) { 414 414 - throw new AppError(`Please answer “${questionLabel}”.`, 422); 411 411 + if (block.type === FORM_BLOCK_TYPES.LINK) { 412 412 + throw new AppError(`Please enter a link for “${questionLabel}”.`, 422); 415 413 } 416 414 417 417 - return undefined; 418 418 - } 415 415 + if (block.type === FORM_BLOCK_TYPES.DATE) { 416 416 + throw new AppError(`Please enter a date for “${questionLabel}”.`, 422); 417 417 + } 419 418 420 420 - if (validationRegex && !new RegExp(validationRegex).test(value)) { 419 419 + throw new AppError(`Please answer “${questionLabel}”.`, 422); 420 420 + case "single_choice_required": 421 421 throw new AppError( 422 422 - `Please use a valid format for “${questionLabel}”.`, 422 422 + `Please choose an option for “${questionLabel}”.`, 423 423 422, 424 424 ); 425 425 - } 426 426 - 427 427 - return value; 428 428 - } 429 429 - 430 430 - if (block.type === FORM_BLOCK_TYPES.SINGLE_CHOICE) { 431 431 - const value = typeof rawValue === "string" ? rawValue.trim() : ""; 432 432 - const options = (config as ChoiceBlockConfig).options; 433 433 - 434 434 - if (!value) { 435 435 - if (block.required) { 436 436 - throw new AppError( 437 437 - `Please choose an option for “${questionLabel}”.`, 438 438 - 422, 439 439 - ); 440 440 - } 441 441 - 442 442 - return undefined; 443 443 - } 444 444 - 445 445 - if (!options.includes(value)) { 425 425 + case "multi_choice_required": 426 426 + throw new AppError( 427 427 + `Please choose at least one option for “${questionLabel}”.`, 428 428 + 422, 429 429 + ); 430 430 + case "agreement_required": 431 431 + throw new AppError(`Agreement is required for “${questionLabel}”.`, 422); 432 432 + case "invalid_text_format": 446 433 throw new AppError( 447 447 - `Invalid option submitted for “${questionLabel}”.`, 434 434 + `Please use a valid format for “${questionLabel}”.`, 448 435 422, 449 436 ); 450 450 - } 451 451 - 452 452 - return value; 453 453 - } 454 454 - 455 455 - if (block.type === FORM_BLOCK_TYPES.MULTIPLE_CHOICE) { 456 456 - const values = Array.isArray(rawValue) 457 457 - ? rawValue.filter((value): value is string => typeof value === "string") 458 458 - : []; 459 459 - const options = (config as ChoiceBlockConfig).options; 460 460 - const uniqueValues = [ 461 461 - ...new Set(values.map((value) => value.trim()).filter(Boolean)), 462 462 - ]; 463 463 - 464 464 - if (!uniqueValues.length) { 465 465 - if (block.required) { 466 466 - throw new AppError( 467 467 - `Please choose at least one option for “${questionLabel}”.`, 468 468 - 422, 469 469 - ); 470 470 - } 471 471 - 472 472 - return undefined; 473 473 - } 474 474 - 475 475 - if (!uniqueValues.every((value) => options.includes(value))) { 437 437 + case "invalid_option": 476 438 throw new AppError( 477 439 `Invalid option submitted for “${questionLabel}”.`, 478 440 422, 479 441 ); 480 480 - } 481 481 - 482 482 - return uniqueValues; 483 483 - } 484 484 - 485 485 - if (block.type === FORM_BLOCK_TYPES.NUMBER) { 486 486 - const value = typeof rawValue === "string" ? rawValue.trim() : ""; 487 487 - const numberConfig = config as NumberBlockConfig; 488 488 - 489 489 - if (!value) { 490 490 - if (block.required) { 491 491 - throw new AppError( 492 492 - `Please enter a number for “${questionLabel}”.`, 493 493 - 422, 494 494 - ); 495 495 - } 496 496 - 497 497 - return undefined; 498 498 - } 499 499 - 500 500 - const numericValue = parseNumericAnswer(value); 501 501 - 502 502 - if (numericValue === null) { 442 442 + case "invalid_number": 503 443 throw new AppError( 504 444 `Please enter a valid number for “${questionLabel}”.`, 505 445 422, 506 446 ); 507 507 - } 508 508 - 509 509 - if (!numberConfig.allowFloat && !Number.isInteger(numericValue)) { 447 447 + case "whole_number_required": 510 448 throw new AppError( 511 449 `Please enter a whole number for “${questionLabel}”.`, 512 450 422, 513 451 ); 514 514 - } 515 515 - 516 516 - if (numberConfig.min !== null && numericValue < numberConfig.min) { 452 452 + case "number_below_min": 517 453 throw new AppError( 518 518 - `Please enter a number greater than or equal to ${numberConfig.min} for “${questionLabel}”.`, 454 454 + `Please enter a number greater than or equal to ${result.error.min} for “${questionLabel}”.`, 519 455 422, 520 456 ); 521 521 - } 522 522 - 523 523 - if (numberConfig.max !== null && numericValue > numberConfig.max) { 457 457 + case "number_above_max": 524 458 throw new AppError( 525 525 - `Please enter a number less than or equal to ${numberConfig.max} for “${questionLabel}”.`, 459 459 + `Please enter a number less than or equal to ${result.error.max} for “${questionLabel}”.`, 526 460 422, 527 461 ); 528 528 - } 529 529 - 530 530 - return String(numericValue); 531 531 - } 532 532 - 533 533 - if (block.type === FORM_BLOCK_TYPES.LINK) { 534 534 - const value = typeof rawValue === "string" ? rawValue.trim() : ""; 535 535 - 536 536 - if (!value) { 537 537 - if (block.required) { 538 538 - throw new AppError(`Please enter a link for “${questionLabel}”.`, 422); 539 539 - } 540 540 - 541 541 - return undefined; 542 542 - } 543 543 - 544 544 - if (!isValidLinkAnswer(value)) { 462 462 + case "invalid_link": 545 463 throw new AppError( 546 464 `Please enter a valid link for “${questionLabel}”.`, 547 465 422, 548 466 ); 549 549 - } 550 550 - 551 551 - return new URL(value).toString(); 552 552 - } 553 553 - 554 554 - if (block.type === FORM_BLOCK_TYPES.DATE) { 555 555 - const value = typeof rawValue === "string" ? rawValue.trim() : ""; 556 556 - 557 557 - if (!value) { 558 558 - if (block.required) { 559 559 - throw new AppError(`Please enter a date for “${questionLabel}”.`, 422); 560 560 - } 561 561 - 562 562 - return undefined; 563 563 - } 564 564 - 565 565 - if (!isValidDateAnswer(value)) { 467 467 + case "invalid_date": 566 468 throw new AppError( 567 469 `Please enter a valid date for “${questionLabel}”.`, 568 470 422, 569 471 ); 570 570 - } 571 571 - 572 572 - return value; 573 573 - } 574 574 - 575 575 - if (block.type === FORM_BLOCK_TYPES.AGREEMENT) { 576 576 - const value = typeof rawValue === "string" ? rawValue.trim() : ""; 577 577 - 578 578 - if (!value) { 579 579 - if (block.required) { 580 580 - throw new AppError( 581 581 - `Agreement is required for “${questionLabel}”.`, 582 582 - 422, 583 583 - ); 584 584 - } 585 585 - 586 586 - return undefined; 587 587 - } 588 588 - 589 589 - if (!isAgreementAnswerValue(value)) { 472 472 + case "invalid_agreement": 590 473 throw new AppError( 591 474 `Invalid agreement value submitted for “${questionLabel}”.`, 592 475 422, 593 476 ); 594 594 - } 595 595 - 596 596 - if (block.required && value !== AGREEMENT_ANSWER_VALUES.AGREED) { 597 597 - throw new AppError(`Agreement is required for “${questionLabel}”.`, 422); 598 598 - } 599 599 - 600 600 - return value; 601 477 } 602 602 - 603 603 - return undefined; 604 478 } 605 479 606 480 function parseSnapshotBlocks(response: ResponseRecord): SerializedBlock[] {