@freehour/supabase-core 2.2.1 → 2.3.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 freehour
+Copyright (c) 2026 freehour
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.js

@@ -1,369 +1,68 @@
 import { assert as e } from "@freehour/assert";
 import t from "zod";
-//#region node_modules/@supabase/postgrest-js/dist/index.mjs
-var n = 3, r = (e) => Math.min(1e3 * 2 ** e, 3e4), i = [520, 503], a = [
-	"GET",
-	"HEAD",
-	"OPTIONS"
-], o = class extends Error {
-	constructor(e) {
-		super(e.message), this.name = "PostgrestError", this.details = e.details, this.hint = e.hint, this.code = e.code;
-	}
-	toJSON() {
-		return {
-			name: this.name,
-			message: this.message,
-			details: this.details,
-			hint: this.hint,
-			code: this.code
-		};
-	}
-};
-function s(e, t) {
-	return new Promise((n) => {
-		if (t?.aborted) {
-			n();
-			return;
-		}
-		let r = setTimeout(() => {
-			t?.removeEventListener("abort", i), n();
-		}, e);
-		function i() {
-			clearTimeout(r), n();
-		}
-		t?.addEventListener("abort", i);
-	});
-}
-function c(e, t, r, o) {
-	return !(!o || r >= n || !a.includes(e) || !i.includes(t));
-}
-var l = class {
-	constructor(e) {
-		this.shouldThrowOnError = !1, this.retryEnabled = !0, this.method = e.method, this.url = e.url, this.headers = new Headers(e.headers), this.schema = e.schema, this.body = e.body, this.shouldThrowOnError = e.shouldThrowOnError ?? !1, this.signal = e.signal, this.isMaybeSingle = e.isMaybeSingle ?? !1, this.shouldStripNulls = e.shouldStripNulls ?? !1, this.urlLengthLimit = e.urlLengthLimit ?? 8e3, this.retryEnabled = e.retry ?? !0, e.fetch ? this.fetch = e.fetch : this.fetch = fetch;
-	}
-	throwOnError() {
-		return this.shouldThrowOnError = !0, this;
-	}
-	stripNulls() {
-		if (this.headers.get("Accept") === "text/csv") throw Error("stripNulls() cannot be used with csv()");
-		return this.shouldStripNulls = !0, this;
-	}
-	setHeader(e, t) {
-		return this.headers = new Headers(this.headers), this.headers.set(e, t), this;
-	}
-	retry(e) {
-		return this.retryEnabled = e, this;
-	}
-	then(e, t) {
-		var i = this;
-		if (this.schema === void 0 || (["GET", "HEAD"].includes(this.method) ? this.headers.set("Accept-Profile", this.schema) : this.headers.set("Content-Profile", this.schema)), this.method !== "GET" && this.method !== "HEAD" && this.headers.set("Content-Type", "application/json"), this.shouldStripNulls) {
-			let e = this.headers.get("Accept");
-			e === "application/vnd.pgrst.object+json" ? this.headers.set("Accept", "application/vnd.pgrst.object+json;nulls=stripped") : (!e || e === "application/json") && this.headers.set("Accept", "application/vnd.pgrst.array+json;nulls=stripped");
-		}
-		let o = this.fetch, l = (async () => {
-			let e = 0;
-			for (;;) {
-				let t = new Headers(i.headers);
-				e > 0 && t.set("X-Retry-Count", String(e));
-				let l;
-				try {
-					l = await o(i.url.toString(), {
-						method: i.method,
-						headers: t,
-						body: JSON.stringify(i.body, (e, t) => typeof t == "bigint" ? t.toString() : t),
-						signal: i.signal
-					});
-				} catch (t) {
-					if (t?.name === "AbortError" || t?.code === "ABORT_ERR" || !a.includes(i.method)) throw t;
-					if (i.retryEnabled && e < n) {
-						let t = r(e);
-						e++, await s(t, i.signal);
-						continue;
-					}
-					throw t;
-				}
-				if (c(i.method, l.status, e, i.retryEnabled)) {
-					let t = l.headers?.get("Retry-After") ?? null, n = t === null ? r(e) : Math.max(0, parseInt(t, 10) || 0) * 1e3;
-					await l.text(), e++, await s(n, i.signal);
-					continue;
-				}
-				return await i.processResponse(l);
-			}
-		})();
-		return this.shouldThrowOnError || (l = l.catch((e) => {
-			let t = "", n = "", r = "", i = e?.cause;
-			if (i) {
-				let n = i?.message ?? "", r = i?.code ?? "";
-				t = `${e?.name ?? "FetchError"}: ${e?.message}`, t += `\n\nCaused by: ${i?.name ?? "Error"}: ${n}`, r && (t += ` (${r})`), i?.stack && (t += `\n${i.stack}`);
-			} else t = e?.stack ?? "";
-			let a = this.url.toString().length;
-			return e?.name === "AbortError" || e?.code === "ABORT_ERR" ? (r = "", n = "Request was aborted (timeout or manual cancellation)", a > this.urlLengthLimit && (n += `. Note: Your request URL is ${a} characters, which may exceed server limits. If selecting many fields, consider using views. If filtering with large arrays (e.g., .in('id', [many IDs])), consider using an RPC function to pass values server-side.`)) : (i?.name === "HeadersOverflowError" || i?.code === "UND_ERR_HEADERS_OVERFLOW") && (r = "", n = "HTTP headers exceeded server limits (typically 16KB)", a > this.urlLengthLimit && (n += `. Your request URL is ${a} characters. If selecting many fields, consider using views. If filtering with large arrays (e.g., .in('id', [200+ IDs])), consider using an RPC function instead.`)), {
-				success: !1,
-				error: {
-					message: `${e?.name ?? "FetchError"}: ${e?.message}`,
-					details: t,
-					hint: n,
-					code: r
-				},
-				data: null,
-				count: null,
-				status: 0,
-				statusText: ""
-			};
-		})), l.then(e, t);
-	}
-	async processResponse(e) {
-		var t = this;
-		let n = null, r = null, i = null, a = e.status, s = e.statusText;
-		if (e.ok) {
-			if (t.method !== "HEAD") {
-				let n = await e.text();
-				n === "" || (r = t.headers.get("Accept") === "text/csv" || t.headers.get("Accept") && t.headers.get("Accept")?.includes("application/vnd.pgrst.plan+text") ? n : JSON.parse(n));
-			}
-			let o = t.headers.get("Prefer")?.match(/count=(exact|planned|estimated)/), c = e.headers.get("content-range")?.split("/");
-			o && c && c.length > 1 && (i = parseInt(c[1])), t.isMaybeSingle && Array.isArray(r) && (r.length > 1 ? (n = {
-				code: "PGRST116",
-				details: `Results contain ${r.length} rows, application/vnd.pgrst.object+json requires 1 row`,
-				hint: null,
-				message: "JSON object requested, multiple (or no) rows returned"
-			}, r = null, i = null, a = 406, s = "Not Acceptable") : r = r.length === 1 ? r[0] : null);
-		} else {
-			let i = await e.text();
-			try {
-				n = JSON.parse(i), Array.isArray(n) && e.status === 404 && (r = [], n = null, a = 200, s = "OK");
-			} catch {
-				e.status === 404 && i === "" ? (a = 204, s = "No Content") : n = { message: i };
-			}
-			if (n && t.shouldThrowOnError) throw new o(n);
-		}
-		return {
-			success: n === null,
-			error: n,
-			data: r,
-			count: i,
-			status: a,
-			statusText: s
-		};
-	}
-	returns() {
-		/* istanbul ignore next */
-		return this;
-	}
-	overrideTypes() {
-		return this;
-	}
-}, u = class extends l {
-	select(e) {
-		let t = !1, n = (e ?? "*").split("").map((e) => /\s/.test(e) && !t ? "" : (e === "\"" && (t = !t), e)).join("");
-		return this.url.searchParams.set("select", n), this.headers.append("Prefer", "return=representation"), this;
-	}
-	order(e, { ascending: t = !0, nullsFirst: n, foreignTable: r, referencedTable: i = r } = {}) {
-		let a = i ? `${i}.order` : "order", o = this.url.searchParams.get(a);
-		return this.url.searchParams.set(a, `${o ? `${o},` : ""}${e}.${t ? "asc" : "desc"}${n === void 0 ? "" : n ? ".nullsfirst" : ".nullslast"}`), this;
-	}
-	limit(e, { foreignTable: t, referencedTable: n = t } = {}) {
-		let r = n === void 0 ? "limit" : `${n}.limit`;
-		return this.url.searchParams.set(r, `${e}`), this;
-	}
-	range(e, t, { foreignTable: n, referencedTable: r = n } = {}) {
-		let i = r === void 0 ? "offset" : `${r}.offset`, a = r === void 0 ? "limit" : `${r}.limit`;
-		return this.url.searchParams.set(i, `${e}`), this.url.searchParams.set(a, `${t - e + 1}`), this;
-	}
-	abortSignal(e) {
-		return this.signal = e, this;
-	}
-	single() {
-		return this.headers.set("Accept", "application/vnd.pgrst.object+json"), this;
-	}
-	maybeSingle() {
-		return this.isMaybeSingle = !0, this;
-	}
-	csv() {
-		return this.headers.set("Accept", "text/csv"), this;
-	}
-	geojson() {
-		return this.headers.set("Accept", "application/geo+json"), this;
-	}
-	explain({ analyze: e = !1, verbose: t = !1, settings: n = !1, buffers: r = !1, wal: i = !1, format: a = "text" } = {}) {
-		let o = [
-			e ? "analyze" : null,
-			t ? "verbose" : null,
-			n ? "settings" : null,
-			r ? "buffers" : null,
-			i ? "wal" : null
-		].filter(Boolean).join("|"), s = this.headers.get("Accept") ?? "application/json";
-		return this.headers.set("Accept", `application/vnd.pgrst.plan+${a}; for="${s}"; options=${o};`), this;
-	}
-	rollback() {
-		return this.headers.append("Prefer", "tx=rollback"), this;
-	}
-	returns() {
-		return this;
-	}
-	maxAffected(e) {
-		return this.headers.append("Prefer", "handling=strict"), this.headers.append("Prefer", `max-affected=${e}`), this;
-	}
-}, d = /* @__PURE__ */ RegExp("[,()]"), f = class extends u {
-	eq(e, t) {
-		return this.url.searchParams.append(e, `eq.${t}`), this;
-	}
-	neq(e, t) {
-		return this.url.searchParams.append(e, `neq.${t}`), this;
-	}
-	gt(e, t) {
-		return this.url.searchParams.append(e, `gt.${t}`), this;
-	}
-	gte(e, t) {
-		return this.url.searchParams.append(e, `gte.${t}`), this;
-	}
-	lt(e, t) {
-		return this.url.searchParams.append(e, `lt.${t}`), this;
-	}
-	lte(e, t) {
-		return this.url.searchParams.append(e, `lte.${t}`), this;
-	}
-	like(e, t) {
-		return this.url.searchParams.append(e, `like.${t}`), this;
-	}
-	likeAllOf(e, t) {
-		return this.url.searchParams.append(e, `like(all).{${t.join(",")}}`), this;
-	}
-	likeAnyOf(e, t) {
-		return this.url.searchParams.append(e, `like(any).{${t.join(",")}}`), this;
-	}
-	ilike(e, t) {
-		return this.url.searchParams.append(e, `ilike.${t}`), this;
-	}
-	ilikeAllOf(e, t) {
-		return this.url.searchParams.append(e, `ilike(all).{${t.join(",")}}`), this;
-	}
-	ilikeAnyOf(e, t) {
-		return this.url.searchParams.append(e, `ilike(any).{${t.join(",")}}`), this;
-	}
-	regexMatch(e, t) {
-		return this.url.searchParams.append(e, `match.${t}`), this;
-	}
-	regexIMatch(e, t) {
-		return this.url.searchParams.append(e, `imatch.${t}`), this;
-	}
-	is(e, t) {
-		return this.url.searchParams.append(e, `is.${t}`), this;
-	}
-	isDistinct(e, t) {
-		return this.url.searchParams.append(e, `isdistinct.${t}`), this;
-	}
-	in(e, t) {
-		let n = Array.from(new Set(t)).map((e) => typeof e == "string" && d.test(e) ? `"${e}"` : `${e}`).join(",");
-		return this.url.searchParams.append(e, `in.(${n})`), this;
-	}
-	notIn(e, t) {
-		let n = Array.from(new Set(t)).map((e) => typeof e == "string" && d.test(e) ? `"${e}"` : `${e}`).join(",");
-		return this.url.searchParams.append(e, `not.in.(${n})`), this;
-	}
-	contains(e, t) {
-		return typeof t == "string" ? this.url.searchParams.append(e, `cs.${t}`) : Array.isArray(t) ? this.url.searchParams.append(e, `cs.{${t.join(",")}}`) : this.url.searchParams.append(e, `cs.${JSON.stringify(t)}`), this;
-	}
-	containedBy(e, t) {
-		return typeof t == "string" ? this.url.searchParams.append(e, `cd.${t}`) : Array.isArray(t) ? this.url.searchParams.append(e, `cd.{${t.join(",")}}`) : this.url.searchParams.append(e, `cd.${JSON.stringify(t)}`), this;
-	}
-	rangeGt(e, t) {
-		return this.url.searchParams.append(e, `sr.${t}`), this;
-	}
-	rangeGte(e, t) {
-		return this.url.searchParams.append(e, `nxl.${t}`), this;
-	}
-	rangeLt(e, t) {
-		return this.url.searchParams.append(e, `sl.${t}`), this;
-	}
-	rangeLte(e, t) {
-		return this.url.searchParams.append(e, `nxr.${t}`), this;
-	}
-	rangeAdjacent(e, t) {
-		return this.url.searchParams.append(e, `adj.${t}`), this;
-	}
-	overlaps(e, t) {
-		return typeof t == "string" ? this.url.searchParams.append(e, `ov.${t}`) : this.url.searchParams.append(e, `ov.{${t.join(",")}}`), this;
-	}
-	textSearch(e, t, { config: n, type: r } = {}) {
-		let i = "";
-		r === "plain" ? i = "pl" : r === "phrase" ? i = "ph" : r === "websearch" && (i = "w");
-		let a = n === void 0 ? "" : `(${n})`;
-		return this.url.searchParams.append(e, `${i}fts${a}.${t}`), this;
-	}
-	match(e) {
-		return Object.entries(e).filter(([e, t]) => t !== void 0).forEach(([e, t]) => {
-			this.url.searchParams.append(e, `eq.${t}`);
-		}), this;
-	}
-	not(e, t, n) {
-		return this.url.searchParams.append(e, `not.${t}.${n}`), this;
-	}
-	or(e, { foreignTable: t, referencedTable: n = t } = {}) {
-		let r = n ? `${n}.or` : "or";
-		return this.url.searchParams.append(r, `(${e})`), this;
-	}
-	filter(e, t, n) {
-		return this.url.searchParams.append(e, `${t}.${n}`), this;
-	}
-}, p = class extends Error {
+import { PostgrestError as n } from "@supabase/supabase-js";
+import * as r from "@supabase/postgrest-js";
+import "@supabase/storage-js";
+//#region lib/errors.ts
+var i = class extends Error {
 	constructor(e, t = {}) {
 		super(e, t), this.name = this.constructor.name, Error.captureStackTrace(this, this.constructor);
 	}
-}, m = class extends p {
+}, a = class extends i {
 	fileId;
 	bucket;
 	path;
 	constructor(e, { fileId: t, bucket: n, path: r } = {}) {
 		super(e), this.fileId = t, this.bucket = n, this.path = r;
 	}
-}, h = class extends p {
+}, o = class extends i {
 	expression;
 	format;
 	constructor(e, { expression: t, format: n, ...r } = {}) {
 		super(e, r), this.expression = t, this.format = n;
 	}
-}, g = class extends p {
+}, s = class extends i {
 	schema;
 	relation;
 	id;
 	constructor(e, { schema: t, relation: n, id: r } = {}) {
 		super(e), this.schema = t, this.relation = n, this.id = r;
 	}
-}, _ = t.object({
+}, c = t.object({
 	code: t.string(),
 	details: t.string().nullable(),
 	hint: t.string().nullable(),
 	name: t.string().optional(),
 	message: t.string().optional()
 });
-function v(e) {
-	return e instanceof o || _.safeParse(e).success;
+function l(e) {
+	return e instanceof n || c.safeParse(e).success;
 }
 //#endregion
 //#region lib/utils.ts
-function y(e, t = "/") {
+function u(e, t = "/") {
 	let n = e.lastIndexOf(t);
 	return n === -1 ? ["", e] : [e.substring(0, n), e.substring(n + 1)];
 }
-function b(e) {
+function d(e) {
 	return Array.isArray(e) ? e : [e];
 }
-function x(e, t) {
+function f(e, t) {
 	return e.reduce((e, n) => {
 		let r = t(n);
 		return (e[r] ??= []).push(n), e;
 	}, {});
 }
-function S(e, t) {
+function p(e, t) {
 	let n = e.findIndex(t);
 	return n !== -1 && e.splice(n, 1), e;
 }
-function C(e) {
+function m(e) {
 	return Object.entries(e);
 }
 //#endregion
 //#region lib/data-service.ts
-var w = class {
+var h = class {
 	database;
 	schema;
 	relation;
@@ -371,7 +70,7 @@ var w = class {
 		this.database = e, this.schema = t, this.relation = n;
 	}
 	recordNotFoundError(e) {
-		return new g(`Record with id ${e} not found in ${this.schema}.${this.relation}`, {
+		return new s(`Record with id ${e} not found in ${this.schema}.${this.relation}`, {
 			schema: this.schema,
 			relation: this.relation,
 			id: e
@@ -419,7 +118,7 @@ var w = class {
 	}
 	async upsert(e, { onConflict: t, ...n } = {}) {
 		let { data: r } = await this.query.upsert(e, {
-			onConflict: t === void 0 ? void 0 : b(t).join(","),
+			onConflict: t === void 0 ? void 0 : d(t).join(","),
 			...n
 		}).select().single().throwOnError();
 		return r;
@@ -428,7 +127,7 @@ var w = class {
 		let { data: n } = await this.query.update(t).eq("id", e).select().single().throwOnError();
 		return n;
 	}
-}, T = class extends w {
+}, g = class extends h {
 	constructor({ database: e, schema: t, table: n }) {
 		super({
 			database: e,
@@ -436,7 +135,7 @@ var w = class {
 			relation: n
 		});
 	}
-}, E = class extends w {
+}, _ = class extends h {
 	constructor({ database: e, schema: t, view: n }) {
 		super({
 			database: e,
@@ -445,13 +144,13 @@ var w = class {
 		});
 	}
 };
-function D(t) {
+function v(t) {
 	if (t.error) throw t.error;
 	return e(t.count !== null, "Response does not contain a count. Make sure to set the `count` option in the request."), t;
 }
 //#endregion
 //#region lib/postgrest/filter.ts
-var O = [
+var y = [
 	"eq",
 	"neq",
 	"gt",
@@ -477,44 +176,41 @@ var O = [
 	"nxr",
 	"nxl",
 	"adj"
-], k = ["and", "or"], A = ",", j = "~", M = (e) => (n = {}) => {
+], b = ["and", "or"], x = (e) => (n = {}) => {
 	let r = (e) => n[e] ?? e, i = Object.keys(e.shape);
-	return t.string().transform((e, t) => {
+	return t.string().transform((e, n) => {
 		try {
-			return R(e, i, r);
-		} catch (n) {
-			return t.addIssue({
+			return T(e, i, r);
+		} catch (r) {
+			return n.addIssue({
 				code: "custom",
 				input: e,
-				message: n instanceof Error ? n.message : void 0,
-				params: n instanceof h ? {
-					expression: n.expression,
-					format: n.format
+				message: r instanceof Error ? r.message : void 0,
+				params: r instanceof o ? {
+					expression: r.expression,
+					format: r.format
 				} : void 0
-			}), [];
+			}), t.NEVER;
 		}
 	});
 };
-function N(e) {
+function S(e) {
 	return e.startsWith("not.") ? e.slice(4) : `not.${e}`;
 }
-function P(e) {
+function C(e) {
 	return {
 		...e,
-		op: N(e.op)
+		op: S(e.op)
 	};
 }
-function F(e, t = (e) => e) {
+function w(e, t = (e) => e) {
 	if (e.type === "logical") {
-		let n = e.args.map((e) => F(e, t));
+		let n = e.args.map((e) => w(e, t));
 		return `${e.op}(${n})`;
 	}
 	return `${t(e.key)}.${e.op}.${e.value}`;
 }
-function I(e, t = (e) => e, n = "~") {
-	return e.map((e) => F(e, t)).join(n);
-}
-function L(t, n = [], r = (e) => e) {
+function T(t, n = [], r = (e) => e) {
 	function i(e) {
 		let t = [], n = 0, r = "", i = !1;
 		for (let a of e) a === "\"" ? (i = !i, r += a) : a === "(" && !i ? (n++, r += a) : a === ")" && !i ? (n--, r += a) : a === "," && n === 0 && !i ? (t.push(r.trim()), r = "") : r += a;
@@ -524,47 +220,44 @@ function L(t, n = [], r = (e) => e) {
 		if (t.startsWith("and(")) return {
 			type: "logical",
 			op: "and",
-			args: i(t.slice(4, -1)).map((e) => L(e, n, r))
+			args: i(t.slice(4, -1)).map((e) => T(e, n, r))
 		};
 		if (t.startsWith("or(")) return {
 			type: "logical",
 			op: "or",
-			args: i(t.slice(3, -1)).map((e) => L(e, n, r))
+			args: i(t.slice(3, -1)).map((e) => T(e, n, r))
 		};
 		if (t.startsWith("not.and(")) return {
 			type: "logical",
 			op: "not.and",
-			args: i(t.slice(8, -1)).map((e) => L(e, n, r))
+			args: i(t.slice(8, -1)).map((e) => T(e, n, r))
 		};
 		if (t.startsWith("not.or(")) return {
 			type: "logical",
 			op: "not.or",
-			args: i(t.slice(7, -1)).map((e) => L(e, n, r))
+			args: i(t.slice(7, -1)).map((e) => T(e, n, r))
 		};
 	}
-	let a = `^(${n.length === 0 ? "[a-zA-Z_][a-zA-Z0-9_]*" : n.join("|")})\\.((?:not\\.)?(?:${O.join("|")}))\\.(.+)$`, o = new RegExp(a).exec(t);
-	if (!o) throw new h(`Invalid filter expression '${t}'`, {
+	let a = `^(${n.length === 0 ? "[a-zA-Z_][a-zA-Z0-9_]*" : n.join("|")})\\.((?:not\\.)?(?:${y.join("|")}))\\.(.+)$`, s = new RegExp(a).exec(t);
+	if (!s) throw new o(`Invalid filter expression '${t}'`, {
 		expression: t,
 		format: {
 			syntax: "key.(not.)op.value",
 			keys: n.length === 0 ? "*" : n,
-			operators: O
+			operators: y
 		}
 	});
-	let [, s, c, l] = o;
+	let [, c, l, u] = s;
 	return {
 		type: "condition",
-		key: r(s),
-		op: c,
-		value: e.defined(l)
+		key: r(c),
+		op: l,
+		value: e.defined(u)
 	};
 }
-function R(e, t = [], n = (e) => e, r = "~") {
-	return e.length === 0 ? [] : e.split(r).map((e) => L(e, t, n));
-}
 //#endregion
 //#region lib/postgrest/pagination-builder.ts
-var z = class t extends B {
+var E = class t extends D {
 	pagination;
 	constructor(e, t) {
 		super(e), this.pagination = t;
@@ -593,16 +286,16 @@ var z = class t extends B {
 			return t;
 		});
 	}
-}, B = class t extends f {
+}, D = class t extends r.PostgrestFilterBuilder {
 	constructor(e) {
 		super(e);
 	}
 	select(e = "*") {
-		return new t(super.select(b(e).join(",")));
+		return new t(super.select(d(e).join(",")));
 	}
 	where(e) {
 		if (e.type === "logical") {
-			let t = e.args.map((e) => F(e)).join(",");
+			let t = e.args.map((e) => w(e)).join(",");
 			return this.url.searchParams.append(e.op, `(${t})`), this;
 		}
 		return this.filter(e.key, e.op, e.value);
@@ -610,75 +303,75 @@ var z = class t extends B {
 	paginate(t, n) {
 		e(t >= 0, "Page index must be ≥ 0"), e(n >= 0, "Page limit must be ≥ 0");
 		let r = t * n, i = r + n - 1;
-		return new z(this.range(r, i), {
+		return new E(this.range(r, i), {
 			page: t,
 			limit: n
 		});
 	}
-}, V = class {
+}, O = class {
 	builder;
 	constructor(e) {
 		this.builder = e;
 	}
 	select(e = "*", t) {
-		return new B(this.builder.select(b(e).join(","), t));
+		return new D(this.builder.select(d(e).join(","), t));
 	}
 	count(e = "exact") {
-		return new B(this.select("*", {
+		return new D(this.select("*", {
 			count: e,
 			head: !0
 		}));
 	}
 	insert(e, t) {
-		return new B(this.builder.insert(e, t));
+		return new D(this.builder.insert(e, t));
 	}
 	upsert(e, { onConflict: t, ...n } = {}) {
-		return new B(this.builder.upsert(e, {
-			onConflict: b(t).join(","),
+		return new D(this.builder.upsert(e, {
+			onConflict: d(t).join(","),
 			...n
 		}));
 	}
 	update(e, t) {
-		return new B(this.builder.update(e, t));
+		return new D(this.builder.update(e, t));
 	}
 	delete() {
-		return new B(this.builder.delete());
+		return new D(this.builder.delete());
 	}
-}, H = class {
+}, k = class {
 	client;
 	constructor(e) {
 		this.client = e;
 	}
 	from(e) {
-		return new V(this.client.from(e));
+		return new O(this.client.from(e));
 	}
 	rpc(e, t, n) {
-		return new B(this.client.rpc(e, t, n));
+		return new D(this.client.rpc(e, t, n));
 	}
-}, U = class {
+}, A = class {
 	supabase;
 	constructor({ supabase: e }) {
 		this.supabase = e;
 	}
 	schema(e) {
-		return new H(this.supabase.schema(e));
+		return new k(this.supabase.schema(e));
 	}
 	relation(e, t) {
-		return new w({
+		return new h({
 			database: this,
 			schema: e,
 			relation: t
 		});
 	}
 	table(e, t) {
-		return new T({
+		return new g({
 			database: this,
 			schema: e,
 			table: t
 		});
 	}
 	view(e, t) {
-		return new E({
+		return new _({
 			database: this,
 			schema: e,
 			view: t
@@ -687,15 +380,15 @@ var z = class t extends B {
 };
 //#endregion
 //#region lib/storage.ts
-function W(e) {
+function j(e) {
 	return e.bucket !== void 0 && e.path !== void 0;
 }
-function G(e) {
+function M(e) {
 	return e.fileId !== void 0 && e.bucket !== void 0;
 }
 //#endregion
 //#region lib/storage-service.ts
-var K = class {
+var N = class {
 	client;
 	database;
 	constructor({ client: e, database: t }) {
@@ -715,8 +408,8 @@ var K = class {
 		return n;
 	}
 	async getFileStorageLocation(t) {
-		if (G(t)) return t;
-		if (W(t)) {
+		if (M(t)) return t;
+		if (j(t)) {
 			let { id: e } = await this.getFileObject(t);
 			return {
 				fileId: e,
@@ -724,7 +417,7 @@ var K = class {
 			};
 		}
 		let { fileId: n } = t, r = await this.files.get(n, ["bucket_id", "path_tokens"]);
-		if (r === void 0) throw new m(`File with ID ${n} not found`, { fileId: n });
+		if (r === void 0) throw new a(`File with ID ${n} not found`, { fileId: n });
 		return {
 			fileId: n,
 			bucket: e.notNull(r.bucket_id, "bucket_id must not be null"),
@@ -755,7 +448,7 @@ var K = class {
 	async assertExistsFile(e) {
 		let { bucket: t, path: n } = await this.getFileStorageLocation(e), { data: r, error: i } = await this.client.from(t).exists(n);
 		if (i) throw i;
-		if (!r) throw new m(`File not found in bucket '${t}' at path '${n}'`, {
+		if (!r) throw new a(`File not found in bucket '${t}' at path '${n}'`, {
 			bucket: t,
 			path: n
 		});
@@ -772,7 +465,7 @@ var K = class {
 	async downloadFile(e) {
 		let { fileId: t, bucket: n, path: r, properties: i } = await this.getFileInfo(e), { data: a, error: o } = await this.client.from(n).download(r);
 		if (o) throw o;
-		let [, s] = y(r);
+		let [, s] = u(r);
 		return {
 			fileId: t,
 			bucket: n,
@@ -784,7 +477,7 @@ var K = class {
 		let n = t.filter((e) => "fileId" in e).map((e) => e.fileId), r = (await this.files.query.select(["bucket_id", "path_tokens"]).containedBy("id", n).throwOnError()).data.map(({ bucket_id: t, path_tokens: n }) => ({
 			bucket: e.notNull(t, "bucket_id must not be null"),
 			path: e.notNull(n, "path_tokens must not be null").join("/")
-		})), i = C(x(t.filter((e) => W(e)).concat(r), (e) => e.bucket)).map(([e, t]) => ({
+		})), i = m(f(t.filter((e) => j(e)).concat(r), (e) => e.bucket)).map(([e, t]) => ({
 			bucket: e,
 			paths: t.map((e) => e.path)
 		}));
@@ -799,4 +492,4 @@ var K = class {
 	}
 };
 //#endregion
-export { w as DataService, U as DatabaseService, m as FileNotFoundError, M as Filter, j as FilterChainSeparator, O as FilterOp, k as LogicalOp, A as LogicalOpSeparator, h as ParseError, H as PostgrestClient, _ as PostgrestErrorInterface, B as PostgrestFilterBuilder, z as PostgrestPaginationBuilder, V as PostgrestQueryBuilder, g as RecordNotFoundError, K as StorageService, T as TableDataService, p as TracedError, E as ViewDataService, D as assertCounted, b as coerceArray, I as encodeFilter, F as encodeFilterNode, C as entries, x as groupBy, v as isDatabaseApiError, P as negateFilterNode, N as negateOp, L as parseFilterExpression, R as parseFilterExpressionChain, S as removeElement, y as splitPath };
+export { h as DataService, A as DatabaseService, a as FileNotFoundError, x as FilterNode, y as FilterOp, b as LogicalOp, o as ParseError, k as PostgrestClient, c as PostgrestErrorInterface, D as PostgrestFilterBuilder, E as PostgrestPaginationBuilder, O as PostgrestQueryBuilder, s as RecordNotFoundError, N as StorageService, g as TableDataService, i as TracedError, _ as ViewDataService, v as assertCounted, d as coerceArray, w as encodeFilterNode, m as entries, f as groupBy, l as isDatabaseApiError, C as negateFilterNode, S as negateOp, T as parseFilterExpression, p as removeElement, u as splitPath };

package/dist/postgrest/filter.d.ts

@@ -18,23 +18,6 @@ export type FilterOp = `${'' | 'not.'}${typeof FilterOp[number]}`;
  */
 export declare const LogicalOp: readonly ["and", "or"];
 export type LogicalOp = `${'' | 'not.'}${typeof LogicalOp[number]}`;
-/**
- * The separator used to split multiple filter expressions in a logical operator (e.g. `and`, `or`).
- */
-export declare const LogicalOpSeparator = ",";
-/**
- * The operator for chaining multiple filters.
- * This is a short notation for cascading filters with and().
- *
- * ***NOTE:*** PostgREST uses `&` to separate filters, but we use `~` as `&` is reserved for top-level query parameters.
- *
- * @example
- *  // The following filter expressions are equivalent:
- * 'name.cs.John~age.gt.30~createdAt.gte.2023-01-01'
- * 'and(name.cs.John,and(age.gt.30,createdAt.gte.2023-01-01))'.
- * @see https://docs.postgrest.org/en/stable/api.html#horizontal-filtering
- */
-export declare const FilterChainSeparator = "~";
 /**
  * A single filter condition in an abstract syntax tree (AST) of filter nodes.
  * @param K The type of keys in the filter expression.
@@ -80,7 +63,7 @@ export type FilterKey<Item extends object> = KeyOfString<Item>;
  * An array of filter AST nodes, representing a chain of filter expressions joined by a logical `and`.
  * It can be decoded from a string containing one or more filter expressions, chained with the {@link FilterChainSeparator chain separator `~`} .
  */
-export declare const Filter: <Item extends ZodObject>(item: Item) => <DecodeKey extends string = string>(mapping?: Partial<Record<FilterKey<z.infer<Item>>, DecodeKey>>) => z.ZodPipe<z.ZodString, z.ZodTransform<Filter<DecodeKey>, string>>;
+export declare const FilterNode: <Item extends ZodObject>(item: Item) => <DecodeKey extends string = string>(mapping?: Partial<Record<FilterKey<z.infer<Item>>, DecodeKey>>) => z.ZodPipe<z.ZodString, z.ZodTransform<FilterNode<DecodeKey>, string>>;
 export type Filter<K extends string = string> = FilterNode<K>[];
 /**
  * Negates a filter or logical operator.
@@ -111,18 +94,6 @@ export declare function negateFilterNode<K extends string = string, F extends Fi
  * @see https://docs.postgrest.org/en/stable/api.html#horizontal-filtering
  */
 export declare function encodeFilterNode<K extends string = string>(node: FilterNode<K>, transformKey?: (key: K) => string): string;
-/**
- * Encodes a filter (an array of filter AST nodes) into a filter string
- * containing one or more filter expressions separated by a filter separator.
- *
- * @template InputKey - The type of keys in the filter AST nodes.
- * @template OutputKey - The type of keys in the filter string.
- * @param filter The filter to encode.
- * @param transformKey An optional function to transform keys from InputKey to OutputKey.
- * @param separator The separator used to join multiple filter expressions. Default is the {@link FilterChainSeparator chain separator `~`} .
- * @returns The encoded filter string.
- */
-export declare function encodeFilter<K extends string = string>(filter: Filter<K>, transformKey?: (key: K) => string, separator?: string): string;
 /**
  * Parses a filter expression into a filter AST node.
  * The expression must follow the dot notation of [PostgREST](https://docs.postgrest.org/en/v13/references/api/tables_views.html#horizontal-filtering).
@@ -138,20 +109,4 @@ export declare function encodeFilter<K extends string = string>(filter: Filter<K
  * @throws ParseError if any expression in the filter string can not be parsed, e.g. has invalid syntax, unsupported operators or unsupported keys.
  */
 export declare function parseFilterExpression<InputKey extends string = string, OutputKey extends string = InputKey>(expression: string, inputKeys?: InputKey[], transformKey?: (key: InputKey) => OutputKey): FilterNode<OutputKey>;
-/**
- * Parses a chain of filter expressions into a filter (an array of filter AST nodes).
- * Filter expressions are chained together using a filter separator.
- * Each expression in the chain must follow the dot notation of [PostgREST](https://docs.postgrest.org/en/v13/references/api/tables_views.html#horizontal-filtering).
- *
- * @template InputKey - The type of keys in the filter expressions.
- * @template OutputKey - The type of keys in the filter AST nodes.
- * @param expressions The filter string containing one or more filter expressions, chained together by the {@link separator}.
- * @param inputKeys The list of valid keys in the filter expressions.
- * This is used to validate the keys in the expressions. If not provided, any key is valid.
- * @param transformKey An optional function to transform keys from InputKey to OutputKey.
- * @param separator - The separator used to split multiple filter expressions. Default is the {@link FilterChainSeparator chain separator `~`} .
- * @returns An array of filter AST nodes parsed from the filter string. An empty string will resolve to an empty array.
- * @throws ParseError if any expression in the filter string can not be parsed, e.g. has invalid syntax, unsupported operators or unsupported keys.
- */
-export declare function parseFilterExpressionChain<InputKey extends string = string, OutputKey extends string = InputKey>(expressions: string, inputKeys?: InputKey[], transformKey?: (key: InputKey) => OutputKey, separator?: string): FilterNode<OutputKey>[];
 //# sourceMappingURL=filter.d.ts.map

package/dist/postgrest/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../lib/postgrest/filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,CAAC,MAAM,KAAK,CAAC;AAKpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,QAAQ,oMAAqM,CAAC;AAC3N,MAAM,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;AAElE;;;;GAIG;AACH,eAAO,MAAM,SAAS,wBAAyB,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,MAAM,CAAC;AAExC;;;;GAIG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,QAAQ,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACxC,GAAG,EAAE,CAAC,CAAC;CACV;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACxD,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,SAAS,CAAC;IAEd,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAElG;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;AAG/D;;;GAGG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,SAAS,SAAS,EAAE,MAAM,IAAI,MAAM,SAAS,SAAS,MAAM,GAAG,MAAM,EAC5F,UAAS,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAM,KACnE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAwBlE,CAAC;AACF,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;AAGhE;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,EAAE,SAAS,QAAQ,GAAG,SAAS,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAK/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EACtD,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EACnB,YAAY,GAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAmB,GAC9C,MAAM,CAQR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAClD,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EACjB,YAAY,GAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAmB,EAC7C,SAAS,SAAuB,GACjC,MAAM,CAER;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,SAAS,MAAM,GAAG,QAAQ,EACvG,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,QAAQ,EAAO,EAC1B,YAAY,GAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,SAA8C,GAChF,UAAU,CAAC,SAAS,CAAC,CAoFvB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,SAAS,MAAM,GAAG,QAAQ,EAC5G,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,QAAQ,EAAO,EAC1B,YAAY,GAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,SAA8C,EAC/E,SAAS,SAAuB,GACjC,UAAU,CAAC,SAAS,CAAC,EAAE,CAOzB"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../lib/postgrest/filter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "private": false,
   "displayName": "Supabase-Core",
   "description": "Lightweight services for supabase to make it easier to work with databases, tables and storage buckets",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "type": "module",
   "repository": {
     "type": "git",