|
1 | | -import { silentValidator } from '@aeriajs/validation'; |
| 1 | +import { validate } from '@aeriajs/validation'; |
2 | 2 | import { createCase } from '../../benchmarks'; |
3 | 3 |
|
4 | 4 | const schema = { |
@@ -50,58 +50,38 @@ const schema = { |
50 | 50 | } as const; |
51 | 51 |
|
52 | 52 | createCase('aeria', 'parseSafe', () => { |
53 | | - const [_, validate] = silentValidator(schema, { |
54 | | - extraneous: true, |
55 | | - filterOutExtraneous: true, |
56 | | - coerce: true, |
57 | | - }); |
58 | | - |
59 | | - return (data: any) => { |
60 | | - const result = validate(data); |
61 | | - if (!result) { |
62 | | - throw new Error(); |
63 | | - } |
64 | | - |
65 | | - return result; |
| 53 | + return (data: unknown) => { |
| 54 | + return validate(data, schema, { |
| 55 | + throwOnError: true, |
| 56 | + tolerateExtraneous: true, |
| 57 | + }).result; |
66 | 58 | }; |
67 | 59 | }); |
68 | 60 |
|
69 | 61 | createCase('aeria', 'parseStrict', () => { |
70 | | - const [_, validate] = silentValidator(schema, { |
71 | | - coerce: true, |
72 | | - }); |
73 | | - |
74 | | - return (data: any) => { |
75 | | - const result = validate(data); |
76 | | - if (!result) { |
77 | | - throw new Error(); |
78 | | - } |
79 | | - |
80 | | - return result; |
| 62 | + return (data: unknown) => { |
| 63 | + return validate(data, schema, { |
| 64 | + throwOnError: true, |
| 65 | + }).result; |
81 | 66 | }; |
82 | 67 | }); |
83 | 68 |
|
84 | 69 | createCase('aeria', 'assertLoose', () => { |
85 | | - const [_, validate] = silentValidator(schema, { |
86 | | - extraneous: true, |
87 | | - }); |
88 | | - |
89 | | - return (data: any) => { |
90 | | - if (!validate(data)) { |
91 | | - throw new Error(); |
92 | | - } |
| 70 | + return (data: unknown) => { |
| 71 | + validate(data, schema, { |
| 72 | + throwOnError: true, |
| 73 | + tolerateExtraneous: true, |
| 74 | + }); |
93 | 75 |
|
94 | 76 | return true; |
95 | 77 | }; |
96 | 78 | }); |
97 | 79 |
|
98 | 80 | createCase('aeria', 'assertStrict', () => { |
99 | | - const [_, validate] = silentValidator(schema); |
100 | | - |
101 | | - return (data: any) => { |
102 | | - if (!validate(data)) { |
103 | | - throw new Error(); |
104 | | - } |
| 81 | + return (data: unknown) => { |
| 82 | + validate(data, schema, { |
| 83 | + throwOnError: true, |
| 84 | + }); |
105 | 85 |
|
106 | 86 | return true; |
107 | 87 | }; |
|
0 commit comments