asasvirtuais 0.6.3 → 0.6.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "asasvirtuais",
   "type": "module",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "directories": {
     "packages": "./packages"
   },

package/packages/react-interface.tsx

@@ -43,8 +43,8 @@ export function reactInterface<
     table,
     asAbove,
   }: TableProviderProps<Table>) {
-    type Readable = z.infer<Database[Table]["readable"]>
-    type Writable = z.infer<Database[Table]["writable"]>
+    type Readable = z.infer<Database[Table]['readable']>
+    type Writable = z.infer<Database[Table]['writable']>
 
     const index = useIndex<Readable>({ ...(asAbove ?? {}) })
 
@@ -88,21 +88,6 @@ export function reactInterface<
     }
   }
 
-  const TableContext = createContext<
-    ReturnType<typeof useTableProvider<any>> | undefined
-  >(undefined)
-
-  function TableProvider<Table extends TableKey>({children, ...props}: TableProviderProps<Table> & {
-    children: React.ReactNode | ((props: ReturnType<typeof useTableProvider<Table>>) => React.ReactNode)
-  }) {
-    const context = useTableProvider(props)
-    return (
-      <TableContext.Provider value={context}>
-        {typeof children === 'function' ? children(context) : children}
-      </TableContext.Provider>
-    )
-  }
-
   function useDatabaseProvider(tables: { [T in TableKey]: Record<string, z.infer<Database[T]['readable']>> }): {
     [T in TableKey]: ReturnType<typeof useTableProvider<T>>
   } {
@@ -114,12 +99,56 @@ export function reactInterface<
         [T in TableKey]: ReturnType<typeof useTableProvider<T>>
       }
   }
+  // Create a separate context for each table dynamically
+  const tableContexts = new Map<TableKey, React.Context<ReturnType<typeof useTableProvider<any>> | undefined>>();
+
+  function getTableContext<T extends TableKey>(table: T) {
+    if (!tableContexts.has(table)) {
+      tableContexts.set(table, createContext<ReturnType<typeof useTableProvider<T>> | undefined>(undefined));
+    }
+    return tableContexts.get(table)!;
+  }
 
-  const [DatabaseProvider, useDatabase] =
-    createContextFromHook(useDatabaseProvider)
+  function TableProvider<Table extends TableKey>({ children, ...props }: TableProviderProps<Table> & {
+    children: React.ReactNode | ((props: ReturnType<typeof useTableProvider<Table>>) => React.ReactNode)
+  }) {
+    const context = useTableProvider(props);
+    const TableContext = getTableContext(props.table);
+
+    return (
+      <TableContext.Provider value={context}>
+        {typeof children === 'function' ? children(context) : children}
+      </TableContext.Provider>
+    )
+  }
+
+  function DatabaseProvider({
+    children,
+    ...tables
+  }: React.PropsWithChildren<{
+    [T in TableKey]?: Record<string, z.infer<Database[T]['readable']>>
+  }>) {
+    return Object.entries(tables).reduce(
+      (prev, [table, asAbove]) => {
+        return (
+          <TableProvider table={table as TableKey} asAbove={asAbove}>
+            {prev}
+          </TableProvider>
+        );
+      },
+      children as React.ReactNode
+    )
+  }
 
   function useTable<T extends TableKey>(name: T) {
-    return useDatabase()[name]
+    const TableContext = getTableContext(name);
+    const context = useContext(TableContext);
+
+    if (!context) {
+      throw new Error(`useTable("${String(name)}") must be used within a TableProvider or DatabaseProvider with table="${String(name)}"`);
+    }
+
+    return context as ReturnType<typeof useTableProvider<T>>;
   }
 
   function useSingleProvider<Table extends TableKey>({
@@ -188,7 +217,7 @@ export function reactInterface<
     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 useFields<z.infer<Database[T]['writable']>>>
+        & ReturnType<typeof useFields<z.infer<Database[T]['writable']>>>
     ) => React.ReactNode
   }) {
     type Readable = z.infer<Database[T]['readable']>
@@ -229,7 +258,7 @@ export function reactInterface<
     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 useFields<z.infer<Database[T]['writable']>>>
+        & ReturnType<typeof useFields<z.infer<Database[T]['writable']>>>
     ) => React.ReactNode
   }) {
     type Readable = z.infer<Database[T]['readable']>
@@ -270,7 +299,7 @@ export function reactInterface<
     onSuccess?: (result: z.infer<Database[T]['readable']>[]) => void
     children: (
       props: ReturnType<typeof useFormProvider<ListProps<z.infer<Database[T]['readable']>>, z.infer<Database[T]['readable']>[]>>
-      & ReturnType<typeof useFields<ListProps<z.infer<Database[T]['readable']>>>>
+        & ReturnType<typeof useFields<ListProps<z.infer<Database[T]['readable']>>>>
     ) => React.ReactNode
   }) {
     type Readable = z.infer<Database[T]['readable']>
@@ -280,7 +309,7 @@ export function reactInterface<
 
     const callback = useCallback(
       async (fields: Omit<ListProps<Readable>, 'table'>) => {
-        const result = await list.trigger({query: fields})
+        const result = await list.trigger(fields)
         if (onSuccess) onSuccess(result)
         return result
       },
@@ -289,7 +318,7 @@ export function reactInterface<
 
     return (
       <FieldsProvider<ListProps<Readable>>
-        defaults={(defaults || {}) as ListProps<Readable>}
+        defaults={(defaults || { query: {} }) as ListProps<Readable>}
       >
         {fields => (
           <FormProvider<ListProps<Readable>, Readable[]> callback={callback} data={fields.fields}>
@@ -329,7 +358,6 @@ export function reactInterface<
 
   return {
     DatabaseProvider,
-    useDatabase,
     useTable,
     useTableProvider,
     TableProvider,