Skip to content

Commit

Permalink
feat: Type Errors as NonEmptyArray (gcanti#670)
Browse files Browse the repository at this point in the history
  • Loading branch information
@devkat
devkat committed Nov 2, 2022
1 parent e619fb1 commit f584c79
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion docs/modules/index.ts.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ Added in v1.0.0
**Signature**
```ts
export interface Errors extends Array<ValidationError> {}
export interface Errors extends NonEmptyArray<ValidationError> {}
```
Added in v1.0.0
Expand Down
34 changes: 17 additions & 17 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export interface ValidationError {
* @category Decode error
* @since 1.0.0
*/
export interface Errors extends Array<ValidationError> {}
export interface Errors extends NonEmptyArray<ValidationError> {}

/**
* @category Decode error
Expand Down Expand Up @@ -340,7 +340,7 @@ function enumerableRecord<D extends Mixed, C extends Mixed>(
}
const o = e.right
const a: { [key: string]: any } = {}
const errors: Errors = []
const errors: ValidationError[] = []
let changed = false
for (let i = 0; i < len; i++) {
const k = keys[i]
Expand All @@ -354,7 +354,7 @@ function enumerableRecord<D extends Mixed, C extends Mixed>(
a[k] = vok
}
}
return errors.length > 0 ? failures(errors) : success((changed || Object.keys(o).length !== len ? a : o) as any)
return isNonEmpty(errors) ? failures(errors) : success((changed || Object.keys(o).length !== len ? a : o) as any)
},
codomain.encode === identity
? identity
Expand Down Expand Up @@ -405,7 +405,7 @@ function nonEnumerableRecord<D extends Mixed, C extends Mixed>(
(u, c) => {
if (UnknownRecord.is(u)) {
const a: { [key: string]: any } = {}
const errors: Errors = []
const errors: ValidationError[] = []
const keys = Object.keys(u)
const len = keys.length
let changed = false
Expand All @@ -429,7 +429,7 @@ function nonEnumerableRecord<D extends Mixed, C extends Mixed>(
}
}
}
return errors.length > 0 ? failures(errors) : success((changed ? a : u) as any)
return isNonEmpty(errors) ? failures(errors) : success((changed ? a : u) as any)
}
if (isAnyC(codomain) && Array.isArray(u)) {
return success(u)
Expand Down Expand Up @@ -1278,7 +1278,7 @@ export function array<C extends Mixed>(item: C, name = `Array<${item.name}>`): A
const us = e.right
const len = us.length
let as: Array<TypeOf<C>> = us
const errors: Errors = []
const errors: ValidationError[] = []
for (let i = 0; i < len; i++) {
const ui = us[i]
const result = item.validate(ui, appendContext(c, String(i), item, ui))
Expand All @@ -1294,7 +1294,7 @@ export function array<C extends Mixed>(item: C, name = `Array<${item.name}>`): A
}
}
}
return errors.length > 0 ? failures(errors) : success(as)
return isNonEmpty(errors) ? failures(errors) : success(as)
},
item.encode === identity ? identity : (a) => a.map(item.encode),
item
Expand Down Expand Up @@ -1356,7 +1356,7 @@ export function type<P extends Props>(props: P, name: string = getInterfaceTypeN
}
const o = e.right
let a = o
const errors: Errors = []
const errors: ValidationError[] = []
for (let i = 0; i < len; i++) {
const k = keys[i]
const ak = a[k]
Expand All @@ -1375,7 +1375,7 @@ export function type<P extends Props>(props: P, name: string = getInterfaceTypeN
}
}
}
return errors.length > 0 ? failures(errors) : success(a as any)
return isNonEmpty(errors) ? failures(errors) : success(a as any)
},
useIdentity(types)
? identity
Expand Down Expand Up @@ -1452,7 +1452,7 @@ export function partial<P extends Props>(
}
const o = e.right
let a = o
const errors: Errors = []
const errors: ValidationError[] = []
for (let i = 0; i < len; i++) {
const k = keys[i]
const ak = a[k]
Expand All @@ -1473,7 +1473,7 @@ export function partial<P extends Props>(
}
}
}
return errors.length > 0 ? failures(errors) : success(a as any)
return isNonEmpty(errors) ? failures(errors) : success(a as any)
},
useIdentity(types)
? identity
Expand Down Expand Up @@ -1616,7 +1616,7 @@ export function union<CS extends [Mixed, Mixed, ...Array<Mixed>]>(
name,
(u): u is TypeOf<CS[number]> => codecs.some((type) => type.is(u)),
(u, c) => {
const errors: Errors = []
const errors: ValidationError[] = []
for (let i = 0; i < codecs.length; i++) {
const codec = codecs[i]
const result = codec.validate(u, appendContext(c, String(i), codec, u))
Expand All @@ -1626,7 +1626,7 @@ export function union<CS extends [Mixed, Mixed, ...Array<Mixed>]>(
return success(result.right)
}
}
return failures(errors)
return failures(errors as Errors)
},
useIdentity(codecs)
? identity
Expand Down Expand Up @@ -1719,7 +1719,7 @@ export function intersection<CS extends [Mixed, Mixed, ...Array<Mixed>]>(
? success
: (u, c) => {
const us: Array<unknown> = []
const errors: Errors = []
const errors: ValidationError[] = []
for (let i = 0; i < len; i++) {
const codec = codecs[i]
const result = codec.validate(u, appendContext(c, String(i), codec, u))
Expand All @@ -1729,7 +1729,7 @@ export function intersection<CS extends [Mixed, Mixed, ...Array<Mixed>]>(
us.push(result.right)
}
}
return errors.length > 0 ? failures(errors) : success(mergeAll(u, us))
return isNonEmpty(errors) ? failures(errors) : success(mergeAll(u, us))
},
codecs.length === 0
? identity
Expand Down Expand Up @@ -1825,7 +1825,7 @@ export function tuple<CS extends [Mixed, ...Array<Mixed>]>(
}
const us = e.right
let as: Array<any> = us.length > len ? us.slice(0, len) : us // strip additional components
const errors: Errors = []
const errors: ValidationError[] = []
for (let i = 0; i < len; i++) {
const a = us[i]
const type = codecs[i]
Expand All @@ -1843,7 +1843,7 @@ export function tuple<CS extends [Mixed, ...Array<Mixed>]>(
}
}
}
return errors.length > 0 ? failures(errors) : success(as)
return isNonEmpty(errors) ? failures(errors) : success(as)
},
useIdentity(codecs) ? identity : (a) => codecs.map((type, i) => type.encode(a[i])),
codecs
Expand Down

0 comments on commit f584c79

Please sign in to comment.