@aiao/rxdb-adapter-supabase 0.0.10 → 0.0.12

package/dist/SupabaseTreeRepository.d.ts

@@ -41,17 +41,14 @@ export declare class SupabaseTreeRepository<T extends EntityType> extends Supaba
     countAncestors(options: FindTreeOptions<T>): Promise<number>;
     /**
      * 备用的子孙节点查询（不使用存储函数）
-     * 仅支持简单的层级查询
      *
-     * TODO: 当前实现存在 N+1 查询问题，对于深或宽的树性能较差。
-     * 优化方案：一次查询获取所有节点，在内存中构建树结构。
+     * 一次查询获取所有节点，在内存中构建树结构，避免 N+1 问题。
      */
     private findDescendantsFallback;
     /**
      * 备用的祖先节点查询（不使用存储函数）
      *
-     * TODO: 当前实现存在 N+1 查询问题，每个祖先都需要一次查询。
-     * 优化方案：一次查询获取所有节点，在内存中向上遍历。
+     * 一次查询获取所有节点，在内存中向上遍历，避免 N+1 问题。
      */
     private findAncestorsFallback;
     /**

package/dist/SupabaseTreeRepository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SupabaseTreeRepository.d.ts","sourceRoot":"","sources":["../src/SupabaseTreeRepository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,sBAAsB,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAE,YAAW,eAAe,CAAC,CAAC,CAAC;gBACvG,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,CAAC;IAIvD;;;;;;OAMG;IACG,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAoB9E;;;;;;OAMG;IACG,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAcpE;;;;;OAKG;IACG,aAAa,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAyB5E;;;;;OAKG;IACG,cAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAOlE;;;;;;OAMG;YACW,uBAAuB;IA8DrC;;;;;OAKG;YACW,qBAAqB;IA6CnC;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAW7B"}
+{"version":3,"file":"SupabaseTreeRepository.d.ts","sourceRoot":"","sources":["../src/SupabaseTreeRepository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,sBAAsB,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAE,YAAW,eAAe,CAAC,CAAC,CAAC;gBACvG,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,CAAC;IAIvD;;;;;;OAMG;IACG,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAoB9E;;;;;;OAMG;IACG,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAcpE;;;;;OAKG;IACG,aAAa,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAyB5E;;;;;OAKG;IACG,cAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAOlE;;;;OAIG;YACW,uBAAuB;IAgErC;;;;OAIG;YACW,qBAAqB;IAsDnC;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAW7B"}

package/dist/index.js

@@ -1,22 +1,22 @@
-import { EntityRemoteRemovedEvent as O, EntityRemoteUpdatedEvent as W, EntityRemoteCreatedEvent as U, isRuleGroup as A, getEntityMetadata as b, PropertyType as E, RepositoryBase as K, RxDBAdapterRemoteBase as z } from "@aiao/rxdb";
+import { EntityRemoteRemovedEvent as O, EntityRemoteUpdatedEvent as W, EntityRemoteCreatedEvent as U, isRuleGroup as A, getEntityMetadata as _, PropertyType as $, RepositoryBase as K, RxDBAdapterRemoteBase as z } from "@aiao/rxdb";
 import { createClient as L } from "@supabase/supabase-js";
-import { defer as D, from as k, map as N, of as Q } from "rxjs";
+import { defer as D, from as N, map as k, of as Q } from "rxjs";
 class S extends Error {
   constructor(t, e) {
     super(t), this.code = e, this.name = "SupabaseSyncError";
   }
 }
-class at extends S {
+class rt extends S {
   constructor(t) {
     super(t, "CONFIG_ERROR"), this.name = "SupabaseConfigError";
   }
 }
-class rt extends S {
+class at extends S {
   constructor(t) {
     super(t, "NETWORK_ERROR"), this.name = "SupabaseNetworkError";
   }
 }
-class m extends S {
+class g extends S {
   constructor(t) {
     super(t, "DATA_ERROR"), this.name = "SupabaseDataError";
   }
@@ -30,19 +30,19 @@ function J(i, t) {
   if (t.table !== "RxDBChange" || t.eventType !== "INSERT") return;
   const e = t.new;
   if (!e) return;
-  const { namespace: s, entity: n, entityId: a, type: r, patch: o, clientId: c } = e, d = i.rxdb.context.clientId;
+  const { namespace: n, entity: s, entityId: a, type: r, patch: o, clientId: c } = e, d = i.rxdb.context.clientId;
   if (c && d && c === d || !a || !r) return;
-  const u = V[r];
-  if (!u) return;
-  const l = { id: a, ...o };
+  const f = V[r];
+  if (!f) return;
+  const u = { id: a, ...o };
   i.rxdb.dispatchEvent(
-    new u([
+    new f([
       {
         type: r,
-        namespace: s || "public",
-        entity: n,
+        namespace: n || "public",
+        entity: s,
         id: a,
-        data: l,
+        data: u,
         recordAt: e.createdAt ? new Date(e.createdAt) : /* @__PURE__ */ new Date()
       }
     ])
@@ -64,7 +64,7 @@ const X = {
 function C(i) {
   return i instanceof Date ? i.toISOString() : Array.isArray(i) ? i.map(C) : i;
 }
-function B(i, t, e) {
+function M(i, t, e) {
   return !t || !i.mappedEntity ? e : t.getEntityMetadata(i.mappedEntity, i.mappedNamespace ?? "") ?? e;
 }
 function H(i, t) {
@@ -91,114 +91,114 @@ function H(i, t) {
       throw new Error(`Unsupported operator: ${i}`);
   }
 }
-function F(i, t, e) {
-  const [s, ...n] = i.split(".");
-  return n.length === 0 ? { field: i, operator: t, value: e } : {
-    field: s,
+function B(i, t, e) {
+  const [n, ...s] = i.split(".");
+  return s.length === 0 ? { field: i, operator: t, value: e } : {
+    field: n,
     operator: "exists",
-    where: { combinator: "and", rules: [F(n.join("."), t, e)] }
+    where: { combinator: "and", rules: [B(s.join("."), t, e)] }
   };
 }
-function $(i, t, e, s) {
+function x(i, t, e, n) {
   if (!t?.rules?.length) return i;
   if (t.rules.length === 1) {
     const a = t.rules[0];
-    return A(a) ? $(i, a, e, s) : I(i, a, e, s);
+    return A(a) ? x(i, a, e, n) : I(i, a, e, n);
   }
   if (t.combinator === "and")
     return t.rules.reduce(
-      (a, r) => A(r) ? $(a, r, e, s) : I(a, r, e, s),
+      (a, r) => A(r) ? x(a, r, e, n) : I(a, r, e, n),
       i
     );
-  const n = t.rules.map((a) => {
+  const s = t.rules.map((a) => {
     if (A(a)) throw new Error("Nested OR conditions not supported");
     const { field: r, operator: o, value: c } = a;
     return `${r}.${H(o, c)}`;
   });
-  return i.or(n.join(","));
+  return i.or(s.join(","));
 }
-function I(i, t, e, s) {
-  const { field: n, operator: a, value: r } = t;
-  return typeof n == "string" && n.includes(".") ? I(i, F(n, a, r), e, s) : a === "exists" || a === "notExists" ? Y(i, t, e, s) : M(i, n, a, r);
+function I(i, t, e, n) {
+  const { field: s, operator: a, value: r } = t;
+  return typeof s == "string" && s.includes(".") ? I(i, B(s, a, r), e, n) : a === "exists" || a === "notExists" ? Y(i, t, e, n) : F(i, s, a, r);
 }
-function Y(i, t, e, s) {
-  const { field: n, operator: a } = t, r = t.where, o = String(n), c = e?.relationMap?.get(o);
+function Y(i, t, e, n) {
+  const { field: s, operator: a } = t, r = t.where, o = String(s), c = e?.relationMap?.get(o);
   if (!c)
     throw new Error(`Relation '${o}' not found in '${e?.name || "unknown"}'`);
   const d = c.mappedEntity;
   if (!r?.rules?.length)
     return a === "exists" ? i.not(d, "is", null) : i.is(d, null);
-  const u = e ? B(c, s, e) : void 0;
-  if (!u) throw new Error(`Cannot resolve metadata for '${o}'`);
-  return R(i, d, r, u, s, d);
+  const f = e ? M(c, n, e) : void 0;
+  if (!f) throw new Error(`Cannot resolve metadata for '${o}'`);
+  return R(i, d, r, f, n, d);
 }
-function R(i, t, e, s, n, a = "") {
+function R(i, t, e, n, s, a = "") {
   if (!e?.rules?.length) return i;
   let r = i;
   for (const o of e.rules) {
     if (A(o)) {
-      r = R(r, t, o, s, n, a);
+      r = R(r, t, o, n, s, a);
       continue;
     }
-    const { field: c, operator: d, value: u } = o;
+    const { field: c, operator: d, value: f } = o;
     if (d === "exists" || d === "notExists") {
-      const p = s?.relationMap?.get(String(c));
+      const p = n?.relationMap?.get(String(c));
       if (!p) throw new Error(`Relation '${c}' not found in ${t}`);
-      const f = p.mappedEntity, h = o.where, y = B(p, n, s);
-      if (h?.rules?.length) {
-        const g = a ? `${a}.${f}` : f;
-        r = R(r, f, h, y, n, g);
+      const h = p.mappedEntity, l = o.where, m = M(p, s, n);
+      if (l?.rules?.length) {
+        const w = a ? `${a}.${h}` : h;
+        r = R(r, h, l, m, s, w);
       } else
-        r = d === "exists" ? r.not(f, "is", null) : r.is(f, null);
+        r = d === "exists" ? r.not(h, "is", null) : r.is(h, null);
       continue;
     }
-    const l = a ? `${a}.${c}` : `${t}.${c}`;
-    r = M(r, l, d, u);
+    const u = a ? `${a}.${c}` : `${t}.${c}`;
+    r = F(r, u, d, f);
   }
   return r;
 }
-function M(i, t, e, s) {
-  const n = C(s);
+function F(i, t, e, n) {
+  const s = C(n);
   if (t.includes(".") && e === "between") {
-    const [r, o] = n;
+    const [r, o] = s;
     return i.gte(t, r).lte(t, o);
   }
   switch (e) {
     case "=":
-      return n === null ? i.is(t, null) : i.eq(t, n);
+      return s === null ? i.is(t, null) : i.eq(t, s);
     case "!=":
-      return n === null ? i.not(t, "is", null) : i.neq(t, n);
+      return s === null ? i.not(t, "is", null) : i.neq(t, s);
     case "<":
-      return i.lt(t, n);
+      return i.lt(t, s);
     case ">":
-      return i.gt(t, n);
+      return i.gt(t, s);
     case "<=":
-      return i.lte(t, n);
+      return i.lte(t, s);
     case ">=":
-      return i.gte(t, n);
+      return i.gte(t, s);
     case "in":
-      return i.in(t, n);
+      return i.in(t, s);
     case "notIn":
-      return i.not(t, "in", `(${n.join(",")})`);
+      return i.not(t, "in", `(${s.join(",")})`);
     case "contains":
     case "includes":
-      return i.ilike(t, `%${n}%`);
+      return i.ilike(t, `%${s}%`);
     case "notContains":
-      return i.not(t, "ilike", `%${n}%`);
+      return i.not(t, "ilike", `%${s}%`);
     case "startsWith":
-      return i.ilike(t, `${n}%`);
+      return i.ilike(t, `${s}%`);
     case "notStartsWith":
-      return i.not(t, "ilike", `${n}%`);
+      return i.not(t, "ilike", `${s}%`);
     case "endsWith":
-      return i.ilike(t, `%${n}`);
+      return i.ilike(t, `%${s}`);
     case "notEndsWith":
-      return i.not(t, "ilike", `%${n}`);
+      return i.not(t, "ilike", `%${s}`);
     case "between": {
-      const [r, o] = n;
+      const [r, o] = s;
       return i.gte(t, r).lte(t, o);
     }
     case "notBetween": {
-      const [r, o] = n;
+      const [r, o] = s;
       return i.or(`${t}.lt.${r},${t}.gt.${o}`);
     }
     case "null":
@@ -214,15 +214,15 @@ function M(i, t, e, s) {
 function T(i) {
   const t = /* @__PURE__ */ new Map();
   for (const e of i) {
-    const s = e.constructor;
-    t.has(s) || t.set(s, /* @__PURE__ */ new Set()), t.get(s).add(e);
+    const n = e.constructor;
+    t.has(n) || t.set(n, /* @__PURE__ */ new Set()), t.get(n).add(e);
   }
   return t;
 }
 function v(i, t) {
   const e = [];
-  for (const [s, n] of i) {
-    const a = b(s), r = Array.from(n);
+  for (const [n, s] of i) {
+    const a = _(n), r = Array.from(s);
     e.push({
       table: a.name,
       schema: a.namespace,
@@ -233,12 +233,12 @@ function v(i, t) {
 }
 function Z(i) {
   const t = [];
-  for (const [e, s] of i) {
-    const n = b(e);
+  for (const [e, n] of i) {
+    const s = _(e);
     t.push({
-      table: n.name,
-      schema: n.namespace,
-      ids: Array.from(s).map((a) => a.id)
+      table: s.name,
+      schema: s.namespace,
+      ids: Array.from(n).map((a) => a.id)
     });
   }
   return t;
@@ -246,36 +246,36 @@ function Z(i) {
 function j(i, t) {
   if (i == null) return i;
   switch (t.type) {
-    case E.date:
+    case $.date:
       return i instanceof Date ? i : new Date(i);
-    case E.keyValue:
+    case $.keyValue:
       if (typeof i == "object" && t.properties) {
         const e = {};
-        for (const s of t.properties)
-          i[s.name] !== void 0 && (e[s.name] = j(i[s.name], s));
+        for (const n of t.properties)
+          i[n.name] !== void 0 && (e[n.name] = j(i[n.name], n));
         return e;
       }
       return i;
-    case E.boolean:
+    case $.boolean:
       return !!i;
-    case E.json:
-    case E.stringArray:
-    case E.numberArray:
+    case $.json:
+    case $.stringArray:
+    case $.numberArray:
     default:
       return i;
   }
 }
 function G(i, t, e) {
-  const s = new i();
-  for (const n of Object.keys(e)) {
-    const a = t.propertyMap.get(n);
-    s[n] = a ? j(e[n], a) : e[n];
+  const n = new i();
+  for (const s of Object.keys(e)) {
+    const a = t.propertyMap.get(s);
+    n[s] = a ? j(e[s], a) : e[s];
   }
-  return s;
+  return n;
 }
 class P extends K {
   constructor(t, e) {
-    super(t.rxdb, e), this.adapter = t, this.metadata = b(e);
+    super(t.rxdb, e), this.adapter = t, this.metadata = _(e);
   }
   metadata;
   /**
@@ -283,23 +283,23 @@ class P extends K {
    */
   async find(t) {
     const e = this.extract_relation_fields(t.where);
-    let s = "*";
+    let n = "*";
     if (e.size > 0) {
       const o = Array.from(e);
-      s = `*, ${o.filter(
-        (d) => !o.some((u) => u !== d && u.startsWith(d + "."))
+      n = `*, ${o.filter(
+        (d) => !o.some((f) => f !== d && f.startsWith(d + "."))
       ).map((d) => this.build_relation_select(d)).join(", ")}`;
     }
-    let n = this.get_client().select(s);
-    if (n = $(n, t.where, this.metadata, this.adapter.rxdb.schemaManager), t.orderBy?.length)
+    let s = this.get_client().select(n);
+    if (s = x(s, t.where, this.metadata, this.adapter.rxdb.schemaManager), t.orderBy?.length)
       for (const o of t.orderBy)
-        n = n.order(o.field, { ascending: o.sort === "asc" });
+        s = s.order(o.field, { ascending: o.sort === "asc" });
     if (t.offset !== void 0) {
       const o = t.offset, c = t.limit !== void 0 ? o + t.limit - 1 : Number.MAX_SAFE_INTEGER;
-      n = n.range(o, c);
-    } else t.limit !== void 0 && (n = n.limit(t.limit));
-    const { data: a, error: r } = await n;
-    if (r) throw new m(`Failed to find entities: ${r.message}`);
+      s = s.range(o, c);
+    } else t.limit !== void 0 && (s = s.limit(t.limit));
+    const { data: a, error: r } = await s;
+    if (r) throw new g(`Failed to find entities: ${r.message}`);
     return (a || []).map((o) => G(this.EntityType, this.metadata, o));
   }
   /**
@@ -308,15 +308,15 @@ class P extends K {
   async count(t) {
     if (t.groupBy) throw new Error("groupBy not supported yet");
     const e = this.extract_relation_fields(t.where);
-    let s = "*";
-    e.size > 0 && (s = `*, ${Array.from(e).map((o) => this.build_relation_select(o)).join(", ")}`);
-    let n = this.get_client().select(s, { count: "exact", head: !0 });
-    n = $(n, t.where, this.metadata, this.adapter.rxdb.schemaManager);
-    const { count: a, error: r } = await n;
+    let n = "*";
+    e.size > 0 && (n = `*, ${Array.from(e).map((o) => this.build_relation_select(o)).join(", ")}`);
+    let s = this.get_client().select(n, { count: "exact", head: !0 });
+    s = x(s, t.where, this.metadata, this.adapter.rxdb.schemaManager);
+    const { count: a, error: r } = await s;
     if (r) {
       if (!r.message)
         return console.warn("Supabase count returned empty error, returning 0. Options:", JSON.stringify(t)), 0;
-      throw new m(`Failed to count entities: ${r.message}`);
+      throw new g(`Failed to count entities: ${r.message}`);
     }
     return a ?? 0;
   }
@@ -324,19 +324,19 @@ class P extends K {
    * 创建实体
    */
   async create(t) {
-    const e = { ...t }, s = this.rxdb.context.userId;
-    s && (e.createdBy = s);
-    const { data: n, error: a } = await this.get_client().insert(e).select().single();
-    if (a) throw new m(`Failed to create entity: ${a.message}`);
-    return n;
+    const e = { ...t }, n = this.rxdb.context.userId;
+    n && (e.createdBy = n);
+    const { data: s, error: a } = await this.get_client().insert(e).select().single();
+    if (a) throw new g(`Failed to create entity: ${a.message}`);
+    return s;
   }
   /**
    * 更新实体
    */
   async update(t, e) {
-    const { data: s, error: n } = await this.get_client().update(e).eq("id", t.id).select().single();
-    if (n) throw new m(`Failed to update entity: ${n.message}`);
-    return s;
+    const { data: n, error: s } = await this.get_client().update(e).eq("id", t.id).select().single();
+    if (s) throw new g(`Failed to update entity: ${s.message}`);
+    return n;
   }
   /**
    * 删除实体
@@ -345,7 +345,7 @@ class P extends K {
    */
   async remove(t) {
     const { error: e } = await this.get_client().delete().eq("id", t.id);
-    if (e) throw new m(`Failed to remove entity: ${e.message}`);
+    if (e) throw new g(`Failed to remove entity: ${e.message}`);
     return t;
   }
   // ============================================
@@ -353,11 +353,11 @@ class P extends K {
   // ============================================
   /** 提取查询中的关系字段路径（用于 EXISTS 查询的 INNER JOIN） */
   extract_relation_fields(t) {
-    const e = /* @__PURE__ */ new Set(), s = (n, a = "") => {
-      if (n?.rules) {
-        for (const r of n.rules)
+    const e = /* @__PURE__ */ new Set(), n = (s, a = "") => {
+      if (s?.rules) {
+        for (const r of s.rules)
           if (r.rules)
-            s(r, a);
+            n(r, a);
           else if (typeof r.field == "string" && r.field.includes(".")) {
             const o = r.field.split(".");
             for (let c = 1; c < o.length; c++) {
@@ -366,11 +366,11 @@ class P extends K {
             }
           } else if (r.operator === "exists" || r.operator === "notExists") {
             const o = String(r.field), c = a ? `${a}.${o}` : o;
-            this.metadata.relationMap?.has(o) && e.add(c), r.where && s(r.where, c);
+            this.metadata.relationMap?.has(o) && e.add(c), r.where && n(r.where, c);
           }
       }
     };
-    return s(t), e;
+    return n(t), e;
   }
   /**
    * 构建关系字段的 SELECT 语法
@@ -379,18 +379,18 @@ class P extends K {
   build_relation_select(t) {
     const e = t.split(".");
     if (e.length === 1) return this.build_single_relation_select(e[0]);
-    const s = [];
-    let n = this.metadata;
+    const n = [];
+    let s = this.metadata;
     for (const r of e) {
-      const o = n.relationMap?.get(r);
+      const o = s.relationMap?.get(r);
       if (!o) return `${r}(id)`;
-      s.push({ tableName: o.mappedEntity, kind: o.kind, sourceEntity: n.name });
+      n.push({ tableName: o.mappedEntity, kind: o.kind, sourceEntity: s.name });
       const c = this.adapter.rxdb.schemaManager.getEntityMetadata(o.mappedEntity, o.mappedNamespace ?? "");
-      c && (n = c);
+      c && (s = c);
     }
-    let a = this.build_relation_segment(s[s.length - 1], !0);
-    for (let r = s.length - 2; r >= 0; r--)
-      a = this.build_relation_segment(s[r], !0).replace("(*)", `(*, ${a})`);
+    let a = this.build_relation_segment(n[n.length - 1], !0);
+    for (let r = n.length - 2; r >= 0; r--)
+      a = this.build_relation_segment(n[r], !0).replace("(*)", `(*, ${a})`);
     return a;
   }
   /**
@@ -400,25 +400,25 @@ class P extends K {
   build_single_relation_select(t) {
     const e = this.metadata.relationMap?.get(t);
     if (!e) return `${t}(id)`;
-    const s = e.mappedEntity, n = this.metadata.name;
+    const n = e.mappedEntity, s = this.metadata.name;
     if (e.kind === "m:1" || e.kind === "1:1") {
-      const a = `${n}_${t}Id_fkey`;
-      return `${s}!${a}(*)`;
+      const a = `${s}_${t}Id_fkey`;
+      return `${n}!${a}(*)`;
     }
     if (e.kind === "m:n") {
-      const a = this.get_join_table_name(n, s);
-      return `${s}!${a}(*)`;
+      const a = this.get_join_table_name(s, n);
+      return `${n}!${a}(*)`;
     }
-    return `${s}(*)`;
+    return `${n}(*)`;
   }
   /** 构建关系 SELECT 片段 */
   build_relation_segment(t, e) {
-    const s = e ? "!inner" : "";
+    const n = e ? "!inner" : "";
     if (t.kind === "m:n") {
-      const n = this.get_join_table_name(t.sourceEntity, t.tableName);
-      return `${t.tableName}!${n}${s}(*)`;
+      const s = this.get_join_table_name(t.sourceEntity, t.tableName);
+      return `${t.tableName}!${s}${n}(*)`;
     }
-    return `${t.tableName}${s}(*)`;
+    return `${t.tableName}${n}(*)`;
   }
   /** 获取 m:n 中间表名（按字母顺序） */
   get_join_table_name(t, e) {
@@ -441,16 +441,16 @@ class q extends P {
    * - 不指定 entityId 时：返回所有根节点及其子孙
    */
   async findDescendants(t) {
-    const { entityId: e, level: s = 100 } = t, { data: n, error: a } = await this.adapter.client.rpc(
+    const { entityId: e, level: n = 100 } = t, { data: s, error: a } = await this.adapter.client.rpc(
       e ? "get_descendants" : "get_root_descendants",
-      e ? { root_id: e, max_level: s } : { max_level: s }
+      e ? { root_id: e, max_level: n } : { max_level: n }
     );
     if (a) {
       if (a.message.includes("function") || a.message.includes("Could not find"))
         return this.findDescendantsFallback(t);
-      throw new m(`Failed to find descendants: ${a.message}`);
+      throw new g(`Failed to find descendants: ${a.message}`);
     }
-    return (n || []).map((r) => this.transformRowToEntity(r));
+    return (s || []).map((r) => this.transformRowToEntity(r));
   }
   /**
    * 查询子孙节点数量
@@ -460,8 +460,8 @@ class q extends P {
    * - 不指定 entityId 时：统计所有根节点及其后代的总数
    */
   async countDescendants(t) {
-    const { entityId: e } = t, s = await this.findDescendants(t);
-    return e ? s.length - 1 : s.length;
+    const { entityId: e } = t, n = await this.findDescendants(t);
+    return e ? n.length - 1 : n.length;
   }
   /**
    * 查询祖先节点
@@ -470,19 +470,19 @@ class q extends P {
    * 指定 entityId 时：包含当前节点 + 祖先节点
    */
   async findAncestors(t) {
-    const { entityId: e, level: s = 100 } = t;
+    const { entityId: e, level: n = 100 } = t;
     if (!e)
       return [];
-    const { data: n, error: a } = await this.adapter.client.rpc("get_ancestors", {
+    const { data: s, error: a } = await this.adapter.client.rpc("get_ancestors", {
       node_id: e,
-      max_level: s
+      max_level: n
     });
     if (a) {
       if (a.message.includes("function") || a.message.includes("Could not find"))
         return this.findAncestorsFallback(t);
-      throw new m(`Failed to find ancestors: ${a.message}`);
+      throw new g(`Failed to find ancestors: ${a.message}`);
     }
-    return (n || []).map((r) => this.transformRowToEntity(r));
+    return (s || []).map((r) => this.transformRowToEntity(r));
   }
   /**
    * 查询祖先节点数量
@@ -496,67 +496,85 @@ class q extends P {
   }
   /**
    * 备用的子孙节点查询（不使用存储函数）
-   * 仅支持简单的层级查询
    *
-   * TODO: 当前实现存在 N+1 查询问题，对于深或宽的树性能较差。
-   * 优化方案：一次查询获取所有节点，在内存中构建树结构。
+   * 一次查询获取所有节点，在内存中构建树结构，避免 N+1 问题。
    */
   async findDescendantsFallback(t) {
-    const { entityId: e, level: s = 100 } = t, n = this.metadata.name, a = this.metadata.features?.tree?.hasChildren, r = [], o = /* @__PURE__ */ new Set();
-    let c = this.adapter.client.schema("public").from(n).select("*");
-    e ? c = c.eq("id", e) : c = c.is("parentId", null);
-    const { data: d, error: u } = await c;
-    if (u)
-      throw new m(`Failed to find start nodes: ${u.message}`);
-    const l = async (p, f) => {
-      for (const h of p) {
-        if (o.has(h.id) || f > s) continue;
-        o.add(h.id);
-        const y = this.transformRowToEntity(h);
-        if (a) {
-          const { count: g } = await this.adapter.client.schema("public").from(n).select("*", { count: "exact", head: !0 }).eq("parentId", h.id);
-          y.hasChildren = (g || 0) > 0;
-        }
-        if (r.push(y), f < s) {
-          const { data: g } = await this.adapter.client.schema("public").from(n).select("*").eq("parentId", h.id);
-          g && g.length > 0 && await l(g, f + 1);
-        }
+    const { entityId: e, level: n = 100 } = t, s = this.metadata.name, a = this.metadata.features?.tree?.hasChildren, { data: r, error: o } = await this.adapter.client.schema("public").from(s).select("*");
+    if (o)
+      throw new g(`Failed to find descendants: ${o.message}`);
+    if (!r || r.length === 0) return [];
+    const c = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map();
+    for (const l of r) {
+      d.set(l.id, l);
+      const m = l.parentId ?? null;
+      c.has(m) || c.set(m, []), c.get(m).push(l);
+    }
+    const f = [], u = /* @__PURE__ */ new Set();
+    let p;
+    if (e) {
+      const l = d.get(e);
+      p = l ? [l] : [];
+    } else
+      p = c.get(null) ?? [];
+    const h = p.map((l) => ({ node: l, depth: 0 }));
+    for (; h.length > 0; ) {
+      const { node: l, depth: m } = h.shift();
+      if (u.has(l.id) || m > n) continue;
+      u.add(l.id);
+      const w = this.transformRowToEntity(l);
+      if (a) {
+        const y = c.get(l.id);
+        w.hasChildren = !!y && y.length > 0;
       }
-    };
-    return await l(d || [], 0), r;
+      if (f.push(w), m < n) {
+        const y = c.get(l.id) ?? [];
+        for (const b of y)
+          h.push({ node: b, depth: m + 1 });
+      }
+    }
+    return f;
   }
   /**
    * 备用的祖先节点查询（不使用存储函数）
    *
-   * TODO: 当前实现存在 N+1 查询问题，每个祖先都需要一次查询。
-   * 优化方案：一次查询获取所有节点，在内存中向上遍历。
+   * 一次查询获取所有节点，在内存中向上遍历，避免 N+1 问题。
    */
   async findAncestorsFallback(t) {
-    const { entityId: e, level: s = 100 } = t;
+    const { entityId: e, level: n = 100 } = t;
     if (!e)
       return [];
-    const n = this.metadata.name, a = this.metadata.features?.tree?.hasChildren, r = [];
-    let o = e, c = 0;
-    for (; o && c <= s; ) {
-      const { data: d, error: u } = await this.adapter.client.schema("public").from(n).select("*").eq("id", o);
-      if (u || !d || d.length === 0)
-        break;
-      const l = d[0], p = this.transformRowToEntity(l);
+    const s = this.metadata.name, a = this.metadata.features?.tree?.hasChildren, { data: r, error: o } = await this.adapter.client.schema("public").from(s).select("*");
+    if (o)
+      throw new g(`Failed to find ancestors: ${o.message}`);
+    if (!r || r.length === 0) return [];
+    const c = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map();
+    for (const h of r) {
+      c.set(h.id, h);
+      const l = h.parentId ?? null;
+      d.has(l) || d.set(l, []), d.get(l).push(h);
+    }
+    const f = [];
+    let u = e, p = 0;
+    for (; u && p <= n; ) {
+      const h = c.get(u);
+      if (!h) break;
+      const l = this.transformRowToEntity(h);
       if (a) {
-        const { count: f } = await this.adapter.client.schema("public").from(n).select("*", { count: "exact", head: !0 }).eq("parentId", l.id);
-        p.hasChildren = (f || 0) > 0;
+        const m = d.get(h.id);
+        l.hasChildren = !!m && m.length > 0;
       }
-      r.push(p), o = l.parentId, c++;
+      f.push(l), u = h.parentId ?? null, p++;
     }
-    return r;
+    return f;
   }
   /**
    * 将数据库行转换为实体
    */
   transformRowToEntity(t) {
     const e = new this.EntityType();
-    return Object.keys(t).forEach((s) => {
-      s !== "level" && (e[s] = t[s]);
+    return Object.keys(t).forEach((n) => {
+      n !== "level" && (e[n] = t[n]);
     }), e;
   }
 }
@@ -611,12 +629,12 @@ class it extends z {
    * 在单个数据库事务中执行所有操作，确保原子性。
    */
   async mutations(t) {
-    const e = this.rxdb.context.userId, s = [...v(t.create, e), ...v(t.update, e)], n = Z(t.remove), { data: a, error: r } = await this.#t.rpc("rxdb_mutations", {
-      p_upserts: s,
-      p_deletes: n
+    const e = this.rxdb.context.userId, n = [...v(t.create, e), ...v(t.update, e)], s = Z(t.remove), { data: a, error: r } = await this.#t.rpc("rxdb_mutations", {
+      p_upserts: n,
+      p_deletes: s
     });
     if (r)
-      throw new m(`Transaction failed: ${r.message}`);
+      throw new g(`Transaction failed: ${r.message}`);
     const o = a?.upserted ?? [];
     for (const [, c] of t.remove)
       o.push(...c);
@@ -628,18 +646,18 @@ class it extends z {
   getRepository(t) {
     if (this.repository_cache.has(t))
       return this.repository_cache.get(t);
-    const s = b(t).features?.tree ? new q(this, t) : new P(this, t);
-    return this.repository_cache.set(t, s), s;
+    const n = _(t).features?.tree ? new q(this, t) : new P(this, t);
+    return this.repository_cache.set(t, n), n;
   }
   // ============================================
   // 工具方法
   // ============================================
   async isTableExisted(t) {
-    const e = b(t), n = await this.getSchemaClient(e.namespace).from(e.name).select("*", { count: "exact", head: !0 });
-    if (n.status === 200) return !0;
-    if (n.status === 204) return !1;
-    throw new m(
-      `Failed to check table existence: ${n.error?.message || `status ${n.status}`}`
+    const e = _(t), s = await this.getSchemaClient(e.namespace).from(e.name).select("*", { count: "exact", head: !0 });
+    if (s.status === 200) return !0;
+    if (s.status === 204) return !1;
+    throw new g(
+      `Failed to check table existence: ${s.error?.message || `status ${s.status}`}`
     );
   }
   // ============================================
@@ -660,25 +678,25 @@ class it extends z {
    * 当提供 filter 参数时，会通过 JOIN 实体表并应用过滤条件，
    * 只返回满足条件的实体对应的变更记录。
    */
-  async pullChanges(t, e = 1e3, s, n) {
+  async pullChanges(t, e = 1e3, n, s) {
     const a = [];
     let r;
-    if (n && s?.length === 1) {
-      const l = s[0];
-      if (r = await this.#n(l, n), r.length === 0)
+    if (s && n?.length === 1) {
+      const u = n[0];
+      if (r = await this.#n(u, s), r.length === 0)
         return [];
     }
     let o = this.#t.from("RxDBChange").select("*").gt("id", t).order("id", { ascending: !0 }).limit(e);
-    s && s.length > 0 && (o = o.in("entity", s)), r && (o = o.in("entityId", r));
+    n && n.length > 0 && (o = o.in("entity", n)), r && (o = o.in("entityId", r));
     const { data: c, error: d } = await o;
     if (d)
-      throw new m(`Failed to pull changes: ${d.message}`);
-    const u = (c ?? []).map((l) => ({
-      ...l,
-      createdAt: new Date(l.createdAt),
-      updatedAt: l.updatedAt ? new Date(l.updatedAt) : null
+      throw new g(`Failed to pull changes: ${d.message}`);
+    const f = (c ?? []).map((u) => ({
+      ...u,
+      createdAt: new Date(u.createdAt),
+      updatedAt: u.updatedAt ? new Date(u.updatedAt) : null
     }));
-    return a.push(...u), a;
+    return a.push(...f), a;
   }
   /**
    * 获取远程变更数量（轻量级，不下载数据）(T042, US2)
@@ -698,22 +716,22 @@ class it extends z {
    * ```
    */
   async getChangeCount(t, e) {
-    let s = this.#t.from("RxDBChange").select("*", { count: "exact", head: !0 }).gt("id", t);
-    e && e.length > 0 && (s = s.in("entity", e));
-    const { count: n, error: a } = await s;
+    let n = this.#t.from("RxDBChange").select("*", { count: "exact", head: !0 }).gt("id", t);
+    e && e.length > 0 && (n = n.in("entity", e));
+    const { count: s, error: a } = await n;
     if (a)
-      throw new m(`Failed to get change count: ${a.message}`);
+      throw new g(`Failed to get change count: ${a.message}`);
     let r = t;
-    if (n && n > 0) {
+    if (s && s > 0) {
       let o = this.#t.from("RxDBChange").select("id").gt("id", t).order("id", { ascending: !1 }).limit(1);
       e && e.length > 0 && (o = o.in("entity", e));
       const { data: c, error: d } = await o;
       if (d)
-        throw new m(`Failed to get latest changeId: ${d.message}`);
+        throw new g(`Failed to get latest changeId: ${d.message}`);
       c && c.length > 0 && (r = c[0].id);
     }
     return {
-      count: n ?? 0,
+      count: s ?? 0,
       latestChangeId: r
     };
   }
@@ -731,18 +749,18 @@ class it extends z {
       updates: /* @__PURE__ */ new Map(),
       deletes: /* @__PURE__ */ new Map()
     };
-    for (const s of t) {
-      const { entityKey: n, finalType: a, finalPatch: r, inversePatch: o } = s;
+    for (const n of t) {
+      const { entityKey: s, finalType: a, finalPatch: r, inversePatch: o } = n;
       if (a)
         switch (a) {
           case "INSERT":
-            e.inserts.set(n, { patch: r, inversePatch: o });
+            e.inserts.set(s, { patch: r, inversePatch: o });
             break;
           case "UPDATE":
-            e.updates.set(n, { patch: r, inversePatch: o });
+            e.updates.set(s, { patch: r, inversePatch: o });
             break;
           case "DELETE":
-            e.deletes.set(n, { patch: null, inversePatch: o });
+            e.deletes.set(s, { patch: null, inversePatch: o });
             break;
         }
     }
@@ -759,13 +777,13 @@ class it extends z {
    * @param actions - 压缩后的变更操作集合
    */
   async mergeChanges(t) {
-    const e = (/* @__PURE__ */ new Date()).toISOString(), s = this.rxdb.context.userId, n = [], a = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map();
-    for (const [l, { inversePatch: p }] of t.deletes) {
-      const [f, h, y] = l.split(":"), g = f ? `${f}.${h}` : h;
-      n.push({
-        namespace: f || "public",
-        entity: h,
-        entityId: y,
+    const e = (/* @__PURE__ */ new Date()).toISOString(), n = this.rxdb.context.userId, s = [], a = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map();
+    for (const [u, { inversePatch: p }] of t.deletes) {
+      const [h, l, m] = u.split(":"), w = h ? `${h}.${l}` : l;
+      s.push({
+        namespace: h || "public",
+        entity: l,
+        entityId: m,
         type: "DELETE",
         patch: null,
         inversePatch: p,
@@ -773,55 +791,55 @@ class it extends z {
         createdAt: e,
         updatedAt: e
       });
-      const w = r.get(g) ?? [];
-      w.push(y), r.set(g, w);
+      const y = r.get(w) ?? [];
+      y.push(m), r.set(w, y);
     }
-    for (const [l, { patch: p, inversePatch: f }] of t.updates) {
-      const [h, y, g] = l.split(":"), w = h ? `${h}.${y}` : y;
-      n.push({
-        namespace: h || "public",
-        entity: y,
-        entityId: g,
+    for (const [u, { patch: p, inversePatch: h }] of t.updates) {
+      const [l, m, w] = u.split(":"), y = l ? `${l}.${m}` : m;
+      s.push({
+        namespace: l || "public",
+        entity: m,
+        entityId: w,
         type: "UPDATE",
         patch: p,
-        inversePatch: f,
+        inversePatch: h,
         clientId: this.rxdb.context.clientId,
         createdAt: e,
         updatedAt: e
       });
-      const x = a.get(w) ?? [], _ = { id: g, ...p };
-      s && (_.updatedBy = s), x.push(_), a.set(w, x);
+      const b = a.get(y) ?? [], E = { id: w, ...p };
+      n && (E.updatedBy = n), b.push(E), a.set(y, b);
     }
-    for (const [l, { patch: p, inversePatch: f }] of t.inserts) {
-      const [h, y, g] = l.split(":"), w = h ? `${h}.${y}` : y;
-      n.push({
-        namespace: h || "public",
-        entity: y,
-        entityId: g,
+    for (const [u, { patch: p, inversePatch: h }] of t.inserts) {
+      const [l, m, w] = u.split(":"), y = l ? `${l}.${m}` : m;
+      s.push({
+        namespace: l || "public",
+        entity: m,
+        entityId: w,
         type: "INSERT",
         patch: p,
-        inversePatch: f,
+        inversePatch: h,
         clientId: this.rxdb.context.clientId,
         createdAt: e,
         updatedAt: e
       });
-      const x = a.get(w) ?? [], _ = { id: g, ...p };
-      s && (_.createdBy = s, _.updatedBy = s), x.push(_), a.set(w, x);
+      const b = a.get(y) ?? [], E = { id: w, ...p };
+      n && (E.createdBy = n, E.updatedBy = n), b.push(E), a.set(y, b);
     }
-    const o = Array.from(a.entries()).map(([l, p]) => {
-      const [f, h] = l.includes(".") ? l.split(".") : ["public", l];
-      return { table: h, schema: f, data: p };
-    }), c = Array.from(r.entries()).map(([l, p]) => {
-      const [f, h] = l.includes(".") ? l.split(".") : ["public", l];
-      return { table: h, schema: f, ids: p };
-    }), { data: d, error: u } = await this.#t.rpc("rxdb_mutations", {
+    const o = Array.from(a.entries()).map(([u, p]) => {
+      const [h, l] = u.includes(".") ? u.split(".") : ["public", u];
+      return { table: l, schema: h, data: p };
+    }), c = Array.from(r.entries()).map(([u, p]) => {
+      const [h, l] = u.includes(".") ? u.split(".") : ["public", u];
+      return { table: l, schema: h, ids: p };
+    }), { data: d, error: f } = await this.#t.rpc("rxdb_mutations", {
       p_upserts: o,
       p_deletes: c,
-      p_changes: n,
+      p_changes: s,
       p_skip_sync: !0
     });
-    if (u)
-      throw new m(`Failed to merge changes: ${u.message}`);
+    if (f)
+      throw new g(`Failed to merge changes: ${f.message}`);
     return d?.max_change_id ?? void 0;
   }
   // ============================================
@@ -844,12 +862,12 @@ class it extends z {
    */
   fetchMetadata(t, e) {
     return D(() => {
-      let s = this.#t.from(t).select("id, updatedAt");
-      return s = $(s, e), k(s).pipe(
-        N(({ data: n, error: a }) => {
+      let n = this.#t.from(t).select("id, updatedAt");
+      return n = x(n, e), N(n).pipe(
+        k(({ data: s, error: a }) => {
           if (a)
-            throw new m(`Failed to fetch metadata: ${a.message}`);
-          return (n ?? []).map((r) => ({
+            throw new g(`Failed to fetch metadata: ${a.message}`);
+          return (s ?? []).map((r) => ({
             id: r.id,
             updatedAt: r.updatedAt
           }));
@@ -865,11 +883,11 @@ class it extends z {
    * @returns Observable<T[]>
    */
   findByIds(t, e) {
-    return D(() => e.length === 0 ? Q([]) : k(this.#t.from(t).select("*").in("id", e)).pipe(
-      N(({ data: s, error: n }) => {
-        if (n)
-          throw new m(`Failed to find by ids: ${n.message}`);
-        return s ?? [];
+    return D(() => e.length === 0 ? Q([]) : N(this.#t.from(t).select("*").in("id", e)).pipe(
+      k(({ data: n, error: s }) => {
+        if (s)
+          throw new g(`Failed to find by ids: ${s.message}`);
+        return n ?? [];
       })
     ));
   }
@@ -882,22 +900,22 @@ class it extends z {
   }
   /** 执行 upsert（非事务） */
   async executeUpsert(t) {
-    const e = [], s = this.rxdb.context.userId;
-    for (const [n, a] of t) {
-      const r = b(n), o = this.getSchemaClient(r.namespace), c = Array.from(a), d = s ? c.map((p) => ({ ...p, createdBy: s, updatedBy: s })) : c, { data: u, error: l } = await o.from(r.name).upsert(d).select();
-      if (l)
-        throw new m(`Failed to upsert: ${l.message}`);
-      e.push(...u);
+    const e = [], n = this.rxdb.context.userId;
+    for (const [s, a] of t) {
+      const r = _(s), o = this.getSchemaClient(r.namespace), c = Array.from(a), d = n ? c.map((p) => ({ ...p, createdBy: n, updatedBy: n })) : c, { data: f, error: u } = await o.from(r.name).upsert(d).select();
+      if (u)
+        throw new g(`Failed to upsert: ${u.message}`);
+      e.push(...f);
     }
     return e;
   }
   /** 执行 delete（非事务） */
   async executeDelete(t) {
     const e = [];
-    for (const [s, n] of t) {
-      const a = b(s), r = this.getSchemaClient(a.namespace), o = Array.from(n), c = o.map((u) => u.id), { error: d } = await r.from(a.name).delete().in("id", c);
+    for (const [n, s] of t) {
+      const a = _(n), r = this.getSchemaClient(a.namespace), o = Array.from(s), c = o.map((f) => f.id), { error: d } = await r.from(a.name).delete().in("id", c);
       if (d)
-        throw new m(`Failed to delete: ${d.message}`);
+        throw new g(`Failed to delete: ${d.message}`);
       e.push(...o);
     }
     return e;
@@ -910,20 +928,20 @@ class it extends z {
    * @returns 满足条件的 entityId 列表
    */
   async #n(t, e) {
-    let s = this.#t.from(t).select("id");
-    s = $(s, e);
-    const { data: n, error: a } = await s;
+    let n = this.#t.from(t).select("id");
+    n = x(n, e);
+    const { data: s, error: a } = await n;
     if (a)
-      throw new m(`Failed to query filtered entities: ${a.message}`);
-    return (n ?? []).map((r) => r.id);
+      throw new g(`Failed to query filtered entities: ${a.message}`);
+    return (s ?? []).map((r) => r.id);
   }
 }
 export {
   tt as ADAPTER_NAME,
   it as RxDBAdapterSupabase,
-  at as SupabaseConfigError,
-  m as SupabaseDataError,
-  rt as SupabaseNetworkError,
+  rt as SupabaseConfigError,
+  g as SupabaseDataError,
+  at as SupabaseNetworkError,
   P as SupabaseRepository,
   S as SupabaseSyncError,
   q as SupabaseTreeRepository

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiao/rxdb-adapter-supabase",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -28,14 +28,14 @@
     ]
   },
   "peerDependencies": {
-    "@supabase/supabase-js": "^2.88.0",
     "@supabase/postgrest-js": "^2.89.0",
+    "@supabase/supabase-js": "^2.88.0",
     "rxjs": "^7.8.2",
-    "@aiao/rxdb": "0.0.10"
+    "@aiao/rxdb": "0.0.12"
   },
   "devDependencies": {
-    "dotenv": "^17.2.3",
-    "@aiao/rxdb-adapter-sqlite": "0.0.10",
-    "@aiao/rxdb-test": "0.0.10"
+    "dotenv": "^17.3.1",
+    "@aiao/rxdb-test": "0.0.12",
+    "@aiao/rxdb-adapter-sqlite": "0.0.12"
   }
 }