refactor(core): use nonthrowing URL parsing (#45726)

This commit is contained in:
Kit Langton
2026-08-27 23:12:43 -04:00
committed by GitHub
Unverified
parent becf5bf482
commit 2cca1ae860
3 changed files with 17 additions and 16 deletions
+1 -10
View File
@@ -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<string> {
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`)
+5 -6
View File
@@ -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) {
+11
View File
@@ -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<Form.Field>
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