better-supabase 0.2.0 → 0.3.0

package/dist/{config-ClDXmVtY.js → config-DOsGYSiT.js}

@@ -1,5 +1,4 @@
-import { t as DEFAULT_CLAIMS } from "./claims-CoTobNC-.js";
-import { a as parseImport, c as schemaName, d as variantsFor, i as fieldsFor, l as siblingPath, o as propertyKey, r as HEADER, s as rowType, u as tableEntries } from "./json-schema-BpYqkCKf.js";
+import { a as parseImport, c as schemaName, d as variantsFor, i as fieldsFor, l as siblingPath, o as propertyKey, r as HEADER, s as rowType, u as tableEntries } from "./json-schema--aOXAGfU.js";
 //#region src/generators/valibot.ts
 function scalar$1(kind) {
 	switch (kind.kind) {
@@ -10,7 +9,8 @@ function scalar$1(kind) {
 		case "boolean": return "v.boolean()";
 		case "datetime": return "v.pipe(v.string(), v.isoTimestamp())";
 		case "date": return "v.pipe(v.string(), v.isoDate())";
-		case "dateObject": return "v.date()";
+		case "instant": return "v.instance(Temporal.Instant)";
+		case "plainDateTime": return "v.instance(Temporal.PlainDateTime)";
 		case "bigint": return "v.bigint()";
 		case "json": return "json";
 		case "enum": return `v.picklist([${kind.values.map((value) => JSON.stringify(value)).join(", ")}])`;
@@ -19,7 +19,7 @@ function scalar$1(kind) {
 	}
 }
 function field$1(table, plan, jsonImports) {
-	let expr = jsonImports.get(`${table}.${plan.column.db}`) ?? (plan.customJson ? `v.custom<NonNullable<RowOf<'${table}'>['${plan.name}']>>((value) => value !== undefined)` : plan.column.storage !== void 0 ? `(v.string() as unknown as v.GenericSchema<${rowType(table, plan)}>)` : scalar$1(plan.scalar));
+	let expr = jsonImports.get(`${table}.${plan.column.db}`) ?? (plan.customJson ? `v.custom<NonNullable<RowOf<'${table}'>['${plan.name}']>>((value) => value !== undefined)` : plan.column.storage === void 0 ? scalar$1(plan.scalar) : `(v.string() as unknown as v.GenericSchema<${rowType(table, plan)}>)`);
 	if (plan.column.array) expr = `v.array(${expr})`;
 	if (plan.nullable) expr = `v.nullable(${expr})`;
 	if (plan.optional) expr = `v.exactOptional(${expr})`;
@@ -44,9 +44,9 @@ function valibot(options = {}) {
 			const lines = [
 				HEADER,
 				"import * as v from \"valibot\";",
-				""
+				"",
+				`import type { InsertOf, Json, RowOf, UpdateOf } from ${JSON.stringify(input.importPath(path, input.config.output))};`
 			];
-			lines.push(`import type { InsertOf, Json, RowOf, UpdateOf } from ${JSON.stringify(input.importPath(path, input.config.output))};`);
 			for (const [from, names] of imports) lines.push(`import { ${[...new Set(names)].sort().join(", ")} } from ${JSON.stringify(from)};`);
 			lines.push("", "const json: v.GenericSchema<Json> = v.lazy(() =>", "  v.union([v.string(), v.number(), v.boolean(), v.null(), v.array(json), v.record(v.string(), v.optional(json))]),", ");");
 			const validators = [];
@@ -67,8 +67,7 @@ function valibot(options = {}) {
 					validatorTypes.push(`  readonly ${propertyKey(key)}: { readonly insert: typeof ${insert}; readonly update: typeof ${update} };`);
 				}
 			}
-			lines.push("", "/** Write validators for the validation plugin. */");
-			lines.push("export const validators: {", ...validatorTypes, "} = {", ...validators, "};", "");
+			lines.push("", "/** Write validators for the validation plugin. */", "export const validators: {", ...validatorTypes, "} = {", ...validators, "};", "");
 			return [{
 				path,
 				contents: lines.join("\n")
@@ -87,7 +86,8 @@ function scalar(kind) {
 		case "boolean": return "z.boolean()";
 		case "datetime": return "z.iso.datetime({ offset: true })";
 		case "date": return "z.iso.date()";
-		case "dateObject": return "z.date()";
+		case "instant": return "z.instanceof(Temporal.Instant)";
+		case "plainDateTime": return "z.instanceof(Temporal.PlainDateTime)";
 		case "bigint": return "z.bigint()";
 		case "json": return "z.json()";
 		case "enum": return `z.enum([${kind.values.map((value) => JSON.stringify(value)).join(", ")}])`;
@@ -96,7 +96,7 @@ function scalar(kind) {
 	}
 }
 function field(table, plan, jsonImports) {
-	let expr = jsonImports.get(`${table}.${plan.column.db}`) ?? (plan.customJson ? `z.custom<NonNullable<RowOf<'${table}'>['${plan.name}']>>((value) => value !== undefined)` : plan.column.storage !== void 0 ? `(z.string() as unknown as z.ZodType<${rowType(table, plan)}>)` : scalar(plan.scalar));
+	let expr = jsonImports.get(`${table}.${plan.column.db}`) ?? (plan.customJson ? `z.custom<NonNullable<RowOf<'${table}'>['${plan.name}']>>((value) => value !== undefined)` : plan.column.storage === void 0 ? scalar(plan.scalar) : `(z.string() as unknown as z.ZodType<${rowType(table, plan)}>)`);
 	if (plan.column.array) expr = `z.array(${expr})`;
 	if (plan.nullable) expr = `${expr}.nullable()`;
 	if (plan.optional) expr = `${expr}.exactOptional()`;
@@ -121,9 +121,9 @@ function zod(options = {}) {
 			const lines = [
 				HEADER,
 				"import { z } from \"zod\";",
-				""
+				"",
+				`import type { InsertOf, RowOf, UpdateOf } from ${JSON.stringify(input.importPath(path, input.config.output))};`
 			];
-			lines.push(`import type { InsertOf, RowOf, UpdateOf } from ${JSON.stringify(input.importPath(path, input.config.output))};`);
 			for (const [from, names] of imports) lines.push(`import { ${[...new Set(names)].sort().join(", ")} } from ${JSON.stringify(from)};`);
 			const validators = [];
 			for (const [key, table] of tableEntries(input)) {
@@ -137,8 +137,7 @@ function zod(options = {}) {
 				}
 				if (variants.includes("Insert")) validators.push(`  ${propertyKey(key)}: { insert: ${schemaName(key, "Insert")}, update: ${schemaName(key, "Update")} },`);
 			}
-			lines.push("", "/** Write validators for the validation plugin. */");
-			lines.push("export const validators: {");
+			lines.push("", "/** Write validators for the validation plugin. */", "export const validators: {");
 			for (const [key, table] of tableEntries(input)) {
 				if (!variantsFor(table).includes("Insert")) continue;
 				lines.push(`  readonly ${propertyKey(key)}: { readonly insert: typeof ${schemaName(key, "Insert")}; readonly update: typeof ${schemaName(key, "Update")} };`);
@@ -152,126 +151,4 @@ function zod(options = {}) {
 	};
 }
 //#endregion
-//#region src/config/index.ts
-/** The JSON Schema document for a `json[...].schema` entry. */
-function resolveJsonSchema(source) {
-	const standard = source["~standard"];
-	if (standard === void 0) return source;
-	const jsonSchema = standard.jsonSchema;
-	if (typeof jsonSchema?.input !== "function") throw new TypeError("json[...].schema: this Standard Schema library does not implement Standard JSON Schema; pass a JSON Schema object instead");
-	return jsonSchema.input({ target: "draft-2020-12" });
-}
-function entitlementsOf(config = {}) {
-	const customer = config.customer ?? "organizations.stripe_customer_id";
-	const dot = customer.lastIndexOf(".");
-	if (dot <= 0) throw new TypeError(`entitlements.customer must be "table.column", got "${customer}"`);
-	return {
-		table: customer.slice(0, dot),
-		column: customer.slice(dot + 1),
-		key: config.key ?? "id"
-	};
-}
-function vectorSearchOf(config = {}) {
-	return Object.entries(config).map(([table, entry]) => typeof entry === "string" ? {
-		table,
-		column: entry,
-		distance: "cosine"
-	} : {
-		table,
-		column: entry.column,
-		distance: entry.distance ?? "cosine"
-	});
-}
-const CONFIG_SCHEMA_URL = "https://unpkg.com/better-supabase/schemas/config-v1.json";
-/** Identity helper that types `better-supabase.config.ts`. */
-function defineConfig(config) {
-	return config;
-}
-function pick(value, defaults) {
-	if (value === void 0 || value === false) return void 0;
-	if (value === true) return defaults;
-	return {
-		...defaults,
-		...value
-	};
-}
-function resolveExpose(entry) {
-	if (Array.isArray(entry)) return {
-		anon: [],
-		authenticated: entry
-	};
-	const roles = entry;
-	return {
-		anon: roles.anon ?? [],
-		authenticated: roles.authenticated ?? []
-	};
-}
-/** Applies defaults. Paths stay relative to `root`. */
-function resolveConfig(config, root) {
-	const output = config.output ?? "src/lib/supabase/generated.ts";
-	return {
-		root,
-		source: config.source ?? {},
-		schemas: config.schemas ?? ["public"],
-		casing: config.casing ?? "snake",
-		tables: config.tables ?? {},
-		output,
-		databaseTypesOutput: output.replace(/[^/]+$/, "database.types.ts"),
-		postgrestVersion: config.postgrestVersion ?? "13",
-		json: config.json ?? {},
-		codecs: {
-			timestamptz: config.codecs?.timestamptz ?? "string",
-			int8: config.codecs?.int8 ?? "number",
-			numeric: config.codecs?.numeric ?? "number"
-		},
-		sensitive: config.sensitive ?? [],
-		storagePaths: config.storagePaths ?? {},
-		expose: Object.fromEntries(Object.entries(config.expose ?? {}).map(([table, entry]) => [table, resolveExpose(entry)])),
-		readSets: config.readSets ?? [],
-		generators: config.generators ?? [],
-		plugins: {
-			timestamps: pick(config.plugins?.timestamps, {
-				createdAt: "created_at",
-				updatedAt: "updated_at"
-			}),
-			softDelete: pick(config.plugins?.softDelete, { column: "deleted_at" }),
-			tenant: pick(config.plugins?.tenant, { column: "organization_id" }),
-			actor: pick(config.plugins?.actor, {
-				createdBy: "created_by",
-				updatedBy: "updated_by"
-			})
-		},
-		claims: {
-			...DEFAULT_CLAIMS,
-			...config.claims
-		},
-		buckets: config.buckets ?? {},
-		topics: config.topics ?? {},
-		realtime: { tables: config.realtime?.tables ?? [] },
-		entitlements: entitlementsOf(config.entitlements),
-		vectorSearch: vectorSearchOf(config.vectorSearch),
-		sql: {
-			dir: config.sql?.dir ?? "supabase/schemas",
-			prefix: config.sql?.prefix ?? "900_better_supabase",
-			testsDir: config.sql?.testsDir ?? "supabase/tests",
-			kit: config.sql?.kit ?? []
-		},
-		seed: {
-			entry: config.seed?.entry ?? "supabase/seed.ts",
-			output: config.seed?.output ?? "supabase/seeds/000_better_supabase.sql"
-		},
-		openapi: {
-			entry: config.openapi?.entry ?? "src/lib/openapi.ts",
-			output: config.openapi?.output ?? "openapi.json"
-		},
-		doctor: {
-			ignore: config.doctor?.ignore ?? [],
-			strict: config.doctor?.strict ?? false,
-			sources: config.doctor?.sources ?? ["src/**/*.{ts,tsx}"],
-			policyHelperLimit: config.doctor?.policyHelperLimit ?? 5,
-			...config.doctor?.claimsLimit === void 0 ? {} : { claimsLimit: config.doctor.claimsLimit }
-		}
-	};
-}
-//#endregion
-export { zod as a, resolveJsonSchema as i, defineConfig as n, valibot as o, resolveConfig as r, CONFIG_SCHEMA_URL as t };
+export { valibot as n, zod as t };

package/dist/{define-BXMYD9AY.js → define-DF341GDj.js}

@@ -1,12 +1,14 @@
 import { n as dbError, t as DbException } from "./errors-Bl3rkOzo.js";
-import { a as invalidRequest, c as needsDecoding, o as decodeRows, r as IrBuilder, s as encodeValue } from "./simplify-bwJpLnaS.js";
-import { i as or, t as and } from "./types-6cYK9pbJ.js";
+import { a as invalidRequest, c as needsDecoding, o as decodeRows, r as IrBuilder, s as encodeValue } from "./simplify-LakqK1vH.js";
+import { n as nowInstant } from "./temporal-BwshQk0W.js";
+import { i as or, n as column, r as not, t as and } from "./types-6cYK9pbJ.js";
 import { i as ok, n as err, o as toDbError, s as withErrorMapper, t as AsyncResult } from "./result-DWXatkd6.js";
-import { t as invalidationTargets } from "./tables-rZxRxNPW.js";
+import { t as invalidationTargets } from "./tables-Dhha3BXM.js";
 import { t as consoleLogger } from "./logger-glM28NVN.js";
 import { r as orderPlugins } from "./plugin-BqR6wKMB.js";
-import { a as postgrestExecutor, n as StatsRecorder, r as recordStats } from "./stats-C5W-rBfR.js";
-import { d as isQuerySpec, f as specTables, n as checkParams, o as isReadSet, r as containsPlaceholder, t as bindParams, u as createSpecs } from "./read-set-4lI3W_gZ.js";
+import { a as postgrestExecutor, n as StatsRecorder, r as recordStats } from "./stats-D78UQ8Yu.js";
+import { d as isQuerySpec, f as specTables, n as checkParams, o as isReadSet, r as containsPlaceholder, t as bindParams, u as createSpecs } from "./read-set-D0qBcboM.js";
+import { a as toBase64Url, t as base64ToText } from "./base64-CQeB1eSf.js";
 import { t as validate } from "./standard-FUi3Z3-7.js";
 //#region src/core/batch.ts
 /**
@@ -129,27 +131,13 @@ var EventHub = class {
 };
 //#endregion
 //#region src/core/cursor.ts
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
-function toBase64Url(bytes) {
-	let binary = "";
-	for (const byte of bytes) binary += String.fromCharCode(byte);
-	return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-function fromBase64Url(text) {
-	const base64 = text.replace(/-/g, "+").replace(/_/g, "/");
-	const binary = atob(base64 + "=".repeat((4 - base64.length % 4) % 4));
-	const bytes = new Uint8Array(binary.length);
-	for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
-	return bytes;
-}
 /** Opaque, URL-safe keyset cursor. */
 function encodeCursor(values) {
-	return toBase64Url(encoder.encode(JSON.stringify(values)));
+	return toBase64Url(JSON.stringify(values));
 }
 function decodeCursor(cursor) {
 	try {
-		const parsed = JSON.parse(decoder.decode(fromBase64Url(cursor)));
+		const parsed = JSON.parse(base64ToText(cursor));
 		return Array.isArray(parsed) ? parsed : void 0;
 	} catch {
 		return;
@@ -233,10 +221,16 @@ var OperationRunner = class {
 		} : { errorMappers: runtime.errorMappers };
 		const executed = await runtime.executor.execute(current, context);
 		const selection = current.kind === "select" ? current.selection : current.returning;
-		const result = executed.ok && selection && needsDecoding(selection) ? ok({
-			...executed.data,
-			rows: decodeRows(selection, executed.data.rows)
-		}) : executed;
+		let result = executed;
+		if (executed.ok && selection && needsDecoding(selection)) try {
+			result = ok({
+				...executed.data,
+				rows: decodeRows(selection, executed.data.rows)
+			});
+		} catch (cause) {
+			if (cause instanceof DbException) return this.fail(op.table, cause.error);
+			throw cause;
+		}
 		const rows = result.ok ? result.data.rows.length : 0;
 		const truncated = current.kind === "select" && current.limit === void 0 && current.single === void 0 && !current.head && rows >= runtime.maxRows;
 		if (truncated && !runtime.truncatedTables.has(op.table.key)) {
@@ -515,10 +509,11 @@ function createRepository(runner, table) {
 		}
 	};
 	function insertOp(rows, args, conflict) {
+		const built = rows.map((row) => builder.row(table, row));
 		return {
 			kind: "insert",
 			table,
-			rows: rows.map((row) => builder.row(table, row)),
+			rows: conflict && built.length > 1 ? byKey(built, conflict) : built,
 			returning: returning(args),
 			onConflict: conflict ? {
 				columns: conflict,
@@ -572,7 +567,7 @@ function createRepository(runner, table) {
 		if (typeof args["after"] === "string") {
 			const values = decodeCursor(args["after"]);
 			if (!values || values.length !== orderBy.length) return runner.fail(table, dbError("invalid_request", "Invalid cursor"));
-			after = keysetCondition(orderBy, values);
+			after = keysetCondition(orderBy, values, (name) => Object.values(table.columns).find((meta) => meta.db === name)?.nullable ?? true);
 		}
 		const op = selectOp(args, {
 			selection: withSort,
@@ -634,24 +629,47 @@ function strip(row, keys) {
 	for (const key of keys) delete copy[key];
 	return copy;
 }
-/** `(a, b) > (x, y)` for mixed directions, as an OR of ANDs. */
-function keysetCondition(orderBy, values) {
-	const branches = orderBy.map((term, index) => {
-		const equal = orderBy.slice(0, index).map((prev, prevIndex) => ({
-			kind: "column",
-			column: prev.column,
-			op: "eq",
-			value: values[prevIndex]
-		}));
-		const step = {
-			kind: "column",
-			column: term.column,
-			op: term.direction === "asc" ? "gt" : "lt",
-			value: values[index]
-		};
-		return and(...equal, step) ?? step;
+/**
+* Rows in conflict-key order, so concurrent upserts lock the same rows in
+* the same order instead of deadlocking.
+*/
+function byKey(rows, columns) {
+	const compare = (left, right) => {
+		if (left === right) return 0;
+		if (left === null || left === void 0) return 1;
+		if (right === null || right === void 0) return -1;
+		if (typeof left === "number" && typeof right === "number") return left - right;
+		if (typeof left === "bigint" && typeof right === "bigint") return left < right ? -1 : 1;
+		const a = String(left);
+		const b = String(right);
+		return a < b ? -1 : a > b ? 1 : 0;
+	};
+	return [...rows].sort((left, right) => {
+		for (const column of columns) {
+			const order = compare(left[column], right[column]);
+			if (order !== 0) return order;
+		}
+		return 0;
+	});
+}
+/**
+* The rows after the cursor `values` in `orderBy` order, as an OR of ANDs:
+* `a > x or (a = x and b > y)`. The SQL compiler sends that shape as the row
+* comparison `(a, b) > (x, y)`. Nulls sort where Postgres puts them: last
+* for `asc`, first for `desc`, unless the term says otherwise.
+*/
+function keysetCondition(orderBy, values, nullable) {
+	const isNull = (name) => column(name, "is", null);
+	const branches = orderBy.flatMap((term, index) => {
+		const value = values[index];
+		const nullsFirst = (term.nulls ?? (term.direction === "desc" ? "first" : "last")) === "first";
+		const after = column(term.column, term.direction === "asc" ? "gt" : "lt", value);
+		const step = value === null ? nullsFirst ? not(isNull(term.column)) : void 0 : nullsFirst || !nullable(term.column) ? after : or(after, isNull(term.column));
+		if (!step) return [];
+		const equal = orderBy.slice(0, index).map((prev, prevIndex) => values[prevIndex] === null ? isNull(prev.column) : column(prev.column, "eq", values[prevIndex]));
+		return [and(...equal, step) ?? step];
 	});
-	return or(...branches);
+	return branches.length > 0 ? or(...branches) : column(orderBy[0]?.column ?? "", "in", []);
 }
 //#endregion
 //#region src/core/search.ts
@@ -796,7 +814,9 @@ var BetterSupabase = class BetterSupabase {
 		const invalidate = (target) => {
 			try {
 				const pending = adapter.invalidate(target);
-				if (pending) pending.catch((cause) => report(cause, target.table));
+				if (pending) pending.catch((cause) => {
+					report(cause, target.table);
+				});
 			} catch (cause) {
 				report(cause, target.table);
 			}
@@ -831,7 +851,7 @@ var BetterSupabase = class BetterSupabase {
 			context,
 			events,
 			errorMappers,
-			now: this.options.now ?? (() => /* @__PURE__ */ new Date()),
+			now: this.options.now ?? nowInstant,
 			maxRows: this.options.maxRows ?? 1e3,
 			truncatedTables: this.#truncatedTables
 		});
@@ -985,15 +1005,15 @@ var BetterSupabase = class BetterSupabase {
 			const rows = entry.rows ?? [];
 			const result = await runSpec(this.#db(client, {
 				name: "read-set",
-				execute: async (op) => {
+				execute: (op) => {
 					if (op.kind === "select" && op.single) {
-						if (rows.length > 1) return err(dbError("multiple_rows", `Expected one ${op.table.key} row`));
-						if (rows.length === 0 && op.single === "one") return err(dbError("not_found", `No ${op.table.key} row matched`));
+						if (rows.length > 1) return Promise.resolve(err(dbError("multiple_rows", `Expected one ${op.table.key} row`)));
+						if (rows.length === 0 && op.single === "one") return Promise.resolve(err(dbError("not_found", `No ${op.table.key} row matched`)));
 					}
-					return ok({
+					return Promise.resolve(ok({
 						rows,
 						count: entry.count ?? null
-					});
+					}));
 				}
 			}, context, [], new StatsRecorder(), new EventHub(this.events.logger)), spec, void 0);
 			if (!result.ok) return result;

package/dist/{define-e3zI4_4g.d.ts → define-DUbydmJa.d.ts}

@@ -1,10 +1,11 @@
-import { A as SchemaMeta, C as PrimaryKeyValue, D as Relations, E as RelationShape, I as UniqueKeyName, L as UniqueWhere, N as TableKey, O as Row, P as TableMeta, R as Update, _ as Insert, j as Simplify, k as Schema, n as AnyModels, t as AnyFunctions } from "./types-C83v5SQz.js";
-import { g as Operation, l as CountMode, r as Executor } from "./executor-CGdNQ27g.js";
-import { p as DbError, s as ThrowMapper, t as AsyncResult, v as ErrorMapper } from "./result-CTkCZ6JA.js";
-import { a as EventHub, f as Logger, i as EventHandler, o as EventName, s as MutationNotice, u as RpcNotice } from "./events-DOt3nSO-.js";
-import { a as ExtensionOf, g as WithExtension, h as RequestContext, n as AnyPlugin, r as ApplyExtension } from "./plugin-C4TR9J0Z.js";
-import { t as StandardSchemaV1 } from "./standard-CyhRzctb.js";
-import { i as PostgrestPlan } from "./postgrest-cAEQ_IQN.js";
+/// <reference lib="esnext.temporal" />
+import { A as SchemaMeta, C as PrimaryKeyValue, D as Relations, E as RelationTypes, I as UniqueKeyName, L as UniqueWhere, N as TableKey, O as Row, P as TableMeta, R as Update, g as Insert, j as Simplify, k as Schema, n as AnyModels, t as AnyFunctions } from "./types-DONv9SHN.js";
+import { g as Operation, l as CountMode, r as Executor } from "./executor-DynmIWhq.js";
+import { p as DbError, s as ThrowMapper, t as AsyncResult, v as ErrorMapper } from "./result-c2OYgCV2.js";
+import { a as EventHub, f as Logger, i as EventHandler, o as EventName, s as MutationNotice, u as RpcNotice } from "./events-Do8jXh4D.js";
+import { a as ExtensionOf, g as WithExtension, h as RequestContext, n as AnyPlugin, r as ApplyExtension } from "./plugin-DVRB8qNE.js";
+import { t as StandardSchemaV1 } from "./standard-eudBiRk1.js";
+import { i as PostgrestPlan } from "./postgrest-DmBlevh-.js";
 //#region src/ir/args.d.ts
 interface BaseOps<V> {
   readonly eq?: V;
@@ -147,7 +148,7 @@ interface AggregateArgs<M extends AnyModels, T extends keyof M> {
 type SelectPart<M extends AnyModels, T extends keyof M, A> = A extends {
   readonly select: readonly (infer K)[];
 } ? Pick<Row<M, T>, Extract<K, keyof Row<M, T>>> : Row<M, T>;
-type RelationPayload<M extends AnyModels, R, V> = R extends RelationShape ? R["kind"] extends "many" ? Payload<M, Extract<R["table"], keyof M>, V extends true ? unknown : V>[] : R["nullable"] extends true ? Payload<M, Extract<R["table"], keyof M>, V extends true ? unknown : V> | null : Payload<M, Extract<R["table"], keyof M>, V extends true ? unknown : V> : never;
+type RelationPayload<M extends AnyModels, R, V> = R extends RelationTypes ? R["kind"] extends "many" ? Payload<M, Extract<R["table"], keyof M>, V extends true ? unknown : V>[] : R["nullable"] extends true ? Payload<M, Extract<R["table"], keyof M>, V extends true ? unknown : V> | null : Payload<M, Extract<R["table"], keyof M>, V extends true ? unknown : V> : never;
 type IncludePart<M extends AnyModels, T extends keyof M, A> = A extends {
   readonly include: infer I;
 } ? { -readonly [R in keyof I & keyof Relations<M, T>]: RelationPayload<M, Relations<M, T>[R], I[R]>; } & CountPart<I> & ([keyof I & MeasureKey] extends [never] ? unknown : RelationMeasures<M, T, I>) : unknown;
@@ -551,7 +552,7 @@ declare function explainPostgrest(op: Operation): PostgrestPlan;
 //#region src/core/define.d.ts
 interface DefineSupabaseOptions {
   /** Clock used by plugins (timestamps, soft delete). */
-  readonly now?: () => Date;
+  readonly now?: () => Temporal.Instant;
   /** Extra error mappers, run before plugin mappers. */
   readonly errors?: readonly ErrorMapper[];
   /** Receives errors from event handlers, hooks and cache adapters. Defaults to `console`. */

package/dist/edge/index.d.ts

@@ -1,7 +1,7 @@
-import { N as TableKey, n as AnyModels, t as AnyFunctions } from "../types-C83v5SQz.js";
-import { t as BetterSupabase } from "../define-e3zI4_4g.js";
-import { d as ServerContext, f as ServerOptions, l as BetterServer, n as GuardOptions } from "../respond-Dne1ARSa.js";
-import { i as ResourceRouteOptions } from "../resource-CgZa3YG_.js";
+import { N as TableKey, n as AnyModels, t as AnyFunctions } from "../types-DONv9SHN.js";
+import { t as BetterSupabase } from "../define-DUbydmJa.js";
+import { d as ServerContext, f as ServerOptions, l as BetterServer, n as GuardOptions } from "../respond-DAkPIdTH.js";
+import { a as ResourceRouteOptions } from "../resource-CwVgiI5q.js";
 //#region src/edge/index.d.ts
 export interface CorsOptions {
   /** Allowed origins, or `*`. Defaults to `*`. */

package/dist/edge/index.js

@@ -1,7 +1,7 @@
 import { n as dbError } from "../errors-Bl3rkOzo.js";
-import { a as problemResponse } from "../problem-BTkTtRV9.js";
-import { i as respond, n as guard, o as createServer, s as extendServer, t as defaultExpose } from "../respond-DMcbQwfN.js";
-import { t as defineResource } from "../resource-BHEWmQJK.js";
+import { a as problemResponse } from "../problem-CGt1ADix.js";
+import { i as respond, n as guard, o as createServer, s as extendServer, t as defaultExpose } from "../respond-C44EZAJo.js";
+import { t as defineResource } from "../resource-D30rp0GN.js";
 //#region src/edge/index.ts
 const SUPABASE_CORS_HEADERS = [
 	"authorization",
@@ -54,7 +54,7 @@ function createEdge(sb, options = {}) {
 			});
 			const ctx = await server.context(request, { refresh: handlerOptions.refresh ?? false });
 			const instance = new URL(request.url).pathname;
-			const denied = guard(ctx.auth, handlerOptions.allow, handlerOptions.aal);
+			const denied = guard(ctx.auth, handlerOptions.allow, handlerOptions.aal, handlerOptions.scopes);
 			let response;
 			try {
 				response = denied ? problemResponse(denied, {

package/dist/{entitlements-Dng-ctuT.d.ts → entitlements-DvJXoI02.d.ts}

@@ -1,4 +1,4 @@
-import { t as AuthSession } from "./view-D1s0wa0T.js";
+import { t as AuthSession } from "./view-3Po_PVlr.js";
 //#region src/auth/entitlements.d.ts
 /**
  * One entry of the `memberships` claim, in PermDock's shape. PermDock strips