@aiao/rxdb 0.0.14 → 0.0.16

package/dist/index.js

@@ -1,7 +1,6 @@
-import { isFunction as Bt, isArray as Rn, orderBy as Cn, get as In, isEqual as Dt, once as S, performChunk as Tn, pick as An, isSymbol as Sn, nextMicroTask as Mn, createBroadcastTopic as On, LeaderElection as xn, needArray as Nn, isNil as mt, deepFreeze as Pn, isPromise as $n } from "@aiao/utils";
-import { v7 as Bn } from "uuid";
-import Lt from "object-hash";
-import { finalize as Ft, forkJoin as Dn, concat as Ln, of as Q, EMPTY as Fn, BehaviorSubject as J, ReplaySubject as Un, takeUntil as jn, distinctUntilChanged as Fe, tap as k, switchMap as x, Observable as Ut, map as $, shareReplay as P, firstValueFrom as L, Subject as Yn, defer as ae, combineLatest as Ne, filter as Ce } from "rxjs";
+import { isFunction as Dt, isArray as Cn, orderBy as In, get as An, isEqual as Lt, once as S, performChunk as Tn, pick as Sn, isSymbol as Mn, nextMicroTask as On, createBroadcastTopic as xn, LeaderElection as Nn, needArray as Pn, isNil as gt, deepFreeze as $n, isPromise as Bn } from "@aiao/utils";
+import { v7 as Dn } from "uuid";
+import { finalize as Ft, forkJoin as Ln, concat as Fn, of as Q, EMPTY as Un, BehaviorSubject as J, ReplaySubject as jn, takeUntil as Yn, distinctUntilChanged as Ue, tap as k, switchMap as x, Observable as Ut, map as $, shareReplay as P, firstValueFrom as L, Subject as zn, defer as ae, combineLatest as Pe, filter as Ie } from "rxjs";
 class R extends Error {
   constructor(e) {
     super(e), this.name = "RxDBError", Object.setPrototypeOf(this, R.prototype);
@@ -13,56 +12,56 @@ class et extends R {
     super(`NetworkOfflineError: ${e.message}`), this.name = "NetworkOfflineError", this.originalError = e, Object.setPrototypeOf(this, et.prototype);
   }
 }
-const zn = "ENTITY_LOCAL_NEW", ne = "ENTITY_LOCAL_CREATE", oe = "ENTITY_LOCAL_UPDATE", ce = "ENTITY_LOCAL_REMOVE", Ue = "ENTITY_REMOTE_CREATE", je = "ENTITY_REMOTE_UPDATE", Ye = "ENTITY_REMOTE_REMOVE", tt = "TRANSACTION_BEGIN", nt = "TRANSACTION_COMMIT", rt = "TRANSACTION_ROLLBACK", kn = "SWITCH_BRANCH_BEGIN", Wn = "SWITCH_BRANCH_COMMIT", Kn = "SWITCH_BRANCH_ROLLBACK", Hn = "SYNC_BEGIN", qn = "SYNC_COMPLETE", Vn = "SYNC_ERROR", Vi = "REMOTE_CHANGES_PENDING", Gn = "CONFLICT_DETECTED", Qn = "CONFLICT_PENDING", Jn = "REPOSITORY_SYNC_BEGIN", jt = "REPOSITORY_SYNC_COMPLETE", Xn = "REPOSITORY_SYNC_ERROR";
-class Zn {
+const kn = "ENTITY_LOCAL_NEW", ne = "ENTITY_LOCAL_CREATE", oe = "ENTITY_LOCAL_UPDATE", ce = "ENTITY_LOCAL_REMOVE", je = "ENTITY_REMOTE_CREATE", Ye = "ENTITY_REMOTE_UPDATE", ze = "ENTITY_REMOTE_REMOVE", tt = "TRANSACTION_BEGIN", nt = "TRANSACTION_COMMIT", rt = "TRANSACTION_ROLLBACK", Wn = "SWITCH_BRANCH_BEGIN", Hn = "SWITCH_BRANCH_COMMIT", Kn = "SWITCH_BRANCH_ROLLBACK", qn = "MERGE_BRANCH_BEGIN", Gn = "MERGE_BRANCH_COMMIT", Vn = "MERGE_BRANCH_ROLLBACK", Qn = "SYNC_BEGIN", Jn = "SYNC_COMPLETE", Xn = "SYNC_ERROR", ea = "REMOTE_CHANGES_PENDING", Zn = "CONFLICT_DETECTED", er = "CONFLICT_PENDING", tr = "REPOSITORY_SYNC_BEGIN", jt = "REPOSITORY_SYNC_COMPLETE", nr = "REPOSITORY_SYNC_ERROR";
+class rr {
   constructor(e) {
     this.entities = e;
   }
-  type = zn;
+  type = kn;
 }
-class Gi {
+class ta {
   constructor(e) {
     this.entities = e;
   }
   type = ne;
 }
-class Qi {
+class na {
   constructor(e) {
     this.entities = e;
   }
   type = oe;
 }
-class Ji {
+class ra {
   constructor(e) {
     this.entities = e;
   }
   type = ce;
 }
-class Xi {
+class sa {
   constructor(e) {
     this.entities = e;
   }
-  type = Ue;
+  type = je;
 }
-class Zi {
+class ia {
   constructor(e) {
     this.entities = e;
   }
-  type = je;
+  type = Ye;
 }
-class ea {
+class aa {
   constructor(e) {
     this.entities = e;
   }
-  type = Ye;
+  type = ze;
 }
-class ta {
+class oa {
   type = tt;
 }
-class na {
+class ca {
   type = nt;
 }
-class ra {
+class la {
   type = rt;
 }
 class st {
@@ -70,79 +69,99 @@ class st {
     this.branchName = e;
   }
 }
-class er extends st {
-  type = kn;
-}
-class tr extends st {
+class sr extends st {
   type = Wn;
 }
-class nr extends st {
+class ir extends st {
+  type = Hn;
+}
+class ar extends st {
   type = Kn;
 }
+class it {
+  constructor(e, t) {
+    this.sourceBranch = e, this.targetBranch = t;
+  }
+}
+class or extends it {
+  type = qn;
+}
+class cr extends it {
+  type = Gn;
+}
+class lr extends it {
+  type = Vn;
+}
 class Yt {
   constructor(e) {
     this.direction = e;
   }
-  type = Hn;
+  type = Qn;
 }
 class zt {
   constructor(e, t) {
     this.direction = e, this.result = t;
   }
-  type = qn;
+  type = Jn;
 }
 class kt {
   constructor(e, t) {
     this.direction = e, this.error = t;
   }
-  type = Vn;
+  type = Xn;
 }
-class sa {
+class ua {
   constructor(e, t, n) {
     this.conflicts = e, this.resolved = t, this.deferred = n;
   }
-  type = Gn;
+  type = Zn;
 }
-class ia {
+class da {
   constructor(e) {
     this.conflicts = e;
   }
-  type = Qn;
+  type = er;
 }
-class it {
+class at {
   constructor(e, t, n, s) {
     this.direction = e, this.namespace = t, this.entity = n, this.includeRelated = s;
   }
-  type = Jn;
+  type = tr;
 }
-class at {
+class ot {
   constructor(e, t, n, s) {
     this.direction = e, this.namespace = t, this.entity = n, this.result = s;
   }
   type = jt;
 }
-class ot {
+class ct {
   constructor(e, t, n, s) {
     this.direction = e, this.namespace = t, this.entity = n, this.error = s;
   }
-  type = Xn;
+  type = nr;
 }
-const Wt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMetadata"), Kt = /* @__PURE__ */ Symbol("ɵStatus"), ke = /* @__PURE__ */ Symbol("ɵEntityManager"), We = /* @__PURE__ */ Symbol("ɵEntityType"), rr = (r, e) => e.sync.local?.adapter === r, sr = (r) => [tt, nt, rt].includes(r.type), I = (r) => r[ze] || r.constructor[ze], aa = (r) => r[We] || r.constructor[We], O = (r) => r && r[Kt], oa = (r) => r && !!O(r), ca = (r, e, t, n) => {
+const Wt = /* @__PURE__ */ Symbol("ɵProxy"), ke = /* @__PURE__ */ Symbol("ɵMetadata"), Ht = /* @__PURE__ */ Symbol("ɵStatus"), We = /* @__PURE__ */ Symbol("ɵEntityManager"), He = /* @__PURE__ */ Symbol("ɵEntityType"), ur = (r, e) => e.sync.local?.adapter === r, dr = (r) => [tt, nt, rt].includes(r.type), I = (r) => {
+  const e = r;
+  return e[ke] || e.constructor[ke];
+}, ha = (r) => {
+  const e = r;
+  return e[He] || e.constructor[He];
+}, O = (r) => r && r[Ht], pa = (r) => r && !!O(r), fa = (r, e, t, n) => {
   let s = n > 1 ? void 0 : n ? Object.getOwnPropertyDescriptor(e, t) : e;
   for (let i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
-}, Ht = () => Bn(), ir = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"], ar = ["rev"], la = (r) => !!(ir.includes(r) || ar.includes(r) || r.startsWith("_")), M = (r, e, t) => Object.defineProperty(r, e, {
+}, Kt = () => Dn(), hr = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"], pr = ["rev"], ya = (r) => !!(hr.includes(r) || pr.includes(r) || r.startsWith("_")), M = (r, e, t) => Object.defineProperty(r, e, {
   value: t,
   enumerable: !1,
   configurable: !1,
   writable: !1
-}), or = (r, e, t) => Object.defineProperty(r, e, {
+}), fr = (r, e, t) => Object.defineProperty(r, e, {
   value: t,
   enumerable: !1,
   configurable: !1,
   writable: !0
-}), he = (r, e, t) => {
+}), pe = (r, e, t) => {
   let n;
   const s = {
     get: () => (n = t(), s.get = () => n, n),
@@ -150,18 +169,18 @@ const Wt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMet
     configurable: !1
   };
   return Object.defineProperty(r, e, s);
-}, cr = (r, e) => {
+}, yr = (r, e) => {
   const t = {};
   let n = !1;
   r.defaultValueProperties.forEach((s) => {
-    e[s.name] === void 0 && (n = !0, Bt(s.default) ? t[s.name] = s.default() : t[s.name] = s.default);
+    e[s.name] === void 0 && (n = !0, Dt(s.default) ? t[s.name] = s.default() : t[s.name] = s.default);
   }), n && Object.assign(e, t);
-}, lr = (r, e, t) => {
+}, mr = (r, e, t) => {
   const { propertyMap: n, foreignKeyNames: s } = I(e);
   Object.keys(t).forEach((i) => {
     n.has(i) ? r.propertyMap.get(i)?.readonly !== !0 && (e[i] = t[i]) : s.includes(i) && (e[i] = t[i]);
   });
-}, gt = (r) => {
+}, _t = (r) => {
   const e = /* @__PURE__ */ new Set(), t = (s) => {
     const a = O(s).getNeedSaveEntities();
     a.length && n(a);
@@ -169,14 +188,14 @@ const Wt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMet
     e.add(i), t(i);
   });
   return n(r), Array.from(e).filter((s) => O(s).modified);
-}, ur = (r) => {
+}, gr = (r) => {
   const e = /* @__PURE__ */ new Set(), t = (n) => {
     O(n).getNeedRemoveEntities().forEach((a) => {
       e.has(a) || (e.add(a), t(a));
     });
   };
   return r.forEach((n) => t(n)), Array.from(e).filter((n) => O(n).local);
-}, Pe = (r) => {
+}, $e = (r) => {
   const { need_save_entities: e, need_remove_entities: t } = r, n = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
   for (let a = 0; a < e.length; a++) {
     const o = e[a];
@@ -193,27 +212,27 @@ const Wt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMet
     update: s
   };
 };
-var C = /* @__PURE__ */ ((r) => (r.uuid = "uuid", r.string = "string", r.enum = "enum", r.number = "number", r.integer = "integer", r.boolean = "boolean", r.date = "date", r.stringArray = "stringArray", r.numberArray = "numberArray", r.keyValue = "keyValue", r.json = "json", r))(C || {}), T = /* @__PURE__ */ ((r) => (r.ONE_TO_ONE = "1:1", r.ONE_TO_MANY = "1:m", r.MANY_TO_ONE = "m:1", r.MANY_TO_MANY = "m:n", r))(T || {}), W = /* @__PURE__ */ ((r) => (r.NO_ACTION = "NO ACTION", r.RESTRICT = "RESTRICT", r.CASCADE = "CASCADE", r.SET_NULL = "SET NULL", r.SET_DEFAULT = "SET DEFAULT", r))(W || {}), qt = /* @__PURE__ */ ((r) => (r.NO_ACTION = "NO ACTION", r.RESTRICT = "RESTRICT", r.CASCADE = "CASCADE", r.SET_NULL = "SET NULL", r.SET_DEFAULT = "SET DEFAULT", r))(qt || {}), fe = /* @__PURE__ */ ((r) => (r.Full = "full", r.Filter = "filter", r.QueryCache = "QueryCache", r.None = "none", r))(fe || {});
-const dr = (r, e, t = !1) => {
-  const n = hr(e, t);
+var C = /* @__PURE__ */ ((r) => (r.uuid = "uuid", r.string = "string", r.enum = "enum", r.number = "number", r.integer = "integer", r.boolean = "boolean", r.date = "date", r.stringArray = "stringArray", r.numberArray = "numberArray", r.keyValue = "keyValue", r.json = "json", r))(C || {}), A = /* @__PURE__ */ ((r) => (r.ONE_TO_ONE = "1:1", r.ONE_TO_MANY = "1:m", r.MANY_TO_ONE = "m:1", r.MANY_TO_MANY = "m:n", r))(A || {}), W = /* @__PURE__ */ ((r) => (r.NO_ACTION = "NO ACTION", r.RESTRICT = "RESTRICT", r.CASCADE = "CASCADE", r.SET_NULL = "SET NULL", r.SET_DEFAULT = "SET DEFAULT", r))(W || {}), qt = /* @__PURE__ */ ((r) => (r.NO_ACTION = "NO ACTION", r.RESTRICT = "RESTRICT", r.CASCADE = "CASCADE", r.SET_NULL = "SET NULL", r.SET_DEFAULT = "SET DEFAULT", r))(qt || {}), ye = /* @__PURE__ */ ((r) => (r.Full = "full", r.Filter = "filter", r.QueryCache = "QueryCache", r.None = "none", r))(ye || {});
+const _r = (r, e, t = !1) => {
+  const n = br(e, t);
   return {
     onDelete: r.onDelete ?? n.onDelete,
     onUpdate: r.onUpdate ?? n.onUpdate
   };
-}, hr = (r, e = !1) => {
+}, br = (r, e = !1) => {
   const t = qt.RESTRICT;
   switch (r) {
-    case T.ONE_TO_ONE:
+    case A.ONE_TO_ONE:
       return {
         onDelete: W.CASCADE,
         onUpdate: t
       };
-    case T.ONE_TO_MANY:
+    case A.ONE_TO_MANY:
       return {
         onDelete: W.CASCADE,
         onUpdate: t
       };
-    case T.MANY_TO_ONE:
+    case A.MANY_TO_ONE:
       return e ? {
         onDelete: W.SET_NULL,
         onUpdate: t
@@ -221,7 +240,7 @@ const dr = (r, e, t = !1) => {
         onDelete: W.RESTRICT,
         onUpdate: t
       };
-    case T.MANY_TO_MANY:
+    case A.MANY_TO_MANY:
       return {
         onDelete: W.RESTRICT,
         onUpdate: t
@@ -232,16 +251,16 @@ const dr = (r, e, t = !1) => {
         onUpdate: t
       };
   }
-}, pr = (r) => r.kind !== T.ONE_TO_MANY, fr = (r, e) => {
+}, wr = (r) => r.kind !== A.ONE_TO_MANY, vr = (r, e) => {
   const t = [];
   t.push(r);
   const n = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = { ...r };
   if (o.repository = o.repository || "Repository", o.namespace = o.namespace || "public", o.properties = o.properties || [], o.relations = o.relations || [], o.indexes = o.indexes || [], o.computedProperties = o.computedProperties || [], e) {
-    if (Bt(e)) {
+    if (Dt(e)) {
       let u = e, d = r;
       for (; u !== Object.prototype && d; )
         u = Object.getPrototypeOf(u), d = I(u), d && t.push(d);
-    } else Rn(e) ? t.push(...e) : t.push(e);
+    } else Cn(e) ? t.push(...e) : t.push(e);
     const c = t.map((u) => u.name);
     c.shift(), o.extends = c;
   }
@@ -252,7 +271,7 @@ const dr = (r, e, t = !1) => {
       u.columnName || (u.columnName = u.name), s.set(u.name, u);
     }), c.relations?.forEach((u) => {
       u.mappedNamespace = u.mappedNamespace || "public";
-      const d = "nullable" in u ? u.nullable ?? !1 : !1, h = dr(
+      const d = "nullable" in u ? u.nullable ?? !1 : !1, p = _r(
         {
           onDelete: u.onDelete,
           onUpdate: u.onUpdate
@@ -260,9 +279,9 @@ const dr = (r, e, t = !1) => {
         u.kind,
         d
       );
-      if (u.onDelete = h.onDelete, u.onUpdate = h.onUpdate, pr(u) && !u.columnName && (u.columnName = u.name + "Id"), u.mappedEntity === c.name && u.mappedNamespace === c.namespace) {
-        const p = { ...u };
-        p.mappedEntity = o.name, p.mappedNamespace = o.namespace, i.set(u.name, p);
+      if (u.onDelete = p.onDelete, u.onUpdate = p.onUpdate, wr(u) && !u.columnName && (u.columnName = u.name + "Id"), u.mappedEntity === c.name && u.mappedNamespace === c.namespace) {
+        const h = { ...u };
+        h.mappedEntity = o.name, h.mappedNamespace = o.namespace, i.set(u.name, h);
       } else
         i.set(u.name, u);
     }), c.indexes?.forEach((u) => a.set(u.name, u));
@@ -270,20 +289,20 @@ const dr = (r, e, t = !1) => {
   const l = /* @__PURE__ */ new Map();
   return n.forEach((c, u) => {
     l.set(c.columnName, u);
-  }), M(o, "columnNameToPropertyName", l), he(
+  }), M(o, "columnNameToPropertyName", l), pe(
     o,
     "defaultValueProperties",
     () => Array.from(n.values()).filter((c) => c.default !== void 0)
-  ), he(
+  ), pe(
     o,
     "foreignKeyRelations",
     () => Array.from(o.relationMap.values()).filter(
-      (c) => c.kind === T.MANY_TO_ONE || c.kind === T.ONE_TO_ONE
+      (c) => c.kind === A.MANY_TO_ONE || c.kind === A.ONE_TO_ONE
     )
-  ), he(o, "foreignKeyRelationMap", () => {
+  ), pe(o, "foreignKeyRelationMap", () => {
     const c = /* @__PURE__ */ new Map();
     return o.foreignKeyRelations.forEach((u) => c.set(`${u.name}Id`, u)), c;
-  }), he(o, "foreignKeyNames", () => o.foreignKeyRelations.map((c) => `${c.name}Id`)), he(
+  }), pe(o, "foreignKeyNames", () => o.foreignKeyRelations.map((c) => `${c.name}Id`)), pe(
     o,
     "foreignKeyColumnNames",
     () => o.foreignKeyRelations.filter((c) => !!c.columnName).map((c) => c.columnName)
@@ -293,8 +312,8 @@ const dr = (r, e, t = !1) => {
     (c) => c && c.endsWith("Id") && o.foreignKeyNames.includes(c)
   ), o;
 }, ie = (r) => (e) => {
-  const t = fr(r, e);
-  if (M(e, ze, t), r.abstract) return e;
+  const t = vr(r, e);
+  if (M(e, ke, t), r.abstract) return e;
   const n = e;
   return class extends n {
     /**
@@ -310,12 +329,12 @@ const dr = (r, e, t = !1) => {
      */
     constructor(s) {
       super(s);
-      const i = this[ke];
+      const i = this[We];
       if (!i) throw new R("need init rxdb");
-      return cr(t, this), s && lr(t, this, s), i[Wt](this);
+      return yr(t, this), s && mr(t, this, s), i[Wt](this);
     }
   };
-}, yr = (r) => {
+}, Er = (r) => {
   const e = r.features?.tree ?? {};
   return ie({
     ...r,
@@ -329,13 +348,13 @@ const dr = (r, e, t = !1) => {
     },
     repository: r.repository ?? "TreeRepository"
   });
-}, ct = /* @__PURE__ */ Symbol("ɵEntityStaticTypes");
-var mr = Object.getOwnPropertyDescriptor, gr = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? mr(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+}, lt = /* @__PURE__ */ Symbol("ɵEntityStaticTypes");
+var Rr = Object.getOwnPropertyDescriptor, Cr = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? Rr(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
-const _r = {
+const Ir = {
   name: "EntityBase",
   abstract: !0,
   // 标记为抽象类，不会直接创建此类的实例
@@ -350,7 +369,7 @@ const _r = {
       // 唯一索引
       readonly: !0,
       // 创建后不可修改
-      default: () => Ht()
+      default: () => Kt()
       // 默认生成 UUID
     },
     {
@@ -383,7 +402,7 @@ const _r = {
     }
   ]
 };
-let Ie = class {
+let Ae = class {
   /**
    * 实体唯一标识符
    * 自动生成的UUID，作为主键
@@ -419,15 +438,15 @@ let Ie = class {
   constructor(r) {
   }
 };
-Ie = gr([
-  ie(_r)
-], Ie);
-var br = Object.getOwnPropertyDescriptor, wr = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? br(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+Ae = Cr([
+  ie(Ir)
+], Ae);
+var Ar = Object.getOwnPropertyDescriptor, Tr = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? Ar(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
-const vr = {
+const Sr = {
   name: "TreeAdjacencyListEntityBase",
   abstract: !0,
   // 标记为抽象类，不会直接创建此类的实例
@@ -447,7 +466,7 @@ const vr = {
       name: "children",
       // 子节点关系名称
       displayName: "子节点",
-      kind: T.ONE_TO_MANY,
+      kind: A.ONE_TO_MANY,
       // 一对多关系
       mappedEntity: "TreeAdjacencyListEntityBase",
       // 关联到同一实体类型
@@ -460,7 +479,7 @@ const vr = {
       columnName: "parentId",
       // 外键列名
       displayName: "父节点",
-      kind: T.MANY_TO_ONE,
+      kind: A.MANY_TO_ONE,
       // 多对一关系
       mappedEntity: "TreeAdjacencyListEntityBase",
       // 关联到同一实体类型
@@ -481,16 +500,16 @@ const vr = {
     }
   }
 };
-let _t = class extends Ie {
+let bt = class extends Ae {
   /**
    * 父节点ID
    */
   parentId;
 };
-_t = wr([
-  ie(vr)
-], _t);
-const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r) => r.operator === "exists" || r.operator === "notExists", Cr = (r, e) => {
+bt = Tr([
+  ie(Sr)
+], bt);
+const Gt = (r) => !!(r && r.combinator), Mr = (r) => !!(r && r.field), Or = (r) => r.operator === "exists" || r.operator === "notExists", xr = (r, e) => {
   const t = Reflect.get(e, r.field), { operator: n } = r;
   switch (n) {
     case "in":
@@ -520,7 +539,7 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
     }
     case "=":
     case "!=": {
-      const { value: s } = r, i = Dt(s, t);
+      const { value: s } = r, i = Lt(s, t);
       return n === "=" ? i : !i;
     }
     case ">":
@@ -543,7 +562,7 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
     }
     case "exists":
     case "notExists": {
-      const s = Rr(r) ? r.where : void 0;
+      const s = Or(r) ? r.where : void 0;
       if (Array.isArray(t)) {
         let i = t;
         s && (i = t.filter((o) => Y(o, s)));
@@ -562,13 +581,13 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
       throw new R(`Unknown operator: ${n}`);
   }
 }, Ke = (r, e) => {
-  if (Vt(r)) {
+  if (Gt(r)) {
     const { combinator: t, rules: n } = r;
     return t === "and" ? n.every((s) => Ke(s, e)) : n.some((s) => Ke(s, e));
   } else
-    return Cr(r, e);
-}, Y = (r, e) => r == null ? !1 : Ke(e, r), Ir = (r, e, t) => {
-  const { field: n, sort: s } = t, i = In(r, n);
+    return xr(r, e);
+}, Y = (r, e) => r == null ? !1 : Ke(e, r), Nr = (r, e, t) => {
+  const { field: n, sort: s } = t, i = An(r, n);
   if (s === "asc") {
     if (e.some((l) => i < Reflect.get(l, n))) return !0;
     if (e.every((l) => i > Reflect.get(l, n))) return !1;
@@ -576,10 +595,10 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
     if (e.some((l) => i > Reflect.get(l, n))) return !0;
     if (e.every((l) => i < Reflect.get(l, n))) return !1;
   }
-}, Tr = (r, e, t) => {
+}, Pr = (r, e, t) => {
   if (!t || t.length === 0 || e.length === 0 || !r) return !0;
   for (let n = 0; n < t.length; n++) {
-    const s = t[n], i = Ir(r, e, s);
+    const s = t[n], i = Nr(r, e, s);
     if (i === void 0) {
       const { field: a } = s, o = Reflect.get(r, a);
       e = e.filter((l) => Reflect.get(l, a) === o);
@@ -590,28 +609,24 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
   const t = [], n = [];
   return e.forEach((s) => {
     t.push(s.field), n.push(s.sort);
-  }), Cn(r, t, n);
-}, me = (r, e, t) => {
-  const n = bt(r, t);
+  }), In(r, t, n);
+}, ge = (r, e, t) => {
+  const n = wt(r, t);
   return {
-    refresh: n === !1 && bt(r, e),
+    refresh: n === !1 && wt(r, e),
     recalculate: n
   };
-}, bt = (r, e) => e.some((t) => t.every((n) => r[n]())), Ar = (r, e, t, n, s) => {
+}, wt = (r, e) => e.some((t) => t.every((n) => r[n]())), $r = (r, e, t, n, s) => {
   const i = t.slice(0, n);
   let a = e;
   for (const o of i) {
     if (!a?.relationMap.has(o))
       return !1;
     const l = a.relationMap.get(o), c = r.schemaManager.getEntityType(l.mappedEntity, l.mappedNamespace);
-    if (c && s.add(c), l.kind === T.MANY_TO_MANY) {
-      const u = l.junctionEntityType;
-      u && s.add(u);
-    }
-    a = r.schemaManager.getEntityMetadata(l.mappedEntity, l.mappedNamespace);
+    c && s.add(c), l.kind === A.MANY_TO_MANY && l.junctionEntityType && s.add(l.junctionEntityType), a = r.schemaManager.getEntityMetadata(l.mappedEntity, l.mappedNamespace);
   }
   return a !== void 0;
-}, Sr = (r, e, t, n) => {
+}, Br = (r, e, t, n) => {
   const s = t.split(".");
   try {
     const i = r.schemaManager.getFieldRelations(e, t);
@@ -619,7 +634,7 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
       return;
     i.relations.forEach(({ relation: a }) => {
       const o = r.schemaManager.getEntityType(a.mappedEntity, a.mappedNamespace);
-      if (o && n.add(o), a.kind === T.MANY_TO_MANY) {
+      if (o && n.add(o), a.kind === A.MANY_TO_MANY) {
         const l = a.junctionEntityType;
         l && n.add(l);
       }
@@ -636,7 +651,7 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
   for (let i = s.length - 1; i > 0; i--) {
     const a = s.slice(i);
     if (a.length === 0) continue;
-    if (Ar(r, e, s, i, n)) {
+    if ($r(r, e, s, i, n)) {
       const l = s.slice(0, i);
       let c = e;
       for (const u of l) {
@@ -650,7 +665,7 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
       }
     }
   }
-}, lt = (r, e, t, n) => {
+}, ut = (r, e, t, n) => {
   n.add(t);
   const s = I(t), i = (a) => {
     if (a.rules)
@@ -663,10 +678,10 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
         if (u === "exists" || u === "notExists") {
           const d = s.relationMap.get(c);
           if (d) {
-            const h = r.schemaManager.getEntityType(d.mappedEntity, d.mappedNamespace);
-            if (h && n.add(h), d.kind === T.MANY_TO_MANY) {
-              const p = d.junctionEntityType;
-              p && n.add(p);
+            const p = r.schemaManager.getEntityType(d.mappedEntity, d.mappedNamespace);
+            if (p && n.add(p), d.kind === A.MANY_TO_MANY) {
+              const h = d.junctionEntityType;
+              h && n.add(h);
             }
             if (l.where && r.schemaManager.getEntityMetadata(
               d.mappedEntity,
@@ -676,14 +691,14 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
                 d.mappedEntity,
                 d.mappedNamespace
               );
-              f && (lt(r, l.where, f, m), m.forEach((y) => n.add(y)));
+              f && (ut(r, l.where, f, m), m.forEach((y) => n.add(y)));
             }
           }
           continue;
         }
         if (c && c.includes("."))
           try {
-            Sr(r, s, c, n);
+            Br(r, s, c, n);
           } catch (d) {
             d instanceof R || console.warn("[entity_type_dependencies] Failed to resolve dotted field:", c, d);
           }
@@ -691,7 +706,7 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
   };
   i(e);
 };
-function Mr(r, e) {
+function Dr(r, e) {
   const { rxdb: t, entityType: n } = r, s = I(n);
   if (!s) return !1;
   const i = t.schemaManager.getEntityMetadata(e.entity, e.namespace);
@@ -699,7 +714,7 @@ function Mr(r, e) {
   const a = r.options?.where;
   if (a) {
     const o = /* @__PURE__ */ new Set();
-    lt(t, a, n, o);
+    ut(t, a, n, o);
     for (const l of o) {
       const c = I(l);
       if (c && c.name === e.entity && c.namespace === e.namespace)
@@ -710,7 +725,7 @@ function Mr(r, e) {
     (o) => o.mappedEntity === s.name && o.mappedNamespace === s.namespace
   );
 }
-function Gt(r, e) {
+function Vt(r, e) {
   const t = I(r.entityType);
   if (!t)
     return {
@@ -719,19 +734,19 @@ function Gt(r, e) {
     };
   const n = [], s = [];
   return e.forEach((i) => {
-    const a = i.entity === t.name && i.namespace === t.namespace, o = Mr(r, i);
+    const a = i.entity === t.name && i.namespace === t.namespace, o = Dr(r, i);
     a ? (n.push(i), o && r.type !== "findByCursor" && s.push(i)) : o && s.push(i);
   }), { current_entities: n, relation_entities: s };
 }
-function Or(r, e) {
+function Lr(r, e) {
   const t = new Set(
     e.relations ? e.relations.map((s) => s.name) : Array.from(e.relationMap?.keys() ?? [])
   ), n = (s) => {
     if (!s) return !1;
     for (const i of s.rules)
-      if (Vt(i)) {
+      if (Gt(i)) {
         if (n(i)) return !0;
-      } else if (Er(i)) {
+      } else if (Mr(i)) {
         const a = i.field;
         if (a.includes(".")) return !0;
         const o = a.split(":")[0];
@@ -742,7 +757,7 @@ function Or(r, e) {
   return n(r);
 }
 const ee = S(() => !0);
-class ut {
+class dt {
   constructor(e, t, n, s = !1) {
     this.task = e, this.current_entities = t, this.hasRelationChanges = n, this.whereUsesRelations = s, this.entityIds = S(() => t.map((i) => i.id));
   }
@@ -838,19 +853,19 @@ class ut {
   buildOrderByRule() {
     const e = "orderBy" in this.task.options ? this.task.options.orderBy : void 0;
     return e ? S(
-      () => this.current_entities.some((t) => Tr(t.patch, Array.from(this.task.resultEntitySet), e))
+      () => this.current_entities.some((t) => Pr(t.patch, Array.from(this.task.resultEntitySet), e))
     ) : ee;
   }
 }
-const $e = S(() => !0), xr = (r, e, t, n) => {
+const Be = S(() => !0), Fr = (r, e, t, n) => {
   if (!I(r.entityType)) {
-    const c = S(() => e.map((_) => _.id)), u = $e, d = $e, h = $e, p = S(() => !1), m = S(() => !0), f = S(() => c().some((_) => r.resultEntitySet?.has(_))), y = S(() => f() === !1);
+    const c = S(() => e.map((_) => _.id)), u = Be, d = Be, p = Be, h = S(() => !1), m = S(() => !0), f = S(() => c().some((_) => r.resultEntitySet?.has(_))), y = S(() => f() === !1);
     return {
-      ...me({
+      ...ge({
         match_where: u,
         not_match_where: d,
-        match_order_by: h,
-        match_relation_where: p,
+        match_order_by: p,
+        match_relation_where: h,
         not_match_relation_where: m,
         result_contains: f,
         result_not_contains: y
@@ -859,19 +874,19 @@ const $e = S(() => !0), xr = (r, e, t, n) => {
       relation_entities: []
     };
   }
-  const { current_entities: i, relation_entities: a } = Gt(r, e), l = new ut(r, i, a.length > 0).buildCreateRules();
+  const { current_entities: i, relation_entities: a } = Vt(r, e), l = new dt(r, i, a.length > 0).buildCreateRules();
   return {
-    ...me(l, t, n),
+    ...ge(l, t, n),
     current_entities: i,
     relation_entities: a
   };
-}, Nr = (r, e, t, n) => {
-  const i = new ut(r, e, !1).buildRemoveRules();
-  return me(i, t, n);
-}, wt = S(() => !0), Pr = (r, e, t, n) => {
+}, Ur = (r, e, t, n) => {
+  const i = new dt(r, e, !1).buildRemoveRules();
+  return ge(i, t, n);
+}, vt = S(() => !0), jr = (r, e, t, n) => {
   const s = I(r.entityType);
   if (!s) {
-    const { options: d, resultEntityIds: h } = r, p = S(() => e.map((E) => E.id)), m = "where" in d ? d.where : void 0, f = m ? S(() => e.some((E) => Y(E.patch, m))) : wt, y = S(() => f() === !1), g = m ? S(() => e.some((E) => Y(E.inversePatch, m))) : wt, _ = S(() => g() === !1), v = S(() => p().some((E) => h.has(E))), b = S(() => v() === !1), w = {
+    const { options: d, resultEntityIds: p } = r, h = S(() => e.map((E) => E.id)), m = "where" in d ? d.where : void 0, f = m ? S(() => e.some((E) => Y(E.patch, m))) : vt, y = S(() => f() === !1), g = m ? S(() => e.some((E) => Y(E.inversePatch, m))) : vt, _ = S(() => g() === !1), v = S(() => h().some((E) => p.has(E))), b = S(() => v() === !1), w = {
       match_where: f,
       not_match_where: y,
       match_where_before: g,
@@ -881,19 +896,19 @@ const $e = S(() => !0), xr = (r, e, t, n) => {
       result_contains: v,
       result_not_contains: b
     };
-    return me(w, t, n);
+    return ge(w, t, n);
   }
-  const { current_entities: i, relation_entities: a } = Gt(r, e), o = "where" in r.options ? r.options.where : void 0;
+  const { current_entities: i, relation_entities: a } = Vt(r, e), o = "where" in r.options ? r.options.where : void 0;
   let l = !1;
-  o && (l = Or(o, s));
-  const u = new ut(r, i, a.length > 0, l).buildUpdateRules();
+  o && (l = Lr(o, s));
+  const u = new dt(r, i, a.length > 0, l).buildUpdateRules();
   return {
-    ...me(u, t, n),
+    ...ge(u, t, n),
     current_entities: i,
     relation_entities: a
   };
 };
-function $r(r, e) {
+function Yr(r, e) {
   const t = [], n = [], s = [], i = /* @__PURE__ */ new Set();
   for (const o of r) {
     const l = e.get(o.id);
@@ -907,12 +922,12 @@ function $r(r, e) {
 function F(r) {
   return typeof r == "function";
 }
-function Br(r) {
+function zr(r) {
   return F(r?.lift);
 }
-function we(r) {
+function ve(r) {
   return function(e) {
-    if (Br(e))
+    if (zr(e))
       return e.lift(function(t) {
         try {
           return r(t, this);
@@ -923,23 +938,23 @@ function we(r) {
     throw new TypeError("Unable to lift unknown Observable type");
   };
 }
-var He = function(r, e) {
-  return He = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(t, n) {
+var qe = function(r, e) {
+  return qe = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(t, n) {
     t.__proto__ = n;
   } || function(t, n) {
     for (var s in n) Object.prototype.hasOwnProperty.call(n, s) && (t[s] = n[s]);
-  }, He(r, e);
+  }, qe(r, e);
 };
-function de(r, e) {
+function he(r, e) {
   if (typeof e != "function" && e !== null)
     throw new TypeError("Class extends value " + String(e) + " is not a constructor or null");
-  He(r, e);
+  qe(r, e);
   function t() {
     this.constructor = r;
   }
   r.prototype = e === null ? Object.create(e) : (t.prototype = e.prototype, new t());
 }
-function Dr(r, e, t, n) {
+function kr(r, e, t, n) {
   function s(i) {
     return i instanceof t ? i : new t(function(a) {
       a(i);
@@ -1053,7 +1068,7 @@ function Te(r, e) {
   }
   return i;
 }
-function Ae(r, e, t) {
+function Se(r, e, t) {
   if (t || arguments.length === 2) for (var n = 0, s = e.length, i; n < s; n++)
     (i || !(n in e)) && (i || (i = Array.prototype.slice.call(e, 0, n)), i[n] = e[n]);
   return r.concat(i || Array.prototype.slice.call(e));
@@ -1061,45 +1076,45 @@ function Ae(r, e, t) {
 function le(r) {
   return this instanceof le ? (this.v = r, this) : new le(r);
 }
-function Lr(r, e, t) {
+function Wr(r, e, t) {
   if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
   var n = t.apply(r, e || []), s, i = [];
   return s = Object.create((typeof AsyncIterator == "function" ? AsyncIterator : Object).prototype), o("next"), o("throw"), o("return", a), s[Symbol.asyncIterator] = function() {
     return this;
   }, s;
-  function a(p) {
+  function a(h) {
     return function(m) {
-      return Promise.resolve(m).then(p, d);
+      return Promise.resolve(m).then(h, d);
     };
   }
-  function o(p, m) {
-    n[p] && (s[p] = function(f) {
+  function o(h, m) {
+    n[h] && (s[h] = function(f) {
       return new Promise(function(y, g) {
-        i.push([p, f, y, g]) > 1 || l(p, f);
+        i.push([h, f, y, g]) > 1 || l(h, f);
       });
-    }, m && (s[p] = m(s[p])));
+    }, m && (s[h] = m(s[h])));
   }
-  function l(p, m) {
+  function l(h, m) {
     try {
-      c(n[p](m));
+      c(n[h](m));
     } catch (f) {
-      h(i[0][3], f);
+      p(i[0][3], f);
     }
   }
-  function c(p) {
-    p.value instanceof le ? Promise.resolve(p.value.v).then(u, d) : h(i[0][2], p);
+  function c(h) {
+    h.value instanceof le ? Promise.resolve(h.value.v).then(u, d) : p(i[0][2], h);
   }
-  function u(p) {
-    l("next", p);
+  function u(h) {
+    l("next", h);
   }
-  function d(p) {
-    l("throw", p);
+  function d(h) {
+    l("throw", h);
   }
-  function h(p, m) {
-    p(m), i.shift(), i.length && l(i[0][0], i[0][1]);
+  function p(h, m) {
+    h(m), i.shift(), i.length && l(i[0][0], i[0][1]);
   }
 }
-function Fr(r) {
+function Hr(r) {
   if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
   var e = r[Symbol.asyncIterator], t;
   return e ? e.call(r) : (r = typeof ue == "function" ? ue(r) : r[Symbol.iterator](), t = {}, n("next"), n("throw"), n("return"), t[Symbol.asyncIterator] = function() {
@@ -1118,10 +1133,10 @@ function Fr(r) {
     }, a);
   }
 }
-var Ur = (function(r) {
+var Kr = (function(r) {
   return r && typeof r.length == "number" && typeof r != "function";
 });
-function jr(r) {
+function qr(r) {
   return F(r?.then);
 }
 function Jt(r) {
@@ -1130,7 +1145,7 @@ function Jt(r) {
   }, t = r(e);
   return t.prototype = Object.create(Error.prototype), t.prototype.constructor = t, t;
 }
-var Be = Jt(function(r) {
+var De = Jt(function(r) {
   return function(t) {
     r(this), this.message = t ? t.length + ` errors occurred during unsubscription:
 ` + t.map(function(n, s) {
@@ -1139,13 +1154,13 @@ var Be = Jt(function(r) {
   `) : "", this.name = "UnsubscriptionError", this.errors = t;
   };
 });
-function qe(r, e) {
+function Ge(r, e) {
   if (r) {
     var t = r.indexOf(e);
     0 <= t && r.splice(t, 1);
   }
 }
-var Se = (function() {
+var Me = (function() {
   function r(e) {
     this.initialTeardown = e, this.closed = !1, this._parentage = null, this._finalizers = null;
   }
@@ -1177,38 +1192,38 @@ var Se = (function() {
         try {
           u();
         } catch (f) {
-          i = f instanceof Be ? f.errors : [f];
+          i = f instanceof De ? f.errors : [f];
         }
       var d = this._finalizers;
       if (d) {
         this._finalizers = null;
         try {
-          for (var h = ue(d), p = h.next(); !p.done; p = h.next()) {
-            var m = p.value;
+          for (var p = ue(d), h = p.next(); !h.done; h = p.next()) {
+            var m = h.value;
             try {
-              vt(m);
+              Et(m);
             } catch (f) {
-              i = i ?? [], f instanceof Be ? i = Ae(Ae([], Te(i)), Te(f.errors)) : i.push(f);
+              i = i ?? [], f instanceof De ? i = Se(Se([], Te(i)), Te(f.errors)) : i.push(f);
             }
           }
         } catch (f) {
           n = { error: f };
         } finally {
           try {
-            p && !p.done && (s = h.return) && s.call(h);
+            h && !h.done && (s = p.return) && s.call(p);
           } finally {
             if (n) throw n.error;
           }
         }
       }
       if (i)
-        throw new Be(i);
+        throw new De(i);
     }
   }, r.prototype.add = function(e) {
     var t;
     if (e && e !== this)
       if (this.closed)
-        vt(e);
+        Et(e);
       else {
         if (e instanceof r) {
           if (e.closed || e._hasParent(this))
@@ -1225,28 +1240,28 @@ var Se = (function() {
     this._parentage = Array.isArray(t) ? (t.push(e), t) : t ? [t, e] : e;
   }, r.prototype._removeParent = function(e) {
     var t = this._parentage;
-    t === e ? this._parentage = null : Array.isArray(t) && qe(t, e);
+    t === e ? this._parentage = null : Array.isArray(t) && Ge(t, e);
   }, r.prototype.remove = function(e) {
     var t = this._finalizers;
-    t && qe(t, e), e instanceof r && e._removeParent(this);
+    t && Ge(t, e), e instanceof r && e._removeParent(this);
   }, r.EMPTY = (function() {
     var e = new r();
     return e.closed = !0, e;
   })(), r;
-})(), Xt = Se.EMPTY;
+})(), Xt = Me.EMPTY;
 function Zt(r) {
-  return r instanceof Se || r && "closed" in r && F(r.remove) && F(r.add) && F(r.unsubscribe);
+  return r instanceof Me || r && "closed" in r && F(r.remove) && F(r.add) && F(r.unsubscribe);
 }
-function vt(r) {
+function Et(r) {
   F(r) ? r() : r.unsubscribe();
 }
-var Yr = {
+var Gr = {
   Promise: void 0
-}, zr = {
+}, Vr = {
   setTimeout: function(r, e) {
     for (var t = [], n = 2; n < arguments.length; n++)
       t[n - 2] = arguments[n];
-    return setTimeout.apply(void 0, Ae([r, e], Te(t)));
+    return setTimeout.apply(void 0, Se([r, e], Te(t)));
   },
   clearTimeout: function(r) {
     return clearTimeout(r);
@@ -1254,23 +1269,23 @@ var Yr = {
   delegate: void 0
 };
 function en(r) {
-  zr.setTimeout(function() {
+  Vr.setTimeout(function() {
     throw r;
   });
 }
-function Et() {
+function Rt() {
 }
-function Ee(r) {
+function Re(r) {
   r();
 }
-var dt = (function(r) {
-  de(e, r);
+var ht = (function(r) {
+  he(e, r);
   function e(t) {
     var n = r.call(this) || this;
-    return n.isStopped = !1, t ? (n.destination = t, Zt(t) && t.add(n)) : n.destination = Kr, n;
+    return n.isStopped = !1, t ? (n.destination = t, Zt(t) && t.add(n)) : n.destination = Xr, n;
   }
   return e.create = function(t, n, s) {
-    return new ge(t, n, s);
+    return new _e(t, n, s);
   }, e.prototype.next = function(t) {
     this.isStopped || this._next(t);
   }, e.prototype.error = function(t) {
@@ -1294,7 +1309,7 @@ var dt = (function(r) {
       this.unsubscribe();
     }
   }, e;
-})(Se), kr = (function() {
+})(Me), Qr = (function() {
   function r(e) {
     this.partialObserver = e;
   }
@@ -1304,7 +1319,7 @@ var dt = (function(r) {
       try {
         t.next(e);
       } catch (n) {
-        ve(n);
+        Ee(n);
       }
   }, r.prototype.error = function(e) {
     var t = this.partialObserver;
@@ -1312,50 +1327,50 @@ var dt = (function(r) {
       try {
         t.error(e);
       } catch (n) {
-        ve(n);
+        Ee(n);
       }
     else
-      ve(e);
+      Ee(e);
   }, r.prototype.complete = function() {
     var e = this.partialObserver;
     if (e.complete)
       try {
         e.complete();
       } catch (t) {
-        ve(t);
+        Ee(t);
       }
   }, r;
-})(), ge = (function(r) {
-  de(e, r);
+})(), _e = (function(r) {
+  he(e, r);
   function e(t, n, s) {
     var i = r.call(this) || this, a;
     return F(t) || !t ? a = {
       next: t ?? void 0,
       error: n ?? void 0,
       complete: s ?? void 0
-    } : a = t, i.destination = new kr(a), i;
+    } : a = t, i.destination = new Qr(a), i;
   }
   return e;
-})(dt);
-function ve(r) {
+})(ht);
+function Ee(r) {
   en(r);
 }
-function Wr(r) {
+function Jr(r) {
   throw r;
 }
-var Kr = {
+var Xr = {
   closed: !0,
-  next: Et,
-  error: Wr,
-  complete: Et
-}, ht = (function() {
+  next: Rt,
+  error: Jr,
+  complete: Rt
+}, pt = (function() {
   return typeof Symbol == "function" && Symbol.observable || "@@observable";
 })();
-function Hr(r) {
+function Zr(r) {
   return r;
 }
-function qr(r) {
-  return r.length === 0 ? Hr : r.length === 1 ? r[0] : function(t) {
+function es(r) {
+  return r.length === 0 ? Zr : r.length === 1 ? r[0] : function(t) {
     return r.reduce(function(n, s) {
       return s(n);
     }, t);
@@ -1369,8 +1384,8 @@ var re = (function() {
     var t = new r();
     return t.source = this, t.operator = e, t;
   }, r.prototype.subscribe = function(e, t, n) {
-    var s = this, i = Gr(e) ? e : new ge(e, t, n);
-    return Ee(function() {
+    var s = this, i = ns(e) ? e : new _e(e, t, n);
+    return Re(function() {
       var a = s, o = a.operator, l = a.source;
       i.add(o ? o.call(i, l) : l ? s._subscribe(i) : s._trySubscribe(i));
     }), i;
@@ -1382,8 +1397,8 @@ var re = (function() {
     }
   }, r.prototype.forEach = function(e, t) {
     var n = this;
-    return t = Rt(t), new t(function(s, i) {
-      var a = new ge({
+    return t = Ct(t), new t(function(s, i) {
+      var a = new _e({
         next: function(o) {
           try {
             e(o);
@@ -1399,15 +1414,15 @@ var re = (function() {
   }, r.prototype._subscribe = function(e) {
     var t;
     return (t = this.source) === null || t === void 0 ? void 0 : t.subscribe(e);
-  }, r.prototype[ht] = function() {
+  }, r.prototype[pt] = function() {
     return this;
   }, r.prototype.pipe = function() {
     for (var e = [], t = 0; t < arguments.length; t++)
       e[t] = arguments[t];
-    return qr(e)(this);
+    return es(e)(this);
   }, r.prototype.toPromise = function(e) {
     var t = this;
-    return e = Rt(e), new e(function(n, s) {
+    return e = Ct(e), new e(function(n, s) {
       var i;
       t.subscribe(function(a) {
         return i = a;
@@ -1421,34 +1436,34 @@ var re = (function() {
     return new r(e);
   }, r;
 })();
-function Rt(r) {
+function Ct(r) {
   var e;
-  return (e = r ?? Yr.Promise) !== null && e !== void 0 ? e : Promise;
+  return (e = r ?? Gr.Promise) !== null && e !== void 0 ? e : Promise;
 }
-function Vr(r) {
+function ts(r) {
   return r && F(r.next) && F(r.error) && F(r.complete);
 }
-function Gr(r) {
-  return r && r instanceof dt || Vr(r) && Zt(r);
+function ns(r) {
+  return r && r instanceof ht || ts(r) && Zt(r);
 }
-function Qr(r) {
-  return F(r[ht]);
+function rs(r) {
+  return F(r[pt]);
 }
-function Jr(r) {
+function ss(r) {
   return Symbol.asyncIterator && F(r?.[Symbol.asyncIterator]);
 }
-function Xr(r) {
+function is(r) {
   return new TypeError("You provided " + (r !== null && typeof r == "object" ? "an invalid object" : "'" + r + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
 }
-function Zr() {
+function as() {
   return typeof Symbol != "function" || !Symbol.iterator ? "@@iterator" : Symbol.iterator;
 }
-var es = Zr();
-function ts(r) {
-  return F(r?.[es]);
+var os = as();
+function cs(r) {
+  return F(r?.[os]);
 }
-function ns(r) {
-  return Lr(this, arguments, function() {
+function ls(r) {
+  return Wr(this, arguments, function() {
     var t, n, s, i;
     return Qt(this, function(a) {
       switch (a.label) {
@@ -1478,44 +1493,44 @@ function ns(r) {
     });
   });
 }
-function rs(r) {
+function us(r) {
   return F(r?.getReader);
 }
-function Me(r) {
+function Oe(r) {
   if (r instanceof re)
     return r;
   if (r != null) {
-    if (Qr(r))
-      return ss(r);
-    if (Ur(r))
-      return is(r);
-    if (jr(r))
-      return as(r);
-    if (Jr(r))
-      return tn(r);
-    if (ts(r))
-      return os(r);
     if (rs(r))
-      return cs(r);
+      return ds(r);
+    if (Kr(r))
+      return hs(r);
+    if (qr(r))
+      return ps(r);
+    if (ss(r))
+      return tn(r);
+    if (cs(r))
+      return fs(r);
+    if (us(r))
+      return ys(r);
   }
-  throw Xr(r);
+  throw is(r);
 }
-function ss(r) {
+function ds(r) {
   return new re(function(e) {
-    var t = r[ht]();
+    var t = r[pt]();
     if (F(t.subscribe))
       return t.subscribe(e);
     throw new TypeError("Provided object does not correctly implement Symbol.observable");
   });
 }
-function is(r) {
+function hs(r) {
   return new re(function(e) {
     for (var t = 0; t < r.length && !e.closed; t++)
       e.next(r[t]);
     e.complete();
   });
 }
-function as(r) {
+function ps(r) {
   return new re(function(e) {
     r.then(function(t) {
       e.closed || (e.next(t), e.complete());
@@ -1524,7 +1539,7 @@ function as(r) {
     }).then(null, en);
   });
 }
-function os(r) {
+function fs(r) {
   return new re(function(e) {
     var t, n;
     try {
@@ -1547,22 +1562,22 @@ function os(r) {
 }
 function tn(r) {
   return new re(function(e) {
-    ls(r, e).catch(function(t) {
+    ms(r, e).catch(function(t) {
       return e.error(t);
     });
   });
 }
-function cs(r) {
-  return tn(ns(r));
+function ys(r) {
+  return tn(ls(r));
 }
-function ls(r, e) {
+function ms(r, e) {
   var t, n, s, i;
-  return Dr(this, void 0, void 0, function() {
+  return kr(this, void 0, void 0, function() {
     var a, o;
     return Qt(this, function(l) {
       switch (l.label) {
         case 0:
-          l.trys.push([0, 5, 6, 11]), t = Fr(r), l.label = 1;
+          l.trys.push([0, 5, 6, 11]), t = Hr(r), l.label = 1;
         case 1:
           return [4, t.next()];
         case 2:
@@ -1593,11 +1608,11 @@ function ls(r, e) {
     });
   });
 }
-function _e(r, e, t, n, s) {
-  return new us(r, e, t, n, s);
+function be(r, e, t, n, s) {
+  return new gs(r, e, t, n, s);
 }
-var us = (function(r) {
-  de(e, r);
+var gs = (function(r) {
+  he(e, r);
   function e(t, n, s, i, a, o) {
     var l = r.call(this, t) || this;
     return l.onFinalize = a, l.shouldUnsubscribe = o, l._next = n ? function(c) {
@@ -1631,47 +1646,47 @@ var us = (function(r) {
       r.prototype.unsubscribe.call(this), !n && ((t = this.onFinalize) === null || t === void 0 || t.call(this));
     }
   }, e;
-})(dt), nn = {
+})(ht), nn = {
   now: function() {
     return (nn.delegate || Date).now();
   },
   delegate: void 0
 };
-function Re(r) {
-  return we(function(e, t) {
+function Ce(r) {
+  return ve(function(e, t) {
     var n = null, s = !1, i;
-    n = e.subscribe(_e(t, void 0, void 0, function(a) {
-      i = Me(r(a, Re(r)(e))), n ? (n.unsubscribe(), n = null, i.subscribe(t)) : s = !0;
+    n = e.subscribe(be(t, void 0, void 0, function(a) {
+      i = Oe(r(a, Ce(r)(e))), n ? (n.unsubscribe(), n = null, i.subscribe(t)) : s = !0;
     })), s && (n.unsubscribe(), n = null, i.subscribe(t));
   });
 }
 function te(r, e) {
-  return we(function(t, n) {
+  return ve(function(t, n) {
     var s = 0;
-    t.subscribe(_e(n, function(i) {
+    t.subscribe(be(n, function(i) {
       n.next(r.call(e, i, s++));
     }));
   });
 }
-var ds = Jt(function(r) {
+var _s = Jt(function(r) {
   return function() {
     r(this), this.name = "ObjectUnsubscribedError", this.message = "object unsubscribed";
   };
-}), pt = (function(r) {
-  de(e, r);
+}), ft = (function(r) {
+  he(e, r);
   function e() {
     var t = r.call(this) || this;
     return t.closed = !1, t.currentObservers = null, t.observers = [], t.isStopped = !1, t.hasError = !1, t.thrownError = null, t;
   }
   return e.prototype.lift = function(t) {
-    var n = new Ct(this, this);
+    var n = new It(this, this);
     return n.operator = t, n;
   }, e.prototype._throwIfClosed = function() {
     if (this.closed)
-      throw new ds();
+      throw new _s();
   }, e.prototype.next = function(t) {
     var n = this;
-    Ee(function() {
+    Re(function() {
       var s, i;
       if (n._throwIfClosed(), !n.isStopped) {
         n.currentObservers || (n.currentObservers = Array.from(n.observers));
@@ -1693,7 +1708,7 @@ var ds = Jt(function(r) {
     });
   }, e.prototype.error = function(t) {
     var n = this;
-    Ee(function() {
+    Re(function() {
       if (n._throwIfClosed(), !n.isStopped) {
         n.hasError = n.isStopped = !0, n.thrownError = t;
         for (var s = n.observers; s.length; )
@@ -1702,7 +1717,7 @@ var ds = Jt(function(r) {
     });
   }, e.prototype.complete = function() {
     var t = this;
-    Ee(function() {
+    Re(function() {
       if (t._throwIfClosed(), !t.isStopped) {
         t.isStopped = !0;
         for (var n = t.observers; n.length; )
@@ -1724,8 +1739,8 @@ var ds = Jt(function(r) {
     return this._throwIfClosed(), this._checkFinalizedStatuses(t), this._innerSubscribe(t);
   }, e.prototype._innerSubscribe = function(t) {
     var n = this, s = this, i = s.hasError, a = s.isStopped, o = s.observers;
-    return i || a ? Xt : (this.currentObservers = null, o.push(t), new Se(function() {
-      n.currentObservers = null, qe(o, t);
+    return i || a ? Xt : (this.currentObservers = null, o.push(t), new Me(function() {
+      n.currentObservers = null, Ge(o, t);
     }));
   }, e.prototype._checkFinalizedStatuses = function(t) {
     var n = this, s = n.hasError, i = n.thrownError, a = n.isStopped;
@@ -1734,10 +1749,10 @@ var ds = Jt(function(r) {
     var t = new re();
     return t.source = this, t;
   }, e.create = function(t, n) {
-    return new Ct(t, n);
+    return new It(t, n);
   }, e;
-})(re), Ct = (function(r) {
-  de(e, r);
+})(re), It = (function(r) {
+  he(e, r);
   function e(t, n) {
     var s = r.call(this) || this;
     return s.destination = t, s.source = n, s;
@@ -1755,17 +1770,17 @@ var ds = Jt(function(r) {
     var n, s;
     return (s = (n = this.source) === null || n === void 0 ? void 0 : n.subscribe(t)) !== null && s !== void 0 ? s : Xt;
   }, e;
-})(pt);
-function It(r, e) {
-  return we(function(t, n) {
+})(ft);
+function At(r, e) {
+  return ve(function(t, n) {
     var s = 0;
-    t.subscribe(_e(n, function(i) {
+    t.subscribe(be(n, function(i) {
       return r.call(e, i, s++) && n.next(i);
     }));
   });
 }
-var hs = (function(r) {
-  de(e, r);
+var bs = (function(r) {
+  he(e, r);
   function e(t, n, s) {
     t === void 0 && (t = 1 / 0), n === void 0 && (n = 1 / 0), s === void 0 && (s = nn);
     var i = r.call(this) || this;
@@ -1787,41 +1802,41 @@ var hs = (function(r) {
       c && i.splice(0, c + 1);
     }
   }, e;
-})(pt);
-function ps(r) {
+})(ft);
+function ws(r) {
   r === void 0 && (r = {});
   var e = r.connector, t = e === void 0 ? function() {
-    return new pt();
+    return new ft();
   } : e, n = r.resetOnError, s = n === void 0 ? !0 : n, i = r.resetOnComplete, a = i === void 0 ? !0 : i, o = r.resetOnRefCountZero, l = o === void 0 ? !0 : o;
   return function(c) {
-    var u, d, h, p = 0, m = !1, f = !1, y = function() {
+    var u, d, p, h = 0, m = !1, f = !1, y = function() {
       d?.unsubscribe(), d = void 0;
     }, g = function() {
-      y(), u = h = void 0, m = f = !1;
+      y(), u = p = void 0, m = f = !1;
     }, _ = function() {
       var v = u;
       g(), v?.unsubscribe();
     };
-    return we(function(v, b) {
-      p++, !f && !m && y();
-      var w = h = h ?? t();
+    return ve(function(v, b) {
+      h++, !f && !m && y();
+      var w = p = p ?? t();
       b.add(function() {
-        p--, p === 0 && !f && !m && (d = De(_, l));
-      }), w.subscribe(b), !u && p > 0 && (u = new ge({
+        h--, h === 0 && !f && !m && (d = Le(_, l));
+      }), w.subscribe(b), !u && h > 0 && (u = new _e({
         next: function(E) {
           return w.next(E);
         },
         error: function(E) {
-          f = !0, y(), d = De(g, s, E), w.error(E);
+          f = !0, y(), d = Le(g, s, E), w.error(E);
         },
         complete: function() {
-          m = !0, y(), d = De(g, a), w.complete();
+          m = !0, y(), d = Le(g, a), w.complete();
         }
-      }), Me(v).subscribe(u));
+      }), Oe(v).subscribe(u));
     })(c);
   };
 }
-function De(r, e) {
+function Le(r, e) {
   for (var t = [], n = 2; n < arguments.length; n++)
     t[n - 2] = arguments[n];
   if (e === !0) {
@@ -1829,34 +1844,34 @@ function De(r, e) {
     return;
   }
   if (e !== !1) {
-    var s = new ge({
+    var s = new _e({
       next: function() {
         s.unsubscribe(), r();
       }
     });
-    return Me(e.apply(void 0, Ae([], Te(t)))).subscribe(s);
+    return Oe(e.apply(void 0, Se([], Te(t)))).subscribe(s);
   }
 }
-function fs(r, e, t) {
+function vs(r, e, t) {
   var n, s = !1;
-  return n = r, ps({
+  return n = r, ws({
     connector: function() {
-      return new hs(n, e, t);
+      return new bs(n, e, t);
     },
     resetOnError: !0,
     resetOnComplete: !1,
     resetOnRefCountZero: s
   });
 }
-function V(r, e) {
-  return we(function(t, n) {
+function G(r, e) {
+  return ve(function(t, n) {
     var s = null, i = 0, a = !1, o = function() {
       return a && !s && n.complete();
     };
-    t.subscribe(_e(n, function(l) {
+    t.subscribe(be(n, function(l) {
       s?.unsubscribe();
       var c = 0, u = i++;
-      Me(r(l, u)).subscribe(s = _e(n, function(d) {
+      Oe(r(l, u)).subscribe(s = be(n, function(d) {
         return n.next(e ? e(l, d, u, c++) : d);
       }, function() {
         s = null, o();
@@ -1866,7 +1881,7 @@ function V(r, e) {
     }));
   });
 }
-class ua {
+class ma {
   constructor(e, t, n) {
     this.remoteAdapter = t, this.localAdapter = n, this.entityName = e;
   }
@@ -1913,7 +1928,7 @@ class ua {
     let s;
     e.localCacheFirst ? s = this.#n(e) : s = this.#s(e), e.offlineFallback && (s = this.#i(s));
     const i = s.pipe(
-      fs(1),
+      vs(1),
       Ft(() => {
         this.#e.delete(t);
       })
@@ -1937,16 +1952,16 @@ class ua {
       combinator: "and",
       rules: [{ field: "id", operator: "=", value: e }]
     };
-    return Dn({
+    return Ln({
       remoteMetadata: this.remoteAdapter.fetchMetadata(this.entityName, t),
       localMetadata: this.localAdapter.getMetadataByIds(this.entityName, [e])
     }).pipe(
-      V(({ remoteMetadata: n, localMetadata: s }) => {
+      G(({ remoteMetadata: n, localMetadata: s }) => {
         if (n.length === 0)
           return Q(null);
         const i = n[0].updatedAt, a = s.get(e);
         return a && a >= i ? this.#a([e]).pipe(te((o) => o[0] || null)) : this.remoteAdapter.findByIds(this.entityName, [e]).pipe(
-          V((o) => o.length === 0 ? Q(null) : this.localAdapter.upsertMany(this.entityName, o).pipe(te(() => o[0])))
+          G((o) => o.length === 0 ? Q(null) : this.localAdapter.upsertMany(this.entityName, o).pipe(te(() => o[0])))
         );
       })
     );
@@ -1976,7 +1991,7 @@ class ua {
     if (!this.remoteAdapter.create)
       throw new Error(`Remote adapter does not support create operation for ${this.entityName}`);
     return this.remoteAdapter.create(this.entityName, e).pipe(
-      V((t) => this.localAdapter.upsertMany(this.entityName, [t]).pipe(te(() => t)))
+      G((t) => this.localAdapter.upsertMany(this.entityName, [t]).pipe(te(() => t)))
     );
   }
   /**
@@ -2002,7 +2017,7 @@ class ua {
     if (!this.remoteAdapter.update)
       throw new Error(`Remote adapter does not support update operation for ${this.entityName}`);
     return this.remoteAdapter.update(this.entityName, e, t).pipe(
-      V((n) => this.localAdapter.upsertMany(this.entityName, [n]).pipe(te(() => n)))
+      G((n) => this.localAdapter.upsertMany(this.entityName, [n]).pipe(te(() => n)))
     );
   }
   /**
@@ -2027,7 +2042,7 @@ class ua {
       throw new Error(`Remote adapter does not support delete operation for ${this.entityName}`);
     const t = Array.isArray(e) ? e : [e];
     return this.remoteAdapter.delete(this.entityName, e).pipe(
-      V(() => this.localAdapter.deleteByIds(this.entityName, t))
+      G(() => this.localAdapter.deleteByIds(this.entityName, t))
     );
   }
   // ============================================
@@ -2043,16 +2058,16 @@ class ua {
    * 4. 如果远程数据有变化，再次发射
    */
   #n(e) {
-    const t = this.#t().pipe(Re(() => Q([])));
+    const t = this.#t().pipe(Ce(() => Q([])));
     let n = !1, s = "";
     const i = this.#s(e).pipe(
-      It((a) => n ? this.#r(a) !== s : !0),
-      Re(() => Fn)
+      At((a) => n ? this.#r(a) !== s : !0),
+      Ce(() => Un)
       // 远程失败时静默处理，保留缓存数据
     );
-    return Ln(
+    return Fn(
       t.pipe(
-        It((a) => a.length > 0),
+        At((a) => a.length > 0),
         // 只有有缓存时才发射
         te((a) => (n = !0, s = this.#r(a), a))
       ),
@@ -2084,8 +2099,8 @@ class ua {
    */
   #i(e) {
     return e.pipe(
-      Re((t) => this.#t().pipe(
-        V((n) => {
+      Ce((t) => this.#t().pipe(
+        G((n) => {
           if (n.length > 0)
             return Q(n);
           throw new et(t);
@@ -2099,7 +2114,7 @@ class ua {
   #s(e) {
     const t = e.where, n = Date.now();
     return this.remoteAdapter.fetchMetadata(this.entityName, t).pipe(
-      V((s) => {
+      G((s) => {
         if (s.length === 0)
           return this.#o(e.onSyncStats, {
             remoteCount: 0,
@@ -2112,8 +2127,8 @@ class ua {
           }), Q([]);
         const i = s.map((a) => a.id);
         return this.localAdapter.getMetadataByIds(this.entityName, i).pipe(
-          V((a) => {
-            const o = $r(s, a), l = [...o.missingIds, ...o.staleIds];
+          G((a) => {
+            const o = Yr(s, a), l = [...o.missingIds, ...o.staleIds];
             return l.length === 0 ? this.#a(o.freshIds).pipe(
               te((c) => (this.#o(e.onSyncStats, {
                 remoteCount: s.length,
@@ -2125,7 +2140,7 @@ class ua {
                 durationMs: Date.now() - n
               }), c))
             ) : this.remoteAdapter.findByIds(this.entityName, l).pipe(
-              V((c) => c.length === 0 ? this.#a(o.freshIds).pipe(
+              G((c) => c.length === 0 ? this.#a(o.freshIds).pipe(
                 te((u) => (this.#o(e.onSyncStats, {
                   remoteCount: s.length,
                   missingCount: o.missingIds.length,
@@ -2136,7 +2151,7 @@ class ua {
                   durationMs: Date.now() - n
                 }), u))
               ) : this.localAdapter.upsertMany(this.entityName, c).pipe(
-                V(() => o.freshIds.length === 0 ? (this.#o(e.onSyncStats, {
+                G(() => o.freshIds.length === 0 ? (this.#o(e.onSyncStats, {
                   remoteCount: s.length,
                   missingCount: o.missingIds.length,
                   staleCount: o.staleIds.length,
@@ -2181,10 +2196,10 @@ class ua {
    * @returns 查询指纹字符串
    */
   #c(e) {
-    return Lt(e);
+    return JSON.stringify(e);
   }
 }
-class ys {
+class Es {
   /**
    * 刷新
    * 重新执行 SQL 查询
@@ -2193,7 +2208,7 @@ class ys {
   /**
    * 销毁
    */
-  #n = new Un(1);
+  #n = new jn(1);
   /**
    * 是否首次运行
    * 标识查询是否为第一次执行
@@ -2295,12 +2310,12 @@ class ys {
     if (this.#t === !0) return;
     this.#t = !0;
     const e = this.options && typeof this.options == "object" && "where" in this.options ? this.options.where : void 0;
-    e && (lt(this.rxdb, e, this.entityType, this.relationEntityTypes), this.relationEntityTypes.forEach((t) => {
+    e && (ut(this.rxdb, e, this.entityType, this.relationEntityTypes), this.relationEntityTypes.forEach((t) => {
       const n = this.depEntityTypeMap.get(t) || 0;
       this.depEntityTypeMap.set(t, n + 1);
     })), this.refresh$.pipe(
-      jn(this.destroy$),
-      Fe(),
+      Yn(this.destroy$),
+      Ue(),
       k(() => this.refreshCount++),
       x(() => this.runner())
     ).subscribe({
@@ -2347,8 +2362,8 @@ class ys {
     this.#e.next(this.refreshCount + 1);
   };
 }
-var ms = /* @__PURE__ */ ((r) => (r.Synced = "Synced", r.Syncing = "Syncing", r.Never = "Never", r))(ms || {});
-const Ve = (r) => Array.isArray(r) ? r : [r], Le = (r) => r ? [O(r).fingerprint] : [r], ye = (r) => r.map((e) => O(e).fingerprint), D = (r) => r?.parentId || null;
+var Rs = /* @__PURE__ */ ((r) => (r.Synced = "Synced", r.Syncing = "Syncing", r.Never = "Never", r))(Rs || {});
+const Ve = (r) => Array.isArray(r) ? r : [r], Fe = (r) => r ? [O(r).fingerprint] : [r], me = (r) => r.map((e) => O(e).fingerprint), D = (r) => r?.parentId || null;
 function* rn(r, e, t = {}) {
   const { maxLevel: n, maxDepth: s = 1e3 } = t, i = /* @__PURE__ */ new Set();
   let a = D(r), o = 1;
@@ -2359,7 +2374,7 @@ function* rn(r, e, t = {}) {
     yield { entity: l, level: o }, a = D(l), o++;
   }
 }
-function gs(r, e, t, n) {
+function Cs(r, e, t, n) {
   if (e == null)
     return r.parentId === null;
   const s = /* @__PURE__ */ new Set();
@@ -2376,7 +2391,7 @@ function gs(r, e, t, n) {
   }
   return !1;
 }
-function _s(r, e, t) {
+function Is(r, e, t) {
   const n = t.get(e);
   if (!n) return !1;
   for (const { entity: s } of rn(n, t))
@@ -2384,7 +2399,7 @@ function _s(r, e, t) {
       return !0;
   return !1;
 }
-function Ge(r, e) {
+function Qe(r, e) {
   const t = /* @__PURE__ */ new Map();
   return r.forEach((n) => {
     const s = e(n);
@@ -2394,7 +2409,7 @@ function Ge(r, e) {
 function Tt(r, e) {
   return r.length !== e.length ? !0 : r.some((t, n) => t !== e[n]);
 }
-const bs = (r, e) => {
+const As = (r, e) => {
   const t = r.options.where, n = e.filter((i) => !t || Y(i.patch, t));
   if (n.length === 0) return;
   const s = n.map((i) => r.serialize(i));
@@ -2435,22 +2450,22 @@ const bs = (r, e) => {
       const i = r.options, { before: a, after: o, orderBy: l } = i;
       if (!l?.length) return;
       const c = Array.from(r.resultEntitySet.values()), u = [...c, ...s], d = X(u, l);
-      let h;
+      let p;
       if (o || a) {
-        const p = [...u];
-        o && !p.includes(o) && p.push(o), a && !p.includes(a) && p.push(a);
-        const m = X(p, l);
+        const h = [...u];
+        o && !h.includes(o) && h.push(o), a && !h.includes(a) && h.push(a);
+        const m = X(h, l);
         if (o) {
           const f = m.findIndex((y) => y === o);
-          f !== -1 ? h = m.slice(f + 1).filter((y) => c.includes(y) || s.includes(y)) : h = c;
+          f !== -1 ? p = m.slice(f + 1).filter((y) => c.includes(y) || s.includes(y)) : p = c;
         } else {
           const f = m.findIndex((y) => y === a);
-          f !== -1 ? h = m.slice(0, f).filter((y) => c.includes(y) || s.includes(y)) : h = c;
+          f !== -1 ? p = m.slice(0, f).filter((y) => c.includes(y) || s.includes(y)) : p = c;
         }
       } else
-        h = d;
-      if (!Tt(c, h)) return;
-      r.next(h, !0);
+        p = d;
+      if (!Tt(c, p)) return;
+      r.next(p, !0);
       break;
     }
     case "count": {
@@ -2459,21 +2474,21 @@ const bs = (r, e) => {
       break;
     }
     case "findDescendants": {
-      const i = r.options, a = Array.from(r.resultEntitySet.values()), o = Ge(a, (c) => c.id), l = s.filter(
-        (c) => gs(c, i.entityId, o, i.level)
+      const i = r.options, a = Array.from(r.resultEntitySet.values()), o = Qe(a, (c) => c.id), l = s.filter(
+        (c) => Cs(c, i.entityId, o, i.level)
       );
       if (l.length === 0) return;
       l.forEach((c) => r.resultEntitySet.add(c)), r.next(Array.from(r.resultEntitySet.values()), !0);
       break;
     }
     case "findAncestors": {
-      const i = r.options, o = [...Array.from(r.resultEntitySet.values()), ...s], l = Ge(o, (u) => u.id), c = s.filter((u) => u.id === i.entityId ? !0 : i.entityId ? _s(u, i.entityId, l) : !1);
+      const i = r.options, o = [...Array.from(r.resultEntitySet.values()), ...s], l = Qe(o, (u) => u.id), c = s.filter((u) => u.id === i.entityId ? !0 : i.entityId ? Is(u, i.entityId, l) : !1);
       if (c.length === 0) return;
       c.forEach((u) => r.resultEntitySet.add(u)), r.next(Array.from(r.resultEntitySet.values()), !0);
       break;
     }
   }
-}, Qe = (r, e) => {
+}, Je = (r, e) => {
   const t = [], n = [], s = () => {
     n.push(["match_where", "not_match_relation_where"]), t.push(["match_relation_where"]);
   };
@@ -2495,9 +2510,9 @@ const bs = (r, e) => {
       t.push(["match_where"], ["match_relation_where"]);
       break;
   }
-  const i = xr(r, e, t, n);
-  i.refresh ? r.refresh() : i.recalculate && bs(r, i.current_entities);
-}, ws = (r, e) => {
+  const i = Fr(r, e, t, n);
+  i.refresh ? r.refresh() : i.recalculate && As(r, i.current_entities);
+}, Ts = (r, e) => {
   const t = new Set(e.map((n) => n.id));
   switch (r.type) {
     case "findAll": {
@@ -2530,7 +2545,7 @@ const bs = (r, e) => {
       break;
     }
     case "findDescendants": {
-      const n = r.options, s = Array.from(r.resultEntitySet.values()), i = Ge(s, (c) => c.id);
+      const n = r.options, s = Array.from(r.resultEntitySet.values()), i = Qe(s, (c) => c.id);
       let a = !1;
       const o = s.filter((c) => {
         if (t.has(c.id))
@@ -2552,7 +2567,7 @@ const bs = (r, e) => {
       break;
     }
   }
-}, Je = (r, e) => {
+}, Xe = (r, e) => {
   const t = [], n = [];
   switch (r.type) {
     case "find":
@@ -2576,13 +2591,13 @@ const bs = (r, e) => {
       t.push(["match_where"]);
       break;
   }
-  const s = Nr(r, e, t, n);
-  s.refresh ? r.refresh() : s.recalculate && ws(r, e);
+  const s = Ur(r, e, t, n);
+  s.refresh ? r.refresh() : s.recalculate && Ts(r, e);
 }, N = (r) => {
   if (r)
     return r.id;
 };
-class vs {
+class Ss {
   constructor(e, t) {
     this.serialize = t, e.forEach((n) => this.dataById.set(n.id, n));
   }
@@ -2617,7 +2632,7 @@ class vs {
     return this.dataById.get(e);
   }
 }
-const Es = (r, e, t) => {
+const Ms = (r, e, t) => {
   const n = new Set(r.map((d) => d.id)), s = r.filter((d) => !e || t(d.patch, e)), i = r.filter((d) => !e || t(d.inversePatch, e)), a = new Set(s.map((d) => d.id)), o = new Set(i.map((d) => d.id)), l = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set();
   return s.forEach((d) => {
     o.has(d.id) ? u.add(d.id) : l.add(d.id);
@@ -2631,7 +2646,7 @@ const Es = (r, e, t) => {
     newlyUnmatchedIds: c,
     stillMatchedIds: u
   };
-}, Rs = (r, e, t) => {
+}, Os = (r, e, t) => {
   const n = r.options, s = n.where, i = Array.from(r.resultEntitySet.values()), a = [];
   for (const u of i) {
     const d = N(u);
@@ -2639,25 +2654,25 @@ const Es = (r, e, t) => {
       a.push(u);
       continue;
     }
-    const h = t.getData(d);
-    h?.patch ? (Object.assign(u, h.patch), (!s || Y(u, s)) && a.push(u)) : a.push(u);
+    const p = t.getData(d);
+    p?.patch ? (Object.assign(u, p.patch), (!s || Y(u, s)) && a.push(u)) : a.push(u);
   }
   const o = new Set(a.map((u) => N(u)).filter(Boolean)), l = Array.from(e.newlyMatchedIds).filter((u) => !o.has(u)).map((u) => t.getSerializedUpdate(u)).filter((u) => !!u);
   let c = [...a, ...l];
   n.orderBy?.length && (c = X(c, n.orderBy)), r.next(c, !0);
-}, Cs = (r, e) => {
+}, xs = (r, e) => {
   const n = Array.from(r.resultEntitySet.values()).some((i) => {
     const a = N(i);
     return !!a && e.updatedIds.has(a);
   }), s = e.newlyMatchedIds.size > 0;
   (n || s) && r.refresh();
-}, Is = (r, e) => {
+}, Ns = (r, e) => {
   const n = Array.from(r.resultEntitySet.values()).some((i) => {
     const a = N(i);
     return !!a && e.updatedIds.has(a);
   }), s = e.newlyMatchedIds.size > 0;
   (n || s) && r.refresh();
-}, Ts = (r, e, t) => {
+}, Ps = (r, e, t) => {
   const n = r.options, s = n.where;
   if (r.result === null || r.result === void 0) {
     e.newlyMatchedIds.size > 0 && r.refresh();
@@ -2680,14 +2695,14 @@ const Es = (r, e, t) => {
     return;
   }
   e.newlyMatchedIds.size > 0 && r.refresh();
-}, As = (r, e) => {
+}, $s = (r, e) => {
   const t = r.result || 0, n = e.newlyMatchedIds.size, s = e.newlyUnmatchedIds.size;
   if (n > 0 || s > 0) {
     const i = Math.max(0, t + n - s);
     r.next(i);
   }
 };
-class Oe {
+class xe {
   constructor(e, t) {
     this.cache = e, this.oldResultMap = t;
   }
@@ -2840,15 +2855,15 @@ class Oe {
     return !1;
   }
 }
-const Ss = (r, e, t, n) => {
+const Bs = (r, e, t, n) => {
   const s = r.options, i = s.entityId, a = s.level, o = Array.from(r.resultEntitySet.values()), l = /* @__PURE__ */ new Map();
   o.forEach((y) => {
     const g = N(y);
     g && l.set(g, y);
   });
-  const c = new Oe(n, l);
+  const c = new xe(n, l);
   let u = !1;
-  const h = o.filter((y) => {
+  const p = o.filter((y) => {
     const g = N(y);
     if (!g) return !0;
     if (t.updatedIds.has(g)) {
@@ -2874,7 +2889,7 @@ const Ss = (r, e, t, n) => {
       _ && (Object.assign(y, _.patch), u = !0);
     }
     return y;
-  }), p = [];
+  }), h = [];
   if (e.filter((y) => {
     const g = y.id, _ = l.has(g), v = "parentId" in y.patch;
     return t.matchNowIds.has(g) && !_ && v;
@@ -2883,7 +2898,7 @@ const Ss = (r, e, t, n) => {
     if (!g) return;
     const { isDescendant: _, level: v } = c.isEntityDescendant(g, i);
     if (_ && (a === void 0 || v <= a)) {
-      u = !0, p.push(g);
+      u = !0, h.push(g);
       const b = N(g);
       b && l.set(b, g);
     }
@@ -2893,27 +2908,27 @@ const Ss = (r, e, t, n) => {
       const _ = n.getSerializedUpdate(g);
       if (_) {
         const { isDescendant: v, level: b } = c.isEntityDescendant(_, i);
-        v && (a === void 0 || b <= a) && (h.some((E) => N(E) === g) || p.some((E) => N(E) === g) || l.has(g) || (u = !0, p.push(_), l.set(g, _)));
+        v && (a === void 0 || b <= a) && (p.some((E) => N(E) === g) || h.some((E) => N(E) === g) || l.has(g) || (u = !0, h.push(_), l.set(g, _)));
       }
     }
   }), !u)
     return;
-  const f = [...h, ...p];
+  const f = [...p, ...h];
   r.next(f, !0);
-}, Ms = (r, e, t, n) => {
+}, Ds = (r, e, t, n) => {
   const i = r.options.entityId, a = Array.from(r.resultEntitySet.values()), o = /* @__PURE__ */ new Map();
   a.forEach((b) => {
     const w = N(b);
     w && o.set(w, b);
   });
-  const l = new Oe(n, o), c = () => {
+  const l = new xe(n, o), c = () => {
     if (!i)
       return;
     const b = n.getSerializedUpdate(i);
     return b || o.get(i);
   };
   let u = !1;
-  const h = (i ? t.updatedIds.has(i) : !1) && i ? n.getData(i) : void 0, m = h && "parentId" in h.patch, y = a.filter((b) => {
+  const p = (i ? t.updatedIds.has(i) : !1) && i ? n.getData(i) : void 0, m = p && "parentId" in p.patch, y = a.filter((b) => {
     const w = N(b);
     if (!w) return !0;
     if (t.newlyUnmatchedIds.has(w))
@@ -2924,10 +2939,10 @@ const Ss = (r, e, t, n) => {
     } else if (t.updatedIds.has(w) && t.matchNowIds.has(w)) {
       const E = n.getData(w);
       if (E && "parentId" in E.patch) {
-        const U = n.getSerializedUpdate(w), A = c();
-        if (!A)
+        const U = n.getSerializedUpdate(w), T = c();
+        if (!T)
           return !0;
-        if (U && !l.isEntityAncestor(A, U))
+        if (U && !l.isEntityAncestor(T, U))
           return u = !0, !1;
       }
     }
@@ -2955,17 +2970,17 @@ const Ss = (r, e, t, n) => {
     return;
   const v = [...y, ...g];
   r.next(v, !0);
-}, Os = (r, e, t, n, s, i) => {
-  const o = r.options.entityId, l = r.result || 0, c = /* @__PURE__ */ new Map(), u = new Oe(n, c);
-  let d = !1, h = 0;
-  for (const p of e) {
-    const m = !s || i(p.inversePatch, s), f = n.getSerializedBefore(p.id, p.inversePatch), y = u.isEntityDescendantForCount(f, o);
+}, Ls = (r, e, t, n, s, i) => {
+  const o = r.options.entityId, l = r.result || 0, c = /* @__PURE__ */ new Map(), u = new xe(n, c);
+  let d = !1, p = 0;
+  for (const h of e) {
+    const m = !s || i(h.inversePatch, s), f = n.getSerializedBefore(h.id, h.inversePatch), y = u.isEntityDescendantForCount(f, o);
     if (y === void 0) {
       d = !0;
       break;
     }
-    const g = m && y, _ = !s || i(p.patch, s), v = u.isEntityDescendantForCount(
-      n.getSerializedUpdate(p.id),
+    const g = m && y, _ = !s || i(h.patch, s), v = u.isEntityDescendantForCount(
+      n.getSerializedUpdate(h.id),
       o
     );
     if (v === void 0) {
@@ -2973,15 +2988,15 @@ const Ss = (r, e, t, n) => {
       break;
     }
     const b = _ && v;
-    b && !g ? h++ : !b && g && h--;
+    b && !g ? p++ : !b && g && p--;
   }
   if (d)
     r.refresh();
-  else if (h !== 0) {
-    const p = Math.max(0, l + h);
-    r.next(p);
+  else if (p !== 0) {
+    const h = Math.max(0, l + p);
+    r.next(h);
   }
-}, xs = (r, e, t, n, s, i) => {
+}, Fs = (r, e, t, n, s, i) => {
   const o = r.options.entityId, l = r.result || 0;
   if (!o) {
     r.refresh();
@@ -2992,12 +3007,12 @@ const Ss = (r, e, t, n) => {
     r.refresh();
     return;
   }
-  const u = /* @__PURE__ */ new Map(), d = new Oe(n, u), h = n.getSerializedBefore(c.id, c.inversePatch), p = n.getSerializedUpdate(c.id);
-  if (!h || !p) {
+  const u = /* @__PURE__ */ new Map(), d = new xe(n, u), p = n.getSerializedBefore(c.id, c.inversePatch), h = n.getSerializedUpdate(c.id);
+  if (!p || !h) {
     r.refresh();
     return;
   }
-  const m = D(h), f = D(p);
+  const m = D(p), f = D(h);
   if (m !== f) {
     r.refresh();
     return;
@@ -3012,8 +3027,8 @@ const Ss = (r, e, t, n) => {
     w || (w = {}, _.set(b, w));
     const E = !s || i(v.inversePatch, s);
     if (w.before === void 0) {
-      const xe = n.getSerializedBefore(v.id, v.inversePatch);
-      w.before = d.isEntityAncestorForCount(h, xe);
+      const Ne = n.getSerializedBefore(v.id, v.inversePatch);
+      w.before = d.isEntityAncestorForCount(p, Ne);
     }
     const B = w.before;
     if (B === void 0) {
@@ -3022,15 +3037,15 @@ const Ss = (r, e, t, n) => {
     }
     const U = !s || i(v.patch, s);
     if (w.after === void 0) {
-      const xe = n.getSerializedUpdate(v.id);
-      w.after = d.isEntityAncestorForCount(p, xe);
+      const Ne = n.getSerializedUpdate(v.id);
+      w.after = d.isEntityAncestorForCount(h, Ne);
     }
-    const A = w.after;
-    if (A === void 0) {
+    const T = w.after;
+    if (T === void 0) {
       g = !0;
       break;
     }
-    const q = E && B, Z = U && A;
+    const q = E && B, Z = U && T;
     Z && !q ? y++ : !Z && q && y--;
   }
   if (g)
@@ -3039,39 +3054,39 @@ const Ss = (r, e, t, n) => {
     const v = Math.max(0, l + y);
     r.next(v);
   }
-}, Ns = (r, e) => {
-  const t = r.options.where, n = new vs(e, (i) => r.serialize(i)), s = Es(e, t, Y);
+}, Us = (r, e) => {
+  const t = r.options.where, n = new Ss(e, (i) => r.serialize(i)), s = Ms(e, t, Y);
   switch (r.type) {
     case "findAll":
-      Rs(r, s, n);
+      Os(r, s, n);
       break;
     case "find":
-      Cs(r, s);
+      xs(r, s);
       break;
     case "findOne":
     case "findOneOrFail":
-      Ts(r, s, n);
+      Ps(r, s, n);
       break;
     case "findByCursor":
-      Is(r, s);
+      Ns(r, s);
       break;
     case "count":
-      As(r, s);
+      $s(r, s);
       break;
     case "findDescendants":
-      Ss(r, e, s, n);
+      Bs(r, e, s, n);
       break;
     case "findAncestors":
-      Ms(r, e, s, n);
+      Ds(r, e, s, n);
       break;
     case "countDescendants":
-      Os(r, e, s, n, t, Y);
+      Ls(r, e, s, n, t, Y);
       break;
     case "countAncestors":
-      xs(r, e, s, n, t, Y);
+      Fs(r, e, s, n, t, Y);
       break;
   }
-}, Xe = (r, e) => {
+}, Ze = (r, e) => {
   const t = [], n = [];
   switch (r.type) {
     case "find":
@@ -3135,10 +3150,10 @@ const Ss = (r, e, t, n) => {
       t.push(["match_where"]), t.push(["match_where_before"]), t.push(["match_relation_where"]);
       break;
   }
-  const s = Pr(r, e, t, n);
-  s.refresh ? r.refresh() : s.recalculate && Ns(r, e);
+  const s = jr(r, e, t, n);
+  s.refresh ? r.refresh() : s.recalculate && Us(r, e);
 };
-class Ps {
+class js {
   /**
    * 构造函数
    *
@@ -3173,7 +3188,7 @@ class Ps {
    * @returns 查询任务对象，包含 result$ 用于订阅查询结果
    */
   createTask(e) {
-    const t = Lt(e.options);
+    const t = JSON.stringify(e.options);
     let n = this.#e.get(t);
     return n || (n = this.#o(t, e), this.#e.set(t, n)), n.result$ = this.#u(n), n;
   }
@@ -3194,7 +3209,7 @@ class Ps {
    * @returns 新创建的查询任务
    */
   #o(e, t) {
-    return new ys({
+    return new Es({
       cacheKey: e,
       ...t,
       entityType: this.EntityType,
@@ -3274,13 +3289,13 @@ class Ps {
         Tn(Array.from(this.#e.values()), (i) => {
           switch (t.type) {
             case ne:
-              (this.#t.get(i.type) || Qe)(i, s);
+              (this.#t.get(i.type) || Je)(i, s);
               break;
             case oe:
-              (this.#r.get(i.type) || Xe)(i, s);
+              (this.#r.get(i.type) || Ze)(i, s);
               break;
             case ce:
-              (this.#i.get(i.type) || Je)(i, s);
+              (this.#i.get(i.type) || Xe)(i, s);
               break;
           }
         });
@@ -3289,7 +3304,7 @@ class Ps {
     this.#s = e, this.rxdb.addEventListener(ne, e), this.rxdb.addEventListener(oe, e), this.rxdb.addEventListener(ce, e);
   }
 }
-class $s {
+class Ys {
   constructor(e, t) {
     this.rxdb = e, this.EntityType = t;
   }
@@ -3326,7 +3341,7 @@ class $s {
     n.origin = { ...t }, Object.assign(e, t);
   }
 }
-class sn extends $s {
+class sn extends Ys {
   static _STATIC_METHODS = [
     ...super._STATIC_METHODS,
     "get",
@@ -3370,7 +3385,7 @@ class sn extends $s {
     const n = I(t);
     this.sync = n.sync || e.config.sync;
     const { local: s, remote: i } = this.sync, a = !s && !!i;
-    this.primary$ = a ? this.remote$ : this.local$, this.queryManager = new Ps(e, t, this);
+    this.primary$ = a ? this.remote$ : this.local$, this.queryManager = new js(e, t, this);
   }
   /**
    * 根据 id 获取实体
@@ -3400,7 +3415,7 @@ class sn extends $s {
     return this.queryManager.createTask({
       options: { type: "get", options: e },
       runner: n,
-      getFingerprint: Le
+      getFingerprint: Fe
     }).result$;
   }
   /**
@@ -3416,7 +3431,7 @@ class sn extends $s {
     return this.queryManager.createTask({
       options: { type: "findOne", options: e },
       runner: t,
-      getFingerprint: Le
+      getFingerprint: Fe
     }).result$;
   }
   /**
@@ -3435,7 +3450,7 @@ class sn extends $s {
     return this.queryManager.createTask({
       options: { type: "findOneOrFail", options: e },
       runner: t,
-      getFingerprint: Le
+      getFingerprint: Fe
     }).result$;
   }
   /**
@@ -3450,7 +3465,7 @@ class sn extends $s {
     return this.queryManager.createTask({
       options: { type: "find", options: e },
       runner: t,
-      getFingerprint: ye
+      getFingerprint: me
     }).result$;
   }
   /**
@@ -3466,7 +3481,7 @@ class sn extends $s {
     return this.queryManager.createTask({
       options: { type: "findAll", options: e },
       runner: t,
-      getFingerprint: ye
+      getFingerprint: me
     }).result$;
   }
   /**
@@ -3481,8 +3496,8 @@ class sn extends $s {
     if (e.before && e.after)
       throw new R("before and after cannot be used together in cursor-based pagination");
     let n = structuredClone(e.where);
-    const s = Bs(e);
-    s && (n = Ds(n, s));
+    const s = zs(e);
+    s && (n = ks(n, s));
     const i = () => this.primary$.pipe(
       x((a) => a.find({ ...e, where: n })),
       k(this._setLocals)
@@ -3490,7 +3505,7 @@ class sn extends $s {
     return this.queryManager.createTask({
       options: { type: "findByCursor", options: e },
       runner: i,
-      getFingerprint: ye
+      getFingerprint: me
     }).result$;
   }
   /**
@@ -3545,7 +3560,7 @@ class sn extends $s {
   };
   _setLocals = (e) => e.forEach(this._setLocal);
 }
-const Bs = (r) => {
+const zs = (r) => {
   const e = r.after || r.before;
   if (!e) return null;
   const t = !!r.after;
@@ -3560,14 +3575,14 @@ const Bs = (r) => {
   for (let s = 0; s < r.orderBy.length; s++) {
     const { field: i, sort: a } = r.orderBy[s], l = a === "asc" === t, c = [];
     for (let d = 0; d < s; d++) {
-      const h = r.orderBy[d].field;
-      c.push({ field: h, operator: "=", value: e[h] });
+      const p = r.orderBy[d].field;
+      c.push({ field: p, operator: "=", value: e[p] });
     }
     const u = l ? ">" : "<";
     c.push({ field: i, operator: u, value: e[i] }), n.push({ combinator: "and", rules: c });
   }
   return { combinator: "or", rules: n };
-}, Ds = (r, e) => r.combinator === "and" ? { ...r, rules: [...r.rules, e] } : { combinator: "and", rules: [r, e] };
+}, ks = (r, e) => r.combinator === "and" ? { ...r, rules: [...r.rules, e] } : { combinator: "and", rules: [r, e] };
 class an {
   constructor(e) {
     this.rxdb = e;
@@ -3583,17 +3598,17 @@ class an {
     this.repository_map.set(e, t);
   }
 }
-class da extends an {
+class ga extends an {
 }
-class ha extends an {
+class _a extends an {
 }
-class pa {
+class ba {
   constructor(e) {
     this.rxdb = e;
   }
 }
-const At = 100;
-class Ls extends sn {
+const St = 100;
+class Ws extends sn {
   static _STATIC_METHODS = [
     ...super._STATIC_METHODS,
     "findDescendants",
@@ -3613,7 +3628,7 @@ class Ls extends sn {
     return this.queryManager.createTask({
       options: { type: "findDescendants", options: e },
       runner: t,
-      getFingerprint: ye
+      getFingerprint: me
     }).result$;
   }
   /**
@@ -3640,7 +3655,7 @@ class Ls extends sn {
     return this.queryManager.createTask({
       options: { type: "findAncestors", options: e },
       runner: t,
-      getFingerprint: ye
+      getFingerprint: me
     }).result$;
   }
   /**
@@ -3657,10 +3672,10 @@ class Ls extends sn {
   }
   #e(e) {
     const t = { ...e }, n = t.level ?? 0;
-    return n < 0 ? t.level = 0 : n > At ? t.level = At : t.level = n, t.entityId = t.entityId ?? null, t;
+    return n < 0 ? t.level = 0 : n > St ? t.level = St : t.level = n, t.entityId = t.entityId ?? null, t;
   }
 }
-class Fs {
+class Hs {
   /**
    * 创建实体状态实例
    *
@@ -3711,7 +3726,7 @@ class Fs {
    * 每次调用 checkChange 时发布最新的 patches 数组
    * 使用 shareReplay(1) 确保新订阅者能立即收到最近的变更记录
    */
-  #t = new Yn();
+  #t = new zn();
   /**
    * 状态快照数组
    * 存储实体在不同时间点的完整状态，用于支持撤销/重做功能
@@ -3835,7 +3850,7 @@ class Fs {
    * 例如：patch = { name: 'new' }  →  inversePatch = { name: 'old' }
    */
   get inversePatch() {
-    return this.patch && An(this.origin, Object.keys(this.patch)) || null;
+    return this.patch && Sn(this.origin, Object.keys(this.patch)) || null;
   }
   /**
    * 获取变化
@@ -3977,10 +3992,10 @@ class Fs {
   */
   addRelationEntity(e, t) {
     const n = this.getRelationCache(e);
-    if (e.kind === T.MANY_TO_MANY) {
-      const s = e.junctionEntityType, i = e.name + "Id", a = e.mappedProperty + "Id", o = (h) => h instanceof s && h[i] === t.id && h[a] === this.target.id;
+    if (e.kind === A.MANY_TO_MANY) {
+      const s = e.junctionEntityType, i = e.name + "Id", a = e.mappedProperty + "Id", o = (p) => p instanceof s && p[i] === t.id && p[a] === this.target.id;
       if (Array.from(n.values()).find(o)) return;
-      const c = I(t.constructor).relations.find((h) => h.name === e.mappedProperty);
+      const c = I(t.constructor).relations.find((p) => p.name === e.mappedProperty);
       let u, d;
       c && (u = O(t).getRelationCache(c), d = Array.from(u.values()).find(o)), (!d || O(d).removed) && (d = new s({
         [i]: t.id,
@@ -4008,7 +4023,7 @@ class Fs {
    */
   removeRelationEntity(e, t) {
     const n = this.getRelationCache(e);
-    if (e.kind === T.MANY_TO_MANY) {
+    if (e.kind === A.MANY_TO_MANY) {
       const s = e.junctionEntityType, i = e.name + "Id", a = e.mappedProperty + "Id", o = Array.from(n.values()).find(
         (l) => l instanceof s && l[i] === t.id && l[a] === this.target.id
       );
@@ -4057,7 +4072,7 @@ class Fs {
     this._patch_cache = void 0, this._fingerprint = void 0;
   }
 }
-const Us = (r) => {
+const Ks = (r) => {
   const e = O(r), t = I(r.constructor), n = () => e.checkChange();
   let s;
   const i = {
@@ -4067,16 +4082,16 @@ const Us = (r) => {
      * 同时根据 metadata 配置进行类型转换
      */
     set: (a, o, l, c) => {
-      if (Dt(a[o], l)) return !0;
-      if (Sn(o) === !1 && (e.markChanged(o), e.modified = !0, clearTimeout(s), s = setTimeout(() => n(), 0), l === null && t.isForeignKey(o))) {
+      if (Lt(a[o], l)) return !0;
+      if (Mn(o) === !1 && (e.markChanged(o), e.modified = !0, clearTimeout(s), s = setTimeout(() => n(), 0), l === null && t.isForeignKey(o))) {
         const u = t.foreignKeyRelationMap.get(o);
-        u && (u.kind === T.MANY_TO_ONE || u.kind === T.ONE_TO_ONE) && e.cleanRelationEntity(u);
+        u && (u.kind === A.MANY_TO_ONE || u.kind === A.ONE_TO_ONE) && e.cleanRelationEntity(u);
       }
       return Reflect.set(a, o, l, c);
     }
   };
   return new Proxy(r, i);
-}, js = (r, e, t) => {
+}, qs = (r, e, t) => {
   const n = t.rxdb.schemaManager.getEntityType(r.mappedEntity, r.mappedNamespace);
   if (!n) throw new R(`mapped entity not found: ${r.mappedEntity}`);
   const s = r.name + "Id", i = r.name + "$";
@@ -4087,8 +4102,8 @@ const Us = (r) => {
      * 创建一个可观察对象，通过外键ID获取关联实体
      * 提供set和remove方法操作关系
      */
-    case T.MANY_TO_ONE:
-    case T.ONE_TO_ONE:
+    case A.MANY_TO_ONE:
+    case A.ONE_TO_ONE:
       a = function() {
         const o = this, l = O(o), c = new J(o[s]), u = c.asObservable().pipe(
           x((d) => d ? t.getRepository(n).get(d) : Q(null)),
@@ -4110,7 +4125,7 @@ const Us = (r) => {
      * 创建一个可观察对象，查询所有关联到当前实体的实体集合
      * 提供add和remove方法操作关系集合
      */
-    case T.ONE_TO_MANY:
+    case A.ONE_TO_MANY:
       a = function() {
         const o = r.mappedProperty + "Id", l = r.mappedProperty + "$", c = this, u = O(c), d = ae(
           () => t.getRepository(n).findAll({
@@ -4125,7 +4140,7 @@ const Us = (r) => {
               ]
             }
           })
-        ), h = ae(
+        ), p = ae(
           () => t.getRepository(n).count({
             where: {
               combinator: "and",
@@ -4139,12 +4154,12 @@ const Us = (r) => {
             }
           })
         );
-        return M(d, "count$", h), M(d, "add", (...p) => {
-          p.forEach((m) => {
+        return M(d, "count$", p), M(d, "add", (...h) => {
+          h.forEach((m) => {
             u.addRelationEntity(r, m), m[l].set(c);
           });
-        }), M(d, "remove", (...p) => {
-          p.forEach((m) => {
+        }), M(d, "remove", (...h) => {
+          h.forEach((m) => {
             u.removeRelationEntity(r, m), m[l].remove();
           });
         }), Object.freeze(d);
@@ -4156,7 +4171,7 @@ const Us = (r) => {
      * 创建一个可观察对象，查询通过中间表关联到当前实体的实体集合
      * 提供add和remove方法操作关系集合
      */
-    case T.MANY_TO_MANY:
+    case A.MANY_TO_MANY:
       a = function() {
         const o = this, l = O(o), c = r.name + "Id";
         if (!r.junctionEntityType) throw new R("junction entity not found");
@@ -4173,8 +4188,8 @@ const Us = (r) => {
               ]
             }
           }).pipe(
-            x((h) => {
-              const p = h.map((m) => m[c]);
+            x((p) => {
+              const h = p.map((m) => m[c]);
               return t.getRepository(n).findAll({
                 where: {
                   combinator: "and",
@@ -4182,7 +4197,7 @@ const Us = (r) => {
                     {
                       field: "id",
                       operator: "in",
-                      value: p
+                      value: h
                     }
                   ]
                 }
@@ -4206,12 +4221,12 @@ const Us = (r) => {
         return M(u, "count$", d), M(
           u,
           "add",
-          (...h) => h.forEach((p) => l.addRelationEntity(r, p))
+          (...p) => p.forEach((h) => l.addRelationEntity(r, h))
         ), M(
           u,
           "remove",
-          (...h) => h.forEach((p) => {
-            l.removeRelationEntity(r, p);
+          (...p) => p.forEach((h) => {
+            l.removeRelationEntity(r, h);
           })
         ), Object.freeze(u);
       };
@@ -4225,7 +4240,7 @@ const Us = (r) => {
     configurable: !1
   });
 };
-class Ys {
+class Gs {
   /**
    * 创建实体管理器实例
    *
@@ -4240,16 +4255,16 @@ class Ys {
     this.rxdb = e, e.repository("Repository", {
       class: sn,
       mergeOperations: {
-        create: Qe,
-        update: Xe,
-        remove: Je
+        create: Je,
+        update: Ze,
+        remove: Xe
       }
     }).repository("TreeRepository", {
-      class: Ls,
+      class: Ws,
       mergeOperations: {
-        create: Qe,
-        update: Xe,
-        remove: Je
+        create: Je,
+        update: Ze,
+        remove: Xe
       }
     });
   }
@@ -4267,7 +4282,7 @@ class Ys {
   init() {
     this.rxdb.config.entities.forEach((e) => {
       const t = I(e);
-      M(e.prototype, ke, this), M(t, ke, this), M(t, We, e);
+      M(e.prototype, We, this), M(t, We, this), M(t, He, e);
       const n = this.rxdb.getRepositoryConfig(t.repository);
       n && n.class.staticMethods.forEach(
         (i) => M(
@@ -4275,14 +4290,14 @@ class Ys {
           i,
           (a) => this.#t(e)[i](a)
         )
-      ), Object.keys(St).forEach(
-        (s) => M(e.prototype, s, St[s](this, e))
-      ), t.relationMap.forEach((s) => js(s, e, this));
+      ), Object.keys(Mt).forEach(
+        (s) => M(e.prototype, s, Mt[s](this, e))
+      ), t.relationMap.forEach((s) => qs(s, e, this));
     }), M(this, Wt, (e) => {
       const t = this.#i(e, { local: !1, remote: !1, modified: !0 });
-      return Mn(() => {
+      return On(() => {
         this.addEntityCache(t);
-        const n = I(e), s = new Zn([
+        const n = I(e), s = new rr([
           {
             type: "NEW",
             namespace: n.namespace,
@@ -4379,14 +4394,14 @@ class Ys {
    * @returns 保存后的实体实例
    */
   async save(e) {
-    const t = gt([e]), n = ur([e]);
+    const t = _t([e]), n = gr([e]);
     if (t.length === 1 && n.length === 0) {
       const s = t[0];
       O(s).local ? await this.update(s) : await this.create(s);
     } else if (t.length === 0 && n.length === 1)
       await this.remove(n[0]);
     else if (t.length || n.length) {
-      const s = Pe({
+      const s = $e({
         need_save_entities: t,
         need_remove_entities: n
       });
@@ -4400,7 +4415,7 @@ class Ys {
    * @returns
    */
   async saveMany(e) {
-    const t = gt(e), n = Pe({
+    const t = _t(e), n = $e({
       need_save_entities: t,
       need_remove_entities: []
     });
@@ -4412,7 +4427,7 @@ class Ys {
    * @returns
    */
   async removeMany(e) {
-    const t = Pe({
+    const t = $e({
       need_save_entities: [],
       need_remove_entities: e
     });
@@ -4525,13 +4540,13 @@ class Ys {
    * @returns 初始化后的代理实体实例
    */
   #i(e, t) {
-    const n = new Fs(this.rxdb, { target: e, ...t });
-    or(e, Kt, n);
-    const s = Us(e);
+    const n = new Hs(this.rxdb, { target: e, ...t });
+    fr(e, Ht, n);
+    const s = Ks(e);
     return M(n, "proxyTarget", s), s;
   }
 }
-const St = {
+const Mt = {
   save: (r) => function() {
     return r.save(this);
   },
@@ -4541,8 +4556,8 @@ const St = {
   reset: (r) => function() {
     return r.reset(this);
   }
-}, Mt = "entity_event", Ot = "hello", xt = "first_connected_at";
-class zs {
+}, Ot = "entity_event", xt = "hello", Nt = "first_connected_at";
+class Vs {
   #e;
   #n;
   #t;
@@ -4570,7 +4585,7 @@ class zs {
     return this.#o;
   }
   constructor(e) {
-    this.#t = e.clientId, this.#e = On(`${e.dbName}_gateway`), this.#n = new xn(`${e.dbName}_leader`);
+    this.#t = e.clientId, this.#e = xn(`${e.dbName}_gateway`), this.#n = new Nn(`${e.dbName}_leader`);
   }
   /**
    * 初始化网关
@@ -4599,7 +4614,7 @@ class zs {
    */
   #f(e) {
     this.#u || this.#e.emit({
-      type: Mt,
+      type: Ot,
       messageId: this.#l(),
       clientId: this.#t,
       event: e
@@ -4610,7 +4625,7 @@ class zs {
    */
   #h() {
     this.#e.emit({
-      type: Ot,
+      type: xt,
       messageId: this.#l(),
       clientId: this.#t
     });
@@ -4620,7 +4635,7 @@ class zs {
    */
   #p() {
     this.#a && this.#e.emit({
-      type: xt,
+      type: Nt,
       messageId: this.#l(),
       clientId: this.#t,
       firstConnectedAt: this.#a.toISOString()
@@ -4633,7 +4648,7 @@ class zs {
     const t = this.#e.message$.subscribe((n) => {
       if (n.clientId !== this.#t)
         switch (n.type) {
-          case Mt:
+          case Ot:
             this.#u = !0;
             try {
               e(n.event);
@@ -4641,10 +4656,10 @@ class zs {
               this.#u = !1;
             }
             break;
-          case Ot:
+          case xt:
             this.#o && this.#p();
             break;
-          case xt:
+          case Nt:
             this.#a || (this.#a = new Date(n.firstConnectedAt));
             break;
         }
@@ -4667,7 +4682,7 @@ class zs {
     });
   }
 }
-const ks = (r) => {
+const Qs = (r) => {
   const [{ metadata: e, relation: t }, { metadata: n, relation: s }] = r, i = Array.from(/* @__PURE__ */ new Set([e.namespace, n.namespace])).sort().join("_") || void 0;
   return {
     name: Array.from(/* @__PURE__ */ new Set([e.name, n.name])).sort().join("_"),
@@ -4684,7 +4699,7 @@ const ks = (r) => {
          * 不能使用 RESTRICT，否则会阻止删除有关联的实体
          */
         name: t.name,
-        kind: T.MANY_TO_ONE,
+        kind: A.MANY_TO_ONE,
         mappedNamespace: n.namespace,
         mappedEntity: n.name,
         mappedProperty: s.name,
@@ -4696,7 +4711,7 @@ const ks = (r) => {
          * 同样需要 CASCADE 删除
          */
         name: s.name,
-        kind: T.MANY_TO_ONE,
+        kind: A.MANY_TO_ONE,
         mappedNamespace: e.namespace,
         mappedEntity: e.name,
         mappedProperty: t.name,
@@ -4705,13 +4720,13 @@ const ks = (r) => {
     ]
   };
 };
-var Ws = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Hs = (r, e, t) => e in r ? Ws(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, qs = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? Ks(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+var Js = Object.defineProperty, Xs = Object.getOwnPropertyDescriptor, Zs = (r, e, t) => e in r ? Js(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, ei = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? Xs(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
-}, Vs = (r, e, t) => Hs(r, typeof e != "symbol" ? e + "" : e, t), on;
-on = ct;
-let K = class {
+}, ti = (r, e, t) => Zs(r, typeof e != "symbol" ? e + "" : e, t), on;
+on = lt;
+let H = class {
   /**
    * id
    */
@@ -4763,9 +4778,9 @@ let K = class {
    */
   children$;
 };
-Vs(K, on);
-K = qs([
-  yr({
+ti(H, on);
+H = ei([
+  Er({
     name: "RxDBBranch",
     tableName: "rxdb_branch",
     log: !1,
@@ -4814,39 +4829,39 @@ K = qs([
     relations: [
       {
         name: "changes",
-        kind: T.ONE_TO_MANY,
+        kind: A.ONE_TO_MANY,
         mappedEntity: "RxDBChange",
         mappedProperty: "branch"
       },
       {
         name: "syncs",
-        kind: T.ONE_TO_MANY,
+        kind: A.ONE_TO_MANY,
         mappedEntity: "RxDBSync",
         mappedProperty: "branch"
       },
       {
         name: "children",
-        kind: T.ONE_TO_MANY,
+        kind: A.ONE_TO_MANY,
         mappedEntity: "RxDBBranch",
         mappedProperty: "parent"
       },
       {
         name: "parent",
-        kind: T.MANY_TO_ONE,
+        kind: A.MANY_TO_ONE,
         mappedEntity: "RxDBBranch",
         mappedProperty: "children",
         nullable: !0
       }
     ]
   })
-], K);
-var Gs = Object.defineProperty, Qs = Object.getOwnPropertyDescriptor, Js = (r, e, t) => e in r ? Gs(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, Xs = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? Qs(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+], H);
+var ni = Object.defineProperty, ri = Object.getOwnPropertyDescriptor, si = (r, e, t) => e in r ? ni(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, ii = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? ri(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
-}, Zs = (r, e, t) => Js(r, typeof e != "symbol" ? e + "" : e, t), cn;
-cn = ct;
-let H = class {
+}, ai = (r, e, t) => si(r, typeof e != "symbol" ? e + "" : e, t), cn;
+cn = lt;
+let K = class {
   /**
    * id
    */
@@ -5381,8 +5396,8 @@ let H = class {
    */
   branch$;
 };
-Zs(H, cn);
-H = Xs([
+ai(K, cn);
+K = ii([
   ie({
     name: "RxDBChange",
     tableName: "rxdb_change",
@@ -5468,20 +5483,20 @@ H = Xs([
     relations: [
       {
         name: "branch",
-        kind: T.MANY_TO_ONE,
+        kind: A.MANY_TO_ONE,
         mappedEntity: "RxDBBranch",
         mappedProperty: "changes",
         nullable: !0
       }
     ]
   })
-], H);
-var ei = Object.defineProperty, ti = Object.getOwnPropertyDescriptor, ni = (r, e, t) => e in r ? ei(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, ri = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? ti(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+], K);
+var oi = Object.defineProperty, ci = Object.getOwnPropertyDescriptor, li = (r, e, t) => e in r ? oi(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, ui = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? ci(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
-}, si = (r, e, t) => ni(r, typeof e != "symbol" ? e + "" : e, t), ln;
-ln = ct;
+}, di = (r, e, t) => li(r, typeof e != "symbol" ? e + "" : e, t), ln;
+ln = lt;
 let se = class {
   /**
    * id
@@ -5497,8 +5512,8 @@ let se = class {
    */
   name;
 };
-si(se, ln);
-se = ri([
+di(se, ln);
+se = ui([
   ie({
     name: "RxDBMigration",
     tableName: "rxdb_migration",
@@ -5523,8 +5538,8 @@ se = ri([
     ]
   })
 ], se);
-var ii = Object.getOwnPropertyDescriptor, ai = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? ii(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+var hi = Object.getOwnPropertyDescriptor, pi = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? hi(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
@@ -5592,7 +5607,7 @@ let z = class {
    */
   branch;
 };
-z = ai([
+z = pi([
   ie({
     name: "RxDBSync",
     tableName: "rxdb_sync",
@@ -5674,7 +5689,7 @@ z = ai([
     relations: [
       {
         name: "branch",
-        kind: T.MANY_TO_ONE,
+        kind: A.MANY_TO_ONE,
         mappedEntity: "RxDBBranch",
         mappedProperty: "syncs",
         onDelete: W.CASCADE
@@ -5682,13 +5697,13 @@ z = ai([
     ]
   })
 ], z);
-var oi = Object.getOwnPropertyDescriptor, ci = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? oi(e, t) : e, i = r.length - 1, a; i >= 0; i--)
+var fi = Object.getOwnPropertyDescriptor, yi = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? fi(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
-const G = (r, e) => e + ":" + r;
-class li {
+const V = (r, e) => e + ":" + r;
+class mi {
   constructor(e) {
     this.rxdb = e;
   }
@@ -5698,31 +5713,31 @@ class li {
   #r = /* @__PURE__ */ new Map();
   init() {
     const { entities: e } = this.rxdb.config;
-    e.push(K, H, se, z), new Set(e).forEach((t) => {
-      const n = I(t), { name: s, namespace: i } = n, a = G(s, i);
+    e.push(H, K, se, z), new Set(e).forEach((t) => {
+      const n = I(t), { name: s, namespace: i } = n, a = V(s, i);
       this.#e.set(a, n), this.#n.set(a, t);
       const o = this.rxdb.getRepositoryConfig(n.repository);
       if (o?.entityGenerator) {
         const l = o.entityGenerator(n);
-        Nn(l).forEach((u) => {
-          const d = I(u), h = G(d.name, d.namespace);
-          this.#e.has(h) || (this.#e.set(h, d), this.#n.set(h, u), e.push(u));
+        Pn(l).forEach((u) => {
+          const d = I(u), p = V(d.name, d.namespace);
+          this.#e.has(p) || (this.#e.set(p, d), this.#n.set(p, u), e.push(u));
         });
       }
     }), this.#e.forEach(
       (t) => t.relations.forEach((n) => {
-        if (n.kind === T.MANY_TO_MANY) {
+        if (n.kind === A.MANY_TO_MANY) {
           const s = n, i = this.findMappedRelation(t, s);
           if (!i)
             throw new R("mapped relation not found");
-          const a = ks([
+          const a = Qs([
             { metadata: t, relation: s },
             i
-          ]), o = G(a.name, a.namespace);
+          ]), o = V(a.name, a.namespace);
           if (this.#e.has(o) === !1) {
-            let l = class extends Ie {
+            let l = class extends Ae {
             };
-            l = ci([
+            l = yi([
               ie(a)
             ], l);
             const c = I(l);
@@ -5732,7 +5747,7 @@ class li {
         }
       })
     ), this.#e.forEach((t, n) => {
-      const { name: s, namespace: i, tableName: a } = t, o = G(a, i);
+      const { name: s, namespace: i, tableName: a } = t, o = V(a, i);
       this.#t.set(o, this.#n.get(n)), this.#r.set(o, t);
       let l = this.rxdb;
       i !== "public" && (M(l, i, {}), l = l[i]), M(l, s, this.#n.get(n));
@@ -5747,17 +5762,17 @@ class li {
       if (n.relations && n.name === t.mappedEntity && n.namespace === t.mappedNamespace) {
         let s;
         switch (t.kind) {
-          case T.MANY_TO_MANY:
-            s = (a) => a.kind === T.MANY_TO_MANY && a.name === t.mappedProperty && a.mappedProperty === t.name;
+          case A.MANY_TO_MANY:
+            s = (a) => a.kind === A.MANY_TO_MANY && a.name === t.mappedProperty && a.mappedProperty === t.name;
             break;
-          case T.ONE_TO_MANY:
-            s = (a) => a.kind === T.MANY_TO_ONE && a.name === t.mappedProperty;
+          case A.ONE_TO_MANY:
+            s = (a) => a.kind === A.MANY_TO_ONE && a.name === t.mappedProperty;
             break;
-          case T.MANY_TO_ONE:
-            s = (a) => a.kind === T.ONE_TO_MANY && a.mappedProperty === t.name;
+          case A.MANY_TO_ONE:
+            s = (a) => a.kind === A.ONE_TO_MANY && a.mappedProperty === t.name;
             break;
-          case T.ONE_TO_ONE:
-            s = (a) => a.kind === T.ONE_TO_ONE && a.mappedEntity === e.name;
+          case A.ONE_TO_ONE:
+            s = (a) => a.kind === A.ONE_TO_ONE && a.mappedEntity === e.name;
             break;
         }
         const i = n.relations.find(s);
@@ -5782,8 +5797,8 @@ class li {
         o = a.propertyMap.get(u);
       } else {
         if (a.relationMap.has(u) === !1) throw new R(`relation '${u}' not found`);
-        const h = a.relationMap.get(u);
-        n.push({ relation: h, metadata: a }), a = this.getEntityMetadata(h.mappedEntity, h.mappedNamespace);
+        const p = a.relationMap.get(u);
+        n.push({ relation: p, metadata: a }), a = this.getEntityMetadata(p.mappedEntity, p.mappedNamespace);
       }
     }), {
       property: o,
@@ -5796,14 +5811,14 @@ class li {
    * 获取实体元数据
    */
   getEntityMetadata(e, t) {
-    const n = G(e, t);
+    const n = V(e, t);
     return this.#e.get(n);
   }
   /**
    * 获取实体元数据
    */
   getEntityType(e, t) {
-    const n = G(e, t);
+    const n = V(e, t);
     return this.#n.get(n);
   }
   /**
@@ -5812,7 +5827,7 @@ class li {
    * @param namespace 命名空间
    */
   getEntityTypeByTableName(e, t) {
-    return this.#t.get(G(e, t)) ?? this.#n.get(G(e, t));
+    return this.#t.get(V(e, t)) ?? this.#n.get(V(e, t));
   }
   /**
    * 通过 tableName 获取实体元数据
@@ -5820,10 +5835,10 @@ class li {
    * @param namespace 命名空间
    */
   getEntityMetadataByTableName(e, t) {
-    return this.#r.get(G(e, t)) ?? this.#e.get(G(e, t));
+    return this.#r.get(V(e, t)) ?? this.#e.get(V(e, t));
   }
 }
-const ui = "0.0.10", Ze = (r) => `${r.namespace}:${r.entity}:${r.entityId}`, fa = (r) => r.split(":");
+const gi = "0.0.15", we = (r) => `${r.namespace}:${r.entity}:${r.entityId}`, wa = (r) => r.split(":", 3);
 function un(r, e = {
   deletes: /* @__PURE__ */ new Map(),
   updates: /* @__PURE__ */ new Map(),
@@ -5831,7 +5846,7 @@ function un(r, e = {
 }) {
   const t = [...r].sort((n, s) => n.id - s.id);
   for (const n of t) {
-    const s = Ze(n);
+    const s = we(n);
     switch (n.type) {
       case "INSERT":
         e.inserts.set(s, {
@@ -5861,7 +5876,7 @@ function un(r, e = {
   }
   return e;
 }
-function ft(r) {
+function yt(r) {
   const e = /* @__PURE__ */ new Map();
   for (const t of r) {
     const n = `${t.namespace}:${t.name}`, s = {
@@ -5871,7 +5886,7 @@ function ft(r) {
     };
     if (t.relations) {
       for (const i of t.relations)
-        if (i.kind === T.MANY_TO_ONE || i.kind === T.ONE_TO_ONE) {
+        if (i.kind === A.MANY_TO_ONE || i.kind === A.ONE_TO_ONE) {
           const a = i.mappedEntity, o = i.mappedNamespace || t.namespace;
           s.dependsOn.push({
             namespace: o,
@@ -5886,9 +5901,9 @@ function ft(r) {
       const s = `${n.namespace}:${n.entity}`, i = e.get(s);
       i && i.requiredBy.push(t.repository);
     }
-  return di(e), e;
+  return _i(e), e;
 }
-function di(r) {
+function _i(r) {
   const e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set(), n = [];
   function s(i) {
     e.add(i), t.add(i), n.push(i);
@@ -5910,20 +5925,20 @@ function di(r) {
   for (const i of r.keys())
     e.has(i) || s(i);
 }
-function hi(r, e) {
+function bi(r, e) {
   return r.sync || e;
 }
 function j(r, e) {
-  const t = hi(r, e);
+  const t = bi(r, e);
   if (!t)
     return "none";
-  if (t.type === fe.Filter)
+  if (t.type === ye.Filter)
     return "filter";
-  if (t.type === fe.QueryCache)
+  if (t.type === ye.QueryCache)
     return "querycache";
-  if (t.type === fe.Full)
+  if (t.type === ye.Full)
     return "full";
-  if (t.type === fe.None) {
+  if (t.type === ye.None) {
     const n = !!t.local, s = !!t.remote;
     return !r.sync && n && s ? "full" : n && s ? "none" : s && !n ? "remote" : n && !s ? "local" : "none";
   }
@@ -5933,17 +5948,17 @@ function dn(r, e) {
   const t = j(r, e);
   return t === "full" || t === "filter" || t === "remote";
 }
-function pi(r, e) {
+function wi(r, e) {
   const t = j(r, e);
   return t === "full" || t === "filter" || t === "local";
 }
-function fi(r, e) {
+function vi(r, e) {
   return j(r, e) === "none";
 }
-function ya(r, e) {
-  return r.filter((t) => !fi(t, e));
+function va(r, e) {
+  return r.filter((t) => !vi(t, e));
 }
-function ma(r, e) {
+function Ea(r, e) {
   const t = {
     full: [],
     filter: [],
@@ -5958,7 +5973,7 @@ function ma(r, e) {
   }
   return t;
 }
-function yt(r, e) {
+function mt(r, e) {
   const t = [], n = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
   function i(a) {
     if (n.has(a)) return;
@@ -5979,39 +5994,39 @@ function yt(r, e) {
     i(a);
   return t;
 }
-function yi(r) {
-  return yt(r, "pull");
+function Ei(r) {
+  return mt(r, "pull");
 }
-function mi(r) {
-  return yt(r, "push");
+function Ri(r) {
+  return mt(r, "push");
 }
 function hn(r) {
   if (!r || typeof r != "object") return !1;
   const e = r;
   return (e.combinator === "and" || e.combinator === "or") && Array.isArray(e.rules);
 }
-const gi = {
+const Ci = {
   limit: 1e3,
   fetchAll: !1,
   includeRelated: !0,
   filter: void 0
 };
 async function pn(r, e, t, n) {
-  const s = { ...gi, ...n }, i = r.rxdb;
-  i.dispatchEvent(new it("pull", e, t, s.includeRelated));
+  const s = { ...Ci, ...n }, i = r.rxdb;
+  i.dispatchEvent(new at("pull", e, t, s.includeRelated));
   try {
-    const a = await _i(r, e, t, s);
+    const a = await Ii(r, e, t, s);
     return i.dispatchEvent(
-      new at("pull", e, t, {
+      new ot("pull", e, t, {
         pulled: a.pulled,
         compacted: a.compacted
       })
     ), a;
   } catch (a) {
-    throw i.dispatchEvent(new ot("pull", e, t, a)), a;
+    throw i.dispatchEvent(new ct("pull", e, t, a)), a;
   }
 }
-async function _i(r, e, t, n) {
+async function Ii(r, e, t, n) {
   const s = r.rxdb.config.entities.find((c) => {
     const u = I(c);
     return u.namespace === e && u.name === t;
@@ -6041,15 +6056,15 @@ async function _i(r, e, t, n) {
     }
   }
   const l = { ...n, filter: o };
-  return n.includeRelated ? await bi(r, e, t, l) : await fn(r, e, t, l);
+  return n.includeRelated ? await Ai(r, e, t, l) : await fn(r, e, t, l);
 }
-async function bi(r, e, t, n) {
-  const s = r.rxdb.config.entities.map((y) => I(y)), i = ft(s), a = new Map(
+async function Ai(r, e, t, n) {
+  const s = r.rxdb.config.entities.map((y) => I(y)), i = yt(s), a = new Map(
     r.rxdb.config.entities.map((y) => {
       const g = I(y);
       return [`${g.namespace}:${g.name}`, y];
     })
-  ), o = yi(i), l = `${e}:${t}`;
+  ), o = Ei(i), l = `${e}:${t}`;
   if (!i.get(l))
     throw new R(`Repository ${e}:${t} not found in dependency graph`);
   const u = /* @__PURE__ */ new Set([l]), d = (y) => {
@@ -6061,17 +6076,17 @@ async function bi(r, e, t, n) {
       }
   };
   d(l);
-  const h = o.filter((y) => {
+  const p = o.filter((y) => {
     const g = `${y.namespace}:${y.entity}`;
     return u.has(g);
-  }), p = [], m = /* @__PURE__ */ new Set();
-  for (const y of h) {
+  }), h = [], m = /* @__PURE__ */ new Set();
+  for (const y of p) {
     const g = `${y.namespace}:${y.entity}`;
     if (i.get(g)?.dependsOn.some((b) => {
       const w = `${b.namespace}:${b.entity}`;
       return m.has(w);
     })) {
-      p.push({
+      h.push({
         repository: y,
         success: !1,
         skipped: "Dependency failed",
@@ -6088,10 +6103,10 @@ async function bi(r, e, t, n) {
       if (b) {
         const B = I(b), U = j(B, r.rxdb.config.sync);
         if (U === "filter") {
-          const A = B.sync;
-          if (A?.remote?.filter)
+          const T = B.sync;
+          if (T?.remote?.filter)
             try {
-              const q = A.remote.filter();
+              const q = T.remote.filter();
               q && hn(q) && (w = q);
             } catch {
               w = void 0;
@@ -6104,9 +6119,9 @@ async function bi(r, e, t, n) {
         includeRelated: !1
         // 防止递归级联
       });
-      E.success = !0, p.push(E);
+      E.success = !0, h.push(E);
     } catch (b) {
-      p.push({
+      h.push({
         repository: y,
         success: !1,
         error: b instanceof Error ? b : new Error(String(b)),
@@ -6117,10 +6132,10 @@ async function bi(r, e, t, n) {
       }), m.add(g);
     }
   }
-  const f = p.find((y) => y.repository.namespace === e && y.repository.entity === t);
+  const f = h.find((y) => y.repository.namespace === e && y.repository.entity === t);
   if (!f)
     throw new R("Internal error: target repository result not found");
-  if (f.relatedResults = p.filter((y) => y !== f), !f.success && f.error)
+  if (f.relatedResults = h.filter((y) => y !== f), !f.success && f.error)
     throw f.error;
   return f;
 }
@@ -6128,29 +6143,29 @@ async function fn(r, e, t, n) {
   if (!r.rxdb.config.sync?.remote?.adapter)
     throw new R("Remote adapter not configured.");
   const { adapter: a } = await r.getRemoteRepositories(), { adapter: o } = await r.getLocalRepositories(), l = await r.getCurrentBranch(), c = `${e}:${t}:${l.id}`, u = o.getRepository(z);
-  let h = (await u.find({
+  let p = (await u.find({
     where: {
       combinator: "and",
       rules: [{ field: "id", operator: "=", value: c }]
     },
     limit: 1
   }))[0];
-  if (!h) {
+  if (!p) {
     const E = r.rxdb.config.entities.find((q) => {
       const Z = I(q);
       return Z.namespace === e && Z.name === t;
-    }), B = I(E), U = j(B, r.rxdb.config.sync), A = new z();
-    A.id = c, A.namespace = e, A.entity = t, A.branchId = l.id, A.syncType = U, A.lastPushedChangeId = null, A.lastPushedAt = null, A.lastPulledAt = null, A.lastPullRemoteChangeId = null, A.enabled = !0, A.createdAt = /* @__PURE__ */ new Date(), A.updatedAt = /* @__PURE__ */ new Date(), h = await u.create(A);
+    }), B = I(E), U = j(B, r.rxdb.config.sync), T = new z();
+    T.id = c, T.namespace = e, T.entity = t, T.branchId = l.id, T.syncType = U, T.lastPushedChangeId = null, T.lastPushedAt = null, T.lastPulledAt = null, T.lastPullRemoteChangeId = null, T.enabled = !0, T.createdAt = /* @__PURE__ */ new Date(), T.updatedAt = /* @__PURE__ */ new Date(), p = await u.create(T);
   }
-  const p = await u.find({
+  const h = await u.find({
     where: {
       combinator: "and",
       rules: [{ field: "id", operator: "=", value: c }]
     },
     limit: 1
   });
-  p.length > 0 && (h = p[0]);
-  const m = h.lastPullRemoteChangeId;
+  h.length > 0 && (p = h[0]);
+  const m = p.lastPullRemoteChangeId;
   let f = 0, y = 0, g = 0, _ = !1, v, b = m ?? 0;
   const w = {
     deletes: /* @__PURE__ */ new Map(),
@@ -6167,7 +6182,7 @@ async function fn(r, e, t, n) {
     const B = w.inserts.size + w.updates.size + w.deletes.size;
     if (y += E.length - B, _ = E.length >= n.limit, await o.mergeChanges(w, void 0, !0), B > 0) {
       const U = v.id;
-      h = await u.update(h, {
+      p = await u.update(p, {
         lastPullRemoteChangeId: U,
         lastPulledAt: /* @__PURE__ */ new Date(),
         updatedAt: /* @__PURE__ */ new Date()
@@ -6183,27 +6198,27 @@ async function fn(r, e, t, n) {
     hasMore: _
   };
 }
-const wi = {
+const Ti = {
   batchSize: 1e3,
   includeRelated: !0
 };
 async function yn(r, e, t, n) {
-  const s = { ...wi, ...n }, i = r.rxdb;
-  i.dispatchEvent(new it("push", e, t, s.includeRelated));
+  const s = { ...Ti, ...n }, i = r.rxdb;
+  i.dispatchEvent(new at("push", e, t, s.includeRelated));
   try {
-    const a = await vi(r, e, t, s);
+    const a = await Si(r, e, t, s);
     return i.dispatchEvent(
-      new at("push", e, t, {
+      new ot("push", e, t, {
         pushed: a.pushed,
         compacted: a.compacted,
         failed: a.failed
       })
     ), a;
   } catch (a) {
-    throw i.dispatchEvent(new ot("push", e, t, a)), a;
+    throw i.dispatchEvent(new ct("push", e, t, a)), a;
   }
 }
-async function vi(r, e, t, n) {
+async function Si(r, e, t, n) {
   const s = r.rxdb.config.entities.find((o) => {
     const l = I(o);
     return l.namespace === e && l.name === t;
@@ -6215,10 +6230,10 @@ async function vi(r, e, t, n) {
     throw new R(`Cannot push repository ${e}:${t}: syncType is 'none'.`);
   if (a === "remote")
     throw new R(`Cannot push repository ${e}:${t}: syncType is 'remote' (read-only).`);
-  return n.includeRelated ? await Ei(r, e, t, n) : await mn(r, e, t);
+  return n.includeRelated ? await Mi(r, e, t, n) : await mn(r, e, t);
 }
-async function Ei(r, e, t, n) {
-  const s = r.rxdb.config.entities.map((f) => I(f)), i = ft(s), a = mi(i), o = `${e}:${t}`;
+async function Mi(r, e, t, n) {
+  const s = r.rxdb.config.entities.map((f) => I(f)), i = yt(s), a = Ri(i), o = `${e}:${t}`;
   if (!i.get(o))
     throw new R(`Repository ${e}:${t} not found in dependency graph`);
   const c = /* @__PURE__ */ new Set([o]), u = (f) => {
@@ -6233,14 +6248,14 @@ async function Ei(r, e, t, n) {
   const d = a.filter((f) => {
     const y = `${f.namespace}:${f.entity}`;
     return c.has(y);
-  }), h = [], p = /* @__PURE__ */ new Set();
+  }), p = [], h = /* @__PURE__ */ new Set();
   for (const f of d) {
     const y = `${f.namespace}:${f.entity}`;
     if (i.get(y)?.dependsOn.some((v) => {
       const b = `${v.namespace}:${v.entity}`;
-      return p.has(b);
+      return h.has(b);
     })) {
-      h.push({
+      p.push({
         repository: f,
         success: !1,
         skipped: "Dependency failed",
@@ -6248,7 +6263,7 @@ async function Ei(r, e, t, n) {
         failed: 0,
         compacted: 0,
         originalCount: 0
-      }), p.add(y);
+      }), h.add(y);
       continue;
     }
     try {
@@ -6257,9 +6272,9 @@ async function Ei(r, e, t, n) {
         includeRelated: !1
         // 防止递归级联
       });
-      v.success = !0, h.push(v);
+      v.success = !0, p.push(v);
     } catch (v) {
-      h.push({
+      p.push({
         repository: f,
         success: !1,
         error: v instanceof Error ? v : new Error(String(v)),
@@ -6267,13 +6282,13 @@ async function Ei(r, e, t, n) {
         failed: 0,
         compacted: 0,
         originalCount: 0
-      }), p.add(y);
+      }), h.add(y);
     }
   }
-  const m = h.find((f) => f.repository.namespace === e && f.repository.entity === t);
+  const m = p.find((f) => f.repository.namespace === e && f.repository.entity === t);
   if (!m)
     throw new R("Internal error: target repository result not found");
-  if (m.relatedResults = h.filter((f) => f !== m), !m.success && m.error)
+  if (m.relatedResults = p.filter((f) => f !== m), !m.success && m.error)
     throw m.error;
   return m;
 }
@@ -6293,10 +6308,10 @@ async function mn(r, e, t, n) {
     const E = r.rxdb.config.entities.find((q) => {
       const Z = I(q);
       return Z.namespace === e && Z.name === t;
-    }), B = I(E), U = j(B, r.rxdb.config.sync), A = new z();
-    A.id = l, A.namespace = e, A.entity = t, A.branchId = o.id, A.syncType = U, A.lastPushedChangeId = null, A.lastPushedAt = null, A.lastPulledAt = null, A.lastPullRemoteChangeId = null, A.enabled = !0, A.createdAt = /* @__PURE__ */ new Date(), A.updatedAt = /* @__PURE__ */ new Date(), d = await c.create(A);
+    }), B = I(E), U = j(B, r.rxdb.config.sync), T = new z();
+    T.id = l, T.namespace = e, T.entity = t, T.branchId = o.id, T.syncType = U, T.lastPushedChangeId = null, T.lastPushedAt = null, T.lastPulledAt = null, T.lastPullRemoteChangeId = null, T.enabled = !0, T.createdAt = /* @__PURE__ */ new Date(), T.updatedAt = /* @__PURE__ */ new Date(), d = await c.create(T);
   }
-  const h = d.lastPushedChangeId, p = a.getRepository(H), m = await Ri(p, o.id, h, [t]), f = m.length;
+  const p = d.lastPushedChangeId, h = a.getRepository(K), m = await Oi(h, o.id, p, [t]), f = m.length;
   if (f === 0)
     return {
       repository: { namespace: e, entity: t },
@@ -6357,7 +6372,7 @@ async function mn(r, e, t, n) {
     originalCount: f
   };
 }
-async function Ri(r, e, t, n) {
+async function Oi(r, e, t, n) {
   const s = [
     { field: "branchId", operator: "=", value: e },
     { field: "revertChangeId", operator: "=", value: null },
@@ -6373,23 +6388,23 @@ async function Ri(r, e, t, n) {
 }
 async function gn(r, e, t, n) {
   const s = r.rxdb, i = n?.pull?.includeRelated ?? n?.push?.includeRelated ?? !0;
-  s.dispatchEvent(new it("sync", e, t, i));
+  s.dispatchEvent(new at("sync", e, t, i));
   try {
-    const a = await Ci(r, e, t, n), o = {
+    const a = await xi(r, e, t, n), o = {
       pulled: a.pullResult?.pulled ?? 0,
       pushed: a.pushResult?.pushed ?? 0,
       compacted: (a.pullResult?.compacted ?? 0) + (a.pushResult?.compacted ?? 0),
       failed: a.pushResult?.failed ?? 0
     };
-    return s.dispatchEvent(new at("sync", e, t, o)), a;
+    return s.dispatchEvent(new ot("sync", e, t, o)), a;
   } catch (a) {
-    throw s.dispatchEvent(new ot("sync", e, t, a)), a;
+    throw s.dispatchEvent(new ct("sync", e, t, a)), a;
   }
 }
-async function Ci(r, e, t, n) {
+async function xi(r, e, t, n) {
   const s = r.rxdb.config.entities.find((d) => {
-    const h = I(d);
-    return h.namespace === e && h.name === t;
+    const p = I(d);
+    return p.namespace === e && p.name === t;
   });
   if (!s)
     throw new R(`Entity not found: ${e}:${t}`);
@@ -6418,7 +6433,7 @@ async function Ci(r, e, t, n) {
     pushResult: c
   };
 }
-function Ii(r, e) {
+function Ni(r, e) {
   if (e.repositories && e.repositories.length > 0)
     return e.repositories;
   const t = [];
@@ -6447,7 +6462,7 @@ async function _n(r, e, t) {
     };
   }
 }
-async function Ti(r, e, t) {
+async function Pi(r, e, t) {
   const n = [];
   for (const s of e) {
     const i = await _n(r, s, t);
@@ -6455,7 +6470,7 @@ async function Ti(r, e, t) {
   }
   return n;
 }
-async function Ai(r, e, t, n) {
+async function $i(r, e, t, n) {
   const s = [];
   for (let i = 0; i < e.length; i += n) {
     const o = e.slice(i, i + n).map((c) => _n(r, c, t)), l = await Promise.all(o);
@@ -6463,14 +6478,14 @@ async function Ai(r, e, t, n) {
   }
   return s;
 }
-async function Si(r, e = {}) {
-  const t = Date.now(), n = Ii(r, e), s = {
+async function Bi(r, e = {}) {
+  const t = Date.now(), n = Ni(r, e), s = {
     direction: e.operation,
     pull: e.pull,
     push: e.push
   }, i = e.concurrent ?? !1, a = e.concurrency ?? 3;
   let o;
-  i ? o = await Ai(r, n, s, a) : o = await Ti(r, n, s);
+  i ? o = await $i(r, n, s, a) : o = await Pi(r, n, s);
   const l = o.filter((d) => d.success).length, c = o.filter((d) => !d.success).length, u = Date.now() - t;
   return {
     succeeded: l,
@@ -6495,7 +6510,7 @@ async function bn(r, e, t) {
       pendingCount: 0,
       hasUpdates: !1
     };
-  const o = (await r.versionManager.getCurrentBranch()).id, { adapter: l } = await r.versionManager.getLocalRepositories(), c = l.getRepository(z), u = `${e}:${t}:${o}`, p = (await c.find({
+  const o = (await r.versionManager.getCurrentBranch()).id, { adapter: l } = await r.versionManager.getLocalRepositories(), c = l.getRepository(z), u = `${e}:${t}:${o}`, h = (await c.find({
     where: {
       combinator: "and",
       rules: [{ field: "id", operator: "=", value: u }]
@@ -6504,16 +6519,16 @@ async function bn(r, e, t) {
   }))[0]?.lastPullRemoteChangeId ?? null, { adapter: m } = await r.versionManager.getRemoteRepositories();
   if (!m)
     throw new Error("Remote adapter not configured");
-  const f = p ?? 0, y = i.name, { count: g, latestChangeId: _ } = await m.getChangeCount(f, [y]);
+  const f = h ?? 0, y = i.name, { count: g, latestChangeId: _ } = await m.getChangeCount(f, [y]);
   return {
     repository: n,
     remoteLatestChangeId: _,
-    localLastPullRemoteChangeId: p,
+    localLastPullRemoteChangeId: h,
     pendingCount: g,
     hasUpdates: g > 0
   };
 }
-async function Mi(r, e, t, n) {
+async function Di(r, e, t, n) {
   const s = r.rxdb, { adapter: i } = await r.getLocalRepositories(), a = s.config.entities.find((f) => {
     const y = I(f);
     return y.namespace === e && y.name === t;
@@ -6537,33 +6552,33 @@ async function Mi(r, e, t, n) {
     throw new R(
       `No filter provided and entity ${e}:${t} does not have a Filter sync configuration.`
     );
-  const u = wn(c), h = await i.getRepository(a).find({
+  const u = wn(c), p = await i.getRepository(a).find({
     where: u
-  }), p = h.map((f) => f.id), m = p.length;
+  }), h = p.map((f) => f.id), m = h.length;
   if (n?.dryRun)
     return {
       removed: m,
-      removedIds: p
+      removedIds: h
     };
   if (m > 0) {
     const f = /* @__PURE__ */ new Map();
-    for (const g of h)
+    for (const g of p)
       f.set(`${e}:${t}:${g.id}`, { patch: null, inversePatch: null });
     const y = { deletes: f, updates: /* @__PURE__ */ new Map(), inserts: /* @__PURE__ */ new Map() };
     await i.mergeChanges(y, void 0, !0);
   }
   return {
     removed: m,
-    removedIds: p
+    removedIds: h
   };
 }
 function wn(r) {
   return {
     combinator: r.combinator === "and" ? "or" : "and",
-    rules: r.rules.map((e) => "combinator" in e ? wn(e) : Oi(e))
+    rules: r.rules.map((e) => "combinator" in e ? wn(e) : Li(e))
   };
 }
-function Oi(r) {
+function Li(r) {
   const t = {
     "=": "!=",
     "!=": "=",
@@ -6591,7 +6606,7 @@ function Oi(r) {
     operator: t
   };
 }
-const xi = async (r, e, t) => {
+const Fi = async (r, e, t) => {
   const { branchRepository: n, changeRepository: s } = await r.getLocalRepositories();
   if ((await n.find({
     where: {
@@ -6618,11 +6633,11 @@ const xi = async (r, e, t) => {
       limit: 1
     }))[0];
   } else
-    a = await r.getCurrentBranch(), a && (o = await Ni(r, a.id));
+    a = await r.getCurrentBranch(), a && (o = await Ui(r, a.id));
   if (!a) throw new R("Source branch not found");
-  const l = new K();
+  const l = new H();
   return l.id = e, l.activated = !1, l.local = !0, l.remote = !1, l.fromChangeId = o?.id ?? null, l.parentId = a.id, await l.save(), l;
-}, Ni = async (r, e) => {
+}, Ui = async (r, e) => {
   const { changeRepository: t } = await r.getLocalRepositories();
   return (await t.find({
     where: {
@@ -6640,8 +6655,8 @@ const xi = async (r, e, t) => {
     limit: 1
   }))[0];
 };
-async function Pi(r, e, t, n, s) {
-  const { adapter: i } = await r.versionManager.getLocalRepositories(), a = i.getRepository(H), o = [
+async function ji(r, e, t, n, s) {
+  const { adapter: i } = await r.versionManager.getLocalRepositories(), a = i.getRepository(K), o = [
     { field: "namespace", operator: "=", value: e },
     { field: "entity", operator: "=", value: t },
     { field: "branchId", operator: "=", value: n },
@@ -6655,7 +6670,7 @@ async function Pi(r, e, t, n, s) {
     }
   })).length;
 }
-async function $i(r, e, t) {
+async function Yi(r, e, t) {
   try {
     return (await bn(r, e, t)).pendingCount;
   } catch (n) {
@@ -6672,28 +6687,28 @@ async function vn(r, e, t) {
   const s = I(n), i = j(s, r.config.sync), o = (await r.versionManager.getCurrentBranch()).id, { adapter: l } = await r.versionManager.getLocalRepositories(), c = l.getRepository(z), d = {
     combinator: "and",
     rules: [{ field: "id", operator: "=", value: `${e}:${t}:${o}` }]
-  }, h = await c.find({ where: d, limit: 1 }), p = h.length > 0 ? h[0] : null;
+  }, p = await c.find({ where: d, limit: 1 }), h = p.length > 0 ? p[0] : null;
   let m = 0, f = 0;
-  return pi(s) && (m = await Pi(
+  return wi(s) && (m = await ji(
     r,
     e,
     t,
     o,
-    p?.lastPushedChangeId ?? null
-  )), dn(s) && (f = await $i(r, e, t)), {
+    h?.lastPushedChangeId ?? null
+  )), dn(s) && (f = await Yi(r, e, t)), {
     repository: { namespace: e, entity: t },
     branchId: o,
     syncType: i,
     enabled: i !== "none",
-    lastPushedChangeId: p?.lastPushedChangeId ?? null,
-    lastPushedAt: p?.lastPushedAt ?? null,
-    lastPulledAt: p?.lastPulledAt ?? null,
-    lastPullRemoteChangeId: p?.lastPullRemoteChangeId ?? null,
+    lastPushedChangeId: h?.lastPushedChangeId ?? null,
+    lastPushedAt: h?.lastPushedAt ?? null,
+    lastPulledAt: h?.lastPulledAt ?? null,
+    lastPullRemoteChangeId: h?.lastPullRemoteChangeId ?? null,
     pushableCount: m,
     pullableCount: f
   };
 }
-async function Bi(r, e) {
+async function zi(r, e) {
   const t = r.config.entities, n = [];
   for (const i of t) {
     const a = I(i), o = a.namespace, l = a.name, c = await vn(r, o, l);
@@ -6702,7 +6717,7 @@ async function Bi(r, e) {
   let s = n;
   return e?.syncType && e.syncType.length > 0 && (s = s.filter((i) => e.syncType.includes(i.syncType))), e?.enabled !== void 0 && (s = s.filter((i) => i.enabled === e.enabled)), e?.hasPendingChanges !== void 0 && (e.hasPendingChanges ? s = s.filter((i) => i.pushableCount > 0 || i.pullableCount > 0) : s = s.filter((i) => i.pushableCount === 0 && i.pullableCount === 0)), s;
 }
-const Di = (r) => {
+const ki = (r) => {
   const { branches: e, currentBranch: t, nextBranch: n } = r, s = r.currentChangeId ?? t.fromChangeId ?? 0, i = r.nextChangeId ?? n.fromChangeId ?? 0;
   if (s === i)
     return [];
@@ -6715,11 +6730,11 @@ const Di = (r) => {
       }
     ];
   const a = /* @__PURE__ */ new Map();
-  for (const p of e)
-    a.set(p.id, p);
-  const o = (p) => {
-    const m = [p];
-    let f = p;
+  for (const h of e)
+    a.set(h.id, h);
+  const o = (h) => {
+    const m = [h];
+    let f = h;
     for (; f.parentId; ) {
       const y = a.get(f.parentId);
       if (!y) break;
@@ -6728,41 +6743,41 @@ const Di = (r) => {
     return m;
   }, l = o(t), c = o(n);
   let u = null, d = -1;
-  for (let p = 0; p < l.length; p++)
-    if (c.findIndex((f) => f.id === l[p].id) !== -1) {
-      u = l[p], d = p;
+  for (let h = 0; h < l.length; h++)
+    if (c.findIndex((f) => f.id === l[h].id) !== -1) {
+      u = l[h], d = h;
       break;
     }
-  const h = [];
+  const p = [];
   if (u) {
     for (let f = 0; f < d; f++) {
       const y = l[f], g = f === 0 ? s : l[f - 1].fromChangeId ?? 0, _ = y.fromChangeId ?? 0;
-      g !== _ && h.push({
+      g !== _ && p.push({
         branch: y,
         fromChangeId: g,
         toChangeId: _
       });
     }
-    const p = c.findIndex((f) => f.id === u.id);
-    if (p === 0) {
+    const h = c.findIndex((f) => f.id === u.id);
+    if (h === 0) {
       const f = d === 0 ? s : l[d - 1].fromChangeId ?? 0, y = i;
-      f !== y && h.push({
+      f !== y && p.push({
         branch: u,
         fromChangeId: f,
         toChangeId: y
       });
-    } else if (p > 0) {
-      const f = d === 0 ? s : l[d - 1].fromChangeId ?? 0, y = c[p - 1].fromChangeId ?? 0;
-      f !== y && h.push({
+    } else if (h > 0) {
+      const f = d === 0 ? s : l[d - 1].fromChangeId ?? 0, y = c[h - 1].fromChangeId ?? 0;
+      f !== y && p.push({
         branch: u,
         fromChangeId: f,
         toChangeId: y
       });
     }
-    const m = c.slice(0, p).reverse();
+    const m = c.slice(0, h).reverse();
     for (let f = 0; f < m.length; f++) {
       const y = m[f], g = y.fromChangeId ?? 0, _ = f === m.length - 1 ? i ?? 0 : m[f + 1].fromChangeId ?? 0;
-      g !== _ && h.push({
+      g !== _ && p.push({
         branch: y,
         fromChangeId: g,
         toChangeId: _
@@ -6771,20 +6786,20 @@ const Di = (r) => {
   } else {
     for (let _ = 0; _ < l.length; _++) {
       const v = l[_], b = _ === 0 ? s : l[_ - 1].fromChangeId ?? 0, w = v.fromChangeId ?? 0;
-      b !== w && h.push({
+      b !== w && p.push({
         branch: v,
         fromChangeId: b,
         toChangeId: w
       });
     }
-    const p = l[l.length - 1], m = p.fromChangeId ?? 0;
-    m !== 0 && h.push({
-      branch: p,
+    const h = l[l.length - 1], m = h.fromChangeId ?? 0;
+    m !== 0 && p.push({
+      branch: h,
       fromChangeId: m,
       toChangeId: 0
     });
     const f = c[c.length - 1], y = c.length > 1 ? c[c.length - 2].fromChangeId ?? 0 : i ?? 0;
-    y !== 0 && h.push({
+    y !== 0 && p.push({
       branch: f,
       fromChangeId: 0,
       toChangeId: y
@@ -6792,15 +6807,15 @@ const Di = (r) => {
     const g = c.slice(0, c.length - 1).reverse();
     for (let _ = 0; _ < g.length; _++) {
       const v = g[_], b = v.fromChangeId ?? 0, w = _ === g.length - 1 ? i ?? 0 : g[_ + 1].fromChangeId ?? 0;
-      b !== w && h.push({
+      b !== w && p.push({
         branch: v,
         fromChangeId: b,
         toChangeId: w
       });
     }
   }
-  return h;
-}, Li = async (r, e) => {
+  return p;
+}, Wi = async (r, e) => {
   const { branchRepository: t, changeRepository: n } = await r.getLocalRepositories(), s = await t.find({
     where: {
       combinator: "and",
@@ -6813,7 +6828,7 @@ const Di = (r) => {
   if (!a) throw new R(`Branch (${e}) not found`);
   if (i.id === a.id)
     throw new R("Cannot switch to the same branch");
-  const o = await Nt(n, i.id), l = await Nt(n, a.id), c = Di({
+  const o = await Pt(n, i.id), l = await Pt(n, a.id), c = ki({
     branches: s,
     currentBranch: i,
     currentChangeId: o ? o.id : null,
@@ -6825,23 +6840,23 @@ const Di = (r) => {
     inserts: /* @__PURE__ */ new Map()
   };
   for (let d = 0; d < c.length; d++) {
-    const { branch: h, fromChangeId: p, toChangeId: m } = c[d], f = p < m, y = p > m, g = Math.min(p, m), _ = Math.max(p, m), v = {
+    const { branch: p, fromChangeId: h, toChangeId: m } = c[d], f = h < m, y = h > m, g = Math.min(h, m), _ = Math.max(h, m), v = {
       where: {
         combinator: "and",
         rules: [
-          { field: "branchId", operator: "=", value: h.id },
+          { field: "branchId", operator: "=", value: p.id },
           { field: "id", operator: ">", value: g },
           { field: "id", operator: "<=", value: _ },
           { field: "revertChangeId", operator: "=", value: null }
         ]
       }
     };
-    h.fromChangeId && g < h.fromChangeId && v.where.rules.push({ field: "id", operator: ">", value: h.fromChangeId });
+    p.fromChangeId && g < p.fromChangeId && v.where.rules.push({ field: "id", operator: ">", value: p.fromChangeId });
     const b = await n.find(v);
-    y ? Ui(b, u) : f && Fi(b, u);
+    y ? Ki(b, u) : f && Hi(b, u);
   }
   return u;
-}, Fi = (r, e) => be(r, !0, e), Ui = (r, e) => be(r, !1, e), be = (r, e, t = {
+}, Hi = (r, e) => de(r, !0, e), Ki = (r, e) => de(r, !1, e), de = (r, e, t = {
   deletes: /* @__PURE__ */ new Map(),
   updates: /* @__PURE__ */ new Map(),
   inserts: /* @__PURE__ */ new Map()
@@ -6849,7 +6864,7 @@ const Di = (r) => {
   if (e) {
     const n = [...r].sort((s, i) => s.id - i.id);
     for (const s of n) {
-      const i = Ze(s);
+      const i = we(s);
       switch (s.type) {
         case "INSERT":
           t.inserts.set(i, {
@@ -6877,7 +6892,7 @@ const Di = (r) => {
   } else {
     const n = [...r].sort((s, i) => i.id - s.id);
     for (const s of n) {
-      const i = Ze(s);
+      const i = we(s);
       switch (s.type) {
         case "INSERT":
           t.deletes.set(i, {
@@ -6904,7 +6919,7 @@ const Di = (r) => {
     }
   }
   return t;
-}, Nt = async (r, e) => (await r.find({
+}, Pt = async (r, e) => (await r.find({
   where: {
     combinator: "and",
     rules: [
@@ -6915,7 +6930,7 @@ const Di = (r) => {
   orderBy: [{ field: "id", sort: "desc" }],
   limit: 1
 }))[0];
-function pe(r, e) {
+function fe(r, e) {
   return e.type === "database" ? r : r.map((t) => {
     const n = t.changes.filter((s) => e.type === "repository" ? s.namespace === e.namespace && s.entity === e.entity : s.namespace === e.namespace && s.entity === e.entity && s.entityId === e.entityId);
     return n.length === 0 ? null : {
@@ -6949,24 +6964,24 @@ function En(r) {
   ), t = [];
   return e.insert && t.push(`创建${e.insert}条`), e.update && t.push(`更新${e.update}条`), e.delete && t.push(`删除${e.delete}条`), `事务: ${t.join(", ")}`;
 }
-function ji(r) {
+function qi(r) {
   return r.type === "database" ? "database" : r.type === "repository" ? `${r.namespace}:${r.entity}` : `${r.namespace}:${r.entity}:${r.entityId}`;
 }
-class Yi {
+class Gi {
   constructor(e) {
     this.rxdb = e;
-    const t = e.entityManager.getRepository(K).findOne({
+    const t = e.entityManager.getRepository(H).findOne({
       where: {
         combinator: "and",
         rules: [{ field: "activated", operator: "=", value: !0 }]
       }
     });
-    this.#r = Ne({
+    this.#r = Pe({
       connected: this.rxdb.connected$,
       branch: t
     }).pipe(
-      Ce(({ connected: n, branch: s }) => n && !!s),
-      x(({ branch: n }) => (this.#i || (this.#i = /* @__PURE__ */ new Date()), H.findAll({
+      Ie(({ connected: n, branch: s }) => n && !!s),
+      x(({ branch: n }) => (this.#i || (this.#i = /* @__PURE__ */ new Date()), K.findAll({
         where: {
           combinator: "and",
           rules: [
@@ -6990,7 +7005,7 @@ class Yi {
     ), this.count$ = this.histories$.pipe(
       $((n) => n.length),
       P(1)
-    ), this.undoHistories$ = Ne({
+    ), this.undoHistories$ = Pe({
       histories: this.histories$,
       syncCleared: this.#s,
       trigger: this.#t
@@ -7001,7 +7016,7 @@ class Yi {
           return [];
         try {
           const i = await L(
-            this.rxdb.entityManager.getRepository(K).findOne({
+            this.rxdb.entityManager.getRepository(H).findOne({
               where: {
                 combinator: "and",
                 rules: [{ field: "activated", operator: "=", value: !0 }]
@@ -7018,22 +7033,22 @@ class Yi {
           for (const u of l) {
             let d = null;
             try {
-              const h = await o.find({
+              const p = await o.find({
                 where: {
                   combinator: "and",
                   rules: [{ field: "id", operator: "=", value: u.id }]
                 },
                 limit: 1
               });
-              h.length > 0 && (d = h[0].lastPushedChangeId);
+              p.length > 0 && (d = p[0].lastPushedChangeId);
             } catch {
               d = null;
             }
             d !== null && c.set(u.entity, d);
           }
           return n.filter((u) => u.changes.every((d) => {
-            const h = d.revertChangeId == null, p = d.remoteId == null, m = c.get(d.entity), f = m == null || d.id > m;
-            return h && p && f;
+            const p = d.revertChangeId == null, h = d.remoteId == null, m = c.get(d.entity), f = m == null || d.id > m;
+            return p && h && f;
           }));
         } catch (i) {
           return console.error("[undoHistories$] error", i), [];
@@ -7046,18 +7061,18 @@ class Yi {
     ), this.redoCount$ = this.redoHistories$.pipe(
       $((n) => n.length),
       P(1)
-    ), this.pushableCount$ = this.#n.asObservable(), this.pullableCount$ = this.#e.asObservable(), Ne({
+    ), this.pushableCount$ = this.#n.asObservable(), this.pullableCount$ = this.#e.asObservable(), Pe({
       connected: this.rxdb.connected$,
       branch: t
     }).pipe(
-      Ce(({ connected: n, branch: s }) => n && !!s),
+      Ie(({ connected: n, branch: s }) => n && !!s),
       x(({ branch: n }) => {
         const s = [
           { field: "branchId", operator: "=", value: n.id },
           { field: "revertChangeId", operator: "=", value: null },
           { field: "remoteId", operator: "=", value: null }
         ];
-        return H.count({
+        return K.count({
           where: { combinator: "and", rules: s }
         });
       })
@@ -7266,7 +7281,7 @@ class Yi {
       try {
         const e = await L(this.redoHistories$);
         if (e.length === 0) return;
-        const t = e.flatMap((o) => o.changes), n = /* @__PURE__ */ new Date(), s = be([], !1), { adapter: i } = await this.rxdb.versionManager.getLocalRepositories();
+        const t = e.flatMap((o) => o.changes), n = /* @__PURE__ */ new Date(), s = de([], !1), { adapter: i } = await this.rxdb.versionManager.getLocalRepositories();
         t.forEach((o) => {
           const l = `${o.namespace}:RxDBChange:${o.id}`;
           s.updates.set(l, {
@@ -7348,7 +7363,7 @@ class Yi {
           entity: m.name
         };
       }
-    const n = ji(t);
+    const n = qi(t);
     if (this.history_cache) {
       const m = this.history_cache.get(n);
       if (m)
@@ -7363,7 +7378,7 @@ class Yi {
       const m = (this.history_ref_counts.get(n) || 0) + 1;
       this.history_ref_counts.set(n, m);
     }, a = this.histories$.pipe(
-      $((m) => pe(m, t)),
+      $((m) => fe(m, t)),
       Ft(s),
       P({ bufferSize: 1, refCount: !0 })
     ), o = (m) => new Ut((f) => {
@@ -7374,12 +7389,12 @@ class Yi {
       };
     }), l = o(
       this.undoHistories$.pipe(
-        $((m) => pe(m, t)),
+        $((m) => fe(m, t)),
         P({ bufferSize: 1, refCount: !0 })
       )
     ), c = o(
       this.redoHistories$.pipe(
-        $((m) => pe(m, t)),
+        $((m) => fe(m, t)),
         P({ bufferSize: 1, refCount: !0 })
       )
     ), u = o(
@@ -7392,29 +7407,29 @@ class Yi {
         $((m) => m.length),
         P({ bufferSize: 1, refCount: !0 })
       )
-    ), h = o(
+    ), p = o(
       c.pipe(
         $((m) => m.length),
         P({ bufferSize: 1, refCount: !0 })
       )
-    ), p = {
+    ), h = {
       type: t.type,
       histories$: a,
       undoHistories$: l,
       redoHistories$: c,
       count$: u,
       undoCount$: d,
-      redoCount$: h,
+      redoCount$: p,
       undo: async (m = 1) => {
-        const y = (await this.#o()).filter((v) => v.changes.every((b) => b.revertChangeId == null)), _ = pe(y, t).slice(0, m);
+        const y = (await this.#o()).filter((v) => v.changes.every((b) => b.revertChangeId == null)), _ = fe(y, t).slice(0, m);
         _.length !== 0 && await this.#u("undo", _);
       },
       redo: async (m = 1) => {
-        const f = await L(this.redoHistories$), g = pe(f, t).slice(0, m);
+        const f = await L(this.redoHistories$), g = fe(f, t).slice(0, m);
         g.length !== 0 && await this.#u("redo", g);
       }
     };
-    return this.history_cache && this.history_cache.set(n, p), p;
+    return this.history_cache && this.history_cache.set(n, h), h;
   }
   /**
    * 直接从数据库查询最新变更并转换为历史项
@@ -7491,10 +7506,10 @@ class Yi {
    * @returns 结构化的历史项，包含描述、类型、状态等信息
    */
   #c(e) {
-    const t = e[0], n = e.length, s = t.transactionId ?? null, i = t.createdAt, a = t.namespace, o = t.entity, l = s ? "TRANSACTION" : t.type, c = [l, t.entityId, i.getTime()].join(":"), u = e.some((h) => mt(h.revertChangeId) === !1), d = e.some((h) => mt(h.redoInvalidatedAt) === !1);
+    const t = e[0], n = e.length, s = t.transactionId ?? null, i = t.createdAt, a = t.namespace, o = t.entity, l = s ? "TRANSACTION" : t.type, c = [l, t.entityId, i.getTime()].join(":"), u = e.some((p) => gt(p.revertChangeId) === !1), d = e.some((p) => gt(p.redoInvalidatedAt) === !1);
     return {
       transactionId: s,
-      changeId: Math.max(...e.map((h) => h.id)),
+      changeId: Math.max(...e.map((p) => p.id)),
       fingerprint: c,
       changes: e,
       type: l,
@@ -7524,18 +7539,18 @@ class Yi {
   async #u(e, t) {
     this.isUndoRedoInProgress = !0;
     try {
-      const n = t.flatMap((o) => o.changes).sort((o, l) => e === "undo" ? l.id - o.id : o.id - l.id), s = be(n, e === "redo");
+      const n = t.flatMap((o) => o.changes).sort((o, l) => e === "undo" ? l.id - o.id : o.id - l.id), s = de(n, e === "redo");
       if (e === "undo") {
         const { adapter: o } = await this.rxdb.versionManager.getLocalRepositories(), l = await o.getRxDBChangeSequence(), c = /* @__PURE__ */ new Date();
         n.forEach((u, d) => {
-          const h = `${u.namespace}:RxDBChange:${u.id}`, p = s.updates.get(h) || { patch: {}, inversePatch: null };
-          s.updates.set(h, {
+          const p = `${u.namespace}:RxDBChange:${u.id}`, h = s.updates.get(p) || { patch: {}, inversePatch: null };
+          s.updates.set(p, {
             patch: {
-              ...p.patch,
+              ...h.patch,
               revertChangeId: l + d + 1,
               revertChangedAt: c
             },
-            inversePatch: p.inversePatch
+            inversePatch: h.inversePatch
           });
         }), s.updateRxDBChangeSequence = l + n.length;
       } else
@@ -7569,7 +7584,7 @@ class Yi {
         return;
       }
       const n = (await L(this.rxdb.localAdapter$)).getRepository(z), s = await L(
-        this.rxdb.entityManager.getRepository(K).findOne({
+        this.rxdb.entityManager.getRepository(H).findOne({
           where: {
             combinator: "and",
             rules: [{ field: "activated", operator: "=", value: !0 }]
@@ -7604,7 +7619,7 @@ class Yi {
           rules: u
         };
       }), l = await L(
-        H.count({
+        K.count({
           where: {
             combinator: "and",
             rules: [
@@ -7623,7 +7638,90 @@ class Yi {
     }
   }
 }
-async function Pt(r, e) {
+const Rn = async (r, e) => {
+  const { branchRepository: t, changeRepository: n, adapter: s } = await r.getLocalRepositories();
+  if (e === "main")
+    throw new R("Cannot remove main branch");
+  const i = (await t.find({
+    where: {
+      combinator: "and",
+      rules: [{ field: "id", operator: "=", value: e }]
+    },
+    limit: 1
+  }))[0];
+  if (!i)
+    throw new R(`Branch '${e}' not found`);
+  if (i.activated)
+    throw new R(`Cannot remove active branch '${e}'. Switch to another branch first.`);
+  const a = await n.find({
+    where: {
+      combinator: "and",
+      rules: [{ field: "branchId", operator: "=", value: e }]
+    }
+  });
+  if (a.length > 0) {
+    const o = a.map((c) => c.id);
+    if ((await t.find({
+      where: {
+        combinator: "and",
+        rules: [
+          { field: "fromChangeId", operator: "in", value: o },
+          { field: "id", operator: "!=", value: e }
+        ]
+      },
+      limit: 1
+    }))?.length)
+      throw new R(`Cannot remove branch '${e}' because it has child branches`);
+  }
+  await s.removeMany([...a, i]);
+}, Vi = async (r, e, t, n) => {
+  const s = n?.strategy ?? "squash", i = n?.deleteSource ?? !1, { branchRepository: a, changeRepository: o, adapter: l } = await r.getLocalRepositories();
+  if (e === t)
+    throw new R(`Cannot merge branch '${e}' into itself`);
+  const c = (await a.find({
+    where: {
+      combinator: "and",
+      rules: [{ field: "id", operator: "=", value: e }]
+    },
+    limit: 1
+  }))[0];
+  if (!c)
+    throw new R(`Branch '${e}' not found`);
+  const u = await o.find({
+    where: {
+      combinator: "and",
+      rules: [
+        { field: "branchId", operator: "=", value: e },
+        { field: "revertChangeId", operator: "=", value: null },
+        ...c.fromChangeId != null ? [{ field: "id", operator: ">", value: c.fromChangeId }] : []
+      ]
+    },
+    orderBy: [{ field: "id", sort: "asc" }]
+  }), d = async () => i ? (await Rn(r, e), !0) : !1;
+  if (u.length === 0)
+    return { merged: 0, strategy: s, sourceDeleted: await d() };
+  let p;
+  if (s === "normal") {
+    for (const h of u) {
+      const m = {
+        deletes: /* @__PURE__ */ new Map(),
+        updates: /* @__PURE__ */ new Map(),
+        inserts: /* @__PURE__ */ new Map()
+      }, f = we(h);
+      h.type === "INSERT" ? m.inserts.set(f, { patch: h.patch, inversePatch: null }) : h.type === "UPDATE" ? m.updates.set(f, { patch: h.patch, inversePatch: h.inversePatch }) : h.type === "DELETE" && m.deletes.set(f, { patch: null, inversePatch: h.inversePatch }), await l.mergeChanges(m, void 0, !1);
+    }
+    p = u.length;
+  } else {
+    const h = de(u, !0), m = new Set(u.filter((f) => f.type === "INSERT").map((f) => we(f)));
+    for (const f of m)
+      h.deletes.has(f) && h.deletes.delete(f);
+    if (p = h.inserts.size + h.updates.size + h.deletes.size, p === 0)
+      return { merged: 0, strategy: s, sourceDeleted: await d() };
+    await l.mergeChanges(h, void 0, !1);
+  }
+  return { merged: p, strategy: s, sourceDeleted: await d() };
+};
+async function $t(r, e) {
   const t = r.rxdb;
   if (!t.config.sync?.remote?.adapter)
     throw new R("Remote adapter not configured.");
@@ -7636,8 +7734,8 @@ async function Pt(r, e) {
     let a = 0, o = 0, l = 0, c = !1;
     for (const d of i.results)
       if (d.success && d.result) {
-        const h = d.result.pullResult;
-        a += h.pulled ?? 0, o += h.compacted ?? 0, l += h.applied ?? 0, h.hasMore && (c = !0);
+        const p = d.result.pullResult;
+        a += p.pulled ?? 0, o += p.compacted ?? 0, l += p.applied ?? 0, p.hasMore && (c = !0);
       }
     const u = {
       pulled: a,
@@ -7650,7 +7748,7 @@ async function Pt(r, e) {
     throw t.dispatchEvent(new kt("pull", s)), s;
   }
 }
-async function $t(r, e) {
+async function Bt(r, e) {
   const t = r.rxdb;
   if (!t.config.sync?.remote?.adapter)
     throw new R("Remote adapter not configured.");
@@ -7663,8 +7761,8 @@ async function $t(r, e) {
     let a = 0, o = 0, l = 0, c = 0;
     for (const d of i.results)
       if (d.success && d.result) {
-        const h = d.result.pushResult;
-        a += h.pushed ?? 0, o += h.failed ?? 0, l += h.compacted ?? 0, c += h.originalCount ?? 0;
+        const p = d.result.pushResult;
+        a += p.pushed ?? 0, o += p.failed ?? 0, l += p.compacted ?? 0, c += p.originalCount ?? 0;
       } else
         o++;
     const u = {
@@ -7678,46 +7776,9 @@ async function $t(r, e) {
     throw t.dispatchEvent(new kt("push", s)), s;
   }
 }
-const zi = async (r, e) => {
-  const { branchRepository: t, changeRepository: n, adapter: s } = await r.getLocalRepositories();
-  if (e === "main")
-    throw new R("Cannot remove main branch");
-  const i = (await t.find({
-    where: {
-      combinator: "and",
-      rules: [{ field: "id", operator: "=", value: e }]
-    },
-    limit: 1
-  }))[0];
-  if (!i)
-    throw new R(`Branch '${e}' not found`);
-  if (i.activated)
-    throw new R(`Cannot remove active branch '${e}'. Switch to another branch first.`);
-  const a = await n.find({
-    where: {
-      combinator: "and",
-      rules: [{ field: "branchId", operator: "=", value: e }]
-    }
-  });
-  if (a.length > 0) {
-    const o = a.map((c) => c.id);
-    if ((await t.find({
-      where: {
-        combinator: "and",
-        rules: [
-          { field: "fromChangeId", operator: "in", value: o },
-          { field: "id", operator: "!=", value: e }
-        ]
-      },
-      limit: 1
-    }))?.length)
-      throw new R(`Cannot remove branch '${e}' because it has child branches`);
-  }
-  await s.removeMany([...a, i]);
-};
-class ki {
+class Qi {
   constructor(e) {
-    this.rxdb = e, this.historyManager = new Yi(this.rxdb);
+    this.rxdb = e, this.historyManager = new Gi(this.rxdb);
   }
   #e = [];
   /**
@@ -7764,14 +7825,14 @@ class ki {
    * @param fromChangeId 从哪个 changeId 创建新分支
    */
   async createBranch(e, t) {
-    return xi(this, e, t);
+    return Fi(this, e, t);
   }
   /**
    * 删除分支
    * @param branchId 分支 id
    */
   async removeBranch(e) {
-    return zi(this, e);
+    return Rn(this, e);
   }
   // ============================================
   // Pull/Push 同步方法
@@ -7795,7 +7856,7 @@ class ki {
    * ```
    */
   async pull(e) {
-    const t = await this.historyManager.syncing(() => Pt(this, e));
+    const t = await this.historyManager.syncing(() => $t(this, e));
     return this.historyManager.resetPullableCount(), t.pulled > 0 && this.historyManager.clearUndoHistory(), t;
   }
   /**
@@ -7822,7 +7883,7 @@ class ki {
    * ```
    */
   async push(e) {
-    const t = await this.historyManager.syncing(() => $t(this, e));
+    const t = await this.historyManager.syncing(() => Bt(this, e));
     return t.pushed > 0 && this.historyManager.clearUndoHistory(), t;
   }
   /**
@@ -7844,35 +7905,34 @@ class ki {
    */
   async sync(e) {
     const t = await this.historyManager.syncing(async () => {
-      const n = await Pt(this, e?.pull), s = await $t(this, e?.push);
+      const n = await $t(this, e?.pull), s = await Bt(this, e?.push);
       return { pullResult: n, pushResult: s };
     });
     return (t.pullResult.pulled > 0 || t.pushResult.pushed > 0) && this.historyManager.clearUndoHistory(), t;
   }
   // ============================================
-  // Repository-level sync methods
+  // Repository 级别同步方法
   // ============================================
   /**
-   * Pull changes for a specific repository
+   * 拉取指定 Repository 的远程变更
    *
-   * Provides fine-grained control over synchronization at the entity type level.
-   * Supports cascade synchronization to automatically pull related entities.
+   * 提供实体类型级别的精细同步控制，支持级联同步以自动拉取关联实体。
    *
-   * @param namespace - Entity namespace (e.g., "public")
-   * @param entity - Entity name (e.g., "Todo")
-   * @param options - Pull options
-   * @returns Pull result
+   * @param namespace - 实体命名空间（如 "public"）
+   * @param entity - 实体名称（如 "Todo"）
+   * @param options - 拉取选项
+   * @returns 拉取结果
    *
    * @example
    * ```typescript
-   * // Pull Todo repository with cascading dependencies
+   * // 拉取 Todo 并级联拉取依赖
    * const result = await rxdb.versionManager.pullRepository('public', 'Todo', {
-   *   includeRelated: true // Default: automatically pulls User if Todo has foreign key
+   *   includeRelated: true // 默认：若 Todo 有外键则自动拉取 User
    * });
    *
-   * // Pull without cascading
+   * // 不级联拉取
    * const result = await rxdb.versionManager.pullRepository('public', 'Todo', {
-   *   includeRelated: false // Only pull Todo, may cause foreign key errors
+   *   includeRelated: false // 仅拉取 Todo，可能引发外键错误
    * });
    * ```
    */
@@ -7881,26 +7941,25 @@ class ki {
     return s.pulled > 0 && this.historyManager.clearUndoHistory(), s;
   }
   /**
-   * Push changes for a specific repository
+   * 推送指定 Repository 的本地变更
    *
-   * Provides fine-grained control over synchronization at the entity type level.
-   * Supports cascade synchronization to automatically push dependent entities.
+   * 提供实体类型级别的精细同步控制，支持级联同步以自动推送依赖实体。
    *
-   * @param namespace - Entity namespace (e.g., "public")
-   * @param entity - Entity name (e.g., "User")
-   * @param options - Push options
-   * @returns Push result
+   * @param namespace - 实体命名空间（如 "public"）
+   * @param entity - 实体名称（如 "User"）
+   * @param options - 推送选项
+   * @returns 推送结果
    *
    * @example
    * ```typescript
-   * // Push User repository with cascading dependents
+   * // 推送 User 并级联推送依赖方
    * const result = await rxdb.versionManager.pushRepository('public', 'User', {
-   *   includeRelated: true // Default: automatically pushes Post if Post references User
+   *   includeRelated: true // 默认：若 Post 引用 User 则自动推送 Post
    * });
    *
-   * // Push without cascading
+   * // 不级联推送
    * const result = await rxdb.versionManager.pushRepository('public', 'User', {
-   *   includeRelated: false // Only push User, dependent data may be incomplete
+   *   includeRelated: false // 仅推送 User，依赖数据可能不完整
    * });
    * ```
    */
@@ -7909,23 +7968,23 @@ class ki {
     return s.pushed > 0 && this.historyManager.clearUndoHistory(), s;
   }
   /**
-   * Sync a specific repository (pull then push)
+   * 同步指定 Repository（先 pull 再 push）
    *
-   * Combines pull and push operations for a single repository, ensuring proper execution order.
-   * Recommended for ensuring data consistency when syncing a specific entity type.
+   * 将单个 Repository 的 pull 和 push 合并为一次操作，保证正确的执行顺序。
+   * 推荐在需要确保特定实体类型数据一致性时使用。
    *
-   * @param namespace - Entity namespace (e.g., "public")
-   * @param entity - Entity name (e.g., "Todo")
-   * @param options - Sync options (separate pull and push options)
-   * @returns Sync result (contains both pull and push results)
+   * @param namespace - 实体命名空间（如 "public"）
+   * @param entity - 实体名称（如 "Todo"）
+   * @param options - 同步选项（分别配置 pull 和 push）
+   * @returns 同步结果（包含 pull 和 push 结果）
    *
    * @example
    * ```typescript
-   * // Basic usage
+   * // 基本用法
    * const result = await rxdb.versionManager.syncRepository('public', 'Todo');
    * console.log(`Pulled ${result.pullResult.pulled}, Pushed ${result.pushResult.pushed}`);
    *
-   * // Custom options for pull and push
+   * // 自定义 pull 和 push 选项
    * const result = await rxdb.versionManager.syncRepository('public', 'Todo', {
    *   pull: { limit: 500, fetchAll: true },
    *   push: { batchSize: 100 }
@@ -7960,26 +8019,25 @@ class ki {
    * ```
    */
   async cleanupExpired(e, t, n) {
-    return Mi(this, e, t, n);
+    return Di(this, e, t, n);
   }
   /**
-   * Check for remote updates without downloading data (T040, US2)
+   * 检查远程是否有更新，不下载数据
    *
-   * This method only queries how many new changes exist remotely,
-   * without actually pulling the data. Useful for showing
-   * "N updates available" messages to save bandwidth and time.
+   * 仅查询远程有多少新变更，不实际拉取数据。
+   * 适用于显示「有 N 条远程更新」提示，节省带宽和时间。
    *
-   * @param namespace - Entity namespace (e.g., "public")
-   * @param entity - Entity name (e.g., "Todo")
-   * @returns Update check result
+   * @param namespace - 实体命名空间（如 "public"）
+   * @param entity - 实体名称（如 "Todo"）
+   * @returns 更新检查结果
    *
    * @example
    * ```typescript
-   * // Check if Todo has remote updates
+   * // 检查 Todo 是否有远程更新
    * const result = await rxdb.versionManager.checkRepositoryUpdates('public', 'Todo');
    * if (result.hasUpdates) {
-   *   console.log(`${result.pendingCount} updates available`);
-   *   // User clicks "Update" button, then call pullRepository()
+   *   console.log(`有 ${result.pendingCount} 条更新可拉取`);
+   *   // 用户点击「更新」按钮后再调用 pullRepository()
    * }
    * ```
    */
@@ -7987,47 +8045,47 @@ class ki {
     return bn(this.rxdb, e, t);
   }
   /**
-   * Get sync status for a single repository (T052, US3)
+   * 获取单个 Repository 的同步状态
    *
-   * Returns comprehensive sync status including:
-   * - syncType (full/remote/local/disabled)
-   * - pushableCount (number of local changes pending push)
-   * - pullableCount (number of remote changes available to pull)
-   * - Last sync timestamps
+   * 返回完整的同步状态信息，包括：
+   * - syncType（full/remote/local/disabled）
+   * - pushableCount（待推送的本地变更数）
+   * - pullableCount（可拉取的远程变更数）
+   * - 最近同步时间戳
    *
-   * @param namespace - Entity namespace (e.g., "public")
-   * @param entity - Entity name (e.g., "Todo")
-   * @returns Repository sync status
+   * @param namespace - 实体命名空间（如 "public"）
+   * @param entity - 实体名称（如 "Todo"）
+   * @returns Repository 同步状态
    *
    * @example
    * ```typescript
    * const status = await rxdb.versionManager.getRepositorySyncStatus('public', 'Todo');
-   * console.log(`Sync type: ${status.syncType}`);
-   * console.log(`Pushable: ${status.pushableCount}, Pullable: ${status.pullableCount}`);
+   * console.log(`同步类型: ${status.syncType}`);
+   * console.log(`待推送: ${status.pushableCount}，可拉取: ${status.pullableCount}`);
    * ```
    */
   async getRepositorySyncStatus(e, t) {
     return vn(this.rxdb, e, t);
   }
   /**
-   * Get sync status for all repositories (T053, US3)
+   * 获取所有 Repository 的同步状态
    *
-   * Returns status for all registered entities, with optional filtering.
+   * 返回所有已注册实体的状态，支持可选过滤。
    *
-   * @param filter - Optional filter conditions
-   * @returns Array of repository sync statuses
+   * @param filter - 可选过滤条件
+   * @returns Repository 同步状态数组
    *
    * @example
    * ```typescript
-   * // Get all statuses
+   * // 获取全部状态
    * const statuses = await rxdb.versionManager.getAllRepositorySyncStatus();
    *
-   * // Only get repositories with pending changes
+   * // 仅获取有待处理变更的 Repository
    * const pending = await rxdb.versionManager.getAllRepositorySyncStatus({
    *   hasPendingChanges: true
    * });
    *
-   * // Only get enabled full-sync repositories
+   * // 仅获取已启用的全量同步 Repository
    * const fullSync = await rxdb.versionManager.getAllRepositorySyncStatus({
    *   syncType: ['full'],
    *   enabled: true
@@ -8035,24 +8093,23 @@ class ki {
    * ```
    */
   async getAllRepositorySyncStatus(e) {
-    return Bi(this.rxdb, e);
+    return zi(this.rxdb, e);
   }
   /**
-   * Bulk sync multiple repositories
+   * 批量同步多个 Repository
    *
-   * Syncs multiple repositories in a single operation with support for
-   * sequential or concurrent execution.
+   * 在单次操作中同步多个 Repository，支持顺序或并发执行。
    *
-   * @param options - Bulk sync options
-   * @returns Bulk sync result with success/failure counts
+   * @param options - 批量同步选项
+   * @returns 批量同步结果（包含成功/失败计数）
    *
    * @example
    * ```typescript
-   * // Sync all enabled repositories sequentially
+   * // 顺序同步所有已启用的 Repository
    * const result = await rxdb.versionManager.bulkSync();
-   * console.log(`Succeeded: ${result.succeeded}, Failed: ${result.failed}`);
+   * console.log(`成功: ${result.succeeded}，失败: ${result.failed}`);
    *
-   * // Sync specific repositories
+   * // 同步指定 Repository
    * const result = await rxdb.versionManager.bulkSync({
    *   repositories: [
    *     { namespace: 'public', entity: 'Todo' },
@@ -8060,17 +8117,17 @@ class ki {
    *   ]
    * });
    *
-   * // Concurrent sync with pull only
+   * // 并发模式仅 pull
    * const result = await rxdb.versionManager.bulkSync({
    *   concurrent: true,
    *   concurrency: 3,
    *   push: false
    * });
    *
-   * // Inspect results
+   * // 检查每项结果
    * for (const item of result.results) {
    *   if (item.success) {
-   *     console.log(`${item.repository.entity}: pulled ${item.result.pull?.pulled || 0}`);
+   *     console.log(`${item.repository.entity}: 已拉取 ${item.result.pull?.pulled || 0} 条`);
    *   } else {
    *     console.error(`${item.repository.entity}: ${item.error.message}`);
    *   }
@@ -8078,54 +8135,53 @@ class ki {
    * ```
    */
   async bulkSync(e) {
-    return Si(this.rxdb, e);
+    return Bi(this.rxdb, e);
   }
   /**
-   * Get dependency graph for all repositories
+   * 获取所有 Repository 的依赖图
    *
-   * Analyzes entity relationships (MANY_TO_ONE, ONE_TO_ONE) to build
-   * a dependency graph showing which repositories depend on others.
+   * 分析实体关系（MANY_TO_ONE、ONE_TO_ONE）以构建依赖图，
+   * 展示各 Repository 之间的依赖关系。
    *
-   * @returns Dependency graph with repository dependencies
+   * @returns 包含依赖关系的依赖图
    *
    * @example
    * ```typescript
    * const graph = rxdb.versionManager.getRepositoryDependencyGraph();
    *
-   * // Iterate through dependencies
+   * // 遍历依赖关系
    * for (const [key, dep] of graph) {
-   *   console.log(`${key} depends on:`, dep.dependsOn);
-   *   console.log(`${key} is required by:`, dep.requiredBy);
+   *   console.log(`${key} 依赖:`, dep.dependsOn);
+   *   console.log(`${key} 被依赖:`, dep.requiredBy);
    * }
    * ```
    */
   getRepositoryDependencyGraph() {
     const e = this.rxdb.config.entities.map((t) => I(t));
-    return ft(e);
+    return yt(e);
   }
   /**
-   * Get sync order for repositories based on dependencies
+   * 根据依赖关系获取 Repository 的同步顺序
    *
-   * Uses topological sort to determine the correct order for syncing
-   * repositories based on their dependencies.
+   * 通过拓扑排序确定基于依赖关系的正确同步顺序。
    *
-   * @param direction - Sort direction: 'pull' (parent first) or 'push' (child first)
-   * @returns Ordered list of repositories
+   * @param direction - 排序方向：'pull'（父节点优先）或 'push'（子节点优先）
+   * @returns 有序的 Repository 列表
    *
    * @example
    * ```typescript
-   * // Get pull order (parents before children)
+   * // 获取 pull 顺序（父节点优先）
    * const pullOrder = rxdb.versionManager.getRepositorySyncOrder('pull');
    * // [User, Todo, Comment]
    *
-   * // Get push order (children before parents)
+   * // 获取 push 顺序（子节点优先）
    * const pushOrder = rxdb.versionManager.getRepositorySyncOrder('push');
    * // [Comment, Todo, User]
    * ```
    */
   getRepositorySyncOrder(e) {
     const t = this.getRepositoryDependencyGraph();
-    return yt(t, e);
+    return mt(t, e);
   }
   // ============================================
   // Branch management
@@ -8142,16 +8198,63 @@ class ki {
   async switchBranch(e) {
     if ((await this.getCurrentBranch())?.id !== e)
       try {
-        this.rxdb.dispatchEvent(new er(e));
-        const { adapter: n } = await this.getLocalRepositories(), s = await Li(this, e), i = await n.switchBranch({
+        this.rxdb.dispatchEvent(new sr(e));
+        const { adapter: n } = await this.getLocalRepositories(), s = await Wi(this, e), i = await n.switchBranch({
           branchId: e,
           actions: s
         });
-        return this.historyManager.clearRedoStack(), this.rxdb.dispatchEvent(new tr(e)), i;
+        return this.historyManager.clearRedoStack(), this.rxdb.dispatchEvent(new ir(e)), i;
       } catch (n) {
-        throw this.rxdb.dispatchEvent(new nr(e)), n;
+        throw this.rxdb.dispatchEvent(new ar(e)), n;
       }
   }
+  /**
+   * 合并分支
+   *
+   * 将源分支的变更合并到当前激活分支（目标分支）。
+   *
+   * @param sourceBranchId - 源分支 ID
+   * @param options - 合并选项
+   * @returns 合并结果
+   *
+   * @remarks
+   * 支持两种策略：
+   * - `squash`（默认）：将源分支所有变更压缩为最小操作集后一次性应用，目标分支只产生一组变更记录
+   * - `normal`：逐条应用源分支变更，每条变更在目标分支产生独立的变更记录（保留历史细节）
+   *
+   * 合并后会清空 undo/redo 历史，因为合并操作不可逆。
+   * 可选通过 `deleteSource: true` 在合并后删除源分支。
+   *
+   * @example
+   * ```typescript
+   * // 压缩合并（默认）
+   * const result = await rxdb.versionManager.mergeBranch('feature-x');
+   * console.log(`Merged ${result.merged} changes`);
+   *
+   * // 普通合并
+   * const result = await rxdb.versionManager.mergeBranch('feature-x', {
+   *   strategy: 'normal'
+   * });
+   *
+   * // 合并后删除源分支
+   * const result = await rxdb.versionManager.mergeBranch('feature-x', {
+   *   deleteSource: true
+   * });
+   * ```
+   */
+  async mergeBranch(e, t) {
+    const n = await this.getCurrentBranch();
+    if (!n)
+      throw new R("No active branch found");
+    const s = n.id;
+    try {
+      this.rxdb.dispatchEvent(new or(e, s));
+      const i = await Vi(this, e, s, t);
+      return i.merged > 0 && this.historyManager.clearUndoHistory(), this.rxdb.dispatchEvent(new cr(e, s)), i;
+    } catch (i) {
+      throw this.rxdb.dispatchEvent(new lr(e, s)), i;
+    }
+  }
   /**
    * 获取特定作用域的历史记录 API
    *
@@ -8201,7 +8304,7 @@ class ki {
       throw new R(`Cannot restore from non-DELETE change (type=${a.type})`);
     if (!a.inversePatch)
       throw new R(`RxDBChange ${t.changeId} has no inversePatch`);
-    const o = be([a], !1), l = await this.getCurrentBranch();
+    const o = de([a], !1), l = await this.getCurrentBranch();
     await s.switchBranch({ branchId: l.id, actions: o });
     const c = e.constructor;
     return (await s.getRepository(c).find({
@@ -8213,11 +8316,11 @@ class ki {
     }))[0];
   }
   async getLocalRepositories() {
-    const e = await L(this.rxdb.localAdapter$), t = e.getRepository(K), n = e.getRepository(H);
+    const e = await L(this.rxdb.localAdapter$), t = e.getRepository(H), n = e.getRepository(K);
     return { branchRepository: t, changeRepository: n, adapter: e };
   }
   async getRemoteRepositories() {
-    const e = await L(this.rxdb.remoteAdapter$), t = e.getRepository(K), n = e.getRepository(H);
+    const e = await L(this.rxdb.remoteAdapter$), t = e.getRepository(H), n = e.getRepository(K);
     return { branchRepository: t, changeRepository: n, adapter: e };
   }
   async getCurrentBranch() {
@@ -8238,14 +8341,14 @@ class ki {
     }, n = (s) => {
       this.historyManager.incrementPullableCount(s.entities.length);
     };
-    this.rxdb.addEventListener(Ue, e), this.rxdb.addEventListener(je, t), this.rxdb.addEventListener(Ye, n), this.#e.push(
-      { type: Ue, handler: e },
-      { type: je, handler: t },
-      { type: Ye, handler: n }
+    this.rxdb.addEventListener(je, e), this.rxdb.addEventListener(Ye, t), this.rxdb.addEventListener(ze, n), this.#e.push(
+      { type: je, handler: e },
+      { type: Ye, handler: t },
+      { type: ze, handler: n }
     );
   }
 }
-class ga {
+class Ra {
   #e = new J("");
   #n = new J("");
   /**
@@ -8304,8 +8407,8 @@ class ga {
    * 本地适配器
    */
   localAdapter$ = this.#e.asObservable().pipe(
-    Ce(Boolean),
-    Fe(),
+    Ie(Boolean),
+    Ue(),
     x(
       (e) => ae(() => this.getAdapter(e)).pipe($((t) => t))
     ),
@@ -8315,8 +8418,8 @@ class ga {
    * 远程适配器
    */
   remoteAdapter$ = this.#n.asObservable().pipe(
-    Ce(Boolean),
-    Fe(),
+    Ie(Boolean),
+    Ue(),
     x(
       (e) => ae(() => this.getAdapter(e)).pipe($((t) => t))
     ),
@@ -8357,7 +8460,7 @@ class ga {
    * 获取 RxDB 版本号
    */
   get version() {
-    return ui;
+    return gi;
   }
   get config() {
     return this.#t;
@@ -8367,14 +8470,14 @@ class ga {
    * @param options - RxDB 配置选项
    */
   constructor(e) {
-    this.#t = e, this.schemaManager = new li(this), this.entityManager = new Ys(this), this.versionManager = new ki(this), this.context = { ...this.#t.context }, this.#t.dbName = this.#t.dbName + "@" + this.version.replace(/\./g, "_"), Pn(this.#t), globalThis.rxdb = this;
+    this.#t = e, this.schemaManager = new mi(this), this.entityManager = new Gs(this), this.versionManager = new Qi(this), this.context = { ...this.#t.context }, this.#t.dbName = this.#t.dbName + "@" + this.version.replace(/\./g, "_"), $n(this.#t), globalThis.rxdb = this;
   }
   /**
    * 初始化 RxDB
    */
   init() {
     if (this.#r) return;
-    this.#r = !0, this.#d.clientId || (this.#d.clientId = Ht());
+    this.#r = !0, this.#d.clientId || (this.#d.clientId = Kt());
     const { local: e, remote: t } = this.#t.sync || {};
     e && this.#e.next(e.adapter), t && this.#n.next(t.adapter), this.#_(), this.schemaManager.init(), this.entityManager.init(), this.versionManager.init(), this.#y(), this.#m();
   }
@@ -8424,7 +8527,7 @@ class ga {
     const t = this.#f.get(e);
     if (!t)
       throw new Error(`Adapter "${String(e)}" not found. Please register it first using rxdb.adapter()`);
-    const n = t(this), s = $n(n) ? n : Promise.resolve(n);
+    const n = t(this), s = Bn(n) ? n : Promise.resolve(n);
     return this.#h.set(e, s), s;
   }
   /**
@@ -8447,11 +8550,11 @@ class ga {
     const t = (async () => {
       this.init();
       const n = await this.getAdapter(e);
-      if (await n.connect(), rr(e, this.#t))
+      if (await n.connect(), ur(e, this.#t))
         if (await n.isTableExisted(se))
           await this.#w(n);
         else {
-          const i = new K();
+          const i = new H();
           i.id = "main", i.activated = !0, await n.createTables(this.#t.entities, [i]);
         }
       return this.#o.next(!0), n;
@@ -8493,14 +8596,14 @@ class ga {
    * @param event - 要派发的事件对象
    */
   dispatchEvent(e) {
-    this.#l && sr(e) === !1 ? this.#u.push(e) : this.#g(e.type).forEach((t) => t.call(this, e));
+    this.#l && dr(e) === !1 ? this.#u.push(e) : this.#g(e.type).forEach((t) => t.call(this, e));
   }
   /**
    * 初始化网关
    * 设置统一的多 Tab 通信网关
    */
   #y() {
-    this.#c = new zs({
+    this.#c = new Vs({
       dbName: this.#t.dbName,
       clientId: this.#d.clientId
     }), this.#c.init(
@@ -8576,7 +8679,7 @@ class ga {
     });
   }
 }
-class _a {
+class Ca {
   /**
    * 解决单个冲突
    *
@@ -8603,109 +8706,116 @@ class _a {
   }
 }
 export {
-  Gn as CONFLICT_DETECTED_EVENT,
-  Qn as CONFLICT_PENDING_EVENT,
-  sa as ConflictDetectedEvent,
-  ia as ConflictPendingEvent,
-  _r as ENTITY_BASE_METADATA_OPTIONS,
+  Zn as CONFLICT_DETECTED_EVENT,
+  er as CONFLICT_PENDING_EVENT,
+  ua as ConflictDetectedEvent,
+  da as ConflictPendingEvent,
+  Ir as ENTITY_BASE_METADATA_OPTIONS,
   ne as ENTITY_LOCAL_CREATE_EVENT,
-  zn as ENTITY_LOCAL_NEW_EVENT,
+  kn as ENTITY_LOCAL_NEW_EVENT,
   ce as ENTITY_LOCAL_REMOVE_EVENT,
   oe as ENTITY_LOCAL_UPDATE_EVENT,
-  Ue as ENTITY_REMOTE_CREATE_EVENT,
-  Ye as ENTITY_REMOTE_REMOVE_EVENT,
-  je as ENTITY_REMOTE_UPDATE_EVENT,
-  ct as ENTITY_STATIC_TYPES,
+  je as ENTITY_REMOTE_CREATE_EVENT,
+  ze as ENTITY_REMOTE_REMOVE_EVENT,
+  Ye as ENTITY_REMOTE_UPDATE_EVENT,
+  lt as ENTITY_STATIC_TYPES,
   ie as Entity,
-  Ie as EntityBase,
-  Gi as EntityLocalCreatedEvent,
-  Zn as EntityLocalNewEvent,
-  Ji as EntityLocalRemovedEvent,
-  Qi as EntityLocalUpdatedEvent,
-  Xi as EntityRemoteCreatedEvent,
-  ea as EntityRemoteRemovedEvent,
-  Zi as EntityRemoteUpdatedEvent,
-  _a as LWWConflictResolver,
+  Ae as EntityBase,
+  ta as EntityLocalCreatedEvent,
+  rr as EntityLocalNewEvent,
+  ra as EntityLocalRemovedEvent,
+  na as EntityLocalUpdatedEvent,
+  sa as EntityRemoteCreatedEvent,
+  aa as EntityRemoteRemovedEvent,
+  ia as EntityRemoteUpdatedEvent,
+  Ca as LWWConflictResolver,
+  qn as MERGE_BRANCH_BEGIN,
+  Gn as MERGE_BRANCH_COMMIT,
+  Vn as MERGE_BRANCH_ROLLBACK,
+  or as MergeBranchBeginEvent,
+  cr as MergeBranchCommitEvent,
+  it as MergeBranchEventBase,
+  lr as MergeBranchRollbackEvent,
   et as NetworkOfflineError,
   W as OnDeleteAction,
   qt as OnUpdateAction,
   C as PropertyType,
-  ua as QueryCacheRepository,
-  ys as QueryTask,
-  Vi as REMOTE_CHANGES_PENDING_EVENT,
-  Jn as REPOSITORY_SYNC_BEGIN_EVENT,
+  ma as QueryCacheRepository,
+  Es as QueryTask,
+  ea as REMOTE_CHANGES_PENDING_EVENT,
+  tr as REPOSITORY_SYNC_BEGIN_EVENT,
   jt as REPOSITORY_SYNC_COMPLETE_EVENT,
-  Xn as REPOSITORY_SYNC_ERROR_EVENT,
-  T as RelationKind,
+  nr as REPOSITORY_SYNC_ERROR_EVENT,
+  A as RelationKind,
   sn as Repository,
-  $s as RepositoryBase,
-  it as RepositorySyncBeginEvent,
-  at as RepositorySyncCompleteEvent,
-  ot as RepositorySyncErrorEvent,
-  ga as RxDB,
+  Ys as RepositoryBase,
+  at as RepositorySyncBeginEvent,
+  ot as RepositorySyncCompleteEvent,
+  ct as RepositorySyncErrorEvent,
+  Ra as RxDB,
   an as RxDBAdapterBase,
-  da as RxDBAdapterLocalBase,
-  ha as RxDBAdapterRemoteBase,
-  K as RxDBBranch,
-  H as RxDBChange,
+  ga as RxDBAdapterLocalBase,
+  _a as RxDBAdapterRemoteBase,
+  H as RxDBBranch,
+  K as RxDBChange,
   R as RxDBError,
   se as RxDBMigration,
-  pa as RxDBPluginBase,
+  ba as RxDBPluginBase,
   z as RxDBSync,
-  kn as SWITCH_BRANCH_BEGIN,
-  Wn as SWITCH_BRANCH_COMMIT,
+  Wn as SWITCH_BRANCH_BEGIN,
+  Hn as SWITCH_BRANCH_COMMIT,
   Kn as SWITCH_BRANCH_ROLLBACK,
-  Hn as SYNC_BEGIN_EVENT,
-  qn as SYNC_COMPLETE_EVENT,
-  Vn as SYNC_ERROR_EVENT,
-  er as SwitchBranchBeginEvent,
-  tr as SwitchBranchCommitEvent,
+  Qn as SYNC_BEGIN_EVENT,
+  Jn as SYNC_COMPLETE_EVENT,
+  Xn as SYNC_ERROR_EVENT,
+  sr as SwitchBranchBeginEvent,
+  ir as SwitchBranchCommitEvent,
   st as SwitchBranchEventBase,
-  nr as SwitchBranchRollbackEvent,
+  ar as SwitchBranchRollbackEvent,
   Yt as SyncBeginEvent,
   zt as SyncCompleteEvent,
   kt as SyncErrorEvent,
-  ms as SyncStatus,
-  fe as SyncType,
+  Rs as SyncStatus,
+  ye as SyncType,
   tt as TRANSACTION_BEGIN,
   nt as TRANSACTION_COMMIT,
   rt as TRANSACTION_ROLLBACK,
-  vr as TREE_ADJACENCY_LIST_ENTITY_BASE_OPTIONS,
-  ta as TransactionBeginEvent,
-  na as TransactionCommitEvent,
-  ra as TransactionRollbackEvent,
-  _t as TreeAdjacencyListEntityBase,
-  yr as TreeEntity,
-  ca as __decorateClass,
-  Mi as cleanupExpired,
+  Sr as TREE_ADJACENCY_LIST_ENTITY_BASE_OPTIONS,
+  oa as TransactionBeginEvent,
+  ca as TransactionCommitEvent,
+  la as TransactionRollbackEvent,
+  bt as TreeAdjacencyListEntityBase,
+  Er as TreeEntity,
+  fa as __decorateClass,
+  Di as cleanupExpired,
   un as compactChanges,
-  $r as diffMetadata,
-  cr as fillDefaultValue,
-  lr as fillInitValue,
+  Yr as diffMetadata,
+  yr as fillDefaultValue,
+  mr as fillInitValue,
   I as getEntityMetadata,
-  Pe as getEntityMutations,
+  $e as getEntityMutations,
   O as getEntityStatus,
-  aa as getEntityType,
-  ur as getNeedRemoveEntities,
-  gt as getNeedSaveEntities,
-  Ze as getRxDBChangeKey,
-  hi as getSyncConfig,
+  ha as getEntityType,
+  gr as getNeedRemoveEntities,
+  _t as getNeedSaveEntities,
+  we as getRxDBChangeKey,
+  bi as getSyncConfig,
   j as getSyncType,
-  ya as getSyncableRepositories,
-  ma as groupBySyncType,
-  la as isEntityInternalName,
-  fi as isNoSync,
-  Vt as isRuleGroup,
-  oa as isRxDBEntity,
+  va as getSyncableRepositories,
+  Ea as groupBySyncType,
+  ya as isEntityInternalName,
+  vi as isNoSync,
+  Gt as isRuleGroup,
+  pa as isRxDBEntity,
   dn as needsPull,
-  pi as needsPush,
-  fa as parseRxDBChangeKey,
-  xr as queryNeedRefreshCreate,
-  Nr as queryNeedRefreshRemove,
-  Pr as queryNeedRefreshUpdate,
+  wi as needsPush,
+  wa as parseRxDBChangeKey,
+  Fr as queryNeedRefreshCreate,
+  Ur as queryNeedRefreshRemove,
+  jr as queryNeedRefreshUpdate,
   M as setSafeObjectKey,
-  he as setSafeObjectKeyLazyInitOnce,
-  or as setSafeObjectWritableKey,
-  fr as transitionMetadata,
-  Ht as uuid
+  pe as setSafeObjectKeyLazyInitOnce,
+  fr as setSafeObjectWritableKey,
+  vr as transitionMetadata,
+  Kt as uuid
 };