feat: support zod effects and update password token prop

Author: Pagebakers

.changeset/afraid-maps-watch.md

@@ -0,0 +1,5 @@
+---
+'@saas-ui/forms': minor
+---
+
+Added support for ZodEffects schema to Form

.changeset/green-fishes-fetch.md

@@ -0,0 +1,5 @@
+---
+'@saas-ui/auth-provider': patch
+---
+
+Added optional token prop to update password handler

packages/saas-ui-auth-provider/src/provider.tsx

@@ -25,14 +25,18 @@ export interface AuthParams {
 
 export interface ResetPasswordParams {
   email: string
+  [key: string]: any
 }
 
 export interface UpdatePasswordParams {
   password: string
+  token?: string
+  [key: string]: any
 }
 
 export interface OtpParams {
   otp: string
+  [key: string]: any
 }
 
 export type ExtraAuthOptions = Record<string, unknown>

packages/saas-ui-auth-provider/tests/provider.test.tsx

@@ -49,6 +49,14 @@ const createAuthService = (): AuthProviderProps => {
 
       throw new Error('Sign up failed')
     },
+    onResetPassword: async (params) => {
+      const { email } = params
+      return { email }
+    },
+    onUpdatePassword: async (params) => {
+      const { password, token } = params
+      return { password, token }
+    },
     onGetToken: async () => {
       return token
     },

packages/saas-ui-forms/stories/form.stories.tsx

@@ -22,7 +22,7 @@ import { LuInfo } from 'react-icons/lu'
 import { splitProps } from '@saas-ui/core/utils'
 
 import { createYupForm } from '../yup/src'
-import { createZodForm } from '../zod/src'
+import { createZodForm, zodMeta } from '../zod/src'
 import { JTDDataType, createAjvForm } from '../ajv/src'
 
 import {
@@ -55,15 +55,31 @@ export default {
 
 type Story = StoryObj<typeof Form>
 
-const loginSchema = yup.object({
-  email: yup.string().email().required().label('Email address'),
-  password: yup
-    .string()
-    .required()
-    .label('Password')
-    .meta({ type: 'password' }),
+const loginSchema = z.object({
+  email: z.string().email().describe('Email address'),
+  password: z.string().describe(
+    zodMeta({
+      label: 'Password',
+      type: 'password',
+    })
+  ),
 })
 
+const signupSchema = z
+  .object({
+    email: z.string().email().describe('Email address'),
+    password: z.string().describe('Password').min(8),
+    confirmPassword: z.string().describe('Confirm password'),
+  })
+  .superRefine((data, ctx) => {
+    if (data.password !== data.confirmPassword) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Passwords do not match',
+      })
+    }
+  })
+
 export const Basic: Story = {
   render() {
     return (
@@ -266,6 +282,35 @@ export const WithZodSchema: StoryObj<typeof ZodForm> = {
   },
 }
 
+export const ZodSuperRefine: StoryObj<typeof ZodForm> = {
+  render(props) {
+    return (
+      <ZodForm
+        schema={signupSchema}
+        defaultValues={{
+          email: '',
+          password: '',
+          confirmPassword: '',
+        }}
+        onSubmit={props?.onSubmit || onSubmit}
+      >
+        {({ Field }) => (
+          <FormLayout>
+            <Field name="email" label="Email" />
+            <Field name="password" label="Password" type="password" />
+            <Field
+              name="confirmPassword"
+              type="password"
+              label="Confirm password"
+            />
+            <SubmitButton>Sign up</SubmitButton>
+          </FormLayout>
+        )}
+      </ZodForm>
+    )
+  },
+}
+
 const YupForm = createYupForm({
   fields: { custom: CustomField },
   getBaseField,

packages/saas-ui-forms/zod/src/create-zod-form.ts

@@ -18,15 +18,20 @@ export interface CreateZodFormProps<
   resolverOptions?: ResolverArgs[2]
 }
 
+type InferObjectSchema<T extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny>> =
+  T extends z.ZodEffects<infer TSchema> ? z.infer<TSchema> : z.infer<T>
+
 export type ZodFormType<
   FieldDefs,
   ExtraProps = object,
   ExtraFieldProps extends object = object,
   ExtraOverrides = object,
   Type extends 'zod' = 'zod',
 > = (<
-  TSchema extends z.AnyZodObject = z.AnyZodObject,
-  TFieldValues extends z.infer<TSchema> = z.infer<TSchema>,
+  TSchema extends
+    | z.AnyZodObject
+    | z.ZodEffects<z.AnyZodObject> = z.AnyZodObject,
+  TFieldValues extends InferObjectSchema<TSchema> = InferObjectSchema<TSchema>,
   TContext extends object = object,
 >(
   props: WithFields<