better-supabase 0.1.0 → 0.3.0

package/dist/react/session.js

@@ -1,3 +1,21 @@
 "use client";
-import { n as useSession, t as SessionProvider } from "../session-CD-3orO_.js";
+import { createContext, createElement, use, useContext } from "react";
+//#region src/react/session.ts
+const SessionContext = createContext(null);
+/** Shares the server-verified session with Client Components. */
+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 `sb.claims(schema)`) and `P` the profile (the output of
+* `sb.userMetadata(schema)`); `createHooks().useSession` infers both.
+*/
+function useSession() {
+	const promise = useContext(SessionContext);
+	if (!promise) throw new Error("better-supabase: useSession() needs <SessionProvider sessionPromise={...}>");
+	return use(promise);
+}
+//#endregion
 export { SessionProvider, useSession };

package/dist/{react-CrOvrnIP.js → react-DNBYNazu.js}

@@ -1,8 +1,9 @@
+import { i as tenantClaimPaths, n as claimAt, r as claimsOf } from "./claims-CoTobNC-.js";
 import { t as invalidateTables } from "./invalidate-DbxuL2jL.js";
 import { n as liveQuery, t as liveCount } from "./live-D8rV1Ldw.js";
-import { n as useSession } from "./session-CD-3orO_.js";
+import { useSession } from "./react/session.js";
 import { createContext, createElement, useContext, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
-//#region src/react/index.ts
+//#region src/react/hooks.ts
 const BrowserContext = createContext(null);
 const LOADING = {
 	status: "loading",
@@ -90,9 +91,9 @@ function useBroadcast(topic, values, handlers, options) {
 	const userId = auth.user?.id ?? null;
 	if (options?.invalidate && !queryClient) throw new Error("better-supabase: useBroadcast({ invalidate }) needs <BetterSupabaseProvider queryClient={...}>");
 	useEffect(() => {
-		if (!name || auth.status === "loading") return void 0;
+		if (!name || auth.status === "loading") return;
 		const matched = topic.match(name);
-		if (!matched) return void 0;
+		if (!matched) return;
 		const forward = (payload, message) => {
 			const current = latest.current;
 			const table = current.handlers;
@@ -124,12 +125,12 @@ function useBroadcast(topic, values, handlers, options) {
 	]);
 	return status;
 }
-function claimedTenant(auth) {
+function claimedTenant(auth, meta) {
 	if (auth.status !== "signed-in") return void 0;
-	const top = auth.claims["org_id"];
-	if (typeof top === "string") return top;
-	const app = auth.claims["app_metadata"];
-	return typeof app?.["org_id"] === "string" ? app["org_id"] : void 0;
+	for (const path of tenantClaimPaths(claimsOf(meta).tenant)) {
+		const value = claimAt(auth.claims, path);
+		if (value !== void 0) return value;
+	}
 }
 /**
 * Keeps a query fresh: invalidates every cached query that read a table the
@@ -148,11 +149,11 @@ function useLiveQuery(spec, options = {}) {
 	const [status, setStatus] = useState("closed");
 	if (spec && !queryClient) throw new Error("better-supabase: useLiveQuery needs <BetterSupabaseProvider queryClient={...}>");
 	const key = spec ? JSON.stringify(spec) : null;
-	const tenant = options.tenant ?? claimedTenant(auth);
+	const tenant = options.tenant ?? claimedTenant(auth, browser.sb.meta);
 	const userId = auth.user?.id ?? null;
 	const debounceMs = options.debounceMs;
 	useEffect(() => {
-		if (!key || !queryClient || auth.status === "loading") return void 0;
+		if (!key || !queryClient || auth.status === "loading") return;
 		const live = liveQuery(browser.sb, browser.supabase, JSON.parse(key), {
 			onChange: (tables) => void invalidateTables(queryClient, tables),
 			onStatus: setStatus,
@@ -196,24 +197,28 @@ function useLiveCount(source, options = {}) {
 	});
 	const [status, setStatus] = useState("closed");
 	const key = spec ? JSON.stringify(spec) : null;
-	const tenant = options.tenant ?? claimedTenant(auth);
+	const tenant = options.tenant ?? claimedTenant(auth, browser.sb.meta);
 	const userId = auth.user?.id ?? null;
 	const debounceMs = options.debounceMs;
 	const hasInitial = initial !== void 0;
 	useEffect(() => {
-		if (!key || auth.status === "loading") return void 0;
+		if (!key || auth.status === "loading") return;
 		const live = liveCount(browser.sb, browser.supabase, browser.db, JSON.parse(key), {
 			immediate: !hasInitial,
-			onCount: (count) => setState({
-				key,
-				count,
-				error: void 0
-			}),
-			onError: (error) => setState((previous) => ({
-				key,
-				count: previous.key === key ? previous.count : void 0,
-				error
-			})),
+			onCount: (count) => {
+				setState({
+					key,
+					count,
+					error: void 0
+				});
+			},
+			onError: (error) => {
+				setState((previous) => ({
+					key,
+					count: previous.key === key ? previous.count : void 0,
+					error
+				}));
+			},
 			onStatus: setStatus,
 			...tenant === void 0 ? {} : { tenant },
 			...debounceMs === void 0 ? {} : { debounceMs }

package/dist/{read-set-DhX2d04c.js → read-set-D0qBcboM.js}

@@ -1,5 +1,5 @@
-import { r as IrBuilder, u as tableMeta } from "./simplify-oHiDKRVQ.js";
-import { n as touchedTables } from "./tables-rZxRxNPW.js";
+import { r as IrBuilder, u as tableMeta } from "./simplify-LakqK1vH.js";
+import { n as touchedTables } from "./tables-Dhha3BXM.js";
 //#region src/core/spec.ts
 const READ_METHODS = [
 	"findMany",
@@ -87,7 +87,7 @@ const TYPE = /^(?:[a-z_][a-z0-9_]*\.)?[a-z_][a-z0-9_]*(?:\[\])?$/;
 /** `jsonb_build_object` takes at most 100 arguments. */
 const MAX_ENTRIES = 50;
 /** Placeholders are `NUL bs:<name> NUL`: no real parameter value holds a NUL. */
-const NUL = String.fromCharCode(0);
+const NUL = "\0";
 const SENTINEL = new RegExp(`${NUL}bs:([a-z_][a-z0-9_]*)${NUL}`, "gi");
 const EXACT = new RegExp(`^${NUL}bs:([a-z_][a-z0-9_]*)${NUL}$`, "i");
 function sentinel(name) {

package/dist/realtime/index.d.ts

@@ -1,3 +1,5 @@
+import { x as PermdockTopicPolicy } from "../types-DONv9SHN.js";
+import { t as PermdockCatalog } from "../permdock-sql-DImJULY-.js";
 import { n as TemplateValues, t as TemplateParams } from "../template-mbvlysOo.js";
-import { C as defineTopic, S as TriggerOptions, _ as TopicEvent, a as LiveSource, b as TopicOptions, c as liveQuery, d as RealtimeClient, f as RowChange, g as Topic, h as SubscriptionStatus, i as LiveQueryOptions, l as liveTopic, m as Subscription, n as LiveCountOptions, o as LiveSubscription, p as SubscribeOptions, r as LiveCountSeed, s as liveCount, t as CountRunner, u as EventSchemas, v as TopicHandlers, w as rowChange, x as TopicPayload, y as TopicMessage } from "../live-6b9i72Ux.js";
-export { type CountRunner, EventSchemas, type LiveCountOptions, type LiveCountSeed, type LiveQueryOptions, type LiveSource, type LiveSubscription, RealtimeClient, RowChange, SubscribeOptions, Subscription, SubscriptionStatus, type TemplateParams, type TemplateValues, Topic, TopicEvent, TopicHandlers, TopicMessage, TopicOptions, TopicPayload, TriggerOptions, defineTopic, liveCount, liveQuery, liveTopic, rowChange };
+import { C as defineTopic, S as TriggerOptions, _ as TopicEvent, a as LiveSource, b as TopicOptions, c as liveQuery, d as RealtimeClient, f as RowChange, g as Topic, h as SubscriptionStatus, i as LiveQueryOptions, l as liveTopic, m as Subscription, n as LiveCountOptions, o as LiveSubscription, p as SubscribeOptions, r as LiveCountSeed, s as liveCount, t as CountRunner, u as EventSchemas, v as TopicHandlers, w as rowChange, x as TopicPayload, y as TopicMessage } from "../live-QE3UPbGm.js";
+export { type CountRunner, type EventSchemas, type LiveCountOptions, type LiveCountSeed, type LiveQueryOptions, type LiveSource, type LiveSubscription, type PermdockCatalog, type PermdockTopicPolicy, type RealtimeClient, type RowChange, type SubscribeOptions, type Subscription, type SubscriptionStatus, type TemplateParams, type TemplateValues, type Topic, type TopicEvent, type TopicHandlers, type TopicMessage, type TopicOptions, type TopicPayload, type TriggerOptions, defineTopic, liveCount, liveQuery, liveTopic, rowChange };

package/dist/realtime/index.js

@@ -1,10 +1,11 @@
 import { n as dbError } from "../errors-Bl3rkOzo.js";
 import { i as ok, n as err, t as AsyncResult } from "../result-DWXatkd6.js";
+import { i as tenantClaimPaths } from "../claims-CoTobNC-.js";
 import { n as liveQuery, r as liveTopic, t as liveCount } from "../live-D8rV1Ldw.js";
 import { s as toApp } from "../shared-_6-uPL7E.js";
-import { i as sqlString, n as slug, r as sqlIdent, t as parseTemplate } from "../template-BeOGnynM.js";
+import { a as sqlIdent, i as slug, o as sqlString, r as parseTemplate, t as permdockCheck } from "../permdock-sql-Bta_G0v-.js";
 import { REALTIME_SUBSCRIBE_STATES } from "@supabase/supabase-js";
-//#region src/realtime/index.ts
+//#region src/realtime/topic.ts
 const VALUE = /^[\w.@+=-]+$/;
 function validateValue(_name, value) {
 	return VALUE.test(value) ? void 0 : "contains characters topics do not allow";
@@ -54,7 +55,7 @@ function sendError(status, message) {
 */
 function defineTopic(template, options = {}) {
 	const parsed = parseTemplate(template, ":", validateValue);
-	const literal = template.replace(/\{[^}]+\}/g, " ");
+	const literal = template.replaceAll(/\{[^}]+\}/g, " ");
 	const name = slug(options.name ?? literal) || "topic";
 	const isPrivate = options.private ?? true;
 	const schemas = options.events ?? {};
@@ -64,10 +65,21 @@ function defineTopic(template, options = {}) {
 		return index;
 	};
 	const checks = [];
+	const permdock = options.permdock;
 	const tenantParam = options.tenant === false ? void 0 : options.tenant?.param ?? "orgId";
-	if (tenantParam && (options.tenant || parsed.params.includes(tenantParam))) {
-		const tenant = options.tenant || {};
-		const expression = tenant.sql ?? claimSql(tenant.claim ?? ["org_id", "app_metadata.org_id"]);
+	const permdockChecks = (() => {
+		if (!permdock) return void 0;
+		const where = `defineTopic(${template})`;
+		const id = permdock.scope === "global" ? void 0 : `split_part((select realtime.topic()), ':', ${String(permdock.segment ?? segment(tenantParam ?? "orgId", "PermDock"))})`;
+		const receive = permdockCheck(where, permdock, permdock.receive, id, options.catalog);
+		return {
+			receive,
+			send: permdock.send === void 0 ? receive : permdockCheck(where, permdock, permdock.send, id, options.catalog)
+		};
+	})();
+	if (!permdock && tenantParam && (options.tenant || parsed.params.includes(tenantParam))) {
+		const tenant = options.tenant === false ? {} : options.tenant ?? {};
+		const expression = tenant.sql ?? claimSql(tenant.claim ?? tenantClaimPaths());
 		checks.push(`split_part((select realtime.topic()), ':', ${String(segment(tenantParam, "tenant"))}) = (${expression})`);
 	}
 	const ownerParam = options.owner === false ? void 0 : options.owner?.param ?? "userId";
@@ -82,25 +94,28 @@ function defineTopic(template, options = {}) {
 		match: (topic) => parsed.match(topic),
 		sql() {
 			const extensions = options.presence ? "('broadcast', 'presence')" : "('broadcast')";
-			const condition = [
+			const condition = (extra) => [
 				`(select realtime.topic()) ~ ${sqlString(parsed.sqlPattern)}`,
 				`realtime.messages.extension in ${extensions}`,
-				...checks
+				...checks,
+				...extra === void 0 ? [] : [extra]
 			].join("\n    and ");
 			const lines = [`-- better-supabase: topic ${template}`];
 			const policies = [[
 				"receive",
 				"select",
-				"using"
+				"using",
+				condition(permdockChecks?.receive)
 			]];
-			if (options.send || options.presence) policies.push([
+			if (options.send || options.presence || permdock?.send !== void 0) policies.push([
 				"send",
 				"insert",
-				"with check"
+				"with check",
+				condition(permdockChecks?.send)
 			]);
-			for (const [suffix, command, clause] of policies) {
+			for (const [suffix, command, clause, check] of policies) {
 				const policy = sqlIdent(`bs_topic_${name}_${suffix}`);
-				lines.push(`drop policy if exists ${policy} on realtime.messages;`, `create policy ${policy} on realtime.messages for ${command} to authenticated\n  ${clause} (\n    ${condition}\n  );`);
+				lines.push(`drop policy if exists ${policy} on realtime.messages;`, `create policy ${policy} on realtime.messages for ${command} to authenticated\n  ${clause} (\n    ${check}\n  );`);
 			}
 			return `${lines.join("\n")}\n`;
 		},
@@ -116,7 +131,7 @@ function defineTopic(template, options = {}) {
 				if (!db) throw new TypeError(`defineTopic: no column for {${param}} on "${table}"`);
 				return `rec.${sqlIdent(db)}::text`;
 			});
-			const schema = trigger.functionSchema ?? "public";
+			const schema = trigger.functionSchema ?? "better_supabase";
 			const fn = `${sqlIdent(schema)}.${sqlIdent(`bs_broadcast_${name}_${slug(meta.name)}`)}`;
 			const triggerName = sqlIdent(`bs_broadcast_${name}`);
 			const target = `${sqlIdent(meta.schema)}.${sqlIdent(meta.name)}`;
@@ -127,6 +142,7 @@ function defineTopic(template, options = {}) {
 			]).join(" or ");
 			return [
 				`-- better-supabase: broadcast ${meta.name} changes to ${template}`,
+				`create schema if not exists ${sqlIdent(schema)};`,
 				`create or replace function ${fn}()`,
 				"returns trigger",
 				"language plpgsql",

package/dist/{resolve-DW8h9NPm.d.ts → resolve-BRciX2jK.d.ts}

@@ -1,7 +1,7 @@
-import { p as DbError } from "./result-CTkCZ6JA.js";
-import { l as RefreshEvent } from "./events-2OJsVG_d.js";
-import { h as RequestContext } from "./plugin-HvGqCurB.js";
-import { t as StandardSchemaV1 } from "./standard-CyhRzctb.js";
+import { p as DbError } from "./result-c2OYgCV2.js";
+import { f as Logger, l as RefreshEvent } from "./events-Do8jXh4D.js";
+import { h as RequestContext } from "./plugin-DVRB8qNE.js";
+import { t as StandardSchemaV1 } from "./standard-eudBiRk1.js";
 import { t as BetterSupabaseEnv } from "./index-Dy6kuF0P.js";
 import { CookieOptions } from "@supabase/ssr";
 import { JWTClaims, SupabaseEnv, UserClaims } from "@supabase/server";
@@ -47,9 +47,10 @@ declare function applyCookieWrites(cookies: readonly CookieRecord[], writes: rea
 //#region src/auth/resolve.d.ts
 /**
  * Who is calling. `C` is the claims type from `sb.claims(schema)`; the
- * verified payload keeps every JWT claim and adds the schema's output.
+ * verified payload keeps every JWT claim and adds the schema's output. `P`
+ * is the `user_metadata` type from `sb.userMetadata(schema)`.
  */
-type AuthState<C = unknown> = {
+type AuthState<C = unknown, P = unknown> = {
   readonly kind: "user";
   readonly token: string;
   readonly claims: JWTClaims & C;
@@ -57,6 +58,12 @@ type AuthState<C = unknown> = {
   readonly source: "bearer" | "cookie" | (string & {});
   /** Seconds since epoch, from the token's `exp`. */
   readonly expiresAt: number | null;
+  /**
+   * `user_metadata` parsed by `sb.userMetadata(schema)`; `undefined`
+   * without a schema or when the metadata fails it. Users can write this
+   * data themselves: use it for display, never for access.
+   */
+  readonly profile?: P;
 } | {
   readonly kind: "service";
   readonly keyName: string;
@@ -69,7 +76,7 @@ type AuthState<C = unknown> = {
   readonly reason: InvalidReason;
   readonly error: DbError;
 };
-type InvalidReason = "token" | "claims";
+type InvalidReason = "token" | "claims" | "actor";
 /**
  * What an `AuthResolver` returns. `reason` may be left out of an `invalid`
  * state; it then counts as `token`.
@@ -114,6 +121,14 @@ interface ResolveAuthOptions {
    * resolves to `{ kind: 'invalid', reason: 'claims' }`.
    */
   readonly claims?: StandardSchemaV1;
+  /**
+   * Parses `user_metadata` into `profile` (`sb.userMetadata(schema)` sets
+   * it). A failure leaves `profile` undefined and warns once; the session
+   * stays valid.
+   */
+  readonly userMetadata?: StandardSchemaV1;
+  /** Receives the `userMetadata` warning. Defaults to `console`. */
+  readonly logger?: Logger;
   readonly resolvers?: readonly AuthResolver[];
   /**
    * The caller's IP, sent to Auth as `Sb-Forwarded-For` on refreshes so its
@@ -125,10 +140,11 @@ interface ResolveAuthOptions {
   /** Called after every refresh attempt (metrics, logging). */
   readonly onRefresh?: (event: RefreshEvent) => void;
   readonly fetch?: typeof fetch;
+  /** Epoch milliseconds, the unit JWT `exp` and `iat` math needs. */
   readonly now?: () => number;
 }
-interface AuthResolution<C = unknown> {
-  readonly auth: AuthState<C>;
+interface AuthResolution<C = unknown, P = unknown> {
+  readonly auth: AuthState<C, P>;
   /** Cookie writes for the response. Empty unless the session was refreshed or cleared. */
   readonly cookies: readonly CookieWrite[];
   /** No-store headers, set whenever `cookies` is not empty. */

package/dist/{resource-SkPTRJDD.d.ts → resource-CwVgiI5q.d.ts}

@@ -1,13 +1,14 @@
-import { A as TableMeta, P as Update, h as Insert, k as TableKey, n as AnyModels, t as AnyFunctions } from "./types-C2fslP1z.js";
-import { b as ValidationIssue, o as Result } from "./result-CTkCZ6JA.js";
-import { t as BetterSupabase, xt as SelectArg } from "./define-CTfWw-SS.js";
-import { r as RespondOptions } from "./respond-PoTpy5DT.js";
-import { i as ResourceOperation } from "./index-DRid0qIv.js";
+import { N as TableKey, P as TableMeta, R as Update, g as Insert, n as AnyModels, t as AnyFunctions } from "./types-DONv9SHN.js";
+import { b as ValidationIssue, o as Result } from "./result-c2OYgCV2.js";
+import { t as BetterSupabase, xt as SelectArg } from "./define-DUbydmJa.js";
+import { r as RespondOptions } from "./respond-DAkPIdTH.js";
+import { i as ResourceOperation } from "./index-qriRM9cZ.js";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/server/resource.d.ts
 /** What a resource needs from `defineListQuery`. */
 interface ResourceList {
   readonly table: string;
+  readonly pagination?: ResourcePagination;
   readonly openapi: readonly unknown[];
   readonly jsonSchema: Readonly<Record<string, unknown>>;
   parse(input: never): {
@@ -31,9 +32,16 @@ interface ResourceRouteOptions<M extends AnyModels, T extends TableKey<M>> {
     readonly create?: StandardSchemaV1<unknown, Insert<M, T>>;
     readonly update?: StandardSchemaV1<unknown, Update<M, T>>;
   };
-  /** Largest page for the default `page`/`size` list. Defaults to 200. */
+  /**
+   * Paging of the default list: `offset` (`page` and `size`) or `cursor`
+   * (`after` and `size`, keyset). A `list` query brings its own. Defaults
+   * to `offset`.
+   */
+  readonly pagination?: ResourcePagination;
+  /** Largest page for the default list. Defaults to 200. */
   readonly maxPageSize?: number;
 }
+type ResourcePagination = "offset" | "cursor";
 interface ResourceInput {
   /** Primary key value; strings are converted for integer keys. */
   readonly id?: unknown;
@@ -49,6 +57,7 @@ interface ResourceHandler {
   /** Name of the key parameter, or `undefined` for tables without a single-column key. */
   readonly keyParam: string | undefined;
   readonly list: ResourceList | undefined;
+  readonly pagination: ResourcePagination;
   readonly maxPageSize: number;
   /** Runs one operation as whoever `db` is bound to. Resolves to a `Result`. */
   execute(db: object, operation: ResourceOperation, input?: ResourceInput): Promise<Result<unknown>>;
@@ -62,4 +71,4 @@ interface ResourceHandler {
  */
 declare function defineResource<M extends AnyModels, D, F extends AnyFunctions, E, T extends TableKey<M>>(sb: BetterSupabase<M, D, F, E>, table: T, options?: ResourceRouteOptions<M, T>): ResourceHandler;
 //#endregion
-export { defineResource as a, ResourceRouteOptions as i, ResourceInput as n, ResourceList as r, ResourceHandler as t };
+export { ResourceRouteOptions as a, ResourcePagination as i, ResourceInput as n, defineResource as o, ResourceList as r, ResourceHandler as t };

package/dist/{resource-CYiu6Ygi.js → resource-D30rp0GN.js}

@@ -1,7 +1,7 @@
 import { n as dbError } from "./errors-Bl3rkOzo.js";
 import { i as ok, n as err } from "./result-DWXatkd6.js";
 import { t as validate } from "./standard-FUi3Z3-7.js";
-import { i as respond } from "./respond-4-dhoV7x.js";
+import { i as respond } from "./respond-C44EZAJo.js";
 //#region src/server/resource.ts
 const INTEGER = /* @__PURE__ */ new Set([
 	"int2",
@@ -24,24 +24,44 @@ async function readBody(request) {
 	} catch {}
 	return err(dbError("invalid_request", "The request body must be a JSON object"));
 }
-function pageArgs(query, max) {
+function pageArgs(query, max, pagination) {
+	const raw = (name) => {
+		const value = query instanceof URLSearchParams ? query.get(name) : query?.[name];
+		return value === null || value === "" ? void 0 : value;
+	};
 	const read = (name, fallback) => {
-		const raw = query instanceof URLSearchParams ? query.get(name) : query?.[name];
-		if (raw === null || raw === void 0 || raw === "") return fallback;
-		const value = Number(raw);
-		return Number.isSafeInteger(value) && value >= 1 ? value : void 0;
+		const value = raw(name);
+		if (value === void 0) return fallback;
+		const number = Number(value);
+		return Number.isSafeInteger(number) && number >= 1 ? number : void 0;
 	};
-	const page = read("page", 1);
+	const issues = [];
 	const size = read("size", 50);
-	if (page === void 0 || size === void 0 || size > max) return err(dbError("validation", "Invalid page parameters", { issues: [...page === void 0 ? [{
-		message: "Must be a positive integer",
-		path: ["page"]
-	}] : [], ...size === void 0 || size > max ? [{
+	if (size === void 0 || size > max) issues.push({
 		message: `Must be between 1 and ${max}`,
 		path: ["size"]
-	}] : []] }));
-	return ok({
-		page,
+	});
+	const [used, unused] = pagination === "cursor" ? ["after", "page"] : ["page", "after"];
+	if (raw(unused) !== void 0) issues.push({
+		message: `This list pages with \`${used}\``,
+		path: [unused]
+	});
+	const page = read("page", 1);
+	if (pagination === "offset" && page === void 0) issues.push({
+		message: "Must be a positive integer",
+		path: ["page"]
+	});
+	const after = raw("after");
+	if (pagination === "cursor" && after !== void 0 && typeof after !== "string") issues.push({
+		message: "Must be text",
+		path: ["after"]
+	});
+	if (issues.length > 0 || size === void 0) return err(dbError("validation", "Invalid page parameters", { issues }));
+	return pagination === "cursor" ? ok({
+		after: typeof after === "string" ? after : null,
+		size
+	}) : ok({
+		page: page ?? 1,
 		size
 	});
 }
@@ -78,6 +98,7 @@ function defineResource(sb, table, options = {}) {
 	const extra = options.select === void 0 ? {} : { select: options.select };
 	const maxPageSize = options.maxPageSize ?? 200;
 	const list = options.list;
+	const pagination = list ? list.pagination ?? "offset" : options.pagination ?? "offset";
 	const execute = async (db, operation, input = {}) => {
 		const repository = db[table];
 		if (!repository) throw new TypeError(`The db has no "${table}" repository`);
@@ -90,12 +111,12 @@ function defineResource(sb, table, options = {}) {
 					if (!query.ok) return err(dbError("validation", "Invalid list query", { issues: query.issues }));
 					return settled(list.run(db, query.value, extra));
 				}
-				const page = pageArgs(input.query, maxPageSize);
+				const page = pageArgs(input.query, maxPageSize, pagination);
 				if (!page.ok) return page;
 				return settled(repository.paginate({
 					...extra,
 					...page.data,
-					count: "exact"
+					..."page" in page.data ? { count: "exact" } : {}
 				}));
 			}
 			case "get": {
@@ -160,6 +181,7 @@ function defineResource(sb, table, options = {}) {
 		operations,
 		keyParam,
 		list,
+		pagination,
 		maxPageSize,
 		execute,
 		handle(request, db, id, respondOptions = {}) {

package/dist/{respond-4-dhoV7x.js → respond-C44EZAJo.js}

@@ -1,10 +1,11 @@
 import { n as dbError, o as isDbError, r as dbErrorOf } from "./errors-Bl3rkOzo.js";
 import { i as ok, n as err, o as toDbError, t as AsyncResult } from "./result-DWXatkd6.js";
-import { a as postgrestExecutor, n as StatsRecorder } from "./stats-3iy8u3_P.js";
-import { a as problemResponse } from "./problem-DPu6Fh-t.js";
-import { i as loadEnv } from "./env-BEToab0I.js";
-import { h as actClaim, i as authContext, o as resolveAuth, r as checkAal } from "./mfa-CpogP66z.js";
-import { n as postgresExecutor } from "./executor-Ceq60hPM.js";
+import { a as postgrestExecutor, n as StatsRecorder } from "./stats-D78UQ8Yu.js";
+import { a as problemResponse } from "./problem-CGt1ADix.js";
+import { loadEnv } from "./env/index.js";
+import { _ as actClaim, g as delegationOf, h as actorOf, i as authContext, o as resolveAuth, r as checkAal } from "./mfa-BxoR1RkN.js";
+import { n as postgresExecutor } from "./executor-C57jx2pn.js";
+import { parseCookieHeader, serializeCookieHeader } from "@supabase/ssr";
 import { createClient } from "@supabase/supabase-js";
 //#region src/server/replicas.ts
 /** Cookie holding the epoch ms until which reads stay on the primary. */
@@ -29,19 +30,18 @@ function replicaState(pinnedUntil = 0, now = Date.now()) {
 /** `bs-primary-until` from a `cookie` header, or 0. */
 function pinnedUntil(cookieHeader) {
 	if (!cookieHeader) return 0;
-	for (const part of cookieHeader.split(";")) {
-		const [name, value] = part.trim().split("=", 2);
-		if (name === "bs-primary-until") {
-			const until = Number(value);
-			return Number.isFinite(until) ? until : 0;
-		}
-	}
-	return 0;
+	const value = parseCookieHeader(cookieHeader).find((cookie) => cookie.name === PRIMARY_COOKIE)?.value;
+	const until = Number(value);
+	return value !== void 0 && Number.isFinite(until) ? until : 0;
 }
 /** A `Set-Cookie` value keeping the next requests on the primary for `pinMs`. */
 function primaryCookie(pinMs, now = Date.now()) {
-	const seconds = Math.max(1, Math.ceil(pinMs / 1e3));
-	return `${PRIMARY_COOKIE}=${String(now + pinMs)}; Path=/; Max-Age=${String(seconds)}; HttpOnly; SameSite=Lax`;
+	return serializeCookieHeader(PRIMARY_COOKIE, String(now + pinMs), {
+		path: "/",
+		maxAge: Math.max(1, Math.ceil(pinMs / 1e3)),
+		httpOnly: true,
+		sameSite: "lax"
+	});
 }
 /**
 * Reads go to `replica` until the context is pinned; writes, and every read
@@ -248,7 +248,7 @@ function createServer(sb, options = {}) {
 				return replica;
 			},
 			get sql() {
-				if (!options.postgres || !sqlClaims) return void 0;
+				if (!options.postgres || !sqlClaims) return;
 				sql ??= sqlFor(sqlClaims, context, recorder);
 				return sql;
 			},
@@ -257,11 +257,14 @@ function createServer(sb, options = {}) {
 	};
 	const resolve = async (request, resolveOptions = {}) => {
 		const claims = options.auth?.claims ?? sb.claimsSchema;
+		const userMetadata = sb.userMetadataSchema;
 		const resolution = await resolveAuth(request, {
+			logger: sb.events.logger,
 			...options.auth,
 			...claims ? { claims } : {},
+			...userMetadata ? { userMetadata } : {},
 			env: env(),
-			...resolveOptions.refresh !== void 0 ? { refresh: resolveOptions.refresh } : {},
+			...resolveOptions.refresh === void 0 ? {} : { refresh: resolveOptions.refresh },
 			onRefresh: (event) => {
 				options.auth?.onRefresh?.(event);
 				sb.events.emit("refresh", event);
@@ -326,10 +329,26 @@ function createServer(sb, options = {}) {
 }
 //#endregion
 //#region src/server/respond.ts
+/** The scopes a delegated user token lacks; empty for the user's own session. */
+function missingScopes(auth, required) {
+	if (required.length === 0) return [];
+	const outcome = actorOf(auth.claims);
+	if (!outcome.ok || !outcome.actor) return [];
+	const granted = new Set(delegationOf(auth.claims)?.scopes);
+	return required.filter((scope) => !granted.has(scope));
+}
 /** `undefined` when `auth` may pass; otherwise the 401/403 error to send. */
-function guard(auth, allow = ["user"], aal = "aal1") {
+function guard(auth, allow = ["user"], aal = "aal1", scopes = []) {
 	if (auth.kind === "invalid") return auth.error;
-	if (allow.includes(auth.kind)) return checkAal(auth, aal);
+	if (allow.includes(auth.kind)) {
+		const denied = checkAal(auth, aal);
+		if (denied || auth.kind !== "user") return denied;
+		const missing = missingScopes(auth, scopes);
+		return missing.length > 0 ? dbError("forbidden", `The token lacks the scope ${missing.join(" ")}`, {
+			code: "INSUFFICIENT_SCOPE",
+			scopes
+		}) : void 0;
+	}
 	return auth.kind === "anon" ? dbError("unauthorized", "Sign in to continue", { code: "MISSING_CREDENTIALS" }) : dbError("forbidden", `A ${auth.kind} caller is not allowed here`);
 }
 function isResult(value) {