@aiao/rxdb-adapter-sqlite 0.0.16 → 0.0.17

package/dist/index.js

@@ -1,12 +1,12 @@
-import { getEntityMetadata as T, PropertyType as E, RelationKind as b, isRuleGroup as fe, getEntityStatus as F, RepositoryBase as Be, RxDBChange as B, EntityLocalCreatedEvent as K, EntityLocalRemovedEvent as ce, EntityLocalUpdatedEvent as Y, parseRxDBChangeKey as ee, RxDBBranch as H, getEntityType as te, TransactionBeginEvent as Ue, TransactionRollbackEvent as We, TransactionCommitEvent as Ke, RxDBAdapterLocalBase as He, getEntityMutations as he, uuid as Ve } from "@aiao/rxdb";
-import { isString as Qe, isNil as Ge, traverseObjectKeys as Je, EventDispatcher as Xe, AsyncQueueExecutor as we, get as Ye, isFunction as me } from "@aiao/utils";
-import { wrap as Ee, proxy as ze } from "comlink";
-import { defer as ne, of as se, from as re, map as Ze } from "rxjs";
-import { Factory as et, SQLITE_ROW as tt, SQLITE_UTF8 as Ae, SQLITE_DETERMINISTIC as Se } from "wa-sqlite";
-const nt = (e) => ({
+import { getEntityMetadata as w, PropertyType as E, RelationKind as I, isRuleGroup as fe, getEntityStatus as F, RepositoryBase as Ue, RxDBChange as B, EntityLocalCreatedEvent as K, EntityLocalRemovedEvent as ce, EntityLocalUpdatedEvent as Y, parseRxDBChangeKey as ee, RxDBBranch as H, getEntityType as te, TransactionBeginEvent as We, TransactionRollbackEvent as Ke, TransactionCommitEvent as He, RxDBAdapterLocalBase as Ve, getEntityMutations as he, uuid as Qe } from "@aiao/rxdb";
+import { isString as Ge, isNil as Je, traverseObjectKeys as Xe, EventDispatcher as Ye, AsyncQueueExecutor as Ae, get as ze, isFunction as me } from "@aiao/utils";
+import { wrap as Ee, proxy as Ze } from "comlink";
+import { defer as ne, of as se, from as re, map as et } from "rxjs";
+import { Factory as tt, SQLITE_ROW as nt, SQLITE_UTF8 as Se, SQLITE_DETERMINISTIC as be } from "wa-sqlite";
+const st = (e) => ({
   sql: "SELECT * FROM sqlite_master WHERE type='table' AND name=? LIMIT 1;",
   params: [e]
-}), st = (e) => !!e.sql && (e.results.length === 0 || e.results[0].rows.length === 0), q = "__rowid", rt = (e) => {
+}), rt = (e) => !!e.sql && (e.results.length === 0 || e.results[0].rows.length === 0), x = "__rowid", ot = (e) => {
   switch (e.type) {
     case E.uuid:
     case E.string:
@@ -31,7 +31,7 @@ const nt = (e) => ({
       case E.boolean:
         return e ? 1 : 0;
       case E.date:
-        return e instanceof Date ? e.toISOString() : e;
+        return e instanceof Date ? isNaN(e.getTime()) ? null : e.toISOString() : e === "" ? null : e;
       case E.keyValue: {
         if (!e) return null;
         if (n.properties && typeof e == "object" && !Array.isArray(e)) {
@@ -55,8 +55,15 @@ const nt = (e) => ({
     switch (n.type) {
       case E.boolean:
         return !!e;
-      case E.date:
-        return e instanceof Date ? e : typeof e == "string" ? new Date(e) : e;
+      case E.date: {
+        if (e === "") return null;
+        if (e instanceof Date) return isNaN(e.getTime()) ? null : e;
+        if (typeof e == "string") {
+          const t = new Date(e);
+          return isNaN(t.getTime()) ? null : t;
+        }
+        return e;
+      }
       case E.keyValue: {
         if (!e) return null;
         const t = typeof e == "object" ? e : JSON.parse(e);
@@ -72,10 +79,10 @@ const nt = (e) => ({
       default:
         return e;
     }
-}, P = (e, n) => `${n}$${e}`, ot = (e) => {
+}, P = (e, n) => `${n}$${e}`, at = (e) => {
   const n = e.indexOf("$");
   return n === -1 ? ["", e] : [e.substring(0, n), e.substring(n + 1)];
-}, A = (e) => P(e.tableName, e.namespace), _e = (e) => A(T(e)), ye = (e, n) => `idx_${e.name}_${n.name}`;
+}, S = (e) => P(e.tableName, e.namespace), ye = (e) => S(w(e)), _e = (e, n) => `idx_${e.name}_${n.name}`;
 class R extends Error {
   constructor(n, t) {
     super(n, t), this.name = "RxDBAdapterSqliteError", Object.setPrototypeOf(this, R.prototype);
@@ -97,19 +104,19 @@ const le = (e, n) => {
       t[c] = n[c];
       continue;
     }
-    const u = e.propertyMap.get(c);
-    if (u) {
-      t[u.columnName] = V(n[c], u);
+    const d = e.propertyMap.get(c);
+    if (d) {
+      t[d.columnName] = V(n[c], d);
       continue;
     }
-    const d = e.columnNameToPropertyName?.get(c);
-    if (d) {
-      const f = e.propertyMap.get(d);
+    const u = e.columnNameToPropertyName?.get(c);
+    if (u) {
+      const f = e.propertyMap.get(u);
       f && (t[c] = V(n[c], f));
     }
   }
   return t;
-}, be = (e, n) => {
+}, Ie = (e, n) => {
   const t = {};
   for (const [o, i] of e.propertyMap)
     o in n && (t[i.columnName] = n[o]);
@@ -119,7 +126,7 @@ const le = (e, n) => {
     i in n && (t[r[o]] = n[i]);
   }
   return t;
-}, at = (e, n) => {
+}, it = (e, n) => {
   const t = {};
   for (const [o, i] of e.propertyMap)
     o in n && i.readonly !== !0 && (t[i.columnName] = n[o]);
@@ -132,9 +139,9 @@ const le = (e, n) => {
     }
   }
   return t;
-}, I = (e) => Qe(e) ? `'${e.replaceAll("\0", "").replaceAll("'", "''")}'` : Ge(e) ? "NULL" : e, k = (e, n = []) => {
+}, T = (e) => Ge(e) ? `'${e.replaceAll("\0", "").replaceAll("'", "''")}'` : Je(e) ? "NULL" : e, k = (e, n = []) => {
   let t = 0;
-  return e.replace(/\?/g, () => String(I(n[t++])));
+  return e.replace(/\?/g, () => String(T(n[t++])));
 }, oe = (e, n, t) => {
   const s = {};
   return t.forEach((r, o) => {
@@ -145,18 +152,18 @@ const le = (e, n) => {
       s[c[l]] = r;
       return;
     }
-    const u = e.columnNameToPropertyName, p = u?.get(i);
+    const d = e.columnNameToPropertyName, p = d?.get(i);
     if (p) {
       const f = e.propertyMap.get(p);
       f ? s[p] = v(r, f) : console.warn(`Property ${p} not found in metadata ${e.name}`);
       return;
     }
-    const d = e.computedPropertyMap?.get(i);
-    if (d) {
-      s[i] = v(r, d);
+    const u = e.computedPropertyMap?.get(i);
+    if (u) {
+      s[i] = v(r, u);
       return;
     }
-    if (!u) {
+    if (!d) {
       const f = e.propertyMap.get(i);
       if (f) {
         s[i] = v(r, f);
@@ -165,7 +172,7 @@ const le = (e, n) => {
     }
     console.warn(`Column ${i}=${r} not found in metadata ${e.name}`);
   }), s;
-}, w = "_", it = {
+}, A = "_", ct = {
   "=": "=",
   "!=": "!=",
   ">": ">",
@@ -206,11 +213,11 @@ const le = (e, n) => {
       return r[o];
   }
   return e;
-}, ge = (e, n, t) => {
+}, Ne = (e, n, t) => {
   if (n) return n;
   if (!e.includes(".")) {
     const c = ae(e, t);
-    return `${w}."${c}"`;
+    return `${A}."${c}"`;
   }
   const s = e.lastIndexOf("."), r = e.slice(0, s), o = e.slice(s + 1), i = ae(o, t);
   return `"${r}"."${i}"`;
@@ -219,71 +226,71 @@ const le = (e, n) => {
   switch (n) {
     case "in":
     case "notIn":
-      return lt(t);
+      return ut(t);
     case "between":
     case "notBetween":
-      return ut(t);
+      return dt(t);
     case "contains":
     case "notContains":
-      return I(`%${t}%`);
+      return T(`%${t}%`);
     case "startsWith":
     case "notStartsWith":
-      return I(`${t}%`);
+      return T(`${t}%`);
     case "endsWith":
     case "notEndsWith":
-      return I(`%${t}`);
+      return T(`%${t}`);
     default:
-      return dt(t);
+      return pt(t);
   }
-}, ct = (e) => it[e] || e, Q = (e, n, t) => e.length === 1 ? t.name : `${n}_${t.name}`, lt = (e) => !Array.isArray(e) || !e.length ? "(NULL)" : `(${e.map(I).join(", ")})`, ut = (e) => {
+}, lt = (e) => ct[e] || e, Q = (e, n, t) => e.length === 1 ? t.name : `${n}_${t.name}`, ut = (e) => !Array.isArray(e) || !e.length ? "(NULL)" : `(${e.map(T).join(", ")})`, dt = (e) => {
   if (!Array.isArray(e) || e.length < 2) return "";
   const [n, t] = e;
   if (n == null || t == null) return "";
   const s = n instanceof Date ? n.toISOString() : n, r = t instanceof Date ? t.toISOString() : t;
-  return `${I(s)} and ${I(r)}`;
-}, dt = (e) => typeof e == "boolean" ? e ? "1" : "0" : typeof e == "string" ? I(e) : typeof e == "number" ? e.toString() : e instanceof Date ? I(e.toISOString()) : I(e), pt = (e, n, t) => {
+  return `${T(s)} and ${T(r)}`;
+}, pt = (e) => typeof e == "boolean" ? e ? "1" : "0" : typeof e == "string" ? T(e) : typeof e == "number" ? e.toString() : e instanceof Date ? T(e.toISOString()) : T(e), ft = (e, n, t) => {
   const s = e.propertyMap.get(n);
   if (!s || s.type !== E.keyValue || typeof t.value != "object" || Array.isArray(t.value)) return null;
   const r = Object.entries(t.value).filter(([, a]) => a != null);
   if (!r.length) return "";
   const o = t.operator === "notContains" ? "NOT LIKE" : "LIKE", i = t.operator === "contains" ? " OR " : " AND ";
   return `(${r.map(([a, l]) => {
-    const u = l instanceof Date ? l.toISOString() : typeof l == "string" ? l : String(l), p = a.replace(/'/g, "''");
-    return `json_extract(${w}."${s.columnName}", '$.${p}') ${o} ${I(`%${u}%`)}`;
+    const d = l instanceof Date ? l.toISOString() : typeof l == "string" ? l : String(l), p = a.replace(/'/g, "''");
+    return `json_extract(${A}."${s.columnName}", '$.${p}') ${o} ${T(`%${d}%`)}`;
   }).join(i)})`;
-}, ft = (e, n, t) => {
+}, ht = (e, n, t) => {
   const s = e.propertyMap.get(n);
   if (!s || s.type !== E.stringArray && s.type !== E.numberArray) return null;
-  const r = Re(t), o = `EXISTS (SELECT 1 FROM json_each(${w}."${s.columnName}") WHERE json_each.value IN ${r})`;
+  const r = Re(t), o = `EXISTS (SELECT 1 FROM json_each(${A}."${s.columnName}") WHERE json_each.value IN ${r})`;
   return t.operator === "notIn" ? `NOT ${o}` : o;
-}, ht = (e, n, t, s, r) => {
+}, mt = (e, n, t, s, r) => {
   if (t && s && r && (e.operator === "exists" || e.operator === "notExists")) {
-    const d = gt(e, t, s, (f, h) => {
-      const _ = /* @__PURE__ */ new Map();
-      return h.propertyMap.forEach((m, y) => {
-        _.set(y, `"child"."${m.columnName}"`);
-      }), r(f, _, h, s);
+    const u = gt(e, t, s, (f, h) => {
+      const y = /* @__PURE__ */ new Map();
+      return h.propertyMap.forEach((m, _) => {
+        y.set(_, `"child"."${m.columnName}"`);
+      }), r(f, y, h, s);
     });
-    if (d !== null) return d;
+    if (u !== null) return u;
   }
   if (e.operator === "null" || e.operator === "notNull") {
-    const p = String(e.field), d = n.get(p), f = ge(p, d, t);
+    const p = String(e.field), u = n.get(p), f = Ne(p, u, t);
     return e.operator === "null" ? `${f} IS NULL` : `${f} IS NOT NULL`;
   }
-  const o = e.value === null, i = o ? "" : ct(e.operator).toLowerCase(), c = o ? e.operator === "=" ? "IS NULL" : e.operator === "!=" ? "IS NOT NULL" : "" : Re(e);
+  const o = e.value === null, i = o ? "" : lt(e.operator).toLowerCase(), c = o ? e.operator === "=" ? "IS NULL" : e.operator === "!=" ? "IS NOT NULL" : "" : Re(e);
   if (!c && ["in", "notIn", "between", "notBetween"].includes(e.operator)) return "";
   const a = String(e.field), l = n.get(a);
   if (t && !a.includes(".") && (e.operator === "contains" || e.operator === "notContains")) {
-    const p = pt(t, a, e);
+    const p = ft(t, a, e);
     if (p !== null) return p;
   }
   if (t && !a.includes(".") && (e.operator === "in" || e.operator === "notIn")) {
-    const p = ft(t, a, e);
+    const p = ht(t, a, e);
     if (p !== null) return p;
   }
-  return `${ge(a, l, t)} ${i} ${c}`.replace(/\s+/g, " ").trim();
-}, ue = (e) => e === w ? e : `"${e}"`, mt = (e, n, t) => {
-  if (e.kind !== b.ONE_TO_MANY)
+  return `${Ne(a, l, t)} ${i} ${c}`.replace(/\s+/g, " ").trim();
+}, ue = (e) => e === A ? e : `"${e}"`, Et = (e, n, t) => {
+  if (e.kind !== I.ONE_TO_MANY)
     throw new Error("_build_one_to_many_exists requires ONE_TO_MANY relation");
   const s = P(n.tableName, n.namespace), r = "child", o = n.relations.find((a) => a.name === e.mappedProperty);
   if (!o)
@@ -292,52 +299,52 @@ const le = (e, n) => {
     );
   const i = o.columnName;
   let c = `EXISTS (SELECT 1 FROM "${s}" "${r}"`;
-  return c += ` WHERE "${r}"."${i}" = ${w}."id"`, t && (c += ` AND ${t}`), c += ")", c;
-}, Et = (e, n, t) => {
+  return c += ` WHERE "${r}"."${i}" = ${A}."id"`, t && (c += ` AND ${t}`), c += ")", c;
+}, yt = (e, n, t) => {
   const s = e.columnName;
   if (!t)
-    return `${w}."${s}" IS NOT NULL`;
+    return `${A}."${s}" IS NOT NULL`;
   const r = P(n.tableName, n.namespace), o = "child";
   let i = `EXISTS (SELECT 1 FROM "${r}" "${o}"`;
-  return i += ` WHERE ${w}."${s}" = "${o}"."id"`, i += ` AND ${t}`, i += ")", i;
+  return i += ` WHERE ${A}."${s}" = "${o}"."id"`, i += ` AND ${t}`, i += ")", i;
 }, _t = (e, n, t, s, r) => {
   const o = s.rxdb.schemaManager.findMappedRelation(e, n);
   if (o?.relation) {
     const i = P(t.tableName, t.namespace), c = "child", a = o.relation.columnName;
     let l = `EXISTS (SELECT 1 FROM "${i}" "${c}"`;
-    return l += ` WHERE "${c}"."${a}" = ${w}."id"`, r && (l += ` AND ${r}`), l += ")", l;
+    return l += ` WHERE "${c}"."${a}" = ${A}."id"`, r && (l += ` AND ${r}`), l += ")", l;
   } else {
     const i = n.columnName;
     if (!r)
-      return `${w}."${i}" IS NOT NULL`;
+      return `${A}."${i}" IS NOT NULL`;
     const c = P(t.tableName, t.namespace), a = "child";
     let l = `EXISTS (SELECT 1 FROM "${c}" "${a}"`;
-    return l += ` WHERE ${w}."${i}" = "${a}"."id"`, l += ` AND ${r}`, l += ")", l;
+    return l += ` WHERE ${A}."${i}" = "${a}"."id"`, l += ` AND ${r}`, l += ")", l;
   }
-}, yt = (e, n, t, s) => {
+}, Nt = (e, n, t, s) => {
   const r = P(t.tableName, t.namespace), o = "child", i = n.junctionEntityType;
   if (!i)
     throw new Error(`MANY_TO_MANY relation "${n.name}" missing junctionEntityType`);
-  const c = T(i);
+  const c = w(i);
   if (!c)
     throw new Error("Cannot find metadata for junction entity");
-  const a = P(c.tableName, c.namespace), l = "junction", u = c.relations.find(
-    (_) => _.mappedEntity === e.name && _.mappedNamespace === e.namespace
+  const a = P(c.tableName, c.namespace), l = "junction", d = c.relations.find(
+    (y) => y.mappedEntity === e.name && y.mappedNamespace === e.namespace
   );
-  if (!u)
+  if (!d)
     throw new Error(
       `Cannot find relation in junction entity ${c.name} pointing to ${e.name}`
     );
   const p = c.relations.find(
-    (_) => _.mappedEntity === t.name && _.mappedNamespace === t.namespace
+    (y) => y.mappedEntity === t.name && y.mappedNamespace === t.namespace
   );
   if (!p)
     throw new Error(
       `Cannot find relation in junction entity ${c.name} pointing to ${t.name}`
     );
-  const d = u.columnName, f = p.columnName;
+  const u = d.columnName, f = p.columnName;
   let h = `EXISTS (SELECT 1 FROM "${r}" "${o}"`;
-  return h += ` INNER JOIN "${a}" "${l}"`, h += ` ON "${l}"."${f}" = "${o}"."id"`, h += ` WHERE "${l}"."${d}" = ${w}."id"`, s && (h += ` AND ${s}`), h += ")", h;
+  return h += ` INNER JOIN "${a}" "${l}"`, h += ` ON "${l}"."${f}" = "${o}"."id"`, h += ` WHERE "${l}"."${u}" = ${A}."id"`, s && (h += ` AND ${s}`), h += ")", h;
 }, gt = (e, n, t, s) => {
   if (e.operator !== "exists" && e.operator !== "notExists")
     return null;
@@ -353,26 +360,26 @@ const le = (e, n) => {
   e.where && s && (i = s(e.where, o));
   let c;
   switch (r.kind) {
-    case b.ONE_TO_MANY:
-      c = mt(r, o, i);
-      break;
-    case b.MANY_TO_ONE:
+    case I.ONE_TO_MANY:
       c = Et(r, o, i);
       break;
-    case b.ONE_TO_ONE:
+    case I.MANY_TO_ONE:
+      c = yt(r, o, i);
+      break;
+    case I.ONE_TO_ONE:
       c = _t(n, r, o, t, i);
       break;
-    case b.MANY_TO_MANY:
-      c = yt(n, r, o, i);
+    case I.MANY_TO_MANY:
+      c = Nt(n, r, o, i);
       break;
   }
   return e.operator === "notExists" ? `NOT ${c}` : c;
 }, G = (e, n) => {
   if (e.relationAliasMap.has(n))
     return e.relationAliasMap.get(n);
-  const t = n.includes("_") ? n : n.split("_")[0], s = Oe(e, t);
+  const t = n.includes("_") ? n : n.split("_")[0], s = Ce(e, t);
   return e.relationAliasMap.set(n, s), s;
-}, Nt = (e, n, t, s) => {
+}, $t = (e, n, t, s) => {
   const r = t.slice(0, s);
   let o = n;
   const i = [];
@@ -383,142 +390,142 @@ const le = (e, n) => {
     i.push({ metadata: o, relation: a }), o = e.rxdb.schemaManager.getEntityMetadata(a.mappedEntity, a.mappedNamespace);
   }
   return { metaWalker: o, relPairs: i };
-}, $t = (e, n, t, s, r) => {
+}, Tt = (e, n, t, s, r) => {
   for (let o = r.length - 1; o > 0; o--) {
     const i = r.slice(o);
     if (i.length === 0) continue;
-    const { metaWalker: c, relPairs: a } = Nt(e, t, r, o);
+    const { metaWalker: c, relPairs: a } = $t(e, t, r, o);
     if (!c || a.length === 0) continue;
-    const l = i[0], u = i.slice(1).join("."), p = c.propertyMap.get(l);
+    const l = i[0], d = i.slice(1).join("."), p = c.propertyMap.get(l);
     if (p && p.type === E.keyValue) {
-      const d = r.slice(0, o).join(".");
-      Ie(e, n, a, d);
-      const f = a[a.length - 1].relation, h = Q(a, d, f), _ = G(n, h), m = u ? `$.${u}` : "$";
-      return n.fieldAliasMap.set(s, `json_extract("${_}"."${p.columnName}", '${m}')`), !0;
+      const u = r.slice(0, o).join(".");
+      Oe(e, n, a, u);
+      const f = a[a.length - 1].relation, h = Q(a, u, f), y = G(n, h), m = d ? `$.${d}` : "$";
+      return n.fieldAliasMap.set(s, `json_extract("${y}"."${p.columnName}", '${m}')`), !0;
     }
   }
   return !1;
-}, Ie = (e, n, t, s) => {
+}, Oe = (e, n, t, s) => {
   t.forEach(({ metadata: r, relation: o }, i) => {
     let c = e.rxdb.schemaManager.findMappedRelation(r, o);
     if (!c)
-      if (o.kind === b.ONE_TO_MANY || o.kind === b.MANY_TO_MANY) {
+      if (o.kind === I.ONE_TO_MANY || o.kind === I.MANY_TO_MANY) {
         const p = r.relationMap.get(o.mappedProperty);
         p && (c = { metadata: r, relation: p });
-      } else (o.kind === b.MANY_TO_ONE || o.kind === b.ONE_TO_ONE) && (c = { metadata: r, relation: o });
+      } else (o.kind === I.MANY_TO_ONE || o.kind === I.ONE_TO_ONE) && (c = { metadata: r, relation: o });
     if (!c) throw new R("mappedRelation not found");
     const a = Q(t, s, o), l = G(n, a);
-    let u = w;
+    let d = A;
     if (i > 0) {
-      const p = t[i - 1], d = Q(t, s, p.relation);
-      u = G(n, d);
+      const p = t[i - 1], u = Q(t, s, p.relation);
+      d = G(n, u);
     }
     switch (o.kind) {
-      case b.ONE_TO_MANY:
-        Tt(
+      case I.ONE_TO_MANY:
+        wt(
           n,
           c,
           l,
-          u
+          d
         );
         break;
-      case b.ONE_TO_ONE:
-      case b.MANY_TO_ONE:
-        wt(
+      case I.ONE_TO_ONE:
+      case I.MANY_TO_ONE:
+        At(
           n,
           c,
           l,
-          u,
+          d,
           o
         );
         break;
-      case b.MANY_TO_MANY:
-        At(
+      case I.MANY_TO_MANY:
+        St(
           e,
           n,
           c,
           l,
-          u,
+          d,
           o
         );
         break;
     }
   });
-}, Tt = (e, n, t, s) => {
+}, wt = (e, n, t, s) => {
   const r = J(e, n.metadata), o = `"${t}".${n.relation.columnName} = ${ue(s)}.id`;
   r.find((c) => c.joinTableName === t && c.on === o) || r.push({
     joinTableName: t,
     on: o
   });
-}, wt = (e, n, t, s, r) => {
+}, At = (e, n, t, s, r) => {
   const o = J(e, n.metadata), i = `"${t}".id = ${ue(s)}.${r.columnName}`;
   o.find((a) => a.joinTableName === t && a.on === i) || o.push({
     joinTableName: t,
     on: i
   });
-}, At = (e, n, t, s, r, o) => {
-  const i = T(o.junctionEntityType), c = J(n, i), a = Oe(n, `${o.name}_m_n`), l = `"${a}".${t.relation.columnName} = ${ue(r)}.id`;
+}, St = (e, n, t, s, r, o) => {
+  const i = w(o.junctionEntityType), c = J(n, i), a = Ce(n, `${o.name}_m_n`), l = `"${a}".${t.relation.columnName} = ${ue(r)}.id`;
   c.find(
     (h) => h.joinTableName === a && h.on === l
   ) || c.push({
     joinTableName: a,
     on: l
   });
-  const p = J(n, t.metadata), d = `"${s}".id = "${a}".${o.columnName}`;
-  p.find((h) => h.joinTableName === s && h.on === d) || p.push({
+  const p = J(n, t.metadata), u = `"${s}".id = "${a}".${o.columnName}`;
+  p.find((h) => h.joinTableName === s && h.on === u) || p.push({
     joinTableName: s,
-    on: d
+    on: u
   });
-}, J = (e, n) => (e.joinMap.has(n) || e.joinMap.set(n, []), e.joinMap.get(n)), Oe = (e, n) => {
+}, J = (e, n) => (e.joinMap.has(n) || e.joinMap.set(n, []), e.joinMap.get(n)), Ce = (e, n) => {
   let t = n, s = 1;
   for (; e.usedAliases.has(t); )
     t = `${n}_${s}`, s++;
   return e.usedAliases.add(t), t;
-}, St = (e, n) => {
+}, bt = (e, n) => {
   if (e?.length)
     return e.map((t) => {
       const s = ae(t.field, n);
-      return `${w}."${s}" ${t.sort}`;
+      return `${A}."${s}" ${t.sort}`;
     }).join(", ");
 }, U = (e, n = /* @__PURE__ */ new Map(), t, s) => {
   if (!e?.rules) return "";
   const r = e.rules.map(
-    (o) => fe(o) ? U(o, n, t, s) : ht(o, n, t, s, U)
+    (o) => fe(o) ? U(o, n, t, s) : mt(o, n, t, s, U)
   ).filter(Boolean);
   return r.length ? r.length === 1 ? r[0] : `(${r.join(fe(e) ? ` ${e.combinator} ` : " ")})` : "";
 }, Me = (e) => {
   const { tableName: n, where: t, limit: s, offset: r, orderBy: o, join: i, hasJoin: c, metadata: a } = e;
-  let l = `${w}.rowid as ${q}, ${w}.*`;
+  let l = `${A}.rowid as ${x}, ${A}.*`;
   if (a.features?.tree?.hasChildren && a.features?.tree?.type === "adjacency-list") {
-    const d = a.relationMap.get("parent").columnName;
-    l += `, EXISTS(SELECT 1 FROM "${n}" __sub WHERE __sub."${d}" = ${w}."id") AS "hasChildren"`;
+    const u = a.relationMap.get("parent").columnName;
+    l += `, EXISTS(SELECT 1 FROM "${n}" __sub WHERE __sub."${u}" = ${A}."id") AS "hasChildren"`;
   }
-  const u = [`SELECT ${c ? "DISTINCT " : ""}${l} FROM "${n}" ${w}`];
-  return i && u.push(i), t && u.push(` WHERE ${t}`), o && u.push(` ORDER BY ${o}`), s && u.push(` LIMIT ${s}`), r && u.push(` OFFSET ${r}`), u.join("") + ";";
-}, Ce = (e, n, t) => {
+  const d = [`SELECT ${c ? "DISTINCT " : ""}${l} FROM "${n}" ${A}`];
+  return i && d.push(i), t && d.push(` WHERE ${t}`), o && d.push(` ORDER BY ${o}`), s && d.push(` LIMIT ${s}`), r && d.push(` OFFSET ${r}`), d.join("") + ";";
+}, Le = (e, n, t) => {
   const s = {
     joinMap: /* @__PURE__ */ new Map(),
     usedAliases: /* @__PURE__ */ new Set(),
     fieldAliasMap: /* @__PURE__ */ new Map(),
     relationAliasMap: /* @__PURE__ */ new Map()
   };
-  Je(t, (o, i, c) => {
+  Xe(t, (o, i, c) => {
     const a = i;
     o !== "field" || !a.includes(".") || Rt(e, s, n, a, c);
   });
   const r = [];
   for (const [o, i] of s.joinMap.entries()) {
-    const c = A(o);
+    const c = S(o);
     for (const a of i)
       r.push(` LEFT JOIN "${c}" "${a.joinTableName}" ON ${a.on}`);
   }
   return { joinSQL: r.join(""), fieldAliasMap: s.fieldAliasMap };
-}, bt = (e, n, t, s) => {
+}, It = (e, n, t, s) => {
   if (s.length <= 1) return !1;
   const [r, ...o] = s, i = n.propertyMap.get(r);
   if (i && i.type === E.keyValue && o.length > 0) {
     const c = o.join(".");
-    return e.fieldAliasMap.set(t, `json_extract(${w}."${i.columnName}", '$.${c}')`), !0;
+    return e.fieldAliasMap.set(t, `json_extract(${A}."${i.columnName}", '$.${c}')`), !0;
   }
   return !1;
 }, Rt = (e, n, t, s, r) => {
@@ -530,96 +537,96 @@ const le = (e, n) => {
       return;
     }
     const c = s.replace(`.${i.propertyName}`, "");
-    Ie(e, n, i.relations, c);
-    const a = i.relations[i.relations.length - 1], l = Q(i.relations, c, a.relation), u = G(n, l);
-    n.fieldAliasMap.set(s, `"${u}"."${i.property.columnName}"`);
+    Oe(e, n, i.relations, c);
+    const a = i.relations[i.relations.length - 1], l = Q(i.relations, c, a.relation), d = G(n, l);
+    n.fieldAliasMap.set(s, `"${d}"."${i.property.columnName}"`);
     return;
   } catch {
   }
-  bt(n, t, s, o) || $t(e, n, t, s, o);
-}, It = (e, n) => {
-  const t = A(e), s = [n.id];
+  It(n, t, s, o) || Tt(e, n, t, s, o);
+}, Ot = (e, n) => {
+  const t = S(e), s = [n.id];
   return {
     sql: `DELETE FROM "${t}" WHERE id = ?;`,
     params: s
   };
-}, Le = (e, n, t) => {
-  const s = A(e), r = be(e, n);
+}, je = (e, n, t) => {
+  const s = S(e), r = Ie(e, n);
   t?.userId && (e.propertyMap.has("createdBy") && (r.createdBy = t.userId), e.propertyMap.has("updatedBy") && (r.updatedBy = t.userId));
   const o = /* @__PURE__ */ new Date();
   e.propertyMap.has("createdAt") && r.createdAt === void 0 && (r.createdAt = t?.createdAt ?? o), e.propertyMap.has("updatedAt") && r.updatedAt === void 0 && (r.updatedAt = t?.updatedAt ?? o);
   const i = le(e, r), c = Object.keys(i), a = Array(c.length).fill("?").join(","), l = Object.values(i);
   let p = `${t?.useReplace ? "INSERT OR REPLACE" : "INSERT"} INTO "${s}" (${c.join(",")}) VALUES (${a})`;
-  return t?.returning !== !1 ? p += ` RETURNING rowid as ${q}, *;` : p += ";", {
+  return t?.returning !== !1 ? p += ` RETURNING rowid as ${x}, *;` : p += ";", {
     sql: p,
     params: l
   };
 }, de = (e, n, t, s) => {
-  const r = at(e, t);
+  const r = it(e, t);
   e.propertyMap.has("updatedAt") && (r.updatedAt = s?.updatedAt ?? /* @__PURE__ */ new Date()), s?.userId && e.propertyMap.has("updatedBy") && (r.updatedBy = s.userId);
-  const o = le(e, r), i = Object.keys(o).map((d) => `${d} = ?`).join(","), c = [...Object.values(o)], a = A(e), l = Array.isArray(n), u = l ? n : [n];
+  const o = le(e, r), i = Object.keys(o).map((u) => `${u} = ?`).join(","), c = [...Object.values(o)], a = S(e), l = Array.isArray(n), d = l ? n : [n];
   let p = `UPDATE "${a}" SET ${i} WHERE id `;
-  return l ? p += `in (${u.map((d) => I(d.id)).join(",")})` : (c.push(n.id), p += "= ?"), s?.returning !== !1 ? p += ` RETURNING rowid as ${q}, *;` : p += ";", {
+  return l ? p += `in (${d.map((u) => T(u.id)).join(",")})` : (c.push(n.id), p += "= ?"), s?.returning !== !1 ? p += ` RETURNING rowid as ${x}, *;` : p += ";", {
     sql: p,
     params: c
   };
-}, Ot = (e, n, t) => {
+}, Ct = (e, n, t) => {
   if (t.groupBy)
     throw new R("groupBy not supported yet");
-  const { joinSQL: s, fieldAliasMap: r } = Ce(e, n, t.where), o = A(n), i = U(t.where, r, n, e), c = [`SELECT COUNT(${w}.rowid) AS count FROM "${o}" ${w}`];
+  const { joinSQL: s, fieldAliasMap: r } = Le(e, n, t.where), o = S(n), i = U(t.where, r, n, e), c = [`SELECT COUNT(${A}.rowid) AS count FROM "${o}" ${A}`];
   return s && c.push(s), i && c.push(` WHERE ${i}`), { sql: c.join("") };
 }, ie = (e, n, t) => {
-  const { joinSQL: s, fieldAliasMap: r } = Ce(e, n, t.where);
+  const { joinSQL: s, fieldAliasMap: r } = Le(e, n, t.where);
   return { sql: Me({
-    tableName: A(n),
+    tableName: S(n),
     where: U(t.where, r, n, e),
-    orderBy: St(t.orderBy, n),
+    orderBy: bt(t.orderBy, n),
     join: s,
     hasJoin: !!s,
     metadata: n,
     limit: t.limit,
     offset: t.offset
   }) };
-}, Mt = (e, n) => {
+}, ge = (e, n) => {
   const t = n.map(() => "?").join(",");
   return { sql: Me({
-    tableName: A(e),
-    where: `${q} IN (${t})`,
+    tableName: S(e),
+    where: `${x} IN (${t})`,
     metadata: e
   }), params: n };
 }, X = (e, n, t, s = !1, r = !1) => {
-  const o = [], i = T(n), c = e.rxdb.entityManager;
+  const o = [], i = w(n), c = e.rxdb.entityManager;
   return t.results.forEach(({ columns: a, rows: l }) => {
-    const u = a.findIndex((d) => d === "id"), p = a.findIndex((d) => d === q);
-    l.forEach((d) => {
-      const f = d[u];
+    const d = a.findIndex((u) => u === "id"), p = a.findIndex((u) => u === x);
+    l.forEach((u) => {
+      const f = u[d];
       let h;
       if (e.rxdb.entityManager.hasEntityRef(n, f)) {
         h = c.getEntityRef(n, f);
-        const y = oe(i, a, d);
-        if (i.computedPropertyMap.forEach((N, $) => {
-          $ in y && (h[$] = y[$]);
+        const _ = oe(i, a, u);
+        if (i.computedPropertyMap.forEach((g, $) => {
+          $ in _ && (h[$] = _[$]);
         }), s) {
-          const N = F(h);
-          N.origin = { ...y }, Object.assign(h, y);
+          const g = F(h);
+          g.origin = { ..._ }, Object.assign(h, _);
         }
       } else {
         if (r)
           return;
         {
-          const y = oe(i, a, d);
-          h = c.createEntityRef(n, y);
+          const _ = oe(i, a, u);
+          h = c.createEntityRef(n, _);
         }
       }
       o.push(h);
       const m = F(h);
       if (m.local = !0, m.modified = !1, p !== -1) {
-        const y = BigInt(d[p]);
-        e.cacheRowIdEntity(y, h);
+        const _ = BigInt(u[p]);
+        e.cacheRowIdEntity(_, h);
       }
     });
   }), o;
-}, Ct = (e, n, t) => {
+}, Mt = (e, n, t) => {
   t.forEach((s) => {
     if (e.rxdb.entityManager.hasEntityRef(n, s)) {
       const r = e.rxdb.entityManager.getEntityRef(n, s), o = F(r);
@@ -627,14 +634,26 @@ const le = (e, n) => {
     }
   });
 };
-class Lt extends Be {
+class Lt extends Ue {
   constructor(n, t) {
-    super(n.rxdb, t), this.adapter = n, this.metadata = T(t);
+    super(n.rxdb, t), this.adapter = n, this.metadata = w(t);
   }
   metadata;
   async findByRowIds(n) {
-    const { sql: t, params: s } = Mt(this.metadata, n), r = await this.adapter.query(t, s);
-    return this.addQueryCache(r);
+    if (n.length <= 999) {
+      const { sql: i, params: c } = ge(this.metadata, n), a = await this.adapter.query(i, c);
+      return this.addQueryCache(a);
+    }
+    const s = [];
+    for (let i = 0; i < n.length; i += 999) {
+      const c = n.slice(i, i + 999), { sql: a, params: l } = ge(this.metadata, c);
+      s.push(await this.adapter.query(a, l));
+    }
+    const r = s[0], o = {
+      ...r,
+      results: [{ columns: r.results[0]?.columns ?? [], rows: s.flatMap((i) => i.results[0]?.rows ?? []) }]
+    };
+    return this.addQueryCache(o);
   }
   /**
    * 添加缓存
@@ -645,7 +664,7 @@ class Lt extends Be {
     return X(this.adapter, this.EntityType, n, t);
   }
 }
-class je extends Lt {
+class qe extends Lt {
   async get(n) {
     const t = {
       where: {
@@ -664,11 +683,11 @@ class je extends Lt {
     return this.addQueryCache(r);
   }
   async count(n) {
-    const { sql: t, params: s } = Ot(this.adapter, this.metadata, n);
+    const { sql: t, params: s } = Ct(this.adapter, this.metadata, n);
     return (await this.adapter.query(t, s)).results[0].rows[0][0];
   }
   async create(n) {
-    const { sql: t, params: s } = Le(this.metadata, n, this.rxdb.context), r = await this.adapter.query(t, s);
+    const { sql: t, params: s } = je(this.metadata, n, this.rxdb.context), r = await this.adapter.query(t, s);
     return this.addQueryCache(r, !0), n;
   }
   async update(n, t) {
@@ -680,10 +699,10 @@ class je extends Lt {
       t.origin = structuredClone({ ...n }), t.modified = !1, t.removed = !0;
     };
     if (t.local === !0) {
-      const { sql: o, params: i } = It(this.metadata, n);
+      const { sql: o, params: i } = Ot(this.metadata, n);
       return await this.adapter.query(o, i), s(), n;
     }
-    const r = T(n);
+    const r = w(n);
     throw new R(`Remove Error${r.name}(${n.id}) not saved local.`);
   }
 }
@@ -697,7 +716,7 @@ const jt = (e) => {
     case 23:
       return "UPDATE";
   }
-}, xt = "sqlite", qt = () => import("wa-sqlite/dist/wa-sqlite-async.mjs").then((e) => e.default), Dt = () => import("wa-sqlite/dist/wa-sqlite.mjs").then((e) => e.default), vt = [
+}, qt = "sqlite", xt = () => import("wa-sqlite/dist/wa-sqlite-async.mjs").then((e) => e.default), Dt = () => import("wa-sqlite/dist/wa-sqlite.mjs").then((e) => e.default), vt = [
   {
     name: "MemoryVFS",
     vfsModule: () => import("wa-sqlite/src/examples/MemoryVFS.js").then((e) => e.MemoryVFS),
@@ -796,10 +815,10 @@ const jt = (e) => {
 }, Pt = async (e) => {
   const n = xe(e), t = e.async ?? !0;
   let s;
-  t ? s = qt : s = Dt;
+  t ? s = xt : s = Dt;
   const [r, o] = await Promise.all([s(), n.vfsModule()]), i = {};
   e.locateFile ? i.locateFile = e.locateFile : e.wasmPath && (i.locateFile = () => e.wasmPath);
-  const c = await r(i), a = et(c), l = await o.create(e.vfs, c, n.vfsOptions);
+  const c = await r(i), a = tt(c), l = await o.create(e.vfs, c, n.vfsOptions);
   return a.vfs_register(l, !0), a;
 };
 async function kt(e, n, t, s) {
@@ -811,13 +830,13 @@ async function kt(e, n, t, s) {
   };
   for await (const l of e.statements(n, t)) {
     c && (e.reset(l), e.bind_collection(l, c), c = void 0);
-    const u = [];
-    for (; await e.step(l) === tt; ) {
-      const d = e.row(l);
-      u.push(d);
+    const d = [];
+    for (; await e.step(l) === nt; ) {
+      const u = e.row(l);
+      d.push(u);
     }
     const p = e.column_names(l);
-    p.length && o.push({ columns: p, rows: u }), i += e.changes(n);
+    p.length && o.push({ columns: p, rows: d }), i += e.changes(n);
   }
   return {
     ...a,
@@ -827,8 +846,8 @@ async function kt(e, n, t, s) {
 }
 const Ft = {
   BALANCED: 16
-}, Ne = Ft.BALANCED, Bt = 50 * 1024, Ut = /* @__PURE__ */ new Set(["public$rxdb_change", "public$rxdb_branch", "public$rxdb_migration"]);
-class Wt extends Xe {
+}, $e = Ft.BALANCED, Bt = 50 * 1024, Ut = /* @__PURE__ */ new Set(["public$rxdb_change", "public$rxdb_branch", "public$rxdb_migration"]);
+class Wt extends Ye {
   #n;
   #e;
   #a = !1;
@@ -836,7 +855,7 @@ class Wt extends Xe {
   #c;
   #s = [];
   #t;
-  #r = Ne;
+  #r = $e;
   /**
    * 初始化数据库
    *
@@ -845,9 +864,9 @@ class Wt extends Xe {
    */
   async init(n, t) {
     if (this.#a) return;
-    this.#a = !0, this.#c = new we(1);
+    this.#a = !0, this.#c = new Ae(1);
     const s = await Pt(t), r = `${n}.sqlite`;
-    this.#e = await s.open_v2(r), this.#n = s, this.#u(s, this.#e), this.#r = t?.batchTimeout ?? Ne;
+    this.#e = await s.open_v2(r), this.#n = s, this.#u(s, this.#e), this.#r = t?.batchTimeout ?? $e;
     const o = t?.cacheSizeKb ?? Bt;
     await this.execute(`
       PRAGMA temp_store = memory;
@@ -864,7 +883,7 @@ class Wt extends Xe {
    */
   async version() {
     const n = await this.execute("SELECT sqlite_version()");
-    return Ye(n, "results[0].rows[0][0]");
+    return ze(n, "results[0].rows[0][0]");
   }
   /**
    * 断开数据库连接
@@ -938,7 +957,7 @@ class Wt extends Xe {
   }
 }
 const W = /* @__PURE__ */ new Map(), Kt = 128;
-function qe(e, n = "") {
+function De(e, n = "") {
   const t = `${e}\0${n}`;
   let s = W.get(t);
   if (!s) {
@@ -948,9 +967,9 @@ function qe(e, n = "") {
   return s;
 }
 function Ht(e, n) {
-  e.create_function(n, "regexp", 2, Ae | Se, 0, (t, s) => {
+  e.create_function(n, "regexp", 2, Se | be, 0, (t, s) => {
     try {
-      const r = qe(e.value_text(s[0])), o = e.value_text(s[1]);
+      const r = De(e.value_text(s[0])), o = e.value_text(s[1]);
       e.result(t, r.test(o) ? 1 : 0);
     } catch {
       e.result(t, 0);
@@ -958,30 +977,30 @@ function Ht(e, n) {
   });
 }
 function Vt(e, n) {
-  e.create_function(n, "regexp_replace", -1, Ae | Se, 0, (t, s) => {
+  e.create_function(n, "regexp_replace", -1, Se | be, 0, (t, s) => {
     if (s.length < 3) {
       e.result(t, "");
       return;
     }
     try {
       const r = e.value_text(s[0]), o = e.value_text(s[1]), i = e.value_text(s[2]), c = s.length > 3 ? e.value_text(s[3]) : "";
-      e.result(t, o.replace(qe(r, c), i));
+      e.result(t, o.replace(De(r, c), i));
     } catch {
       e.result(t, e.value_text(s[1]));
     }
   });
 }
 async function Qt(e, n) {
-  const { vfs: t, async: s, worker: r, wasmPath: o, locateFile: i, workerInstance: c, sharedWorkerInstance: a, sharedWorker: l } = n, u = {
+  const { vfs: t, async: s, worker: r, wasmPath: o, locateFile: i, workerInstance: c, sharedWorkerInstance: a, sharedWorker: l } = n, d = {
     vfs: t,
     async: s,
     worker: r,
     wasmPath: o,
     locateFile: i
   };
-  xe(u);
+  xe(d);
   let p;
-  return r && c ? p = Ee(c) : l && a ? p = Ee(a.port) : p = new Wt(), await p.init(e, u), p;
+  return r && c ? p = Ee(c) : l && a ? p = Ee(a.port) : p = new Wt(), await p.init(e, d), p;
 }
 const Gt = (e, n) => n.map((t) => {
   const s = e.rxdb.schemaManager.getEntityMetadata(t.entity, t.namespace);
@@ -1043,28 +1062,28 @@ const Gt = (e, n) => n.map((t) => {
     e.rxdb.dispatchEvent(new ce(s));
   }
 }, Xt = (e, n) => {
-  const { tableName: t } = n, [s, r] = ot(t), o = e.rxdb.schemaManager.getEntityTypeByTableName(r, s);
+  const { tableName: t } = n, [s, r] = at(t), o = e.rxdb.schemaManager.getEntityTypeByTableName(r, s);
   if (!o) return;
-  const i = e.getRepository(o), c = T(o), a = T(B);
+  const i = e.getRepository(o), c = w(o), a = w(B);
   i.findByRowIds(n.rowIds).then((l) => {
     try {
-      let u = l;
+      let d = l;
       if (c === a) {
-        if (u = Gt(e, l), n.type === D.SQLITE_INSERT) {
-          Jt(e, u);
-          const p = u.map((d) => ({
+        if (d = Gt(e, l), n.type === D.SQLITE_INSERT) {
+          Jt(e, d);
+          const p = d.map((u) => ({
             namespace: c.namespace,
             entity: c.name,
-            type: d.type,
-            id: d.id,
-            patch: { ...d },
+            type: u.type,
+            id: u.id,
+            patch: { ...u },
             inversePatch: null,
-            recordAt: d.createdAt
+            recordAt: u.createdAt
           }));
           e.rxdb.dispatchEvent(new K(p));
         }
       } else {
-        const p = jt(n.type), d = u.map((f) => {
+        const p = jt(n.type), u = d.map((f) => {
           const h = {
             namespace: c.namespace,
             entity: c.name,
@@ -1096,48 +1115,48 @@ const Gt = (e, n) => n.map((t) => {
         switch (p) {
           case "UPDATE":
             e.rxdb.dispatchEvent(
-              new Y(d)
+              new Y(u)
             );
             break;
           case "DELETE":
             e.rxdb.dispatchEvent(
-              new ce(d)
+              new ce(u)
             );
             break;
           case "INSERT":
             e.rxdb.dispatchEvent(
-              new K(d)
+              new K(u)
             );
             break;
         }
       }
-    } catch (u) {
-      console.error(`[rxdb-adapter-sqlite] Error processing ${t} change event:`, u);
+    } catch (d) {
+      console.error(`[rxdb-adapter-sqlite] Error processing ${t} change event:`, d);
     }
   }).catch((l) => {
     console.error(`[rxdb-adapter-sqlite] Failed to query ${t} change (rowIds: ${n.rowIds}):`, l);
   });
 }, z = (e, n, t) => {
-  const { isCount: s, isFindDescendants: r, entityId: o, where: i } = t, c = !o, a = A(n), u = n.relationMap.get("parent").columnName;
+  const { isCount: s, isFindDescendants: r, entityId: o, where: i } = t, c = !o, a = S(n), d = n.relationMap.get("parent").columnName;
   let p = "";
   const f = [`c.__level < ${t.level || 0}`, i && U(i, /* @__PURE__ */ new Map(), n, e)].filter(Boolean).join(" AND ");
   f && (p = `WHERE ${f}`);
   let h = "__children.*";
-  s ? c ? h = "count(*)" : h = "count(*)-1" : t.hasChildren && (h += `, EXISTS(SELECT 1 FROM "${a}" __sub WHERE __sub."${u}" = __children.id) AS hasChildren`);
-  const _ = [];
+  s ? c ? h = "count(*)" : h = "count(*)-1" : t.hasChildren && (h += `, EXISTS(SELECT 1 FROM "${a}" __sub WHERE __sub."${d}" = __children.id) AS hasChildren`);
+  const y = [];
   let m;
-  return c ? m = `"${u}" is null` : (m = "id = ?", _.push(o)), { sql: `WITH RECURSIVE __children AS (
-  SELECT *,rowid as ${q}, 0 AS __level
+  return c ? m = `"${d}" is null` : (m = "id = ?", y.push(o)), { sql: `WITH RECURSIVE __children AS (
+  SELECT *,rowid as ${x}, 0 AS __level
   FROM "${a}"
   WHERE ${m}
   UNION ALL
-  SELECT children.*,children.rowid as ${q}, c.__level + 1 AS __level
+  SELECT children.*,children.rowid as ${x}, c.__level + 1 AS __level
   FROM "${a}" children
-  JOIN __children c ON ${r ? `children."${u}" = c.id` : `children.id = c."${u}"`}
+  JOIN __children c ON ${r ? `children."${d}" = c.id` : `children.id = c."${d}"`}
   ${p}
 )
 
-SELECT ${h} FROM __children ORDER BY __level, id;`, params: _ };
+SELECT ${h} FROM __children ORDER BY __level, id;`, params: y };
 }, Yt = (e, n, t) => z(e, n, {
   ...t,
   isFindDescendants: !0,
@@ -1147,7 +1166,7 @@ SELECT ${h} FROM __children ORDER BY __level, id;`, params: _ };
   isFindDescendants: !1,
   hasChildren: n.features?.tree?.hasChildren
 }), en = (e, n, t) => z(e, n, { ...t, isFindDescendants: !1, isCount: !0 });
-class tn extends je {
+class tn extends qe {
   async findDescendants(n) {
     const { sql: t, params: s } = Yt(this.adapter, this.metadata, n), r = await this.adapter.query(t, s);
     return this.addQueryCache(r, !0);
@@ -1166,76 +1185,76 @@ class tn extends je {
   }
 }
 const nn = (e, n) => {
-  const t = A(e), s = n.map((r) => I(r.id)).join(",");
+  const t = S(e), s = n.map((r) => T(r.id)).join(",");
   return `DELETE FROM "${t}" WHERE id in (${s});`;
-}, De = (e, n, t) => {
-  const s = A(e), r = t?.userId && e.propertyMap.has("createdBy"), o = t?.userId && e.propertyMap.has("updatedBy"), i = e.propertyMap.has("createdAt"), c = e.propertyMap.has("updatedAt"), a = /* @__PURE__ */ new Date(), l = [
+}, ve = (e, n, t) => {
+  const s = S(e), r = t?.userId && e.propertyMap.has("createdBy"), o = t?.userId && e.propertyMap.has("updatedBy"), i = e.propertyMap.has("createdAt"), c = e.propertyMap.has("updatedAt"), a = /* @__PURE__ */ new Date(), l = [
     ...Array.from(e.propertyMap.values()).map((f) => f.columnName),
     ...e.foreignKeyColumnNames || e.foreignKeyNames
-  ], u = [], p = [];
+  ], d = [], p = [];
   return n.forEach((f) => {
-    const h = be(e, f);
+    const h = Ie(e, f);
     r && (h.createdBy = t.userId), o && (h.updatedBy = t.userId), i && h.createdAt === void 0 && (h.createdAt = a), c && h.updatedAt === void 0 && (h.updatedAt = a);
-    const _ = le(e, h), m = [];
-    l.forEach((y) => {
-      m.push("?"), u.push(_[y] ?? null);
+    const y = le(e, h), m = [];
+    l.forEach((_) => {
+      m.push("?"), d.push(y[_] ?? null);
     }), p.push(`(${m.join(",")})`);
-  }), { sql: `INSERT INTO "${s}" (${l.join(",")}) VALUES ${p.join(",")};`, params: u };
-}, $e = async (e, n) => {
+  }), { sql: `INSERT INTO "${s}" (${l.join(",")}) VALUES ${p.join(",")};`, params: d };
+}, Te = async (e, n) => {
   const t = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Date();
   let r = "";
   const o = /* @__PURE__ */ new Set();
   return n.create.forEach((i, c) => {
     const a = Array.from(i);
     a.forEach((m) => o.add(m));
-    const l = T(c), u = De(l, a, e.rxdb.context), p = k(u.sql, u.params), d = a.map((m) => m.id);
-    d.forEach((m) => t.set(m, c));
+    const l = w(c), d = ve(l, a, e.rxdb.context), p = k(d.sql, d.params), u = a.map((m) => m.id);
+    u.forEach((m) => t.set(m, c));
     const { sql: f, params: h } = ie(e, l, {
       where: {
         combinator: "and",
-        rules: [{ field: "id", operator: "in", value: d }]
+        rules: [{ field: "id", operator: "in", value: u }]
       }
-    }), _ = k(f, h);
-    r += p + _;
+    }), y = k(f, h);
+    r += p + y;
   }), n.update.forEach((i, c) => {
     const a = Array.from(i);
     a.forEach((f) => o.add(f));
-    const l = T(c);
+    const l = w(c);
     a.forEach((f) => {
-      const h = F(f), _ = de(l, f, h.patch, {
+      const h = F(f), y = de(l, f, h.patch, {
         ...e.rxdb.context,
         returning: !1,
         updatedAt: s
       });
       t.set(f.id, c);
-      const m = k(_.sql, _.params);
+      const m = k(y.sql, y.params);
       r += m;
     });
-    const u = a.map((f) => f.id);
-    u.forEach((f) => t.set(f, c));
+    const d = a.map((f) => f.id);
+    d.forEach((f) => t.set(f, c));
     const p = ie(e, l, {
       where: {
         combinator: "and",
-        rules: [{ field: "id", operator: "in", value: u }]
+        rules: [{ field: "id", operator: "in", value: d }]
       }
-    }), d = k(p.sql, p.params);
-    r += d;
-  }), n.remove.forEach((i, c) => {
-    const a = Array.from(i), l = T(c), u = nn(l, a);
+    }), u = k(p.sql, p.params);
     r += u;
+  }), n.remove.forEach((i, c) => {
+    const a = Array.from(i), l = w(c), d = nn(l, a);
+    r += d;
   }), r && (await e.query(r)).results.forEach(({ columns: c, rows: a }) => {
-    const l = c.findIndex((d) => d === "id"), u = c.findIndex((d) => d === q), p = e.rxdb.entityManager;
-    a.forEach((d) => {
-      const f = d[l], h = t.get(f), _ = T(h);
+    const l = c.findIndex((u) => u === "id"), d = c.findIndex((u) => u === x), p = e.rxdb.entityManager;
+    a.forEach((u) => {
+      const f = u[l], h = t.get(f), y = w(h);
       if (p.hasEntityRef(h, f)) {
-        const m = p.getEntityRef(h, f), y = oe(_, c, d);
-        e.getRepository(h).updateEntity(m, y);
-        const N = F(m);
-        if (N.local = !0, u !== -1) {
-          const $ = BigInt(d[u]);
+        const m = p.getEntityRef(h, f), _ = oe(y, c, u);
+        e.getRepository(h).updateEntity(m, _);
+        const g = F(m);
+        if (g.local = !0, d !== -1) {
+          const $ = BigInt(u[d]);
           e.cacheRowIdEntity($, m);
         }
-        N.modified = !1;
+        g.modified = !1;
       }
     });
   }), n.remove.forEach(
@@ -1246,17 +1265,17 @@ const nn = (e, n) => {
     })
   ), Array.from(o);
 }, sn = (e, n) => {
-  const t = A(n);
+  const t = S(n);
   let s = `CREATE TABLE "${t}" (`;
   const r = [], o = [], i = [];
   n.propertyMap.forEach((a) => {
     const l = a.columnName;
-    let u = `"${l}" ${rt(a)}`;
-    if (a.type === E.integer && a.primary ? u += " PRIMARY KEY AUTOINCREMENT" : (a.type === E.uuid || a.type === E.string) && a.primary && (u += " PRIMARY KEY", a.type === E.uuid && (u += " DEFAULT (lower(hex(randomblob(16))))")), !(a.type === E.uuid && a.primary) && a.default !== void 0) {
-      let d = a.default;
-      me(a.default) && (d = a.default()), d === "CURRENT_TIMESTAMP" ? u += " DEFAULT(strftime('%FT%H:%M:%fZ'))" : (d = V(d, a), a.type === E.boolean || a.type === E.integer || a.type === E.number ? u += ` DEFAULT ${d}` : u += ` DEFAULT '${d}'`);
+    let d = `"${l}" ${ot(a)}`;
+    if (a.type === E.integer && a.primary ? d += " PRIMARY KEY AUTOINCREMENT" : (a.type === E.uuid || a.type === E.string) && a.primary && (d += " PRIMARY KEY", a.type === E.uuid && (d += " DEFAULT (lower(hex(randomblob(16))))")), !(a.type === E.uuid && a.primary) && a.default !== void 0) {
+      let u = a.default;
+      me(a.default) && (u = a.default()), u === "CURRENT_TIMESTAMP" ? d += " DEFAULT(strftime('%FT%H:%M:%fZ'))" : (u = V(u, a), a.type === E.boolean || a.type === E.integer || a.type === E.number ? d += ` DEFAULT ${u}` : d += ` DEFAULT '${u}'`);
     }
-    switch (a.nullable || (u += " NOT NULL"), a.type) {
+    switch (a.nullable || (d += " NOT NULL"), a.type) {
       case E.json:
       case E.keyValue:
       case E.stringArray:
@@ -1268,42 +1287,42 @@ const nn = (e, n) => {
         break;
       case E.enum:
         if ("enum" in a && a.enum && a.enum.length > 0) {
-          const d = a.enum.map((f) => `'${String(f).replace(/'/g, "''")}'`).join(",");
-          o.push(`CHECK (${l} in(${d}))`);
+          const u = a.enum.map((f) => `'${String(f).replace(/'/g, "''")}'`).join(",");
+          a.nullable ? o.push(`CHECK (${l} IN(${u},null))`) : o.push(`CHECK (${l} in(${u}))`);
         }
         break;
     }
     a.unique && r.push(
-      `CREATE UNIQUE INDEX ${ye(n, a)} on "${t}"(${l});`
-    ), i.push(u);
+      `CREATE UNIQUE INDEX ${_e(n, a)} on "${t}"(${l});`
+    ), i.push(d);
   }), n.relationMap.forEach((a) => {
-    if (a.kind === b.ONE_TO_ONE || a.kind === b.MANY_TO_ONE) {
-      const l = a.columnName, u = e.rxdb.schemaManager.getEntityMetadata(
+    if (a.kind === I.ONE_TO_ONE || a.kind === I.MANY_TO_ONE) {
+      const l = a.columnName, d = e.rxdb.schemaManager.getEntityMetadata(
         a.mappedEntity,
         a.mappedNamespace
       );
       let p = "TEXT";
-      const d = u.propertyMap.get("id");
-      d.type === E.integer ? p = "INTEGER" : (d.type === E.uuid || d.type === E.string) && (p = "TEXT");
+      const u = d.propertyMap.get("id");
+      u.type === E.integer ? p = "INTEGER" : (u.type === E.uuid || u.type === E.string) && (p = "TEXT");
       const f = a.onDelete === "SET NULL" || a.onUpdate === "SET NULL";
       let h = `"${l}" ${p}`;
-      if (!a.nullable && !f && (h += " NOT NULL"), a.kind === b.MANY_TO_ONE && a.default !== void 0) {
-        const _ = a;
-        let m = _.default;
-        me(_.default) && (m = _.default()), h += ` DEFAULT ${m}`;
+      if (!a.nullable && !f && (h += " NOT NULL"), a.kind === I.MANY_TO_ONE && a.default !== void 0) {
+        const y = a;
+        let m = y.default;
+        me(y.default) && (m = y.default()), h += ` DEFAULT ${m}`;
       }
       if (a.mappedEntity) {
-        const _ = e.rxdb.schemaManager.getEntityMetadata(
+        const y = e.rxdb.schemaManager.getEntityMetadata(
           a.mappedEntity,
           a.mappedNamespace
         ), m = P(
-          _?.tableName ?? a.mappedEntity,
+          y?.tableName ?? a.mappedEntity,
           a.mappedNamespace
         );
         h += ` REFERENCES ${m}(id)`, a.onDelete && (h += ` ON DELETE ${a.onDelete}`), a.onUpdate && (h += ` ON UPDATE ${a.onUpdate}`);
       }
-      i.push(h), (a.unique || a.kind === b.ONE_TO_ONE) && r.push(
-        `CREATE UNIQUE INDEX ${ye(n, a)} on "${t}"(${l});`
+      i.push(h), (a.unique || a.kind === I.ONE_TO_ONE) && r.push(
+        `CREATE UNIQUE INDEX ${_e(n, a)} on "${t}"(${l});`
       );
     }
   });
@@ -1317,50 +1336,50 @@ ${a}`).join(","), s += `
   return r.length && (s += `
 ` + r.join(`
 `)), n.indexes && n.indexes.length > 0 && n.indexes.forEach((a) => {
-    const l = `idx_${n.name}_${a.name}`, u = a.properties?.map((d) => {
-      const f = n.propertyMap.get(d);
+    const l = `idx_${n.name}_${a.name}`, d = a.properties?.map((u) => {
+      const f = n.propertyMap.get(u);
       if (f) return `"${f.columnName}"`;
-      const h = n.foreignKeyNames, _ = n.foreignKeyColumnNames;
-      if (h && _) {
-        const m = h.indexOf(d);
-        if (m >= 0) return `"${_[m]}"`;
+      const h = n.foreignKeyNames, y = n.foreignKeyColumnNames;
+      if (h && y) {
+        const m = h.indexOf(u);
+        if (m >= 0) return `"${y[m]}"`;
       }
-      return `"${d}"`;
+      return `"${u}"`;
     }).join(", ") || `"${a.name}"`, p = a.unique ? "UNIQUE " : "";
     s += `
-CREATE ${p}INDEX "${l}" ON "${t}"(${u});`;
+CREATE ${p}INDEX "${l}" ON "${t}"(${d});`;
   }), s;
 }, rn = (e, n) => sn(e, n), pe = (e, n = {}) => {
-  const t = A(e), s = T(B), r = A(s), { propertyMap: o, name: i, foreignKeyNames: c, foreignKeyColumnNames: a, namespace: l } = e, u = [];
-  for (const [g, C] of o)
-    g !== "id" && u.push({ jsName: g, dbColumn: C.columnName });
+  const t = S(e), s = w(B), r = S(s), { propertyMap: o, name: i, foreignKeyNames: c, foreignKeyColumnNames: a, namespace: l } = e, d = [];
+  for (const [N, M] of o)
+    N !== "id" && d.push({ jsName: N, dbColumn: M.columnName });
   const p = a || c;
-  for (let g = 0; g < c.length; g++)
-    c[g] !== "id" && u.push({ jsName: c[g], dbColumn: p[g] });
-  const d = " type, namespace, entity, branchId, transactionId, entityId, inversePatch, patch", { transactionId: f, branchId: h } = n, _ = I(f), m = I(h || "main"), y = `'${l}','${i}',${m},${_}`, N = (g) => g === E.stringArray || g === E.numberArray || g === E.json || g === E.keyValue, $ = (g, C, x) => {
-    const Z = o.get(C);
-    return Z?.type === E.boolean ? `CASE WHEN ${x}.${g} = 1 THEN 1 ELSE 0 END` : N(Z?.type) ? `CASE WHEN ${x}.${g} IS NOT NULL THEN json(${x}.${g}) ELSE NULL END` : `${x}.${g}`;
-  }, S = (g, C, x) => o.get(C)?.type === E.boolean ? `CASE WHEN ${x}.${g} = 1 THEN 1 ELSE 0 END` : `${x}.${g}`, L = `
+  for (let N = 0; N < c.length; N++)
+    c[N] !== "id" && d.push({ jsName: c[N], dbColumn: p[N] });
+  const u = " type, namespace, entity, branchId, transactionId, entityId, inversePatch, patch", { transactionId: f, branchId: h } = n, y = T(f), m = T(h || "main"), _ = `'${l}','${i}',${m},${y}`, g = (N) => N === E.stringArray || N === E.numberArray || N === E.json || N === E.keyValue, $ = (N, M, q) => {
+    const Z = o.get(M);
+    return Z?.type === E.boolean ? `CASE WHEN ${q}.${N} = 1 THEN 1 ELSE 0 END` : g(Z?.type) ? `CASE WHEN ${q}.${N} IS NOT NULL THEN json(${q}.${N}) ELSE NULL END` : `${q}.${N}`;
+  }, b = (N, M, q) => o.get(M)?.type === E.boolean ? `CASE WHEN ${q}.${N} = 1 THEN 1 ELSE 0 END` : `${q}.${N}`, L = `
   DROP TRIGGER IF EXISTS ${t}_insert;
   CREATE TRIGGER ${t}_insert AFTER INSERT ON "${t}"
   BEGIN
-    INSERT INTO ${r} (${d}) VALUES (
-    'INSERT',${y}, NEW.id, NULL,
-      json_object(${u.map((g) => `'${g.jsName}', ${$(g.dbColumn, g.jsName, "NEW")}`).join(`,
+    INSERT INTO ${r} (${u}) VALUES (
+    'INSERT',${_}, NEW.id, NULL,
+      json_object(${d.map((N) => `'${N.jsName}', ${$(N.dbColumn, N.jsName, "NEW")}`).join(`,
 `)})
     );
-  END;`, O = (g) => u.map((C) => {
-    const x = N(o.get(C.jsName)?.type) ? 1 : 0;
-    return `SELECT '${C.jsName}' AS key, ${S(C.dbColumn, C.jsName, g)} AS value, ${x} AS is_json WHERE OLD.${C.dbColumn} IS NOT NEW.${C.dbColumn}`;
+  END;`, O = (N) => d.map((M) => {
+    const q = g(o.get(M.jsName)?.type) ? 1 : 0;
+    return `SELECT '${M.jsName}' AS key, ${b(M.dbColumn, M.jsName, N)} AS value, ${q} AS is_json WHERE OLD.${M.dbColumn} IS NOT NEW.${M.dbColumn}`;
   }).join(`
- UNION `), M = `
+ UNION `), C = `
   DROP TRIGGER IF EXISTS ${t}_update;
   CREATE TRIGGER ${t}_update AFTER UPDATE ON "${t}"
-    WHEN ( ${u.map((g) => `OLD.${g.dbColumn} IS NOT NEW.${g.dbColumn}`).join(` OR
+    WHEN ( ${d.map((N) => `OLD.${N.dbColumn} IS NOT NEW.${N.dbColumn}`).join(` OR
 `)} )
   BEGIN
-    INSERT INTO ${r} (${d}) VALUES (
-     'UPDATE',${y}, NEW.id,
+    INSERT INTO ${r} (${u}) VALUES (
+     'UPDATE',${_}, NEW.id,
       (
         SELECT json_group_object(key, CASE WHEN is_json AND value IS NOT NULL THEN json(value) ELSE value END) FROM (
           ${O("OLD")}
@@ -1376,19 +1395,19 @@ CREATE ${p}INDEX "${l}" ON "${t}"(${u});`;
   DROP TRIGGER IF EXISTS ${t}_delete;
   CREATE TRIGGER ${t}_delete AFTER DELETE ON "${t}"
   BEGIN
-    INSERT INTO ${r} (${d}) VALUES (
-      'DELETE',${y}, OLD.id,
-      json_object(${u.map((g) => `'${g.jsName}', ${$(g.dbColumn, g.jsName, "OLD")}`).join(`,
+    INSERT INTO ${r} (${u}) VALUES (
+      'DELETE',${_}, OLD.id,
+      json_object(${d.map((N) => `'${N.jsName}', ${$(N.dbColumn, N.jsName, "OLD")}`).join(`,
 `)}), NULL
     );
   END;`;
   return L + `
-` + M + `
+` + C + `
 ` + j;
 }, on = (e, n, t) => {
   let s = "";
   for (let r = 0; r < n.length; r++) {
-    const o = n[r], i = T(o);
+    const o = n[r], i = w(o);
     if (s += `
 ` + rn(e, i), i.log !== !1) {
       const c = pe(i);
@@ -1399,11 +1418,11 @@ CREATE ${p}INDEX "${l}" ON "${t}"(${u});`;
   if (t) {
     const r = /* @__PURE__ */ new Map();
     t.forEach((o) => {
-      const i = T(o);
+      const i = w(o);
       r.has(i) === !1 && r.set(i, /* @__PURE__ */ new Set()), r.get(i).add(o);
     });
     for (const o of r.keys()) {
-      const i = De(
+      const i = ve(
         o,
         Array.from(r.get(o)),
         e.rxdb.context
@@ -1414,106 +1433,108 @@ CREATE ${p}INDEX "${l}" ON "${t}"(${u});`;
   }
   return s;
 }, an = (e) => {
-  const n = A(e);
+  const n = S(e);
   return `DROP TRIGGER IF EXISTS ${n}_insert;
 DROP TRIGGER IF EXISTS ${n}_update;
 DROP TRIGGER IF EXISTS ${n}_delete;`;
-}, ve = (e) => {
+}, Pe = (e) => {
   let n = "";
   return e.rxdb.config.entities.forEach((t) => {
-    const s = T(t);
+    const s = w(t);
     s.log !== !1 && (n += an(s));
   }), n;
-}, Pe = (e, n) => {
+}, ke = (e, n) => {
   const { deletes: t, inserts: s, updates: r } = n, o = { deletes: [], inserts: [], updates: [] }, i = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map();
-  for (const [d, f] of t.entries()) {
-    const [h, _, m] = ee(d), y = `${h}:${_}`, N = i.get(y);
-    N ? N.add(m) : i.set(y, /* @__PURE__ */ new Set([m]));
-    let $ = c.get(y);
-    $ || ($ = /* @__PURE__ */ new Map(), c.set(y, $)), $.set(m, {
+  for (const [u, f] of t.entries()) {
+    const [h, y, m] = ee(u), _ = `${h}:${y}`, g = i.get(_);
+    g ? g.add(m) : i.set(_, /* @__PURE__ */ new Set([m]));
+    let $ = c.get(_);
+    $ || ($ = /* @__PURE__ */ new Map(), c.set(_, $)), $.set(m, {
       patch: f.patch,
       inversePatch: f.inversePatch
     });
   }
-  for (const [d, f] of i) {
-    const [h, _] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(_, h), y = A(m), N = m.propertyMap.get("id").type === "integer";
+  for (const [u, f] of i) {
+    const [h, y] = u.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(y, h), _ = S(m), g = m.propertyMap.get("id").type === "integer";
     let $ = "";
-    N ? $ = Array.from(f).join(",") : $ = Array.from(f).map((L) => I(L)).join(",");
-    const S = `DELETE FROM "${y}" WHERE id in (${$});`;
+    g ? $ = Array.from(f).join(",") : $ = Array.from(f).map((L) => T(L)).join(",");
+    const b = `DELETE FROM "${_}" WHERE id in (${$});`;
     o.deletes.push({
       metadata: m,
       ids: f,
-      sql: S,
-      changes: c.get(d)
+      sql: b,
+      changes: c.get(u)
     });
   }
   const a = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
-  for (const [d, f] of s.entries()) {
-    const [h, _, m] = ee(d), y = `${h}:${_}`, N = a.get(y), $ = { ...f.patch, id: m };
-    N ? N.push($) : a.set(y, [$]);
-    let S = l.get(y);
-    S || (S = /* @__PURE__ */ new Map(), l.set(y, S)), S.set(m, {
+  for (const [u, f] of s.entries()) {
+    const [h, y, m] = ee(u), _ = `${h}:${y}`, g = a.get(_), $ = { ...f.patch, id: m };
+    g ? g.push($) : a.set(_, [$]);
+    let b = l.get(_);
+    b || (b = /* @__PURE__ */ new Map(), l.set(_, b)), b.set(m, {
       patch: f.patch,
       inversePatch: f.inversePatch
     });
   }
-  for (const [d, f] of a) {
-    const [h, _] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(_, h);
-    let y = "";
-    f.forEach((N) => {
-      for (const [O, M] of m.propertyMap)
-        N[O] === void 0 && M.default !== void 0 && (typeof M.default == "function" ? N[O] = M.default() : N[O] = M.default);
-      const { sql: $, params: S } = Le(m, N, {
+  for (const [u, f] of a) {
+    const [h, y] = u.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(y, h);
+    let _ = "";
+    f.forEach((g) => {
+      for (const [O, C] of m.propertyMap)
+        g[O] === void 0 && C.default !== void 0 && (typeof C.default == "function" ? g[O] = C.default() : g[O] = C.default);
+      const { sql: $, params: b } = je(m, g, {
         useReplace: !0
-      }), L = k($, S);
-      y += L;
+      }), L = k($, b);
+      _ += L;
     }), o.inserts.push({
       metadata: m,
-      ids: new Set(f.filter((N) => N != null).map((N) => N.id)),
-      sql: y,
-      changes: l.get(d)
+      ids: new Set(f.filter((g) => g != null).map((g) => g.id)),
+      sql: _,
+      changes: l.get(u)
     });
   }
-  const u = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map();
-  for (const [d, f] of r.entries()) {
-    const [h, _, m] = ee(d), y = `${h}:${_}`, N = u.get(y), $ = { ...f.patch, id: m };
-    N ? N.push($) : u.set(y, [$]);
-    let S = p.get(y);
-    S || (S = /* @__PURE__ */ new Map(), p.set(y, S));
-    const L = e.rxdb.schemaManager.getEntityMetadata(_, h), O = f.patch ? { ...f.patch } : null, M = f.inversePatch ? { ...f.inversePatch } : null;
+  const d = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map();
+  for (const [u, f] of r.entries()) {
+    const [h, y, m] = ee(u), _ = `${h}:${y}`, g = d.get(_), $ = { ...f.patch, id: m };
+    g ? g.push($) : d.set(_, [$]);
+    let b = p.get(_);
+    b || (b = /* @__PURE__ */ new Map(), p.set(_, b));
+    const L = e.rxdb.schemaManager.getEntityMetadata(y, h), O = f.patch ? { ...f.patch } : null, C = f.inversePatch ? { ...f.inversePatch } : null;
     L && (O && Object.keys(O).forEach((j) => {
-      const g = L.propertyMap.get(j);
-      g && (O[j] = v(O[j], g));
-    }), M && Object.keys(M).forEach((j) => {
-      const g = L.propertyMap.get(j);
-      g && (M[j] = v(M[j], g));
-    })), S.set(m, {
+      const N = L.propertyMap.get(j);
+      N && (O[j] = v(O[j], N));
+    }), C && Object.keys(C).forEach((j) => {
+      const N = L.propertyMap.get(j);
+      N && (C[j] = v(C[j], N));
+    })), b.set(m, {
       patch: O,
-      inversePatch: M
+      inversePatch: C
     });
   }
-  for (const [d, f] of u) {
-    const [h, _] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(_, h);
-    let y = "";
-    f.forEach((N) => {
+  for (const [u, f] of d) {
+    const [h, y] = u.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(y, h);
+    if (!m)
+      throw new Error(`找不到 namespace=${h} entityName=${y} 对应的实体元数据`);
+    let _ = "";
+    f.forEach((g) => {
       let $;
-      m.propertyMap.has("updatedAt") && ($ = N.updatedAt);
-      const { id: S, ...L } = N, { sql: O, params: M } = de(m, { id: S }, L, {
+      m.propertyMap.has("updatedAt") && ($ = g.updatedAt);
+      const { id: b, ...L } = g, { sql: O, params: C } = de(m, { id: b }, L, {
         updatedAt: $
       });
-      y += k(O, M);
+      _ += k(O, C);
     }), o.updates.push({
       metadata: m,
-      ids: new Set(f.filter((N) => N != null).map((N) => N.id)),
-      sql: y,
-      changes: p.get(d)
+      ids: new Set(f.filter((g) => g != null).map((g) => g.id)),
+      sql: _,
+      changes: p.get(u)
     });
   }
   return o;
-}, ke = (e, n) => {
+}, Fe = (e, n) => {
   let t = "";
   e.rxdb.config.entities.forEach((i) => {
-    const c = T(i);
+    const c = w(i);
     if (c.log !== !1)
       try {
         const a = pe(c, {
@@ -1524,7 +1545,7 @@ DROP TRIGGER IF EXISTS ${n}_delete;`;
         console.warn(`Failed to generate trigger SQL for entity ${c.name}:`, a);
       }
   });
-  const s = T(H), r = A(s), o = n.replace(/'/g, "''");
+  const s = w(H), r = S(s), o = n.replace(/'/g, "''");
   return t += `
     UPDATE "${r}"
     SET
@@ -1537,76 +1558,81 @@ DROP TRIGGER IF EXISTS ${n}_delete;`;
         ELSE updatedAt
       END
     WHERE id = '${o}' OR activated = 1
-    RETURNING rowid as ${q},*;
+    RETURNING rowid as ${x},*;
     `, t;
 }, cn = async (e, n) => {
-  const { branchId: t, actions: s } = n, r = s && Pe(e, s);
+  const { branchId: t, actions: s } = n, r = s && ke(e, s);
   let o;
   try {
     await e.transaction(async (a) => {
-      const l = ve(e);
+      const l = Pe(e);
       if (l && await a.execute(l), r) {
         if (r.deletes.length)
-          for (const u of r.deletes)
-            await a.execute(u.sql);
+          for (const d of r.deletes)
+            await a.execute(d.sql);
         if (r.inserts.length)
-          for (const u of r.inserts)
-            u.successResults = await a.execute(u.sql);
+          for (const d of r.inserts)
+            d.successResults = await a.execute(d.sql);
         if (r.updates.length)
-          for (const u of r.updates)
-            u.successResults = await a.execute(u.sql);
+          for (const d of r.updates)
+            d.successResults = await a.execute(d.sql);
       }
       s?.updateRxDBChangeSequence !== void 0 && await e.setRxDBChangeSequence(s.updateRxDBChangeSequence);
     }, !1);
-    const i = ke(e, t);
+    const i = Fe(e, t);
     o = await e.internalQuery(i);
     const c = (a, l) => {
       if (l.length === 0) return;
-      const u = l.map((p) => {
-        const d = { ...p };
+      const d = l.map((p) => {
+        const u = { ...p };
         return {
           namespace: a.namespace,
           entity: a.name,
           type: "UPDATE",
           id: p.id,
-          patch: d,
-          inversePatch: d,
+          patch: u,
+          inversePatch: u,
           recordAt: p.createdAt
         };
       });
-      e.rxdb.dispatchEvent(new Y(u));
+      e.rxdb.dispatchEvent(new Y(d));
     };
     if (o) {
-      const a = X(e, H, o, !0), l = T(H);
+      const a = X(e, H, o, !0), l = w(H);
       c(l, a);
     }
-    r && Fe(e, r);
+    r && Be(e, r);
   } catch (i) {
     throw new R(`switch branch ${t} failed`, { cause: i });
   }
 };
-async function ln(e, n, t = !1) {
-  if (await e.transaction(async (s) => {
+async function ln(e, n, t = !1, s) {
+  if (await e.transaction(async (r) => {
     if (t) {
-      const r = ve(e);
-      r && await s.execute(r);
+      const o = Pe(e);
+      o && await r.execute(o);
+    }
+    for (const o of n.deletes)
+      await r.execute(o.sql);
+    for (const o of n.inserts)
+      o.successResults = await r.execute(o.sql);
+    for (const o of n.updates)
+      o.successResults = await r.execute(o.sql);
+    if (t && s?.length) {
+      console.log("localChanges", s);
+      const o = un(s);
+      o && await r.execute(o);
     }
-    for (const r of n.deletes)
-      await s.execute(r.sql);
-    for (const r of n.inserts)
-      r.successResults = await s.execute(r.sql);
-    for (const r of n.updates)
-      r.successResults = await s.execute(r.sql);
   }, !1), t) {
-    const s = await e.rxdb.versionManager.getCurrentBranch(), r = ke(e, s.id);
-    await e.internalQuery(r);
+    const r = await e.rxdb.versionManager.getCurrentBranch(), o = Fe(e, r.id);
+    await e.internalQuery(o);
   }
-  Fe(e, n);
+  Be(e, n);
 }
-function Fe(e, n) {
+function Be(e, n) {
   for (const t of n.deletes) {
     const s = te(t.metadata);
-    Ct(e, s, Array.from(t.ids));
+    Mt(e, s, Array.from(t.ids));
     const r = t.metadata, o = Array.from(t.ids).map((i) => {
       const c = t.changes.get(String(i));
       return {
@@ -1652,10 +1678,19 @@ function Fe(e, n) {
     e.rxdb.dispatchEvent(new Y(i));
   }
 }
-const Te = (e, n, t) => {
+function un(e) {
+  if (!e.length) return "";
+  const n = w(B), t = S(n), s = "type, namespace, entity, branchId, transactionId, entityId, remoteId, inversePatch, patch", r = e.map((o) => {
+    const i = T(o.type), c = T(o.namespace), a = T(o.entity), l = T(o.branchId), d = T(o.transactionId ?? null), p = T(o.entityId), u = o.remoteId != null ? o.remoteId : "NULL", f = o.inversePatch != null ? T(JSON.stringify(o.inversePatch)) : "NULL", h = o.patch != null ? T(JSON.stringify(o.patch)) : "NULL";
+    return `(${i},${c},${a},${l},${d},${p},${u},${f},${h})`;
+  });
+  return `INSERT INTO "${t}" (${s}) VALUES ${r.join(`,
+`)};`;
+}
+const we = (e, n, t) => {
   let s = "";
   return e.rxdb.config.entities.forEach((r) => {
-    const o = T(r);
+    const o = w(r);
     if (o.log !== !1) {
       const i = pe(o, {
         branchId: n,
@@ -1666,17 +1701,17 @@ const Te = (e, n, t) => {
     }
   }), s;
 };
-class yn extends He {
+class Nn extends Ve {
   constructor(n, t) {
     super(n), this.options = t, t.repositories && Object.keys(t.repositories).forEach((r) => {
       this.repository(r, t.repositories[r]);
     });
-    const s = ze((r) => {
+    const s = Ze((r) => {
       this.#t || Xt(this, r);
     });
     this.#r().then((r) => {
       r.addEventListener(D.SQLITE_INSERT, s), r.addEventListener(D.SQLITE_UPDATE, s), r.addEventListener(D.SQLITE_DELETE, s);
-    }).catch((r) => console.error("[RxDBAdapterSqlite] Failed to register event listeners", r)), this.repository("Repository", je), this.repository("TreeRepository", tn);
+    }).catch((r) => console.error("[RxDBAdapterSqlite] Failed to register event listeners", r)), this.repository("Repository", qe), this.repository("TreeRepository", tn);
   }
   // SQLite 客户端缓存
   #n;
@@ -1690,7 +1725,7 @@ class yn extends He {
   #a = /* @__PURE__ */ new Map();
   #o = /* @__PURE__ */ new WeakMap();
   // 查询任务队列执行器
-  #c = new we(1);
+  #c = new Ae(1);
   // sqlite 客户端
   #s;
   // 是否已断开连接
@@ -1698,14 +1733,14 @@ class yn extends He {
   /**
    * 适配器名称
    */
-  name = xt;
+  name = qt;
   /**
    * 获取实体仓库
    * @param EntityType 实体类
    */
   getRepository(n) {
     if (!this.repository_cache.has(n)) {
-      const t = T(n), s = this.repository_map.get(t.repository);
+      const t = w(n), s = this.repository_map.get(t.repository);
       if (!s)
         throw new R(`Repository '${t.repository}' not found`);
       const r = new s(this, n);
@@ -1759,15 +1794,15 @@ class yn extends He {
    * @param options
    */
   async mutations(n) {
-    return this.#e ? await $e(this, n) : await this.transaction(() => $e(this, n));
+    return this.#e ? await Te(this, n) : await this.transaction(() => Te(this, n));
   }
   /**
    * 判断表是否存在
    * @param EntityType
    */
   async isTableExisted(n) {
-    const t = T(n), s = A(t), { sql: r, params: o } = nt(s), i = await this.#i(r, o);
-    return st(i) === !1;
+    const t = w(n), s = S(t), { sql: r, params: o } = st(s), i = await this.#i(r, o);
+    return rt(i) === !1;
   }
   /**
    * 创建表和初始化数据
@@ -1791,14 +1826,16 @@ class yn extends He {
    * 应用压缩后的变更到本地实体表
    *
    * 将 actions 转换为 SQL 操作实体表。
+   * 当 disableTriggers=true（pull 场景）且提供了 localChanges 时，
+   * 手动将变更记录插入 RxDBChange 表。
    *
    * @param actions - 压缩后的变更操作
-   * @param _localChanges - （已废弃）不再使用
+   * @param localChanges - 需要记录到 RxDBChange 表的变更（pull 场景）
    * @param disableTriggers - 是否禁用触发器（用于 pull 等操作，避免创建 RxDBChange）
    */
   async mergeChanges(n, t, s = !1) {
-    const r = Pe(this, n);
-    await ln(this, r, s);
+    const r = ke(this, n);
+    await ln(this, r, s, t);
   }
   /**
    * 缓存 RowId 与实体映射
@@ -1853,13 +1890,13 @@ class yn extends He {
   async transaction(n, t = !0) {
     await this.rxdb.connect(this.name);
     const s = await this.#r();
-    this.#e = !0, this.rxdb.dispatchEvent(un);
+    this.#e = !0, this.rxdb.dispatchEvent(dn);
     let r = "", o = "";
     if (t) {
-      const i = Ve(), c = await this.rxdb.versionManager.getCurrentBranch();
+      const i = Qe(), c = await this.rxdb.versionManager.getCurrentBranch();
       if (!c)
         throw new Error("currentBranch is undefined! Cannot start transaction with logging.");
-      r = Te(this, c.id, i), o = Te(this, c.id);
+      r = we(this, c.id, i), o = we(this, c.id);
     }
     await s.execute(`
           BEGIN;
@@ -1869,12 +1906,12 @@ class yn extends He {
     try {
       const i = await n(s);
       return await s.execute(`${o}
-COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(pn), i;
+COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(fn), i;
     } catch (i) {
       try {
         await s.execute("ROLLBACK");
       } finally {
-        this.#e = !1, this.rxdb.dispatchEvent(dn);
+        this.#e = !1, this.rxdb.dispatchEvent(pn);
       }
       const c = i?.message || "Transaction Error";
       throw new R(c, { cause: i });
@@ -1906,7 +1943,7 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(pn), i;
    * @returns
    */
   async getRxDBChangeSequence() {
-    const n = _e(B);
+    const n = ye(B);
     return (await this.#i("SELECT seq FROM sqlite_sequence WHERE name = ?", [n])).results[0]?.rows?.[0]?.[0] ?? 0;
   }
   /**
@@ -1914,7 +1951,7 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(pn), i;
    * @param sequence 序列值
    */
   async setRxDBChangeSequence(n) {
-    const t = _e(B);
+    const t = ye(B);
     await this.#i("UPDATE sqlite_sequence SET seq = ? WHERE name = ?", [n, t]);
   }
   // ============================================
@@ -1941,7 +1978,7 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(pn), i;
         return se(/* @__PURE__ */ new Map());
       const s = t.map(() => "?").join(", "), r = `SELECT id, updatedAt FROM "${n}" WHERE id IN (${s})`;
       return re(this.internalQuery(r, t)).pipe(
-        Ze((o) => {
+        et((o) => {
           const i = /* @__PURE__ */ new Map();
           if (o.results?.[0]?.rows)
             for (const c of o.results[0].rows)
@@ -2023,16 +2060,16 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(pn), i;
     return this.#a.has(n) === !1 && this.#a.set(n, /* @__PURE__ */ new Map()), this.#a.get(n);
   }
 }
-const un = new Ue(), dn = new We(), pn = new Ke();
+const dn = new We(), pn = new Ke(), fn = new He();
 export {
-  q as ROWID,
-  yn as RxDBAdapterSqlite,
+  x as ROWID,
+  Nn as RxDBAdapterSqlite,
   R as RxDBAdapterSqliteError,
   Wt as SqliteClient,
-  je as SqliteRepository,
+  qe as SqliteRepository,
   vt as WA_SQLITE_VFS_LIST,
   U as buildRuleGroup,
   P as sqliteGetTableName,
-  A as sqliteGetTableNameByMetadata,
+  S as sqliteGetTableNameByMetadata,
   Pt as sqliteLoad
 };