Merge pull request #34 from esamattis/esamattis/fix-validation-narrowing-33

Author: esamattis

packages/react-zorm/__tests__/use-zorm.test.tsx

@@ -878,3 +878,29 @@ test("can bound to lazily created form", () => {
 
     expect(spy).toHaveBeenCalledTimes(1);
 });
+
+test.skip("[TYPE ONLY] can narrow validation type to success", () => {
+    const Schema = z.object({
+        thing: z.string(),
+    });
+
+    function Test() {
+        const zo = useZorm("form", Schema);
+
+        const customValidation = zo.validate();
+
+        if (customValidation.success) {
+            customValidation.data.thing;
+
+            // @ts-expect-error
+            customValidation.data.bad;
+        }
+
+        if (zo.validation?.success) {
+            zo.validation.data.thing;
+
+            // @ts-expect-error
+            zo.validation.data.bad;
+        }
+    }
+});

packages/react-zorm/src/types.tsx

@@ -1,4 +1,4 @@
-import { ZodCustomIssue, ZodIssue, ZodType } from "zod";
+import { SafeParseReturnType, ZodCustomIssue, ZodIssue, ZodType } from "zod";
 
 type Primitive = string | number | boolean | bigint | symbol | undefined | null;
 
@@ -96,8 +96,9 @@ export type ErrorChainFromSchema<T extends GenericSchema> = ErrorChain<
     DeepNonNullable<ReturnType<T["parse"]>>
 >;
 
-export type SafeParseResult<Schema extends GenericSchema> = ReturnType<
-    ZodType<Schema>["safeParse"]
+export type SafeParseResult<Schema extends GenericSchema> = SafeParseReturnType<
+    any,
+    ReturnType<Schema["parse"]>
 >;
 
 export interface Zorm<Schema extends GenericSchema> {