@aiao/rxdb-adapter-sqlite 0.0.12 → 0.0.14

package/dist/index.js

@@ -1,164 +1,168 @@
-import { getEntityMetadata as w, PropertyType as y, RelationKind as A, isRuleGroup as le, getEntityStatus as j, RepositoryBase as De, RxDBChange as k, EntityLocalCreatedEvent as B, EntityLocalRemovedEvent as re, EntityLocalUpdatedEvent as G, parseRxDBChangeKey as Y, RxDBBranch as W, getEntityType as X, TransactionBeginEvent as ke, TransactionRollbackEvent as Pe, TransactionCommitEvent as Fe, RxDBAdapterLocalBase as Be, getEntityMutations as ue, uuid as We } from "@aiao/rxdb";
-import { isString as Ue, isNil as Ke, traverseObjectKeys as Ve, EventDispatcher as He, AsyncQueueExecutor as ge, get as Qe, isFunction as de } from "@aiao/utils";
-import { wrap as fe, proxy as Ge } from "comlink";
-import Ne from "object-hash";
-import { defer as z, of as Z, from as ee, map as Je } from "rxjs";
-import { Factory as Ye, SQLITE_ROW as Xe, SQLITE_UTF8 as $e, SQLITE_DETERMINISTIC as Te } from "wa-sqlite";
-const ze = (e) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${e}' limit 1;`, Ze = (e) => !!e.sql && (e.results.length === 0 || e.results[0].rows.length === 0), L = "__rowid", et = (e) => {
+import { getEntityMetadata as T, PropertyType as E, RelationKind as b, isRuleGroup as fe, getEntityStatus as D, 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) => ({
+  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) => {
   switch (e.type) {
-    case y.uuid:
-    case y.string:
-    case y.json:
-    case y.keyValue:
-    case y.stringArray:
-    case y.numberArray:
+    case E.uuid:
+    case E.string:
+    case E.enum:
+    case E.json:
+    case E.keyValue:
+    case E.stringArray:
+    case E.numberArray:
       return "TEXT";
-    case y.number:
+    case E.number:
       return "REAL";
-    case y.integer:
-    case y.boolean:
+    case E.integer:
+    case E.boolean:
       return "INTEGER";
     default:
       return "TEXT";
   }
-}, U = (e, t) => {
-  if (e === null && t.nullable) return null;
+}, V = (e, n) => {
+  if (e === null && n.nullable) return null;
   if (e !== void 0)
-    switch (t.type) {
-      case y.boolean:
+    switch (n.type) {
+      case E.boolean:
         return e ? 1 : 0;
-      case y.date:
+      case E.date:
         return e instanceof Date ? e.toISOString() : e;
-      case y.keyValue: {
+      case E.keyValue: {
         if (!e) return null;
-        if (t.properties && typeof e == "object" && !Array.isArray(e)) {
-          const n = { ...e };
-          return t.properties.forEach((s) => {
-            s.name in n && (n[s.name] = U(n[s.name], s));
-          }), JSON.stringify(n);
+        if (n.properties && typeof e == "object" && !Array.isArray(e)) {
+          const t = { ...e };
+          return n.properties.forEach((s) => {
+            s.name in t && (t[s.name] = V(t[s.name], s));
+          }), JSON.stringify(t);
         }
         return JSON.stringify(e);
       }
-      case y.stringArray:
-      case y.numberArray:
-      case y.json:
+      case E.stringArray:
+      case E.numberArray:
+      case E.json:
         return JSON.stringify(e);
       default:
         return e;
     }
-}, v = (e, t) => {
-  if (e === null && t.nullable) return null;
+}, P = (e, n) => {
+  if (e === null && n.nullable) return null;
   if (e !== void 0)
-    switch (t.type) {
-      case y.boolean:
+    switch (n.type) {
+      case E.boolean:
         return !!e;
-      case y.date:
+      case E.date:
         return e instanceof Date ? e : typeof e == "string" ? new Date(e) : e;
-      case y.keyValue: {
+      case E.keyValue: {
         if (!e) return null;
-        const n = JSON.parse(e);
-        return t.properties && n && typeof n == "object" && t.properties.forEach((s) => {
-          s.name in n && (n[s.name] = v(n[s.name], s));
-        }), n;
+        const t = typeof e == "object" ? e : JSON.parse(e);
+        return n.properties && t && typeof t == "object" && n.properties.forEach((s) => {
+          s.name in t && (t[s.name] = P(t[s.name], s));
+        }), t;
       }
-      case y.json:
-      case y.stringArray:
-      case y.numberArray:
-        return e ? JSON.parse(e) : null;
+      case E.stringArray:
+      case E.numberArray:
+        return Array.isArray(e) ? e : e ? JSON.parse(e) : null;
+      case E.json:
+        return e !== null && typeof e == "object" ? e : e ? JSON.parse(e) : null;
       default:
         return e;
     }
-}, q = (e, t) => `${t}$${e}`, tt = (e) => {
-  const t = e.indexOf("$");
-  return t === -1 ? ["", e] : [e.substring(0, t), e.substring(t + 1)];
-}, S = (e) => q(e.tableName, e.namespace), pe = (e) => S(w(e)), he = (e, t) => `idx_${e.name}_${t.name}`;
-class O extends Error {
-  constructor(t) {
-    super(t), this.name = "RxDBAdapterSqliteError", Object.setPrototypeOf(this, O.prototype);
+}, k = (e, n) => `${n}$${e}`, ot = (e) => {
+  const n = e.indexOf("$");
+  return n === -1 ? ["", e] : [e.substring(0, n), e.substring(n + 1)];
+}, A = (e) => k(e.tableName, e.namespace), ye = (e) => A(T(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);
   }
 }
-const oe = (e, t) => {
-  const n = {}, s = Object.keys(t), r = e.foreignKeyNames || [], o = e.foreignKeyColumnNames || r;
+const le = (e, n) => {
+  const t = {}, s = Object.keys(n), r = e.foreignKeyNames || [], o = e.foreignKeyColumnNames || r;
   for (let i = 0; i < s.length; i++) {
     const c = s[i], a = r.indexOf(c);
     if (a !== -1) {
-      n[o[a]] = t[c];
+      t[o[a]] = n[c];
       continue;
     }
     if (o.indexOf(c) !== -1) {
-      n[c] = t[c];
+      t[c] = n[c];
       continue;
     }
     if (r.length === 0 && c.endsWith("Id")) {
-      n[c] = t[c];
+      t[c] = n[c];
       continue;
     }
-    const u = e.propertyMap.get(c);
-    if (u) {
-      n[u.columnName] = U(t[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 p = e.propertyMap.get(d);
-      p && (n[c] = U(t[c], p));
+    const u = e.columnNameToPropertyName?.get(c);
+    if (u) {
+      const h = e.propertyMap.get(u);
+      h && (t[c] = V(n[c], h));
     }
   }
-  return n;
-}, we = (e, t) => {
-  const n = {};
+  return t;
+}, be = (e, n) => {
+  const t = {};
   for (const [o, i] of e.propertyMap)
-    o in t && (n[i.columnName] = t[o]);
+    o in n && (t[i.columnName] = n[o]);
   const s = e.foreignKeyNames || [], r = e.foreignKeyColumnNames || s;
   for (let o = 0; o < s.length; o++) {
     const i = s[o];
-    i in t && (n[r[o]] = t[i]);
+    i in n && (t[r[o]] = n[i]);
   }
-  return n;
-}, nt = (e, t) => {
-  const n = {};
+  return t;
+}, at = (e, n) => {
+  const t = {};
   for (const [o, i] of e.propertyMap)
-    o in t && i.readonly !== !0 && (n[i.columnName] = t[o]);
+    o in n && i.readonly !== !0 && (t[i.columnName] = n[o]);
   const s = e.foreignKeyNames || [], r = e.foreignKeyColumnNames || s;
   for (let o = 0; o < s.length; o++) {
     const i = s[o];
-    if (i in t) {
+    if (i in n) {
       const c = e.foreignKeyRelationMap.get(i);
-      c && c.readonly !== !0 && (n[r[o]] = t[i]);
+      c && c.readonly !== !0 && (t[r[o]] = n[i]);
     }
   }
-  return n;
-}, R = (e) => Ue(e) ? `'${e.replaceAll("'", "''")}'` : Ke(e) ? "NULL" : e, P = (e, t = []) => e.replace(/\?/g, () => R(t.shift())), te = (e, t, n) => {
+  return t;
+}, I = (e) => Qe(e) ? `'${e.replaceAll("\0", "").replaceAll("'", "''")}'` : Ge(e) ? "NULL" : e, F = (e, n = []) => e.replace(/\?/g, () => String(I(n.shift()))), oe = (e, n, t) => {
   const s = {};
-  return n.forEach((r, o) => {
-    const i = t[o];
+  return t.forEach((r, o) => {
+    const i = n[o];
     if (i.startsWith("__")) return;
     const c = e.foreignKeyNames || [], l = (e.foreignKeyColumnNames || c).indexOf(i);
     if (l !== -1) {
       s[c[l]] = r;
       return;
     }
-    const u = e.columnNameToPropertyName, f = u?.get(i);
-    if (f) {
-      const p = e.propertyMap.get(f);
-      p ? s[f] = v(r, p) : console.log(`Property ${f} not found in metadata ${e.name}`);
+    const d = e.columnNameToPropertyName, p = d?.get(i);
+    if (p) {
+      const h = e.propertyMap.get(p);
+      h ? s[p] = P(r, h) : 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] = P(r, u);
       return;
     }
-    if (!u) {
-      const p = e.propertyMap.get(i);
-      if (p) {
-        s[i] = v(r, p);
+    if (!d) {
+      const h = e.propertyMap.get(i);
+      if (h) {
+        s[i] = P(r, h);
         return;
       }
     }
-    console.log(`Column ${i}=${r} not found in metadata ${e.name}`);
+    console.warn(`Column ${i}=${r} not found in metadata ${e.name}`);
   }), s;
-}, b = "_", st = {
+}, w = "_", it = {
   "=": "=",
   "!=": "!=",
   ">": ">",
@@ -175,168 +179,168 @@ const oe = (e, t) => {
   notStartsWith: "NOT LIKE",
   endsWith: "LIKE",
   notEndsWith: "NOT LIKE"
-}, ne = (e, t) => {
-  if (t && e.includes(".")) {
-    const n = e.split("."), s = t.propertyMap.get(n[0]);
+}, ae = (e, n) => {
+  if (n && e.includes(".")) {
+    const t = e.split("."), s = n.propertyMap.get(t[0]);
     if (!s) return e;
-    if (s.type === y.keyValue)
+    if (s.type === E.keyValue)
       return s.columnName;
-    for (let o = 0; o < n.length - 1; o++) {
-      const i = t.propertyMap.get(n[o]);
+    for (let o = 0; o < t.length - 1; o++) {
+      const i = n.propertyMap.get(t[o]);
       if (!i) return e;
-      if (i.type === y.keyValue)
+      if (i.type === E.keyValue)
         return i.columnName;
     }
-    const r = t.propertyMap.get(n[n.length - 1]);
+    const r = n.propertyMap.get(t[t.length - 1]);
     return r ? r.columnName : e;
   }
-  if (t) {
-    const n = t.propertyMap.get(e);
-    if (n)
-      return n.columnName;
-    const s = t.foreignKeyNames || [], r = t.foreignKeyColumnNames || s, o = s.indexOf(e);
+  if (n) {
+    const t = n.propertyMap.get(e);
+    if (t)
+      return t.columnName;
+    const s = n.foreignKeyNames || [], r = n.foreignKeyColumnNames || s, o = s.indexOf(e);
     if (o !== -1)
       return r[o];
   }
   return e;
-}, me = (e, t, n) => {
-  if (t) return t;
+}, ge = (e, n, t) => {
+  if (n) return n;
   if (!e.includes(".")) {
-    const c = ne(e, n);
-    return `${b}."${c}"`;
+    const c = ae(e, t);
+    return `${w}."${c}"`;
   }
-  const s = e.lastIndexOf("."), r = e.slice(0, s), o = e.slice(s + 1), i = ne(o, n);
+  const s = e.lastIndexOf("."), r = e.slice(0, s), o = e.slice(s + 1), i = ae(o, t);
   return `"${r}"."${i}"`;
-}, be = (e) => {
-  const { operator: t, value: n } = e;
-  switch (t) {
+}, Re = (e) => {
+  const { operator: n, value: t } = e;
+  switch (n) {
     case "in":
     case "notIn":
-      return ot(n);
+      return lt(t);
     case "between":
     case "notBetween":
-      return at(n);
+      return ut(t);
     case "contains":
     case "notContains":
-      return R(`%${n}%`);
+      return I(`%${t}%`);
     case "startsWith":
     case "notStartsWith":
-      return R(`${n}%`);
+      return I(`${t}%`);
     case "endsWith":
     case "notEndsWith":
-      return R(`%${n}`);
+      return I(`%${t}`);
     default:
-      return it(n);
+      return dt(t);
   }
-}, rt = (e) => st[e] || e, K = (e, t, n) => e.length === 1 ? n.name : `${t}_${n.name}`, ot = (e) => !Array.isArray(e) || !e.length ? "(NULL)" : `(${e.map(R).join(", ")})`, at = (e) => {
+}, 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) => {
   if (!Array.isArray(e) || e.length < 2) return "";
-  const [t, n] = e;
-  if (t == null || n == null) return "";
-  const s = t instanceof Date ? t.toISOString() : t, r = n instanceof Date ? n.toISOString() : n;
-  return `${R(s)} and ${R(r)}`;
-}, it = (e) => typeof e == "boolean" ? e ? "1" : "0" : typeof e == "string" ? R(e) : typeof e == "number" ? e.toString() : e instanceof Date ? R(e.toISOString()) : R(e), ct = (e, t, n) => {
-  const s = e.propertyMap.get(t);
-  if (!s || s.type !== y.keyValue || typeof n.value != "object" || Array.isArray(n.value)) return null;
-  const r = Object.entries(n.value).filter(([, a]) => a != null);
+  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) => {
+  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 = n.operator === "notContains" ? "NOT LIKE" : "LIKE", i = n.operator === "contains" ? " OR " : " AND ";
+  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);
-    return `json_extract(${b}."${s.columnName}", '$.${a}') ${o} ${R(`%${u}%`)}`;
+    const d = l instanceof Date ? l.toISOString() : typeof l == "string" ? l : String(l), p = a.replace(/'/g, "''");
+    return `json_extract(${w}."${s.columnName}", '$.${p}') ${o} ${I(`%${d}%`)}`;
   }).join(i)})`;
-}, lt = (e, t, n) => {
-  const s = e.propertyMap.get(t);
-  if (!s || s.type !== y.stringArray && s.type !== y.numberArray) return null;
-  const r = be(n), o = `EXISTS (SELECT 1 FROM json_each(${b}."${s.columnName}") WHERE json_each.value IN ${r})`;
-  return n.operator === "notIn" ? `NOT ${o}` : o;
-}, ut = (e, t, n, s, r) => {
-  if (n && s && r && (e.operator === "exists" || e.operator === "notExists")) {
-    const d = mt(e, n, s, (p, h) => {
-      const E = /* @__PURE__ */ new Map();
-      return h.propertyMap.forEach((m, N) => {
-        E.set(N, `"child"."${m.columnName}"`);
-      }), r(p, E, h, s);
+}, ft = (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})`;
+  return t.operator === "notIn" ? `NOT ${o}` : o;
+}, ht = (e, n, t, s, r) => {
+  if (t && s && r && (e.operator === "exists" || e.operator === "notExists")) {
+    const u = gt(e, t, s, (h, f) => {
+      const y = /* @__PURE__ */ new Map();
+      return f.propertyMap.forEach((m, _) => {
+        y.set(_, `"child"."${m.columnName}"`);
+      }), r(h, y, f, s);
     });
-    if (d !== null) return d;
+    if (u !== null) return u;
   }
   if (e.operator === "null" || e.operator === "notNull") {
-    const f = String(e.field), d = t.get(f), p = me(f, d, n);
-    return e.operator === "null" ? `${p} IS NULL` : `${p} IS NOT NULL`;
+    const p = String(e.field), u = n.get(p), h = ge(p, u, t);
+    return e.operator === "null" ? `${h} IS NULL` : `${h} IS NOT NULL`;
   }
-  const o = e.value === null, i = o ? "" : rt(e.operator).toLowerCase(), c = o ? e.operator === "=" ? "IS NULL" : e.operator === "!=" ? "IS NOT NULL" : "" : be(e);
+  const o = e.value === null, i = o ? "" : ct(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 = t.get(a);
-  if (n && !a.includes(".") && (e.operator === "contains" || e.operator === "notContains")) {
-    const f = ct(n, a, e);
-    if (f !== null) return f;
-  }
-  if (n && !a.includes(".") && (e.operator === "in" || e.operator === "notIn")) {
-    const f = lt(n, a, e);
-    if (f !== null) return f;
-  }
-  return `${me(a, l, n)} ${i} ${c}`.replace(/\s+/g, " ").trim();
-}, ae = (e) => e === b ? e : `"${e}"`, dt = (e, t, n) => {
-  if (e.kind !== A.ONE_TO_MANY)
+  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);
+    if (p !== null) return p;
+  }
+  if (t && !a.includes(".") && (e.operator === "in" || e.operator === "notIn")) {
+    const p = ft(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)
     throw new Error("_build_one_to_many_exists requires ONE_TO_MANY relation");
-  const s = q(t.tableName, t.namespace), r = "child", o = t.relations.find((a) => a.name === e.mappedProperty);
+  const s = k(n.tableName, n.namespace), r = "child", o = n.relations.find((a) => a.name === e.mappedProperty);
   if (!o)
     throw new Error(
-      `Cannot find mappedProperty relation "${e.mappedProperty}" in entity "${t.name}"`
+      `Cannot find mappedProperty relation "${e.mappedProperty}" in entity "${n.name}"`
     );
   const i = o.columnName;
   let c = `EXISTS (SELECT 1 FROM "${s}" "${r}"`;
-  return c += ` WHERE "${r}"."${i}" = ${b}."id"`, n && (c += ` AND ${n}`), c += ")", c;
-}, ft = (e, t, n) => {
+  return c += ` WHERE "${r}"."${i}" = ${w}."id"`, t && (c += ` AND ${t}`), c += ")", c;
+}, Et = (e, n, t) => {
   const s = e.columnName;
-  if (!n)
-    return `${b}."${s}" IS NOT NULL`;
-  const r = q(t.tableName, t.namespace), o = "child";
+  if (!t)
+    return `${w}."${s}" IS NOT NULL`;
+  const r = k(n.tableName, n.namespace), o = "child";
   let i = `EXISTS (SELECT 1 FROM "${r}" "${o}"`;
-  return i += ` WHERE ${b}."${s}" = "${o}"."id"`, i += ` AND ${n}`, i += ")", i;
-}, pt = (e, t, n, s, r) => {
-  const o = s.rxdb.schemaManager.findMappedRelation(e, t);
+  return i += ` WHERE ${w}."${s}" = "${o}"."id"`, i += ` AND ${t}`, i += ")", i;
+}, yt = (e, n, t, s, r) => {
+  const o = s.rxdb.schemaManager.findMappedRelation(e, n);
   if (o?.relation) {
-    const i = q(n.tableName, n.namespace), c = "child", a = o.relation.columnName;
+    const i = k(t.tableName, t.namespace), c = "child", a = o.relation.columnName;
     let l = `EXISTS (SELECT 1 FROM "${i}" "${c}"`;
-    return l += ` WHERE "${c}"."${a}" = ${b}."id"`, r && (l += ` AND ${r}`), l += ")", l;
+    return l += ` WHERE "${c}"."${a}" = ${w}."id"`, r && (l += ` AND ${r}`), l += ")", l;
   } else {
-    const i = t.columnName;
+    const i = n.columnName;
     if (!r)
-      return `${b}."${i}" IS NOT NULL`;
-    const c = q(n.tableName, n.namespace), a = "child";
+      return `${w}."${i}" IS NOT NULL`;
+    const c = k(t.tableName, t.namespace), a = "child";
     let l = `EXISTS (SELECT 1 FROM "${c}" "${a}"`;
-    return l += ` WHERE ${b}."${i}" = "${a}"."id"`, l += ` AND ${r}`, l += ")", l;
+    return l += ` WHERE ${w}."${i}" = "${a}"."id"`, l += ` AND ${r}`, l += ")", l;
   }
-}, ht = (e, t, n, s) => {
-  const r = q(n.tableName, n.namespace), o = "child", i = t.junctionEntityType;
+}, _t = (e, n, t, s) => {
+  const r = k(t.tableName, t.namespace), o = "child", i = n.junctionEntityType;
   if (!i)
-    throw new Error(`MANY_TO_MANY relation "${t.name}" missing junctionEntityType`);
-  const c = w(i);
+    throw new Error(`MANY_TO_MANY relation "${n.name}" missing junctionEntityType`);
+  const c = T(i);
   if (!c)
     throw new Error("Cannot find metadata for junction entity");
-  const a = q(c.tableName, c.namespace), l = "junction", u = c.relations.find(
-    (E) => E.mappedEntity === e.name && E.mappedNamespace === e.namespace
+  const a = k(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 f = c.relations.find(
-    (E) => E.mappedEntity === n.name && E.mappedNamespace === n.namespace
+  const p = c.relations.find(
+    (y) => y.mappedEntity === t.name && y.mappedNamespace === t.namespace
   );
-  if (!f)
+  if (!p)
     throw new Error(
-      `Cannot find relation in junction entity ${c.name} pointing to ${n.name}`
+      `Cannot find relation in junction entity ${c.name} pointing to ${t.name}`
     );
-  const d = u.columnName, p = f.columnName;
-  let h = `EXISTS (SELECT 1 FROM "${r}" "${o}"`;
-  return h += ` INNER JOIN "${a}" "${l}"`, h += ` ON "${l}"."${p}" = "${o}"."id"`, h += ` WHERE "${l}"."${d}" = ${b}."id"`, s && (h += ` AND ${s}`), h += ")", h;
-}, mt = (e, t, n, s) => {
+  const u = d.columnName, h = p.columnName;
+  let f = `EXISTS (SELECT 1 FROM "${r}" "${o}"`;
+  return f += ` INNER JOIN "${a}" "${l}"`, f += ` ON "${l}"."${h}" = "${o}"."id"`, f += ` WHERE "${l}"."${u}" = ${w}."id"`, s && (f += ` AND ${s}`), f += ")", f;
+}, gt = (e, n, t, s) => {
   if (e.operator !== "exists" && e.operator !== "notExists")
     return null;
-  const r = t.relationMap.get(e.field);
+  const r = n.relationMap.get(e.field);
   if (!r) return null;
-  const o = n.rxdb.schemaManager.getEntityMetadata(
+  const o = t.rxdb.schemaManager.getEntityMetadata(
     r.mappedEntity,
     r.mappedNamespace
   );
@@ -346,28 +350,28 @@ const oe = (e, t) => {
   e.where && s && (i = s(e.where, o));
   let c;
   switch (r.kind) {
-    case A.ONE_TO_MANY:
-      c = dt(r, o, i);
+    case b.ONE_TO_MANY:
+      c = mt(r, o, i);
       break;
-    case A.MANY_TO_ONE:
-      c = ft(r, o, i);
+    case b.MANY_TO_ONE:
+      c = Et(r, o, i);
       break;
-    case A.ONE_TO_ONE:
-      c = pt(t, r, o, n, i);
+    case b.ONE_TO_ONE:
+      c = yt(n, r, o, t, i);
       break;
-    case A.MANY_TO_MANY:
-      c = ht(t, r, o, i);
+    case b.MANY_TO_MANY:
+      c = _t(n, r, o, i);
       break;
   }
   return e.operator === "notExists" ? `NOT ${c}` : c;
-}, V = (e, t) => {
-  if (e.relationAliasMap.has(t))
-    return e.relationAliasMap.get(t);
-  const n = t.includes("_") ? t : t.split("_")[0], s = Ae(e, n);
-  return e.relationAliasMap.set(t, s), s;
-}, Et = (e, t, n, s) => {
-  const r = n.slice(0, s);
-  let o = t;
+}, 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);
+  return e.relationAliasMap.set(n, s), s;
+}, Nt = (e, n, t, s) => {
+  const r = t.slice(0, s);
+  let o = n;
   const i = [];
   for (const c of r) {
     if (!o?.relationMap.has(c))
@@ -376,250 +380,257 @@ const oe = (e, t) => {
     i.push({ metadata: o, relation: a }), o = e.rxdb.schemaManager.getEntityMetadata(a.mappedEntity, a.mappedNamespace);
   }
   return { metaWalker: o, relPairs: i };
-}, _t = (e, t, n, s, r) => {
+}, $t = (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 } = Et(e, n, r, o);
+    const { metaWalker: c, relPairs: a } = Nt(e, t, r, o);
     if (!c || a.length === 0) continue;
-    const l = i[0], u = i.slice(1).join("."), f = c.propertyMap.get(l);
-    if (f && f.type === y.keyValue) {
-      const d = r.slice(0, o).join(".");
-      Se(e, t, a, d);
-      const p = a[a.length - 1].relation, h = K(a, d, p), E = V(t, h), m = u ? `$.${u}` : "$";
-      return t.fieldAliasMap.set(s, `json_extract("${E}"."${f.columnName}", '${m}')`), !0;
+    const l = i[0], d = i.slice(1).join("."), p = c.propertyMap.get(l);
+    if (p && p.type === E.keyValue) {
+      const u = r.slice(0, o).join(".");
+      Ie(e, n, a, u);
+      const h = a[a.length - 1].relation, f = Q(a, u, h), y = G(n, f), m = d ? `$.${d}` : "$";
+      return n.fieldAliasMap.set(s, `json_extract("${y}"."${p.columnName}", '${m}')`), !0;
     }
   }
   return !1;
-}, Se = (e, t, n, s) => {
-  n.forEach(({ metadata: r, relation: o }, i) => {
+}, Ie = (e, n, t, s) => {
+  t.forEach(({ metadata: r, relation: o }, i) => {
     let c = e.rxdb.schemaManager.findMappedRelation(r, o);
     if (!c)
-      if (o.kind === A.ONE_TO_MANY || o.kind === A.MANY_TO_MANY) {
-        const f = r.relationMap.get(o.mappedProperty);
-        f && (c = { metadata: r, relation: f });
-      } else (o.kind === A.MANY_TO_ONE || o.kind === A.ONE_TO_ONE) && (c = { metadata: r, relation: o });
-    if (!c) throw new O("mappedRelation not found");
-    const a = K(n, s, o), l = V(t, a);
-    let u = b;
+      if (o.kind === b.ONE_TO_MANY || o.kind === b.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 });
+    if (!c) throw new R("mappedRelation not found");
+    const a = Q(t, s, o), l = G(n, a);
+    let d = w;
     if (i > 0) {
-      const f = n[i - 1], d = K(n, s, f.relation);
-      u = V(t, d);
+      const p = t[i - 1], u = Q(t, s, p.relation);
+      d = G(n, u);
     }
     switch (o.kind) {
-      case A.ONE_TO_MANY:
-        yt(
-          t,
+      case b.ONE_TO_MANY:
+        Tt(
+          n,
           c,
           l,
-          u
+          d
         );
         break;
-      case A.ONE_TO_ONE:
-      case A.MANY_TO_ONE:
-        gt(
-          t,
+      case b.ONE_TO_ONE:
+      case b.MANY_TO_ONE:
+        wt(
+          n,
           c,
           l,
-          u,
+          d,
           o
         );
         break;
-      case A.MANY_TO_MANY:
-        Nt(
+      case b.MANY_TO_MANY:
+        At(
           e,
-          t,
+          n,
           c,
           l,
-          u,
+          d,
           o
         );
         break;
     }
   });
-}, yt = (e, t, n, s) => {
-  const r = H(e, t.metadata), o = `"${n}".${t.relation.columnName} = ${ae(s)}.id`;
-  r.find((c) => c.joinTableName === n && c.on === o) || r.push({
-    joinTableName: n,
+}, Tt = (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
   });
-}, gt = (e, t, n, s, r) => {
-  const o = H(e, t.metadata), i = `"${n}".id = ${ae(s)}.${r.columnName}`;
-  o.find((a) => a.joinTableName === n && a.on === i) || o.push({
-    joinTableName: n,
+}, wt = (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
   });
-}, Nt = (e, t, n, s, r, o) => {
-  const i = w(o.junctionEntityType), c = H(t, i), a = Ae(t, `${o.name}_m_n`), l = `"${a}".${n.relation.columnName} = ${ae(r)}.id`;
+}, 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`;
   c.find(
-    (h) => h.joinTableName === a && h.on === l
+    (f) => f.joinTableName === a && f.on === l
   ) || c.push({
     joinTableName: a,
     on: l
   });
-  const f = H(t, n.metadata), d = `"${s}".id = "${a}".${o.columnName}`;
-  f.find((h) => h.joinTableName === s && h.on === d) || f.push({
+  const p = J(n, t.metadata), u = `"${s}".id = "${a}".${o.columnName}`;
+  p.find((f) => f.joinTableName === s && f.on === u) || p.push({
     joinTableName: s,
-    on: d
+    on: u
   });
-}, H = (e, t) => (e.joinMap.has(t) || e.joinMap.set(t, []), e.joinMap.get(t)), Ae = (e, t) => {
-  let n = t, s = 1;
-  for (; e.usedAliases.has(n); )
-    n = `${t}_${s}`, s++;
-  return e.usedAliases.add(n), n;
-}, $t = (e, t) => {
+}, J = (e, n) => (e.joinMap.has(n) || e.joinMap.set(n, []), e.joinMap.get(n)), Oe = (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) => {
   if (e?.length)
-    return e.map((n) => {
-      const s = ne(n.field, t);
-      return `${b}."${s}" ${n.sort}`;
+    return e.map((t) => {
+      const s = ae(t.field, n);
+      return `${w}."${s}" ${t.sort}`;
     }).join(", ");
-}, F = (e, t = /* @__PURE__ */ new Map(), n, s) => {
+}, U = (e, n = /* @__PURE__ */ new Map(), t, s) => {
   if (!e?.rules) return "";
   const r = e.rules.map(
-    (o) => le(o) ? F(o, t, n, s) : ut(o, t, n, s, F)
+    (o) => fe(o) ? U(o, n, t, s) : ht(o, n, t, s, U)
   ).filter(Boolean);
-  return r.length ? r.length === 1 ? r[0] : `(${r.join(le(e) ? ` ${e.combinator} ` : " ")})` : "";
-}, Re = (e) => {
-  const { tableName: t, where: n, limit: s, offset: r, orderBy: o, join: i, hasJoin: c, metadata: a } = e;
-  let l = `${b}.rowid as ${L}, ${b}.*`;
+  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}.*`;
   if (a.features?.tree?.hasChildren && a.features?.tree?.type === "adjacency-list") {
-    const d = a.relationMap.get("parent").columnName;
-    l += `, EXISTS(SELECT 1 FROM "${t}" __sub WHERE __sub."${d}" = ${b}."id") AS "hasChildren"`;
+    const u = a.relationMap.get("parent").columnName;
+    l += `, EXISTS(SELECT 1 FROM "${n}" __sub WHERE __sub."${u}" = ${w}."id") AS "hasChildren"`;
   }
-  const u = [`SELECT ${c ? "DISTINCT " : ""}${l} FROM "${t}" ${b}`];
-  return i && u.push(i), n && u.push(` WHERE ${n}`), o && u.push(` ORDER BY ${o}`), s && u.push(` LIMIT ${s}`), r && u.push(` OFFSET ${r}`), u.join("") + ";";
-}, Ie = (e, t, n) => {
+  const d = [`SELECT ${c ? "DISTINCT " : ""}${l} FROM "${n}" ${w}`];
+  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("") + ";";
+}, Ce = (e, n, t) => {
   const s = {
     joinMap: /* @__PURE__ */ new Map(),
     usedAliases: /* @__PURE__ */ new Set(),
     fieldAliasMap: /* @__PURE__ */ new Map(),
     relationAliasMap: /* @__PURE__ */ new Map()
   };
-  Ve(n, (o, i, c) => {
+  Je(t, (o, i, c) => {
     const a = i;
-    o !== "field" || !a.includes(".") || wt(e, s, t, a, c);
+    o !== "field" || !a.includes(".") || Rt(e, s, n, a, c);
   });
   const r = [];
   for (const [o, i] of s.joinMap.entries()) {
-    const c = S(o);
+    const c = A(o);
     for (const a of i)
       r.push(` LEFT JOIN "${c}" "${a.joinTableName}" ON ${a.on}`);
   }
   return { joinSQL: r.join(""), fieldAliasMap: s.fieldAliasMap };
-}, Tt = (e, t, n, s) => {
+}, bt = (e, n, t, s) => {
   if (s.length <= 1) return !1;
-  const [r, ...o] = s, i = t.propertyMap.get(r);
-  if (i && i.type === y.keyValue && o.length > 0) {
+  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(n, `json_extract(${b}."${i.columnName}", '$.${c}')`), !0;
+    return e.fieldAliasMap.set(t, `json_extract(${w}."${i.columnName}", '$.${c}')`), !0;
   }
   return !1;
-}, wt = (e, t, n, s, r) => {
+}, Rt = (e, n, t, s, r) => {
   const o = s.split(".");
   try {
-    const i = e.rxdb.schemaManager.getFieldRelations(n, s);
+    const i = e.rxdb.schemaManager.getFieldRelations(t, s);
     if (i.isForeignKey) {
       r.field = i.propertyName;
       return;
     }
     const c = s.replace(`.${i.propertyName}`, "");
-    Se(e, t, i.relations, c);
-    const a = i.relations[i.relations.length - 1], l = K(i.relations, c, a.relation), u = V(t, l);
-    t.fieldAliasMap.set(s, `"${u}"."${i.property.columnName}"`);
+    Ie(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 {
   }
-  Tt(t, n, s, o) || _t(e, t, n, s, o);
-}, bt = (e, t) => {
-  const n = S(e), s = [t.id];
+  bt(n, t, s, o) || $t(e, n, t, s, o);
+}, It = (e, n) => {
+  const t = A(e), s = [n.id];
   return {
-    sql: `DELETE FROM "${n}" WHERE id = ?;`,
+    sql: `DELETE FROM "${t}" WHERE id = ?;`,
     params: s
   };
-}, Oe = (e, t, n) => {
-  const s = S(e), r = we(e, t);
-  n?.userId && (e.propertyMap.has("createdBy") && (r.createdBy = n.userId), e.propertyMap.has("updatedBy") && (r.updatedBy = n.userId));
+}, Le = (e, n, t) => {
+  const s = A(e), r = be(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 = n?.createdAt ?? o), e.propertyMap.has("updatedAt") && r.updatedAt === void 0 && (r.updatedAt = n?.updatedAt ?? o);
-  const i = oe(e, r), c = Object.keys(i), a = Array(c.length).fill("?").join(","), l = Object.values(i);
-  let f = `${n?.useReplace ? "INSERT OR REPLACE" : "INSERT"} INTO "${s}" (${c.join(",")}) VALUES (${a})`;
-  return n?.returning !== !1 ? f += ` RETURNING rowid as ${L}, *;` : f += ";", {
-    sql: f,
+  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 += ";", {
+    sql: p,
     params: l
   };
-}, ie = (e, t, n, s) => {
-  const r = nt(e, n);
+}, de = (e, n, t, s) => {
+  const r = at(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 = oe(e, r), i = Object.keys(o).map((d) => `${d} = ?`).join(","), c = [...Object.values(o)], a = S(e), l = Array.isArray(t), u = l ? t : [t];
-  let f = `UPDATE "${a}" SET ${i} WHERE id `;
-  return l ? f += `in (${u.map((d) => R(d.id)).join(",")})` : (c.push(t.id), f += "= ?"), s?.returning !== !1 ? f += ` RETURNING rowid as ${L}, *;` : f += ";", {
-    sql: f,
+  const o = le(e, r), i = Object.keys(o).map((u) => `${u} = ?`).join(","), c = [...Object.values(o)], a = A(e), l = Array.isArray(n), d = l ? n : [n];
+  let p = `UPDATE "${a}" SET ${i} WHERE id `;
+  return l ? p += `in (${d.map((u) => I(u.id)).join(",")})` : (c.push(n.id), p += "= ?"), s?.returning !== !1 ? p += ` RETURNING rowid as ${q}, *;` : p += ";", {
+    sql: p,
     params: c
   };
-}, St = (e, t, n) => {
-  if (n.groupBy)
-    throw new O("groupBy not supported yet");
-  const { joinSQL: s, fieldAliasMap: r } = Ie(e, t, n.where), o = S(t), i = F(n.where, r, t, e), c = [`SELECT COUNT(${b}.rowid) AS count FROM "${o}" ${b}`];
+}, Ot = (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}`];
   return s && c.push(s), i && c.push(` WHERE ${i}`), { sql: c.join("") };
-}, se = (e, t, n) => {
-  const { joinSQL: s, fieldAliasMap: r } = Ie(e, t, n.where);
-  return { sql: Re({
-    tableName: S(t),
-    where: F(n.where, r, t, e),
-    orderBy: $t(n.orderBy, t),
+}, ie = (e, n, t) => {
+  const { joinSQL: s, fieldAliasMap: r } = Ce(e, n, t.where);
+  return { sql: Me({
+    tableName: A(n),
+    where: U(t.where, r, n, e),
+    orderBy: St(t.orderBy, n),
     join: s,
     hasJoin: !!s,
-    metadata: t,
-    limit: n.limit,
-    offset: n.offset
+    metadata: n,
+    limit: t.limit,
+    offset: t.offset
   }) };
-}, At = (e, t) => ({ sql: Re({
-  tableName: S(e),
-  where: `${L} IN (${t.join(",")})`,
-  metadata: e
-}) }), Q = (e, t, n, s = !1) => {
-  const r = [], o = w(t), i = e.rxdb.entityManager;
-  return n.results.forEach(({ columns: c, rows: a }) => {
-    const l = c.findIndex((f) => f === "id"), u = c.findIndex((f) => f === L);
-    a.forEach((f) => {
-      const d = f[l];
-      let p;
-      if (e.rxdb.entityManager.hasEntityRef(t, d)) {
-        p = i.getEntityRef(t, d);
-        const m = te(o, c, f);
-        if (o.computedPropertyMap.forEach((N, g) => {
-          g in m && (p[g] = m[g]);
+}, Mt = (e, n) => {
+  const t = n.map(() => "?").join(",");
+  return { sql: Me({
+    tableName: A(e),
+    where: `${q} IN (${t})`,
+    metadata: e
+  }), params: n };
+}, X = (e, n, t, s = !1, r = !1) => {
+  const o = [], i = T(n), c = e.rxdb.entityManager;
+  return t.results.forEach(({ columns: a, rows: l }) => {
+    const d = a.findIndex((u) => u === "id"), p = a.findIndex((u) => u === q);
+    l.forEach((u) => {
+      const h = u[d];
+      let f;
+      if (e.rxdb.entityManager.hasEntityRef(n, h)) {
+        f = c.getEntityRef(n, h);
+        const _ = oe(i, a, u);
+        if (i.computedPropertyMap.forEach((N, $) => {
+          $ in _ && (f[$] = _[$]);
         }), s) {
-          const N = j(p);
-          N.origin = { ...m }, Object.assign(p, m);
+          const N = D(f);
+          N.origin = { ..._ }, Object.assign(f, _);
         }
       } else {
-        const m = te(o, c, f);
-        p = i.createEntityRef(t, m);
+        if (r)
+          return;
+        {
+          const _ = oe(i, a, u);
+          f = c.createEntityRef(n, _);
+        }
       }
-      r.push(p);
-      const E = j(p);
-      if (E.local = !0, E.modified = !1, u !== -1) {
-        const m = BigInt(f[u]);
-        e.cacheRowIdEntity(m, p);
+      o.push(f);
+      const m = D(f);
+      if (m.local = !0, m.modified = !1, p !== -1) {
+        const _ = BigInt(u[p]);
+        e.cacheRowIdEntity(_, f);
       }
     });
-  }), r;
-}, Rt = (e, t, n) => {
-  n.forEach((s) => {
-    if (e.rxdb.entityManager.hasEntityRef(t, s)) {
-      const r = e.rxdb.entityManager.getEntityRef(t, s), o = j(r);
+  }), o;
+}, Ct = (e, n, t) => {
+  t.forEach((s) => {
+    if (e.rxdb.entityManager.hasEntityRef(n, s)) {
+      const r = e.rxdb.entityManager.getEntityRef(n, s), o = D(r);
       o.local = !1, o.removed = !0, o.modified = !1;
     }
   });
 };
-class It extends De {
-  constructor(t, n) {
-    super(t.rxdb, n), this.adapter = t, this.metadata = w(n);
+class Lt extends Be {
+  constructor(n, t) {
+    super(n.rxdb, t), this.adapter = n, this.metadata = T(t);
   }
   metadata;
-  async findByRowIds(t) {
-    const { sql: n, params: s } = At(this.metadata, t), r = await this.adapter.query(n, s);
+  async findByRowIds(n) {
+    const { sql: t, params: s } = Mt(this.metadata, n), r = await this.adapter.query(t, s);
     return this.addQueryCache(r);
   }
   /**
@@ -627,54 +638,54 @@ class It extends De {
    * @param sqliteSuccessResult
    * @param forcedUpdate 强制刷新，在数据有的情况下也会更新数据，在修改数据的情况下需要
    */
-  addQueryCache(t, n = !1) {
-    return Q(this.adapter, this.EntityType, t, n);
+  addQueryCache(n, t = !1) {
+    return X(this.adapter, this.EntityType, n, t);
   }
 }
-class Ce extends It {
-  async get(t) {
-    const n = {
+class je extends Lt {
+  async get(n) {
+    const t = {
       where: {
         combinator: "and",
-        rules: [{ field: "id", operator: "=", value: t }]
+        rules: [{ field: "id", operator: "=", value: n }]
       }
-    }, s = await this.findOne(n);
-    if (!s) throw new O(`Entity (${t}) not found`);
+    }, s = await this.findOne(t);
+    if (!s) throw new R(`Entity (${n}) not found`);
     return s;
   }
-  async findOne(t) {
-    return (await this.find({ ...t, limit: 1, offset: 0 }))[0];
+  async findOne(n) {
+    return (await this.find({ ...n, limit: 1, offset: 0 }))[0];
   }
-  async find(t) {
-    const { sql: n, params: s } = se(this.adapter, this.metadata, t), r = await this.adapter.query(n, s);
+  async find(n) {
+    const { sql: t, params: s } = ie(this.adapter, this.metadata, n), r = await this.adapter.query(t, s);
     return this.addQueryCache(r);
   }
-  async count(t) {
-    const { sql: n, params: s } = St(this.adapter, this.metadata, t);
-    return (await this.adapter.query(n, s)).results[0].rows[0][0];
+  async count(n) {
+    const { sql: t, params: s } = Ot(this.adapter, this.metadata, n);
+    return (await this.adapter.query(t, s)).results[0].rows[0][0];
   }
-  async create(t) {
-    const { sql: n, params: s } = Oe(this.metadata, t, this.rxdb.context), r = await this.adapter.query(n, s);
-    return this.addQueryCache(r, !0), t;
+  async create(n) {
+    const { sql: t, params: s } = Le(this.metadata, n, this.rxdb.context), r = await this.adapter.query(t, s);
+    return this.addQueryCache(r, !0), n;
   }
-  async update(t, n) {
-    const { sql: s, params: r } = ie(this.metadata, t, n, this.rxdb.context), o = await this.adapter.query(s, r);
-    return this.addQueryCache(o, !0), t;
+  async update(n, t) {
+    const { sql: s, params: r } = de(this.metadata, n, t, this.rxdb.context), o = await this.adapter.query(s, r);
+    return this.addQueryCache(o, !0), n;
   }
-  async remove(t) {
-    const n = j(t), s = () => {
-      n.origin = structuredClone({ ...t }), n.modified = !1, n.removed = !0;
+  async remove(n) {
+    const t = D(n), s = () => {
+      t.origin = structuredClone({ ...n }), t.modified = !1, t.removed = !0;
     };
-    if (n.local === !0) {
-      const { sql: o, params: i } = bt(this.metadata, t);
-      return await this.adapter.query(o, i), s(), t;
+    if (t.local === !0) {
+      const { sql: o, params: i } = It(this.metadata, n);
+      return await this.adapter.query(o, i), s(), n;
     }
-    const r = w(t);
-    throw new O(`Remove Error${r.name}(${t.id}) not saved local.`);
+    const r = T(n);
+    throw new R(`Remove Error${r.name}(${n.id}) not saved local.`);
   }
 }
-var x = /* @__PURE__ */ ((e) => (e[e.SQLITE_DELETE = 9] = "SQLITE_DELETE", e[e.SQLITE_INSERT = 18] = "SQLITE_INSERT", e[e.SQLITE_UPDATE = 23] = "SQLITE_UPDATE", e))(x || {});
-const Ot = (e) => {
+var v = /* @__PURE__ */ ((e) => (e[e.SQLITE_DELETE = 9] = "SQLITE_DELETE", e[e.SQLITE_INSERT = 18] = "SQLITE_INSERT", e[e.SQLITE_UPDATE = 23] = "SQLITE_UPDATE", e))(v || {});
+const jt = (e) => {
   switch (e) {
     case 18:
       return "INSERT";
@@ -683,7 +694,7 @@ const Ot = (e) => {
     case 23:
       return "UPDATE";
   }
-}, Ct = "sqlite", Mt = () => import("wa-sqlite/dist/wa-sqlite-async.mjs").then((e) => e.default), Lt = () => import("wa-sqlite/dist/wa-sqlite.mjs").then((e) => e.default), jt = [
+}, 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 = [
   {
     name: "MemoryVFS",
     vfsModule: () => import("wa-sqlite/src/examples/MemoryVFS.js").then((e) => e.MemoryVFS),
@@ -767,82 +778,80 @@ const Ot = (e) => {
     jsContext: !1,
     multipleConnections: !0
   }
-], Me = (e) => {
-  const t = jt.find((o) => o.name === e.vfs), { vfs: n, async: s, worker: r } = e;
-  if (!t) throw new O(`vfs ${n} not found`);
+], xe = (e) => {
+  const n = vt.find((o) => o.name === e.vfs), { vfs: t, async: s, worker: r } = e;
+  if (!n) throw new R(`vfs ${t} not found`);
   if (s !== void 0) {
-    if (s && !t.async)
-      throw new O(`vfs ${n} not support async: true`);
-    if (!s && !t.sync)
-      throw new O(`vfs ${n} not support async: false`);
+    if (s && !n.async)
+      throw new R(`vfs ${t} not support async: true`);
+    if (!s && !n.sync)
+      throw new R(`vfs ${t} not support async: false`);
   }
-  if (r && !t.worker) throw new O(`vfs ${n} not support worker`);
-  if (!r && !t.jsContext) throw new O(`vfs ${n} only support worker`);
-  return t;
-}, xt = async (e) => {
-  const t = Me(e), n = e.async ?? !0;
+  if (r && !n.worker) throw new R(`vfs ${t} not support worker`);
+  if (!r && !n.jsContext) throw new R(`vfs ${t} only support worker`);
+  return n;
+}, Pt = async (e) => {
+  const n = xe(e), t = e.async ?? !0;
   let s;
-  n ? s = Mt : s = Lt;
-  const [r, o] = await Promise.all([s(), t.vfsModule()]), i = {};
+  t ? s = qt : 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 = Ye(c), l = await o.create(e.vfs, c, t.vfsOptions);
+  const c = await r(i), a = et(c), l = await o.create(e.vfs, c, n.vfsOptions);
   return a.vfs_register(l, !0), a;
 };
-async function vt(e, t, n, s) {
-  const r = performance.now(), o = s ? [s] : [[]], i = [];
-  let c = 0;
+async function kt(e, n, t, s) {
+  const r = performance.now(), o = [];
+  let i = 0, c = s;
   const a = {
-    sql: n,
-    results: i
+    sql: t,
+    results: o
   };
-  for await (const l of e.statements(t, n)) {
-    if (s)
-      for (const d of o)
-        e.reset(l), e.bind_collection(l, d);
-    const u = [];
-    for (; await e.step(l) === Xe; ) {
-      const d = e.row(l);
-      u.push(d);
+  for await (const l of e.statements(n, t)) {
+    c && (e.reset(l), e.bind_collection(l, c), c = void 0);
+    const d = [];
+    for (; await e.step(l) === tt; ) {
+      const u = e.row(l);
+      d.push(u);
     }
-    const f = e.column_names(l);
-    f.length && i.push({ columns: f, rows: u }), c += e.changes(t);
+    const p = e.column_names(l);
+    p.length && o.push({ columns: p, rows: d }), i += e.changes(n);
   }
   return {
     ...a,
-    rowsAffected: c,
+    rowsAffected: i,
     elapsed: performance.now() - r
   };
 }
-const qt = {
+const Ft = {
   BALANCED: 16
-}, Ee = qt.BALANCED, Dt = 50 * 1024, kt = /* @__PURE__ */ new Set(["public$rxdb_change", "public$rxdb_branch", "public$rxdb_migration"]);
-class Pt extends He {
+}, Ne = Ft.BALANCED, Bt = 50 * 1024, Ut = /* @__PURE__ */ new Set(["public$rxdb_change", "public$rxdb_branch", "public$rxdb_migration"]);
+class Wt extends Xe {
   #n;
   #e;
-  #r = !1;
-  #s = !1;
+  #a = !1;
+  #o = !1;
   #c;
-  #o = [];
-  #a;
-  #t = Ee;
+  #s = [];
+  #t;
+  #r = Ne;
   /**
    * 初始化数据库
    *
    * @param dbName - 数据库名称（不含 .sqlite 扩展名）
    * @param options - 加载选项
    */
-  async init(t, n) {
-    if (this.#r) return;
-    this.#r = !0, this.#c = new ge(1);
-    const s = await xt(n), r = `${t}.sqlite`;
-    this.#e = await s.open_v2(r), this.#n = s, this.#u(s, this.#e), this.#t = n?.batchTimeout ?? Ee;
-    const o = n?.cacheSizeKb ?? Dt;
+  async init(n, t) {
+    if (this.#a) return;
+    this.#a = !0, this.#c = new we(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;
+    const o = t?.cacheSizeKb ?? Bt;
     await this.execute(`
       PRAGMA temp_store = memory;
       PRAGMA foreign_keys = ON;
       PRAGMA cache_size = -${o};
     `), this.#n.update_hook(this.#e, (i, c, a, l) => {
-      !c || !a || !kt.has(a) || (this.#o.push({ type: i, dbName: c, tableName: a, rowId: l }), this.#i());
+      !c || !a || !Ut.has(a) || (this.#s.push({ type: i, dbName: c, tableName: a, rowId: l }), this.#i());
     });
   }
   /**
@@ -851,8 +860,8 @@ class Pt extends He {
    * @returns SQLite 版本字符串
    */
   async version() {
-    const t = await this.execute("SELECT sqlite_version()");
-    return Qe(t, "results[0].rows[0][0]");
+    const n = await this.execute("SELECT sqlite_version()");
+    return Ye(n, "results[0].rows[0][0]");
   }
   /**
    * 断开数据库连接
@@ -860,7 +869,8 @@ class Pt extends He {
    * 等待所有待执行任务完成后关闭数据库连接
    */
   async disconnect() {
-    this.#s = !0, await this.#c.waitForAll(), await this.#n.close(this.#e);
+    this.#o = !0, this.#t && (clearTimeout(this.#t), this.#t = void 0), this.#s.length = 0, this.#n.update_hook(this.#e, () => {
+    }), await this.#c.waitForAll(), await this.#n.close(this.#e);
   }
   /**
    * 执行 SQL 语句
@@ -880,38 +890,38 @@ class Pt extends He {
    * );
    * ```
    */
-  async execute(t, n) {
-    if (this.#s)
+  async execute(n, t) {
+    if (this.#o)
       throw new Error("SqliteClient has been disconnected");
-    return this.#c.addTask(() => vt(this.#n, this.#e, t, n));
+    return this.#c.addTask(() => kt(this.#n, this.#e, n, t));
   }
   /**
    * 调度批量发送
    * 使用防抖机制合并连续的变更事件
    */
   #i() {
-    this.#a && clearTimeout(this.#a), this.#a = setTimeout(() => {
-      this.#l(), this.#a = void 0;
-    }, this.#t);
+    this.#t && clearTimeout(this.#t), this.#t = setTimeout(() => {
+      this.#l(), this.#t = void 0;
+    }, this.#r);
   }
   /**
    * 刷新待发送事件
    * 将同类型、同表的事件合并后分发
    */
   #l() {
-    const t = Object.groupBy(this.#o, (n) => `${n.type}_${n.dbName}_${n.tableName}`);
-    for (const n of Object.values(t)) {
-      if (!n || n.length === 0) continue;
-      const s = n[0];
+    const n = Object.groupBy(this.#s, (t) => `${t.type}_${t.dbName}_${t.tableName}`);
+    for (const t of Object.values(n)) {
+      if (!t || t.length === 0) continue;
+      const s = t[0];
       this.dispatchEvent(s.type, {
         type: s.type,
         dbName: s.dbName,
         tableName: s.tableName,
-        rowIds: n.map((r) => r.rowId),
+        rowIds: t.map((r) => r.rowId),
         recordAt: /* @__PURE__ */ new Date()
       });
     }
-    this.#o.length = 0;
+    this.#s.length = 0;
   }
   /**
    * 注册自定义 SQL 函数
@@ -920,345 +930,378 @@ class Pt extends He {
    * - `regexp(pattern, text)` - 正则匹配
    * - `regexp_replace(pattern, text, replacement[, flags])` - 正则替换
    */
-  #u(t, n) {
-    Ft(t, n), Bt(t, n);
+  #u(n, t) {
+    Ht(n, t), Vt(n, t);
   }
 }
-function Ft(e, t) {
-  e.create_function(t, "regexp", 2, $e | Te, 0, (n, s) => {
+const W = /* @__PURE__ */ new Map(), Kt = 128;
+function qe(e, n = "") {
+  const t = `${e}\0${n}`;
+  let s = W.get(t);
+  if (!s) {
+    if (e.length > 1e3) throw new Error("regexp pattern too long");
+    s = new RegExp(e, n), W.size >= Kt && W.clear(), W.set(t, s);
+  }
+  return s;
+}
+function Ht(e, n) {
+  e.create_function(n, "regexp", 2, Ae | Se, 0, (t, s) => {
     try {
-      const r = new RegExp(e.value_text(s[0])), o = e.value_text(s[1]);
-      e.result(n, r.test(o) ? 1 : 0);
+      const r = qe(e.value_text(s[0])), o = e.value_text(s[1]);
+      e.result(t, r.test(o) ? 1 : 0);
     } catch {
-      e.result(n, 0);
+      e.result(t, 0);
     }
   });
 }
-function Bt(e, t) {
-  e.create_function(t, "regexp_replace", -1, $e | Te, 0, (n, s) => {
+function Vt(e, n) {
+  e.create_function(n, "regexp_replace", -1, Ae | Se, 0, (t, s) => {
     if (s.length < 3) {
-      e.result(n, "");
+      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(n, o.replace(new RegExp(r, c), i));
+      e.result(t, o.replace(qe(r, c), i));
     } catch {
-      e.result(n, e.value_text(s[1]));
+      e.result(t, e.value_text(s[1]));
     }
   });
 }
-async function Wt(e, t) {
-  const { vfs: n, async: s, worker: r, wasmPath: o, locateFile: i, workerInstance: c, sharedWorkerInstance: a, sharedWorker: l } = t, u = {
-    vfs: n,
+async function Qt(e, n) {
+  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
   };
-  Me(u);
-  let f;
-  return r && c ? f = fe(c) : l && a ? f = fe(a.port) : f = new Pt(), await f.init(e, u), f;
+  xe(d);
+  let p;
+  return r && c ? p = Ee(c) : l && a ? p = Ee(a.port) : p = new Wt(), await p.init(e, d), p;
 }
-const Ut = (e, t) => t.map((n) => {
-  const s = e.rxdb.schemaManager.getEntityMetadata(n.entity, n.namespace);
-  return s ? (n.inversePatch && Object.keys(n.inversePatch).forEach((r) => {
+const Gt = (e, n) => n.map((t) => {
+  const s = e.rxdb.schemaManager.getEntityMetadata(t.entity, t.namespace);
+  return s ? (t.inversePatch && Object.keys(t.inversePatch).forEach((r) => {
     const o = s.propertyMap.get(r);
-    o && (n.inversePatch[r] = v(n.inversePatch[r], o));
-  }), n.patch && Object.keys(n.patch).forEach((r) => {
+    o && (t.inversePatch[r] = P(
+      t.inversePatch[r],
+      o
+    ));
+  }), t.patch && Object.keys(t.patch).forEach((r) => {
     const o = s.propertyMap.get(r);
-    o && (n.patch[r] = v(n.patch[r], o));
-  })) : console.warn(`Entity metadata not found for ${n.namespace}.${n.entity}`), n;
-}), Kt = (e, t) => {
-  const n = Object.groupBy(t, (r) => r.type), s = Object.entries(n);
-  for (let r = 0; r < s.length; r++) {
-    const [o, i] = s[r];
-    if (!i || i.length === 0) continue;
-    const c = i.map((a) => ({
-      namespace: a.namespace,
-      entity: a.entity,
-      type: a.type,
-      id: a.entityId,
-      patch: a.patch,
-      inversePatch: a.inversePatch,
-      recordAt: a.createdAt
-    }));
-    switch (o) {
-      case "INSERT":
-        e.rxdb.dispatchEvent(
-          new B(c)
-        );
-        break;
-      case "UPDATE":
-        e.rxdb.dispatchEvent(
-          new G(c)
-        );
-        break;
-      case "DELETE":
-        e.rxdb.dispatchEvent(
-          new re(c)
-        );
-        break;
-    }
+    o && (t.patch[r] = P(
+      t.patch[r],
+      o
+    ));
+  })) : console.warn(`Entity metadata not found for ${t.namespace}.${t.entity}`), t;
+}), Jt = (e, n) => {
+  const t = Object.groupBy(n, (s) => s.type);
+  if (t.INSERT?.length) {
+    const s = t.INSERT.map(
+      (r) => ({
+        namespace: r.namespace,
+        entity: r.entity,
+        type: r.type,
+        id: r.entityId,
+        patch: r.patch,
+        inversePatch: null,
+        recordAt: r.createdAt
+      })
+    );
+    e.rxdb.dispatchEvent(new K(s));
   }
-}, Vt = (e, t) => {
-  const { tableName: n } = t, [s, r] = tt(n), o = e.rxdb.schemaManager.getEntityTypeByTableName(r, s);
+  if (t.UPDATE?.length) {
+    const s = t.UPDATE.map(
+      (r) => ({
+        namespace: r.namespace,
+        entity: r.entity,
+        type: r.type,
+        id: r.entityId,
+        patch: r.patch,
+        inversePatch: r.inversePatch,
+        recordAt: r.createdAt
+      })
+    );
+    e.rxdb.dispatchEvent(new Y(s));
+  }
+  if (t.DELETE?.length) {
+    const s = t.DELETE.map(
+      (r) => ({
+        namespace: r.namespace,
+        entity: r.entity,
+        type: r.type,
+        id: r.entityId,
+        patch: null,
+        inversePatch: r.inversePatch,
+        recordAt: r.createdAt
+      })
+    );
+    e.rxdb.dispatchEvent(new ce(s));
+  }
+}, Xt = (e, n) => {
+  const { tableName: t } = n, [s, r] = ot(t), o = e.rxdb.schemaManager.getEntityTypeByTableName(r, s);
   if (!o) return;
-  const i = e.getRepository(o), c = w(o), a = w(k);
-  i.findByRowIds(t.rowIds).then((l) => {
-    let u = l;
-    if (c === a) {
-      if (u = Ut(e, l), t.type === x.SQLITE_INSERT) {
-        Kt(e, u);
-        const f = u.map((d) => ({
-          namespace: c.namespace,
-          entity: c.name,
-          type: d.type,
-          id: d.id,
-          patch: { ...d },
-          inversePatch: null,
-          recordAt: d.createdAt
-        }));
-        e.rxdb.dispatchEvent(new B(f));
-      }
-    } else {
-      const f = Ot(t.type), d = u.map((p) => {
-        const h = {
-          namespace: c.namespace,
-          entity: c.name,
-          type: f,
-          id: p.id,
-          recordAt: p.createdAt || /* @__PURE__ */ new Date()
-        };
-        switch (t.type) {
-          case x.SQLITE_INSERT:
-            return {
-              ...h,
-              patch: { ...p },
-              inversePatch: null
-            };
-          case x.SQLITE_DELETE:
-            return {
-              ...h,
-              patch: null,
-              inversePatch: { ...p }
-            };
-          case x.SQLITE_UPDATE:
-            return {
-              ...h,
-              // TODO: 这里没有办法拿到变更前的数据，只能把整个 entity 作为 patch 返回, 可能会有问题，先这样处理
-              inversePatch: null,
-              patch: { ...p }
-            };
+  const i = e.getRepository(o), c = T(o), a = T(B);
+  i.findByRowIds(n.rowIds).then((l) => {
+    try {
+      let d = l;
+      if (c === a) {
+        if (d = Gt(e, l), n.type === v.SQLITE_INSERT) {
+          Jt(e, d);
+          const p = d.map((u) => ({
+            namespace: c.namespace,
+            entity: c.name,
+            type: u.type,
+            id: u.id,
+            patch: { ...u },
+            inversePatch: null,
+            recordAt: u.createdAt
+          }));
+          e.rxdb.dispatchEvent(new K(p));
+        }
+      } else {
+        const p = jt(n.type), u = d.map((h) => {
+          const f = {
+            namespace: c.namespace,
+            entity: c.name,
+            type: p,
+            id: h.id,
+            recordAt: h.createdAt || /* @__PURE__ */ new Date()
+          };
+          switch (n.type) {
+            case v.SQLITE_INSERT:
+              return {
+                ...f,
+                patch: { ...h },
+                inversePatch: null
+              };
+            case v.SQLITE_DELETE:
+              return {
+                ...f,
+                patch: null,
+                inversePatch: { ...h }
+              };
+            case v.SQLITE_UPDATE:
+              return {
+                ...f,
+                inversePatch: null,
+                patch: { ...h }
+              };
+          }
+        });
+        switch (p) {
+          case "UPDATE":
+            e.rxdb.dispatchEvent(
+              new Y(u)
+            );
+            break;
+          case "DELETE":
+            e.rxdb.dispatchEvent(
+              new ce(u)
+            );
+            break;
+          case "INSERT":
+            e.rxdb.dispatchEvent(
+              new K(u)
+            );
+            break;
         }
-      });
-      switch (f) {
-        case "UPDATE":
-          e.rxdb.dispatchEvent(
-            new G(d)
-          );
-          break;
-        case "DELETE":
-          e.rxdb.dispatchEvent(
-            new re(d)
-          );
-          break;
-        case "INSERT":
-          e.rxdb.dispatchEvent(
-            new B(d)
-          );
-          break;
       }
+    } catch (d) {
+      console.error(`[rxdb-adapter-sqlite] Error processing ${t} change event:`, d);
     }
   }).catch((l) => {
-    console.error("Failed to handle RxDBChange insert event", l);
+    console.error(`[rxdb-adapter-sqlite] Failed to query ${t} change (rowIds: ${n.rowIds}):`, l);
   });
-}, J = (e, t, n) => {
-  const { isCount: s, isFindDescendants: r, entityId: o, where: i } = n, c = !o, a = S(t), u = t.relationMap.get("parent").columnName;
-  let f = "";
-  const p = [`c.__level < ${n.level || 0}`, i && F(i, /* @__PURE__ */ new Map(), t, e)].filter(Boolean).join(" AND ");
-  p && (f = `WHERE ${p}`);
-  let h = "__children.*";
-  s ? c ? h = "count(*)" : h = "count(*)-1" : n.hasChildren && (h += `, EXISTS(SELECT 1 FROM "${a}" __sub WHERE __sub."${u}" = __children.id) AS hasChildren`);
-  const E = c ? `"${u}" is null` : `id = '${o}'`;
-  return {
-    sql: `WITH RECURSIVE __children AS (
-  SELECT *,rowid as ${L}, 0 AS __level
+}, z = (e, n, t) => {
+  const { isCount: s, isFindDescendants: r, entityId: o, where: i } = t, c = !o, a = A(n), d = n.relationMap.get("parent").columnName;
+  let p = "";
+  const h = [`c.__level < ${t.level || 0}`, i && U(i, /* @__PURE__ */ new Map(), n, e)].filter(Boolean).join(" AND ");
+  h && (p = `WHERE ${h}`);
+  let f = "__children.*";
+  s ? c ? f = "count(*)" : f = "count(*)-1" : t.hasChildren && (f += `, EXISTS(SELECT 1 FROM "${a}" __sub WHERE __sub."${d}" = __children.id) AS hasChildren`);
+  const y = [];
+  let m;
+  return c ? m = `"${d}" is null` : (m = "id = ?", y.push(o)), { sql: `WITH RECURSIVE __children AS (
+  SELECT *,rowid as ${q}, 0 AS __level
   FROM "${a}"
-  WHERE ${E}
+  WHERE ${m}
   UNION ALL
-  SELECT children.*,children.rowid as ${L}, c.__level + 1 AS __level
+  SELECT children.*,children.rowid as ${q}, c.__level + 1 AS __level
   FROM "${a}" children
-  JOIN __children c ON ${r ? `children."${u}" = c.id` : `children.id = c."${u}"`}
-  ${f}
+  JOIN __children c ON ${r ? `children."${d}" = c.id` : `children.id = c."${d}"`}
+  ${p}
 )
 
-SELECT ${h} FROM __children ORDER BY __level, id;`
-  };
-}, Ht = (e, t, n) => J(e, t, {
-  ...n,
+SELECT ${f} FROM __children ORDER BY __level, id;`, params: y };
+}, Yt = (e, n, t) => z(e, n, {
+  ...t,
   isFindDescendants: !0,
-  hasChildren: t.features?.tree?.hasChildren
-}), Qt = (e, t, n) => J(e, t, { ...n, isFindDescendants: !0, isCount: !0 }), Gt = (e, t, n) => J(e, t, {
-  ...n,
+  hasChildren: n.features?.tree?.hasChildren
+}), zt = (e, n, t) => z(e, n, { ...t, isFindDescendants: !0, isCount: !0 }), Zt = (e, n, t) => z(e, n, {
+  ...t,
   isFindDescendants: !1,
-  hasChildren: t.features?.tree?.hasChildren
-}), Jt = (e, t, n) => J(e, t, { ...n, isFindDescendants: !1, isCount: !0 });
-class Yt extends Ce {
-  async findDescendants(t) {
-    const { sql: n } = Ht(this.adapter, this.metadata, t), s = await this.adapter.query(n);
-    return this.addQueryCache(s, !0);
-  }
-  async countDescendants(t) {
-    const { sql: n } = Qt(this.adapter, this.metadata, t);
-    return (await this.adapter.query(n)).results[0].rows[0][0];
-  }
-  async findAncestors(t) {
-    const { sql: n } = Gt(this.adapter, this.metadata, t), s = await this.adapter.query(n);
-    return this.addQueryCache(s);
+  hasChildren: n.features?.tree?.hasChildren
+}), en = (e, n, t) => z(e, n, { ...t, isFindDescendants: !1, isCount: !0 });
+class tn extends je {
+  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);
+  }
+  async countDescendants(n) {
+    const { sql: t, params: s } = zt(this.adapter, this.metadata, n);
+    return (await this.adapter.query(t, s)).results[0].rows[0][0];
+  }
+  async findAncestors(n) {
+    const { sql: t, params: s } = Zt(this.adapter, this.metadata, n), r = await this.adapter.query(t, s);
+    return this.addQueryCache(r);
   }
-  async countAncestors(t) {
-    const { sql: n } = Jt(this.adapter, this.metadata, t);
-    return (await this.adapter.query(n)).results[0].rows[0][0];
+  async countAncestors(n) {
+    const { sql: t, params: s } = en(this.adapter, this.metadata, n);
+    return (await this.adapter.query(t, s)).results[0].rows[0][0];
   }
 }
-const Xt = (e, t) => {
-  const n = S(e), s = t.map((r) => R(r.id)).join(",");
-  return `DELETE FROM "${n}" WHERE id in (${s});`;
-}, Le = (e, t, n) => {
-  const s = S(e), r = n?.userId && e.propertyMap.has("createdBy"), o = n?.userId && e.propertyMap.has("updatedBy"), i = [
-    ...Array.from(e.propertyMap.values()).map((l) => l.columnName),
+const nn = (e, n) => {
+  const t = A(e), s = n.map((r) => I(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 = [
+    ...Array.from(e.propertyMap.values()).map((h) => h.columnName),
     ...e.foreignKeyColumnNames || e.foreignKeyNames
-  ], c = [];
-  t.forEach((l) => {
-    const u = we(e, l);
-    r && (u.createdBy = n.userId), o && (u.updatedBy = n.userId);
-    const f = oe(e, u), d = [];
-    i.forEach((p) => {
-      const h = R(f[p]);
-      d.push(h);
-    }), c.push(d);
-  });
-  const a = c.map((l) => `(${l.join(",")})`).join(",");
-  return `INSERT INTO "${s}" (${i.join(",")}) VALUES ${a};`;
-}, _e = async (e, t, n) => {
-  const s = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Date();
-  let o = "";
-  const i = /* @__PURE__ */ new Set();
-  return t.create.forEach((c, a) => {
-    const l = Array.from(c);
-    l.forEach((m) => i.add(m));
-    const u = w(a), f = Le(u, l, e.rxdb.context), d = l.map((m) => m.id);
-    d.forEach((m) => s.set(m, a));
-    const { sql: p, params: h } = se(e, u, {
+  ], d = [], p = [];
+  return n.forEach((h) => {
+    const f = be(e, h);
+    r && (f.createdBy = t.userId), o && (f.updatedBy = t.userId), i && f.createdAt === void 0 && (f.createdAt = a), c && f.updatedAt === void 0 && (f.updatedAt = a);
+    const y = le(e, f), m = [];
+    l.forEach((_) => {
+      m.push("?"), d.push(y[_] ?? null);
+    }), p.push(`(${m.join(",")})`);
+  }), { sql: `INSERT INTO "${s}" (${l.join(",")}) VALUES ${p.join(",")};`, params: d };
+}, $e = 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), d = De(l, a, e.rxdb.context), p = F(d.sql, d.params), u = a.map((m) => m.id);
+    u.forEach((m) => t.set(m, c));
+    const { sql: h, params: f } = ie(e, l, {
       where: {
         combinator: "and",
-        rules: [{ field: "id", operator: "in", value: d }]
+        rules: [{ field: "id", operator: "in", value: u }]
       }
-    }), E = P(p, h);
-    o += f + E;
-  }), t.update.forEach((c, a) => {
-    const l = Array.from(c);
-    l.forEach((d) => i.add(d));
-    const u = w(a), f = Object.groupBy(l, (d) => {
-      const p = j(d);
-      return Ne(Object.keys(p.patch).sort());
+    }), y = F(h, f);
+    r += p + y;
+  }), n.update.forEach((i, c) => {
+    const a = Array.from(i);
+    a.forEach((p) => o.add(p));
+    const l = T(c), d = Object.groupBy(a, (p) => {
+      const u = D(p);
+      return Object.keys(u.patch).sort().join(",");
     });
-    Object.values(f).forEach((d) => {
-      const p = d[0], h = j(p), E = ie(u, d, h.patch, {
+    Object.values(d).forEach((p) => {
+      const u = p[0], h = D(u), f = de(l, p, h.patch, {
         ...e.rxdb.context,
         returning: !1,
-        updatedAt: r
-      }), m = P(E.sql, E.params);
-      o += m;
-      const N = d.map((T) => T.id);
-      N.forEach((T) => s.set(T, a));
-      const g = se(e, u, {
+        updatedAt: s
+      }), y = F(f.sql, f.params);
+      r += y;
+      const m = p.map(($) => $.id);
+      m.forEach(($) => t.set($, c));
+      const _ = ie(e, l, {
         where: {
           combinator: "and",
-          rules: [{ field: "id", operator: "in", value: N }]
+          rules: [{ field: "id", operator: "in", value: m }]
         }
-      }), $ = P(g.sql, g.params);
-      o += $;
+      }), N = F(_.sql, _.params);
+      r += N;
     });
-  }), t.remove.forEach((c, a) => {
-    const l = Array.from(c), u = w(a), f = Xt(u, l);
-    o += f;
-  }), o && (await e.query(o)).results.forEach(({ columns: a, rows: l }) => {
-    const u = a.findIndex((p) => p === "id"), f = a.findIndex((p) => p === L), d = e.rxdb.entityManager;
-    l.forEach((p) => {
-      const h = p[u], E = s.get(h), m = w(E);
-      if (d.hasEntityRef(E, h)) {
-        const N = d.getEntityRef(E, h), g = te(m, a, p);
-        e.getRepository(E).updateEntity(N, g);
-        const $ = j(N);
-        if ($.local = !0, f !== -1) {
-          const T = BigInt(p[f]);
-          e.cacheRowIdEntity(T, N);
+  }), n.remove.forEach((i, c) => {
+    const a = Array.from(i), l = T(c), d = nn(l, a);
+    r += d;
+  }), r && (await e.query(r)).results.forEach(({ columns: c, rows: a }) => {
+    const l = c.findIndex((u) => u === "id"), d = c.findIndex((u) => u === q), p = e.rxdb.entityManager;
+    a.forEach((u) => {
+      const h = u[l], f = t.get(h), y = T(f);
+      if (p.hasEntityRef(f, h)) {
+        const m = p.getEntityRef(f, h), _ = oe(y, c, u);
+        e.getRepository(f).updateEntity(m, _);
+        const N = D(m);
+        if (N.local = !0, d !== -1) {
+          const $ = BigInt(u[d]);
+          e.cacheRowIdEntity($, m);
         }
-        $.modified = !1;
+        N.modified = !1;
       }
     });
-  }), t.remove.forEach(
-    (c) => c.forEach((a) => {
-      i.add(a);
-      const l = j(a);
-      l.origin = structuredClone({ ...a }), l.modified = !1, l.removed = !0, l.local = !1;
+  }), n.remove.forEach(
+    (i) => i.forEach((c) => {
+      o.add(c);
+      const a = D(c);
+      a.origin = structuredClone({ ...c }), a.modified = !1, a.removed = !0, a.local = !1;
     })
-  ), Array.from(i);
-}, zt = (e, t) => {
-  const n = S(t);
-  let s = `CREATE TABLE "${n}" (`;
+  ), Array.from(o);
+}, sn = (e, n) => {
+  const t = A(n);
+  let s = `CREATE TABLE "${t}" (`;
   const r = [], o = [], i = [];
-  t.propertyMap.forEach((a) => {
+  n.propertyMap.forEach((a) => {
     const l = a.columnName;
-    let u = `"${l}" ${et(a)}`;
-    if (a.type === y.integer && a.primary ? u += " PRIMARY KEY AUTOINCREMENT" : (a.type === y.uuid || a.type === y.string) && a.primary && (u += " PRIMARY KEY", a.type === y.uuid && (u += " DEFAULT (lower(hex(randomblob(16))))")), !(a.type === y.uuid && a.primary) && Reflect.get(a, "default") !== void 0) {
-      let d = a.default;
-      de(a.default) && (d = a.default()), d === "CURRENT_TIMESTAMP" ? u += " DEFAULT(strftime('%FT%H:%M:%fZ'))" : (d = U(d, a), a.type === y.boolean || a.type === y.integer || a.type === y.number ? u += ` DEFAULT ${d}` : u += ` DEFAULT '${d}'`);
+    let d = `"${l}" ${rt(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) {
-      case y.json:
-      case y.keyValue:
-      case y.stringArray:
-      case y.numberArray:
+    switch (a.nullable || (d += " NOT NULL"), a.type) {
+      case E.json:
+      case E.keyValue:
+      case E.stringArray:
+      case E.numberArray:
         o.push(`CHECK ( JSON_VALID(${l})=1 )`);
         break;
-      case y.boolean:
+      case E.boolean:
         o.push(`CHECK (${l} in(0,1))`);
         break;
+      case E.enum:
+        if ("enum" in a && a.enum && a.enum.length > 0) {
+          const u = a.enum.map((h) => `'${String(h).replace(/'/g, "''")}'`).join(",");
+          o.push(`CHECK (${l} in(${u}))`);
+        }
+        break;
     }
     a.unique && r.push(
-      `CREATE UNIQUE INDEX ${he(t, a)} on "${n}"(${l});`
-    ), i.push(u);
-  }), t.relationMap.forEach((a) => {
-    if (a.kind === A.ONE_TO_ONE || a.kind === A.MANY_TO_ONE) {
-      const l = a.columnName, u = e.rxdb.schemaManager.getEntityMetadata(
+      `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, d = e.rxdb.schemaManager.getEntityMetadata(
         a.mappedEntity,
         a.mappedNamespace
       );
-      let f = "TEXT";
-      const d = u.propertyMap.get("id");
-      d.type === y.integer ? f = "INTEGER" : (d.type === y.uuid || d.type === y.string) && (f = "TEXT");
-      const p = a.onDelete === "SET NULL" || a.onUpdate === "SET NULL";
-      let h = `"${l}" ${f}`;
-      if (!a.nullable && !p && (h += " NOT NULL"), a.kind === A.MANY_TO_ONE && Reflect.get(a, "default") !== void 0) {
-        const E = a;
-        let m = E.default;
-        de(E.default) && (m = E.default()), h += ` DEFAULT ${m}`;
+      let 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 h = a.onDelete === "SET NULL" || a.onUpdate === "SET NULL";
+      let f = `"${l}" ${p}`;
+      if (!a.nullable && !h && (f += " NOT NULL"), a.kind === b.MANY_TO_ONE && a.default !== void 0) {
+        const y = a;
+        let m = y.default;
+        me(y.default) && (m = y.default()), f += ` DEFAULT ${m}`;
       }
       if (a.mappedEntity) {
-        const E = e.rxdb.schemaManager.getEntityMetadata(
+        const y = e.rxdb.schemaManager.getEntityMetadata(
           a.mappedEntity,
           a.mappedNamespace
-        ), m = q(
-          E?.tableName ?? a.mappedEntity,
+        ), m = k(
+          y?.tableName ?? a.mappedEntity,
           a.mappedNamespace
         );
-        h += ` REFERENCES ${m}(id)`, a.onDelete && (h += ` ON DELETE ${a.onDelete}`), a.onUpdate && (h += ` ON UPDATE ${a.onUpdate}`);
+        f += ` REFERENCES ${m}(id)`, a.onDelete && (f += ` ON DELETE ${a.onDelete}`), a.onUpdate && (f += ` ON UPDATE ${a.onUpdate}`);
       }
-      i.push(h), (a.unique || a.kind === A.ONE_TO_ONE) && r.push(
-        `CREATE UNIQUE INDEX ${he(t, a)} on "${n}"(${l});`
+      i.push(f), (a.unique || a.kind === b.ONE_TO_ONE) && r.push(
+        `CREATE UNIQUE INDEX ${_e(n, a)} on "${t}"(${l});`
       );
     }
   });
@@ -1268,208 +1311,219 @@ const Xt = (e, t) => {
 ${a}`).join(","), s += `
 );`;
   else
-    throw new O("columns is empty!");
+    throw new R("columns is empty!");
   return r.length && (s += `
 ` + r.join(`
-`)), t.indexes && t.indexes.length > 0 && t.indexes.forEach((a) => {
-    const l = `idx_${t.name}_${a.name}`, u = a.properties?.map((d) => {
-      const p = t.propertyMap.get(d);
-      if (p) return `"${p.columnName}"`;
-      const h = t.foreignKeyNames, E = t.foreignKeyColumnNames;
-      if (h && E) {
-        const m = h.indexOf(d);
-        if (m >= 0) return `"${E[m]}"`;
+`)), n.indexes && n.indexes.length > 0 && n.indexes.forEach((a) => {
+    const l = `idx_${n.name}_${a.name}`, d = a.properties?.map((u) => {
+      const h = n.propertyMap.get(u);
+      if (h) return `"${h.columnName}"`;
+      const f = n.foreignKeyNames, y = n.foreignKeyColumnNames;
+      if (f && y) {
+        const m = f.indexOf(u);
+        if (m >= 0) return `"${y[m]}"`;
       }
-      return `"${d}"`;
-    }).join(", ") || `"${a.name}"`, f = a.unique ? "UNIQUE " : "";
+      return `"${u}"`;
+    }).join(", ") || `"${a.name}"`, p = a.unique ? "UNIQUE " : "";
     s += `
-CREATE ${f}INDEX "${l}" ON "${n}"(${u});`;
+CREATE ${p}INDEX "${l}" ON "${t}"(${d});`;
   }), s;
-}, Zt = (e, t) => zt(e, t), ce = (e, t = {}) => {
-  const n = S(e), s = w(k), r = S(s), { propertyMap: o, name: i, foreignKeyNames: c, foreignKeyColumnNames: a, namespace: l } = e, u = [];
-  for (const [_, I] of o)
-    _ !== "id" && u.push({ jsName: _, dbColumn: I.columnName });
-  const f = a || c;
-  for (let _ = 0; _ < c.length; _++)
-    c[_] !== "id" && u.push({ jsName: c[_], dbColumn: f[_] });
-  const d = " type, namespace, entity, branchId, transactionId, entityId, inversePatch, patch", { transactionId: p, branchId: h } = t, E = R(p), m = R(h || "main"), N = `'${l}','${i}',${m},${E}`, g = (_, I, M) => o.get(I)?.type === y.boolean ? `CASE WHEN ${M}.${_} = 1 THEN 1 ELSE 0 END` : `${M}.${_}`, $ = `
-  DROP TRIGGER IF EXISTS ${n}_insert;
-  CREATE TRIGGER ${n}_insert AFTER INSERT ON "${n}"
+}, 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, d = [];
+  for (const [g, C] of o)
+    g !== "id" && d.push({ jsName: g, dbColumn: C.columnName });
+  const p = a || c;
+  for (let g = 0; g < c.length; g++)
+    c[g] !== "id" && d.push({ jsName: c[g], dbColumn: p[g] });
+  const u = " type, namespace, entity, branchId, transactionId, entityId, inversePatch, patch", { transactionId: h, branchId: f } = n, y = I(h), m = I(f || "main"), _ = `'${l}','${i}',${m},${y}`, 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 = `
+  DROP TRIGGER IF EXISTS ${t}_insert;
+  CREATE TRIGGER ${t}_insert AFTER INSERT ON "${t}"
   BEGIN
-    INSERT INTO ${r} (${d}) VALUES (
-    'INSERT',${N}, NEW.id, NULL,
-      json_object(${u.map((_) => `'${_.jsName}', ${g(_.dbColumn, _.jsName, "NEW")}`).join(`,
+    INSERT INTO ${r} (${u}) VALUES (
+    'INSERT',${_}, NEW.id, NULL,
+      json_object(${d.map((g) => `'${g.jsName}', ${$(g.dbColumn, g.jsName, "NEW")}`).join(`,
 `)})
     );
-  END;`, T = `
-  DROP TRIGGER IF EXISTS ${n}_update;
-  CREATE TRIGGER ${n}_update AFTER UPDATE ON "${n}"
-    WHEN ( ${u.map((_) => `OLD.${_.dbColumn} IS NOT NEW.${_.dbColumn}`).join(` OR
+  END;`, O = (g) => d.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}`;
+  }).join(`
+ UNION `), M = `
+  DROP TRIGGER IF EXISTS ${t}_update;
+  CREATE TRIGGER ${t}_update AFTER UPDATE ON "${t}"
+    WHEN ( ${d.map((g) => `OLD.${g.dbColumn} IS NOT NEW.${g.dbColumn}`).join(` OR
 `)} )
   BEGIN
-    INSERT INTO ${r} (${d}) VALUES (
-     'UPDATE',${N}, NEW.id,
+    INSERT INTO ${r} (${u}) VALUES (
+     'UPDATE',${_}, NEW.id,
       (
-        SELECT json_group_object(key, value) FROM (
-          ${u.map((_) => `SELECT '${_.jsName}' AS key, ${g(_.dbColumn, _.jsName, "OLD")} AS value WHERE OLD.${_.dbColumn} IS NOT NEW.${_.dbColumn}`).join(`
- UNION `)}
+        SELECT json_group_object(key, CASE WHEN is_json AND value IS NOT NULL THEN json(value) ELSE value END) FROM (
+          ${O("OLD")}
         )
       ),
       (
-        SELECT json_group_object(key, value) FROM (
-          ${u.map((_) => `SELECT '${_.jsName}' AS key, ${g(_.dbColumn, _.jsName, "NEW")} AS value WHERE OLD.${_.dbColumn} IS NOT NEW.${_.dbColumn}`).join(`
- UNION `)}
+        SELECT json_group_object(key, CASE WHEN is_json AND value IS NOT NULL THEN json(value) ELSE value END) FROM (
+          ${O("NEW")}
         )
       )
     );
-  END;`, C = `
-  DROP TRIGGER IF EXISTS ${n}_delete;
-  CREATE TRIGGER ${n}_delete AFTER DELETE ON "${n}"
+  END;`, j = `
+  DROP TRIGGER IF EXISTS ${t}_delete;
+  CREATE TRIGGER ${t}_delete AFTER DELETE ON "${t}"
   BEGIN
-    INSERT INTO ${r} (${d}) VALUES (
-      'DELETE',${N}, OLD.id,
-      json_object(${u.map((_) => `'${_.jsName}', ${g(_.dbColumn, _.jsName, "OLD")}`).join(`,
+    INSERT INTO ${r} (${u}) VALUES (
+      'DELETE',${_}, OLD.id,
+      json_object(${d.map((g) => `'${g.jsName}', ${$(g.dbColumn, g.jsName, "OLD")}`).join(`,
 `)}), NULL
     );
   END;`;
-  return $ + `
-` + T + `
-` + C;
-}, en = (e, t, n) => {
+  return L + `
+` + M + `
+` + j;
+}, on = (e, n, t) => {
   let s = "";
-  for (let r = 0; r < t.length; r++) {
-    const o = t[r], i = w(o);
+  for (let r = 0; r < n.length; r++) {
+    const o = n[r], i = T(o);
     if (s += `
-` + Zt(e, i), i.log !== !1) {
-      const c = ce(i);
+` + rn(e, i), i.log !== !1) {
+      const c = pe(i);
       s += `
 ` + c;
     }
   }
-  if (n) {
+  if (t) {
     const r = /* @__PURE__ */ new Map();
-    n.forEach((o) => {
-      const i = w(o);
+    t.forEach((o) => {
+      const i = T(o);
       r.has(i) === !1 && r.set(i, /* @__PURE__ */ new Set()), r.get(i).add(o);
     });
     for (const o of r.keys()) {
-      const i = Le(o, Array.from(r.get(o)), e.rxdb.context);
+      const i = De(
+        o,
+        Array.from(r.get(o)),
+        e.rxdb.context
+      );
       s += `
-` + i;
+` + F(i.sql, i.params);
     }
   }
   return s;
-}, tn = (e) => {
-  const t = S(e);
-  return `DROP TRIGGER IF EXISTS ${t}_insert;
-DROP TRIGGER IF EXISTS ${t}_update;
-DROP TRIGGER IF EXISTS ${t}_delete;`;
-}, je = (e) => {
-  let t = "";
-  return e.rxdb.config.entities.forEach((n) => {
-    const s = w(n);
-    s.log !== !1 && (t += tn(s));
-  }), t;
-}, xe = (e, t) => {
-  const { deletes: n, inserts: s, updates: r } = t, o = { deletes: [], inserts: [], updates: [] }, i = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map();
-  for (const [d, p] of n.entries()) {
-    const [h, E, m] = Y(d), N = `${h}:${E}`, g = i.get(N);
-    g ? g.add(m) : i.set(N, /* @__PURE__ */ new Set([m]));
-    let $ = c.get(N);
-    $ || ($ = /* @__PURE__ */ new Map(), c.set(N, $)), $.set(m, {
-      patch: p.patch,
-      inversePatch: p.inversePatch
+}, an = (e) => {
+  const n = A(e);
+  return `DROP TRIGGER IF EXISTS ${n}_insert;
+DROP TRIGGER IF EXISTS ${n}_update;
+DROP TRIGGER IF EXISTS ${n}_delete;`;
+}, ve = (e) => {
+  let n = "";
+  return e.rxdb.config.entities.forEach((t) => {
+    const s = T(t);
+    s.log !== !1 && (n += an(s));
+  }), n;
+}, Pe = (e, n) => {
+  const { deletes: t, inserts: s, updates: r } = n, o = { deletes: [], inserts: [], updates: [] }, i = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map();
+  for (const [u, h] of t.entries()) {
+    const [f, y, m] = ee(u), _ = `${f}:${y}`, N = i.get(_);
+    N ? N.add(m) : i.set(_, /* @__PURE__ */ new Set([m]));
+    let $ = c.get(_);
+    $ || ($ = /* @__PURE__ */ new Map(), c.set(_, $)), $.set(m, {
+      patch: h.patch,
+      inversePatch: h.inversePatch
     });
   }
-  for (const [d, p] of i) {
-    const [h, E] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(E, h), N = S(m), g = m.propertyMap.get("id").type === "integer";
+  for (const [u, h] of i) {
+    const [f, y] = u.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(y, f), _ = A(m), N = m.propertyMap.get("id").type === "integer";
     let $ = "";
-    g ? $ = Array.from(p).join(",") : $ = Array.from(p).map((C) => R(C)).join(",");
-    const T = `DELETE FROM "${N}" WHERE id in (${$});`;
+    N ? $ = Array.from(h).join(",") : $ = Array.from(h).map((L) => I(L)).join(",");
+    const S = `DELETE FROM "${_}" WHERE id in (${$});`;
     o.deletes.push({
       metadata: m,
-      ids: p,
-      sql: T,
-      changes: c.get(d)
+      ids: h,
+      sql: S,
+      changes: c.get(u)
     });
   }
   const a = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
-  for (const [d, p] of s.entries()) {
-    const [h, E, m] = Y(d), N = `${h}:${E}`, g = a.get(N), $ = { ...p.patch, id: m };
-    g ? g.push($) : a.set(N, [$]);
-    let T = l.get(N);
-    T || (T = /* @__PURE__ */ new Map(), l.set(N, T)), T.set(m, {
-      patch: p.patch,
-      inversePatch: p.inversePatch
+  for (const [u, h] of s.entries()) {
+    const [f, y, m] = ee(u), _ = `${f}:${y}`, N = a.get(_), $ = { ...h.patch, id: m };
+    N ? N.push($) : a.set(_, [$]);
+    let S = l.get(_);
+    S || (S = /* @__PURE__ */ new Map(), l.set(_, S)), S.set(m, {
+      patch: h.patch,
+      inversePatch: h.inversePatch
     });
   }
-  for (const [d, p] of a) {
-    const [h, E] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(E, h);
-    let N = "";
-    p.forEach((g) => {
-      for (const [_, I] of m.propertyMap)
-        g[_] === void 0 && I.default !== void 0 && (typeof I.default == "function" ? g[_] = I.default() : g[_] = I.default);
-      const { sql: $, params: T } = Oe(m, g, { useReplace: !0 }), C = P($, T);
-      N += C;
+  for (const [u, h] of a) {
+    const [f, y] = u.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(y, f);
+    let _ = "";
+    h.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, {
+        useReplace: !0
+      }), L = F($, S);
+      _ += L;
     }), o.inserts.push({
       metadata: m,
-      ids: new Set(p.filter((g) => g != null).map((g) => g.id)),
-      sql: N,
-      changes: l.get(d)
+      ids: new Set(h.filter((N) => N != null).map((N) => N.id)),
+      sql: _,
+      changes: l.get(u)
     });
   }
-  const u = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Map();
-  for (const [d, p] of r.entries()) {
-    const [h, E, m] = Y(d), N = `${h}:${E}`, g = u.get(N), $ = { ...p.patch, id: m };
-    g ? g.push($) : u.set(N, [$]);
-    let T = f.get(N);
-    T || (T = /* @__PURE__ */ new Map(), f.set(N, T));
-    const C = e.rxdb.schemaManager.getEntityMetadata(E, h), _ = p.patch ? { ...p.patch } : null, I = p.inversePatch ? { ...p.inversePatch } : null;
-    C && (_ && Object.keys(_).forEach((M) => {
-      const D = C.propertyMap.get(M);
-      D && (_[M] = v(_[M], D));
-    }), I && Object.keys(I).forEach((M) => {
-      const D = C.propertyMap.get(M);
-      D && (I[M] = v(I[M], D));
-    })), T.set(m, {
-      patch: _,
-      inversePatch: I
+  const d = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map();
+  for (const [u, h] of r.entries()) {
+    const [f, y, m] = ee(u), _ = `${f}:${y}`, N = d.get(_), $ = { ...h.patch, id: m };
+    N ? N.push($) : d.set(_, [$]);
+    let S = p.get(_);
+    S || (S = /* @__PURE__ */ new Map(), p.set(_, S));
+    const L = e.rxdb.schemaManager.getEntityMetadata(y, f), O = h.patch ? { ...h.patch } : null, M = h.inversePatch ? { ...h.inversePatch } : null;
+    L && (O && Object.keys(O).forEach((j) => {
+      const g = L.propertyMap.get(j);
+      g && (O[j] = P(O[j], g));
+    }), M && Object.keys(M).forEach((j) => {
+      const g = L.propertyMap.get(j);
+      g && (M[j] = P(M[j], g));
+    })), S.set(m, {
+      patch: O,
+      inversePatch: M
     });
   }
-  for (const [d, p] of u) {
-    const [h, E] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(E, h);
-    let N = "";
-    p.forEach((g) => {
+  for (const [u, h] of d) {
+    const [f, y] = u.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(y, f);
+    let _ = "";
+    h.forEach((N) => {
       let $;
-      m.propertyMap.has("updatedAt") && ($ = g.updatedAt);
-      const { id: T, ...C } = g, { sql: _, params: I } = ie(m, { id: T }, C, {
+      m.propertyMap.has("updatedAt") && ($ = N.updatedAt);
+      const { id: S, ...L } = N, { sql: O, params: M } = de(m, { id: S }, L, {
         updatedAt: $
       });
-      N += P(_, I);
+      _ += F(O, M);
     }), o.updates.push({
       metadata: m,
-      ids: new Set(p.filter((g) => g != null).map((g) => g.id)),
-      sql: N,
-      changes: f.get(d)
+      ids: new Set(h.filter((N) => N != null).map((N) => N.id)),
+      sql: _,
+      changes: p.get(u)
     });
   }
   return o;
-}, ve = (e, t) => {
-  let n = "";
+}, ke = (e, n) => {
+  let t = "";
   e.rxdb.config.entities.forEach((i) => {
-    const c = w(i);
+    const c = T(i);
     if (c.log !== !1)
       try {
-        const a = ce(c, {
-          branchId: t
+        const a = pe(c, {
+          branchId: n
         });
-        a.trim() && (n += a);
+        a.trim() && (t += a);
       } catch (a) {
         console.warn(`Failed to generate trigger SQL for entity ${c.name}:`, a);
       }
   });
-  const s = w(W), r = S(s), o = t.replace(/'/g, "''");
-  return n += `
+  const s = T(H), r = A(s), o = n.replace(/'/g, "''");
+  return t += `
     UPDATE "${r}"
     SET
       activated = CASE
@@ -1481,78 +1535,78 @@ DROP TRIGGER IF EXISTS ${t}_delete;`;
         ELSE updatedAt
       END
     WHERE id = '${o}' OR activated = 1
-    RETURNING rowid as ${L},*;
-    `, n;
-}, nn = async (e, t) => {
-  const { branchId: n, actions: s } = t, r = s && xe(e, s);
+    RETURNING rowid as ${q},*;
+    `, t;
+}, cn = async (e, n) => {
+  const { branchId: t, actions: s } = n, r = s && Pe(e, s);
   let o;
   try {
     await e.transaction(async (a) => {
-      const l = je(e);
+      const l = ve(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 = ve(e, n);
+    const i = ke(e, t);
     o = await e.internalQuery(i);
     const c = (a, l) => {
       if (l.length === 0) return;
-      const u = l.map((f) => {
-        const d = { ...f };
+      const d = l.map((p) => {
+        const u = { ...p };
         return {
           namespace: a.namespace,
           entity: a.name,
           type: "UPDATE",
-          id: f.id,
-          patch: d,
-          inversePatch: d,
-          recordAt: f.createdAt
+          id: p.id,
+          patch: u,
+          inversePatch: u,
+          recordAt: p.createdAt
         };
       });
-      e.rxdb.dispatchEvent(new G(u));
+      e.rxdb.dispatchEvent(new Y(d));
     };
     if (o) {
-      const a = Q(e, W, o, !0), l = w(W);
+      const a = X(e, H, o, !0), l = T(H);
       c(l, a);
     }
-    r && qe(e, r);
+    r && Fe(e, r);
   } catch (i) {
-    throw new O(`switch branch ${n} failed: ` + i);
+    throw new R(`switch branch ${t} failed`, { cause: i });
   }
 };
-async function sn(e, t, n = !1) {
+async function ln(e, n, t = !1) {
   if (await e.transaction(async (s) => {
-    if (n) {
-      const r = je(e);
+    if (t) {
+      const r = ve(e);
       r && await s.execute(r);
     }
-    for (const r of t.deletes)
+    for (const r of n.deletes)
       await s.execute(r.sql);
-    for (const r of t.inserts)
+    for (const r of n.inserts)
       r.successResults = await s.execute(r.sql);
-    for (const r of t.updates)
+    for (const r of n.updates)
       r.successResults = await s.execute(r.sql);
-  }, !1), n) {
-    const s = await e.rxdb.versionManager.getCurrentBranch(), r = ve(e, s.id);
+  }, !1), t) {
+    const s = await e.rxdb.versionManager.getCurrentBranch(), r = ke(e, s.id);
     await e.internalQuery(r);
   }
-  qe(e, t);
+  Fe(e, n);
 }
-function qe(e, t) {
-  for (const n of t.deletes) {
-    const s = X(n.metadata);
-    Rt(e, s, Array.from(n.ids));
-    const r = n.metadata, o = Array.from(n.ids).map((i) => {
-      const c = n.changes.get(String(i));
+function Fe(e, n) {
+  for (const t of n.deletes) {
+    const s = te(t.metadata);
+    Ct(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 {
         namespace: r.namespace,
         entity: r.name,
@@ -1563,11 +1617,11 @@ function qe(e, t) {
         recordAt: /* @__PURE__ */ new Date()
       };
     });
-    e.rxdb.dispatchEvent(new re(o));
+    e.rxdb.dispatchEvent(new ce(o));
   }
-  for (const n of t.inserts) {
-    const s = X(n.metadata), r = Q(e, s, n.successResults), o = n.metadata, i = r.map((c) => {
-      const a = n.changes.get(String(c.id));
+  for (const t of n.inserts) {
+    const s = te(t.metadata), r = X(e, s, t.successResults), o = t.metadata, i = r.map((c) => {
+      const a = t.changes.get(String(c.id));
       return {
         namespace: o.namespace,
         entity: o.name,
@@ -1578,11 +1632,11 @@ function qe(e, t) {
         recordAt: c.createdAt
       };
     });
-    e.rxdb.dispatchEvent(new B(i));
+    e.rxdb.dispatchEvent(new K(i));
   }
-  for (const n of t.updates) {
-    const s = X(n.metadata), r = Q(e, s, n.successResults, !0), o = n.metadata, i = r.map((c) => {
-      const a = n.changes.get(String(c.id));
+  for (const t of n.updates) {
+    const s = te(t.metadata), r = X(e, s, t.successResults, !0), o = t.metadata, i = r.map((c) => {
+      const a = t.changes.get(String(c.id));
       return {
         namespace: o.namespace,
         entity: o.name,
@@ -1593,34 +1647,34 @@ function qe(e, t) {
         recordAt: c.updatedAt || c.createdAt || /* @__PURE__ */ new Date()
       };
     });
-    e.rxdb.dispatchEvent(new G(i));
+    e.rxdb.dispatchEvent(new Y(i));
   }
 }
-const ye = (e, t, n) => {
+const Te = (e, n, t) => {
   let s = "";
   return e.rxdb.config.entities.forEach((r) => {
-    const o = w(r);
+    const o = T(r);
     if (o.log !== !1) {
-      const i = ce(o, {
-        branchId: t,
-        transactionId: n
+      const i = pe(o, {
+        branchId: n,
+        transactionId: t
       });
       s += `
 ` + i;
     }
   }), s;
 };
-class hn extends Be {
-  constructor(t, n) {
-    super(t), this.options = n, n.repositories && Object.keys(n.repositories).forEach((r) => {
-      this.repository(r, n.repositories[r]);
+class _n extends He {
+  constructor(n, t) {
+    super(n), this.options = t, t.repositories && Object.keys(t.repositories).forEach((r) => {
+      this.repository(r, t.repositories[r]);
     });
-    const s = Ge((r) => {
-      this.#a || Vt(this, r);
+    const s = ze((r) => {
+      this.#t || Xt(this, r);
     });
-    this.#t().then((r) => {
-      r.addEventListener(x.SQLITE_INSERT, s), r.addEventListener(x.SQLITE_UPDATE, s), r.addEventListener(x.SQLITE_DELETE, s);
-    }), this.repository("Repository", Ce), this.repository("TreeRepository", Yt);
+    this.#r().then((r) => {
+      r.addEventListener(v.SQLITE_INSERT, s), r.addEventListener(v.SQLITE_UPDATE, s), r.addEventListener(v.SQLITE_DELETE, s);
+    }).catch((r) => console.error("[RxDBAdapterSqlite] Failed to register event listeners", r)), this.repository("Repository", je), this.repository("TreeRepository", tn);
   }
   // SQLite 客户端缓存
   #n;
@@ -1631,88 +1685,87 @@ class hn extends Be {
    * 存储数据库行ID到实体UUID的映射关系
    * 用于在数据库操作中快速查找实体
    */
-  #r = /* @__PURE__ */ new Map();
-  #s = /* @__PURE__ */ new WeakMap();
+  #a = /* @__PURE__ */ new Map();
+  #o = /* @__PURE__ */ new WeakMap();
   // 查询任务队列执行器
-  #c = new ge(1);
+  #c = new we(1);
   // sqlite 客户端
-  #o;
+  #s;
   // 是否已断开连接
-  #a = !1;
+  #t = !1;
   /**
    * 适配器名称
    */
-  name = Ct;
+  name = xt;
   /**
    * 获取实体仓库
    * @param EntityType 实体类
    */
-  getRepository(t) {
-    if (!this.repository_cache.has(t)) {
-      const n = w(t), s = this.repository_map.get(n.repository);
+  getRepository(n) {
+    if (!this.repository_cache.has(n)) {
+      const t = T(n), s = this.repository_map.get(t.repository);
       if (!s)
-        throw new O(`Repository '${n.repository}' not found`);
-      const r = new s(this, t);
-      return this.repository_cache.set(t, r), r;
+        throw new R(`Repository '${t.repository}' not found`);
+      const r = new s(this, n);
+      return this.repository_cache.set(n, r), r;
     }
-    return this.repository_cache.get(t);
+    return this.repository_cache.get(n);
   }
   /**
    * 连接 wab sqlite
    */
   async connect() {
-    return await this.#t(), this;
+    return await this.#r(), this;
   }
   /**
    * 断开连接
    */
   async disconnect() {
-    this.#a = !0, await this.#c.waitForAll(), this.#n && await this.#n.disconnect();
+    this.#t = !0, await this.#c.waitForAll(), this.#n && await this.#n.disconnect();
   }
   /**
    * 获取版本
    */
   async version() {
-    return await (await this.#t()).version();
+    return await (await this.#r()).version();
   }
   /**
    * 保存多个实体
-   * TODO: 优化事件
    * @param entities
    */
-  async saveMany(t) {
-    const n = ue({
-      need_save_entities: t,
+  async saveMany(n) {
+    const t = he({
+      need_save_entities: n,
       need_remove_entities: []
     });
-    return this.mutations(n);
+    return this.mutations(t);
   }
   /**
    * 删除多个实例
    * @param entities
    * @returns
    */
-  async removeMany(t) {
-    const n = ue({
+  async removeMany(n) {
+    const t = he({
       need_save_entities: [],
-      need_remove_entities: t
+      need_remove_entities: n
     });
-    return this.mutations(n);
+    return this.mutations(t);
   }
   /**
    * 批量修改实体（创建/更新/删除）
    * @param options
    */
-  async mutations(t) {
-    return this.#e ? await _e(this, t) : await this.transaction(() => _e(this, t));
+  async mutations(n) {
+    return this.#e ? await $e(this, n) : await this.transaction(() => $e(this, n));
   }
   /**
    * 判断表是否存在
    * @param EntityType
    */
-  async isTableExisted(t) {
-    const n = w(t), s = S(n), r = await this.#i(ze(s));
-    return Ze(r) === !1;
+  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;
   }
   /**
    * 创建表和初始化数据
@@ -1720,8 +1773,8 @@ class hn extends Be {
    * @param entities 视图数据
    * @returns
    */
-  async createTables(t, n) {
-    const s = en(this, t, n);
+  async createTables(n, t) {
+    const s = on(this, n, t);
     return await this.#i(s), !0;
   }
   /**
@@ -1729,8 +1782,8 @@ class hn extends Be {
    * @param options 切换选项
    * @returns
    */
-  async switchBranch(t) {
-    return nn(this, t);
+  async switchBranch(n) {
+    return cn(this, n);
   }
   /**
    * 应用压缩后的变更到本地实体表
@@ -1741,56 +1794,53 @@ class hn extends Be {
    * @param _localChanges - （已废弃）不再使用
    * @param disableTriggers - 是否禁用触发器（用于 pull 等操作，避免创建 RxDBChange）
    */
-  async mergeChanges(t, n, s = !1) {
-    const r = xe(this, t);
-    await sn(this, r, s);
+  async mergeChanges(n, t, s = !1) {
+    const r = Pe(this, n);
+    await ln(this, r, s);
   }
   /**
    * 缓存 RowId 与实体映射
    * @param rowId
    * @param entity
    */
-  cacheRowIdEntity(t, n) {
-    this.#l(n.constructor).set(t, n), this.#s.set(n, t);
+  cacheRowIdEntity(n, t) {
+    this.#l(t.constructor).set(n, t), this.#o.set(t, n);
   }
   /**
    * 移除缓存实体映射
    * @param entity
    */
-  removeCacheEntity(t) {
-    const n = this.#s.get(t);
-    n !== void 0 && (this.#l(t.constructor).delete(n), this.#s.delete(t));
+  removeCacheEntity(n) {
+    const t = this.#o.get(n);
+    t !== void 0 && (this.#l(n.constructor).delete(t), this.#o.delete(n));
   }
   /**
    * 根据 RowId 获取实体
    * @param rowId
    * @returns
    */
-  getEntityByRowId(t, n) {
-    return this.#l(n).get(t);
+  getEntityByRowId(n, t) {
+    return this.#l(t).get(n);
   }
   /**
    * 根据实体获取 RowId
    * @param entity
    * @returns
    */
-  getRowIdByEntity(t) {
-    return this.#s.get(t);
+  getRowIdByEntity(n) {
+    return this.#o.get(n);
   }
   /**
    * 清空所有缓存
    */
-  async cleanAllCache() {
-    this.#r.clear(), this.#s = /* @__PURE__ */ new WeakMap();
+  cleanAllCache() {
+    this.#a.clear(), this.#o = /* @__PURE__ */ new WeakMap();
   }
   /**
    * 执行 SQL 语句
    */
-  query(t, n) {
-    return this.#c.addTask(
-      async () => (await this.rxdb.connect(this.name), (await this.#t()).execute(t, n)),
-      Ne([t, n])
-    );
+  query(n, t) {
+    return this.#t ? Promise.reject(new R("Adapter is disconnected")) : this.#c.addTask(async () => (await this.rxdb.connect(this.name), (await this.#r()).execute(n, t)));
   }
   /**
    * 执行事务
@@ -1798,16 +1848,16 @@ class hn extends Be {
    * @param transactionLog 是否生成事务日志
    * @returns
    */
-  async transaction(t, n = !0) {
+  async transaction(n, t = !0) {
     await this.rxdb.connect(this.name);
-    const s = await this.#t();
-    this.#e = !0, this.rxdb.dispatchEvent(rn);
+    const s = await this.#r();
+    this.#e = !0, this.rxdb.dispatchEvent(un);
     let r = "", o = "";
-    if (n) {
-      const i = We(), c = await this.rxdb.versionManager.getCurrentBranch();
+    if (t) {
+      const i = Ve(), c = await this.rxdb.versionManager.getCurrentBranch();
       if (!c)
         throw new Error("currentBranch is undefined! Cannot start transaction with logging.");
-      r = ye(this, c.id, i), o = ye(this, c.id);
+      r = Te(this, c.id, i), o = Te(this, c.id);
     }
     await s.execute(`
           BEGIN;
@@ -1815,20 +1865,24 @@ class hn extends Be {
           ${r}
          `);
     try {
-      const i = await t(s);
+      const i = await n(s);
       return await s.execute(`${o}
-COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
+COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(pn), i;
     } catch (i) {
-      await s.execute("ROLLBACK"), this.#e = !1, this.rxdb.dispatchEvent(on);
+      try {
+        await s.execute("ROLLBACK");
+      } finally {
+        this.#e = !1, this.rxdb.dispatchEvent(dn);
+      }
       const c = i?.message || "Transaction Error";
-      throw new O(c);
+      throw new R(c, { cause: i });
     }
   }
   /**
    * 本地分支仓库
    */
   localRxDBBranch() {
-    return this.getRepository(W);
+    return this.getRepository(H);
   }
   /**
    * 内部查询
@@ -1836,30 +1890,30 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
    * @param sql
    * @returns
    */
-  internalQuery(t, n) {
-    return this.#i(t, n);
+  internalQuery(n, t) {
+    return this.#i(n, t);
   }
   /**
    * 本地变更仓库
    */
   localRxDBChange() {
-    return this.getRepository(k);
+    return this.getRepository(B);
   }
   /**
    * 获取 RxDBChange 表的当前序列值
    * @returns
    */
   async getRxDBChangeSequence() {
-    const t = pe(k);
-    return (await this.#i(`SELECT seq FROM sqlite_sequence WHERE name='${t}'`)).results[0].rows[0][0];
+    const n = ye(B);
+    return (await this.#i("SELECT seq FROM sqlite_sequence WHERE name = ?", [n])).results[0]?.rows?.[0]?.[0] ?? 0;
   }
   /**
    * 设置 RxDBChange 表的序列值
    * @param sequence 序列值
    */
-  async setRxDBChangeSequence(t) {
-    const n = pe(k);
-    await this.#i("UPDATE sqlite_sequence SET seq = ? WHERE name = ?", [t, n]);
+  async setRxDBChangeSequence(n) {
+    const t = ye(B);
+    await this.#i("UPDATE sqlite_sequence SET seq = ? WHERE name = ?", [n, t]);
   }
   // ============================================
   // QueryCache 方法
@@ -1879,13 +1933,13 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
    *   .subscribe(map => console.log(map.get('id1')));
    * ```
    */
-  getMetadataByIds(t, n) {
-    return z(() => {
-      if (n.length === 0)
-        return Z(/* @__PURE__ */ new Map());
-      const s = n.map(() => "?").join(", "), r = `SELECT id, updatedAt FROM "${t}" WHERE id IN (${s})`;
-      return ee(this.internalQuery(r, n)).pipe(
-        Je((o) => {
+  getMetadataByIds(n, t) {
+    return ne(() => {
+      if (t.length === 0)
+        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) => {
           const i = /* @__PURE__ */ new Map();
           if (o.results?.[0]?.rows)
             for (const c of o.results[0].rows)
@@ -1910,10 +1964,10 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
    *   .subscribe(() => console.log('upserted'));
    * ```
    */
-  upsertMany(t, n) {
-    return z(() => n.length === 0 ? Z(void 0) : ee(
+  upsertMany(n, t) {
+    return ne(() => t.length === 0 ? se(void 0) : re(
       (async () => {
-        const s = Object.keys(n[0]), r = `(${s.map(() => "?").join(", ")})`, o = n.map(() => r).join(", "), i = `INSERT OR REPLACE INTO "${t}" (${s.join(", ")}) VALUES ${o}`, c = n.flatMap((a) => s.map((l) => a[l]));
+        const s = Object.keys(t[0]), r = `(${s.map(() => "?").join(", ")})`, o = t.map(() => r).join(", "), i = `INSERT OR REPLACE INTO "${n}" (${s.join(", ")}) VALUES ${o}`, c = t.flatMap((a) => s.map((l) => a[l]));
         await this.internalQuery(i, c);
       })()
     ));
@@ -1931,12 +1985,12 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
    *   .subscribe(() => console.log('deleted'));
    * ```
    */
-  deleteByIds(t, n) {
-    return z(() => {
-      if (n.length === 0)
-        return Z(void 0);
-      const s = n.map(() => "?").join(", "), r = `DELETE FROM "${t}" WHERE id IN (${s})`;
-      return ee(this.internalQuery(r, n).then(() => {
+  deleteByIds(n, t) {
+    return ne(() => {
+      if (t.length === 0)
+        return se(void 0);
+      const s = t.map(() => "?").join(", "), r = `DELETE FROM "${n}" WHERE id IN (${s})`;
+      return re(this.internalQuery(r, t).then(() => {
       }));
     });
   }
@@ -1946,10 +2000,13 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
   /**
    * 获取 SQLite 客户端
    */
-  #t() {
-    return this.#o || (this.#o = Wt(this.rxdb.config.dbName, this.options).then(
-      (t) => (this.#n = t, t)
-    )), this.#o;
+  #r() {
+    return this.#s || (this.#s = Qt(this.rxdb.config.dbName, this.options).then(
+      (n) => (this.#n = n, n),
+      (n) => {
+        throw this.#s = void 0, n;
+      }
+    )), this.#s;
   }
   /**
    * 内部执行 sql
@@ -1957,23 +2014,23 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
    * @param sql
    * @param bindings
    */
-  async #i(t, n) {
-    return await (await this.#t()).execute(t, n);
+  async #i(n, t) {
+    return await (await this.#r()).execute(n, t);
   }
-  #l(t) {
-    return this.#r.has(t) === !1 && this.#r.set(t, /* @__PURE__ */ new Map()), this.#r.get(t);
+  #l(n) {
+    return this.#a.has(n) === !1 && this.#a.set(n, /* @__PURE__ */ new Map()), this.#a.get(n);
   }
 }
-const rn = new ke(), on = new Pe(), an = new Fe();
+const un = new Ue(), dn = new We(), pn = new Ke();
 export {
-  L as ROWID,
-  hn as RxDBAdapterSqlite,
-  O as RxDBAdapterSqliteError,
-  Pt as SqliteClient,
-  Ce as SqliteRepository,
-  jt as WA_SQLITE_VFS_LIST,
-  F as buildRuleGroup,
-  q as sqliteGetTableName,
-  S as sqliteGetTableNameByMetadata,
-  xt as sqliteLoad
+  q as ROWID,
+  _n as RxDBAdapterSqlite,
+  R as RxDBAdapterSqliteError,
+  Wt as SqliteClient,
+  je as SqliteRepository,
+  vt as WA_SQLITE_VFS_LIST,
+  U as buildRuleGroup,
+  k as sqliteGetTableName,
+  A as sqliteGetTableNameByMetadata,
+  Pt as sqliteLoad
 };