@aiao/rxdb-adapter-supabase 0.0.20 → 0.0.22

package/dist/index.js

@@ -19,18 +19,47 @@ var p = class extends Error {
 	constructor(e) {
 		super(e, "DATA_ERROR"), this.name = "SupabaseDataError";
 	}
-}, _ = {
+}, _ = "rxdb", v = "public", y = (e) => e && (e === _ ? v : e);
+//#endregion
+//#region src/entity_scope.ts
+function b(e) {
+	let t = /* @__PURE__ */ new Map();
+	for (let n of e.config.entities) {
+		let e = o(n), r = e.namespace || "public", i = {
+			namespace: r,
+			entity: e.name,
+			schema: y(r) ?? "public",
+			tableName: e.tableName
+		};
+		t.set(`${i.namespace}:${i.entity}`, i);
+	}
+	return [...t.values()];
+}
+function x(e, t) {
+	let n = b(e), r = t.indexOf(":"), i = r > 0 ? n.filter((e) => e.namespace === t.slice(0, r) && e.entity === t.slice(r + 1)) : n.filter((e) => e.entity === t);
+	if (i.length === 1) return i[0];
+	throw i.length > 1 ? new m(`Entity "${t}" is configured in multiple namespaces`) : new m(`Entity "${t}" is not configured`);
+}
+function S(e, t, n) {
+	let r = t || "public";
+	return b(e).some((e) => e.namespace === r && e.entity === n);
+}
+//#endregion
+//#region src/handle_supabase_change.ts
+var C = {
 	INSERT: e,
 	UPDATE: n,
 	DELETE: t
 };
-function v(e, t) {
+function w(e, t) {
 	if (t.table !== "rxdb_change" || t.eventType !== "INSERT") return;
 	let n = t.new;
 	if (!n) return;
-	let { namespace: r, entity: i, entityId: a, type: o, branchId: s, patch: c, clientId: l } = n, u = e.rxdb.context.clientId;
+	let { namespace: r, entity: i, entityId: a, type: o, branchId: s, patch: c, clientId: l } = n;
+	if (!i || !S(e.rxdb, r, i)) return;
+	let u = e.rxdb.context.clientId;
 	if (l && u && l === u || !a || !o) return;
-	let d = o, f = _[d];
+	let d = o, f = C[d];
 	if (!f) return;
 	let p = {
 		id: a,
@@ -48,7 +77,7 @@ function v(e, t) {
 }
 //#endregion
 //#region src/rule_group_builder.ts
-var y = {
+var T = {
 	"=": "eq",
 	"!=": "neq",
 	"<": "lt",
@@ -61,37 +90,41 @@ var y = {
 	startsWith: "ilike",
 	endsWith: "ilike"
 };
-function b(e) {
-	return e instanceof Date ? e.toISOString() : Array.isArray(e) ? e.map(b) : e;
+function E(e) {
+	return e instanceof Date ? e.toISOString() : Array.isArray(e) ? e.map(E) : e;
 }
-function x(e, t) {
-	let n = b(e);
+function D(e) {
+	let t = String(e);
+	return /[,()"\\]/.test(t) ? `"${t.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"` : t;
+}
+function O(e, t) {
+	let n = E(e);
 	if (!Array.isArray(n) || n.length !== 2) throw Error(`${t} operator requires a two-item array`);
 	return [n[0], n[1]];
 }
-function S(e, t, n) {
+function k(e, t, n) {
 	return !t || !e.mappedEntity ? n : t.getEntityMetadata(e.mappedEntity, e.mappedNamespace ?? "") ?? n;
 }
-function C(e, t) {
-	let n = b(t);
+function A(e, t) {
+	let n = E(t);
 	switch (e) {
 		case "=":
 		case "!=":
 		case "<":
 		case "<=":
 		case ">":
-		case ">=": return `${y[e]}.${n}`;
+		case ">=": return `${T[e]}.${D(n)}`;
 		case "in":
 			if (!Array.isArray(n)) throw Error("IN operator requires array");
-			return `in.(${n.join(",")})`;
+			return `in.(${n.map(D).join(",")})`;
 		case "contains":
-		case "includes": return `ilike.*${n}*`;
-		case "startsWith": return `ilike.${n}*`;
-		case "endsWith": return `ilike.*${n}`;
+		case "includes": return `ilike.${D(`*${n}*`)}`;
+		case "startsWith": return `ilike.${D(`${n}*`)}`;
+		case "endsWith": return `ilike.${D(`*${n}`)}`;
 		default: throw Error(`Unsupported operator: ${e}`);
 	}
 }
-function w(e, t, n) {
+function j(e, t, n) {
 	let [r, ...i] = e.split(".");
 	return i.length === 0 ? {
 		field: e,
@@ -102,51 +135,52 @@ function w(e, t, n) {
 		operator: "exists",
 		where: {
 			combinator: "and",
-			rules: [w(i.join("."), t, n)]
+			rules: [j(i.join("."), t, n)]
 		}
 	};
 }
-function T(e, t, n, r) {
+function M(e, t, n, r) {
+	let i = e;
 	if (!t?.rules?.length) return e;
 	if (t.rules.length === 1) {
-		let i = t.rules[0];
-		return s(i) ? T(e, i, n, r) : E(e, i, n, r);
+		let e = t.rules[0];
+		return s(e) ? M(i, e, n, r) : N(i, e, n, r);
 	}
-	if (t.combinator === "and") return t.rules.reduce((e, t) => s(t) ? T(e, t, n, r) : E(e, t, n, r), e);
-	let i = t.rules.map((e) => {
+	if (t.combinator === "and") return t.rules.reduce((e, t) => s(t) ? M(e, t, n, r) : N(e, t, n, r), i);
+	let a = t.rules.map((e) => {
 		if (s(e)) throw Error("Nested OR conditions not supported");
 		let { field: t, operator: n, value: r } = e;
-		return `${t}.${C(n, r)}`;
+		return `${t}.${A(n, r)}`;
 	});
-	return e.or(i.join(","));
+	return i.or(a.join(","));
 }
-function E(e, t, n, r) {
+function N(e, t, n, r) {
 	let { field: i, operator: a, value: o } = t;
-	return typeof i == "string" && i.includes(".") ? E(e, w(i, a, o), n, r) : a === "exists" || a === "notExists" ? D(e, t, n, r) : k(e, i, a, o);
+	return typeof i == "string" && i.includes(".") ? N(e, j(i, a, o), n, r) : a === "exists" || a === "notExists" ? P(e, t, n, r) : I(e, i, a, o);
 }
-function D(e, t, n, r) {
+function P(e, t, n, r) {
 	let { field: i, operator: a, where: o } = t, s = String(i), c = n?.relationMap?.get(s);
 	if (!c) throw Error(`Relation '${s}' not found in '${n?.name || "unknown"}'`);
-	let l = n ? S(c, r, n) : void 0;
+	let l = n ? k(c, r, n) : void 0;
 	if (!l) throw Error(`Cannot resolve metadata for '${s}'`);
-	return o?.rules?.length ? O(a === "exists" ? e.not(s, "is", null) : e, s, o, l, r, s) : a === "exists" ? e.not(s, "is", null) : e.is(s, null);
+	return o?.rules?.length ? F(a === "exists" ? e.not(s, "is", null) : e, s, o, l, r, s) : a === "exists" ? e.not(s, "is", null) : e.is(s, null);
 }
-function O(e, t, n, r, i, a = "") {
+function F(e, t, n, r, i, a = "") {
 	if (!n?.rules?.length) return e;
 	let o = e;
 	for (let e of n.rules) {
 		if (s(e)) {
-			o = O(o, t, e, r, i, a);
+			o = F(o, t, e, r, i, a);
 			continue;
 		}
 		let { field: n, operator: c, value: l, where: u } = e;
 		if (c === "exists" || c === "notExists") {
 			let e = r?.relationMap?.get(String(n));
 			if (!e) throw Error(`Relation '${n}' not found in ${r.name}`);
-			let t = S(e, i, r), s = String(n), l = u;
+			let t = k(e, i, r), s = String(n), l = u;
 			if (l?.rules?.length) {
 				let e = a ? `${a}.${s}` : s;
-				o = O(c === "exists" ? o.not(e, "is", null) : o, s, l, t, i, e);
+				o = F(c === "exists" ? o.not(e, "is", null) : o, s, l, t, i, e);
 			} else {
 				let e = a ? `${a}.${s}` : s;
 				o = c === "exists" ? o.not(e, "is", null) : o.is(e, null);
@@ -154,14 +188,14 @@ function O(e, t, n, r, i, a = "") {
 			continue;
 		}
 		let d = a ? `${a}.${n}` : `${t}.${n}`;
-		o = k(o, d, c, l);
+		o = I(o, d, c, l);
 	}
 	return o;
 }
-function k(e, t, n, r) {
-	let i = b(r);
+function I(e, t, n, r) {
+	let i = E(r);
 	if (t.includes(".") && n === "between") {
-		let [n, i] = x(r, "between");
+		let [n, i] = O(r, "between");
 		return e.gte(t, n).lte(t, i);
 	}
 	switch (n) {
@@ -172,7 +206,7 @@ function k(e, t, n, r) {
 		case "<=": return e.lte(t, i);
 		case ">=": return e.gte(t, i);
 		case "in": return e.in(t, i);
-		case "notIn": return e.not(t, "in", `(${i.join(",")})`);
+		case "notIn": return e.not(t, "in", `(${i.map(D).join(",")})`);
 		case "contains":
 		case "includes": return e.ilike(t, `%${i}%`);
 		case "notContains": return e.not(t, "ilike", `%${i}%`);
@@ -181,12 +215,12 @@ function k(e, t, n, r) {
 		case "endsWith": return e.ilike(t, `%${i}`);
 		case "notEndsWith": return e.not(t, "ilike", `%${i}`);
 		case "between": {
-			let [n, i] = x(r, "between");
+			let [n, i] = O(r, "between");
 			return e.gte(t, n).lte(t, i);
 		}
 		case "notBetween": {
-			let [n, i] = x(r, "notBetween");
-			return e.or(`${t}.lt.${n},${t}.gt.${i}`);
+			let [n, i] = O(r, "notBetween");
+			return e.or(`${t}.lt.${D(n)},${t}.gt.${D(i)}`);
 		}
 		case "null":
 		case "isNull": return e.is(t, null);
@@ -197,7 +231,7 @@ function k(e, t, n, r) {
 }
 //#endregion
 //#region src/RxDBAdapterSupabase.utils.ts
-function A(e) {
+function L(e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e) {
 		let e = n.constructor;
@@ -205,7 +239,7 @@ function A(e) {
 	}
 	return t;
 }
-function j(e, t) {
+function R(e, t) {
 	let n = [];
 	for (let [r, i] of e) {
 		let e = o(r), a = Array.from(i);
@@ -221,7 +255,7 @@ function j(e, t) {
 	}
 	return n;
 }
-function M(e) {
+function z(e) {
 	let t = [];
 	for (let [n, r] of e) {
 		let e = o(n);
@@ -234,18 +268,15 @@ function M(e) {
 	return t;
 }
 //#endregion
-//#region src/schema.utils.ts
-var N = "rxdb", P = "public", F = (e) => e && (e === N ? P : e);
-//#endregion
 //#region src/transform.ts
-function I(e, t) {
+function B(e, t) {
 	if (e == null) return e;
 	switch (t.type) {
 		case r.date: return e instanceof Date ? e : new Date(e);
 		case r.keyValue:
 			if (typeof e == "object" && t.properties) {
 				let n = e, r = {};
-				for (let e of t.properties) n[e.name] !== void 0 && (r[e.name] = I(n[e.name], e));
+				for (let e of t.properties) n[e.name] !== void 0 && (r[e.name] = B(n[e.name], e));
 				return r;
 			}
 			return e;
@@ -256,58 +287,55 @@ function I(e, t) {
 		default: return e;
 	}
 }
-function L(e, t, n) {
+function V(e, t, n) {
 	let r = new e();
 	for (let e of Object.keys(n)) {
 		let i = t.propertyMap.get(e);
-		r[e] = i ? I(n[e], i) : n[e];
+		r[e] = i ? B(n[e], i) : n[e];
 	}
 	return r;
 }
 //#endregion
 //#region src/SupabaseRepository.ts
-var R = class extends i {
+var H = class extends i {
 	adapter;
 	metadata;
 	constructor(e, t) {
 		super(e.rxdb, t), this.adapter = e, this.metadata = o(t);
 	}
 	async find(e) {
-		let t = this.extract_relation_fields(e.where), n = "*";
-		if (t.size > 0) {
-			let e = Array.from(t);
-			n = `*, ${e.filter((t) => !e.some((e) => e !== t && e.startsWith(t + "."))).map((e) => this.build_relation_select(e)).join(", ")}`;
+		let t = e.where, n = this.extract_relation_fields(t), r = "*";
+		if (n.size > 0) {
+			let e = Array.from(n.keys());
+			r = `*, ${e.filter((t) => !e.some((e) => e !== t && e.startsWith(t + "."))).map((e) => this.build_relation_select(e, n.get(e) ?? !0)).join(", ")}`;
 		}
-		let r = () => {
-			let t = this.get_client().select(n);
-			if (t = T(t, e.where, this.metadata, this.adapter.rxdb.schemaManager), e.orderBy?.length) {
-				for (let n of e.orderBy) t = t.order(n.field, { ascending: n.sort === "asc" });
-				e.orderBy.some((e) => e.field === "id") || (t = t.order("id", { ascending: !0 }));
-			}
-			return t;
-		}, i = 1e3, a = [], o = e.offset ?? 0, s = e.limit;
+		let i = () => {
+			let n = this.get_client().select(r);
+			if (n = M(n, t, this.metadata, this.adapter.rxdb.schemaManager), e.orderBy?.length) for (let t of e.orderBy) n = n.order(t.field, { ascending: t.sort === "asc" });
+			return e.orderBy?.some((e) => e.field === "id") || (n = n.order("id", { ascending: !0 })), n;
+		}, a = 1e3, o = [], s = e.offset ?? 0, c = e.limit;
 		for (;;) {
-			let e = s === void 0 ? i : Math.min(i, s);
+			let e = c === void 0 ? a : Math.min(a, c);
 			if (e <= 0) break;
-			let { data: t, error: n } = await r().range(o, o + e - 1);
+			let { data: t, error: n } = await i().range(s, s + e - 1);
 			if (n) throw new g(`Failed to find entities: ${n.message}`);
-			let c = t ?? [];
-			if (a.push(...c), c.length < e || (o += c.length, s !== void 0 && (s -= c.length, s <= 0))) break;
+			let r = t ?? [];
+			if (o.push(...r), r.length < e || (s += r.length, c !== void 0 && (c -= r.length, c <= 0))) break;
 		}
-		return a.map((e) => L(this.EntityType, this.metadata, e));
+		return o.map((e) => V(this.EntityType, this.metadata, e));
 	}
 	async count(e) {
 		if (e.groupBy) throw Error("groupBy not supported yet");
-		let t = this.extract_relation_fields(e.where), n = "*";
-		t.size > 0 && (n = `*, ${Array.from(t).map((e) => this.build_relation_select(e)).join(", ")}`);
-		let r = this.get_client().select(n, {
+		let t = e.where, n = this.extract_relation_fields(t), r = "*";
+		n.size > 0 && (r = `*, ${Array.from(n).map(([e, t]) => this.build_relation_select(e, t)).join(", ")}`);
+		let i = this.get_client().select(r, {
 			count: "exact",
 			head: !0
 		});
-		r = T(r, e.where, this.metadata, this.adapter.rxdb.schemaManager);
-		let { count: i, error: a } = await r;
-		if (a) throw new g(`Failed to count entities: ${a.message || "unknown error"}`);
-		return i ?? 0;
+		i = M(i, t, this.metadata, this.adapter.rxdb.schemaManager);
+		let { count: a, error: o } = await i;
+		if (o) throw new g(`Failed to count entities: ${o.message || "unknown error"}`);
+		return a ?? 0;
 	}
 	async create(e) {
 		let t = { ...e }, n = this.rxdb.context.userId;
@@ -324,54 +352,61 @@ var R = class extends i {
 		return i;
 	}
 	async remove(e) {
-		let { error: t } = await this.get_client().delete().eq("id", e.id);
-		if (t) throw new g(`Failed to remove entity: ${t.message}`);
+		let { data: t, error: n } = await this.get_client().delete().eq("id", e.id).select("id").single();
+		if (n) throw new g(`Failed to remove entity: ${n.message}`);
+		if (t?.id !== e.id) throw new g("Failed to remove entity: deleted row did not match");
 		return e;
 	}
 	extract_relation_fields(e) {
-		let t = /* @__PURE__ */ new Set(), n = (e, r = "") => {
-			if (e?.rules) {
-				for (let i of e.rules) if (s(i)) n(i, r);
-				else if (typeof i.field == "string" && i.field.includes(".")) {
-					let e = i.field.split(".");
-					for (let n = 1; n < e.length; n++) {
-						let i = e.slice(0, n).join(".");
-						t.add(r ? `${r}.${i}` : i);
+		let t = /* @__PURE__ */ new Map(), n = (e, n) => {
+			(n || !t.has(e)) && t.set(e, n);
+		}, r = (e, t = "") => {
+			if (e?.rules) for (let i of e.rules) {
+				if (s(i)) {
+					r(i, t);
+					continue;
+				}
+				let e = i;
+				if (e.field.includes(".")) {
+					let r = e.field.split(".");
+					for (let e = 1; e < r.length; e++) {
+						let i = r.slice(0, e).join(".");
+						n(t ? `${t}.${i}` : i, !0);
 					}
-				} else if (i.operator === "exists" || i.operator === "notExists") {
-					let e = String(i.field), a = r ? `${r}.${e}` : e;
-					this.metadata.relationMap?.has(e) && t.add(a), "where" in i && i.where && n(i.where, a);
+				} else if (e.operator === "exists" || e.operator === "notExists") {
+					let i = e.field, a = t ? `${t}.${i}` : i;
+					this.metadata.relationMap?.has(i) && n(a, e.operator === "exists"), e.where && r(e.where, a);
 				}
 			}
 		};
-		return n(e), t;
-	}
-	build_relation_select(e) {
-		let t = e.split(".");
-		if (t.length === 1) return this.build_single_relation_select(t[0]);
-		let n = [], r = this.metadata;
-		for (let e of t) {
-			let t = r.relationMap?.get(e);
+		return r(e), t;
+	}
+	build_relation_select(e, t) {
+		let n = e.split(".");
+		if (n.length === 1) return this.build_single_relation_select(n[0], t);
+		let r = [], i = this.metadata;
+		for (let e of n) {
+			let t = i.relationMap?.get(e);
 			if (!t) return `${e}(id)`;
-			let i = this.adapter.rxdb.schemaManager.getEntityMetadata(t.mappedEntity, t.mappedNamespace ?? "");
-			n.push({
+			let n = this.adapter.rxdb.schemaManager.getEntityMetadata(t.mappedEntity, t.mappedNamespace ?? "");
+			r.push({
 				relationName: e,
-				targetTableName: i?.tableName ?? t.mappedEntity,
+				targetTableName: n?.tableName ?? t.mappedEntity,
 				targetEntityName: t.mappedEntity,
 				kind: t.kind,
-				sourceEntityName: r.name,
-				sourceTableName: r.tableName
-			}), i && (r = i);
+				sourceEntityName: i.name,
+				sourceTableName: i.tableName
+			}), n && (i = n);
 		}
-		let i = this.build_relation_segment(n[n.length - 1], !0);
-		for (let e = n.length - 2; e >= 0; e--) i = this.build_relation_segment(n[e], !0).replace("(*)", `(*, ${i})`);
-		return i;
+		let a = this.build_relation_segment(r[r.length - 1], t);
+		for (let e = r.length - 2; e >= 0; e--) a = this.build_relation_segment(r[e], t).replace("(*)", `(*, ${a})`);
+		return a;
 	}
-	build_single_relation_select(e) {
-		let t = this.metadata.relationMap?.get(e);
-		if (!t) return `${e}(id)`;
-		let n = this.adapter.rxdb.schemaManager.getEntityMetadata(t.mappedEntity, t.mappedNamespace ?? "")?.tableName ?? t.mappedEntity, r = this.metadata.tableName;
-		return t.kind === "m:1" || t.kind === "1:1" ? `${e}:${n}!${`${r}_${e}Id_fkey`.toLowerCase()}(*)` : t.kind === "m:n" ? `${e}:${n}!${this.get_join_table_name(this.metadata.name, t.mappedEntity)}(*)` : `${e}:${n}(*)`;
+	build_single_relation_select(e, t) {
+		let n = this.metadata.relationMap?.get(e);
+		if (!n) return `${e}(id)`;
+		let r = this.adapter.rxdb.schemaManager.getEntityMetadata(n.mappedEntity, n.mappedNamespace ?? "")?.tableName ?? n.mappedEntity, i = this.metadata.tableName, a = t ? "!inner" : "";
+		return n.kind === "m:1" || n.kind === "1:1" ? `${e}:${r}!${`${i}_${e}Id_fkey`.toLowerCase()}${a}(*)` : n.kind === "m:n" ? `${e}:${r}!${this.get_join_table_name(this.metadata.name, n.mappedEntity)}${a}(*)` : `${e}:${r}${a}(*)`;
 	}
 	build_relation_segment(e, t) {
 		let n = t ? "!inner" : "";
@@ -389,47 +424,29 @@ var R = class extends i {
 		return [e, t].sort().join("_");
 	}
 	get_client() {
-		let e = F(this.metadata.namespace);
+		let e = y(this.metadata.namespace);
 		return e ? this.adapter.client.schema(e).from(this.metadata.tableName) : this.adapter.client.from(this.metadata.tableName);
 	}
-}, z = class extends R {
+}, U = class extends H {
 	constructor(e, t) {
 		super(e, t);
 	}
 	async findDescendants(e) {
-		let { entityId: t, level: n = 100 } = e, { data: r, error: i } = await this.adapter.client.rpc(t ? "get_descendants" : "get_root_descendants", t ? {
-			root_id: t,
-			max_level: n
-		} : { max_level: n });
-		if (i) {
-			if (i.message.includes("function") || i.message.includes("Could not find")) return this.findDescendantsFallback(e);
-			throw new g(`Failed to find descendants: ${i.message}`);
-		}
-		return (r || []).map((e) => this.transformRowToEntity(e));
+		return this.findDescendantsFromTable(e);
 	}
 	async countDescendants(e) {
 		let { entityId: t } = e, n = await this.findDescendants(e);
-		return t ? n.length - 1 : n.length;
+		return t ? Math.max(0, n.length - 1) : n.length;
 	}
 	async findAncestors(e) {
-		let { entityId: t, level: n = 100 } = e;
-		if (!t) return [];
-		let { data: r, error: i } = await this.adapter.client.rpc("get_ancestors", {
-			node_id: t,
-			max_level: n
-		});
-		if (i) {
-			if (i.message.includes("function") || i.message.includes("Could not find")) return this.findAncestorsFallback(e);
-			throw new g(`Failed to find ancestors: ${i.message}`);
-		}
-		return (r || []).map((e) => this.transformRowToEntity(e));
+		return this.findAncestorsFromTable(e);
 	}
 	async countAncestors(e) {
 		let t = await this.findAncestors(e);
 		return Math.max(0, t.length - 1);
 	}
-	async findDescendantsFallback(e) {
-		let { entityId: t, level: n = 100 } = e, r = this.metadata.name, i = this.metadata.features?.tree?.hasChildren, a = F(this.metadata.namespace) ?? "public", o = this.adapter.client.schema(a).from(r), s = [], c = /* @__PURE__ */ new Set(), l = async (e) => {
+	async findDescendantsFromTable(e) {
+		let { entityId: t, level: n = 100 } = e, r = this.metadata.tableName, i = this.metadata.features?.tree?.hasChildren, a = y(this.metadata.namespace) ?? "public", o = this.adapter.client.schema(a).from(r), s = [], c = /* @__PURE__ */ new Set(), l = async (e) => {
 			let { data: n, error: r } = await (e === void 0 ? t ? o.select("*").eq("id", t).limit(1) : o.select("*").is("parentId", null) : o.select("*").in("parentId", e));
 			if (r) throw new g(`Failed to find descendants: ${r.message}`);
 			return n ?? [];
@@ -440,7 +457,7 @@ var R = class extends i {
 				return c.has(n) ? !1 : (c.add(n), e.push(n), !0);
 			});
 			if (t.length === 0) break;
-			let r = d < n && e.length > 0 ? await l(e) : [], a = /* @__PURE__ */ new Map();
+			let r = (d < n || i) && e.length > 0 ? await l(e) : [], a = /* @__PURE__ */ new Map();
 			for (let e of r) {
 				let t = e.parentId;
 				typeof t == "string" && a.set(t, (a.get(t) ?? 0) + 1);
@@ -453,14 +470,14 @@ var R = class extends i {
 				}
 				s.push(t);
 			}
-			u = r, d += 1;
+			u = d < n ? r : [], d += 1;
 		}
 		return s;
 	}
-	async findAncestorsFallback(e) {
+	async findAncestorsFromTable(e) {
 		let { entityId: t, level: n = 100 } = e;
 		if (!t) return [];
-		let r = this.metadata.name, i = this.metadata.features?.tree?.hasChildren, a = F(this.metadata.namespace) ?? "public", { data: o, error: s } = await this.adapter.client.schema(a).from(r).select("*");
+		let r = this.metadata.tableName, i = this.metadata.features?.tree?.hasChildren, a = y(this.metadata.namespace) ?? "public", { data: o, error: s } = await this.adapter.client.schema(a).from(r).select("*");
 		if (s) throw new g(`Failed to find ancestors: ${s.message}`);
 		if (!o || o.length === 0) return [];
 		let c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
@@ -484,9 +501,9 @@ var R = class extends i {
 	}
 	transformRowToEntity(e) {
 		let t = { ...e };
-		return delete t.level, L(this.EntityType, this.metadata, t);
+		return delete t.level, V(this.EntityType, this.metadata, t);
 	}
-}, B = "supabase", V = [
+}, W = "supabase", G = "2.88.0", K = [
 	/invalid response was received from the upstream server/i,
 	/fetch failed/i,
 	/failed to fetch/i,
@@ -494,18 +511,18 @@ var R = class extends i {
 	/upstream connect error/i,
 	/connection terminated/i,
 	/temporarily unavailable/i
-], H = 3, U = 150, W = "rxdb_check_rls", G = 500, K = 5e3, q = new Set([
+], q = 3, J = 150, Y = "rxdb_check_rls", X = 500, Z = 5e3, Q = /* @__PURE__ */ new Set([
 	"CHANNEL_ERROR",
 	"TIMED_OUT",
 	"CLOSED"
-]);
-function J(e) {
+]), $ = 1e3, ee = 100;
+function te(e) {
 	return new Promise((t) => setTimeout(t, e));
 }
-function Y(e) {
-	return V.some((t) => t.test(e));
+function ne(e) {
+	return K.some((t) => t.test(e));
 }
-var X = class extends a {
+var re = class extends a {
 	options;
 	#e;
 	#t = null;
@@ -513,12 +530,18 @@ var X = class extends a {
 	#r = 0;
 	#i = !0;
 	#a = !1;
-	name = B;
+	name = W;
 	get client() {
 		return this.#e;
 	}
 	constructor(e, t) {
-		super(e), this.options = t, this.#e = t.client ?? c(t.supabaseUrl, t.supabaseKey);
+		if (super(e), this.options = t, t.client) {
+			this.#e = t.client;
+			return;
+		}
+		let n = t.supabaseUrl?.trim(), r = t.supabaseKey?.trim();
+		if (!n || !r) throw new m("A non-empty supabaseUrl and supabaseKey are required when client is not supplied");
+		this.#e = c(n, r);
 	}
 	async connect() {
 		return await this.#o(), this.#i = !0, this.#h(), this.#t ||= this.#f(), this;
@@ -530,30 +553,34 @@ var X = class extends a {
 		}
 	}
 	async version() {
-		return "2.86.0";
+		return G;
 	}
 	async saveMany(e) {
-		return e.length === 0 ? [] : this.executeUpsert(A(e));
+		return e.length === 0 ? [] : this.executeUpsert(L(e));
 	}
 	async removeMany(e) {
-		return e.length === 0 ? [] : this.executeDelete(A(e));
+		return e.length === 0 ? [] : this.executeDelete(L(e));
 	}
 	async mutations(e) {
-		let t = this.rxdb.context.userId, n = [...j(e.create, t), ...j(e.update, t)], r = M(e.remove);
+		let t = this.rxdb.context.userId, n = [...R(e.create, t), ...R(e.update, t)], r = z(e.remove);
 		if (n.length === 0 && r.length === 0) return [];
-		let { data: i, error: a } = await this.#e.rpc("rxdb_mutations", {
-			p_upserts: n,
-			p_deletes: r
-		});
-		if (a) throw new g(`Transaction failed: ${a.message}`);
-		let o = i?.upserted ?? [];
-		for (let [, t] of e.remove) o.push(...t);
-		return o;
+		let i = (await this.executeRetryableWrite("execute transaction", async () => {
+			let { data: e, error: t } = await this.#e.rpc("rxdb_mutations", {
+				p_upserts: n,
+				p_deletes: r
+			});
+			return {
+				data: e,
+				error: t
+			};
+		}))?.upserted ?? [];
+		for (let [, t] of e.remove) i.push(...t);
+		return i;
 	}
 	getRepository(e) {
 		let t = this.repository_cache.get(e);
 		if (t) return t;
-		let n = o(e).features?.tree ? new z(this, e) : new R(this, e);
+		let n = o(e).features?.tree ? new U(this, e) : new H(this, e);
 		return this.repository_cache.set(e, n), n;
 	}
 	async isTableExisted(e) {
@@ -566,30 +593,31 @@ var X = class extends a {
 		throw new g(`Failed to check table existence: ${n.error?.message || `status ${n.status}`}`);
 	}
 	async pullChanges(e, t = 1e3, n, r, i) {
-		let a = [], o;
-		if (r && n?.length === 1) {
-			let e = n[0];
-			if (o = await this.#g(e, r), o.length === 0) return [];
+		if (t <= 0) return [];
+		let a = this.#g(n), o;
+		if (r && a?.length === 1 && (o = await this.#y(a[0], r), o.length === 0)) return [];
+		let s = o ? this.#v(o, ee) : [void 0], c = [];
+		for (let n of s) {
+			let r = this.#e.from("rxdb_change").select("*").gt("id", e).order("id", { ascending: !0 }).limit(t);
+			a?.length === 1 ? r = r.eq("namespace", a[0].namespace).eq("entity", a[0].entity) : a && a.length > 1 && (r = r.or(a.map((e) => this.#_(e)).join(","))), i && (r = r.eq("branchId", i)), n && (r = r.in("entityId", n));
+			let { data: o, error: s } = await r;
+			if (s) throw new g(`Failed to pull changes: ${s.message}`);
+			c.push(...(o ?? []).map((e) => ({
+				...e,
+				createdAt: new Date(e.createdAt),
+				updatedAt: e.updatedAt ? new Date(e.updatedAt) : null
+			})));
 		}
-		let s = this.#e.from("rxdb_change").select("*").gt("id", e).order("id", { ascending: !0 }).limit(t);
-		n && n.length > 0 && (s = s.in("entity", n)), i && (s = s.eq("branchId", i)), o && (s = s.in("entityId", o));
-		let { data: c, error: l } = await s;
-		if (l) throw new g(`Failed to pull changes: ${l.message}`);
-		let u = (c ?? []).map((e) => ({
-			...e,
-			createdAt: new Date(e.createdAt),
-			updatedAt: e.updatedAt ? new Date(e.updatedAt) : null
-		}));
-		return a.push(...u), a;
+		return c.sort((e, t) => e.id - t.id).slice(0, t);
 	}
 	async getChangeCount(e, t, n) {
-		let r = this.#e.from("rxdb_change").select("id", { count: "exact" }).gt("id", e);
-		t && t.length > 0 && (r = r.in("entity", t)), n && (r = r.eq("branchId", n));
-		let { data: i, count: a, error: o } = await r.order("id", { ascending: !1 }).limit(1);
-		if (o) throw new g(`Failed to get change count: ${o.message}`);
+		let r = this.#g(t), i = this.#e.from("rxdb_change").select("id", { count: "exact" }).gt("id", e);
+		r?.length === 1 ? i = i.eq("namespace", r[0].namespace).eq("entity", r[0].entity) : r && r.length > 1 && (i = i.or(r.map((e) => this.#_(e)).join(","))), n && (i = i.eq("branchId", n));
+		let { data: a, count: o, error: s } = await i.order("id", { ascending: !1 }).limit(1);
+		if (s) throw new g(`Failed to get change count: ${s.message}`);
 		return {
-			count: a ?? 0,
-			latestChangeId: a && a > 0 && i && i.length > 0 ? i[0].id : e
+			count: o ?? 0,
+			latestChangeId: o && o > 0 && a && a.length > 0 ? a[0].id : e
 		};
 	}
 	async pushChanges(e) {
@@ -722,13 +750,18 @@ var X = class extends a {
 				schema: n,
 				ids: t
 			};
-		}) : [], { data: p, error: m } = await this.#e.rpc("rxdb_mutations", {
-			p_upserts: d,
-			p_deletes: f,
-			p_changes: o,
-			p_skip_sync: !0
+		}) : [], p = await this.executeRetryableWrite("merge changes", async () => {
+			let { data: e, error: t } = await this.#e.rpc("rxdb_mutations", {
+				p_upserts: d,
+				p_deletes: f,
+				p_changes: o,
+				p_skip_sync: !0
+			});
+			return {
+				data: e,
+				error: t
+			};
 		});
-		if (m) throw new g(`Failed to merge changes: ${m.message}`);
 		return {
 			maxChangeId: p?.max_change_id ?? void 0,
 			changeIdMapping: p?.change_id_mapping ?? void 0
@@ -736,8 +769,14 @@ var X = class extends a {
 	}
 	async pullChangesBatch(e, t = 1e3, n) {
 		if (e.length === 0) return [];
-		if (e.length === 1 && (!n || n.length <= 1)) return this.pullChanges(e[0].sinceId, t, [e[0].entity], void 0, n?.[0]);
-		let r = e.map((e) => `and(entity.eq.${e.entity},id.gt.${e.sinceId})`).join(","), i = this.#e.from("rxdb_change").select("*").or(r).order("id", { ascending: !0 }).limit(t);
+		if (e.length === 1 && (!n || n.length <= 1)) {
+			let r = e[0], i = r.namespace ? `${r.namespace}:${r.entity}` : r.entity;
+			return this.pullChanges(r.sinceId, t, [i], void 0, n?.[0]);
+		}
+		let r = e.map((e) => {
+			let t = e.namespace ? `${e.namespace}:${e.entity}` : e.entity, n = x(this.rxdb, t);
+			return `and(namespace.eq.${n.namespace},entity.eq.${n.entity},id.gt.${e.sinceId})`;
+		}).join(","), i = this.#e.from("rxdb_change").select("*").or(r).order("id", { ascending: !0 }).limit(t);
 		n && n.length > 0 && (i = n.length === 1 ? i.eq("branchId", n[0]) : i.in("branchId", n));
 		let { data: a, error: o } = await i;
 		if (o) throw new g(`Failed to batch pull changes: ${o.message}`);
@@ -780,8 +819,8 @@ var X = class extends a {
 	}
 	fetchMetadata(e, t) {
 		return l(() => {
-			let n = this.rxdb.schemaManager.getEntityMetadata(e, "public")?.tableName ?? e, r = this.#e.from(n).select("id, updatedAt");
-			return r = T(r, t), u(r).pipe(d(({ data: e, error: t }) => {
+			let n = x(this.rxdb, e), r = this.#e.schema(n.schema).from(n.tableName).select("id, updatedAt");
+			return r = M(r, t), u(r).pipe(d(({ data: e, error: t }) => {
 				if (t) throw new g(`Failed to fetch metadata: ${t.message}`);
 				return (e ?? []).map((e) => ({
 					id: e.id,
@@ -793,24 +832,24 @@ var X = class extends a {
 	findByIds(e, t) {
 		return l(() => {
 			if (t.length === 0) return f([]);
-			let n = this.rxdb.schemaManager.getEntityMetadata(e, "public")?.tableName ?? e;
-			return u(this.#e.from(n).select("*").in("id", t)).pipe(d(({ data: e, error: t }) => {
+			let n = x(this.rxdb, e);
+			return u(this.#e.schema(n.schema).from(n.tableName).select("*").in("id", t)).pipe(d(({ data: e, error: t }) => {
 				if (t) throw new g(`Failed to find by ids: ${t.message}`);
 				return e ?? [];
 			}));
 		});
 	}
 	getSchemaClient(e) {
-		let t = F(e);
+		let t = y(e);
 		return t ? this.#e.schema(t) : this.#e;
 	}
 	async executeRetryableWrite(e, t) {
 		let n = "Unknown error";
-		for (let r = 1; r <= H; r++) {
+		for (let r = 1; r <= q; r++) {
 			let { data: i, error: a } = await t();
 			if (!a) return i;
-			if (n = a.message || "Unknown error", !Y(n) || r === H) throw new g(`Failed to ${e}: ${n}`);
-			await J(U * r);
+			if (n = a.message || "Unknown error", !ne(n) || r === q) throw new g(`Failed to ${e}: ${n}`);
+			await te(J * r);
 		}
 		throw new g(`Failed to ${e}: ${n}`);
 	}
@@ -848,42 +887,60 @@ var X = class extends a {
 	}
 	async #o() {
 		if (this.#a || this.options.rlsCheck === !1) return;
-		this.#a = !0;
 		let e = this.#s(), t = this.#c(e.tables);
-		if (t.length !== 0) try {
-			let { data: n, error: r } = await this.#e.rpc(e.rpcName, { p_tables: t });
-			if (r) {
-				this.#d(this.#l(e.rpcName, r.message), e.failureMode);
-				return;
-			}
-			let i = (Array.isArray(n) ? n : []).filter((e) => e.exists !== !1 && e.rlsEnabled !== !0);
-			if (i.length > 0) {
-				let t = i.map((e) => `${e.schema}.${e.table}`).sort().join(", ");
-				this.#d(`[RxDB Supabase] RLS is disabled for tables: ${t}. Fix the policies before exposing this adapter to untrusted clients.`, e.failureMode);
-			}
-		} catch (t) {
-			this.#d(this.#u(t), e.failureMode);
+		if (t.length === 0) {
+			this.#a = !0;
+			return;
+		}
+		let n = await Promise.resolve(this.#e.rpc(e.rpcName, { p_tables: t })).catch((t) => (this.#d(this.#u(t), e.failureMode), null));
+		if (!n) {
+			this.#a = !0;
+			return;
+		}
+		let { data: r, error: i } = n;
+		if (i) {
+			this.#d(this.#l(e.rpcName, i.message), e.failureMode), this.#a = !0;
+			return;
+		}
+		let a = new Map((Array.isArray(r) ? r : []).map((e) => [`${e.schema}:${e.table}`, e])), o = t.filter((e) => {
+			let t = a.get(`${e.schema ?? "public"}:${e.table}`);
+			return t?.exists !== !0 || t.rlsEnabled !== !0;
+		});
+		if (o.length > 0) {
+			let t = o.map((e) => `${e.schema}.${e.table}`).sort().join(", ");
+			this.#d(`[RxDB Supabase] RLS is disabled for tables: ${t}. Fix the policies before exposing this adapter to untrusted clients.`, e.failureMode);
 		}
+		this.#a = !0;
 	}
 	#s() {
 		return this.options.rlsCheck && typeof this.options.rlsCheck == "object" ? {
-			rpcName: this.options.rlsCheck.rpcName ?? W,
+			rpcName: this.options.rlsCheck.rpcName ?? Y,
 			failureMode: this.options.rlsCheck.failureMode ?? "warn",
 			tables: this.options.rlsCheck.tables ?? []
 		} : {
-			rpcName: W,
+			rpcName: Y,
 			failureMode: "warn",
 			tables: []
 		};
 	}
 	#c(e) {
-		let t = e.length > 0 ? e : this.rxdb.config.entities.map((e) => {
-			let t = o(e);
-			return {
-				schema: F(t.namespace),
-				table: t.tableName
-			};
-		}), n = /* @__PURE__ */ new Map();
+		let t = e.length > 0 ? e : [
+			{
+				schema: "public",
+				table: "rxdb_change"
+			},
+			{
+				schema: "public",
+				table: "rxdb_branch"
+			},
+			...this.rxdb.config.entities.map((e) => {
+				let t = o(e);
+				return {
+					schema: y(t.namespace),
+					table: t.tableName
+				};
+			})
+		], n = /* @__PURE__ */ new Map();
 		for (let e of t) {
 			let t = e.schema ?? "public", r = `${t}:${e.table}`;
 			n.set(r, {
@@ -909,21 +966,21 @@ var X = class extends a {
 			event: "INSERT",
 			schema: "public",
 			table: "rxdb_change"
-		}, (e) => v(this, e));
+		}, (e) => w(this, e));
 		return e.subscribe((t, n) => {
 			if (this.#t === e) {
 				if (t === "SUBSCRIBED") {
 					this.#r = 0;
 					return;
 				}
-				n && console.error("Supabase Realtime subscription failed:", n), q.has(t) && this.#p(e, t, n?.message);
+				n && console.error("Supabase Realtime subscription failed:", n), Q.has(t) && this.#p(e, t, n?.message);
 			}
 		}), e;
 	}
 	#p(e, t, n) {
 		if (!this.#i || this.#n || this.#t !== e) return;
 		this.#r += 1;
-		let r = Math.min(G * 2 ** (this.#r - 1), K), i = n?.trim();
+		let r = Math.min(X * 2 ** (this.#r - 1), Z), i = n?.trim();
 		console.warn(`[RxDB Supabase] Realtime channel ${t} detected. Retrying in ${r}ms (attempt ${this.#r})${i ? `: ${i}` : ""}.`), this.#n = setTimeout(() => {
 			this.#n = null, this.#m(e);
 		}, r);
@@ -934,13 +991,29 @@ var X = class extends a {
 	#h() {
 		this.#n &&= (clearTimeout(this.#n), null);
 	}
-	async #g(e, t) {
-		let n = this.rxdb.schemaManager.getEntityMetadata(e, "public")?.tableName ?? e, r = this.#e.from(n).select("id");
-		r = T(r, t);
-		let { data: i, error: a } = await r;
-		if (a) throw new g(`Failed to query filtered entities: ${a.message}`);
-		return (i ?? []).map((e) => e.id);
+	#g(e) {
+		if (e?.length) return e.map((e) => x(this.rxdb, e));
+	}
+	#_(e) {
+		return `and(namespace.eq.${e.namespace},entity.eq.${e.entity})`;
+	}
+	#v(e, t) {
+		let n = [];
+		for (let r = 0; r < e.length; r += t) n.push(e.slice(r, r + t));
+		return n;
+	}
+	async #y(e, t) {
+		let n = [];
+		for (let r = 0;; r += $) {
+			let i = this.#e.schema(e.schema).from(e.tableName).select("id");
+			i = M(i, t).order("id", { ascending: !0 }).range(r, r + $ - 1);
+			let { data: a, error: o } = await i;
+			if (o) throw new g(`Failed to query filtered entities: ${o.message}`);
+			let s = a ?? [];
+			if (n.push(...s.map((e) => String(e.id))), s.length < $) break;
+		}
+		return n;
 	}
 };
 //#endregion
-export { B as ADAPTER_NAME, X as RxDBAdapterSupabase, m as SupabaseConfigError, g as SupabaseDataError, h as SupabaseNetworkError, R as SupabaseRepository, p as SupabaseSyncError, z as SupabaseTreeRepository };
+export { W as ADAPTER_NAME, re as RxDBAdapterSupabase, G as SUPABASE_SDK_VERSION, m as SupabaseConfigError, g as SupabaseDataError, h as SupabaseNetworkError, H as SupabaseRepository, p as SupabaseSyncError, U as SupabaseTreeRepository };