@hookform/resolvers 5.9.1 → 6.0.0

package/effect-ts/src/effect-ts.ts

@@ -1,7 +1,6 @@
 import { toNestErrors, validateFieldsNatively } from '@hookform/resolvers';
-import { Effect, Schema } from 'effect';
-import { ArrayFormatter, decodeUnknown } from 'effect/ParseResult';
-import { ParseOptions } from 'effect/SchemaAST';
+import { Effect, Schema, SchemaIssue } from 'effect';
+import type { ParseOptions } from 'effect/SchemaAST';
 import {
   type FieldError,
   FieldValues,
@@ -9,8 +8,37 @@ import {
   appendErrors,
 } from 'react-hook-form';
 
+type Issue = { path: PropertyKey[]; message: string; type: string };
+
+const formatIssue = SchemaIssue.makeFormatterStandardSchemaV1();
+
+// Flattens the issue tree like `makeFormatterStandardSchemaV1` does, but keeps
+// the `_tag` of the failing node so it can be reported as the error `type`.
+const flattenIssue = (
+  issue: SchemaIssue.Issue,
+  path: PropertyKey[],
+): Issue[] => {
+  switch (issue._tag) {
+    case 'Pointer':
+      return flattenIssue(issue.issue, [...path, ...issue.path]);
+    case 'Encoding':
+      return flattenIssue(issue.issue, path);
+    case 'Composite':
+    case 'AnyOf':
+      if (issue.issues.length) {
+        return issue.issues.flatMap((issue) => flattenIssue(issue, path));
+      }
+  }
+
+  return formatIssue(issue).issues.map((error) => ({
+    path: [...path, ...(error.path || [])] as PropertyKey[],
+    message: error.message,
+    type: issue._tag,
+  }));
+};
+
 export function effectTsResolver<Input extends FieldValues, Context, Output>(
-  schema: Schema.Schema<Output, Input>,
+  schema: Schema.Codec<Output, Input, never, unknown>,
   schemaOptions?: ParseOptions,
   resolverOptions?: {
     mode?: 'async' | 'sync';
@@ -19,7 +47,7 @@ export function effectTsResolver<Input extends FieldValues, Context, Output>(
 ): Resolver<Input, Context, Output>;
 
 export function effectTsResolver<Input extends FieldValues, Context, Output>(
-  schema: Schema.Schema<Output, Input>,
+  schema: Schema.Codec<Output, Input, never, unknown>,
   schemaOptions: ParseOptions | undefined,
   resolverOptions: {
     mode?: 'async' | 'sync';
@@ -28,9 +56,9 @@ export function effectTsResolver<Input extends FieldValues, Context, Output>(
 ): Resolver<Input, Context, Input>;
 
 /**
- * Creates a resolver for react-hook-form using Effect.ts schema validation
- * @param {Schema.Schema<TFieldValues, I>} schema - The Effect.ts schema to validate against
- * @param {ParseOptions} [schemaOptions] - Optional Effect.ts validation options
+ * Creates a resolver for react-hook-form using Effect Schema validation
+ * @param {Schema.Codec<Output, Input>} schema - The Effect schema to validate against
+ * @param {ParseOptions} [schemaOptions] - Optional Effect Schema parse options
  * @returns {Resolver<Schema.Schema.Type<typeof schema>>} A resolver function compatible with react-hook-form
  * @example
  * const schema = Schema.Struct({
@@ -43,67 +71,61 @@ export function effectTsResolver<Input extends FieldValues, Context, Output>(
  * });
  */
 export function effectTsResolver<Input extends FieldValues, Context, Output>(
-  schema: Schema.Schema<Output, Input>,
+  schema: Schema.Codec<Output, Input, never, unknown>,
   schemaOptions: ParseOptions = { errors: 'all', onExcessProperty: 'ignore' },
 ): Resolver<Input, Context, Output | Input> {
-  return (values, _, options) => {
-    return decodeUnknown(
-      schema,
-      schemaOptions,
-    )(values).pipe(
-      Effect.catchAll((parseIssue) =>
-        Effect.flip(ArrayFormatter.formatIssue(parseIssue)),
-      ),
-      Effect.mapError((issues) => {
-        const validateAllFieldCriteria =
-          !options.shouldUseNativeValidation && options.criteriaMode === 'all';
+  return (values, _, options) =>
+    Schema.decodeUnknownEffect(schema)(values, schemaOptions).pipe(
+      Effect.match({
+        onFailure: ({ issue }) => {
+          const validateAllFieldCriteria =
+            !options.shouldUseNativeValidation &&
+            options.criteriaMode === 'all';
 
-        // A null-prototype accumulator avoids false-positive hits from
-        // inherited members (e.g. `toString`, `constructor`) when a field
-        // is named after one of them — a plain `{}` would make `!acc[key]`
-        // truthy-skip those paths and silently drop their errors.
-        const errors = issues.reduce(
-          (acc, error) => {
-            const key = error.path.join('.');
+          // A null-prototype accumulator avoids false-positive hits from
+          // inherited members (e.g. `toString`, `constructor`) when a field
+          // is named after one of them — a plain `{}` would make `!acc[key]`
+          // truthy-skip those paths and silently drop their errors.
+          const errors = flattenIssue(issue, []).reduce(
+            (acc, error) => {
+              const key = error.path.join('.');
 
-            if (!acc[key]) {
-              acc[key] = { message: error.message, type: error._tag };
-            }
+              if (!acc[key]) {
+                acc[key] = { message: error.message, type: error.type };
+              }
 
-            if (validateAllFieldCriteria) {
-              const types = acc[key].types;
-              const messages = types && types[String(error._tag)];
+              if (validateAllFieldCriteria) {
+                const types = acc[key].types;
+                const messages = types && types[error.type];
 
-              acc[key] = appendErrors(
-                key,
-                validateAllFieldCriteria,
-                acc,
-                error._tag,
-                messages
-                  ? ([] as string[]).concat(messages as string[], error.message)
-                  : error.message,
-              ) as FieldError;
-            }
+                acc[key] = appendErrors(
+                  key,
+                  validateAllFieldCriteria,
+                  acc,
+                  error.type,
+                  messages
+                    ? ([] as string[]).concat(
+                        messages as string[],
+                        error.message,
+                      )
+                    : error.message,
+                ) as FieldError;
+              }
 
-            return acc;
-          },
-          Object.create(null) as Record<string, FieldError>,
-        );
+              return acc;
+            },
+            Object.create(null) as Record<string, FieldError>,
+          );
 
-        return toNestErrors(errors, options);
-      }),
-      Effect.tap(() =>
-        Effect.sync(
-          () =>
-            options.shouldUseNativeValidation &&
-            validateFieldsNatively({}, options),
-        ),
-      ),
-      Effect.match({
-        onFailure: (errors) => ({ errors, values: {} }),
-        onSuccess: (result) => ({ errors: {}, values: result }),
+          return { errors: toNestErrors(errors, options), values: {} };
+        },
+        onSuccess: (result) => {
+          options.shouldUseNativeValidation &&
+            validateFieldsNatively({}, options);
+
+          return { errors: {}, values: result };
+        },
       }),
       Effect.runPromise,
     );
-  };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hookform/resolvers",
   "amdName": "hookformResolvers",
-  "version": "5.9.1",
+  "version": "6.0.0",
   "description": "React Hook Form validation resolvers: Yup, Joi, Superstruct, Zod, Vest, Class Validator, io-ts, Nope, computed-types, TypeBox, arktype, Typanion, Effect-TS and VineJS",
   "main": "dist/resolvers.js",
   "module": "dist/resolvers.module.js",
@@ -226,7 +226,7 @@
     "build:arktype": "microbundle --cwd arktype --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm",
     "build:valibot": "microbundle --cwd valibot --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm",
     "build:typeschema": "microbundle --cwd typeschema --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm,@typeschema/main=main",
-    "build:effect-ts": "microbundle --cwd effect-ts --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm,effect=Effect,effect/SchemaAST=EffectSchemaAST,effect/ParseResult=EffectParseResult",
+    "build:effect-ts": "microbundle --cwd effect-ts --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm,effect=Effect,effect/SchemaAST=EffectSchemaAST",
     "build:vine": "microbundle --cwd vine --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm,@vinejs/vine=vine",
     "build:fluentvalidation-ts": "microbundle --cwd fluentvalidation-ts --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm",
     "build:standard-schema": "microbundle --cwd standard-schema --globals @hookform/resolvers=hookformResolvers,react-hook-form=ReactHookForm,@standard-schema/spec=standardSchema",
@@ -291,16 +291,16 @@
     "@vinejs/vine": "^4.4.0",
     "@vitejs/plugin-react": "^4.7.0",
     "ajv": "^8.20.0",
-    "ata-validator": "^1.2.0",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^2.1.1",
     "arktype": "2.0.4",
+    "ata-validator": "^1.23.0",
     "check-export-map": "^1.3.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.4",
     "computed-types": "^1.11.2",
     "cross-env": "^7.0.3",
-    "effect": "^3.22.0",
+    "effect": "^4.0.5",
     "fluentvalidation-ts": "^3.3.0",
     "fp-ts": "^2.16.11",
     "io-ts": "^2.2.22",
@@ -337,11 +337,11 @@
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^2.1.1",
     "arktype": "^2.0.0",
-    "ata-validator": "^1.2.0",
+    "ata-validator": "^1.23.0",
     "class-transformer": ">=0.4.0",
     "class-validator": ">=0.12.0",
     "computed-types": "^1.0.0",
-    "effect": "^3.10.3",
+    "effect": "^4.0.0",
     "fluentvalidation-ts": "^3.0.0",
     "fp-ts": "^2.7.0",
     "io-ts": "^2.0.0",