better-supabase 0.7.0 → 0.8.0

package/dist/openapi/index.js

@@ -1,355 +1,33 @@
-import { n as PROBLEM_TYPE_BASE, t as PROBLEM_CONTENT_TYPE } from "../problem-BreOl8b8.js";
-import { t as SPEC_PINS } from "../spec-pins--j6mTok4.js";
-import { t as buildJsonSchema } from "../json-schema-CvER4kgT.js";
+import { a as toOpenApi30Schema, n as openapiFormat, r as OPENAPI_33_PREVIEW_VERSION, t as defineApi } from "../api-DtHFC037.js";
+import { r as PROBLEM_SCHEMA } from "../build-hPwk3_X5.js";
 //#region src/openapi/index.ts
-/** JSON Schema for RFC 9457 Problem Details as better-supabase sends them. */
-const PROBLEM_SCHEMA = {
-	type: "object",
-	required: [
-		"type",
-		"title",
-		"status"
-	],
-	properties: {
-		type: {
-			type: "string",
-			format: "uri-reference",
-			examples: [`${PROBLEM_TYPE_BASE}not-found`]
-		},
-		title: { type: "string" },
-		status: {
-			type: "integer",
-			minimum: 100,
-			maximum: 599
-		},
-		detail: { type: "string" },
-		instance: { type: "string" },
-		kind: { type: "string" },
-		code: { type: "string" },
-		hint: { type: "string" },
-		constraint: { type: "string" },
-		column: { type: "string" },
-		columns: {
-			type: "array",
-			items: { type: "string" }
-		},
-		issues: {
-			type: "array",
-			items: {
-				type: "object",
-				required: ["message"],
-				properties: {
-					message: { type: "string" },
-					path: {
-						type: "array",
-						items: { type: ["string", "integer"] }
-					}
-				}
-			}
-		}
-	}
-};
-const ERRORS = [
-	[
-		"BadRequest",
-		400,
-		"The request is invalid."
-	],
-	[
-		"Unauthorized",
-		401,
-		"Missing or invalid credentials."
-	],
-	[
-		"Forbidden",
-		403,
-		"Row-level security or a plugin denied the request."
-	],
-	[
-		"NotFound",
-		404,
-		"No row matches."
-	],
-	[
-		"Conflict",
-		409,
-		"A unique or foreign key constraint failed."
-	],
-	[
-		"Unprocessable",
-		422,
-		"Validation or a check constraint failed."
-	]
-];
-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) {
-	const out = {};
-	for (const [name, status] of ERRORS) if (codes.includes(status)) out[String(status)] = response(name);
-	return out;
-}
-function jsonBody(schema, description) {
-	return {
-		description,
-		content: { "application/json": { schema } }
-	};
-}
-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,
-		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: 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
+* An OpenAPI document for REST resources over your tables, with schemas
 * from the generated metadata, list-query parameters, Supabase security
-* schemes and Problem Details errors.
+* schemes and Problem Details errors. Throws when building or checking the
+* document finds an error; use `defineApi` to read every finding instead.
 *
 * ```ts
 * const doc = createOpenApi(betterSupabase, {
-*   info: { title: 'CRM API', version: '1.0.0' },
-*   resources: { customers: { list: customerList }, notes: { operations: ['list', 'get'] } },
+*   info: { title: "CRM API", version: "1.0.0" },
+*   resources: { customers: { list: customerList }, notes: { operations: ["list", "get"] } },
 * });
 * ```
 */
 function createOpenApi(betterSupabase, options) {
-	const defs = buildJsonSchema({
-		meta: betterSupabase.meta,
-		config: { json: options.json ?? {} }
-	})["$defs"];
-	const schemas = { Problem: PROBLEM_SCHEMA };
-	const paths = {};
-	const tags = [];
-	const base = (options.basePath ?? "").replace(/\/$/, "");
-	const security = options.security ?? ["bearer"];
-	for (const [key, raw] of Object.entries(options.resources)) {
-		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"] : [
-			"list",
-			"get",
-			"create",
-			"update",
-			"delete"
-		]);
-		const name = pascal(key);
-		const tag = resource.tag ?? key;
-		if (!tags.some((entry) => entry.name === tag)) tags.push({
-			name: tag,
-			...resource.description ? { description: resource.description } : {}
-		});
-		const extensions = { "x-better-supabase-table": `${table.schema}.${table.name}` };
-		for (const variant of [
-			"Row",
-			"Insert",
-			"Update"
-		]) {
-			const schema = defs[`${key}${variant}`];
-			if (schema) schemas[`${name}${variant}`] = schema;
-		}
-		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;
-		const item = keyColumn ? `${collection}/{${keyColumn}}` : void 0;
-		const idParameter = keyColumn ? [{
-			name: keyColumn,
-			in: "path",
-			required: true,
-			schema: idSchema
-		}] : [];
-		const op = (operation, summary, body) => ({
-			operationId: `${operation}${name}`,
-			tags: [tag],
-			summary,
-			...extensions,
-			"x-better-supabase-operation": operation,
-			...body
-		});
-		for (const operation of operations) switch (operation) {
-			case "list":
-				(paths[collection] ??= {})["get"] = op("list", `List ${key}`, {
-					parameters: resource.list?.openapi ?? pageParameters(cursor, resource.maxPageSize ?? 200),
-					responses: {
-						"200": jsonBody(ref(`${name}Page`), `A page of ${key}.`),
-						...errorResponses([
-							400,
-							401,
-							403
-						])
-					}
-				});
-				break;
-			case "create":
-				(paths[collection] ??= {})["post"] = op("create", `Create a ${key} row`, {
-					requestBody: {
-						required: true,
-						content: { "application/json": { schema: ref(`${name}Insert`) } }
-					},
-					responses: {
-						"201": jsonBody(ref(`${name}Row`), "Created."),
-						...errorResponses([
-							400,
-							401,
-							403,
-							409,
-							422
-						])
-					}
-				});
-				break;
-			case "get":
-			case "update":
-			case "delete": {
-				if (!item) break;
-				const path = paths[item] ??= { parameters: idParameter };
-				if (operation === "get") path["get"] = op("get", `Get a ${key} row`, { responses: {
-					"200": jsonBody(ref(`${name}Row`), "The row."),
-					...errorResponses([
-						401,
-						403,
-						404
-					])
-				} });
-				else if (operation === "update") path["patch"] = op("update", `Update a ${key} row`, {
-					requestBody: {
-						required: true,
-						content: { "application/json": { schema: ref(`${name}Update`) } }
-					},
-					responses: {
-						"200": jsonBody(ref(`${name}Row`), "Updated."),
-						...errorResponses([
-							400,
-							401,
-							403,
-							404,
-							409,
-							422
-						])
-					}
-				});
-				else path["delete"] = op("delete", `Delete a ${key} row`, { responses: {
-					"204": { description: "Deleted." },
-					...errorResponses([
-						401,
-						403,
-						404,
-						409
-					])
-				} });
-				break;
-			}
-			default: throw new TypeError(`createOpenApi: unknown operation "${String(operation)}"`);
-		}
-	}
-	const securitySchemes = {};
-	if (security.includes("bearer")) securitySchemes["supabaseJwt"] = {
-		type: "http",
-		scheme: "bearer",
-		bearerFormat: "JWT",
-		description: "A Supabase access token. Requests run as that user under row-level security."
-	};
-	if (security.includes("oauth2")) {
-		if (!options.supabaseUrl) throw new TypeError("createOpenApi: oauth2 security needs supabaseUrl");
-		const auth = `${options.supabaseUrl.replace(/\/$/, "")}/auth/v1`;
-		securitySchemes["supabaseOAuth"] = {
-			type: "oauth2",
-			description: "The Supabase OAuth 2.1 server.",
-			flows: { authorizationCode: {
-				authorizationUrl: `${auth}/oauth/authorize`,
-				tokenUrl: `${auth}/oauth/token`,
-				scopes: {}
-			} }
-		};
-	}
-	const responses = {};
-	for (const [name, , description] of ERRORS) responses[name] = {
-		description,
-		content: { [PROBLEM_CONTENT_TYPE]: { schema: ref("Problem") } }
-	};
-	return {
-		openapi: SPEC_PINS.openapi,
-		info: options.info,
-		jsonSchemaDialect: "https://json-schema.org/draft/2020-12/schema",
-		...options.servers ? { servers: options.servers } : {},
-		tags,
-		paths,
-		components: {
-			schemas,
-			responses,
-			securitySchemes
-		},
-		security: Object.keys(securitySchemes).map((name) => ({ [name]: [] }))
-	};
+	const { version, transform, overlays, onDiagnostic, ...apiOptions } = options;
+	const api = defineApi(betterSupabase, apiOptions);
+	const engine = options.applyOverlays;
+	const result = api.openapi({
+		...version === void 0 ? {} : { version },
+		...transform === void 0 ? {} : { transform },
+		...overlays === void 0 ? {} : { overlays },
+		...engine === void 0 ? {} : { applyOverlays: engine }
+	});
+	const errors = result.diagnostics.filter((diagnostic) => diagnostic.severity === "error");
+	if (errors.length > 0) throw new TypeError(`createOpenApi: ${errors.map((error) => `${error.code}: ${error.message}${error.pointer ? ` (${error.pointer})` : ""}`).join("; ")}`);
+	if (onDiagnostic) for (const diagnostic of result.diagnostics) onDiagnostic(diagnostic);
+	return result.document;
 }
 //#endregion
-export { PROBLEM_SCHEMA, createOpenApi };
+export { OPENAPI_33_PREVIEW_VERSION, PROBLEM_SCHEMA, createOpenApi, openapiFormat, toOpenApi30Schema };

package/dist/optional-peer-D1pi-skw.js

@@ -0,0 +1,24 @@
+//#region src/core/optional-peer.ts
+/**
+* Imports an optional peer package on first use, or resolves `undefined` when
+* it is not installed so the caller can say how to add it. The specifier is
+* a variable on purpose: bundlers then leave the peer out of apps that never
+* reach this call.
+*/
+async function importOptionalPeer(specifier) {
+	try {
+		return await import(specifier);
+	} catch {
+		return;
+	}
+}
+/** Runs `load` once and shares the promise. A rejection is not kept, so the next call tries again. */
+function memoized(load) {
+	let promise;
+	return () => promise ??= load().catch((cause) => {
+		promise = void 0;
+		throw cause;
+	});
+}
+//#endregion
+export { memoized as n, importOptionalPeer as t };

package/dist/orpc/index.d.ts

@@ -1,11 +1,11 @@
-import { b as DbError, f as Result } from "../result-D7y2fT87.js";
-import { a as AnyModels, i as AnyFunctions } from "../types-6BdhkmZe.js";
-import { r as AuthState } from "../resolve-ChTYeTEl.js";
-import { i as ProblemDetails } from "../problem-DD8LZFjc.js";
-import { t as BetterSupabase } from "../define-CJJkkr1-.js";
-import { i as ServerContext, o as ServerOptions, t as BetterServer } from "../server-ZSJ9rCcV.js";
-import { i as MiddlewareOptions, r as GuardOptions } from "../respond-DprrgyXX.js";
-import { s as BlockRequireOptions } from "../kit-CkNzZUqv.js";
+import { b as DbError, f as Result } from "../result-BchM1XZn.js";
+import { a as AnyModels, i as AnyFunctions } from "../types-CoE5Zwy4.js";
+import { r as AuthState } from "../resolve-MxXVWyhd.js";
+import { i as ProblemDetails } from "../problem-TvGdxO1t.js";
+import { t as BetterSupabase } from "../define-DmcfoNXB.js";
+import { i as ServerContext, s as ServerOptions, t as BetterServer } from "../server-types-CrAmZ8jv.js";
+import { i as MiddlewareOptions, r as GuardOptions } from "../respond-Cw-zanCm.js";
+import { s as BlockRequireOptions } from "../kit-W99LCPBS.js";
 import { t as Validated } from "../shared-DDSjEGDR.js";
 import { AnyEntry, Contributions } from "@supabase/middleware";
 import { BuilderWithMiddlewares, DecoratedMiddleware, ORPCError } from "@orpc/server";

package/dist/orpc/index.js

@@ -1,11 +1,11 @@
-import { r as dbErrorOf } from "../errors-B11Duf73.js";
-import { o as toProblem } from "../problem-BreOl8b8.js";
+import { r as dbErrorOf } from "../errors-2M6CKMP4.js";
+import { s as toProblem } from "../problem-CJvFeGu7.js";
 import { i as claimsOf } from "../claims-PqzCxaTD.js";
 import { t as tenantOf } from "../tenant-I1TEZ_BX.js";
-import { c as extendServer, n as flushEvents, s as createServer, y as refreshFor } from "../adapter-B-tL8hqg.js";
-import { n as toSession } from "../view-BeFcRV6G.js";
-import { o as settle, r as guard, t as defaultExpose } from "../respond-BUgsXNgk.js";
-import { t as authorizeCaller } from "../kit-Fm-Fv7q5.js";
+import { b as refreshFor, c as extendServer, n as flushEvents, s as createServer } from "../adapter-CN45ibbV.js";
+import { n as toSession } from "../view-D5ryq3gz.js";
+import { o as settle, r as guard, t as defaultExpose } from "../respond-volM3ByS.js";
+import { t as authorizeCaller } from "../kit-BhHr9T9v.js";
 import { bufferRequest, pipeline, seedContext } from "@supabase/middleware";
 import { COMMON_ERROR_STATUS_MAP, ORPCError, os } from "@orpc/server";
 //#region src/bridges/orpc.ts
@@ -64,10 +64,8 @@ function createOrpc(betterSupabase, options = {}) {
 			});
 			const denied = guard(ctx.auth, middlewareOptions.allow, middlewareOptions.aal, middlewareOptions.scopes);
 			if (denied) throw toOrpcError(denied);
-			if (middlewareOptions.requireTenant || middlewareOptions.authorize) {
-				const caller = await authorizeCaller(ctx.auth, middlewareOptions, void 0, tenantOf(toSession(ctx.auth), tenantClaim));
-				if ("kind" in caller) throw toOrpcError(caller);
-			}
+			const caller = await authorizeCaller(ctx.auth, middlewareOptions, void 0, tenantOf(toSession(ctx.auth), tenantClaim), options.authorizer);
+			if ("kind" in caller) throw toOrpcError(caller);
 			try {
 				return await next({ context: {
 					bs: ctx,
@@ -89,16 +87,19 @@ function createOrpc(betterSupabase, options = {}) {
 		},
 		fetchHandler(handler, fetchOptions = {}) {
 			return async (request, _env, executionContext) => {
-				const { response } = await handler.handle(request, {
-					...fetchOptions.prefix ? { prefix: fetchOptions.prefix } : {},
-					context: { request }
-				});
-				const ctx = contexts.get(request)?.ctx;
-				const answer = response ?? new Response("Not found", { status: 404 });
-				flushEvents(server, options.waitUntil ?? (executionContext ? (promise) => {
-					executionContext.waitUntil(promise);
-				} : void 0));
-				return ctx ? ctx.apply(answer) : answer;
+				try {
+					const { response } = await handler.handle(request, {
+						...fetchOptions.prefix ? { prefix: fetchOptions.prefix } : {},
+						context: { request }
+					});
+					const ctx = contexts.get(request)?.ctx;
+					const answer = response ?? new Response("Not found", { status: 404 });
+					return ctx ? ctx.apply(answer) : answer;
+				} finally {
+					flushEvents(server, options.waitUntil ?? (executionContext ? (promise) => {
+						executionContext.waitUntil(promise);
+					} : void 0));
+				}
 			};
 		},
 		async unwrap(value) {

package/dist/otel/index.d.ts

@@ -1,6 +1,6 @@
-import { d as Plugin } from "../plugin-FGY8UhYm.js";
-import { a as EventHub } from "../events-DWDhx77e.js";
-import { t as SPEC_PINS } from "../spec-pins-C89s6DyW.js";
+import { d as Plugin } from "../plugin-CPK2HsbY.js";
+import { a as EventHub } from "../events-D1BOCll8.js";
+import { t as SPEC_PINS } from "../spec-pins-CwzDY25w.js";
 import { Attributes, Meter, Tracer } from "@opentelemetry/api";
 //#region src/otel/index.d.ts
 export declare const INSTRUMENTATION_NAME = "better-supabase";

package/dist/otel/index.js

@@ -1,7 +1,7 @@
 import { r as definePlugin } from "../plugin-tfXW1-qO.js";
-import { t as SPEC_PINS } from "../spec-pins--j6mTok4.js";
-import { r as blockEventAttributes } from "../block-events-CrT8r7Fe.js";
-import "../version--AolB5ej.js";
+import { t as SPEC_PINS } from "../spec-pins-DsLfUH7l.js";
+import { i as blockEventAttributes } from "../block-events-DTxU5tfr.js";
+import "../version-Cq8gfDbd.js";
 import { SpanKind, SpanStatusCode, context, metrics, propagation, trace } from "@opentelemetry/api";
 //#region src/otel/index.ts
 const INSTRUMENTATION_NAME = "better-supabase";
@@ -40,9 +40,9 @@ function systemOf(executor) {
 * ```
 */
 function otel(options = {}) {
-	const tracer = options.tracer ?? trace.getTracer("better-supabase", "0.7.0");
+	const tracer = options.tracer ?? trace.getTracer("better-supabase", "0.8.0");
 	let histogram;
-	if (options.metrics !== false) histogram = (options.meter ?? metrics.getMeter("better-supabase", "0.7.0")).createHistogram("db.client.operation.duration", {
+	if (options.metrics !== false) histogram = (options.meter ?? metrics.getMeter("better-supabase", "0.8.0")).createHistogram("db.client.operation.duration", {
 		unit: "s",
 		description: "Duration of database client operations.",
 		advice: { explicitBucketBoundaries: [
@@ -181,7 +181,7 @@ function otel(options = {}) {
 * Returns a function that stops listening.
 */
 function traceAuth(betterSupabase, options = {}) {
-	const tracer = options.tracer ?? trace.getTracer("better-supabase", "0.7.0");
+	const tracer = options.tracer ?? trace.getTracer("better-supabase", "0.8.0");
 	const offAuth = betterSupabase.events.on("auth", (event) => {
 		const span = tracer.startSpan("auth.resolve", {
 			kind: SpanKind.INTERNAL,
@@ -219,7 +219,7 @@ function traceAuth(betterSupabase, options = {}) {
 * set an error status. Returns a function that stops listening.
 */
 function traceBlockEvents(betterSupabase, options = {}) {
-	const tracer = options.tracer ?? trace.getTracer("better-supabase", "0.7.0");
+	const tracer = options.tracer ?? trace.getTracer("better-supabase", "0.8.0");
 	return betterSupabase.events.on("block", (event) => {
 		const attributes = {
 			...options.attributes,

package/dist/{outbox-Cq7pPYvl.d.ts → outbox-DZfAvfzC.d.ts}

@@ -1,10 +1,10 @@
 /// <reference lib="esnext.temporal" />
-import { b as DbError, t as AsyncResult } from "./result-D7y2fT87.js";
-import { t as SqlClient } from "./executor-DbvExCFC.js";
-import { t as BlockTransport } from "./block-transport-DvaoPuZ9.js";
-import { i as CursorPageOptions, r as BlockTemporalOptions } from "./block-helpers-CKtbFcRv.js";
-import { t as BlockProblemOptions } from "./problem-DD8LZFjc.js";
-import { r as EventSink, t as CloudEvent } from "./cloud-event-C1JCc1bH.js";
+import { b as DbError, t as AsyncResult } from "./result-BchM1XZn.js";
+import { t as SqlClient } from "./executor-ngjKL_Pe.js";
+import { t as BlockTransport } from "./block-transport-inD4fFq-.js";
+import { i as CursorPageOptions, r as BlockTemporalOptions } from "./block-helpers-C0Xj8War.js";
+import { t as BlockProblemOptions } from "./problem-TvGdxO1t.js";
+import { i as EventSink, t as CloudEvent } from "./cloud-event-Dune0KI7.js";
 //#region src/blocks/outbox/outbox.d.ts
 /** One row of the outbox, as `outbox_claim` and `outbox_history` return it. */
 interface OutboxEvent {