better-supabase 0.2.0 → 0.4.0

package/dist/next/index.js

@@ -1,13 +1,13 @@
-import { n as dbError } from "../errors-Bl3rkOzo.js";
-import { n as StatsRecorder, t as EMPTY_STATS } from "../stats-C5W-rBfR.js";
-import { o as isReadSet } from "../read-set-4lI3W_gZ.js";
-import { t as validate } from "../standard-FUi3Z3-7.js";
-import { a as problemResponse } from "../problem-BTkTtRV9.js";
+import { n as dbError } from "../errors-L0xK41y_.js";
+import { n as StatsRecorder, t as EMPTY_STATS } from "../stats-C_YxA2r1.js";
+import { o as isReadSet } from "../read-set-FWK8qQ58.js";
+import { t as validate } from "../standard-BRyBGTtp.js";
+import { a as problemResponse } from "../problem-BihjPR0t.js";
 import { t as isList } from "../guards-BnzDvFrz.js";
 import { t as hasEntitlement } from "../entitlements-CTEBm7IB.js";
-import { a as settle, c as withExtra, d as primaryCookie, i as respond, n as guard, o as createServer, s as extendServer, t as defaultExpose, u as PRIMARY_COOKIE } from "../respond-DMcbQwfN.js";
-import { r as checkAal } from "../mfa-CpLfJSde.js";
-import { t as toSession } from "../view-aOYizTeE.js";
+import { a as guard, c as settle, d as primaryCookie, i as defaultExpose, n as extendServer, r as withExtra, s as respond, t as createServer, u as PRIMARY_COOKIE } from "../server-BA75B0mT.js";
+import { r as checkAal } from "../mfa-byfjruR9.js";
+import { t as toSession } from "../view-BrJI2LKp.js";
 import { cache } from "react";
 import { cacheLife, cacheTag, revalidateTag, updateTag } from "next/cache.js";
 import { cookies, headers } from "next/headers.js";
@@ -43,7 +43,9 @@ var StatsCollector = class {
 		this.#prune();
 		const entry = {
 			created: Date.now(),
-			recorder: new CollectedRecorder(() => this.#schedule(id))
+			recorder: new CollectedRecorder(() => {
+				this.#schedule(id);
+			})
 		};
 		this.#entries.set(id, entry);
 		return entry.recorder;
@@ -140,8 +142,8 @@ function serverTimingValue(metrics) {
 	return Object.entries(metrics).map(([name, ms]) => `${name};dur=${ms.toFixed(1)}`).join(", ");
 }
 //#endregion
-//#region src/next/index.ts
-/** Response header with the URL of the request's totals on `next.debugRoute()`. */
+//#region src/next/create.ts
+/** Response header with the URL of the request's totals on `bs.debugRoute()`. */
 const STATS_URL_HEADER = "x-bs-stats";
 /**
 * `cacheLife` `stale` seconds for a view of `session`: `max`, but never past
@@ -154,7 +156,7 @@ function sessionStale(session, options = {}, now = Date.now()) {
 	const remaining = session.expiresAt - Math.floor(now / 1e3);
 	return Math.min(max, Math.max(min, remaining));
 }
-/** The tag `next.cached()` puts on a user's entries. */
+/** The tag `bs.cached()` puts on a user's entries. */
 function sessionTag(userId) {
 	return `bs:session:${userId}`;
 }
@@ -200,7 +202,7 @@ function formDataObject(form) {
 * combine it with your sign-in redirect.
 *
 * ```ts
-* next.proxy(request, {
+* bs.proxy(request, {
 *   protect: requireAal('aal2', { redirect: '/mfa', match: (path) => path.startsWith('/settings') }),
 * });
 * ```
@@ -208,10 +210,10 @@ function formDataObject(form) {
 function requireAal(level, options = {}) {
 	return (auth, request) => {
 		const { pathname, search } = request.nextUrl;
-		if (options.redirect !== void 0 && pathname === options.redirect) return void 0;
-		if (options.match && !options.match(pathname)) return void 0;
+		if (options.redirect !== void 0 && pathname === options.redirect) return;
+		if (options.match && !options.match(pathname)) return;
 		const denied = checkAal(auth, level);
-		if (!denied) return void 0;
+		if (!denied) return;
 		if (options.redirect === void 0) return problemResponse(denied);
 		const target = new URL(options.redirect, request.url);
 		target.searchParams.set("next", `${pathname}${search}`);
@@ -233,20 +235,20 @@ function shouldRefresh(request) {
 * actions and cache tags, on top of `createServer`.
 *
 * ```ts
-* export const next = createNext(sb);
+* export const bs = createNext(betterSupabase);
 * ```
 */
-function createNext(sb, options = {}) {
-	const base = createServer(sb, options);
+function createNext(betterSupabase, options = {}) {
+	const base = createServer(betterSupabase, options);
 	const pinMs = options.replicas?.pinMs ?? 5e3;
 	const expose = options.exposeErrors ?? defaultExpose();
-	if (options.cacheTags !== false) sb.cache(nextCache());
+	if (options.cacheTags !== false) betterSupabase.cache(nextCache());
 	const debug = options.debug;
 	const statsHeader = debug?.header ?? "x-bs-db-calls";
 	const statsRoute = debug?.route ?? "/api/bs-stats";
-	const development = typeof process !== "undefined" && process.env["NODE_ENV"] === "development";
-	const collector = debug && (debug.enabled ?? development) ? sharedCollector({
-		logger: sb.events.logger,
+	const development = process.env["NODE_ENV"] === "development";
+	const collector = debug?.enabled ? sharedCollector({
+		logger: betterSupabase.events.logger,
 		warn: development,
 		...debug.budget ? { budget: debug.budget } : {}
 	}) : void 0;
@@ -255,48 +257,59 @@ function createNext(sb, options = {}) {
 		return id ? { stats: collector.recorderFor(id) } : {};
 	};
 	const incomingRequest = async () => new Request("http://next.local/", { headers: new Headers(await headers()) });
-	const server = cache(async () => {
+	/** One token verification per render scope backs `context()`, `session()` and `cached()`. */
+	const incoming = cache(async () => {
 		const request = await incomingRequest();
-		return base.context(request, statsFor(request));
+		return {
+			request,
+			resolution: await base.resolve(request, { refresh: false })
+		};
 	});
-	const session = cache(async () => {
-		const resolution = await base.resolve(await incomingRequest(), { refresh: false });
-		return toSession(resolution.auth);
+	const current = cache(async () => {
+		const { request, resolution } = await incoming();
+		return base.contextFromResolution(resolution, request, statsFor(request));
 	});
-	const serverFor = async (view, { token }) => {
+	const context = (request, contextOptions) => request ? base.context(request, contextOptions) : current();
+	const session = cache(async () => toSession((await incoming()).resolution.auth));
+	const contextForSession = async (view, { token }) => {
 		const request = new Request("http://next.local/", { headers: token ? { authorization: `Bearer ${token}` } : {} });
 		const ctx = await base.context(request);
 		if (ctx.auth.kind === "user" ? view.kind === "user" && view.user.id === ctx.auth.user.id : view.kind !== "user") return ctx;
 		return base.contextFor({
 			kind: "invalid",
 			reason: "token",
-			error: dbError("unauthorized", "The token does not belong to the session passed to serverFor()")
+			error: dbError("unauthorized", "The token does not belong to the session passed to contextForSession()")
 		});
 	};
-	const withAccounts = withExtra(base, { deleteAccount: ((userId, deleteOptions) => base.deleteAccount(userId, deleteOptions).map((result) => {
-		invalidate(sessionTag(userId));
-		return result;
-	})) });
+	const withAccounts = withExtra(base, {
+		context,
+		deleteAccount: ((userId, deleteOptions) => base.deleteAccount(userId, deleteOptions).map((result) => {
+			invalidate(sessionTag(userId));
+			return result;
+		}))
+	});
 	return extendServer(withAccounts, {
-		server,
 		session,
-		serverFor,
+		contextForSession,
 		async cached(cachedOptions = {}) {
-			const [view, ctx] = await Promise.all([session(), server()]);
+			const [view, ctx] = await Promise.all([session(), current()]);
 			const life = cachedOptions.life;
+			const stale = sessionStale(view, life);
 			cacheLife({
-				stale: sessionStale(view, life),
+				stale: life?.stale === void 0 ? stale : Math.min(stale, life.stale),
 				...life?.revalidate === void 0 ? {} : { revalidate: life.revalidate },
 				...life?.expire === void 0 ? {} : { expire: life.expire }
 			});
-			if (view.kind === "user") cacheTag(sessionTag(view.user.id));
+			const tags = [...view.kind === "user" ? [sessionTag(view.user.id)] : [], ...cachedOptions.tags ?? []];
+			if (tags.length > 0) cacheTag(...tags);
 			return withExtra(ctx, { session: view });
 		},
-		invalidateSession(userId) {
+		invalidateSession(userId, invalidateOptions = {}) {
 			invalidate(sessionTag(userId));
+			for (const tag of invalidateOptions.tags ?? []) invalidate(tag);
 		},
 		async liveCount(spec, db) {
-			const result = await (db ?? (await server()).db).$run(spec);
+			const result = await (db ?? (await current()).db).$run(spec);
 			return {
 				spec,
 				count: result.ok && typeof result.data === "number" ? result.data : null
@@ -337,7 +350,7 @@ function createNext(sb, options = {}) {
 		route(handler, guardOptions = {}) {
 			return async (request, segment) => {
 				const ctx = await base.context(request, statsFor(request));
-				const denied = guard(ctx.auth, guardOptions.allow, guardOptions.aal);
+				const denied = guard(ctx.auth, guardOptions.allow, guardOptions.aal, guardOptions.scopes);
 				const instance = request.nextUrl.pathname;
 				if (denied) return problemResponse(denied, {
 					instance,
@@ -358,23 +371,23 @@ function createNext(sb, options = {}) {
 			};
 		},
 		debugRoute() {
-			return async (request) => {
+			return (request) => {
 				const id = new URL(request.url).searchParams.get("id");
-				if (!collector || !id) return Response.json({ error: collector ? "missing ?id=" : "debug is off" }, {
+				if (!collector || !id) return Promise.resolve(Response.json({ error: collector ? "missing ?id=" : "debug is off" }, {
 					status: 404,
 					headers: { "cache-control": "no-store" }
-				});
+				}));
 				const stats = collector.get(id) ?? EMPTY_STATS;
-				return Response.json(stats, { headers: {
+				return Promise.resolve(Response.json(stats, { headers: {
 					[statsHeader]: formatStats(stats),
 					"cache-control": "no-store"
-				} });
+				} }));
 			};
 		},
 		action(actionOptions, fn) {
 			return async (input) => {
-				const ctx = await server();
-				const denied = guard(ctx.auth, actionOptions.allow, actionOptions.aal);
+				const ctx = await current();
+				const denied = guard(ctx.auth, actionOptions.allow, actionOptions.aal, actionOptions.scopes);
 				if (denied) return {
 					ok: false,
 					data: null,
@@ -415,7 +428,7 @@ function createNext(sb, options = {}) {
 			const specs = isReadSet(target) ? Object.values(target.specs) : isList(target) ? target : [target];
 			const tags = /* @__PURE__ */ new Set();
 			for (const spec of specs) {
-				for (const table of sb.tablesOf(spec)) tags.add(tagFor(table));
+				for (const table of betterSupabase.tablesOf(spec)) tags.add(tagFor(table));
 				const [id] = spec.args;
 				if (spec.method === "findById" && (typeof id === "string" || typeof id === "number")) tags.add(tagFor(spec.table, id));
 			}

package/dist/openapi/index.d.ts

@@ -1,2 +1,2 @@
-import { a as ResourceOptions, i as ResourceOperation, n as OpenApiOptions, o as createOpenApi, r as PROBLEM_SCHEMA, t as OpenApiDocument } from "../index-DbxFr7XG.js";
+import { a as ResourceOptions, i as ResourceOperation, n as OpenApiOptions, o as createOpenApi, r as PROBLEM_SCHEMA, t as OpenApiDocument } from "../index-BhHEC04r.js";
 export { OpenApiDocument, OpenApiOptions, PROBLEM_SCHEMA, ResourceOperation, ResourceOptions, createOpenApi };

package/dist/openapi/index.js

@@ -1,6 +1,6 @@
-import { n as PROBLEM_TYPE_BASE, t as PROBLEM_CONTENT_TYPE } from "../problem-BTkTtRV9.js";
+import { n as PROBLEM_TYPE_BASE, t as PROBLEM_CONTENT_TYPE } from "../problem-BihjPR0t.js";
 import { t as SPEC_PINS } from "../spec-pins-C3oc-Tdp.js";
-import { t as buildJsonSchema } from "../json-schema-BpYqkCKf.js";
+import { t as buildJsonSchema } from "../json-schema-DP6V7cbr.js";
 //#region src/openapi/index.ts
 /** JSON Schema for RFC 9457 Problem Details as better-supabase sends them. */
 const PROBLEM_SCHEMA = {
@@ -81,7 +81,7 @@ const ERRORS = [
 		"Validation or a check constraint failed."
 	]
 ];
-const pascal = (value) => value.replace(/(^|[_-])(\w)/g, (_, _sep, char) => char.toUpperCase());
+const pascal = (value) => value.replaceAll(/(^|[_-])(\w)/g, (_, _sep, char) => char.toUpperCase());
 const ref = (name) => ({ $ref: `#/components/schemas/${name}` });
 const response = (name) => ({ $ref: `#/components/responses/${name}` });
 function errorResponses(codes) {
@@ -95,8 +95,14 @@ function jsonBody(schema, description) {
 		content: { "application/json": { schema } }
 	};
 }
-function pageParameters() {
-	return [{
+function pageParameters(cursor, maxPageSize) {
+	return [cursor ? {
+		name: "after",
+		in: "query",
+		required: false,
+		description: "`nextCursor` of the previous page. Leave it out for the first page.",
+		schema: { type: "string" }
+	} : {
 		name: "page",
 		in: "query",
 		required: false,
@@ -114,26 +120,68 @@ function pageParameters() {
 		schema: {
 			type: "integer",
 			minimum: 1,
-			maximum: 200,
+			maximum: maxPageSize,
 			default: 50
 		}
 	}];
 }
+function pageSchema(row, cursor) {
+	const items = {
+		type: "array",
+		items: row
+	};
+	return cursor ? {
+		type: "object",
+		required: [
+			"items",
+			"nextCursor",
+			"hasMore"
+		],
+		properties: {
+			items,
+			nextCursor: { type: ["string", "null"] },
+			hasMore: { type: "boolean" }
+		}
+	} : {
+		type: "object",
+		required: ["items", "page"],
+		properties: {
+			items,
+			page: {
+				type: "object",
+				required: [
+					"number",
+					"size",
+					"total",
+					"pages",
+					"hasMore"
+				],
+				properties: {
+					number: { type: "integer" },
+					size: { type: "integer" },
+					total: { type: ["integer", "null"] },
+					pages: { type: ["integer", "null"] },
+					hasMore: { type: "boolean" }
+				}
+			}
+		}
+	};
+}
 /**
 * An OpenAPI 3.1 document for REST resources over your tables, with schemas
 * from the generated metadata, list-query parameters, Supabase security
 * schemes and Problem Details errors.
 *
 * ```ts
-* const doc = createOpenApi(sb, {
+* const doc = createOpenApi(betterSupabase, {
 *   info: { title: 'CRM API', version: '1.0.0' },
 *   resources: { customers: { list: customerList }, notes: { operations: ['list', 'get'] } },
 * });
 * ```
 */
-function createOpenApi(sb, options) {
+function createOpenApi(betterSupabase, options) {
 	const defs = buildJsonSchema({
-		meta: sb.meta,
+		meta: betterSupabase.meta,
 		config: { json: options.json ?? {} }
 	})["$defs"];
 	const schemas = { Problem: PROBLEM_SCHEMA };
@@ -142,7 +190,7 @@ function createOpenApi(sb, options) {
 	const base = (options.basePath ?? "").replace(/\/$/, "");
 	const security = options.security ?? ["bearer"];
 	for (const [key, raw] of Object.entries(options.resources)) {
-		const table = sb.meta.tables[key];
+		const table = betterSupabase.meta.tables[key];
 		if (!table) throw new TypeError(`createOpenApi: unknown table "${key}"`);
 		const resource = raw === true ? {} : raw;
 		const operations = resource.operations ?? (table.kind === "view" ? ["list", "get"] : [
@@ -167,33 +215,8 @@ function createOpenApi(sb, options) {
 			const schema = defs[`${key}${variant}`];
 			if (schema) schemas[`${name}${variant}`] = schema;
 		}
-		schemas[`${name}Page`] = {
-			type: "object",
-			required: ["items", "page"],
-			properties: {
-				items: {
-					type: "array",
-					items: ref(`${name}Row`)
-				},
-				page: {
-					type: "object",
-					required: [
-						"number",
-						"size",
-						"total",
-						"pages",
-						"hasMore"
-					],
-					properties: {
-						number: { type: "integer" },
-						size: { type: "integer" },
-						total: { type: ["integer", "null"] },
-						pages: { type: ["integer", "null"] },
-						hasMore: { type: "boolean" }
-					}
-				}
-			}
-		};
+		const cursor = (resource.list ? resource.list.pagination : resource.pagination) === "cursor";
+		schemas[`${name}Page`] = pageSchema(ref(`${name}Row`), cursor);
 		const collection = `${base}${resource.path ?? `/${key}`}`;
 		const keyColumn = table.primaryKey.length === 1 ? table.primaryKey[0] : void 0;
 		const idSchema = keyColumn ? (defs[`${key}Row`]?.["properties"])?.[keyColumn] ?? { type: "string" } : void 0;
@@ -215,7 +238,7 @@ function createOpenApi(sb, options) {
 		for (const operation of operations) switch (operation) {
 			case "list":
 				(paths[collection] ??= {})["get"] = op("list", `List ${key}`, {
-					parameters: resource.list?.openapi ?? pageParameters(),
+					parameters: resource.list?.openapi ?? pageParameters(cursor, resource.maxPageSize ?? 200),
 					responses: {
 						"200": jsonBody(ref(`${name}Page`), `A page of ${key}.`),
 						...errorResponses([

package/dist/orpc/index.d.ts

@@ -1,9 +1,9 @@
-import { n as AnyModels, t as AnyFunctions } from "../types-C83v5SQz.js";
-import { o as Result, p as DbError } from "../result-CTkCZ6JA.js";
-import { t as BetterSupabase } from "../define-e3zI4_4g.js";
-import { r as AuthState } from "../resolve-CjHILk2w.js";
-import { d as ServerContext, f as ServerOptions, l as BetterServer, n as GuardOptions } from "../respond-Dne1ARSa.js";
-import { r as ProblemDetails } from "../problem-DlgB0lYl.js";
+import { n as AnyModels, t as AnyFunctions } from "../types-DONv9SHN.js";
+import { o as Result, p as DbError } from "../result-CqEsbgYs.js";
+import { t as BetterSupabase } from "../define-CRS2MRV3.js";
+import { r as AuthState } from "../resolve-BAqQcwMW.js";
+import { f as ServerContext, n as GuardOptions, p as ServerOptions, r as MiddlewareOptions, u as BetterServer } from "../respond-DgIbdrt8.js";
+import { r as ProblemDetails } from "../problem-U8UEKccv.js";
 import { DecoratedMiddleware, ORPCError } from "@orpc/server";
 //#region src/orpc/index.d.ts
 /** Initial context: pass `{ context: { request } }` to the oRPC handler. */
@@ -11,36 +11,33 @@ export interface OrpcRequestContext {
   readonly request: Request;
 }
 /** What `middleware()` adds to `context`. */
-export interface OrpcContext<M extends AnyModels, F extends AnyFunctions, E> {
-  readonly bs: ServerContext<M, F, E>;
-  readonly db: ServerContext<M, F, E>["db"];
-  readonly auth: AuthState;
+export interface OrpcContext<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown> {
+  readonly bs: ServerContext<M, F, E, C, P>;
+  readonly db: ServerContext<M, F, E, C, P>["db"];
+  readonly auth: AuthState<C, P>;
 }
 export interface OrpcOptions extends ServerOptions {
   /** Include internal error messages. Defaults to `NODE_ENV === 'development'`. */
   readonly exposeErrors?: boolean;
 }
-export interface MiddlewareOptions extends GuardOptions {
-  /** Refresh an expired cookie session. Pair with `ctx.bs.resolution.apply` in the handler adapter. */
-  readonly refresh?: boolean;
-}
-export type OrpcMiddleware<M extends AnyModels, F extends AnyFunctions, E> = DecoratedMiddleware<OrpcRequestContext, OrpcContext<M, F, E>, unknown, unknown, Record<never, never>>;
-export interface BetterOrpc<M extends AnyModels, F extends AnyFunctions, E> extends BetterServer<M, F, E> {
+export type OrpcMiddleware<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown> = DecoratedMiddleware<OrpcRequestContext, OrpcContext<M, F, E, C, P>, unknown, unknown, Record<never, never>>;
+export interface BetterOrpc<M extends AnyModels, F extends AnyFunctions, E, C = unknown, P = unknown> extends BetterServer<M, F, E, C, P> {
   /**
    * Resolves the caller, enforces `allow` and adds `context.db`, `context.auth`
    * and `context.bs`. Thrown `DbException`s, and errors caused by a
-   * `DbError`, become `ORPCError`s.
+   * `DbError`, become `ORPCError`s. With `refresh`, pair it with
+   * `ctx.bs.resolution.apply` in the handler adapter.
    */
-  middleware(options?: MiddlewareOptions): OrpcMiddleware<M, F, E>;
+  middleware(options?: MiddlewareOptions): OrpcMiddleware<M, F, E, C, P>;
   /** A `Result` (or `AsyncResult`) as data, throwing an `ORPCError` on failure. */
   unwrap<T>(value: Result<T> | PromiseLike<Result<T>>): Promise<T>;
   /** Plain values pass through; thrown `DbException`s become `ORPCError`s. */
   unwrap<T>(value: T | PromiseLike<T>): Promise<T>;
-  toORPCError(error: DbError): ORPCError<string, ProblemDetails>;
+  toOrpcError(error: DbError): ORPCError<string, ProblemDetails>;
 }
 /** oRPC code for a `DbError`, from its HTTP status. */
 export declare function orpcCode(error: DbError): string;
 /** oRPC integration: middleware adding the caller's repositories to `context`. */
-export declare function createOrpc<M extends AnyModels, D, F extends AnyFunctions, E>(sb: BetterSupabase<M, D, F, E>, options?: OrpcOptions): BetterOrpc<M, F, E>;
+export declare function createOrpc<M extends AnyModels, D, F extends AnyFunctions, E, C = unknown, P = unknown>(betterSupabase: BetterSupabase<M, D, F, E, C, P>, options?: OrpcOptions): BetterOrpc<M, F, E, C, P>;
 //#endregion
-export type { GuardOptions };
+export type { GuardOptions, MiddlewareOptions };

package/dist/orpc/index.js

@@ -1,18 +1,18 @@
-import { r as dbErrorOf } from "../errors-Bl3rkOzo.js";
-import { o as toProblem } from "../problem-BTkTtRV9.js";
-import { a as settle, n as guard, o as createServer, s as extendServer, t as defaultExpose } from "../respond-DMcbQwfN.js";
+import { r as dbErrorOf } from "../errors-L0xK41y_.js";
+import { o as toProblem } from "../problem-BihjPR0t.js";
+import { a as guard, c as settle, i as defaultExpose, n as extendServer, t as createServer } from "../server-BA75B0mT.js";
 import { COMMON_ERROR_STATUS_MAP, ORPCError, os } from "@orpc/server";
 //#region src/orpc/index.ts
-const CODES = new Map(Object.entries(COMMON_ERROR_STATUS_MAP).map(([code, status]) => [status, code]));
+const CODES = /* @__PURE__ */ new Map(Object.entries(COMMON_ERROR_STATUS_MAP).map(([code, status]) => [status, code]));
 /** oRPC code for a `DbError`, from its HTTP status. */
 function orpcCode(error) {
 	return CODES.get(error.status) ?? (error.status >= 500 ? "INTERNAL_SERVER_ERROR" : "BAD_REQUEST");
 }
 /** oRPC integration: middleware adding the caller's repositories to `context`. */
-function createOrpc(sb, options = {}) {
-	const server = createServer(sb, options);
+function createOrpc(betterSupabase, options = {}) {
+	const server = createServer(betterSupabase, options);
 	const expose = options.exposeErrors ?? defaultExpose();
-	const toORPCError = (error) => {
+	const toOrpcError = (error) => {
 		const problem = toProblem(error, { expose });
 		return new ORPCError(orpcCode(error), {
 			message: problem.detail ?? problem.title,
@@ -20,12 +20,12 @@ function createOrpc(sb, options = {}) {
 		});
 	};
 	return extendServer(server, {
-		toORPCError,
+		toOrpcError,
 		middleware(middlewareOptions = {}) {
 			return os.$context().middleware(async ({ context, next }) => {
 				const ctx = await server.context(context.request, { refresh: middlewareOptions.refresh ?? false });
-				const denied = guard(ctx.auth, middlewareOptions.allow, middlewareOptions.aal);
-				if (denied) throw toORPCError(denied);
+				const denied = guard(ctx.auth, middlewareOptions.allow, middlewareOptions.aal, middlewareOptions.scopes);
+				if (denied) throw toOrpcError(denied);
 				try {
 					return await next({ context: {
 						bs: ctx,
@@ -34,14 +34,14 @@ function createOrpc(sb, options = {}) {
 					} });
 				} catch (cause) {
 					const thrown = dbErrorOf(cause);
-					if (thrown) throw toORPCError(thrown);
+					if (thrown) throw toOrpcError(thrown);
 					throw cause;
 				}
 			});
 		},
 		async unwrap(value) {
 			const settled = await settle(() => value);
-			if (!settled.ok) throw toORPCError(settled.error);
+			if (!settled.ok) throw toOrpcError(settled.error);
 			return settled.data;
 		}
 	});

package/dist/otel/index.d.ts

@@ -1,5 +1,5 @@
-import { a as EventHub } from "../events-DOt3nSO-.js";
-import { f as Plugin } from "../plugin-C4TR9J0Z.js";
+import { a as EventHub } from "../events-B21UOhvP.js";
+import { f as Plugin } from "../plugin-bNhvJwRh.js";
 import { t as SPEC_PINS } from "../spec-pins-CqorWDnO.js";
 import { Attributes, Meter, Tracer } from "@opentelemetry/api";
 //#region src/otel/index.d.ts
@@ -20,15 +20,15 @@ export interface OtelOptions {
  * never recorded; `db.query.summary` is `SELECT customers`.
  *
  * ```ts
- * const sb = defineSupabase(schema).use(otel());
+ * const betterSupabase = defineSupabase(schema).use(otel());
  * ```
  */
 export declare function otel(options?: OtelOptions): Plugin<"otel">;
 /**
- * Spans for auth resolution and session refreshes, from `sb.events`.
+ * Spans for auth resolution and session refreshes, from `betterSupabase.events`.
  * Returns a function that stops listening.
  */
-export declare function traceAuth(sb: {
+export declare function traceAuth(betterSupabase: {
   readonly events: EventHub;
 }, options?: Pick<OtelOptions, "tracer" | "attributes">): () => void;
 /**