asasvirtuais 0.5.0 → 0.6.0

package/index.ts

@@ -0,0 +1 @@
+// Silence is golden

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "asasvirtuais",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "directories": {
     "packages": "./packages"
   },
   "exports": {
+    ".": "./index.ts",
     "./package.json": "./package.json",
     "./*": "./packages/*",
     "./*/*": "./packages/*/*"

package/packages/fields.tsx

@@ -4,7 +4,7 @@ import { Input, Text, Button, Image, HStack, Spinner, Textarea } from '@chakra-u
 import { createContext } from 'react'
 import z from 'zod'
 
-type FieldsProps<T> = { defaults: T }
+type FieldsProps<T> = { defaults: Partial<T> }
 
 export function useFieldsProvider<T>(props: FieldsProps<T>) {
 

package/packages/form.tsx

@@ -3,7 +3,7 @@ import React, { createContext, useMemo } from 'react'
 import { useCallback, useState } from 'react'
 
 type Props<Fields, Result> = {
-  data: FormData | Fields
+  data: Partial<Fields>
   callback: (fields: Fields) => Promise<Result>
 }
 
@@ -12,11 +12,11 @@ export function useFormProvider<Fields, Result>(props: React.PropsWithChildren<P
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState<Error | null>(null)
 
-  const values = useMemo(() => {
+  const data = useMemo(() => {
     if (props.data instanceof FormData)
       return Object.fromEntries(props.data.entries()) as Fields
     else
-      return props.data
+      return props.data as Fields
   }, [props.data])
 
   /** receives an event (optional) and processes the form submission using the fields state as props, stores the result or error in the respective states */
@@ -26,7 +26,7 @@ export function useFormProvider<Fields, Result>(props: React.PropsWithChildren<P
       setLoading(true)
       setError(null)
       try {
-        const result = await props.callback(values)
+        const result = await props.callback(data)
         setResult(result)
       } catch (err) {
         console.error(err)
@@ -37,7 +37,7 @@ export function useFormProvider<Fields, Result>(props: React.PropsWithChildren<P
       }
       return false
     },
-    [values, props.callback]
+    [data, props.callback]
   )
 
   return {
@@ -45,7 +45,8 @@ export function useFormProvider<Fields, Result>(props: React.PropsWithChildren<P
     result,
     error,
     submit,
-    values,
+    callback: props.callback,
+    data,
   }
 }
 

package/packages/react-interface.tsx

@@ -17,7 +17,7 @@ import { FormProvider, useForm, useFormProvider } from 'asasvirtuais/form'
 export function reactInterface<
   Database extends Record<
     string,
-    { readable: z.SomeZodObject; writable: z.SomeZodObject }
+    { readable: z.ZodObject<z.ZodRawShape>; writable: z.ZodObject<z.ZodRawShape> }
   >
 >(
   database: Database,
@@ -170,12 +170,8 @@ export function reactInterface<
     defaults?: Partial<z.infer<Database[T]['writable']>>
     onSuccess?: (result: z.infer<Database[T]['readable']>) => void
     children: (
-      props: ReturnType<
-        typeof useFormProvider<z.infer<Database[T]['writable']>,
-        z.infer<Database[T]['readable']>
-      >> & ReturnType<typeof useFieldsProvider<z.infer<Database[T]['writable']>>> & {
-        callback: (fields: Partial<z.infer<Database[T]["writable"]>>) => Promise<z.infer<Database[T]["readable"]>>
-      }
+      props: ReturnType<typeof useFormProvider<z.infer<Database[T]['writable']>, z.infer<Database[T]['readable']>>>
+      & ReturnType<typeof useFields<z.infer<Database[T]['writable']>>>
     ) => React.ReactNode
   }) {
     type Readable = z.infer<Database[T]['readable']>
@@ -196,7 +192,7 @@ export function reactInterface<
       <FieldsProvider<Writable> defaults={defaults || ({} as Writable)}>
         {fields => (
           <FormProvider<Writable, Readable> callback={callback} data={fields.fields}>
-            {form => children({ ...form, ...fields, callback })}
+            {form => children({ ...form, ...fields })}
           </FormProvider>
         )}
       </FieldsProvider>
@@ -215,12 +211,8 @@ export function reactInterface<
     defaults?: Partial<z.infer<Database[T]['writable']>>
     onSuccess?: (result: z.infer<Database[T]['readable']>) => void
     children: (
-      props: ReturnType<
-        typeof useFormProvider<z.infer<Database[T]['writable']>,
-        z.infer<Database[T]['readable']>
-      >> & ReturnType<typeof useFieldsProvider<z.infer<Database[T]['writable']>>> & {
-        callback: (fields: Partial<z.infer<Database[T]["writable"]>>) => Promise<z.infer<Database[T]["readable"]>>
-      }
+      props: ReturnType<typeof useFormProvider<z.infer<Database[T]['writable']>, z.infer<Database[T]['readable']>>>
+      & ReturnType<typeof useFields<z.infer<Database[T]['writable']>>>
     ) => React.ReactNode
   }) {
     type Readable = z.infer<Database[T]['readable']>
@@ -238,12 +230,12 @@ export function reactInterface<
     )
 
     return (
-      <FieldsProvider<Partial<Writable>>
+      <FieldsProvider<Writable>
         defaults={defaults || ({} as Partial<Writable>)}
       >
         {fields => (
-          <FormProvider<Partial<Writable>, Readable> callback={callback} data={fields.fields}>
-            {form => children({ ...form, ...fields, callback })}
+          <FormProvider<Writable, Readable> callback={callback} data={fields.fields}>
+            {form => children({ ...form, ...fields })}
           </FormProvider>
         )}
       </FieldsProvider>
@@ -260,13 +252,8 @@ export function reactInterface<
     defaults?: Partial<ListProps<z.infer<Database[T]['readable']>>>
     onSuccess?: (result: z.infer<Database[T]['readable']>[]) => void
     children: (
-      props: ReturnType<
-        typeof useFormProvider<z.infer<Database[T]['writable']>,
-        Array<z.infer<Database[T]['readable']>
-      >>> & ReturnType<typeof useFieldsProvider<z.infer<Database[T]['writable']>>>
-      & {
-        callback: (fields: Partial<z.infer<Database[T]["writable"]>>) => Promise<z.infer<Database[T]["readable"]>[]>
-      }
+      props: ReturnType<typeof useFormProvider<ListProps<z.infer<Database[T]['readable']>>, z.infer<Database[T]['readable']>[]>>
+      & ReturnType<typeof useFields<ListProps<z.infer<Database[T]['readable']>>>>
     ) => React.ReactNode
   }) {
     type Readable = z.infer<Database[T]['readable']>
@@ -288,8 +275,8 @@ export function reactInterface<
         defaults={(defaults || {}) as ListProps<Readable>}
       >
         {fields => (
-          <FormProvider<ListProps<Readable>, Array<Readable>> callback={callback} data={fields.fields}>
-            {form => children({ ...form, ...fields, callback })}
+          <FormProvider<ListProps<Readable>, Readable[]> callback={callback} data={fields.fields}>
+            {form => children({ ...form, ...fields })}
           </FormProvider>
         )}
       </FieldsProvider>