Hopefully fixed excessively deep infinity type instantiation on message helper.

Author: ciscoheat

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - `onUpdate` didn't cancel `applyAction` and `invalidateAll`.
+- Hopefully fixed excessively deep infinity type instantiation on `message` helper.
 
 ### Added
 

src/index.test.ts

@@ -1,4 +1,9 @@
-import { setError, superValidate, defaultData } from '$lib/server';
+import {
+  setError,
+  superValidate,
+  defaultData,
+  setMessage
+} from '$lib/server';
 import { assert, expect, test, describe } from 'vitest';
 import { z, type AnyZodObject } from 'zod';
 import _slugify from 'slugify';
@@ -160,12 +165,14 @@ test('FormData array data', async () => {
 });
 
 test('Nullable values', async () => {
-  const refinedSchema = z.object({
-    scopeId: z.number().int().min(1),
-    name: z.string().nullable()
-  }).refine(data => data);
+  const refinedSchema = z
+    .object({
+      scopeId: z.number().int().min(1),
+      name: z.string().nullable()
+    })
+    .refine((data) => data);
 
-  const schema = refinedSchema._def.schema
+  const schema = refinedSchema._def.schema;
 
   const output = defaultData(schema);
   expect(output.scopeId).equals(0);
@@ -842,3 +849,27 @@ test('ZodObject defaults', async () => {
     }
   });
 });
+
+test('setMessage and setError with refined schema', async () => {
+  const schema = z
+    .object({
+      name: z.string(),
+      id: z.number()
+    })
+    .refine((data) => data)
+    .refine((data) => data);
+
+  const form = await superValidate({ name: '', id: 0 }, schema);
+  assert(form.valid);
+  expect(form.message).toBeUndefined();
+
+  setMessage(form, 'A message');
+  expect(form.message).toEqual('A message');
+
+  expect(form.errors).toEqual({});
+  setError(form, 'id', 'Id error');
+
+  expect(form.errors).toEqual({
+    id: ['Id error']
+  });
+});

src/lib/validate.ts

@@ -39,7 +39,7 @@ import { clone } from './utils.js';
 
 export { defaultData } from './schemaEntity.js';
 
-export function message<T extends UnwrapEffects<AnyZodObject>, M>(
+export function message<T extends AnyZodObject, M>(
   form: Validation<T, M>,
   message: M,
   options?: {
@@ -58,8 +58,7 @@ export function message<T extends UnwrapEffects<AnyZodObject>, M>(
 
 export const setMessage = message;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function setError<T extends UnwrapEffects<AnyZodObject>>(
+export function setError<T extends AnyZodObject>(
   form: Validation<T, unknown>,
   path: keyof z.infer<T> | FieldPath<z.infer<T>> | [] | null,
   error: string | string[],
@@ -299,7 +298,9 @@ export async function superValidate<
     function tryParseSuperJson(data: FormData) {
       if (data.has('__superform_json')) {
         try {
-          const output = parse(data.getAll('__superform_json').join('') ?? '');
+          const output = parse(
+            data.getAll('__superform_json').join('') ?? ''
+          );
           if (typeof output === 'object') {
             return output as Record<string, unknown>;
           }