Skip to content

Commit

Permalink
refactor: changes to vine validator options normalization
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Nov 22, 2023
1 parent e07cb69 commit e85356b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/vine/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,16 @@ export class VineValidator<
? [options?: ValidationOptions<MetaData> | undefined]
: [options: ValidationOptions<MetaData>]
): Promise<Infer<Schema>> {
if (options?.meta && this.#metaDataValidator) {
this.#metaDataValidator(options.meta)
let normalizedOptions = options || ({} as ValidationOptions<MetaData>)
if (normalizedOptions.meta && this.#metaDataValidator) {
this.#metaDataValidator(normalizedOptions.meta)
}

const errorReporter = options?.errorReporter || this.errorReporter
const messagesProvider = options?.messagesProvider || this.messagesProvider
const errorReporter = normalizedOptions.errorReporter || this.errorReporter
const messagesProvider = normalizedOptions.messagesProvider || this.messagesProvider
return this.#validateFn(
data,
options?.meta || {},
normalizedOptions.meta || {},
this.#refs,
messagesProvider,
errorReporter()
Expand Down

0 comments on commit e85356b

Please sign in to comment.