From 2cca1ae860c6f1ab6a994d663e12c3ce634bdfb6 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Thu, 27 Aug 2026 23:12:43 -0400 Subject: [PATCH] refactor(core): use nonthrowing URL parsing (#45726) --- packages/core/src/form.ts | 11 +---------- packages/core/src/project.ts | 11 +++++------ packages/core/test/form.test.ts | 11 +++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/core/src/form.ts b/packages/core/src/form.ts index 9c54ddd6630..a3ef68994c8 100644 --- a/packages/core/src/form.ts +++ b/packages/core/src/form.ts @@ -311,7 +311,7 @@ function validateField(field: InputField, value: Form.Value): string | undefined } if (field.format === "email" && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) return `Expected email for form field: ${field.key}` - if (field.format === "uri" && !isUri(value)) return `Expected URI for form field: ${field.key}` + if (field.format === "uri" && !URL.canParse(value)) return `Expected URI for form field: ${field.key}` if (field.format === "date" && !isDate(value)) return `Expected date for form field: ${field.key}` if (field.format === "date-time" && !isDateTime(value)) return `Expected date-time for form field: ${field.key}` if (field.options && !field.custom && !field.options.some((option) => option.value === value)) { @@ -347,15 +347,6 @@ function isStringArray(value: Form.Value): value is ReadonlyArray { return Array.isArray(value) && value.every((item): item is string => typeof item === "string") } -function isUri(value: string) { - try { - new URL(value) - return true - } catch { - return false - } -} - function isDate(value: string) { if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) return false const date = new Date(`${value}T00:00:00.000Z`) diff --git a/packages/core/src/project.ts b/packages/core/src/project.ts index c2e274c9d5f..854f3bb5300 100644 --- a/packages/core/src/project.ts +++ b/packages/core/src/project.ts @@ -256,15 +256,14 @@ const layer = Layer.effect( const value = input.trim() if (!value) return undefined - try { - const parsed = new URL(value) + const parsed = URL.parse(value) + if (parsed) { if (parsed.protocol === "file:") return undefined return parts(parsed.hostname, parsed.pathname) - } catch { - const scp = value.match(/^([^@/:]+@)?([^/:]+):(.+)$/) - if (scp) return parts(scp[2], scp[3]) - return undefined } + const scp = value.match(/^([^@/:]+@)?([^/:]+):(.+)$/) + if (scp) return parts(scp[2], scp[3]) + return undefined } function parts(host: string, name: string) { diff --git a/packages/core/test/form.test.ts b/packages/core/test/form.test.ts index 5ee579668be..29c790b4b53 100644 --- a/packages/core/test/form.test.ts +++ b/packages/core/test/form.test.ts @@ -19,6 +19,17 @@ const input = { } satisfies Form.CreateInput describe("Form", () => { + it.effect("validates absolute URI formats without restricting schemes", () => + Effect.sync(() => { + const fields = [{ key: "uri", type: "string", format: "uri" }] satisfies ReadonlyArray + + expect(Form.validateAnswer(fields, { uri: "https://example.com/path" })).toBeUndefined() + expect(Form.validateAnswer(fields, { uri: "mailto:user@example.com" })).toBeUndefined() + expect(Form.validateAnswer(fields, { uri: "relative/path" })).toBe("Expected URI for form field: uri") + expect(Form.validateAnswer(fields, { uri: "://invalid" })).toBe("Expected URI for form field: uri") + }), + ) + it.effect("returns a terminal cancelled state from ask", () => Effect.gen(function* () { const service = yield* Form.Service