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",

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');

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();
 });

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',
 });
 

arktype/src/arktype.ts

@@ -1,41 +1,31 @@
 import { FieldError, FieldErrors } from 'react-hook-form';
 import { toNestErrors, validateFieldsNatively } from '@hookform/resolvers';
 import type { Resolver } from './types';
-import { Problems } from 'arktype';
+import { ArkErrors } from 'arktype';
 
-const parseErrorSchema = (e: Problems) => {
-  const errors: Record<string, FieldError> = {};
-  for (; e.length; ) {
-    const error = e[0];
-    const _path = error.path.join('.');
-
-    if (!errors[_path]) {
-      errors[_path] = { message: error.message, type: error.code };
-    }
-
-    // @ts-expect-error - false positive Property 'shift' does not exist on type 'Problems'.
-    e.shift();
-  }
-
-  return errors;
+const parseErrorSchema = (e: ArkErrors): Record<string, FieldError> => {
+  // copy code to type to match FieldError shape
+  e.forEach((e) => Object.assign(e, { type: e.code }));
+  // need to cast here because TS doesn't understand we added the type field
+  return e.byPath as never;
 };
 
 export const arktypeResolver: Resolver =
   (schema, _schemaOptions, resolverOptions = {}) =>
   (values, _, options) => {
-    const result = schema(values);
+    const out = schema(values);
 
-    if (result.problems) {
+    if (out instanceof ArkErrors) {
       return {
         values: {},
-        errors: toNestErrors(parseErrorSchema(result.problems), options),
+        errors: toNestErrors(parseErrorSchema(out), options),
       };
     }
 
     options.shouldUseNativeValidation && validateFieldsNatively({}, options);
 
     return {
       errors: {} as FieldErrors,
-      values: resolverOptions.raw ? values : result.data,
+      values: resolverOptions.raw ? values : out,
     };
   };

arktype/src/types.ts

@@ -3,7 +3,7 @@ import { Type } from 'arktype';
 
 export type Resolver = <T extends Type<any>>(
   schema: T,
-  schemaOptions?: never,
+  schemaOptions?: undefined,
   factoryOptions?: {
     /**
      * Return the raw input values rather than the parsed values.

package.json

@@ -233,7 +233,7 @@
     "@vitejs/plugin-react": "^4.0.4",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
-    "arktype": "1.0.19-alpha",
+    "arktype": "2.0.0-dev.14",
     "check-export-map": "^1.3.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",