better-supabase 0.12.0 → 0.13.0

package/dist/react/server.d.ts

@@ -1,36 +1,65 @@
-import { t as escapeLike } from "../escape-like-B339PlP-.js";
-import { at as QuerySpec } from "../define-DYZnvAbs.js";
-import { n as Impersonator } from "../impersonation-D5chOkrO.js";
-import { t as tenantOf } from "../tenant-DZMLVuyQ.js";
-import { t as AuthSession } from "../view-KQhe6eNc.js";
-import { r as LiveCountSeed } from "../index-DTQSeHx2.js";
-import { a as BroadcastOptions, c as LiveCountHookOptions, m as UseActionOptions, n as ActionInputOf, o as ClaimsOf, p as ProfileOf, r as ActionResultOf, s as ClientLike, t as fieldErrorsOf, u as LiveQueryHookOptions } from "../field-errors-Z-sgsdoN.js";
-import { r as MembershipClaim } from "../entitlements-CtBGXb3B.js";
-import { n as supportOf, t as SupportView } from "../support-view-Bj_lZ8Wr.js";
-import { A as useSupabase, C as BetterSupabaseProviderProps, D as useBroadcast, E as useAuth, S as BetterSupabaseProvider, _ as ActionHandle, a as UploadTarget, c as useUpload$1, d as useDebouncedSearch$1, f as Presence, g as ActionForm, h as usePresence$1, i as UploadStatus, k as useLiveQuery, l as DebouncedSearch, m as PresenceTopic, n as SignedUrlSource, o as UseUploadOptions, p as PresenceHookOptions, r as Upload, s as useSignedUrl$1, t as SignedUrl, u as DebouncedSearchOptions, v as UseActionFormOptions, w as LiveCount, x as BetterHooks } from "../index-C-_fs7EI.js";
+import { t as escapeLike } from "../escape-like-DuKupGUV.js";
+import { J as QuerySpec } from "../define-D0LSXmUP.js";
+import { n as Impersonator } from "../impersonation-YTa9dZUv.js";
+import { t as tenantOf } from "../tenant-l3H2ouv7.js";
+import { t as AuthSession } from "../view-CKzCp8FW.js";
+import { r as LiveCountSeed } from "../index-C7-2ZS9f.js";
+import { a as BroadcastOptions, c as LiveCountHookOptions, m as UseActionOptions, n as ActionInputOf, o as ClaimsOf, p as ProfileOf, r as ActionResultOf, s as ClientLike, t as fieldErrorsOf, u as LiveQueryHookOptions } from "../field-errors-CKEqR38q.js";
+import { r as MembershipClaim } from "../entitlements-CMGsO4gL.js";
+import { n as supportOf, t as SupportView } from "../support-view-BOJJSZKv.js";
+import { A as useAuth, D as BetterSupabaseProviderProps, E as BetterSupabaseProvider, N as useLiveQuery, O as LiveCount, P as useSupabase, S as UseActionFormOptions, T as BetterHooks, _ as PresenceHookOptions, a as Upload, b as ActionForm, c as UseImageOptions, d as useSignedUrl$1, f as useUpload$1, g as Presence, h as useDebouncedSearch$1, i as StorageImage, j as useBroadcast, l as UseUploadOptions, m as DebouncedSearchOptions, n as SignedUrl, o as UploadStatus, p as DebouncedSearch, r as SignedUrlSource, s as UploadTarget, t as ImageSource, u as useImage$1, v as PresenceTopic, x as ActionHandle, y as usePresence$1 } from "../index-eoAU_QaY.js";
 import { SessionProvider, SessionProviderProps } from "./session.js";
-import { a as useSignIn$1, i as SignOut, n as PendingState, o as useSignOut$1, r as SignIn, t as AuthHookOptions } from "../sign-in-BCV5S2WZ.js";
+import { a as useSignIn$1, i as SignOut, n as PendingState, o as useSignOut$1, r as SignIn, t as AuthHookOptions } from "../sign-in-D54FLMQy.js";
 //#region src/react/server.d.ts
 /** The `react-server` build of `useSession`: await `bs.session()` instead. */
 export declare const useSession: <C = unknown, P = unknown>() => AuthSession<C, P>;
-/** The `react-server` build of `useSupportSession`: use `supportOf(await bs.session())` instead. */
+/**
+ * The `react-server` build of `useSupportSession`: use `supportOf(await
+ * bs.session())` instead.
+ */
 export declare const useSupportSession: () => SupportView | undefined;
-/** The `react-server` build of `useLiveCount`: render the `bs.liveCount()` seed instead. */
+/**
+ * The `react-server` build of `useLiveCount`: render the `bs.liveCount()` seed
+ * instead.
+ */
 export declare const useLiveCount: (source: QuerySpec<string, "count", number> | LiveCountSeed | null | undefined, options?: LiveCountHookOptions) => LiveCount;
-/** The `react-server` build of `useAction`: call the Server Action directly instead. */
+/**
+ * The `react-server` build of `useAction`: call the Server Action directly
+ * instead.
+ */
 export declare const useAction: <I, T>(action: (input: I) => Promise<ActionResultOf<T>>, options?: UseActionOptions<ActionInputOf<I>, T>) => ActionHandle<ActionInputOf<I>, T>;
-/** The `react-server` build of `useActionForm`: render the form in a Client Component. */
+/**
+ * The `react-server` build of `useActionForm`: render the form in a Client
+ * Component.
+ */
 export declare const useActionForm: <T>(action: (input: FormData) => Promise<ActionResultOf<T>>, options?: UseActionFormOptions<T>) => ActionForm<T>;
-/** The `react-server` build of `usePresence`: join presence in a Client Component. */
+/**
+ * The `react-server` build of `usePresence`: join presence in a Client
+ * Component.
+ */
 export declare const usePresence: typeof usePresence$1;
-/** The `react-server` build of `useSignIn`: sign in from a Client Component or a Server Action. */
+/**
+ * The `react-server` build of `useSignIn`: sign in from a Client Component or a
+ * Server Action.
+ */
 export declare const useSignIn: typeof useSignIn$1;
-/** The `react-server` build of `useSignOut`: sign out from a Client Component or a Server Action. */
+/**
+ * The `react-server` build of `useSignOut`: sign out from a Client Component or
+ * a Server Action.
+ */
 export declare const useSignOut: typeof useSignOut$1;
-/** The `react-server` build of `useDebouncedSearch`: read the term from `searchParams` instead. */
+/**
+ * The `react-server` build of `useDebouncedSearch`: read the term from
+ * `searchParams` instead.
+ */
 export declare const useDebouncedSearch: typeof useDebouncedSearch$1;
-/** The `react-server` build of `useSignedUrl`: await `bucket.signedUrl()` instead. */
+/**
+ * The `react-server` build of `useSignedUrl`: await `bucket.signedUrl()`
+ * instead.
+ */
 export declare const useSignedUrl: typeof useSignedUrl$1;
+/** The `react-server` build of `useImage`: await `bucket.renderUrl()` instead. */
+export declare const useImage: typeof useImage$1;
 /** The `react-server` build of `useUpload`: upload from a Client Component. */
 export declare const useUpload: typeof useUpload$1;
 /**
@@ -39,4 +68,4 @@ export declare const useUpload: typeof useUpload$1;
  */
 export declare function createHooks<B extends ClientLike>(): BetterHooks<B>;
 //#endregion
-export { type ActionForm, type ActionHandle, type ActionInputOf, type ActionResultOf, type AuthHookOptions, type AuthSession, type BetterHooks, BetterSupabaseProvider, type BetterSupabaseProviderProps, type BroadcastOptions, type ClaimsOf, type ClientLike, type DebouncedSearch, type DebouncedSearchOptions, type Impersonator, type LiveCount, type LiveCountHookOptions, type LiveCountSeed, type LiveQueryHookOptions, type MembershipClaim, type PendingState, type Presence, type PresenceHookOptions, type PresenceTopic, type ProfileOf, SessionProvider, type SessionProviderProps, type SignIn, type SignOut, type SignedUrl, type SignedUrlSource, type SupportView, type Upload, type UploadStatus, type UploadTarget, type UseActionFormOptions, type UseActionOptions, type UseUploadOptions, escapeLike, fieldErrorsOf, supportOf, tenantOf, useAuth, useBroadcast, useLiveQuery, useSupabase };
+export { type ActionForm, type ActionHandle, type ActionInputOf, type ActionResultOf, type AuthHookOptions, type AuthSession, type BetterHooks, BetterSupabaseProvider, type BetterSupabaseProviderProps, type BroadcastOptions, type ClaimsOf, type ClientLike, type DebouncedSearch, type DebouncedSearchOptions, type ImageSource, type Impersonator, type LiveCount, type LiveCountHookOptions, type LiveCountSeed, type LiveQueryHookOptions, type MembershipClaim, type PendingState, type Presence, type PresenceHookOptions, type PresenceTopic, type ProfileOf, SessionProvider, type SessionProviderProps, type SignIn, type SignOut, type SignedUrl, type SignedUrlSource, type StorageImage, type SupportView, type Upload, type UploadStatus, type UploadTarget, type UseActionFormOptions, type UseActionOptions, type UseImageOptions, type UseUploadOptions, escapeLike, fieldErrorsOf, supportOf, tenantOf, useAuth, useBroadcast, useLiveQuery, useSupabase };

package/dist/react/server.js

@@ -1,9 +1,9 @@
 import { t as escapeLike } from "../escape-like-DHfx6jRr.js";
 import { t as supportOf } from "../support-view-g4YLBeqX.js";
-import { d as useSupabase, i as BetterSupabaseProvider, o as useAuth, s as useBroadcast, u as useLiveQuery } from "../sign-in-z2BaBdps.js";
+import { d as useSupabase, i as BetterSupabaseProvider, o as useAuth, s as useBroadcast, u as useLiveQuery } from "../sign-in-B_QJ2u62.js";
 import { t as fieldErrorsOf } from "../field-errors-DZVRWRkf.js";
-import "../react-DzukE6Wp.js";
-import { t as tenantOf } from "../tenant-B-fiItlJ.js";
+import "../react-uvu_KcVY.js";
+import { t as tenantOf } from "../tenant-DnMqeNIM.js";
 import { SessionProvider } from "./session.js";
 //#region src/react/server.ts
 function clientOnly(name) {
@@ -13,24 +13,53 @@ function clientOnly(name) {
 }
 /** The `react-server` build of `useSession`: await `bs.session()` instead. */
 const useSession = clientOnly("useSession");
-/** The `react-server` build of `useSupportSession`: use `supportOf(await bs.session())` instead. */
+/**
+* The `react-server` build of `useSupportSession`: use `supportOf(await
+* bs.session())` instead.
+*/
 const useSupportSession = clientOnly("useSupportSession");
-/** The `react-server` build of `useLiveCount`: render the `bs.liveCount()` seed instead. */
+/**
+* The `react-server` build of `useLiveCount`: render the `bs.liveCount()` seed
+* instead.
+*/
 const useLiveCount = clientOnly("useLiveCount");
-/** The `react-server` build of `useAction`: call the Server Action directly instead. */
+/**
+* The `react-server` build of `useAction`: call the Server Action directly
+* instead.
+*/
 const useAction = clientOnly("useAction");
-/** The `react-server` build of `useActionForm`: render the form in a Client Component. */
+/**
+* The `react-server` build of `useActionForm`: render the form in a Client
+* Component.
+*/
 const useActionForm = clientOnly("useActionForm");
-/** The `react-server` build of `usePresence`: join presence in a Client Component. */
+/**
+* The `react-server` build of `usePresence`: join presence in a Client
+* Component.
+*/
 const usePresence = clientOnly("usePresence");
-/** The `react-server` build of `useSignIn`: sign in from a Client Component or a Server Action. */
+/**
+* The `react-server` build of `useSignIn`: sign in from a Client Component or a
+* Server Action.
+*/
 const useSignIn = clientOnly("useSignIn");
-/** The `react-server` build of `useSignOut`: sign out from a Client Component or a Server Action. */
+/**
+* The `react-server` build of `useSignOut`: sign out from a Client Component or
+* a Server Action.
+*/
 const useSignOut = clientOnly("useSignOut");
-/** The `react-server` build of `useDebouncedSearch`: read the term from `searchParams` instead. */
+/**
+* The `react-server` build of `useDebouncedSearch`: read the term from
+* `searchParams` instead.
+*/
 const useDebouncedSearch = clientOnly("useDebouncedSearch");
-/** The `react-server` build of `useSignedUrl`: await `bucket.signedUrl()` instead. */
+/**
+* The `react-server` build of `useSignedUrl`: await `bucket.signedUrl()`
+* instead.
+*/
 const useSignedUrl = clientOnly("useSignedUrl");
+/** The `react-server` build of `useImage`: await `bucket.renderUrl()` instead. */
+const useImage = clientOnly("useImage");
 /** The `react-server` build of `useUpload`: upload from a Client Component. */
 const useUpload = clientOnly("useUpload");
 /**
@@ -47,4 +76,4 @@ function createHooks() {
 	};
 }
 //#endregion
-export { BetterSupabaseProvider, SessionProvider, createHooks, escapeLike, fieldErrorsOf, supportOf, tenantOf, useAction, useActionForm, useAuth, useBroadcast, useDebouncedSearch, useLiveCount, useLiveQuery, usePresence, useSession, useSignIn, useSignOut, useSignedUrl, useSupabase, useSupportSession, useUpload };
+export { BetterSupabaseProvider, SessionProvider, createHooks, escapeLike, fieldErrorsOf, supportOf, tenantOf, useAction, useActionForm, useAuth, useBroadcast, useDebouncedSearch, useImage, useLiveCount, useLiveQuery, usePresence, useSession, useSignIn, useSignOut, useSignedUrl, useSupabase, useSupportSession, useUpload };

package/dist/react/session.d.ts

@@ -1,5 +1,5 @@
-import { t as AuthSession } from "../view-KQhe6eNc.js";
-import { t as SupportView } from "../support-view-Bj_lZ8Wr.js";
+import { t as AuthSession } from "../view-CKzCp8FW.js";
+import { t as SupportView } from "../support-view-BOJJSZKv.js";
 import { ReactNode } from "react";
 //#region src/react/session.d.ts
 export interface SessionProviderProps {
@@ -13,15 +13,17 @@ export interface SessionProviderProps {
 /** Shares the server-verified session with Client Components. */
 export declare function SessionProvider(props: SessionProviderProps): ReactNode;
 /**
- * The session from the nearest `<SessionProvider>`. Suspends until the
- * promise resolves, so render it inside `<Suspense>`. `C` types the claims
- * (the output of `betterSupabase.claims(schema)`) and `P` the profile (the output of
- * `betterSupabase.userMetadata(schema)`); `createHooks().useSession` infers both.
+ * The session from the nearest `<SessionProvider>`. Suspends until the promise
+ * resolves, so render it inside `<Suspense>`. `C` types the claims (the output
+ * of `betterSupabase.claims(schema)`) and `P` the profile (the output of
+ * `betterSupabase.userMetadata(schema)`); `createHooks().useSession` infers
+ * both.
  */
 export declare function useSession<C = unknown, P = unknown>(): AuthSession<C, P>;
 /**
  * The support session the page renders in, for a "Viewing as" banner, or
- * `undefined` for a normal session. Needs `<SessionProvider>` like `useSession`.
+ * `undefined` for a normal session. Needs `<SessionProvider>` like
+ * `useSession`.
  */
 export declare function useSupportSession(): SupportView | undefined;
 //#endregion

package/dist/react/session.js

@@ -8,10 +8,11 @@ function SessionProvider(props) {
 	return createElement(SessionContext.Provider, { value: props.sessionPromise }, props.children);
 }
 /**
-* The session from the nearest `<SessionProvider>`. Suspends until the
-* promise resolves, so render it inside `<Suspense>`. `C` types the claims
-* (the output of `betterSupabase.claims(schema)`) and `P` the profile (the output of
-* `betterSupabase.userMetadata(schema)`); `createHooks().useSession` infers both.
+* The session from the nearest `<SessionProvider>`. Suspends until the promise
+* resolves, so render it inside `<Suspense>`. `C` types the claims (the output
+* of `betterSupabase.claims(schema)`) and `P` the profile (the output of
+* `betterSupabase.userMetadata(schema)`); `createHooks().useSession` infers
+* both.
 */
 function useSession() {
 	const promise = useContext(SessionContext);
@@ -20,7 +21,8 @@ function useSession() {
 }
 /**
 * The support session the page renders in, for a "Viewing as" banner, or
-* `undefined` for a normal session. Needs `<SessionProvider>` like `useSession`.
+* `undefined` for a normal session. Needs `<SessionProvider>` like
+* `useSession`.
 */
 function useSupportSession() {
 	return supportOf(useSession());

package/dist/react-BKCnIuZs.js

@@ -0,0 +1,79 @@
+import { useCallback, useMemo } from "react";
+import { DefaultChatTransport } from "ai";
+import { useChat } from "@ai-sdk/react";
+//#region src/ai-sdk/react/body.ts
+/** The body `useAssistant` sends for the user's newest message. */
+function assistantBody(config, request) {
+	const message = request.messages.findLast((entry) => entry.role === "user");
+	return {
+		...config.body,
+		...request.body,
+		id: request.id,
+		message,
+		trigger: request.trigger,
+		...request.messageId === void 0 ? {} : { messageId: request.messageId },
+		...config.model === void 0 ? {} : { model: config.model }
+	};
+}
+//#endregion
+//#region src/ai-sdk/react/index.ts
+function defaultTransport(config) {
+	const { api, headers } = config;
+	return new DefaultChatTransport({
+		api,
+		...headers === void 0 ? {} : { headers: { ...headers } },
+		prepareSendMessagesRequest: (request) => ({ body: assistantBody(config, request) }),
+		prepareReconnectToStreamRequest: (request) => ({ api: `${api}/${encodeURIComponent(request.id)}/stream` })
+	});
+}
+/**
+* `useChat` wired to `createAssistant`: it sends only the new message (the
+* server keeps the history), resumes a running answer after a reload and stops
+* it on the server.
+*/
+function useAssistant(options) {
+	const api = options.api ?? "/api/chat";
+	const { id, model, body, headers } = options;
+	const makeTransport = options.transport ?? defaultTransport;
+	const transport = useMemo(() => makeTransport({
+		api,
+		model,
+		body,
+		headers
+	}), [
+		makeTransport,
+		api,
+		model,
+		body,
+		headers
+	]);
+	const chat = useChat({
+		id,
+		transport,
+		resume: options.resume ?? true,
+		...options.messages === void 0 ? {} : { messages: options.messages },
+		...options.onError === void 0 ? {} : { onError: options.onError },
+		...options.onFinish === void 0 ? {} : { onFinish: options.onFinish },
+		...options.throttle === void 0 ? {} : { throttle: options.throttle },
+		...options.sendAutomaticallyWhen === void 0 ? {} : { sendAutomaticallyWhen: options.sendAutomaticallyWhen }
+	});
+	const { stop: stopLocal } = chat;
+	const stop = useCallback(async () => {
+		await stopLocal();
+		await fetch(`${api}/${encodeURIComponent(id)}/stop`, {
+			method: "POST",
+			...headers === void 0 ? {} : { headers: { ...headers } }
+		});
+	}, [
+		api,
+		id,
+		headers,
+		stopLocal
+	]);
+	return {
+		...chat,
+		stop
+	};
+}
+//#endregion
+export { assistantBody as n, useAssistant as t };

package/dist/react-controller-CKSdtJ10.js

@@ -0,0 +1,43 @@
+import { useMemo, useRef, useState, useSyncExternalStore } from "react";
+//#region src/blocks/react-controller.ts
+/**
+* A controller's state and actions, rendered again when the state changes. The
+* controller is made again when `deps` change; its work starts with the first
+* subscription and stops with the last, so StrictMode's second mount and an
+* unmount need no cleanup here.
+*/
+function useController(create, deps) {
+	const [held, setHeld] = useState(() => ({
+		deps,
+		controller: create()
+	}));
+	let current = held;
+	if (changed(held.deps, deps)) {
+		current = {
+			deps,
+			controller: create()
+		};
+		setHeld(current);
+	}
+	const { controller } = current;
+	const snapshot = useSyncExternalStore(controller.subscribe, controller.getSnapshot, controller.getSnapshot);
+	return {
+		controller,
+		view: useMemo(() => ({
+			...snapshot,
+			...controller.actions
+		}), [snapshot, controller])
+	};
+}
+const changed = (before, after) => before.length !== after.length || before.some((value, index) => !Object.is(value, after[index]));
+/**
+* A ref that always holds the latest value, for callbacks a controller calls
+* later.
+*/
+function useLatest(value) {
+	const latest = useRef(value);
+	latest.current = value;
+	return latest;
+}
+//#endregion
+export { useLatest as n, useController as t };

package/dist/react-env-CodKZgPk.js

@@ -0,0 +1,16 @@
+import { t as ClientContext } from "./context-CMxVnPMY.js";
+import { t as blockEnv } from "./block-env-YfPmSNa1.js";
+import { useContext, useMemo } from "react";
+//#region src/blocks/react-env.ts
+/**
+* The provider's client, session and ports; the topic port defaults to its
+* supabase-js client.
+*/
+function useBlockEnv() {
+	const value = useContext(ClientContext);
+	if (!value) throw new Error("better-supabase: wrap your app in <BetterSupabaseProvider client={bs}>");
+	const { client } = value;
+	return useMemo(() => blockEnv(client), [client]);
+}
+//#endregion
+export { useBlockEnv as t };

package/dist/react-router/index.d.ts

@@ -1,10 +1,10 @@
-import { a as AnyModels, i as AnyFunctions } from "../types-BrpW5ixT.js";
-import { t as BetterSupabase } from "../define-DYZnvAbs.js";
-import { n as BetterServer } from "../server-types-fLdep4gb.js";
-import { a as AuthorizedContext, c as Unwrapped, i as AuthorizeOptions, n as ActionParsed, o as BlockActionOptions, r as ActionResult, s as BlockRequireOptions } from "../kit-De-EVRhw.js";
-import { t as RefusalRedirects } from "../refusal-C7geIBRl.js";
-import { n as FrameworkOptions, t as FrameworkLocals } from "../framework-BQhTsLX-.js";
-import { t as Validated } from "../shared-DDSjEGDR.js";
+import { a as AnyModels, i as AnyFunctions } from "../types-DmshMaXz.js";
+import { t as BetterSupabase } from "../define-D0LSXmUP.js";
+import { n as BetterServer } from "../server-types-D_cQ6OxZ.js";
+import { a as AuthorizedContext, c as ResourceLoaderContext, i as AuthorizeOptions, l as Unwrapped, n as ActionParsed, o as BlockActionOptions, r as ActionResult, s as BlockRequireOptions } from "../kit-LeQGMzLH.js";
+import { t as RefusalRedirects } from "../refusal-BEyNVFy7.js";
+import { n as FrameworkOptions, r as LocalsResource, t as FrameworkLocals } from "../framework-CMeAuJts.js";
+import { t as Validated } from "../shared-CRRfQAKG.js";
 import { AnyEntry, Contributions } from "@supabase/middleware";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/bridges/react-router.d.ts
@@ -12,24 +12,28 @@ import { StandardSchemaV1 } from "@standard-schema/spec";
 interface ReactRouterContext<Key, Value> {
   set(key: Key, value: Value): void;
 }
-/** React Router's server middleware, typed structurally so the package does not import `react-router`. */
+/**
+ * React Router's server middleware, typed structurally so the package does not
+ * import `react-router`.
+ */
 type ReactRouterMiddleware<Key, Value> = (args: {
   readonly request: Request;
   readonly context: ReactRouterContext<Key, Value>;
 }, next: () => Promise<Response>) => Promise<Response>;
 interface ToReactRouterOptions<Key, Value> {
   /**
-   * The host's env object for `getEnv`, e.g.
-   * `({ context }) => context.get(cloudflareContext).env` on Workers.
+   * The host's env object for `getEnv`, e.g. `({ context }) =>
+   * context.get(cloudflareContext).env` on Workers.
    */
   readonly env?: (args: Parameters<ReactRouterMiddleware<Key, Value>>[0]) => unknown;
 }
 /**
- * Runs an entry array as React Router server middleware. The contributions
- * are set under `key` (a `createContext()` key), so loaders and actions
- * read `context.get(key).db`.
+ * Runs an entry array as React Router server middleware. The contributions are
+ * set under `key` (a `createContext()` key), so loaders and actions read
+ * `context.get(key).db`.
  *
- * ```ts title="app/root.tsx"
+ * ```ts
+ * // app/root.tsx
  * export const supabase = createContext<BetterSupabaseContributions<...>>()
  * export const middleware = [toReactRouter([withBetterSupabase(server)], supabase)]
  * ```
@@ -52,13 +56,16 @@ interface ReactRouterOptions extends FrameworkOptions {
   /** `createContext` from `react-router`; the factory makes its own context key. */
   readonly createContext: () => unknown;
   /**
-   * The host's env object for `getEnv`, e.g.
-   * `({ context }) => context.get(cloudflareContext).env` on Workers.
+   * The host's env object for `getEnv`, e.g. `({ context }) =>
+   * context.get(cloudflareContext).env` on Workers.
    */
   readonly platformEnv?: (args: ReactRouterArgs) => unknown;
 }
 interface BetterReactRouter<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown, B = unknown> extends BetterServer<M, F, E, C, P, B> {
-  /** The context key the middleware sets: `context.get(bs.contextKey)`, or `bs.locals(args)`. */
+  /**
+   * The context key the middleware sets: `context.get(bs.contextKey)`, or
+   * `bs.locals(args)`.
+   */
   readonly contextKey: unknown;
   /**
    * Server middleware for `root.tsx`: verifies the caller, refreshes the
@@ -69,15 +76,15 @@ interface BetterReactRouter<M extends AnyModels, F extends AnyFunctions, E, C =
   locals(args: ReactRouterArgs): FrameworkLocals<M, F, E, C, P, B>;
   /**
    * A loader that runs the guard first. A refused caller gets a redirect to
-   * `signIn` or `mfa` when configured, else a thrown Problem Details
-   * response for the `ErrorBoundary`. `Result`s unwrap, and a failed one
-   * is thrown the same way.
+   * `signIn` or `mfa` when configured, else a thrown Problem Details response
+   * for the `ErrorBoundary`. `Result`s unwrap, and a failed one is thrown the
+   * same way.
    */
-  loader<A extends ReactRouterArgs, T, R extends boolean = false>(options: BlockRequireOptions<C, P, R>, fn: (args: A, ctx: FrameworkLocals<M, F, E, C, P, B> & AuthorizedContext<C, P, R>) => T): (args: A) => Promise<Unwrapped<Awaited<T>>>;
+  loader<A extends ReactRouterArgs, T, R extends boolean = false>(options: BlockRequireOptions<C, P, R, unknown, LocalsResource<M, F, E, C, P, B>>, fn: (args: A, ctx: FrameworkLocals<M, F, E, C, P, B> & AuthorizedContext<C, P, R>) => T): (args: A) => Promise<Unwrapped<Awaited<T>>>;
   /** An action returning an `ActionResult`, for `useActionData` or `useAction`. */
-  action<S extends StandardSchemaV1 | undefined, T, A extends ReactRouterArgs = ReactRouterArgs, R extends boolean = false>(options: BlockActionOptions<S, C, P, R>, fn: (input: ActionParsed<S>, ctx: FrameworkLocals<M, F, E, C, P, B> & AuthorizedContext<C, P, R>, args: A) => T): (args: A) => Promise<ActionResult<Unwrapped<Awaited<T>>>>;
+  action<S extends StandardSchemaV1 | undefined, T, A extends ReactRouterArgs = ReactRouterArgs, R extends boolean = false>(options: BlockActionOptions<S, C, P, R, unknown, LocalsResource<M, F, E, C, P, B>>, fn: (input: ActionParsed<S>, ctx: FrameworkLocals<M, F, E, C, P, B> & AuthorizedContext<C, P, R>, args: A) => T): (args: A) => Promise<ActionResult<Unwrapped<Awaited<T>>>>;
 }
 /** React Router integration: middleware, guarded loaders and actions. */
 export declare function createReactRouter<M extends AnyModels, D, F extends AnyFunctions, E, C = unknown, P = unknown, B = unknown>(betterSupabase: BetterSupabase<M, D, F, E, C, P, B>, options: ReactRouterOptions): BetterReactRouter<M, F, E, C, P, B>;
 //#endregion
-export type { ActionResult, AuthorizeOptions, AuthorizedContext, BetterReactRouter, BlockActionOptions, BlockRequireOptions, FrameworkLocals, FrameworkOptions, ReactRouterArgs, ReactRouterContext, ReactRouterContextProvider, ReactRouterMiddleware, ReactRouterOptions, RefusalRedirects, ToReactRouterOptions };
+export type { ActionResult, AuthorizeOptions, AuthorizedContext, BetterReactRouter, BlockActionOptions, BlockRequireOptions, FrameworkLocals, FrameworkOptions, ReactRouterArgs, ReactRouterContext, ReactRouterContextProvider, ReactRouterMiddleware, ReactRouterOptions, RefusalRedirects, ResourceLoaderContext, ToReactRouterOptions };

package/dist/react-router/index.js

@@ -1,17 +1,18 @@
-import { o as problemResponse } from "../problem-JRCohp1j.js";
-import { c as extendServer, o as withFlush, s as createServer } from "../adapter-CRNH2aX_.js";
-import { o as settle, t as defaultExpose } from "../respond-Bhp3G__q.js";
-import { i as requireCaller, o as runAction } from "../kit-LTbHrWWD.js";
-import { n as bufferInPlace, t as around } from "../shared-BmMcMoW9.js";
-import { i as localsOf, n as actionInput, r as frameworkEntry } from "../framework-C6PKBgme.js";
-import { r as refusalResponse } from "../refusal-CFpfmjcS.js";
+import { o as problemResponse } from "../problem-D0KDiYPk.js";
+import { c as extendServer, o as withFlush, s as createServer } from "../adapter-D8dW6p2A.js";
+import { o as settle, t as defaultExpose } from "../respond-DjEmE_DN.js";
+import { i as requireCaller, o as runAction } from "../kit-BeXTrlZn.js";
+import { n as bufferInPlace, t as around } from "../shared-Bf-I13Ht.js";
+import { i as localsOf, n as actionInput, r as frameworkEntry } from "../framework-BpEnOfAo.js";
+import { r as refusalResponse } from "../refusal-Ce2p81VW.js";
 //#region src/bridges/react-router.ts
 /**
-* Runs an entry array as React Router server middleware. The contributions
-* are set under `key` (a `createContext()` key), so loaders and actions
-* read `context.get(key).db`.
+* Runs an entry array as React Router server middleware. The contributions are
+* set under `key` (a `createContext()` key), so loaders and actions read
+* `context.get(key).db`.
 *
-* ```ts title="app/root.tsx"
+* ```ts
+* // app/root.tsx
 * export const supabase = createContext<BetterSupabaseContributions<...>>()
 * export const middleware = [toReactRouter([withBetterSupabase(server)], supabase)]
 * ```
@@ -58,7 +59,7 @@ function createReactRouter(betterSupabase, options) {
 		loader(loaderOptions, fn) {
 			return async (args) => {
 				const scope = locals(args);
-				const caller = await requireCaller(scope.bs.auth, loaderOptions, scope.tenant, options.authorizer);
+				const caller = await requireCaller(scope.bs.auth, loaderOptions, scope.tenant, options.authorizer, scope);
 				if ("kind" in caller) throw refusalResponse(caller, args.request, options, expose);
 				const ctx = {
 					...scope,
@@ -78,7 +79,7 @@ function createReactRouter(betterSupabase, options) {
 				return await runAction(scope.bs.auth, actionOptions, await actionInput(args.request), scope.tenant, (parsed, caller) => fn(parsed, {
 					...scope,
 					...caller
-				}, args), options.authorizer);
+				}, args), options.authorizer, scope);
 			};
 		}
 	});