better-supabase 0.2.0 → 0.4.0

package/dist/jobs/index.js

@@ -1,10 +1,12 @@
-import { c as mapDbError, n as dbError, t as DbException } from "../errors-Bl3rkOzo.js";
-import { i as ok, n as err, o as toDbError, t as AsyncResult } from "../result-DWXatkd6.js";
-import { t as validate } from "../standard-FUi3Z3-7.js";
-import { a as problemResponse } from "../problem-BTkTtRV9.js";
-import { t as fromPgError } from "../executor-DeppvirK.js";
-import { c as verifyWebhook } from "../webhooks-DMipjhSP.js";
-//#region src/jobs/index.ts
+import { c as mapDbError, n as dbError, t as DbException } from "../errors-L0xK41y_.js";
+import { n as nowInstant } from "../temporal-BwshQk0W.js";
+import { t as temporal } from "../temporal-required-CBNHT6ni.js";
+import { i as ok, n as err, o as toDbError, t as AsyncResult } from "../result-Bj6yt33D.js";
+import { t as validate } from "../standard-BRyBGTtp.js";
+import { a as problemResponse } from "../problem-BihjPR0t.js";
+import { t as fromPgError } from "../executor-CVt6dD0B.js";
+import { c as verifyWebhook } from "../webhooks-Bh_Jf_-l.js";
+//#region src/jobs/jobs.ts
 function run(fn) {
 	return AsyncResult.from(async () => {
 		try {
@@ -22,7 +24,10 @@ function workerId() {
 	return `worker-${crypto.randomUUID().slice(0, 8)}`;
 }
 const sleep = (ms, signal) => new Promise((resolve) => {
-	if (signal?.aborted) return resolve();
+	if (signal?.aborted) {
+		resolve();
+		return;
+	}
 	const timer = setTimeout(done, ms);
 	function done() {
 		clearTimeout(timer);
@@ -149,7 +154,8 @@ function postgrestTransport(client) {
 		unschedule: () => sqlOnly("unschedule")
 	};
 }
-const toDate = (value) => value instanceof Date ? value : new Date(value);
+/** pgmq and the inbox return `timestamptz` as text over RPC and as `Date` from `pg`. */
+const toInstant = (value) => value instanceof Date ? temporal().Instant.fromEpochMilliseconds(value.getTime()) : temporal().Instant.from(value);
 function toJob(queue, row) {
 	const message = row.message ?? {};
 	return {
@@ -158,8 +164,8 @@ function toJob(queue, row) {
 		payload: message.payload,
 		attempts: row.attempts,
 		maxAttempts: message.max_attempts ?? 5,
-		enqueuedAt: toDate(row.enqueued_at),
-		visibleUntil: toDate(row.visible_until),
+		enqueuedAt: toInstant(row.enqueued_at),
+		visibleUntil: toInstant(row.visible_until),
 		lastError: message.last_error ?? null
 	};
 }
@@ -194,12 +200,15 @@ function createJobs(source, queues) {
 		schemaOf(queue);
 		return (await transport.read(queue, claimOptions.lease ?? 300, claimOptions.batch ?? 1)).map((row) => toJob(queue, row));
 	});
+	/**
+	* Extends the lease of every job in `held` at half the lease, so jobs
+	* waiting their turn in a claimed batch don't expire before they run.
+	*/
+	const heartbeat = (held, lease) => transport.name === "sql" ? setInterval(() => {
+		for (const job of held) run(() => transport.extend(job, lease));
+	}, Math.max(1e3, lease * 1e3 / 2)) : void 0;
 	const handle = async (job, handler, workOptions) => {
 		const controller = new AbortController();
-		const lease = workOptions.lease ?? 300;
-		const heartbeat = transport.name === "sql" ? setInterval(() => {
-			run(() => transport.extend(job, lease));
-		}, Math.max(1e3, lease * 1e3 / 2)) : void 0;
 		try {
 			const payload = await validate(schemaOf(job.queue), job.payload, "payload");
 			if (!payload.ok) {
@@ -219,15 +228,17 @@ function createJobs(source, queues) {
 			await fail(job, cause);
 			workOptions.onError?.(typeof cause === "object" && cause !== null && "kind" in cause ? cause : toDbError(cause), job);
 			return false;
-		} finally {
-			clearInterval(heartbeat);
 		}
 	};
 	const loop = async (queue, handler, workOptions, forever) => {
 		const concurrency = Math.max(1, workOptions.concurrency ?? 1);
+		const lease = workOptions.lease ?? 300;
+		const firstWait = workOptions.pollInterval ?? 1e3;
+		const maxWait = Math.max(firstWait, workOptions.maxPollInterval ?? 3e4);
 		let succeeded = 0;
 		let failed = 0;
 		const lanes = Array.from({ length: concurrency }, async () => {
+			let wait = firstWait;
 			while (!workOptions.signal?.aborted) {
 				const claimed = await claim(queue, {
 					...workOptions,
@@ -236,11 +247,22 @@ function createJobs(source, queues) {
 				if (!claimed.ok) throw new TypeError(claimed.error.message, { cause: claimed.error });
 				if (claimed.data.length === 0) {
 					if (!forever) return;
-					await sleep(workOptions.pollInterval ?? 1e3, workOptions.signal);
+					await sleep(wait, workOptions.signal);
+					wait = Math.min(maxWait, wait * 2);
 					continue;
 				}
-				for (const job of claimed.data) if (await handle(job, handler, workOptions)) succeeded += 1;
-				else failed += 1;
+				wait = firstWait;
+				const held = new Set(claimed.data);
+				const timer = heartbeat(held, lease);
+				try {
+					for (const job of claimed.data) {
+						if (await handle(job, handler, workOptions)) succeeded += 1;
+						else failed += 1;
+						held.delete(job);
+					}
+				} finally {
+					clearInterval(timer);
+				}
 			}
 		});
 		await Promise.all(lanes);
@@ -254,7 +276,7 @@ function createJobs(source, queues) {
 			return AsyncResult.from(async () => {
 				const valid = await validate(schemaOf(queue), payload, "payload");
 				if (!valid.ok) return valid;
-				const delay = enqueueOptions.delay ?? (enqueueOptions.runAt ? Math.max(0, Math.ceil((enqueueOptions.runAt.getTime() - Date.now()) / 1e3)) : 0);
+				const delay = enqueueOptions.delay ?? (enqueueOptions.runAt ? Math.max(0, Math.ceil((enqueueOptions.runAt.epochMilliseconds - nowInstant().epochMilliseconds) / 1e3)) : 0);
 				return run(() => transport.send(queue, valid.data, delay, enqueueOptions.maxAttempts ?? 5, enqueueOptions.dedupeKey));
 			});
 		},
@@ -435,7 +457,7 @@ function createInbox(sql, options) {
 						payload: row.payload,
 						headers: row.headers,
 						attempts: row.attempts,
-						receivedAt: toDate(row.received_at)
+						receivedAt: toInstant(row.received_at)
 					};
 					try {
 						const outcome = await handler(message);

package/dist/{json-schema-BpYqkCKf.js → json-schema-DP6V7cbr.js}

@@ -19,7 +19,8 @@ function scalarKind(column) {
 		values: column.enum
 	};
 	if (column.json) return { kind: "json" };
-	if (column.codec === "date") return { kind: "dateObject" };
+	if (column.codec === "instant") return { kind: "instant" };
+	if (column.codec === "plainDateTime") return { kind: "plainDateTime" };
 	if (column.codec === "bigint") return { kind: "bigint" };
 	if (column.codec === "string") return { kind: "string" };
 	if (column.type === "uuid") return { kind: "uuid" };
@@ -64,7 +65,7 @@ function variantsFor(table) {
 	];
 }
 function tableEntries(input) {
-	return Object.entries(input.meta.tables).sort(([a], [b]) => a.localeCompare(b));
+	return Object.entries(input.meta.tables).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
 }
 function propertyKey(name) {
 	return /^[A-Za-z_$][\w$]*$/.test(name) ? name : JSON.stringify(name);
@@ -107,10 +108,14 @@ function scalar(kind) {
 			type: "string",
 			format: "date"
 		};
-		case "dateObject": return {
+		case "instant": return {
 			type: "string",
 			format: "date-time"
 		};
+		case "plainDateTime": return {
+			type: "string",
+			pattern: "^\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?$"
+		};
 		case "bigint": return {
 			type: "string",
 			pattern: "^-?\\d+$"

package/dist/lint/index.js

@@ -16,7 +16,7 @@ function receiverName(node) {
 	return receiver.property.name;
 }
 /** Matches `order_items`, `orderItems` and `public.order_items` alike. */
-const tableKey = (name) => (name.split(".").at(-1) ?? name).replace(/_/g, "").toLowerCase();
+const tableKey = (name) => (name.split(".").at(-1) ?? name).replaceAll("_", "").toLowerCase();
 function keyName(property) {
 	if (property.computed) return void 0;
 	if (property.key.type === "Identifier") return property.key.name;

package/dist/list/index.d.ts

@@ -1,2 +1,2 @@
-import { a as ListPage, c as ListQuery, d as ListSearchParams, f as OpenApiParameter, h as defineListQuery, i as ListExtra, l as ListQueryConfig, m as UNSET, n as FacetInfo, o as ListParseResult, p as ParserSpec, r as ListDefinition, s as ListParsers, t as FacetCounts, u as ListQueryInput } from "../index-Bw1bwtC0.js";
-export { FacetCounts, FacetInfo, ListDefinition, ListExtra, ListPage, ListParseResult, ListParsers, ListQuery, ListQueryConfig, ListQueryInput, ListSearchParams, OpenApiParameter, ParserSpec, UNSET, defineListQuery };
+import { a as ListPage, c as ListParsers, d as ListQueryInput, f as ListSearchParams, g as defineListQuery, h as UNSET, i as ListExtra, l as ListQuery, m as ParserSpec, n as FacetInfo, o as ListPagination, p as OpenApiParameter, r as ListDefinition, s as ListParseResult, t as FacetCounts, u as ListQueryConfig } from "../index-BAy4tsAP.js";
+export { type FacetCounts, type FacetInfo, type ListDefinition, type ListExtra, type ListPage, type ListPagination, type ListParseResult, type ListParsers, type ListQuery, type ListQueryConfig, type ListQueryInput, type ListSearchParams, type OpenApiParameter, type ParserSpec, UNSET, defineListQuery };

package/dist/list/index.js

@@ -1,10 +1,11 @@
-//#region src/list/index.ts
+//#region src/list/list-query.ts
 /** Facet value meaning "not set": filters with `is null`. */
 const UNSET = "__unset__";
 const RESERVED = /* @__PURE__ */ new Set([
 	"q",
 	"sort",
 	"page",
+	"after",
 	"size"
 ]);
 function first(value) {
@@ -13,8 +14,9 @@ function first(value) {
 function all(value) {
 	return (typeof value === "string" ? [value] : [...value ?? []]).flatMap((entry) => entry.split(",")).map((entry) => entry.trim()).filter(Boolean);
 }
+const isParamValue = (value) => value === void 0 || typeof value === "string" || Array.isArray(value) && value.every((entry) => typeof entry === "string");
 function isSearchParams(value) {
-	return value instanceof URLSearchParams || !("facets" in value && typeof value.facets === "object");
+	return value instanceof URLSearchParams || !("facets" in value && typeof value.facets === "object") && Object.values(value).every(isParamValue);
 }
 function readRecord(input) {
 	if (!(input instanceof URLSearchParams)) return input;
@@ -33,7 +35,7 @@ function toInt(raw) {
 * OpenAPI parameters and a JSON Schema derived from the same definition.
 *
 * ```ts
-* export const customerList = defineListQuery(sb, 'customers', {
+* export const customerList = defineListQuery(betterSupabase, 'customers', {
 *   search: ['name', 'kvk'],
 *   facets: { status: 'status' },
 *   sorts: { name: { name: 'asc' }, newest: [{ createdAt: 'desc' }, { id: 'asc' }] },
@@ -41,12 +43,13 @@ function toInt(raw) {
 * });
 * ```
 */
-function defineListQuery(sb, table, config) {
-	const meta = sb.meta.tables[table];
+function defineListQuery(betterSupabase, table, config) {
+	const meta = betterSupabase.meta.tables[table];
 	if (!meta) throw new TypeError(`defineListQuery: unknown table "${table}"`);
 	const pageSize = config.pageSize ?? 50;
 	const maxPageSize = config.maxPageSize ?? 200;
 	const maxSearch = config.maxSearchLength ?? 200;
+	const cursor = config.pagination === "cursor";
 	const sortKeys = Object.keys(config.sorts);
 	const facetEntries = Object.entries(config.facets ?? {});
 	for (const [key, column] of facetEntries) {
@@ -96,6 +99,18 @@ function defineListQuery(sb, table, config) {
 			message: "Must be a whole number of at least 1",
 			path: ["page"]
 		});
+		else if (cursor && page !== 1) issues.push({
+			message: "This list pages with `after`, not `page`",
+			path: ["page"]
+		});
+		let after;
+		if (raw.after !== void 0 && raw.after !== "") {
+			if (cursor && typeof raw.after === "string") after = raw.after;
+			else issues.push({
+				message: cursor ? "Must be text" : "This list pages with `page`, not `after`",
+				path: ["after"]
+			});
+		}
 		const size = raw.size === void 0 || raw.size === "" ? pageSize : toInt(raw.size);
 		if (size === void 0 || !Number.isInteger(size) || size < 1 || size > maxPageSize) issues.push({
 			message: `Must be a whole number from 1 to ${String(maxPageSize)}`,
@@ -121,6 +136,7 @@ function defineListQuery(sb, table, config) {
 				...q ? { q } : {},
 				sort,
 				page: page ?? 1,
+				...after ? { after } : {},
 				size: size ?? pageSize,
 				facets: facetValues
 			}
@@ -143,6 +159,7 @@ function defineListQuery(sb, table, config) {
 				q: first(record["q"]),
 				sort: first(record["sort"]),
 				page: first(record["page"]),
+				after: first(record["after"]),
 				size: first(record["size"]),
 				facets: facetValues
 			});
@@ -160,6 +177,7 @@ function defineListQuery(sb, table, config) {
 			q: typed.q,
 			sort: typed.sort,
 			page: typed.page,
+			after: typed.after,
 			size: typed.size,
 			facets: rawFacets
 		});
@@ -195,12 +213,15 @@ function defineListQuery(sb, table, config) {
 	}
 	function args(query) {
 		const filter = where(query);
+		const paging = cursor ? { after: query.after ?? null } : {
+			page: query.page,
+			count: config.count ?? "exact"
+		};
 		return {
 			...filter ? { where: filter } : {},
 			orderBy: config.sorts[query.sort],
-			page: query.page,
 			size: query.size,
-			count: config.count ?? "exact"
+			...paging
 		};
 	}
 	/** Whether a group's value passes the facet's selected values. */
@@ -249,6 +270,10 @@ function defineListQuery(sb, table, config) {
 			serialize: (value) => value
 		},
 		page: intParser,
+		after: {
+			parse: (value) => value || null,
+			serialize: (value) => value
+		},
 		size: intParser,
 		...Object.fromEntries(facets.map((facet) => [facet.key, listParser]))
 	};
@@ -261,8 +286,102 @@ function defineListQuery(sb, table, config) {
 		uniqueItems: true
 	});
 	const searchDescription = config.search ? Array.isArray(config.search) ? `Case-insensitive search in ${config.search.join(", ")}.` : "Full-text search (web search syntax)." : void 0;
+	const openapi = [
+		...searchDescription ? [{
+			name: "q",
+			in: "query",
+			required: false,
+			description: searchDescription,
+			schema: {
+				type: "string",
+				maxLength: maxSearch
+			}
+		}] : [],
+		{
+			name: "sort",
+			in: "query",
+			required: false,
+			description: `Ordering. Default \`${config.defaultSort}\`.`,
+			schema: {
+				type: "string",
+				enum: sortKeys,
+				default: config.defaultSort
+			}
+		},
+		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,
+			description: "1-based page number.",
+			schema: {
+				type: "integer",
+				minimum: 1,
+				default: 1
+			}
+		},
+		{
+			name: "size",
+			in: "query",
+			required: false,
+			description: "Page size.",
+			schema: {
+				type: "integer",
+				minimum: 1,
+				maximum: maxPageSize,
+				default: pageSize
+			}
+		},
+		...facets.map((facet) => ({
+			name: facet.key,
+			in: "query",
+			required: false,
+			description: `Filter on ${facet.column}. Comma-separated; any value matches.${facet.nullable ? ` \`${UNSET}\` matches empty.` : ""}`,
+			schema: facetSchema(facet),
+			style: "form",
+			explode: false
+		}))
+	];
+	const jsonSchema = {
+		type: "object",
+		additionalProperties: false,
+		properties: {
+			...searchDescription ? { q: {
+				type: "string",
+				maxLength: maxSearch,
+				description: searchDescription
+			} } : {},
+			sort: {
+				type: "string",
+				enum: sortKeys,
+				default: config.defaultSort
+			},
+			...cursor ? { after: { type: "string" } } : { page: {
+				type: "integer",
+				minimum: 1,
+				default: 1
+			} },
+			size: {
+				type: "integer",
+				minimum: 1,
+				maximum: maxPageSize,
+				default: pageSize
+			},
+			...facets.length > 0 ? { facets: {
+				type: "object",
+				additionalProperties: false,
+				properties: Object.fromEntries(facets.map((facet) => [facet.key, facetSchema(facet)]))
+			} } : {}
+		}
+	};
 	return {
 		table,
+		pagination: config.pagination ?? "offset",
 		defaults,
 		facets,
 		parse,
@@ -279,7 +398,8 @@ function defineListQuery(sb, table, config) {
 			if (query.q) params.set("q", query.q);
 			if (query.sort && query.sort !== config.defaultSort) params.set("sort", query.sort);
 			if (query.page && query.page !== 1) params.set("page", String(query.page));
-			if (query.size && query.size !== pageSize) params.set("size", String(query.size));
+			if (query.after) params.set("after", query.after);
+			if (query.size !== void 0 && query.size > 0 && query.size !== pageSize) params.set("size", String(query.size));
 			for (const facet of facets) {
 				const values = query.facets?.[facet.key];
 				if (values && values.length > 0) params.set(facet.key, values.join(","));
@@ -297,7 +417,7 @@ function defineListQuery(sb, table, config) {
 			const page = repository.paginate({
 				...extra,
 				...base,
-				count: count ?? base["count"],
+				...cursor ? {} : { count: count ?? base["count"] },
 				...combined ? { where: combined } : {}
 			});
 			if (!config.facetCounts) return page;
@@ -317,93 +437,8 @@ function defineListQuery(sb, table, config) {
 				facetCounts: marginals(rows, query)
 			})));
 		},
-		openapi: [
-			...searchDescription ? [{
-				name: "q",
-				in: "query",
-				required: false,
-				description: searchDescription,
-				schema: {
-					type: "string",
-					maxLength: maxSearch
-				}
-			}] : [],
-			{
-				name: "sort",
-				in: "query",
-				required: false,
-				description: `Ordering. Default \`${config.defaultSort}\`.`,
-				schema: {
-					type: "string",
-					enum: sortKeys,
-					default: config.defaultSort
-				}
-			},
-			{
-				name: "page",
-				in: "query",
-				required: false,
-				description: "1-based page number.",
-				schema: {
-					type: "integer",
-					minimum: 1,
-					default: 1
-				}
-			},
-			{
-				name: "size",
-				in: "query",
-				required: false,
-				description: "Page size.",
-				schema: {
-					type: "integer",
-					minimum: 1,
-					maximum: maxPageSize,
-					default: pageSize
-				}
-			},
-			...facets.map((facet) => ({
-				name: facet.key,
-				in: "query",
-				required: false,
-				description: `Filter on ${facet.column}. Comma-separated; any value matches.${facet.nullable ? ` \`${UNSET}\` matches empty.` : ""}`,
-				schema: facetSchema(facet),
-				style: "form",
-				explode: false
-			}))
-		],
-		jsonSchema: {
-			type: "object",
-			additionalProperties: false,
-			properties: {
-				...searchDescription ? { q: {
-					type: "string",
-					maxLength: maxSearch,
-					description: searchDescription
-				} } : {},
-				sort: {
-					type: "string",
-					enum: sortKeys,
-					default: config.defaultSort
-				},
-				page: {
-					type: "integer",
-					minimum: 1,
-					default: 1
-				},
-				size: {
-					type: "integer",
-					minimum: 1,
-					maximum: maxPageSize,
-					default: pageSize
-				},
-				...facets.length > 0 ? { facets: {
-					type: "object",
-					additionalProperties: false,
-					properties: Object.fromEntries(facets.map((facet) => [facet.key, facetSchema(facet)]))
-				} } : {}
-			}
-		}
+		openapi,
+		jsonSchema
 	};
 }
 //#endregion

package/dist/{live-DJyZMD6w.d.ts → live-BHakSWWo.d.ts}

@@ -1,10 +1,11 @@
-import { A as SchemaMeta, N as TableKey, O as Row, n as AnyModels, t as AnyFunctions, x as PermdockTopicPolicy } from "./types-C83v5SQz.js";
-import { b as ValidationIssue, o as Result, p as DbError, t as AsyncResult } from "./result-CTkCZ6JA.js";
-import { Z as QuerySpec, t as BetterSupabase } from "./define-e3zI4_4g.js";
+import { A as SchemaMeta, N as TableKey, O as Row, n as AnyModels, t as AnyFunctions, x as PermdockTopicPolicy } from "./types-DONv9SHN.js";
+import { b as ValidationIssue, o as Result, p as DbError, t as AsyncResult } from "./result-CqEsbgYs.js";
+import { Z as QuerySpec, t as BetterSupabase } from "./define-CRS2MRV3.js";
+import { t as PermdockCatalog } from "./permdock-sql-DImJULY-.js";
 import { n as TemplateValues, t as TemplateParams } from "./template-mbvlysOo.js";
 import { RealtimeChannel, SupabaseClient } from "@supabase/supabase-js";
 import { StandardSchemaV1 } from "@standard-schema/spec";
-//#region src/realtime/index.d.ts
+//#region src/realtime/topic.d.ts
 type EventSchemas = Readonly<Record<string, StandardSchemaV1>>;
 interface TopicOptions<E extends EventSchemas> {
   /** Name used for generated policies and functions. Defaults to the template's literal parts. */
@@ -34,9 +35,15 @@ interface TopicOptions<E extends EventSchemas> {
    * The helpers check role and scope only. Use this just for permissions
    * whose grants have no row conditions beyond the scope: for a permission
    * with row conditions (e.g. `authorId = principal.id`) every member of the
-   * scope may join. Leave those to the policies `permdock rls generate` writes.
+   * scope could join. Pass `catalog` to refuse those keys here;
+   * `better-supabase doctor` (BS214) refuses them from the catalog file.
    */
   readonly permdock?: PermdockTopicPolicy;
+  /**
+   * PermDock's `permissions.catalog.json`. With it, a `permdock` policy
+   * naming a permission with `rowConditions: true` throws.
+   */
+  readonly catalog?: PermdockCatalog;
   /** Let clients broadcast on the topic, not only receive. Defaults to `false`. */
   readonly send?: boolean;
   /** Also authorize presence. Defaults to `false`. */
@@ -71,13 +78,16 @@ interface Subscription extends Disposable, AsyncDisposable {
   readonly ready: Promise<void>;
   unsubscribe(): Promise<void>;
 }
-type RealtimeClient = Pick<SupabaseClient, "channel" | "removeChannel" | "realtime">;
+type RealtimeClient = Pick<SupabaseClient, "channel" | "getChannels" | "removeChannel" | "realtime">;
 interface TriggerOptions<M extends AnyModels, T extends keyof M, P extends string> {
   /** Column that fills each placeholder. */
   readonly values: { readonly [K in TemplateParams<P>]: Extract<keyof Row<M, T>, string>; };
   /** Defaults to all three. */
   readonly events?: readonly ("insert" | "update" | "delete")[];
-  /** Schema for the generated function. Defaults to `public`. */
+  /**
+   * Schema for the generated function. Defaults to `better_supabase`, which
+   * the Data API does not expose.
+   */
   readonly functionSchema?: string;
 }
 interface RowChange<R> {
@@ -96,7 +106,7 @@ interface Topic<P extends string, E extends EventSchemas> {
   /** `realtime.messages` policies for this topic. Idempotent. */
   sql(): string;
   /** A trigger that broadcasts row changes (`realtime.broadcast_changes`) to this topic. */
-  triggerSql<M extends AnyModels, D, F extends AnyFunctions, X, T extends TableKey<M>>(sb: BetterSupabase<M, D, F, X>, table: T, options: TriggerOptions<M, T, P>): string;
+  triggerSql<M extends AnyModels, D, F extends AnyFunctions, X, T extends TableKey<M>>(betterSupabase: BetterSupabase<M, D, F, X>, table: T, options: TriggerOptions<M, T, P>): string;
   subscribe(client: RealtimeClient, values: TemplateValues<P>, handlers: TopicHandlers<E>, options?: SubscribeOptions): Subscription;
   /** Sends over HTTP, without joining the channel. */
   send<K extends TopicEvent<E>>(client: RealtimeClient, values: TemplateValues<P>, event: K, payload: TopicPayload<E, K>): AsyncResult<void>;
@@ -117,10 +127,10 @@ declare function defineTopic<const P extends string, const E extends EventSchema
  * Reads a `realtime.broadcast_changes` message as an app-cased row change.
  * Returns `null` for messages about other tables.
  */
-declare function rowChange<M extends AnyModels, D, F extends AnyFunctions, X, T extends TableKey<M>>(sb: BetterSupabase<M, D, F, X>, table: T, message: TopicMessage): RowChange<Row<M, T>> | null;
+declare function rowChange<M extends AnyModels, D, F extends AnyFunctions, X, T extends TableKey<M>>(betterSupabase: BetterSupabase<M, D, F, X>, table: T, message: TopicMessage): RowChange<Row<M, T>> | null;
 //#endregion
 //#region src/realtime/live.d.ts
-/** What `liveQuery` needs from `sb`: metadata and the tables a spec reads. */
+/** What `liveQuery` needs from `betterSupabase`: metadata and the tables a spec reads. */
 interface LiveSource {
   readonly meta: SchemaMeta;
   tablesOf(spec: QuerySpec): string[];
@@ -144,7 +154,7 @@ interface LiveSubscription extends Disposable, AsyncDisposable {
 }
 /**
  * A count from the server plus the spec to keep it live on the client:
- * `next.liveCount(spec)` makes one, `useLiveCount(seed)` reads it. `count`
+ * `bs.liveCount(spec)` makes one, `useLiveCount(seed)` reads it. `count`
  * is `null` when the server read failed; the client then fetches it.
  */
 interface LiveCountSeed<T extends string = string> {
@@ -160,11 +170,11 @@ declare function liveTopic(meta: SchemaMeta, table: string, tenant?: string): st
  * table, so any number of them can run at once.
  *
  * ```ts
- * using live = liveQuery(sb, supabase, spec, { onChange: () => refetch() });
+ * using live = liveQuery(betterSupabase, supabase, spec, { onChange: () => refetch() });
  * ```
  */
-declare function liveQuery(sb: LiveSource, client: RealtimeClient, spec: QuerySpec | readonly string[], options: LiveQueryOptions): LiveSubscription;
-/** What `liveCount` runs the spec with: a `db` from `sb.connect()` or `createBrowser()`. */
+declare function liveQuery(betterSupabase: LiveSource, client: RealtimeClient, spec: QuerySpec | readonly string[], options: LiveQueryOptions): LiveSubscription;
+/** What `liveCount` runs the spec with: a `db` from `betterSupabase.connect()` or `createClient()`. */
 interface CountRunner {
   $run(spec: QuerySpec): PromiseLike<Result<unknown>>;
 }
@@ -181,11 +191,11 @@ interface LiveCountOptions extends Omit<LiveQueryOptions, "onChange"> {
  * Responses that arrive out of order are dropped.
  *
  * ```ts
- * using live = liveCount(sb, supabase, db, sb.spec.notes.count(), {
+ * using live = liveCount(betterSupabase, supabase, db, betterSupabase.spec.notes.count(), {
  *   onCount: (count) => render(count),
  * });
  * ```
  */
-declare function liveCount(sb: LiveSource, client: RealtimeClient, db: CountRunner, spec: QuerySpec<string, "count", number>, options: LiveCountOptions): LiveSubscription;
+declare function liveCount(betterSupabase: LiveSource, client: RealtimeClient, db: CountRunner, spec: QuerySpec<string, "count", number>, options: LiveCountOptions): LiveSubscription;
 //#endregion
 export { defineTopic as C, TriggerOptions as S, TopicEvent as _, LiveSource as a, TopicOptions as b, liveQuery as c, RealtimeClient as d, RowChange as f, Topic as g, SubscriptionStatus as h, LiveQueryOptions as i, liveTopic as l, Subscription as m, LiveCountOptions as n, LiveSubscription as o, SubscribeOptions as p, LiveCountSeed as r, liveCount as s, CountRunner as t, EventSchemas as u, TopicHandlers as v, rowChange as w, TopicPayload as x, TopicMessage as y };