@aiao/rxdb 0.0.11 → 0.0.12

package/dist/index.js

@@ -13,56 +13,56 @@ class et extends R {
     super(`NetworkOfflineError: ${e.message}`), this.name = "NetworkOfflineError", this.originalError = e, Object.setPrototypeOf(this, et.prototype);
   }
 }
-const Wn = "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", Kn = "SWITCH_BRANCH_COMMIT", Hn = "SWITCH_BRANCH_ROLLBACK", qn = "SYNC_BEGIN", Vn = "SYNC_COMPLETE", Gn = "SYNC_ERROR", Vi = "REMOTE_CHANGES_PENDING", Qn = "CONFLICT_DETECTED", Jn = "CONFLICT_PENDING", Xn = "REPOSITORY_SYNC_BEGIN", jt = "REPOSITORY_SYNC_COMPLETE", Zn = "REPOSITORY_SYNC_ERROR";
+const Wn = "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", Kn = "SWITCH_BRANCH_COMMIT", Hn = "SWITCH_BRANCH_ROLLBACK", qn = "SYNC_BEGIN", Vn = "SYNC_COMPLETE", Gn = "SYNC_ERROR", Gi = "REMOTE_CHANGES_PENDING", Qn = "CONFLICT_DETECTED", Jn = "CONFLICT_PENDING", Xn = "REPOSITORY_SYNC_BEGIN", jt = "REPOSITORY_SYNC_COMPLETE", Zn = "REPOSITORY_SYNC_ERROR";
 class er {
   constructor(e) {
     this.entities = e;
   }
   type = Wn;
 }
-class Gi {
+class Qi {
   constructor(e) {
     this.entities = e;
   }
   type = ne;
 }
-class Qi {
+class Ji {
   constructor(e) {
     this.entities = e;
   }
   type = oe;
 }
-class Ji {
+class Xi {
   constructor(e) {
     this.entities = e;
   }
   type = ce;
 }
-class Xi {
+class Zi {
   constructor(e) {
     this.entities = e;
   }
   type = Ue;
 }
-class Zi {
+class ea {
   constructor(e) {
     this.entities = e;
   }
   type = je;
 }
-class ea {
+class ta {
   constructor(e) {
     this.entities = e;
   }
   type = Ye;
 }
-class ta {
+class na {
   type = tt;
 }
-class na {
+class ra {
   type = nt;
 }
-class ra {
+class sa {
   type = rt;
 }
 class st {
@@ -97,13 +97,13 @@ class Wt {
   }
   type = Gn;
 }
-class sa {
+class ia {
   constructor(e, t, n) {
     this.conflicts = e, this.resolved = t, this.deferred = n;
   }
   type = Qn;
 }
-class ia {
+class aa {
   constructor(e) {
     this.conflicts = e;
   }
@@ -127,12 +127,12 @@ class ot {
   }
   type = Zn;
 }
-const kt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMetadata"), Kt = /* @__PURE__ */ Symbol("ɵStatus"), We = /* @__PURE__ */ Symbol("ɵEntityManager"), ke = /* @__PURE__ */ Symbol("ɵEntityType"), sr = (r, e) => e.sync.local?.adapter === r, ir = (r) => [tt, nt, rt].includes(r.type), I = (r) => r[ze] || r.constructor[ze], aa = (r) => r[ke] || r.constructor[ke], O = (r) => r && r[Kt], oa = (r) => r && !!O(r), ca = (r, e, t, n) => {
+const kt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMetadata"), Kt = /* @__PURE__ */ Symbol("ɵStatus"), We = /* @__PURE__ */ Symbol("ɵEntityManager"), ke = /* @__PURE__ */ Symbol("ɵEntityType"), sr = (r, e) => e.sync.local?.adapter === r, ir = (r) => [tt, nt, rt].includes(r.type), I = (r) => r[ze] || r.constructor[ze], oa = (r) => r[ke] || r.constructor[ke], O = (r) => r && r[Kt], ca = (r) => r && !!O(r), la = (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 = () => Dn(), ar = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"], or = ["rev"], la = (r) => !!(ar.includes(r) || or.includes(r) || r.startsWith("_")), M = (r, e, t) => Object.defineProperty(r, e, {
+}, Ht = () => Dn(), ar = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"], or = ["rev"], ua = (r) => !!(ar.includes(r) || or.includes(r) || r.startsWith("_")), M = (r, e, t) => Object.defineProperty(r, e, {
   value: t,
   enumerable: !1,
   configurable: !1,
@@ -184,8 +184,8 @@ const kt = /* @__PURE__ */ Symbol("ɵProxy"), ze = /* @__PURE__ */ Symbol("ɵMet
   }
   for (const a of t)
     if (O(a).local) {
-      const c = a.constructor;
-      i.has(c) || i.set(c, /* @__PURE__ */ new Set()), i.get(c).add(a);
+      const l = a.constructor;
+      i.has(l) || i.set(l, /* @__PURE__ */ new Set()), i.get(l).add(a);
     }
   return {
     create: n,
@@ -232,7 +232,7 @@ const hr = (r, e, t = !1) => {
         onUpdate: t
       };
   }
-}, fr = (r, e) => {
+}, fr = (r) => r.kind !== T.ONE_TO_MANY, yr = (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 };
@@ -242,16 +242,16 @@ const hr = (r, e, t = !1) => {
       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);
-    const l = t.map((u) => u.name);
-    l.shift(), o.extends = l;
+    const c = t.map((u) => u.name);
+    c.shift(), o.extends = c;
   }
-  o.extends = o.extends || [], o.displayName || (o.displayName = o.name), o.tableName || (o.tableName = o.name), t.reverse().forEach((l) => {
-    l.namespace = l.namespace || "public", l.properties?.forEach((u) => {
+  o.extends = o.extends || [], o.displayName || (o.displayName = o.name), o.tableName || (o.tableName = o.name), t.reverse().forEach((c) => {
+    c.namespace = c.namespace || "public", c.properties?.forEach((u) => {
       u.columnName || (u.columnName = u.name), n.set(u.name, u);
-    }), l.computedProperties?.forEach((u) => {
+    }), c.computedProperties?.forEach((u) => {
       u.columnName || (u.columnName = u.name), s.set(u.name, u);
-    }), l.relations?.forEach((u) => {
-      u.mappedNamespace = u.mappedNamespace || "public", u.columnName || (u.columnName = u.name + "Id");
+    }), c.relations?.forEach((u) => {
+      u.mappedNamespace = u.mappedNamespace || "public";
       const d = "nullable" in u ? u.nullable ?? !1 : !1, h = hr(
         {
           onDelete: u.onDelete,
@@ -260,40 +260,40 @@ const hr = (r, e, t = !1) => {
         u.kind,
         d
       );
-      if (u.onDelete = h.onDelete, u.onUpdate = h.onUpdate, u.mappedEntity === l.name && u.mappedNamespace === l.namespace) {
+      if (u.onDelete = h.onDelete, u.onUpdate = h.onUpdate, fr(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);
       } else
         i.set(u.name, u);
-    }), l.indexes?.forEach((u) => a.set(u.name, u));
+    }), c.indexes?.forEach((u) => a.set(u.name, u));
   }), M(o, "propertyMap", n), M(o, "computedPropertyMap", s), M(o, "relationMap", i), M(o, "indexMap", a);
-  const c = /* @__PURE__ */ new Map();
-  return n.forEach((l, u) => {
-    c.set(l.columnName, u);
-  }), M(o, "columnNameToPropertyName", c), he(
+  const l = /* @__PURE__ */ new Map();
+  return n.forEach((c, u) => {
+    l.set(c.columnName, u);
+  }), M(o, "columnNameToPropertyName", l), he(
     o,
     "defaultValueProperties",
-    () => Array.from(n.values()).filter((l) => l.default !== void 0)
+    () => Array.from(n.values()).filter((c) => c.default !== void 0)
   ), he(
     o,
     "foreignKeyRelations",
     () => Array.from(o.relationMap.values()).filter(
-      (l) => l.kind === T.MANY_TO_ONE || l.kind === T.ONE_TO_ONE
+      (c) => c.kind === T.MANY_TO_ONE || c.kind === T.ONE_TO_ONE
     )
   ), he(o, "foreignKeyRelationMap", () => {
-    const l = /* @__PURE__ */ new Map();
-    return o.foreignKeyRelations.forEach((u) => l.set(`${u.name}Id`, u)), l;
-  }), he(o, "foreignKeyNames", () => o.foreignKeyRelations.map((l) => `${l.name}Id`)), he(
+    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(
     o,
     "foreignKeyColumnNames",
-    () => o.foreignKeyRelations.map((l) => l.columnName)
+    () => o.foreignKeyRelations.filter((c) => !!c.columnName).map((c) => c.columnName)
   ), M(
     o,
     "isForeignKey",
-    (l) => l && l.endsWith("Id") && o.foreignKeyNames.includes(l)
+    (c) => c && c.endsWith("Id") && o.foreignKeyNames.includes(c)
   ), o;
 }, ie = (r) => (e) => {
-  const t = fr(r, e);
+  const t = yr(r, e);
   if (M(e, ze, t), r.abstract) return e;
   const n = e;
   return class extends n {
@@ -315,7 +315,7 @@ const hr = (r, e, t = !1) => {
       return lr(t, this), s && ur(t, this, s), i[kt](this);
     }
   };
-}, yr = (r) => {
+}, mr = (r) => {
   const e = r.features?.tree ?? {};
   return ie({
     ...r,
@@ -330,12 +330,12 @@ const hr = (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--)
+var gr = Object.getOwnPropertyDescriptor, _r = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? gr(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
-const _r = {
+const br = {
   name: "EntityBase",
   abstract: !0,
   // 标记为抽象类，不会直接创建此类的实例
@@ -419,15 +419,15 @@ let Ie = class {
   constructor(r) {
   }
 };
-Ie = gr([
-  ie(_r)
+Ie = _r([
+  ie(br)
 ], 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--)
+var wr = Object.getOwnPropertyDescriptor, vr = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? wr(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
-const vr = {
+const Er = {
   name: "TreeAdjacencyListEntityBase",
   abstract: !0,
   // 标记为抽象类，不会直接创建此类的实例
@@ -457,11 +457,15 @@ const vr = {
     {
       name: "parent",
       // 父节点关系名称
+      columnName: "parentId",
+      // 外键列名
       displayName: "父节点",
       kind: T.MANY_TO_ONE,
       // 多对一关系
       mappedEntity: "TreeAdjacencyListEntityBase",
       // 关联到同一实体类型
+      mappedProperty: "children",
+      // 映射到父实体的 children 属性
       nullable: !0,
       // 允许根节点没有父节点
       onDelete: k.CASCADE
@@ -483,10 +487,10 @@ let _t = class extends Ie {
    */
   parentId;
 };
-_t = wr([
-  ie(vr)
+_t = vr([
+  ie(Er)
 ], _t);
-const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r) => r.operator === "exists" || r.operator === "notExists", Cr = (r, e) => {
+const Vt = (r) => !!(r && r.combinator), Rr = (r) => !!(r && r.field), Cr = (r) => r.operator === "exists" || r.operator === "notExists", Ir = (r, e) => {
   const t = Reflect.get(e, r.field), { operator: n } = r;
   switch (n) {
     case "in":
@@ -539,7 +543,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 = Cr(r) ? r.where : void 0;
       if (Array.isArray(t)) {
         let i = t;
         s && (i = t.filter((o) => Y(o, s)));
@@ -562,23 +566,23 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (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) => {
+    return Ir(r, e);
+}, Y = (r, e) => r == null ? !1 : Ke(e, r), Tr = (r, e, t) => {
   const { field: n, sort: s } = t, i = In(r, n);
   if (s === "asc") {
-    if (e.some((c) => i < Reflect.get(c, n))) return !0;
-    if (e.every((c) => i > Reflect.get(c, n))) return !1;
+    if (e.some((l) => i < Reflect.get(l, n))) return !0;
+    if (e.every((l) => i > Reflect.get(l, n))) return !1;
   } else {
-    if (e.some((c) => i > Reflect.get(c, n))) return !0;
-    if (e.every((c) => i < Reflect.get(c, n))) return !1;
+    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) => {
+}, Ar = (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 = Tr(r, e, s);
     if (i === void 0) {
       const { field: a } = s, o = Reflect.get(r, a);
-      e = e.filter((c) => Reflect.get(c, a) === o);
+      e = e.filter((l) => Reflect.get(l, a) === o);
     } else
       return i;
   }
@@ -593,21 +597,21 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
     refresh: n === !1 && bt(r, e),
     recalculate: n
   };
-}, bt = (r, e) => e.some((t) => t.every((n) => r[n]())), Ar = (r, e, t, n, s) => {
+}, bt = (r, e) => e.some((t) => t.every((n) => r[n]())), Sr = (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 c = a.relationMap.get(o), l = r.schemaManager.getEntityType(c.mappedEntity, c.mappedNamespace);
-    if (l && s.add(l), c.kind === T.MANY_TO_MANY) {
-      const u = c.junctionEntityType;
+    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(c.mappedEntity, c.mappedNamespace);
+    a = r.schemaManager.getEntityMetadata(l.mappedEntity, l.mappedNamespace);
   }
   return a !== void 0;
-}, Sr = (r, e, t, n) => {
+}, Mr = (r, e, t, n) => {
   const s = t.split(".");
   try {
     const i = r.schemaManager.getFieldRelations(e, t);
@@ -616,8 +620,8 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
     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) {
-        const c = a.junctionEntityType;
-        c && n.add(c);
+        const l = a.junctionEntityType;
+        l && n.add(l);
       }
     });
     return;
@@ -631,15 +635,15 @@ 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)) {
-      const c = s.slice(0, i);
-      let l = e;
-      for (const u of c) {
-        const d = l?.relationMap.get(u);
-        d && (l = r.schemaManager.getEntityMetadata(d.mappedEntity, d.mappedNamespace));
+    if (Sr(r, e, s, i, n)) {
+      const l = s.slice(0, i);
+      let c = e;
+      for (const u of l) {
+        const d = c?.relationMap.get(u);
+        d && (c = r.schemaManager.getEntityMetadata(d.mappedEntity, d.mappedNamespace));
       }
-      if (l) {
-        const u = a[0], d = l.propertyMap.get(u);
+      if (c) {
+        const u = a[0], d = c.propertyMap.get(u);
         if (d && d.type === C.keyValue)
           return;
       }
@@ -654,16 +658,16 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
           i(o);
           continue;
         }
-        const c = o, l = c.field, u = c.operator;
+        const l = o, c = l.field, u = l.operator;
         if (u === "exists" || u === "notExists") {
-          const d = s.relationMap.get(l);
+          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);
             }
-            if (c.where && r.schemaManager.getEntityMetadata(
+            if (l.where && r.schemaManager.getEntityMetadata(
               d.mappedEntity,
               d.mappedNamespace
             )) {
@@ -671,21 +675,21 @@ const Vt = (r) => !!(r && r.combinator), Er = (r) => !!(r && r.field), Rr = (r)
                 d.mappedEntity,
                 d.mappedNamespace
               );
-              f && (lt(r, c.where, f, m), m.forEach((y) => n.add(y)));
+              f && (lt(r, l.where, f, m), m.forEach((y) => n.add(y)));
             }
           }
           continue;
         }
-        if (l && l.includes("."))
+        if (c && c.includes("."))
           try {
-            Sr(r, s, l, n);
+            Mr(r, s, c, n);
           } catch {
           }
       }
   };
   i(e);
 };
-function Mr(r, e) {
+function Or(r, e) {
   const { rxdb: t, entityType: n } = r, s = I(n);
   if (!s) return !1;
   const i = t.schemaManager.getEntityMetadata(e.entity, e.namespace);
@@ -694,9 +698,9 @@ function Mr(r, e) {
   if (a) {
     const o = /* @__PURE__ */ new Set();
     lt(t, a, n, o);
-    for (const c of o) {
-      const l = I(c);
-      if (l && l.name === e.entity && l.namespace === e.namespace)
+    for (const l of o) {
+      const c = I(l);
+      if (c && c.name === e.entity && c.namespace === e.namespace)
         return !0;
     }
   }
@@ -713,11 +717,11 @@ 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 = Or(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 xr(r, e) {
   const t = new Set(
     e.relations ? e.relations.map((s) => s.name) : Array.from(e.relationMap?.keys() ?? [])
   ), n = (s) => {
@@ -725,7 +729,7 @@ function Or(r, e) {
     for (const i of s.rules)
       if (Vt(i)) {
         if (n(i)) return !0;
-      } else if (Er(i)) {
+      } else if (Rr(i)) {
         const a = i.field;
         if (a.includes(".")) return !0;
         const o = a.split(":")[0];
@@ -762,7 +766,7 @@ class ut {
    * 构建完整规则集（UPDATE）
    */
   buildUpdateRules() {
-    const e = this.buildMatchWhere("patch"), t = S(() => e() === !1), n = this.buildMatchWhere("inversePatch"), s = S(() => n() === !1), i = this.buildResultContains(), a = S(() => i() === !1), { matchRelationWhere: o, notMatchRelationWhere: c } = this.buildRelationWhereRulesForUpdate();
+    const e = this.buildMatchWhere("patch"), t = S(() => e() === !1), n = this.buildMatchWhere("inversePatch"), s = S(() => n() === !1), i = this.buildResultContains(), a = S(() => i() === !1), { matchRelationWhere: o, notMatchRelationWhere: l } = this.buildRelationWhereRulesForUpdate();
     return {
       match_where: e,
       not_match_where: t,
@@ -770,7 +774,7 @@ class ut {
       match_where_before: n,
       not_match_where_before: s,
       match_relation_where: o,
-      not_match_relation_where: c,
+      not_match_relation_where: l,
       result_contains: i,
       result_not_contains: a
     };
@@ -832,13 +836,13 @@ 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) => Ar(t.patch, Array.from(this.task.resultEntitySet), e))
     ) : ee;
   }
 }
-const $e = S(() => !0), xr = (r, e, t, n) => {
+const $e = S(() => !0), Nr = (r, e, t, n) => {
   if (!I(r.entityType)) {
-    const l = S(() => e.map((_) => _.id)), u = $e, d = $e, h = $e, p = S(() => !1), m = S(() => !0), f = S(() => l().some((_) => r.resultEntitySet?.has(_))), y = S(() => f() === !1);
+    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);
     return {
       ...me({
         match_where: u,
@@ -853,16 +857,16 @@ const $e = S(() => !0), xr = (r, e, t, n) => {
       relation_entities: []
     };
   }
-  const { current_entities: i, relation_entities: a } = Gt(r, e), c = new ut(r, i, a.length > 0).buildCreateRules();
+  const { current_entities: i, relation_entities: a } = Gt(r, e), l = new ut(r, i, a.length > 0).buildCreateRules();
   return {
-    ...me(c, t, n),
+    ...me(l, t, n),
     current_entities: i,
     relation_entities: a
   };
-}, Nr = (r, e, t, n) => {
+}, Pr = (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) => {
+}, wt = S(() => !0), $r = (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 = {
@@ -878,20 +882,20 @@ const $e = S(() => !0), xr = (r, e, t, n) => {
     return me(w, t, n);
   }
   const { current_entities: i, relation_entities: a } = Gt(r, e), o = "where" in r.options ? r.options.where : void 0;
-  let c = !1;
-  o && (c = Or(o, s));
-  const u = new ut(r, i, a.length > 0, c).buildUpdateRules();
+  let l = !1;
+  o && (l = xr(o, s));
+  const u = new ut(r, i, a.length > 0, l).buildUpdateRules();
   return {
     ...me(u, t, n),
     current_entities: i,
     relation_entities: a
   };
 };
-function $r(r, e) {
+function Br(r, e) {
   const t = [], n = [], s = [], i = /* @__PURE__ */ new Set();
   for (const o of r) {
-    const c = e.get(o.id);
-    c === void 0 ? t.push(o.id) : (i.add(o.id), o.updatedAt > c ? n.push(o.id) : s.push(o.id));
+    const l = e.get(o.id);
+    l === void 0 ? t.push(o.id) : (i.add(o.id), o.updatedAt > l ? n.push(o.id) : s.push(o.id));
   }
   const a = [];
   for (const o of e.keys())
@@ -901,12 +905,12 @@ function $r(r, e) {
 function F(r) {
   return typeof r == "function";
 }
-function Br(r) {
+function Dr(r) {
   return F(r?.lift);
 }
 function we(r) {
   return function(e) {
-    if (Br(e))
+    if (Dr(e))
       return e.lift(function(t) {
         try {
           return r(t, this);
@@ -933,7 +937,7 @@ function de(r, e) {
   }
   r.prototype = e === null ? Object.create(e) : (t.prototype = e.prototype, new t());
 }
-function Dr(r, e, t, n) {
+function Lr(r, e, t, n) {
   function s(i) {
     return i instanceof t ? i : new t(function(a) {
       a(i);
@@ -942,22 +946,22 @@ function Dr(r, e, t, n) {
   return new (t || (t = Promise))(function(i, a) {
     function o(u) {
       try {
-        l(n.next(u));
+        c(n.next(u));
       } catch (d) {
         a(d);
       }
     }
-    function c(u) {
+    function l(u) {
       try {
-        l(n.throw(u));
+        c(n.throw(u));
       } catch (d) {
         a(d);
       }
     }
-    function l(u) {
-      u.done ? i(u.value) : s(u.value).then(o, c);
+    function c(u) {
+      u.done ? i(u.value) : s(u.value).then(o, l);
     }
-    l((n = n.apply(r, e || [])).next());
+    c((n = n.apply(r, e || [])).next());
   });
 }
 function Qt(r, e) {
@@ -968,56 +972,56 @@ function Qt(r, e) {
   return a.next = o(0), a.throw = o(1), a.return = o(2), typeof Symbol == "function" && (a[Symbol.iterator] = function() {
     return this;
   }), a;
-  function o(l) {
+  function o(c) {
     return function(u) {
-      return c([l, u]);
+      return l([c, u]);
     };
   }
-  function c(l) {
+  function l(c) {
     if (n) throw new TypeError("Generator is already executing.");
-    for (; a && (a = 0, l[0] && (t = 0)), t; ) try {
-      if (n = 1, s && (i = l[0] & 2 ? s.return : l[0] ? s.throw || ((i = s.return) && i.call(s), 0) : s.next) && !(i = i.call(s, l[1])).done) return i;
-      switch (s = 0, i && (l = [l[0] & 2, i.value]), l[0]) {
+    for (; a && (a = 0, c[0] && (t = 0)), t; ) try {
+      if (n = 1, s && (i = c[0] & 2 ? s.return : c[0] ? s.throw || ((i = s.return) && i.call(s), 0) : s.next) && !(i = i.call(s, c[1])).done) return i;
+      switch (s = 0, i && (c = [c[0] & 2, i.value]), c[0]) {
         case 0:
         case 1:
-          i = l;
+          i = c;
           break;
         case 4:
-          return t.label++, { value: l[1], done: !1 };
+          return t.label++, { value: c[1], done: !1 };
         case 5:
-          t.label++, s = l[1], l = [0];
+          t.label++, s = c[1], c = [0];
           continue;
         case 7:
-          l = t.ops.pop(), t.trys.pop();
+          c = t.ops.pop(), t.trys.pop();
           continue;
         default:
-          if (i = t.trys, !(i = i.length > 0 && i[i.length - 1]) && (l[0] === 6 || l[0] === 2)) {
+          if (i = t.trys, !(i = i.length > 0 && i[i.length - 1]) && (c[0] === 6 || c[0] === 2)) {
             t = 0;
             continue;
           }
-          if (l[0] === 3 && (!i || l[1] > i[0] && l[1] < i[3])) {
-            t.label = l[1];
+          if (c[0] === 3 && (!i || c[1] > i[0] && c[1] < i[3])) {
+            t.label = c[1];
             break;
           }
-          if (l[0] === 6 && t.label < i[1]) {
-            t.label = i[1], i = l;
+          if (c[0] === 6 && t.label < i[1]) {
+            t.label = i[1], i = c;
             break;
           }
           if (i && t.label < i[2]) {
-            t.label = i[2], t.ops.push(l);
+            t.label = i[2], t.ops.push(c);
             break;
           }
           i[2] && t.ops.pop(), t.trys.pop();
           continue;
       }
-      l = e.call(r, t);
+      c = e.call(r, t);
     } catch (u) {
-      l = [6, u], s = 0;
+      c = [6, u], s = 0;
     } finally {
       n = i = 0;
     }
-    if (l[0] & 5) throw l[1];
-    return { value: l[0] ? l[1] : void 0, done: !0 };
+    if (c[0] & 5) throw c[1];
+    return { value: c[0] ? c[1] : void 0, done: !0 };
   }
 }
 function ue(r) {
@@ -1055,7 +1059,7 @@ 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 Fr(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() {
@@ -1069,31 +1073,31 @@ function Lr(r, e, t) {
   function o(p, m) {
     n[p] && (s[p] = function(f) {
       return new Promise(function(y, g) {
-        i.push([p, f, y, g]) > 1 || c(p, f);
+        i.push([p, f, y, g]) > 1 || l(p, f);
       });
     }, m && (s[p] = m(s[p])));
   }
-  function c(p, m) {
+  function l(p, m) {
     try {
-      l(n[p](m));
+      c(n[p](m));
     } catch (f) {
       h(i[0][3], f);
     }
   }
-  function l(p) {
+  function c(p) {
     p.value instanceof le ? Promise.resolve(p.value.v).then(u, d) : h(i[0][2], p);
   }
   function u(p) {
-    c("next", p);
+    l("next", p);
   }
   function d(p) {
-    c("throw", p);
+    l("throw", p);
   }
   function h(p, m) {
-    p(m), i.shift(), i.length && c(i[0][0], i[0][1]);
+    p(m), i.shift(), i.length && l(i[0][0], i[0][1]);
   }
 }
-function Fr(r) {
+function Ur(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() {
@@ -1101,21 +1105,21 @@ function Fr(r) {
   }, t);
   function n(i) {
     t[i] = r[i] && function(a) {
-      return new Promise(function(o, c) {
-        a = r[i](a), s(o, c, a.done, a.value);
+      return new Promise(function(o, l) {
+        a = r[i](a), s(o, l, a.done, a.value);
       });
     };
   }
-  function s(i, a, o, c) {
-    Promise.resolve(c).then(function(l) {
-      i({ value: l, done: o });
+  function s(i, a, o, l) {
+    Promise.resolve(l).then(function(c) {
+      i({ value: c, done: o });
     }, a);
   }
 }
-var Ur = (function(r) {
+var jr = (function(r) {
   return r && typeof r.length == "number" && typeof r != "function";
 });
-function jr(r) {
+function Yr(r) {
   return F(r?.then);
 }
 function Jt(r) {
@@ -1151,15 +1155,15 @@ var Se = (function() {
       if (a)
         if (this._parentage = null, Array.isArray(a))
           try {
-            for (var o = ue(a), c = o.next(); !c.done; c = o.next()) {
-              var l = c.value;
-              l.remove(this);
+            for (var o = ue(a), l = o.next(); !l.done; l = o.next()) {
+              var c = l.value;
+              c.remove(this);
             }
           } catch (f) {
             e = { error: f };
           } finally {
             try {
-              c && !c.done && (t = o.return) && t.call(o);
+              l && !l.done && (t = o.return) && t.call(o);
             } finally {
               if (e) throw e.error;
             }
@@ -1234,9 +1238,9 @@ function Zt(r) {
 function vt(r) {
   F(r) ? r() : r.unsubscribe();
 }
-var Yr = {
+var zr = {
   Promise: void 0
-}, zr = {
+}, Wr = {
   setTimeout: function(r, e) {
     for (var t = [], n = 2; n < arguments.length; n++)
       t[n - 2] = arguments[n];
@@ -1248,7 +1252,7 @@ var Yr = {
   delegate: void 0
 };
 function en(r) {
-  zr.setTimeout(function() {
+  Wr.setTimeout(function() {
     throw r;
   });
 }
@@ -1261,7 +1265,7 @@ var dt = (function(r) {
   de(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 = Hr, n;
   }
   return e.create = function(t, n, s) {
     return new ge(t, n, s);
@@ -1288,7 +1292,7 @@ var dt = (function(r) {
       this.unsubscribe();
     }
   }, e;
-})(Se), Wr = (function() {
+})(Se), kr = (function() {
   function r(e) {
     this.partialObserver = e;
   }
@@ -1327,29 +1331,29 @@ var dt = (function(r) {
       next: t ?? void 0,
       error: n ?? void 0,
       complete: s ?? void 0
-    } : a = t, i.destination = new Wr(a), i;
+    } : a = t, i.destination = new kr(a), i;
   }
   return e;
 })(dt);
 function ve(r) {
   en(r);
 }
-function kr(r) {
+function Kr(r) {
   throw r;
 }
-var Kr = {
+var Hr = {
   closed: !0,
   next: Et,
-  error: kr,
+  error: Kr,
   complete: Et
 }, ht = (function() {
   return typeof Symbol == "function" && Symbol.observable || "@@observable";
 })();
-function Hr(r) {
+function qr(r) {
   return r;
 }
-function qr(r) {
-  return r.length === 0 ? Hr : r.length === 1 ? r[0] : function(t) {
+function Vr(r) {
+  return r.length === 0 ? qr : r.length === 1 ? r[0] : function(t) {
     return r.reduce(function(n, s) {
       return s(n);
     }, t);
@@ -1363,10 +1367,10 @@ 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);
+    var s = this, i = Qr(e) ? e : new ge(e, t, n);
     return Ee(function() {
-      var a = s, o = a.operator, c = a.source;
-      i.add(o ? o.call(i, c) : c ? s._subscribe(i) : s._trySubscribe(i));
+      var a = s, o = a.operator, l = a.source;
+      i.add(o ? o.call(i, l) : l ? s._subscribe(i) : s._trySubscribe(i));
     }), i;
   }, r.prototype._trySubscribe = function(e) {
     try {
@@ -1381,8 +1385,8 @@ var re = (function() {
         next: function(o) {
           try {
             e(o);
-          } catch (c) {
-            i(c), a.unsubscribe();
+          } catch (l) {
+            i(l), a.unsubscribe();
           }
         },
         error: i,
@@ -1398,7 +1402,7 @@ var re = (function() {
   }, r.prototype.pipe = function() {
     for (var e = [], t = 0; t < arguments.length; t++)
       e[t] = arguments[t];
-    return qr(e)(this);
+    return Vr(e)(this);
   }, r.prototype.toPromise = function(e) {
     var t = this;
     return e = Rt(e), new e(function(n, s) {
@@ -1417,32 +1421,32 @@ var re = (function() {
 })();
 function Rt(r) {
   var e;
-  return (e = r ?? Yr.Promise) !== null && e !== void 0 ? e : Promise;
-}
-function Vr(r) {
-  return r && F(r.next) && F(r.error) && F(r.complete);
+  return (e = r ?? zr.Promise) !== null && e !== void 0 ? e : Promise;
 }
 function Gr(r) {
-  return r && r instanceof dt || Vr(r) && Zt(r);
+  return r && F(r.next) && F(r.error) && F(r.complete);
 }
 function Qr(r) {
-  return F(r[ht]);
+  return r && r instanceof dt || Gr(r) && Zt(r);
 }
 function Jr(r) {
-  return Symbol.asyncIterator && F(r?.[Symbol.asyncIterator]);
+  return F(r[ht]);
 }
 function Xr(r) {
+  return Symbol.asyncIterator && F(r?.[Symbol.asyncIterator]);
+}
+function Zr(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 es() {
   return typeof Symbol != "function" || !Symbol.iterator ? "@@iterator" : Symbol.iterator;
 }
-var es = Zr();
-function ts(r) {
-  return F(r?.[es]);
-}
+var ts = es();
 function ns(r) {
-  return Lr(this, arguments, function() {
+  return F(r?.[ts]);
+}
+function rs(r) {
+  return Fr(this, arguments, function() {
     var t, n, s, i;
     return Qt(this, function(a) {
       switch (a.label) {
@@ -1472,29 +1476,29 @@ function ns(r) {
     });
   });
 }
-function rs(r) {
+function ss(r) {
   return F(r?.getReader);
 }
 function Me(r) {
   if (r instanceof re)
     return r;
   if (r != null) {
-    if (Qr(r))
-      return ss(r);
-    if (Ur(r))
+    if (Jr(r))
       return is(r);
     if (jr(r))
       return as(r);
-    if (Jr(r))
-      return tn(r);
-    if (ts(r))
+    if (Yr(r))
       return os(r);
-    if (rs(r))
+    if (Xr(r))
+      return tn(r);
+    if (ns(r))
       return cs(r);
+    if (ss(r))
+      return ls(r);
   }
-  throw Xr(r);
+  throw Zr(r);
 }
-function ss(r) {
+function is(r) {
   return new re(function(e) {
     var t = r[ht]();
     if (F(t.subscribe))
@@ -1502,14 +1506,14 @@ function ss(r) {
     throw new TypeError("Provided object does not correctly implement Symbol.observable");
   });
 }
-function is(r) {
+function as(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 os(r) {
   return new re(function(e) {
     r.then(function(t) {
       e.closed || (e.next(t), e.complete());
@@ -1518,7 +1522,7 @@ function as(r) {
     }).then(null, en);
   });
 }
-function os(r) {
+function cs(r) {
   return new re(function(e) {
     var t, n;
     try {
@@ -1541,39 +1545,39 @@ function os(r) {
 }
 function tn(r) {
   return new re(function(e) {
-    ls(r, e).catch(function(t) {
+    us(r, e).catch(function(t) {
       return e.error(t);
     });
   });
 }
-function cs(r) {
-  return tn(ns(r));
+function ls(r) {
+  return tn(rs(r));
 }
-function ls(r, e) {
+function us(r, e) {
   var t, n, s, i;
-  return Dr(this, void 0, void 0, function() {
+  return Lr(this, void 0, void 0, function() {
     var a, o;
-    return Qt(this, function(c) {
-      switch (c.label) {
+    return Qt(this, function(l) {
+      switch (l.label) {
         case 0:
-          c.trys.push([0, 5, 6, 11]), t = Fr(r), c.label = 1;
+          l.trys.push([0, 5, 6, 11]), t = Ur(r), l.label = 1;
         case 1:
           return [4, t.next()];
         case 2:
-          if (n = c.sent(), !!n.done) return [3, 4];
+          if (n = l.sent(), !!n.done) return [3, 4];
           if (a = n.value, e.next(a), e.closed)
             return [2];
-          c.label = 3;
+          l.label = 3;
         case 3:
           return [3, 1];
         case 4:
           return [3, 11];
         case 5:
-          return o = c.sent(), s = { error: o }, [3, 11];
+          return o = l.sent(), s = { error: o }, [3, 11];
         case 6:
-          return c.trys.push([6, , 9, 10]), n && !n.done && (i = t.return) ? [4, i.call(t)] : [3, 8];
+          return l.trys.push([6, , 9, 10]), n && !n.done && (i = t.return) ? [4, i.call(t)] : [3, 8];
         case 7:
-          c.sent(), c.label = 8;
+          l.sent(), l.label = 8;
         case 8:
           return [3, 10];
         case 9:
@@ -1588,35 +1592,35 @@ function ls(r, e) {
   });
 }
 function _e(r, e, t, n, s) {
-  return new us(r, e, t, n, s);
+  return new ds(r, e, t, n, s);
 }
-var us = (function(r) {
+var ds = (function(r) {
   de(e, r);
   function e(t, n, s, i, a, o) {
-    var c = r.call(this, t) || this;
-    return c.onFinalize = a, c.shouldUnsubscribe = o, c._next = n ? function(l) {
+    var l = r.call(this, t) || this;
+    return l.onFinalize = a, l.shouldUnsubscribe = o, l._next = n ? function(c) {
       try {
-        n(l);
+        n(c);
       } catch (u) {
         t.error(u);
       }
-    } : r.prototype._next, c._error = i ? function(l) {
+    } : r.prototype._next, l._error = i ? function(c) {
       try {
-        i(l);
+        i(c);
       } catch (u) {
         t.error(u);
       } finally {
         this.unsubscribe();
       }
-    } : r.prototype._error, c._complete = s ? function() {
+    } : r.prototype._error, l._complete = s ? function() {
       try {
         s();
-      } catch (l) {
-        t.error(l);
+      } catch (c) {
+        t.error(c);
       } finally {
         this.unsubscribe();
       }
-    } : r.prototype._complete, c;
+    } : r.prototype._complete, l;
   }
   return e.prototype.unsubscribe = function() {
     var t;
@@ -1647,7 +1651,7 @@ function te(r, e) {
     }));
   });
 }
-var ds = Jt(function(r) {
+var hs = Jt(function(r) {
   return function() {
     r(this), this.name = "ObjectUnsubscribedError", this.message = "object unsubscribed";
   };
@@ -1662,7 +1666,7 @@ var ds = Jt(function(r) {
     return n.operator = t, n;
   }, e.prototype._throwIfClosed = function() {
     if (this.closed)
-      throw new ds();
+      throw new hs();
   }, e.prototype.next = function(t) {
     var n = this;
     Ee(function() {
@@ -1671,11 +1675,11 @@ var ds = Jt(function(r) {
         n.currentObservers || (n.currentObservers = Array.from(n.observers));
         try {
           for (var a = ue(n.currentObservers), o = a.next(); !o.done; o = a.next()) {
-            var c = o.value;
-            c.next(t);
+            var l = o.value;
+            l.next(t);
           }
-        } catch (l) {
-          s = { error: l };
+        } catch (c) {
+          s = { error: c };
         } finally {
           try {
             o && !o.done && (i = a.return) && i.call(a);
@@ -1758,7 +1762,7 @@ function It(r, e) {
     }));
   });
 }
-var hs = (function(r) {
+var ps = (function(r) {
   de(e, r);
   function e(t, n, s) {
     t === void 0 && (t = 1 / 0), n === void 0 && (n = 1 / 0), s === void 0 && (s = nn);
@@ -1766,28 +1770,28 @@ var hs = (function(r) {
     return i._bufferSize = t, i._windowTime = n, i._timestampProvider = s, i._buffer = [], i._infiniteTimeWindow = !0, i._infiniteTimeWindow = n === 1 / 0, i._bufferSize = Math.max(1, t), i._windowTime = Math.max(1, n), i;
   }
   return e.prototype.next = function(t) {
-    var n = this, s = n.isStopped, i = n._buffer, a = n._infiniteTimeWindow, o = n._timestampProvider, c = n._windowTime;
-    s || (i.push(t), !a && i.push(o.now() + c)), this._trimBuffer(), r.prototype.next.call(this, t);
+    var n = this, s = n.isStopped, i = n._buffer, a = n._infiniteTimeWindow, o = n._timestampProvider, l = n._windowTime;
+    s || (i.push(t), !a && i.push(o.now() + l)), this._trimBuffer(), r.prototype.next.call(this, t);
   }, e.prototype._subscribe = function(t) {
     this._throwIfClosed(), this._trimBuffer();
-    for (var n = this._innerSubscribe(t), s = this, i = s._infiniteTimeWindow, a = s._buffer, o = a.slice(), c = 0; c < o.length && !t.closed; c += i ? 1 : 2)
-      t.next(o[c]);
+    for (var n = this._innerSubscribe(t), s = this, i = s._infiniteTimeWindow, a = s._buffer, o = a.slice(), l = 0; l < o.length && !t.closed; l += i ? 1 : 2)
+      t.next(o[l]);
     return this._checkFinalizedStatuses(t), n;
   }, e.prototype._trimBuffer = function() {
     var t = this, n = t._bufferSize, s = t._timestampProvider, i = t._buffer, a = t._infiniteTimeWindow, o = (a ? 1 : 2) * n;
     if (n < 1 / 0 && o < i.length && i.splice(0, i.length - o), !a) {
-      for (var c = s.now(), l = 0, u = 1; u < i.length && i[u] <= c; u += 2)
-        l = u;
-      l && i.splice(0, l + 1);
+      for (var l = s.now(), c = 0, u = 1; u < i.length && i[u] <= l; u += 2)
+        c = u;
+      c && i.splice(0, c + 1);
     }
   }, e;
 })(pt);
-function ps(r) {
+function fs(r) {
   r === void 0 && (r = {});
   var e = r.connector, t = e === void 0 ? function() {
     return new pt();
-  } : e, n = r.resetOnError, s = n === void 0 ? !0 : n, i = r.resetOnComplete, a = i === void 0 ? !0 : i, o = r.resetOnRefCountZero, c = o === void 0 ? !0 : o;
-  return function(l) {
+  } : 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() {
       d?.unsubscribe(), d = void 0;
     }, g = function() {
@@ -1800,7 +1804,7 @@ function ps(r) {
       p++, !f && !m && y();
       var w = h = h ?? t();
       b.add(function() {
-        p--, p === 0 && !f && !m && (d = De(_, c));
+        p--, p === 0 && !f && !m && (d = De(_, l));
       }), w.subscribe(b), !u && p > 0 && (u = new ge({
         next: function(E) {
           return w.next(E);
@@ -1812,7 +1816,7 @@ function ps(r) {
           m = !0, y(), d = De(g, a), w.complete();
         }
       }), Me(v).subscribe(u));
-    })(l);
+    })(c);
   };
 }
 function De(r, e) {
@@ -1831,11 +1835,11 @@ function De(r, e) {
     return Me(e.apply(void 0, Ae([], Te(t)))).subscribe(s);
   }
 }
-function fs(r, e, t) {
+function ys(r, e, t) {
   var n, s = !1;
-  return n = r, ps({
+  return n = r, fs({
     connector: function() {
-      return new hs(n, e, t);
+      return new ps(n, e, t);
     },
     resetOnError: !0,
     resetOnComplete: !1,
@@ -1847,11 +1851,11 @@ function V(r, e) {
     var s = null, i = 0, a = !1, o = function() {
       return a && !s && n.complete();
     };
-    t.subscribe(_e(n, function(c) {
+    t.subscribe(_e(n, function(l) {
       s?.unsubscribe();
-      var l = 0, u = i++;
-      Me(r(c, u)).subscribe(s = _e(n, function(d) {
-        return n.next(e ? e(c, d, u, l++) : d);
+      var c = 0, u = i++;
+      Me(r(l, u)).subscribe(s = _e(n, function(d) {
+        return n.next(e ? e(l, d, u, c++) : d);
       }, function() {
         s = null, o();
       }));
@@ -1860,7 +1864,7 @@ function V(r, e) {
     }));
   });
 }
-class ua {
+class da {
   constructor(e, t, n) {
     this.remoteAdapter = t, this.localAdapter = n, this.entityName = e;
   }
@@ -1907,7 +1911,7 @@ class ua {
     let s;
     e.localCacheFirst ? s = this.#n(e) : s = this.#i(e), e.offlineFallback && (s = this.#s(s));
     const i = s.pipe(
-      fs(1),
+      ys(1),
       Ft(() => {
         this.#e.delete(t);
       })
@@ -2107,9 +2111,9 @@ class ua {
         const i = s.map((a) => a.id);
         return this.localAdapter.getMetadataByIds(this.entityName, i).pipe(
           V((a) => {
-            const o = $r(s, a), c = [...o.missingIds, ...o.staleIds];
-            return c.length === 0 ? this.#a(o.freshIds).pipe(
-              te((l) => (this.#o(e.onSyncStats, {
+            const o = Br(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,
                 missingCount: 0,
                 staleCount: 0,
@@ -2117,9 +2121,9 @@ class ua {
                 orphanCount: o.orphanIds.length,
                 pulledCount: 0,
                 durationMs: Date.now() - n
-              }), l))
-            ) : this.remoteAdapter.findByIds(this.entityName, c).pipe(
-              V((l) => l.length === 0 ? this.#a(o.freshIds).pipe(
+              }), c))
+            ) : this.remoteAdapter.findByIds(this.entityName, l).pipe(
+              V((c) => c.length === 0 ? this.#a(o.freshIds).pipe(
                 te((u) => (this.#o(e.onSyncStats, {
                   remoteCount: s.length,
                   missingCount: o.missingIds.length,
@@ -2129,25 +2133,25 @@ class ua {
                   pulledCount: 0,
                   durationMs: Date.now() - n
                 }), u))
-              ) : this.localAdapter.upsertMany(this.entityName, l).pipe(
+              ) : this.localAdapter.upsertMany(this.entityName, c).pipe(
                 V(() => o.freshIds.length === 0 ? (this.#o(e.onSyncStats, {
                   remoteCount: s.length,
                   missingCount: o.missingIds.length,
                   staleCount: o.staleIds.length,
                   freshCount: 0,
                   orphanCount: o.orphanIds.length,
-                  pulledCount: l.length,
+                  pulledCount: c.length,
                   durationMs: Date.now() - n
-                }), Q(l)) : this.#a(o.freshIds).pipe(
+                }), Q(c)) : this.#a(o.freshIds).pipe(
                   te((u) => (this.#o(e.onSyncStats, {
                     remoteCount: s.length,
                     missingCount: o.missingIds.length,
                     staleCount: o.staleIds.length,
                     freshCount: o.freshIds.length,
                     orphanCount: o.orphanIds.length,
-                    pulledCount: l.length,
+                    pulledCount: c.length,
                     durationMs: Date.now() - n
-                  }), [...u, ...l]))
+                  }), [...u, ...c]))
                 ))
               ))
             );
@@ -2178,7 +2182,7 @@ class ua {
     return Lt(e);
   }
 }
-class ys {
+class ms {
   /**
    * 刷新
    * 重新执行 SQL 查询
@@ -2341,19 +2345,19 @@ class ys {
     this.#e.next(this.refreshCount + 1);
   };
 }
-var ms = /* @__PURE__ */ ((r) => (r.Synced = "Synced", r.Syncing = "Syncing", r.Never = "Never", r))(ms || {});
+var gs = /* @__PURE__ */ ((r) => (r.Synced = "Synced", r.Syncing = "Syncing", r.Never = "Never", r))(gs || {});
 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;
 function* rn(r, e, t = {}) {
   const { maxLevel: n, maxDepth: s = 1e3 } = t, i = /* @__PURE__ */ new Set();
   let a = D(r), o = 1;
   for (; a && !i.has(a) && i.size < s; ) {
     i.add(a);
-    const c = e.get(a);
-    if (!c || n && o > n) break;
-    yield { entity: c, level: o }, a = D(c), o++;
+    const l = e.get(a);
+    if (!l || n && o > n) break;
+    yield { entity: l, level: o }, a = D(l), o++;
   }
 }
-function gs(r, e, t, n) {
+function _s(r, e, t, n) {
   if (e == null)
     return r.parentId === null;
   const s = /* @__PURE__ */ new Set();
@@ -2370,7 +2374,7 @@ function gs(r, e, t, n) {
   }
   return !1;
 }
-function _s(r, e, t) {
+function bs(r, e, t) {
   const n = t.get(e);
   if (!n) return !1;
   for (const { entity: s } of rn(n, t))
@@ -2388,7 +2392,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 ws = (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));
@@ -2402,11 +2406,11 @@ const bs = (r, e) => {
     }
     case "find": {
       const i = r.options, a = i.limit || 100, o = Array.from(r.resultEntitySet.values());
-      let c = [...o, ...s];
-      i.orderBy?.length && (c = X(c, i.orderBy));
-      const l = c.slice(0, a);
-      if (!Tt(o, l)) return;
-      r.next(l, !0);
+      let l = [...o, ...s];
+      i.orderBy?.length && (l = X(l, i.orderBy));
+      const c = l.slice(0, a);
+      if (!Tt(o, c)) return;
+      r.next(c, !0);
       break;
     }
     case "findOne":
@@ -2420,30 +2424,30 @@ const bs = (r, e) => {
         break;
       }
       if (i.orderBy?.length) {
-        const c = r.result, l = X([c, o], i.orderBy);
-        l[0] !== c && r.next(l[0]);
+        const l = r.result, c = X([l, o], i.orderBy);
+        c[0] !== l && r.next(c[0]);
       }
       break;
     }
     case "findByCursor": {
-      const i = r.options, { before: a, after: o, orderBy: c } = i;
-      if (!c?.length) return;
-      const l = Array.from(r.resultEntitySet.values()), u = [...l, ...s], d = X(u, c);
+      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;
       if (o || a) {
         const p = [...u];
         o && !p.includes(o) && p.push(o), a && !p.includes(a) && p.push(a);
-        const m = X(p, c);
+        const m = X(p, l);
         if (o) {
           const f = m.findIndex((y) => y === o);
-          f !== -1 ? h = m.slice(f + 1).filter((y) => l.includes(y) || s.includes(y)) : h = l;
+          f !== -1 ? h = m.slice(f + 1).filter((y) => c.includes(y) || s.includes(y)) : h = c;
         } else {
           const f = m.findIndex((y) => y === a);
-          f !== -1 ? h = m.slice(0, f).filter((y) => l.includes(y) || s.includes(y)) : h = l;
+          f !== -1 ? h = m.slice(0, f).filter((y) => c.includes(y) || s.includes(y)) : h = c;
         }
       } else
         h = d;
-      if (!Tt(l, h)) return;
+      if (!Tt(c, h)) return;
       r.next(h, !0);
       break;
     }
@@ -2453,17 +2457,17 @@ const bs = (r, e) => {
       break;
     }
     case "findDescendants": {
-      const i = r.options, a = Array.from(r.resultEntitySet.values()), o = Ge(a, (l) => l.id), c = s.filter(
-        (l) => gs(l, i.entityId, o, i.level)
+      const i = r.options, a = Array.from(r.resultEntitySet.values()), o = Ge(a, (c) => c.id), l = s.filter(
+        (c) => _s(c, i.entityId, o, i.level)
       );
-      if (c.length === 0) return;
-      c.forEach((l) => r.resultEntitySet.add(l)), r.next(Array.from(r.resultEntitySet.values()), !0);
+      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], c = Ge(o, (u) => u.id), l = s.filter((u) => u.id === i.entityId ? !0 : i.entityId ? _s(u, i.entityId, c) : !1);
-      if (l.length === 0) return;
-      l.forEach((u) => r.resultEntitySet.add(u)), r.next(Array.from(r.resultEntitySet.values()), !0);
+      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 ? bs(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;
     }
   }
@@ -2489,9 +2493,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 = Nr(r, e, t, n);
+  i.refresh ? r.refresh() : i.recalculate && ws(r, i.current_entities);
+}, vs = (r, e) => {
   const t = new Set(e.map((n) => n.id));
   switch (r.type) {
     case "findAll": {
@@ -2524,19 +2528,19 @@ const bs = (r, e) => {
       break;
     }
     case "findDescendants": {
-      const n = r.options, s = Array.from(r.resultEntitySet.values()), i = Ge(s, (l) => l.id);
+      const n = r.options, s = Array.from(r.resultEntitySet.values()), i = Ge(s, (c) => c.id);
       let a = !1;
-      const o = s.filter((l) => {
-        if (t.has(l.id))
+      const o = s.filter((c) => {
+        if (t.has(c.id))
           return a = !0, !1;
-        for (const { entity: u } of rn(l, i))
+        for (const { entity: u } of rn(c, i))
           if (u?.id && t.has(u.id))
             return a = !0, !1;
         return !0;
       });
       if (!a) return;
-      const c = n.orderBy?.length ? X(o, n.orderBy) : o;
-      r.next(c, !0);
+      const l = n.orderBy?.length ? X(o, n.orderBy) : o;
+      r.next(l, !0);
       break;
     }
     case "findAncestors": {
@@ -2570,13 +2574,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 = Pr(r, e, t, n);
+  s.refresh ? r.refresh() : s.recalculate && vs(r, e);
 }, N = (r) => {
   if (r)
     return r.id;
 };
-class vs {
+class Es {
   constructor(e, t) {
     this.serialize = t, e.forEach((n) => this.dataById.set(n.id, n));
   }
@@ -2611,21 +2615,21 @@ class vs {
     return this.dataById.get(e);
   }
 }
-const Es = (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)), c = /* @__PURE__ */ new Set(), l = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set();
+const Rs = (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) : c.add(d.id);
+    o.has(d.id) ? u.add(d.id) : l.add(d.id);
   }), i.forEach((d) => {
-    a.has(d.id) || l.add(d.id);
+    a.has(d.id) || c.add(d.id);
   }), {
     updatedIds: n,
     matchNowIds: a,
     matchBeforeIds: o,
-    newlyMatchedIds: c,
-    newlyUnmatchedIds: l,
+    newlyMatchedIds: l,
+    newlyUnmatchedIds: c,
     stillMatchedIds: u
   };
-}, Rs = (r, e, t) => {
+}, Cs = (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);
@@ -2636,22 +2640,22 @@ const Es = (r, e, t) => {
     const h = t.getData(d);
     h?.patch ? (Object.assign(u, h.patch), (!s || Y(u, s)) && a.push(u)) : a.push(u);
   }
-  const o = new Set(a.map((u) => N(u)).filter(Boolean)), c = Array.from(e.newlyMatchedIds).filter((u) => !o.has(u)).map((u) => t.getSerializedUpdate(u)).filter((u) => !!u);
-  let l = [...a, ...c];
-  n.orderBy?.length && (l = X(l, n.orderBy)), r.next(l, !0);
-}, Cs = (r, e) => {
+  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);
+}, Is = (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) => {
+}, Ts = (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) => {
+}, As = (r, e, t) => {
   const n = r.options, s = n.where;
   if (r.result === null || r.result === void 0) {
     e.newlyMatchedIds.size > 0 && r.refresh();
@@ -2674,7 +2678,7 @@ const Es = (r, e, t) => {
     return;
   }
   e.newlyMatchedIds.size > 0 && r.refresh();
-}, As = (r, e) => {
+}, Ss = (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);
@@ -2723,12 +2727,12 @@ class Oe {
   isEntityDescendant(e, t) {
     if (t == null) {
       let a = D(e), o = 0;
-      const c = /* @__PURE__ */ new Set();
-      for (; a && !c.has(a); ) {
-        o++, c.add(a);
-        const l = this.resolveParentEntity(a);
-        if (l)
-          a = D(l);
+      const l = /* @__PURE__ */ new Set();
+      for (; a && !l.has(a); ) {
+        o++, l.add(a);
+        const c = this.resolveParentEntity(a);
+        if (c)
+          a = D(c);
         else
           break;
       }
@@ -2834,13 +2838,13 @@ class Oe {
     return !1;
   }
 }
-const Ss = (r, e, t, n) => {
-  const s = r.options, i = s.entityId, a = s.level, o = Array.from(r.resultEntitySet.values()), c = /* @__PURE__ */ new Map();
+const Ms = (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 && c.set(g, y);
+    g && l.set(g, y);
   });
-  const l = new Oe(n, c);
+  const c = new Oe(n, l);
   let u = !1;
   const h = o.filter((y) => {
     const g = N(y);
@@ -2853,7 +2857,7 @@ const Ss = (r, e, t, n) => {
         if (_ && "parentId" in _.patch) {
           const b = n.getSerializedUpdate(g);
           if (b) {
-            const { isDescendant: w, level: E } = l.isEntityDescendant(b, i);
+            const { isDescendant: w, level: E } = c.isEntityDescendant(b, i);
             if (!w || a !== void 0 && E > a)
               return u = !0, !1;
           }
@@ -2870,37 +2874,37 @@ const Ss = (r, e, t, n) => {
     return y;
   }), p = [];
   if (e.filter((y) => {
-    const g = y.id, _ = c.has(g), v = "parentId" in y.patch;
+    const g = y.id, _ = l.has(g), v = "parentId" in y.patch;
     return t.matchNowIds.has(g) && !_ && v;
   }).forEach((y) => {
     const g = n.getSerializedUpdate(y.id);
     if (!g) return;
-    const { isDescendant: _, level: v } = l.isEntityDescendant(g, i);
+    const { isDescendant: _, level: v } = c.isEntityDescendant(g, i);
     if (_ && (a === void 0 || v <= a)) {
       u = !0, p.push(g);
       const b = N(g);
-      b && c.set(b, g);
+      b && l.set(b, g);
     }
   }), e.forEach((y) => {
     const g = y.id;
     if (t.newlyMatchedIds.has(g)) {
       const _ = n.getSerializedUpdate(g);
       if (_) {
-        const { isDescendant: v, level: b } = l.isEntityDescendant(_, i);
-        v && (a === void 0 || b <= a) && (h.some((E) => N(E) === g) || p.some((E) => N(E) === g) || c.has(g) || (u = !0, p.push(_), c.set(g, _)));
+        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, _)));
       }
     }
   }), !u)
     return;
   const f = [...h, ...p];
   r.next(f, !0);
-}, Ms = (r, e, t, n) => {
+}, Os = (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 c = new Oe(n, o), l = () => {
+  const l = new Oe(n, o), c = () => {
     if (!i)
       return;
     const b = n.getSerializedUpdate(i);
@@ -2913,15 +2917,15 @@ const Ss = (r, e, t, n) => {
     if (t.newlyUnmatchedIds.has(w))
       return u = !0, !1;
     if (m) {
-      if (!c.isEntityAncestor(l(), b))
+      if (!l.isEntityAncestor(c(), b))
         return u = !0, !1;
     } 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 = l();
+        const U = n.getSerializedUpdate(w), A = c();
         if (!A)
           return !0;
-        if (U && !c.isEntityAncestor(A, U))
+        if (U && !l.isEntityAncestor(A, U))
           return u = !0, !1;
       }
     }
@@ -2937,10 +2941,10 @@ const Ss = (r, e, t, n) => {
   t.newlyMatchedIds.forEach((b) => {
     const w = n.getSerializedUpdate(b);
     if (!w) return;
-    const E = l();
-    E && c.isEntityAncestor(E, w) && (u = !0, g.push(w), o.set(b, w));
+    const E = c();
+    E && l.isEntityAncestor(E, w) && (u = !0, g.push(w), o.set(b, w));
   });
-  const _ = l();
+  const _ = c();
   if (_) {
     const b = N(_);
     b && (y.some((E) => N(E) === b) || g.some((E) => N(E) === b) || (u = !0, y.push(_)));
@@ -2949,8 +2953,8 @@ 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, c = r.result || 0, l = /* @__PURE__ */ new Map(), u = new Oe(n, l);
+}, xs = (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);
@@ -2972,21 +2976,21 @@ const Ss = (r, e, t, n) => {
   if (d)
     r.refresh();
   else if (h !== 0) {
-    const p = Math.max(0, c + h);
+    const p = Math.max(0, l + h);
     r.next(p);
   }
-}, xs = (r, e, t, n, s, i) => {
-  const o = r.options.entityId, c = r.result || 0;
+}, Ns = (r, e, t, n, s, i) => {
+  const o = r.options.entityId, l = r.result || 0;
   if (!o) {
     r.refresh();
     return;
   }
-  const l = n.getData(o);
-  if (!l) {
+  const c = n.getData(o);
+  if (!c) {
     r.refresh();
     return;
   }
-  const u = /* @__PURE__ */ new Map(), d = new Oe(n, u), h = n.getSerializedBefore(l.id, l.inversePatch), p = n.getSerializedUpdate(l.id);
+  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) {
     r.refresh();
     return;
@@ -3030,39 +3034,39 @@ const Ss = (r, e, t, n) => {
   if (g)
     r.refresh();
   else if (y !== 0) {
-    const v = Math.max(0, c + y);
+    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);
+}, Ps = (r, e) => {
+  const t = r.options.where, n = new Es(e, (i) => r.serialize(i)), s = Rs(e, t, Y);
   switch (r.type) {
     case "findAll":
-      Rs(r, s, n);
+      Cs(r, s, n);
       break;
     case "find":
-      Cs(r, s);
+      Is(r, s);
       break;
     case "findOne":
     case "findOneOrFail":
-      Ts(r, s, n);
+      As(r, s, n);
       break;
     case "findByCursor":
-      Is(r, s);
+      Ts(r, s);
       break;
     case "count":
-      As(r, s);
+      Ss(r, s);
       break;
     case "findDescendants":
-      Ss(r, e, s, n);
+      Ms(r, e, s, n);
       break;
     case "findAncestors":
-      Ms(r, e, s, n);
+      Os(r, e, s, n);
       break;
     case "countDescendants":
-      Os(r, e, s, n, t, Y);
+      xs(r, e, s, n, t, Y);
       break;
     case "countAncestors":
-      xs(r, e, s, n, t, Y);
+      Ns(r, e, s, n, t, Y);
       break;
   }
 }, Xe = (r, e) => {
@@ -3129,10 +3133,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 = $r(r, e, t, n);
+  s.refresh ? r.refresh() : s.recalculate && Ps(r, e);
 };
-class Ps {
+class $s {
   /**
    * 构造函数
    *
@@ -3188,7 +3192,7 @@ class Ps {
    * @returns 新创建的查询任务
    */
   #o(e, t) {
-    return new ys({
+    return new ms({
       cacheKey: e,
       ...t,
       entityType: this.EntityType,
@@ -3283,7 +3287,7 @@ class Ps {
     this.#i = e, this.rxdb.addEventListener(ne, e), this.rxdb.addEventListener(oe, e), this.rxdb.addEventListener(ce, e);
   }
 }
-class $s {
+class Bs {
   constructor(e, t) {
     this.rxdb = e, this.EntityType = t;
   }
@@ -3320,7 +3324,7 @@ class $s {
     n.origin = { ...t }, Object.assign(e, t);
   }
 }
-class sn extends $s {
+class sn extends Bs {
   static _STATIC_METHODS = [
     ...super._STATIC_METHODS,
     "get",
@@ -3364,7 +3368,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 $s(e, t, this);
   }
   /**
    * 根据 id 获取实体
@@ -3475,8 +3479,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 = Ds(e);
+    s && (n = Ls(n, s));
     const i = () => this.primary$.pipe(
       x((a) => a.find({ ...e, where: n })),
       W(this._setLocals)
@@ -3539,7 +3543,7 @@ class sn extends $s {
   };
   _setLocals = (e) => e.forEach(this._setLocal);
 }
-const Bs = (r) => {
+const Ds = (r) => {
   const e = r.after || r.before;
   if (!e) return null;
   const t = !!r.after;
@@ -3552,16 +3556,16 @@ const Bs = (r) => {
   }
   const n = [];
   for (let s = 0; s < r.orderBy.length; s++) {
-    const { field: i, sort: a } = r.orderBy[s], c = a === "asc" === t, l = [];
+    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;
-      l.push({ field: h, operator: "=", value: e[h] });
+      c.push({ field: h, operator: "=", value: e[h] });
     }
-    const u = c ? ">" : "<";
-    l.push({ field: i, operator: u, value: e[i] }), n.push({ combinator: "and", rules: l });
+    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] };
+}, Ls = (r, e) => r.combinator === "and" ? { ...r, rules: [...r.rules, e] } : { combinator: "and", rules: [r, e] };
 class an {
   constructor(e) {
     this.rxdb = e;
@@ -3577,17 +3581,17 @@ class an {
     this.repository_map.set(e, t);
   }
 }
-class da extends an {
-}
 class ha extends an {
 }
-class pa {
+class pa extends an {
+}
+class fa {
   constructor(e) {
     this.rxdb = e;
   }
 }
 const At = 100;
-class Ls extends sn {
+class Fs extends sn {
   static _STATIC_METHODS = [
     ...super._STATIC_METHODS,
     "findDescendants",
@@ -3654,7 +3658,7 @@ class Ls extends sn {
     return n < 0 ? t.level = 0 : n > At ? t.level = At : t.level = n, t.entityId = t.entityId ?? null, t;
   }
 }
-class Fs {
+class Us {
   /**
    * 创建实体状态实例
    *
@@ -3955,9 +3959,9 @@ class Fs {
     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 (Array.from(n.values()).find(o)) return;
-      const l = I(t.constructor).relations.find((h) => h.name === e.mappedProperty);
+      const c = I(t.constructor).relations.find((h) => h.name === e.mappedProperty);
       let u, d;
-      l && (u = O(t).getRelationCache(l), d = Array.from(u.values()).find(o)), (!d || O(d).removed) && (d = new s({
+      c && (u = O(t).getRelationCache(c), d = Array.from(u.values()).find(o)), (!d || O(d).removed) && (d = new s({
         [i]: t.id,
         [a]: this.target.id
       })), n.add(t), n.add(d), u && (u.add(this.proxyTarget), u.add(d));
@@ -3985,12 +3989,12 @@ class Fs {
     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 = Array.from(n.values()).find(
-        (c) => c instanceof s && c[i] === t.id && c[a] === this.target.id
+        (l) => l instanceof s && l[i] === t.id && l[a] === this.target.id
       );
       if (o) {
         n.delete(o);
-        const l = I(t.constructor).relations.find((u) => u.name === e.mappedProperty);
-        l && O(t).getRelationCache(l).delete(this.proxyTarget), this.#n.add(o);
+        const c = I(t.constructor).relations.find((u) => u.name === e.mappedProperty);
+        c && O(t).getRelationCache(c).delete(this.proxyTarget), this.#n.add(o);
       }
       n.delete(t);
     } else
@@ -4031,7 +4035,7 @@ class Fs {
     this._patch_cache = void 0, this._fingerprint = void 0;
   }
 }
-const Us = (r) => {
+const js = (r) => {
   const e = O(r), t = I(r.constructor), n = () => e.checkChange();
   let s;
   const i = {
@@ -4040,17 +4044,17 @@ const Us = (r) => {
      * 当属性值发生变化时，记录变更并安排检查
      * 同时根据 metadata 配置进行类型转换
      */
-    set: (a, o, c, l) => {
-      if (Dt(a[o], c)) return !0;
-      if (Mn(o) === !1 && (e.modified = !0, clearTimeout(s), s = setTimeout(() => n(), 0), c === null && t.isForeignKey(o))) {
+    set: (a, o, l, c) => {
+      if (Dt(a[o], l)) return !0;
+      if (Mn(o) === !1 && (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);
       }
-      return Reflect.set(a, o, c, l);
+      return Reflect.set(a, o, l, c);
     }
   };
   return new Proxy(r, i);
-}, js = (r, e, t) => {
+}, Ys = (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 + "$";
@@ -4064,7 +4068,7 @@ const Us = (r) => {
     case T.MANY_TO_ONE:
     case T.ONE_TO_ONE:
       a = function() {
-        const o = this, c = O(o), l = new J(o[s]), u = l.asObservable().pipe(
+        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)),
           P(1)
         );
@@ -4073,9 +4077,9 @@ const Us = (r) => {
             u.remove();
             return;
           }
-          o[s] != d.id && (c.addRelationEntity(r, d), l.next(d.id), o[s] = d.id);
+          o[s] != d.id && (l.addRelationEntity(r, d), c.next(d.id), o[s] = d.id);
         }), M(u, "remove", () => {
-          o[s] != null && (l.next(null), c.removeRelationEntity(r, e), o[s] = null);
+          o[s] != null && (c.next(null), l.removeRelationEntity(r, e), o[s] = null);
         }), Object.freeze(u);
       };
       break;
@@ -4086,7 +4090,7 @@ const Us = (r) => {
      */
     case T.ONE_TO_MANY:
       a = function() {
-        const o = r.mappedProperty + "Id", c = r.mappedProperty + "$", l = this, u = O(l), d = ae(
+        const o = r.mappedProperty + "Id", l = r.mappedProperty + "$", c = this, u = O(c), d = ae(
           () => t.getRepository(n).findAll({
             where: {
               combinator: "and",
@@ -4094,7 +4098,7 @@ const Us = (r) => {
                 {
                   field: o,
                   operator: "=",
-                  value: l.id
+                  value: c.id
                 }
               ]
             }
@@ -4107,7 +4111,7 @@ const Us = (r) => {
                 {
                   field: o,
                   operator: "=",
-                  value: l.id
+                  value: c.id
                 }
               ]
             }
@@ -4115,11 +4119,11 @@ const Us = (r) => {
         );
         return M(d, "count$", h), M(d, "add", (...p) => {
           p.forEach((m) => {
-            u.addRelationEntity(r, m), m[c].set(l);
+            u.addRelationEntity(r, m), m[l].set(c);
           });
         }), M(d, "remove", (...p) => {
           p.forEach((m) => {
-            u.removeRelationEntity(r, m), m[c].remove();
+            u.removeRelationEntity(r, m), m[l].remove();
           });
         }), Object.freeze(d);
       };
@@ -4132,7 +4136,7 @@ const Us = (r) => {
      */
     case T.MANY_TO_MANY:
       a = function() {
-        const o = this, c = O(o), l = r.name + "Id";
+        const o = this, l = O(o), c = r.name + "Id";
         if (!r.junctionEntityType) throw new R("junction entity not found");
         const u = ae(
           () => t.getRepository(r.junctionEntityType).findAll({
@@ -4148,7 +4152,7 @@ const Us = (r) => {
             }
           }).pipe(
             x((h) => {
-              const p = h.map((m) => m[l]);
+              const p = h.map((m) => m[c]);
               return t.getRepository(n).findAll({
                 where: {
                   combinator: "and",
@@ -4180,12 +4184,12 @@ const Us = (r) => {
         return M(u, "count$", d), M(
           u,
           "add",
-          (...h) => h.forEach((p) => c.addRelationEntity(r, p))
+          (...h) => h.forEach((p) => l.addRelationEntity(r, p))
         ), M(
           u,
           "remove",
           (...h) => h.forEach((p) => {
-            c.removeRelationEntity(r, p);
+            l.removeRelationEntity(r, p);
           })
         ), Object.freeze(u);
       };
@@ -4199,7 +4203,7 @@ const Us = (r) => {
     configurable: !1
   });
 };
-class Ys {
+class zs {
   /**
    * 创建实体管理器实例
    *
@@ -4219,7 +4223,7 @@ class Ys {
         remove: Je
       }
     }).repository("TreeRepository", {
-      class: Ls,
+      class: Fs,
       mergeOperations: {
         create: Qe,
         update: Xe,
@@ -4251,7 +4255,7 @@ class Ys {
         )
       ), Object.keys(St).forEach(
         (s) => M(e.prototype, s, St[s](this, e))
-      ), t.relationMap.forEach((s) => js(s, e, this));
+      ), t.relationMap.forEach((s) => Ys(s, e, this));
     }), M(this, kt, (e) => {
       const t = this.#s(e, { local: !1, remote: !1, modified: !0 });
       return On(() => {
@@ -4499,9 +4503,9 @@ class Ys {
    * @returns 初始化后的代理实体实例
    */
   #s(e, t) {
-    const n = new Fs(this.rxdb, { target: e, ...t });
+    const n = new Us(this.rxdb, { target: e, ...t });
     cr(e, Kt, n);
-    const s = Us(e);
+    const s = js(e);
     return M(n, "proxyTarget", s), s;
   }
 }
@@ -4516,7 +4520,7 @@ const St = {
     return r.reset(this);
   }
 }, Mt = "entity_event", Ot = "hello", xt = "first_connected_at";
-class zs {
+class Ws {
   #e;
   #n;
   #t;
@@ -4641,7 +4645,7 @@ class zs {
     });
   }
 }
-const Ws = (r) => {
+const ks = (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("_"),
@@ -4661,6 +4665,7 @@ const Ws = (r) => {
         kind: T.MANY_TO_ONE,
         mappedNamespace: n.namespace,
         mappedEntity: n.name,
+        mappedProperty: s.name,
         onDelete: k.CASCADE
       },
       {
@@ -4672,16 +4677,17 @@ const Ws = (r) => {
         kind: T.MANY_TO_ONE,
         mappedNamespace: e.namespace,
         mappedEntity: e.name,
+        mappedProperty: t.name,
         onDelete: k.CASCADE
       }
     ]
   };
 };
-var ks = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Hs = (r, e, t) => e in r ? ks(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 Ks = Object.defineProperty, Hs = Object.getOwnPropertyDescriptor, qs = (r, e, t) => e in r ? Ks(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, Vs = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? Hs(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;
+}, Gs = (r, e, t) => qs(r, typeof e != "symbol" ? e + "" : e, t), on;
 on = ct;
 let K = class {
   /**
@@ -4735,9 +4741,9 @@ let K = class {
    */
   children$;
 };
-Vs(K, on);
-K = qs([
-  yr({
+Gs(K, on);
+K = Vs([
+  mr({
     name: "RxDBBranch",
     tableName: "rxdb_branch",
     log: !1,
@@ -4806,16 +4812,17 @@ K = qs([
         name: "parent",
         kind: T.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--)
+var Qs = Object.defineProperty, Js = Object.getOwnPropertyDescriptor, Xs = (r, e, t) => e in r ? Qs(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, Zs = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? Js(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;
+}, ei = (r, e, t) => Xs(r, typeof e != "symbol" ? e + "" : e, t), cn;
 cn = ct;
 let H = class {
   /**
@@ -5352,8 +5359,8 @@ let H = class {
    */
   branch$;
 };
-Zs(H, cn);
-H = Xs([
+ei(H, cn);
+H = Zs([
   ie({
     name: "RxDBChange",
     tableName: "rxdb_change",
@@ -5441,16 +5448,17 @@ H = Xs([
         name: "branch",
         kind: T.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--)
+var ti = Object.defineProperty, ni = Object.getOwnPropertyDescriptor, ri = (r, e, t) => e in r ? ti(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, si = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? ni(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;
+}, ii = (r, e, t) => ri(r, typeof e != "symbol" ? e + "" : e, t), ln;
 ln = ct;
 let se = class {
   /**
@@ -5467,8 +5475,8 @@ let se = class {
    */
   name;
 };
-si(se, ln);
-se = ri([
+ii(se, ln);
+se = si([
   ie({
     name: "RxDBMigration",
     tableName: "rxdb_migration",
@@ -5493,8 +5501,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 ai = Object.getOwnPropertyDescriptor, oi = (r, e, t, n) => {
+  for (var s = n > 1 ? void 0 : n ? ai(e, t) : e, i = r.length - 1, a; i >= 0; i--)
     (a = r[i]) && (s = a(s) || s);
   return s;
 };
@@ -5523,6 +5531,7 @@ let z = class {
    * 同步类型
    * - full: 本地 ↔ 远程完全同步
    * - filter: 本地 ↔ 远程条件同步（只同步满足条件的数据）
+   * - querycache: 查询缓存同步（根据查询结果集进行本地缓存与远程数据的一致性维护）
    * - remote: 只读远程数据（只 pull，不 push）
    * - local: 只在本地（只 push，不 pull）
    * - none: 不同步（系统表或临时数据）
@@ -5561,7 +5570,7 @@ let z = class {
    */
   branch;
 };
-z = ai([
+z = oi([
   ie({
     name: "RxDBSync",
     tableName: "rxdb_sync",
@@ -5645,18 +5654,19 @@ z = ai([
         name: "branch",
         kind: T.MANY_TO_ONE,
         mappedEntity: "RxDBBranch",
+        mappedProperty: "syncs",
         onDelete: k.CASCADE
       }
     ]
   })
 ], 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 ci = Object.getOwnPropertyDescriptor, li = (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;
 };
 const G = (r, e) => e + ":" + r;
-class li {
+class ui {
   constructor(e) {
     this.rxdb = e;
   }
@@ -5671,8 +5681,8 @@ class li {
       this.#e.set(a, n), this.#n.set(a, t);
       const o = this.rxdb.getRepositoryConfig(n.repository);
       if (o?.entityGenerator) {
-        const c = o.entityGenerator(n);
-        Pn(c).forEach((u) => {
+        const l = o.entityGenerator(n);
+        Pn(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));
         });
@@ -5683,18 +5693,18 @@ class li {
           const s = n, i = this.findMappedRelation(t, s);
           if (!i)
             throw new R("mapped relation not found");
-          const a = Ws([
+          const a = ks([
             { metadata: t, relation: s },
             i
           ]), o = G(a.name, a.namespace);
           if (this.#e.has(o) === !1) {
-            let c = class extends Ie {
+            let l = class extends Ie {
             };
-            c = ci([
+            l = li([
               ie(a)
-            ], c);
-            const l = I(c);
-            this.#e.set(o, l), this.#n.set(o, c), e.push(c);
+            ], l);
+            const c = I(l);
+            this.#e.set(o, c), this.#n.set(o, l), e.push(l);
           }
           n.junctionEntityType = this.#n.get(o);
         }
@@ -5702,8 +5712,8 @@ class li {
     ), this.#e.forEach((t, n) => {
       const { name: s, namespace: i, tableName: a } = t, o = G(a, i);
       this.#t.set(o, this.#n.get(n)), this.#r.set(o, t);
-      let c = this.rxdb;
-      i !== "public" && (M(c, i, {}), c = c[i]), M(c, s, this.#n.get(n));
+      let l = this.rxdb;
+      i !== "public" && (M(l, i, {}), l = l[i]), M(l, s, this.#n.get(n));
     }), Object.freeze(this);
   }
   /**
@@ -5743,8 +5753,8 @@ class li {
   getFieldRelations(e, t) {
     if (t.includes(".") === !1) throw new R(`field '${t}' 必须是关属性查询`);
     const n = [], s = t.split("."), i = s.length - 1;
-    let a = e, o, c = !1, l = "";
-    return s.length === 2 && s[1] == "id" && (c = a.foreignKeyRelationMap.has(`${s[0]}Id`), l = s[0] + "Id"), s.forEach((u, d) => {
+    let a = e, o, l = !1, c = "";
+    return s.length === 2 && s[1] == "id" && (l = a.foreignKeyRelationMap.has(`${s[0]}Id`), c = s[0] + "Id"), s.forEach((u, d) => {
       if (d === i) {
         if (a.propertyMap.has(u) === !1) throw new R(`property '${u}' not found`);
         o = a.propertyMap.get(u);
@@ -5755,8 +5765,8 @@ class li {
       }
     }), {
       property: o,
-      propertyName: l || o.name,
-      isForeignKey: c,
+      propertyName: c || o.name,
+      isForeignKey: l,
       relations: n
     };
   }
@@ -5791,7 +5801,7 @@ class li {
     return this.#r.get(G(e, t)) ?? this.#e.get(G(e, t));
   }
 }
-const ui = "0.0.10", Ze = (r) => `${r.namespace}:${r.entity}:${r.entityId}`, fa = (r) => r.split(":");
+const di = "0.0.10", Ze = (r) => `${r.namespace}:${r.entity}:${r.entityId}`, ya = (r) => r.split(":");
 function un(r, e = {
   deletes: /* @__PURE__ */ new Map(),
   updates: /* @__PURE__ */ new Map(),
@@ -5854,23 +5864,23 @@ function ft(r) {
       const s = `${n.namespace}:${n.entity}`, i = e.get(s);
       i && i.requiredBy.push(t.repository);
     }
-  return di(e), e;
+  return hi(e), e;
 }
-function di(r) {
+function hi(r) {
   const e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set(), n = [];
   function s(i) {
     e.add(i), t.add(i), n.push(i);
     const a = r.get(i);
     if (!a) return !1;
     for (const o of a.dependsOn) {
-      const c = `${o.namespace}:${o.entity}`;
-      if (c !== i) {
-        if (e.has(c)) {
-          if (t.has(c)) {
-            const l = n.indexOf(c), u = [...n.slice(l), c];
+      const l = `${o.namespace}:${o.entity}`;
+      if (l !== i) {
+        if (e.has(l)) {
+          if (t.has(l)) {
+            const c = n.indexOf(l), u = [...n.slice(c), l];
             throw new R(`Circular dependency detected: ${u.join(" -> ")}`);
           }
-        } else if (s(c)) return !0;
+        } else if (s(l)) return !0;
       }
     }
     return t.delete(i), n.pop(), !1;
@@ -5878,11 +5888,11 @@ function di(r) {
   for (const i of r.keys())
     e.has(i) || s(i);
 }
-function hi(r, e) {
+function pi(r, e) {
   return r.sync || e;
 }
 function j(r, e) {
-  const t = hi(r, e);
+  const t = pi(r, e);
   if (!t)
     return "none";
   if (t.type === fe.Filter)
@@ -5901,17 +5911,17 @@ function dn(r, e) {
   const t = j(r, e);
   return t === "full" || t === "filter" || t === "remote";
 }
-function pi(r, e) {
+function fi(r, e) {
   const t = j(r, e);
   return t === "full" || t === "filter" || t === "local";
 }
-function fi(r, e) {
+function yi(r, e) {
   return j(r, e) === "none";
 }
-function ya(r, e) {
-  return r.filter((t) => !fi(t, e));
-}
 function ma(r, e) {
+  return r.filter((t) => !yi(t, e));
+}
+function ga(r, e) {
   const t = {
     full: [],
     filter: [],
@@ -5936,9 +5946,9 @@ function yt(r, e) {
     const o = r.get(a);
     if (!o)
       throw new R(`Repository ${a} not found in dependency graph`);
-    const c = e === "pull" ? o.dependsOn : o.requiredBy;
-    for (const l of c) {
-      const u = `${l.namespace}:${l.entity}`;
+    const l = e === "pull" ? o.dependsOn : o.requiredBy;
+    for (const c of l) {
+      const u = `${c.namespace}:${c.entity}`;
       u !== a && i(u);
     }
     s.delete(a), n.add(a), t.push(o.repository);
@@ -5947,10 +5957,10 @@ function yt(r, e) {
     i(a);
   return t;
 }
-function yi(r) {
+function mi(r) {
   return yt(r, "pull");
 }
-function mi(r) {
+function gi(r) {
   return yt(r, "push");
 }
 function hn(r) {
@@ -5958,17 +5968,17 @@ function hn(r) {
   const e = r;
   return (e.combinator === "and" || e.combinator === "or") && Array.isArray(e.rules);
 }
-const gi = {
+const _i = {
   limit: 1e3,
   fetchAll: !1,
   includeRelated: !0,
   filter: void 0
 };
 async function pn(r, e, t, n) {
-  const s = { ...gi, ...n }, i = r.rxdb;
+  const s = { ..._i, ...n }, i = r.rxdb;
   i.dispatchEvent(new it("pull", e, t, s.includeRelated));
   try {
-    const a = await _i(r, e, t, s);
+    const a = await bi(r, e, t, s);
     return i.dispatchEvent(
       new at("pull", e, t, {
         pulled: a.pulled,
@@ -5979,9 +5989,9 @@ async function pn(r, e, t, n) {
     throw i.dispatchEvent(new ot("pull", e, t, a)), a;
   }
 }
-async function _i(r, e, t, n) {
-  const s = r.rxdb.config.entities.find((l) => {
-    const u = I(l);
+async function bi(r, e, t, n) {
+  const s = r.rxdb.config.entities.find((c) => {
+    const u = I(c);
     return u.namespace === e && u.name === t;
   });
   if (!s)
@@ -5993,10 +6003,10 @@ async function _i(r, e, t, n) {
     throw new R(`Cannot pull repository ${e}:${t}: syncType is 'local' (no remote).`);
   let o = n.filter;
   if (a === "filter" && !o) {
-    const l = i.sync;
-    if (l?.remote?.filter) {
+    const c = i.sync;
+    if (c?.remote?.filter) {
       try {
-        o = l.remote.filter();
+        o = c.remote.filter();
       } catch (u) {
         throw new R(
           `Filter function failed for ${e}:${t}: ${u instanceof Error ? u.message : String(u)}`
@@ -6008,19 +6018,19 @@ async function _i(r, e, t, n) {
         );
     }
   }
-  const c = { ...n, filter: o };
-  return n.includeRelated ? await bi(r, e, t, c) : await fn(r, e, t, c);
+  const l = { ...n, filter: o };
+  return n.includeRelated ? await wi(r, e, t, l) : await fn(r, e, t, l);
 }
-async function bi(r, e, t, n) {
+async function wi(r, e, t, n) {
   const s = r.rxdb.config.entities.map((y) => I(y)), i = ft(s), a = new Map(
     r.rxdb.config.entities.map((y) => {
       const g = I(y);
       return [`${g.namespace}:${g.name}`, y];
     })
-  ), o = yi(i), c = `${e}:${t}`;
-  if (!i.get(c))
+  ), o = mi(i), l = `${e}:${t}`;
+  if (!i.get(l))
     throw new R(`Repository ${e}:${t} not found in dependency graph`);
-  const u = /* @__PURE__ */ new Set([c]), d = (y) => {
+  const u = /* @__PURE__ */ new Set([l]), d = (y) => {
     const g = i.get(y);
     if (g)
       for (const _ of g.dependsOn) {
@@ -6028,7 +6038,7 @@ async function bi(r, e, t, n) {
         u.has(v) || (u.add(v), d(v));
       }
   };
-  d(c);
+  d(l);
   const h = o.filter((y) => {
     const g = `${y.namespace}:${y.entity}`;
     return u.has(g);
@@ -6095,11 +6105,11 @@ async function bi(r, e, t, n) {
 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(), c = await r.getCurrentBranch(), l = `${e}:${t}:${c.id}`, u = o.getRepository(z);
+  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({
     where: {
       combinator: "and",
-      rules: [{ field: "id", operator: "=", value: l }]
+      rules: [{ field: "id", operator: "=", value: c }]
     },
     limit: 1
   }))[0];
@@ -6108,12 +6118,12 @@ async function fn(r, e, t, n) {
       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 = c.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);
+    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);
   }
   const p = await u.find({
     where: {
       combinator: "and",
-      rules: [{ field: "id", operator: "=", value: l }]
+      rules: [{ field: "id", operator: "=", value: c }]
     },
     limit: 1
   });
@@ -6151,15 +6161,15 @@ async function fn(r, e, t, n) {
     hasMore: _
   };
 }
-const wi = {
+const vi = {
   batchSize: 1e3,
   includeRelated: !0
 };
 async function yn(r, e, t, n) {
-  const s = { ...wi, ...n }, i = r.rxdb;
+  const s = { ...vi, ...n }, i = r.rxdb;
   i.dispatchEvent(new it("push", e, t, s.includeRelated));
   try {
-    const a = await vi(r, e, t, s);
+    const a = await Ei(r, e, t, s);
     return i.dispatchEvent(
       new at("push", e, t, {
         pushed: a.pushed,
@@ -6171,10 +6181,10 @@ async function yn(r, e, t, n) {
     throw i.dispatchEvent(new ot("push", e, t, a)), a;
   }
 }
-async function vi(r, e, t, n) {
+async function Ei(r, e, t, n) {
   const s = r.rxdb.config.entities.find((o) => {
-    const c = I(o);
-    return c.namespace === e && c.name === t;
+    const l = I(o);
+    return l.namespace === e && l.name === t;
   });
   if (!s)
     throw new R(`Entity not found: ${e}:${t}`);
@@ -6183,24 +6193,24 @@ 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 Ri(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 Ri(r, e, t, n) {
+  const s = r.rxdb.config.entities.map((f) => I(f)), i = ft(s), a = gi(i), o = `${e}:${t}`;
   if (!i.get(o))
     throw new R(`Repository ${e}:${t} not found in dependency graph`);
-  const l = /* @__PURE__ */ new Set([o]), u = (f) => {
+  const c = /* @__PURE__ */ new Set([o]), u = (f) => {
     const y = i.get(f);
     if (y)
       for (const g of y.requiredBy) {
         const _ = `${g.namespace}:${g.entity}`;
-        l.has(_) || (l.add(_), u(_));
+        c.has(_) || (c.add(_), u(_));
       }
   };
   u(o);
   const d = a.filter((f) => {
     const y = `${f.namespace}:${f.entity}`;
-    return l.has(y);
+    return c.has(y);
   }), h = [], p = /* @__PURE__ */ new Set();
   for (const f of d) {
     const y = `${f.namespace}:${f.entity}`;
@@ -6249,11 +6259,11 @@ async function mn(r, e, t, n) {
   if (!r.rxdb.config.sync?.remote?.adapter)
     throw new R("Remote adapter not configured.");
   await r.getRemoteRepositories();
-  const { adapter: a } = await r.getLocalRepositories(), o = await r.getCurrentBranch(), c = `${e}:${t}:${o.id}`, l = a.getRepository(z);
-  let d = (await l.find({
+  const { adapter: a } = await r.getLocalRepositories(), o = await r.getCurrentBranch(), l = `${e}:${t}:${o.id}`, c = a.getRepository(z);
+  let d = (await c.find({
     where: {
       combinator: "and",
-      rules: [{ field: "id", operator: "=", value: c }]
+      rules: [{ field: "id", operator: "=", value: l }]
     },
     limit: 1
   }))[0];
@@ -6262,9 +6272,9 @@ async function mn(r, e, t, n) {
       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 = 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 l.create(A);
+    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);
   }
-  const h = d.lastPushedChangeId, p = a.getRepository(H), m = await Ri(p, o.id, h, [t]), f = m.length;
+  const h = d.lastPushedChangeId, p = a.getRepository(H), m = await Ci(p, o.id, h, [t]), f = m.length;
   if (f === 0)
     return {
       repository: { namespace: e, entity: t },
@@ -6311,7 +6321,7 @@ async function mn(r, e, t, n) {
   }
   if (b > 0) {
     const E = Math.max(...m.map((B) => B.id));
-    await l.update(d, {
+    await c.update(d, {
       lastPushedChangeId: E,
       lastPushedAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date()
@@ -6325,7 +6335,7 @@ async function mn(r, e, t, n) {
     originalCount: f
   };
 }
-async function Ri(r, e, t, n) {
+async function Ci(r, e, t, n) {
   const s = [
     { field: "branchId", operator: "=", value: e },
     { field: "revertChangeId", operator: "=", value: null },
@@ -6343,7 +6353,7 @@ 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));
   try {
-    const a = await Ci(r, e, t, n), o = {
+    const a = await Ii(r, e, t, n), o = {
       pulled: a.pullResult?.pulled ?? 0,
       pushed: a.pushResult?.pushed ?? 0,
       compacted: (a.pullResult?.compacted ?? 0) + (a.pushResult?.compacted ?? 0),
@@ -6354,7 +6364,7 @@ async function gn(r, e, t, n) {
     throw s.dispatchEvent(new ot("sync", e, t, a)), a;
   }
 }
-async function Ci(r, e, t, n) {
+async function Ii(r, e, t, n) {
   const s = r.rxdb.config.entities.find((d) => {
     const h = I(d);
     return h.namespace === e && h.name === t;
@@ -6374,8 +6384,8 @@ async function Ci(r, e, t, n) {
     applied: 0,
     hasMore: !1
   };
-  let l;
-  return (n?.direction === "push" || n?.direction === "sync" || !n?.direction) && (a === "local" || a === "full" || a === "filter") ? l = await yn(r, e, t, n?.push) : l = {
+  let c;
+  return (n?.direction === "push" || n?.direction === "sync" || !n?.direction) && (a === "local" || a === "full" || a === "filter") ? c = await yn(r, e, t, n?.push) : c = {
     repository: { namespace: e, entity: t },
     pushed: 0,
     failed: 0,
@@ -6383,10 +6393,10 @@ async function Ci(r, e, t, n) {
     originalCount: 0
   }, {
     pullResult: o,
-    pushResult: l
+    pushResult: c
   };
 }
-function Ii(r, e) {
+function Ti(r, e) {
   if (e.repositories && e.repositories.length > 0)
     return e.repositories;
   const t = [];
@@ -6415,7 +6425,7 @@ async function _n(r, e, t) {
     };
   }
 }
-async function Ti(r, e, t) {
+async function Ai(r, e, t) {
   const n = [];
   for (const s of e) {
     const i = await _n(r, s, t);
@@ -6423,26 +6433,26 @@ async function Ti(r, e, t) {
   }
   return n;
 }
-async function Ai(r, e, t, n) {
+async function Si(r, e, t, n) {
   const s = [];
   for (let i = 0; i < e.length; i += n) {
-    const o = e.slice(i, i + n).map((l) => _n(r, l, t)), c = await Promise.all(o);
-    s.push(...c);
+    const o = e.slice(i, i + n).map((c) => _n(r, c, t)), l = await Promise.all(o);
+    s.push(...l);
   }
   return s;
 }
-async function Si(r, e = {}) {
-  const t = Date.now(), n = Ii(r, e), s = {
+async function Mi(r, e = {}) {
+  const t = Date.now(), n = Ti(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);
-  const c = o.filter((d) => d.success).length, l = o.filter((d) => !d.success).length, u = Date.now() - t;
+  i ? o = await Si(r, n, s, a) : o = await Ai(r, n, s);
+  const l = o.filter((d) => d.success).length, c = o.filter((d) => !d.success).length, u = Date.now() - t;
   return {
-    succeeded: c,
-    failed: l,
+    succeeded: l,
+    failed: c,
     results: o,
     durationMs: u
   };
@@ -6463,7 +6473,7 @@ async function bn(r, e, t) {
       pendingCount: 0,
       hasUpdates: !1
     };
-  const o = (await r.versionManager.getCurrentBranch()).id, { adapter: c } = await r.versionManager.getLocalRepositories(), l = c.getRepository(z), u = `${e}:${t}:${o}`, p = (await l.find({
+  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({
     where: {
       combinator: "and",
       rules: [{ field: "id", operator: "=", value: u }]
@@ -6481,31 +6491,31 @@ async function bn(r, e, t) {
     hasUpdates: g > 0
   };
 }
-async function Mi(r, e, t, n) {
+async function Oi(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;
   });
   if (!a)
     throw new R(`Entity not found: ${e}:${t}`);
-  const o = I(a), c = j(o, s.config.sync);
-  let l = n?.filter;
-  if (!l && c === "filter") {
+  const o = I(a), l = j(o, s.config.sync);
+  let c = n?.filter;
+  if (!c && l === "filter") {
     const f = o.sync;
     if (f?.remote?.filter)
       try {
-        l = f.remote.filter();
+        c = f.remote.filter();
       } catch (y) {
         throw new R(
           `Filter function failed for ${e}:${t}: ${y instanceof Error ? y.message : String(y)}`
         );
       }
   }
-  if (!l)
+  if (!c)
     throw new R(
       `No filter provided and entity ${e}:${t} does not have a Filter sync configuration.`
     );
-  const u = wn(l), h = await i.getRepository(a).find({
+  const u = wn(c), h = await i.getRepository(a).find({
     where: u
   }), p = h.map((f) => f.id), m = p.length;
   if (n?.dryRun)
@@ -6528,10 +6538,10 @@ async function Mi(r, e, t, n) {
 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) : xi(e))
   };
 }
-function Oi(r) {
+function xi(r) {
   const t = {
     "=": "!=",
     "!=": "=",
@@ -6559,7 +6569,7 @@ function Oi(r) {
     operator: t
   };
 }
-const xi = async (r, e, t) => {
+const Ni = async (r, e, t) => {
   const { branchRepository: n, changeRepository: s } = await r.getLocalRepositories();
   if ((await n.find({
     where: {
@@ -6570,27 +6580,27 @@ const xi = async (r, e, t) => {
   })).length) throw new R(`Branch id (${e}) already exists`);
   let a, o;
   if (t) {
-    const l = (await s.find({
+    const c = (await s.find({
       where: {
         combinator: "and",
         rules: [{ field: "id", operator: "=", value: t }]
       },
       limit: 1
     }))[0];
-    if (!l) throw new R(`Change ID (${t}) not found`);
-    o = l, a = (await n.find({
+    if (!c) throw new R(`Change ID (${t}) not found`);
+    o = c, a = (await n.find({
       where: {
         combinator: "and",
-        rules: [{ field: "id", operator: "=", value: l.branchId }]
+        rules: [{ field: "id", operator: "=", value: c.branchId }]
       },
       limit: 1
     }))[0];
   } else
-    a = await r.getCurrentBranch(), a && (o = await Ni(r, a.id));
+    a = await r.getCurrentBranch(), a && (o = await Pi(r, a.id));
   if (!a) throw new R("Source branch not found");
-  const c = new K();
-  return c.id = e, c.activated = !1, c.local = !0, c.remote = !1, c.fromChangeId = o?.id ?? null, c.parentId = a.id, await c.save(), c;
-}, Ni = async (r, e) => {
+  const l = new K();
+  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;
+}, Pi = async (r, e) => {
   const { changeRepository: t } = await r.getLocalRepositories();
   return (await t.find({
     where: {
@@ -6608,7 +6618,7 @@ const xi = async (r, e, t) => {
     limit: 1
   }))[0];
 };
-async function Pi(r, e, t, n, s) {
+async function $i(r, e, t, n, s) {
   const { adapter: i } = await r.versionManager.getLocalRepositories(), a = i.getRepository(H), o = [
     { field: "namespace", operator: "=", value: e },
     { field: "entity", operator: "=", value: t },
@@ -6623,7 +6633,7 @@ async function Pi(r, e, t, n, s) {
     }
   })).length;
 }
-async function $i(r, e, t) {
+async function Bi(r, e, t) {
   return (await bn(r, e, t)).pendingCount;
 }
 async function vn(r, e, t) {
@@ -6633,18 +6643,18 @@ async function vn(r, e, t) {
   });
   if (!n)
     throw new Error(`Entity not found: ${e}.${t}`);
-  const s = I(n), i = j(s, r.config.sync), o = (await r.versionManager.getCurrentBranch()).id, { adapter: c } = await r.versionManager.getLocalRepositories(), l = c.getRepository(z), d = {
+  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 l.find({ where: d, limit: 1 }), p = h.length > 0 ? h[0] : null;
+  }, h = await c.find({ where: d, limit: 1 }), p = h.length > 0 ? h[0] : null;
   let m = 0, f = 0;
-  return pi(s) && (m = await Pi(
+  return fi(s) && (m = await $i(
     r,
     e,
     t,
     o,
     p?.lastPushedChangeId ?? null
-  )), dn(s) && (f = await $i(r, e, t)), {
+  )), dn(s) && (f = await Bi(r, e, t)), {
     repository: { namespace: e, entity: t },
     branchId: o,
     syncType: i,
@@ -6657,16 +6667,16 @@ async function vn(r, e, t) {
     pullableCount: f
   };
 }
-async function Bi(r, e) {
+async function Di(r, e) {
   const t = r.config.entities, n = [];
   for (const i of t) {
-    const a = I(i), o = a.namespace, c = a.name, l = await vn(r, o, c);
-    n.push(l);
+    const a = I(i), o = a.namespace, l = a.name, c = await vn(r, o, l);
+    n.push(c);
   }
   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 Li = (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 [];
@@ -6690,40 +6700,40 @@ const Di = (r) => {
       m.push(y), f = y;
     }
     return m;
-  }, c = o(t), l = o(n);
+  }, l = o(t), c = o(n);
   let u = null, d = -1;
-  for (let p = 0; p < c.length; p++)
-    if (l.findIndex((f) => f.id === c[p].id) !== -1) {
-      u = c[p], d = p;
+  for (let p = 0; p < l.length; p++)
+    if (c.findIndex((f) => f.id === l[p].id) !== -1) {
+      u = l[p], d = p;
       break;
     }
   const h = [];
   if (u) {
     for (let f = 0; f < d; f++) {
-      const y = c[f], g = f === 0 ? s : c[f - 1].fromChangeId ?? 0, _ = y.fromChangeId ?? 0;
+      const y = l[f], g = f === 0 ? s : l[f - 1].fromChangeId ?? 0, _ = y.fromChangeId ?? 0;
       g !== _ && h.push({
         branch: y,
         fromChangeId: g,
         toChangeId: _
       });
     }
-    const p = l.findIndex((f) => f.id === u.id);
+    const p = c.findIndex((f) => f.id === u.id);
     if (p === 0) {
-      const f = d === 0 ? s : c[d - 1].fromChangeId ?? 0, y = i;
+      const f = d === 0 ? s : l[d - 1].fromChangeId ?? 0, y = i;
       f !== y && h.push({
         branch: u,
         fromChangeId: f,
         toChangeId: y
       });
     } else if (p > 0) {
-      const f = d === 0 ? s : c[d - 1].fromChangeId ?? 0, y = l[p - 1].fromChangeId ?? 0;
+      const f = d === 0 ? s : l[d - 1].fromChangeId ?? 0, y = c[p - 1].fromChangeId ?? 0;
       f !== y && h.push({
         branch: u,
         fromChangeId: f,
         toChangeId: y
       });
     }
-    const m = l.slice(0, p).reverse();
+    const m = c.slice(0, p).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({
@@ -6733,27 +6743,27 @@ const Di = (r) => {
       });
     }
   } else {
-    for (let _ = 0; _ < c.length; _++) {
-      const v = c[_], b = _ === 0 ? s : c[_ - 1].fromChangeId ?? 0, w = v.fromChangeId ?? 0;
+    for (let _ = 0; _ < l.length; _++) {
+      const v = l[_], b = _ === 0 ? s : l[_ - 1].fromChangeId ?? 0, w = v.fromChangeId ?? 0;
       b !== w && h.push({
         branch: v,
         fromChangeId: b,
         toChangeId: w
       });
     }
-    const p = c[c.length - 1], m = p.fromChangeId ?? 0;
+    const p = l[l.length - 1], m = p.fromChangeId ?? 0;
     m !== 0 && h.push({
       branch: p,
       fromChangeId: m,
       toChangeId: 0
     });
-    const f = l[l.length - 1], y = l.length > 1 ? l[l.length - 2].fromChangeId ?? 0 : i ?? 0;
+    const f = c[c.length - 1], y = c.length > 1 ? c[c.length - 2].fromChangeId ?? 0 : i ?? 0;
     y !== 0 && h.push({
       branch: f,
       fromChangeId: 0,
       toChangeId: y
     });
-    const g = l.slice(0, l.length - 1).reverse();
+    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({
@@ -6764,7 +6774,7 @@ const Di = (r) => {
     }
   }
   return h;
-}, Li = async (r, e) => {
+}, Fi = async (r, e) => {
   const { branchRepository: t, changeRepository: n } = await r.getLocalRepositories(), s = await t.find({
     where: {
       combinator: "and",
@@ -6777,19 +6787,19 @@ 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), c = await Nt(n, a.id), l = Di({
+  const o = await Nt(n, i.id), l = await Nt(n, a.id), c = Li({
     branches: s,
     currentBranch: i,
     currentChangeId: o ? o.id : null,
     nextBranch: a,
-    nextChangeId: c ? c.id : null
+    nextChangeId: l ? l.id : null
   }), u = {
     deletes: /* @__PURE__ */ new Map(),
     updates: /* @__PURE__ */ new Map(),
     inserts: /* @__PURE__ */ new Map()
   };
-  for (let d = 0; d < l.length; d++) {
-    const { branch: h, fromChangeId: p, toChangeId: m } = l[d], f = p < m, y = p > m, g = Math.min(p, m), _ = Math.max(p, m), v = {
+  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 = {
       where: {
         combinator: "and",
         rules: [
@@ -6802,10 +6812,10 @@ const Di = (r) => {
     };
     h.fromChangeId && g < h.fromChangeId && v.where.rules.push({ field: "id", operator: ">", value: h.fromChangeId });
     const b = await n.find(v);
-    y ? Ui(b, u) : f && Fi(b, u);
+    y ? ji(b, u) : f && Ui(b, u);
   }
   return u;
-}, Fi = (r, e) => be(r, !0, e), Ui = (r, e) => be(r, !1, e), be = (r, e, t = {
+}, Ui = (r, e) => be(r, !0, e), ji = (r, e) => be(r, !1, e), be = (r, e, t = {
   deletes: /* @__PURE__ */ new Map(),
   updates: /* @__PURE__ */ new Map(),
   inserts: /* @__PURE__ */ new Map()
@@ -6913,10 +6923,10 @@ 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 Yi(r) {
   return r.type === "database" ? "database" : r.type === "repository" ? `${r.namespace}:${r.entity}` : `${r.namespace}:${r.entity}:${r.entityId}`;
 }
-class Yi {
+class zi {
   constructor(e) {
     this.rxdb = e;
     const t = e.entityManager.getRepository(K).findOne({
@@ -6973,13 +6983,13 @@ class Yi {
             })
           );
           if (!i) return [];
-          const o = (await L(this.rxdb.localAdapter$)).getRepository(z), c = await o.find({
+          const o = (await L(this.rxdb.localAdapter$)).getRepository(z), l = await o.find({
             where: {
               combinator: "and",
               rules: [{ field: "branchId", operator: "=", value: i.id }]
             }
-          }), l = /* @__PURE__ */ new Map();
-          for (const u of c) {
+          }), c = /* @__PURE__ */ new Map();
+          for (const u of l) {
             let d = null;
             try {
               const h = await o.find({
@@ -6993,10 +7003,10 @@ class Yi {
             } catch {
               d = null;
             }
-            d !== null && l.set(u.entity, d);
+            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 = l.get(d.entity), f = m == null || d.id > m;
+            const h = d.revertChangeId == null, p = d.remoteId == null, m = c.get(d.entity), f = m == null || d.id > m;
             return h && p && f;
           }));
         } catch (i) {
@@ -7232,8 +7242,8 @@ class Yi {
         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();
         t.forEach((o) => {
-          const c = `${o.namespace}:RxDBChange:${o.id}`;
-          s.updates.set(c, {
+          const l = `${o.namespace}:RxDBChange:${o.id}`;
+          s.updates.set(l, {
             patch: {
               redoInvalidatedAt: n
             },
@@ -7312,7 +7322,7 @@ class Yi {
           entity: m.name
         };
       }
-    const n = ji(t);
+    const n = Yi(t);
     if (this.history_cache) {
       const m = this.history_cache.get(n);
       if (m)
@@ -7336,12 +7346,12 @@ class Yi {
       return () => {
         y.unsubscribe();
       };
-    }), c = o(
+    }), l = o(
       this.undoHistories$.pipe(
         $((m) => pe(m, t)),
         P({ bufferSize: 1, refCount: !0 })
       )
-    ), l = o(
+    ), c = o(
       this.redoHistories$.pipe(
         $((m) => pe(m, t)),
         P({ bufferSize: 1, refCount: !0 })
@@ -7352,20 +7362,20 @@ class Yi {
         P({ bufferSize: 1, refCount: !0 })
       )
     ), d = o(
-      c.pipe(
+      l.pipe(
         $((m) => m.length),
         P({ bufferSize: 1, refCount: !0 })
       )
     ), h = o(
-      l.pipe(
+      c.pipe(
         $((m) => m.length),
         P({ bufferSize: 1, refCount: !0 })
       )
     ), p = {
       type: t.type,
       histories$: a,
-      undoHistories$: c,
-      redoHistories$: l,
+      undoHistories$: l,
+      redoHistories$: c,
       count$: u,
       undoCount$: d,
       redoCount$: h,
@@ -7404,12 +7414,12 @@ class Yi {
         rules: [{ field: "branchId", operator: "=", value: s.id }]
       }
     });
-    let c = 0;
+    let l = 0;
     if (o.length > 0) {
       const u = o.map((d) => d.lastPushedChangeId).filter((d) => d !== null);
-      u.length > 0 && (c = Math.min(...u));
+      u.length > 0 && (l = Math.min(...u));
     }
-    const l = await e.find({
+    const c = await e.find({
       where: {
         combinator: "and",
         rules: [
@@ -7421,13 +7431,13 @@ class Yi {
           {
             field: "id",
             operator: ">",
-            value: c
+            value: l
           }
         ]
       },
       orderBy: [{ field: "id", sort: "desc" }]
     });
-    return this.#a(l);
+    return this.#a(c);
   }
   /**
    * 将变更记录转换为历史项
@@ -7455,13 +7465,13 @@ 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, c = s ? "TRANSACTION" : t.type, l = [c, 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((h) => mt(h.revertChangeId) === !1), d = e.some((h) => mt(h.redoInvalidatedAt) === !1);
     return {
       transactionId: s,
       changeId: Math.max(...e.map((h) => h.id)),
-      fingerprint: l,
+      fingerprint: c,
       changes: e,
-      type: c,
+      type: l,
       count: n,
       createdAt: i,
       description: En(e),
@@ -7488,29 +7498,29 @@ class Yi {
   async #u(e, t) {
     this.isUndoRedoInProgress = !0;
     try {
-      const n = t.flatMap((o) => o.changes).sort((o, c) => e === "undo" ? c.id - o.id : o.id - c.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 = be(n, e === "redo");
       if (e === "undo") {
-        const { adapter: o } = await this.rxdb.versionManager.getLocalRepositories(), c = await o.getRxDBChangeSequence(), l = /* @__PURE__ */ new Date();
+        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, {
             patch: {
               ...p.patch,
-              revertChangeId: c + d + 1,
-              revertChangedAt: l
+              revertChangeId: l + d + 1,
+              revertChangedAt: c
             },
             inversePatch: p.inversePatch
           });
-        }), s.updateRxDBChangeSequence = c + n.length;
+        }), s.updateRxDBChangeSequence = l + n.length;
       } else
         n.forEach((o) => {
-          const c = `${o.namespace}:RxDBChange:${o.id}`, l = s.updates.get(c) || { patch: {}, inversePatch: null };
-          s.updates.set(c, {
+          const l = `${o.namespace}:RxDBChange:${o.id}`, c = s.updates.get(l) || { patch: {}, inversePatch: null };
+          s.updates.set(l, {
             patch: {
-              ...l.patch,
+              ...c.patch,
               revertChangeId: null
             },
-            inversePatch: l.inversePatch
+            inversePatch: c.inversePatch
           });
         });
       const { adapter: i } = await this.rxdb.versionManager.getLocalRepositories(), a = await this.rxdb.versionManager.getCurrentBranch();
@@ -7558,16 +7568,16 @@ class Yi {
         { field: "branchId", operator: "=", value: s.id },
         { field: "revertChangeId", operator: "=", value: null },
         { field: "remoteId", operator: "=", value: null }
-      ], o = i.map((l) => {
+      ], o = i.map((c) => {
         const u = [
-          { field: "namespace", operator: "=", value: l.namespace },
-          { field: "entity", operator: "=", value: l.entity }
+          { field: "namespace", operator: "=", value: c.namespace },
+          { field: "entity", operator: "=", value: c.entity }
         ];
-        return l.lastPushedChangeId !== null && l.lastPushedChangeId !== void 0 && u.push({ field: "id", operator: ">", value: l.lastPushedChangeId }), {
+        return c.lastPushedChangeId !== null && c.lastPushedChangeId !== void 0 && u.push({ field: "id", operator: ">", value: c.lastPushedChangeId }), {
           combinator: "and",
           rules: u
         };
-      }), c = await L(
+      }), l = await L(
         H.count({
           where: {
             combinator: "and",
@@ -7581,7 +7591,7 @@ class Yi {
           }
         })
       );
-      this.#n.next(c);
+      this.#n.next(l);
     } catch (e) {
       console.error("[#updatePushableCount] error", e), this.#n.next(0);
     }
@@ -7597,17 +7607,17 @@ async function Pt(r, e) {
       operation: "pull",
       repositories: e?.repositoryFilter?.map((d) => typeof d == "string" ? { namespace: "public", entity: d } : d)
     }, i = await r.bulkSync(s);
-    let a = 0, o = 0, c = 0, l = !1;
+    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, c += h.applied ?? 0, h.hasMore && (l = !0);
+        a += h.pulled ?? 0, o += h.compacted ?? 0, l += h.applied ?? 0, h.hasMore && (c = !0);
       }
     const u = {
       pulled: a,
       compacted: o,
-      applied: c,
-      hasMore: l
+      applied: l,
+      hasMore: c
     };
     return t.dispatchEvent(new zt("pull", u)), u;
   } catch (s) {
@@ -7624,25 +7634,25 @@ async function $t(r, e) {
       operation: "push",
       repositories: e?.repositoryFilter?.map((d) => typeof d == "string" ? { namespace: "public", entity: d } : d)
     }, i = await r.bulkSync(s);
-    let a = 0, o = 0, c = 0, l = 0;
+    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, c += h.compacted ?? 0, l += h.originalCount ?? 0;
+        a += h.pushed ?? 0, o += h.failed ?? 0, l += h.compacted ?? 0, c += h.originalCount ?? 0;
       } else
         o++;
     const u = {
       pushed: a,
       failed: o,
-      compacted: c,
-      originalCount: l
+      compacted: l,
+      originalCount: c
     };
     return t.dispatchEvent(new zt("push", u)), u;
   } catch (s) {
     throw t.dispatchEvent(new Wt("push", s)), s;
   }
 }
-const zi = async (r, e) => {
+const Wi = async (r, e) => {
   const { branchRepository: t, changeRepository: n, adapter: s } = await r.getLocalRepositories();
   if (e === "main")
     throw new R("Cannot remove main branch");
@@ -7664,7 +7674,7 @@ const zi = async (r, e) => {
     }
   });
   if (a.length > 0) {
-    const o = a.map((l) => l.id);
+    const o = a.map((c) => c.id);
     if ((await t.find({
       where: {
         combinator: "and",
@@ -7679,9 +7689,9 @@ const zi = async (r, e) => {
   }
   await s.removeMany([...a, i]);
 };
-class Wi {
+class ki {
   constructor(e) {
-    this.rxdb = e, this.historyManager = new Yi(this.rxdb);
+    this.rxdb = e, this.historyManager = new zi(this.rxdb);
   }
   #e = [];
   /**
@@ -7728,14 +7738,14 @@ class Wi {
    * @param fromChangeId 从哪个 changeId 创建新分支
    */
   async createBranch(e, t) {
-    return xi(this, e, t);
+    return Ni(this, e, t);
   }
   /**
    * 删除分支
    * @param branchId 分支 id
    */
   async removeBranch(e) {
-    return zi(this, e);
+    return Wi(this, e);
   }
   // ============================================
   // Pull/Push 同步方法
@@ -7924,7 +7934,7 @@ class Wi {
    * ```
    */
   async cleanupExpired(e, t, n) {
-    return Mi(this, e, t, n);
+    return Oi(this, e, t, n);
   }
   /**
    * Check for remote updates without downloading data (T040, US2)
@@ -7999,7 +8009,7 @@ class Wi {
    * ```
    */
   async getAllRepositorySyncStatus(e) {
-    return Bi(this.rxdb, e);
+    return Di(this.rxdb, e);
   }
   /**
    * Bulk sync multiple repositories
@@ -8042,7 +8052,7 @@ class Wi {
    * ```
    */
   async bulkSync(e) {
-    return Si(this.rxdb, e);
+    return Mi(this.rxdb, e);
   }
   /**
    * Get dependency graph for all repositories
@@ -8107,7 +8117,7 @@ class Wi {
     if ((await this.getCurrentBranch())?.id !== e)
       try {
         this.rxdb.dispatchEvent(new tr(e));
-        const { adapter: n } = await this.getLocalRepositories(), s = await Li(this, e), i = await n.switchBranch({
+        const { adapter: n } = await this.getLocalRepositories(), s = await Fi(this, e), i = await n.switchBranch({
           branchId: e,
           actions: s
         });
@@ -8165,10 +8175,10 @@ class Wi {
       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), c = await this.getCurrentBranch();
-    await s.switchBranch({ branchId: c.id, actions: o });
-    const l = e.constructor;
-    return (await s.getRepository(l).find({
+    const o = be([a], !1), l = await this.getCurrentBranch();
+    await s.switchBranch({ branchId: l.id, actions: o });
+    const c = e.constructor;
+    return (await s.getRepository(c).find({
       where: {
         combinator: "and",
         rules: [{ field: "id", operator: "=", value: a.entityId }]
@@ -8209,7 +8219,7 @@ class Wi {
     );
   }
 }
-class ga {
+class _a {
   #e = new J("");
   #n = new J("");
   /**
@@ -8321,7 +8331,7 @@ class ga {
    * 获取 RxDB 版本号
    */
   get version() {
-    return ui;
+    return di;
   }
   get config() {
     return this.#t;
@@ -8331,7 +8341,7 @@ class ga {
    * @param options - RxDB 配置选项
    */
   constructor(e) {
-    this.#t = e, this.schemaManager = new li(this), this.entityManager = new Ys(this), this.versionManager = new Wi(this), this.context = { ...this.#t.context }, this.#t.dbName = this.#t.dbName + "@" + this.version.replace(/\./g, "_"), $n(this.#t), globalThis.rxdb = this;
+    this.#t = e, this.schemaManager = new ui(this), this.entityManager = new zs(this), this.versionManager = new ki(this), this.context = { ...this.#t.context }, this.#t.dbName = this.#t.dbName + "@" + this.version.replace(/\./g, "_"), $n(this.#t), globalThis.rxdb = this;
   }
   /**
    * 初始化 RxDB
@@ -8464,7 +8474,7 @@ class ga {
    * 设置统一的多 Tab 通信网关
    */
   #y() {
-    this.#c = new zs({
+    this.#c = new Ws({
       dbName: this.#t.dbName,
       clientId: this.#d.clientId
     }), this.#c.init(
@@ -8526,21 +8536,21 @@ class ga {
       (await L(n.findAll({ where: { combinator: "and", rules: [] } }), {
         defaultValue: []
       })).forEach((o) => s.add(o.name));
-      const a = [...t].sort((o, c) => o.name.localeCompare(c.name));
+      const a = [...t].sort((o, l) => o.name.localeCompare(l.name));
       for (const o of a) {
         if (s.has(o.name)) continue;
         try {
           await o.up();
-        } catch (l) {
-          throw console.error(`Migration failed: ${o.name}`, l), l;
+        } catch (c) {
+          throw console.error(`Migration failed: ${o.name}`, c), c;
         }
-        const c = new se();
-        c.name = o.name, c.executedAt = /* @__PURE__ */ new Date(), await c.save();
+        const l = new se();
+        l.name = o.name, l.executedAt = /* @__PURE__ */ new Date(), await l.save();
       }
     });
   }
 }
-class _a {
+class ba {
   /**
    * 解决单个冲突
    *
@@ -8569,9 +8579,9 @@ class _a {
 export {
   Qn as CONFLICT_DETECTED_EVENT,
   Jn as CONFLICT_PENDING_EVENT,
-  sa as ConflictDetectedEvent,
-  ia as ConflictPendingEvent,
-  _r as ENTITY_BASE_METADATA_OPTIONS,
+  ia as ConflictDetectedEvent,
+  aa as ConflictPendingEvent,
+  br as ENTITY_BASE_METADATA_OPTIONS,
   ne as ENTITY_LOCAL_CREATE_EVENT,
   Wn as ENTITY_LOCAL_NEW_EVENT,
   ce as ENTITY_LOCAL_REMOVE_EVENT,
@@ -8582,39 +8592,39 @@ export {
   ct as ENTITY_STATIC_TYPES,
   ie as Entity,
   Ie as EntityBase,
-  Gi as EntityLocalCreatedEvent,
+  Qi as EntityLocalCreatedEvent,
   er as EntityLocalNewEvent,
-  Ji as EntityLocalRemovedEvent,
-  Qi as EntityLocalUpdatedEvent,
-  Xi as EntityRemoteCreatedEvent,
-  ea as EntityRemoteRemovedEvent,
-  Zi as EntityRemoteUpdatedEvent,
-  _a as LWWConflictResolver,
+  Xi as EntityLocalRemovedEvent,
+  Ji as EntityLocalUpdatedEvent,
+  Zi as EntityRemoteCreatedEvent,
+  ta as EntityRemoteRemovedEvent,
+  ea as EntityRemoteUpdatedEvent,
+  ba as LWWConflictResolver,
   et as NetworkOfflineError,
   k as OnDeleteAction,
   qt as OnUpdateAction,
   C as PropertyType,
-  ua as QueryCacheRepository,
-  ys as QueryTask,
-  Vi as REMOTE_CHANGES_PENDING_EVENT,
+  da as QueryCacheRepository,
+  ms as QueryTask,
+  Gi as REMOTE_CHANGES_PENDING_EVENT,
   Xn as REPOSITORY_SYNC_BEGIN_EVENT,
   jt as REPOSITORY_SYNC_COMPLETE_EVENT,
   Zn as REPOSITORY_SYNC_ERROR_EVENT,
   T as RelationKind,
   sn as Repository,
-  $s as RepositoryBase,
+  Bs as RepositoryBase,
   it as RepositorySyncBeginEvent,
   at as RepositorySyncCompleteEvent,
   ot as RepositorySyncErrorEvent,
-  ga as RxDB,
+  _a as RxDB,
   an as RxDBAdapterBase,
-  da as RxDBAdapterLocalBase,
-  ha as RxDBAdapterRemoteBase,
+  ha as RxDBAdapterLocalBase,
+  pa as RxDBAdapterRemoteBase,
   K as RxDBBranch,
   H as RxDBChange,
   R as RxDBError,
   se as RxDBMigration,
-  pa as RxDBPluginBase,
+  fa as RxDBPluginBase,
   z as RxDBSync,
   kn as SWITCH_BRANCH_BEGIN,
   Kn as SWITCH_BRANCH_COMMIT,
@@ -8629,47 +8639,47 @@ export {
   Yt as SyncBeginEvent,
   zt as SyncCompleteEvent,
   Wt as SyncErrorEvent,
-  ms as SyncStatus,
+  gs as SyncStatus,
   fe 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,
+  Er as TREE_ADJACENCY_LIST_ENTITY_BASE_OPTIONS,
+  na as TransactionBeginEvent,
+  ra as TransactionCommitEvent,
+  sa as TransactionRollbackEvent,
   _t as TreeAdjacencyListEntityBase,
-  yr as TreeEntity,
-  ca as __decorateClass,
-  Mi as cleanupExpired,
+  mr as TreeEntity,
+  la as __decorateClass,
+  Oi as cleanupExpired,
   un as compactChanges,
-  $r as diffMetadata,
+  Br as diffMetadata,
   lr as fillDefaultValue,
   ur as fillInitValue,
   I as getEntityMetadata,
   Pe as getEntityMutations,
   O as getEntityStatus,
-  aa as getEntityType,
+  oa as getEntityType,
   dr as getNeedRemoveEntities,
   gt as getNeedSaveEntities,
   Ze as getRxDBChangeKey,
-  hi as getSyncConfig,
+  pi as getSyncConfig,
   j as getSyncType,
-  ya as getSyncableRepositories,
-  ma as groupBySyncType,
-  la as isEntityInternalName,
-  fi as isNoSync,
+  ma as getSyncableRepositories,
+  ga as groupBySyncType,
+  ua as isEntityInternalName,
+  yi as isNoSync,
   Vt as isRuleGroup,
-  oa as isRxDBEntity,
+  ca as isRxDBEntity,
   dn as needsPull,
-  pi as needsPush,
-  fa as parseRxDBChangeKey,
-  xr as queryNeedRefreshCreate,
-  Nr as queryNeedRefreshRemove,
-  Pr as queryNeedRefreshUpdate,
+  fi as needsPush,
+  ya as parseRxDBChangeKey,
+  Nr as queryNeedRefreshCreate,
+  Pr as queryNeedRefreshRemove,
+  $r as queryNeedRefreshUpdate,
   M as setSafeObjectKey,
   he as setSafeObjectKeyLazyInitOnce,
   cr as setSafeObjectWritableKey,
-  fr as transitionMetadata,
+  yr as transitionMetadata,
   Ht as uuid
 };