Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"nanoid": "^5.1.6",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-hook-form": "7.62.0",
"react-hook-form": "7.66.1",
"regexp.escape": "^2.0.1",
"remark-gfm": "^4.0.1",
"remark-math": "^6.0.0",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 28 additions & 15 deletions renderer/src/common/lib/zod-v4-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
import { ZodError, ZodType } from 'zod/v4'
import type { FieldError, FieldErrors, FieldValues } from 'react-hook-form'
import type {
FieldError,
FieldErrors,
FieldValues,
Resolver,
ResolverOptions,
ResolverResult,
} from 'react-hook-form'

const zodToHookFormErrors = (zodError: ZodError): FieldErrors => {
const errors: FieldErrors = {}
const zodToHookFormErrors = <TFieldValues extends FieldValues>(
zodError: ZodError
): FieldErrors<TFieldValues> => {
const errors: Record<string, FieldError> = {}

for (const issue of zodError.issues) {
const path = issue.path.join('.') || 'root'
Expand All @@ -12,28 +21,33 @@ const zodToHookFormErrors = (zodError: ZodError): FieldErrors => {
} as FieldError
}

return errors
return errors as FieldErrors<TFieldValues>
}

export const zodV4Resolver = (schema: ZodType) => {
return async (
values: FieldValues
): Promise<{
values: FieldValues
errors: FieldErrors
}> => {
export const zodV4Resolver =
<TFieldValues extends FieldValues = FieldValues, TContext = unknown>(
schema: ZodType
): Resolver<TFieldValues, TContext> =>
async (
values: TFieldValues,
_context?: TContext,
_options?: ResolverOptions<TFieldValues>
): Promise<ResolverResult<TFieldValues>> => {
// _context and _options are unused but required by the Resolver signature
void _context
void _options
try {
const result = await schema.safeParseAsync(values)

if (result.success) {
return {
values: result.data as FieldValues,
values: result.data as TFieldValues,
errors: {},
}
} else {
return {
values: {},
errors: zodToHookFormErrors(result.error),
errors: zodToHookFormErrors<TFieldValues>(result.error),
}
}
} catch (error) {
Expand All @@ -45,8 +59,7 @@ export const zodV4Resolver = (schema: ZodType) => {
type: 'unknown',
message: 'An unknown error occurred during validation',
} as FieldError,
},
} as FieldErrors<TFieldValues>,
}
}
}
}