feat: migrate arktype resolver to v2 (#686)

react-hook-form · Jun 4, 2024 · c53864f · c53864f
1 parent 767184d
commit c53864f
Show file tree

Hide file tree

Showing 9 changed files with 4,983 additions and 3,784 deletions.
diff --git a/arktype/package.json b/arktype/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hookform/resolvers/arktype",
   "amdName": "hookformResolversArktype",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "private": true,
   "description": "React Hook Form validation resolver: arktype",
   "main": "dist/arktype.js",

diff --git a/arktype/src/__tests__/Form-native-validation.tsx b/arktype/src/__tests__/Form-native-validation.tsx
@@ -57,14 +57,14 @@ test("form's native validation with Zod", async () => {
   usernameField = screen.getByPlaceholderText(/username/i) as HTMLInputElement;
   expect(usernameField.validity.valid).toBe(false);
   expect(usernameField.validationMessage).toBe(
-    'username must be more than 1 characters (was 0)',
+    'username must be more than length 1 (was 0)',
   );
 
   // password
   passwordField = screen.getByPlaceholderText(/password/i) as HTMLInputElement;
   expect(passwordField.validity.valid).toBe(false);
   expect(passwordField.validationMessage).toBe(
-    'password must be more than 1 characters (was 0)',
+    'password must be more than length 1 (was 0)',
   );
 
   await user.type(screen.getByPlaceholderText(/username/i), 'joe');

diff --git a/arktype/src/__tests__/Form.tsx b/arktype/src/__tests__/Form.tsx
@@ -47,10 +47,10 @@ test("form's validation with arkType and TypeScript's integration", async () =>
   await user.click(screen.getByText(/submit/i));
 
   expect(
-    screen.getByText('username must be more than 1 characters (was 0)'),
+    screen.getByText('username must be more than length 1 (was 0)'),
   ).toBeInTheDocument();
   expect(
-    screen.getByText('password must be more than 1 characters (was 0)'),
+    screen.getByText('password must be more than length 1 (was 0)'),
   ).toBeInTheDocument();
   expect(handleSubmit).not.toHaveBeenCalled();
 });
diff --git a/arktype/src/__tests__/__fixtures__/data.ts b/arktype/src/__tests__/__fixtures__/data.ts
@@ -1,22 +1,20 @@
 import { Field, InternalFieldName } from 'react-hook-form';
-import { type, arrayOf, union } from 'arktype';
+import { type } from 'arktype';
 
 export const schema = type({
   username: 'string>2',
-  password: union(['string>8', '&', '/.*[A-Za-z].*/'], ['/.*\\d.*/']),
+  password: '/.*[A-Za-z].*/>8|/.*\\d.*/',
   repeatPassword: 'string>1',
-  accessToken: union('string', 'number'),
+  accessToken: 'string|number',
   birthYear: '1900<number<2013',
   email: 'email',
-  tags: arrayOf('string'),
+  tags: 'string[]',
   enabled: 'boolean',
   url: 'string>1',
-  'like?': arrayOf(
-    type({
-      id: 'number',
-      name: 'string>3',
-    }),
-  ),
+  'like?': type({
+    id: 'number',
+    name: 'string>3',
+  }).array(),
   dateStr: 'Date',
 });