Provider handles multi-schema store

Author: jbolda

src/react.ts

@@ -8,9 +8,11 @@ import {
 import { getIdFromAction } from "./action.js";
 import type { ThunkAction } from "./query/index.js";
 import {
+  type DefaultSchemaKey,
   type FxSchema,
   type FxStore,
   PERSIST_LOADER_ID,
+  type StoreSchemaRegistry,
 } from "./store/index.js";
 import type { LoaderOutput } from "./store/slice/loaders.js";
 import type { TableOutput } from "./store/slice/table.js";
@@ -180,9 +182,12 @@ export function createTypedHooks<O extends FxMap>(
  * }
  * ```
  */
-export function Provider<O extends FxMap>(props: {
-  store: FxStore<O>;
-  schema?: FxSchema<O>;
+export function Provider<
+  O extends FxMap,
+  TSchemas extends StoreSchemaRegistry = StoreSchemaRegistry<FxSchema<O>>,
+>(props: {
+  store: FxStore<O, TSchemas>;
+  schema?: TSchemas[DefaultSchemaKey];
   children?: React.ReactNode;
 }): React.ReactElement;
 

src/test/react-types.test.ts

@@ -1,6 +1,8 @@
 import { describe, expectTypeOf, test } from "vitest";
+import type { ReactElement } from "react";
 import type { ThunkAction } from "../query/index.js";
 import {
+  Provider,
   type UseApiAction,
   type UseApiProps,
   type UseApiSimpleProps,
@@ -139,6 +141,22 @@ describe("react hook types", () => {
       expectTypeOf(useSchemaState).returns.toEqualTypeOf<typeof schema>();
       expectTypeOf(useTypedLoader).returns.toEqualTypeOf<LoaderState>();
     });
+
+    test("Provider accepts stores with merged root state and narrower default schema", () => {
+      const baseSchema = createSchema({
+        users: slice.table<User>(),
+      });
+      const metadataSchema = createSchema({
+        metadata: slice.obj<Metadata>({}),
+      });
+      const store = createStore({
+        schema: { default: baseSchema, metadata: metadataSchema },
+      });
+
+      const renderProvider = () => Provider({ store, children: null });
+
+      expectTypeOf(renderProvider).returns.toEqualTypeOf<ReactElement>();
+    });
   });
 
   describe("direct hooks with explicit schema generics", () => {