@aiao/rxdb-adapter-sqlite 0.0.10 → 0.0.12

package/dist/index.js

@@ -1,9 +1,9 @@
-import { getEntityMetadata as w, PropertyType as y, RelationKind as A, isRuleGroup as ce, getEntityStatus as C, RepositoryBase as je, RxDBChange as F, EntityLocalCreatedEvent as k, EntityLocalRemovedEvent as ne, EntityLocalUpdatedEvent as K, parseRxDBChangeKey as J, RxDBBranch as W, getEntityType as Y, TransactionBeginEvent as Fe, TransactionRollbackEvent as Pe, TransactionCommitEvent as Be, RxDBAdapterLocalBase as ke, getEntityMutations as le, uuid as We } from "@aiao/rxdb";
-import { pickBy as ye, isString as Ue, isNil as Ve, traverseObjectKeys as He, EventDispatcher as Qe, AsyncQueueExecutor as ge, get as Ke, isFunction as de } from "@aiao/utils";
-import { wrap as ue, proxy as Ge } from "comlink";
-import $e from "object-hash";
-import { defer as X, of as z, from as Z, map as Je } from "rxjs";
-import { Factory as Ye, SQLITE_ROW as Xe, SQLITE_UTF8 as Te, SQLITE_DETERMINISTIC as we } from "wa-sqlite";
+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) => {
   switch (e.type) {
     case y.uuid:
@@ -21,7 +21,7 @@ const ze = (e) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${e}
     default:
       return "TEXT";
   }
-}, se = (e, t) => {
+}, U = (e, t) => {
   if (e === null && t.nullable) return null;
   if (e !== void 0)
     switch (t.type) {
@@ -34,7 +34,7 @@ const ze = (e) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${e}
         if (t.properties && typeof e == "object" && !Array.isArray(e)) {
           const n = { ...e };
           return t.properties.forEach((s) => {
-            s.name in n && (n[s.name] = se(n[s.name], s));
+            s.name in n && (n[s.name] = U(n[s.name], s));
           }), JSON.stringify(n);
         }
         return JSON.stringify(e);
@@ -46,7 +46,7 @@ const ze = (e) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${e}
       default:
         return e;
     }
-}, D = (e, t) => {
+}, v = (e, t) => {
   if (e === null && t.nullable) return null;
   if (e !== void 0)
     switch (t.type) {
@@ -58,7 +58,7 @@ const ze = (e) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${e}
         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] = D(n[s.name], s));
+          s.name in n && (n[s.name] = v(n[s.name], s));
         }), n;
       }
       case y.json:
@@ -71,43 +71,94 @@ const ze = (e) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${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.name, e.namespace), he = (e) => S(w(e)), pe = (e, t) => `idx_${e.name}_${t.name}`;
-class b extends Error {
+}, 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, b.prototype);
+    super(t), this.name = "RxDBAdapterSqliteError", Object.setPrototypeOf(this, O.prototype);
   }
 }
-const re = (e, t) => {
-  const n = {}, s = Object.keys(t);
-  for (let r = 0; r < s.length; r++) {
-    const a = s[r];
-    if (a.endsWith("Id")) {
-      n[a] = t[a];
+const oe = (e, t) => {
+  const n = {}, s = Object.keys(t), 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];
+      continue;
+    }
+    if (o.indexOf(c) !== -1) {
+      n[c] = t[c];
+      continue;
+    }
+    if (r.length === 0 && c.endsWith("Id")) {
+      n[c] = t[c];
+      continue;
+    }
+    const u = e.propertyMap.get(c);
+    if (u) {
+      n[u.columnName] = U(t[c], u);
       continue;
     }
-    const i = e.propertyMap.get(a);
-    i && (n[a] = se(t[a], i));
+    const d = e.columnNameToPropertyName?.get(c);
+    if (d) {
+      const p = e.propertyMap.get(d);
+      p && (n[c] = U(t[c], p));
+    }
   }
   return n;
-}, Ne = (e, t) => ye(t, (n, s) => e.propertyMap.has(s) || e.foreignKeyNames.includes(s)), nt = (e, t) => ye(t, (n, s) => {
-  const r = e.propertyMap.get(s);
-  if (r)
-    return r.readonly !== !0;
-  const a = e.foreignKeyRelationMap.get(s);
-  return a ? a.readonly !== !0 : e.computedPropertyMap.has(s) === !1;
-}), R = (e) => Ue(e) ? `'${e.replaceAll("'", "''")}'` : Ve(e) ? "NULL" : e, P = (e, t = []) => e.replace(/\?/g, () => R(t.shift())), ee = (e, t, n) => {
+}, we = (e, t) => {
+  const n = {};
+  for (const [o, i] of e.propertyMap)
+    o in t && (n[i.columnName] = t[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]);
+  }
+  return n;
+}, nt = (e, t) => {
+  const n = {};
+  for (const [o, i] of e.propertyMap)
+    o in t && i.readonly !== !0 && (n[i.columnName] = t[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) {
+      const c = e.foreignKeyRelationMap.get(i);
+      c && c.readonly !== !0 && (n[r[o]] = t[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) => {
   const s = {};
-  return n.forEach((r, a) => {
-    const i = t[a];
-    if (!i.startsWith("__"))
-      if (e.isForeignKey(i))
-        s[i] = r;
-      else {
-        const c = e.propertyMap.get(i) || e.computedPropertyMap.get(i);
-        c ? s[i] = D(r, c) : console.log(`Property ${i}=${r} not found in metadata ${e.name}`);
+  return n.forEach((r, o) => {
+    const i = t[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}`);
+      return;
+    }
+    const d = e.computedPropertyMap?.get(i);
+    if (d) {
+      s[i] = v(r, d);
+      return;
+    }
+    if (!u) {
+      const p = e.propertyMap.get(i);
+      if (p) {
+        s[i] = v(r, p);
+        return;
       }
+    }
+    console.log(`Column ${i}=${r} not found in metadata ${e.name}`);
   }), s;
-}, N = "_", st = {
+}, b = "_", st = {
   "=": "=",
   "!=": "!=",
   ">": ">",
@@ -124,20 +175,47 @@ const re = (e, t) => {
   notStartsWith: "NOT LIKE",
   endsWith: "LIKE",
   notEndsWith: "NOT LIKE"
-}, fe = (e, t) => {
+}, ne = (e, t) => {
+  if (t && e.includes(".")) {
+    const n = e.split("."), s = t.propertyMap.get(n[0]);
+    if (!s) return e;
+    if (s.type === y.keyValue)
+      return s.columnName;
+    for (let o = 0; o < n.length - 1; o++) {
+      const i = t.propertyMap.get(n[o]);
+      if (!i) return e;
+      if (i.type === y.keyValue)
+        return i.columnName;
+    }
+    const r = t.propertyMap.get(n[n.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 (o !== -1)
+      return r[o];
+  }
+  return e;
+}, me = (e, t, n) => {
   if (t) return t;
-  if (!e.includes(".")) return `${N}."${e}"`;
-  const n = e.lastIndexOf("."), s = e.slice(0, n), r = e.slice(n + 1);
-  return `"${s}"."${r}"`;
-}, Se = (e) => {
+  if (!e.includes(".")) {
+    const c = ne(e, n);
+    return `${b}."${c}"`;
+  }
+  const s = e.lastIndexOf("."), r = e.slice(0, s), o = e.slice(s + 1), i = ne(o, n);
+  return `"${r}"."${i}"`;
+}, be = (e) => {
   const { operator: t, value: n } = e;
   switch (t) {
     case "in":
     case "notIn":
-      return at(n);
+      return ot(n);
     case "between":
     case "notBetween":
-      return ot(n);
+      return at(n);
     case "contains":
     case "notContains":
       return R(`%${n}%`);
@@ -150,7 +228,7 @@ const re = (e, t) => {
     default:
       return it(n);
   }
-}, rt = (e) => st[e] || e, U = (e, t, n) => e.length === 1 ? n.name : `${t}_${n.name}`, at = (e) => !Array.isArray(e) || !e.length ? "(NULL)" : `(${e.map(R).join(", ")})`, ot = (e) => {
+}, 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) => {
   if (!Array.isArray(e) || e.length < 2) return "";
   const [t, n] = e;
   if (t == null || n == null) return "";
@@ -159,228 +237,257 @@ const re = (e, t) => {
 }, 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(([, o]) => o != null);
+  const r = Object.entries(n.value).filter(([, a]) => a != null);
   if (!r.length) return "";
-  const a = n.operator === "notContains" ? "NOT LIKE" : "LIKE", i = n.operator === "contains" ? " OR " : " AND ";
-  return `(${r.map(([o, l]) => {
-    const h = l instanceof Date ? l.toISOString() : typeof l == "string" ? l : String(l);
-    return `json_extract(${N}."${t}", '$.${o}') ${a} ${R(`%${h}%`)}`;
+  const o = n.operator === "notContains" ? "NOT LIKE" : "LIKE", i = n.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}%`)}`;
   }).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 = Se(n), a = `EXISTS (SELECT 1 FROM json_each(${N}."${t}") WHERE json_each.value IN ${r})`;
-  return n.operator === "notIn" ? `NOT ${a}` : a;
-}, dt = (e, t, n, s, r) => {
+  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 u = Et(e, n, s, (p, f) => {
-      const _ = /* @__PURE__ */ new Map();
-      return f.propertyMap.forEach((E, g) => {
-        _.set(g, `"child"."${g}"`);
-      }), r(p, _, f, s);
+    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);
     });
-    if (u !== null) return u;
+    if (d !== null) return d;
   }
   if (e.operator === "null" || e.operator === "notNull") {
-    const d = String(e.field), u = t.get(d), p = fe(d, u);
+    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 a = e.value === null, i = a ? "" : rt(e.operator).toLowerCase(), c = a ? e.operator === "=" ? "IS NULL" : e.operator === "!=" ? "IS NOT NULL" : "" : Se(e);
+  const o = e.value === null, i = o ? "" : rt(e.operator).toLowerCase(), c = o ? e.operator === "=" ? "IS NULL" : e.operator === "!=" ? "IS NOT NULL" : "" : be(e);
   if (!c && ["in", "notIn", "between", "notBetween"].includes(e.operator)) return "";
-  const o = String(e.field), l = t.get(o);
-  if (n && !o.includes(".") && (e.operator === "contains" || e.operator === "notContains")) {
-    const d = ct(n, o, e);
-    if (d !== null) return d;
+  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 && !o.includes(".") && (e.operator === "in" || e.operator === "notIn")) {
-    const d = lt(n, o, e);
-    if (d !== null) return d;
+  if (n && !a.includes(".") && (e.operator === "in" || e.operator === "notIn")) {
+    const f = lt(n, a, e);
+    if (f !== null) return f;
   }
-  return `${fe(o, l)} ${i} ${c}`.replace(/\s+/g, " ").trim();
-}, ae = (e) => e === N ? e : `"${e}"`, ut = (e, t, n) => {
+  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)
     throw new Error("_build_one_to_many_exists requires ONE_TO_MANY relation");
-  const s = q(t.name, t.namespace), r = "child", a = `${e.mappedProperty}Id`;
-  let i = `EXISTS (SELECT 1 FROM "${s}" "${r}"`;
-  return i += ` WHERE "${r}"."${a}" = ${N}."id"`, n && (i += ` AND ${n}`), i += ")", i;
-}, ht = (e, t, n) => {
-  const s = `${e.name}Id`;
+  const s = q(t.tableName, t.namespace), r = "child", o = t.relations.find((a) => a.name === e.mappedProperty);
+  if (!o)
+    throw new Error(
+      `Cannot find mappedProperty relation "${e.mappedProperty}" in entity "${t.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) => {
+  const s = e.columnName;
   if (!n)
-    return `${N}."${s}" IS NOT NULL`;
-  const r = q(t.name, t.namespace), a = "child";
-  let i = `EXISTS (SELECT 1 FROM "${r}" "${a}"`;
-  return i += ` WHERE ${N}."${s}" = "${a}"."id"`, i += ` AND ${n}`, i += ")", i;
+    return `${b}."${s}" IS NOT NULL`;
+  const r = q(t.tableName, t.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 a = s.rxdb.schemaManager.findMappedRelation(e, t);
-  if (a?.relation) {
-    const i = q(n.name, n.namespace), c = "child", o = `${a.relation.name}Id`;
+  const o = s.rxdb.schemaManager.findMappedRelation(e, t);
+  if (o?.relation) {
+    const i = q(n.tableName, n.namespace), c = "child", a = o.relation.columnName;
     let l = `EXISTS (SELECT 1 FROM "${i}" "${c}"`;
-    return l += ` WHERE "${c}"."${o}" = ${N}."id"`, r && (l += ` AND ${r}`), l += ")", l;
+    return l += ` WHERE "${c}"."${a}" = ${b}."id"`, r && (l += ` AND ${r}`), l += ")", l;
   } else {
-    const i = `${t.name}Id`;
+    const i = t.columnName;
     if (!r)
-      return `${N}."${i}" IS NOT NULL`;
-    const c = q(n.name, n.namespace), o = "child";
-    let l = `EXISTS (SELECT 1 FROM "${c}" "${o}"`;
-    return l += ` WHERE ${N}."${i}" = "${o}"."id"`, l += ` AND ${r}`, l += ")", l;
+      return `${b}."${i}" IS NOT NULL`;
+    const c = q(n.tableName, n.namespace), a = "child";
+    let l = `EXISTS (SELECT 1 FROM "${c}" "${a}"`;
+    return l += ` WHERE ${b}."${i}" = "${a}"."id"`, l += ` AND ${r}`, l += ")", l;
   }
-}, ft = (e, t, n, s) => {
-  const r = q(n.name, n.namespace), a = "child", i = t.junctionEntityType;
+}, ht = (e, t, n, s) => {
+  const r = q(n.tableName, n.namespace), o = "child", i = t.junctionEntityType;
   if (!i)
     throw new Error(`MANY_TO_MANY relation "${t.name}" missing junctionEntityType`);
   const c = w(i);
   if (!c)
     throw new Error("Cannot find metadata for junction entity");
-  const o = q(c.name, c.namespace), l = "junction", h = c.relations.find(
-    (_) => _.mappedEntity === e.name && _.mappedNamespace === e.namespace
+  const a = q(c.tableName, c.namespace), l = "junction", u = c.relations.find(
+    (E) => E.mappedEntity === e.name && E.mappedNamespace === e.namespace
   );
-  if (!h)
+  if (!u)
     throw new Error(
       `Cannot find relation in junction entity ${c.name} pointing to ${e.name}`
     );
-  const d = c.relations.find(
-    (_) => _.mappedEntity === n.name && _.mappedNamespace === n.namespace
+  const f = c.relations.find(
+    (E) => E.mappedEntity === n.name && E.mappedNamespace === n.namespace
   );
-  if (!d)
+  if (!f)
     throw new Error(
       `Cannot find relation in junction entity ${c.name} pointing to ${n.name}`
     );
-  const u = `${h.name}Id`, p = `${d.name}Id`;
-  let f = `EXISTS (SELECT 1 FROM "${r}" "${a}"`;
-  return f += ` INNER JOIN "${o}" "${l}"`, f += ` ON "${l}"."${p}" = "${a}"."id"`, f += ` WHERE "${l}"."${u}" = ${N}."id"`, s && (f += ` AND ${s}`), f += ")", f;
-}, Et = (e, t, n, s) => {
+  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) => {
   if (e.operator !== "exists" && e.operator !== "notExists")
     return null;
   const r = t.relationMap.get(e.field);
   if (!r) return null;
-  const a = n.rxdb.schemaManager.getEntityMetadata(
+  const o = n.rxdb.schemaManager.getEntityMetadata(
     r.mappedEntity,
     r.mappedNamespace
   );
-  if (!a)
+  if (!o)
     throw new Error(`Cannot find metadata for entity: ${r.mappedNamespace}.${r.mappedEntity}`);
   let i;
-  e.where && s && (i = s(e.where, a));
+  e.where && s && (i = s(e.where, o));
   let c;
   switch (r.kind) {
     case A.ONE_TO_MANY:
-      c = ut(r, a, i);
+      c = dt(r, o, i);
       break;
     case A.MANY_TO_ONE:
-      c = ht(r, a, i);
+      c = ft(r, o, i);
       break;
     case A.ONE_TO_ONE:
-      c = pt(t, r, a, n, i);
+      c = pt(t, r, o, n, i);
       break;
     case A.MANY_TO_MANY:
-      c = ft(t, r, a, i);
+      c = ht(t, 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 = be(e, n);
+  const n = t.includes("_") ? t : t.split("_")[0], s = Ae(e, n);
   return e.relationAliasMap.set(t, s), s;
-}, _t = (e, t, n, s) => {
+}, Et = (e, t, n, s) => {
   const r = n.slice(0, s);
-  let a = t;
+  let o = t;
   const i = [];
   for (const c of r) {
-    if (!a?.relationMap.has(c))
+    if (!o?.relationMap.has(c))
       return { relPairs: [] };
-    const o = a.relationMap.get(c);
-    i.push({ metadata: a, relation: o }), a = e.rxdb.schemaManager.getEntityMetadata(o.mappedEntity, o.mappedNamespace);
+    const a = o.relationMap.get(c);
+    i.push({ metadata: o, relation: a }), o = e.rxdb.schemaManager.getEntityMetadata(a.mappedEntity, a.mappedNamespace);
   }
-  return { metaWalker: a, relPairs: i };
-}, mt = (e, t, n, s, r) => {
-  for (let a = r.length - 1; a > 0; a--) {
-    const i = r.slice(a);
+  return { metaWalker: o, relPairs: i };
+}, _t = (e, t, n, 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: o } = _t(e, n, r, a);
-    if (!c || o.length === 0) continue;
-    const l = i[0], h = i.slice(1).join("."), d = c.propertyMap.get(l);
-    if (d && d.type === y.keyValue) {
-      const u = r.slice(0, a).join(".");
-      Ae(e, t, o, u);
-      const p = o[o.length - 1].relation, f = U(o, u, p), _ = V(t, f), E = h ? `$.${h}` : "$";
-      return t.fieldAliasMap.set(s, `json_extract("${_}"."${l}", '${E}')`), !0;
+    const { metaWalker: c, relPairs: a } = Et(e, n, 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;
     }
   }
   return !1;
-}, Ae = (e, t, n, s) => {
-  n.forEach(({ metadata: r, relation: a }, i) => {
-    let c = e.rxdb.schemaManager.findMappedRelation(r, a);
+}, Se = (e, t, n, s) => {
+  n.forEach(({ metadata: r, relation: o }, i) => {
+    let c = e.rxdb.schemaManager.findMappedRelation(r, o);
     if (!c)
-      if ((a.kind === A.ONE_TO_MANY || a.kind === A.MANY_TO_MANY) && "mappedProperty" in a) {
-        const d = r.relationMap.get(a.mappedProperty);
-        d && (c = { metadata: r, relation: d });
-      } else (a.kind === A.MANY_TO_ONE || a.kind === A.ONE_TO_ONE) && (c = { metadata: r, relation: a });
-    if (!c) throw new b("mappedRelation not found");
-    const o = U(n, s, a), l = V(t, o);
-    let h = N;
+      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 (i > 0) {
-      const d = n[i - 1], u = U(n, s, d.relation);
-      h = V(t, u);
+      const f = n[i - 1], d = K(n, s, f.relation);
+      u = V(t, d);
     }
-    switch (a.kind) {
+    switch (o.kind) {
       case A.ONE_TO_MANY:
-        yt(t, c, l, h);
+        yt(
+          t,
+          c,
+          l,
+          u
+        );
         break;
       case A.ONE_TO_ONE:
       case A.MANY_TO_ONE:
-        gt(t, c, l, h, a);
+        gt(
+          t,
+          c,
+          l,
+          u,
+          o
+        );
         break;
       case A.MANY_TO_MANY:
-        $t(e, t, c, l, h, a);
+        Nt(
+          e,
+          t,
+          c,
+          l,
+          u,
+          o
+        );
         break;
     }
   });
 }, yt = (e, t, n, s) => {
-  const r = H(e, t.metadata), a = `"${n}".${t.relation.name}Id = ${ae(s)}.id`;
-  r.find((c) => c.joinTableName === n && c.on === a) || r.push({
+  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,
-    on: a
+    on: o
   });
 }, gt = (e, t, n, s, r) => {
-  const a = H(e, t.metadata), i = `"${n}".id = ${ae(s)}.${r.name}Id`;
-  a.find((o) => o.joinTableName === n && o.on === i) || a.push({
+  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,
     on: i
   });
-}, $t = (e, t, n, s, r, a) => {
-  const i = w(a.junctionEntityType), c = H(t, i), o = be(t, `${a.name}_m_n`), l = `"${o}".${n.relation.name}Id = ${ae(r)}.id`;
+}, 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`;
   c.find(
-    (f) => f.joinTableName === o && f.on === l
+    (h) => h.joinTableName === a && h.on === l
   ) || c.push({
-    joinTableName: o,
+    joinTableName: a,
     on: l
   });
-  const d = H(t, n.metadata), u = `"${s}".id = "${o}".${a.name}Id`;
-  d.find((f) => f.joinTableName === s && f.on === u) || d.push({
+  const f = H(t, n.metadata), d = `"${s}".id = "${a}".${o.columnName}`;
+  f.find((h) => h.joinTableName === s && h.on === d) || f.push({
     joinTableName: s,
-    on: u
+    on: d
   });
-}, H = (e, t) => (e.joinMap.has(t) || e.joinMap.set(t, []), e.joinMap.get(t)), be = (e, t) => {
+}, 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;
-}, Tt = (e) => {
+}, $t = (e, t) => {
   if (e?.length)
-    return e.map((t) => `${N}."${t.field}" ${t.sort}`).join(", ");
-}, B = (e, t = /* @__PURE__ */ new Map(), n, s) => {
+    return e.map((n) => {
+      const s = ne(n.field, t);
+      return `${b}."${s}" ${n.sort}`;
+    }).join(", ");
+}, F = (e, t = /* @__PURE__ */ new Map(), n, s) => {
   if (!e?.rules) return "";
   const r = e.rules.map(
-    (a) => ce(a) ? B(a, t, n, s) : dt(a, t, n, s, B)
+    (o) => le(o) ? F(o, t, n, s) : ut(o, t, n, s, F)
   ).filter(Boolean);
-  return r.length ? r.length === 1 ? r[0] : `(${r.join(ce(e) ? ` ${e.combinator} ` : " ")})` : "";
+  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: a, join: i, hasJoin: c, metadata: o } = e;
-  let l = `${N}.rowid as ${L}, ${N}.*`;
-  o.features?.tree?.hasChildren && o.features?.tree?.type === "adjacency-list" && (l += `, EXISTS(SELECT 1 FROM "${t}" __sub WHERE __sub."parentId" = ${N}."id") AS "hasChildren"`);
-  const h = [`SELECT ${c ? "DISTINCT " : ""}${l} FROM "${t}" ${N}`];
-  return i && h.push(i), n && h.push(` WHERE ${n}`), a && h.push(` ORDER BY ${a}`), s && h.push(` LIMIT ${s}`), r && h.push(` OFFSET ${r}`), h.join("") + ";";
+  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}.*`;
+  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 = [`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 s = {
     joinMap: /* @__PURE__ */ new Map(),
@@ -388,27 +495,27 @@ const re = (e, t) => {
     fieldAliasMap: /* @__PURE__ */ new Map(),
     relationAliasMap: /* @__PURE__ */ new Map()
   };
-  He(n, (a, i, c) => {
-    const o = i;
-    a !== "field" || !o.includes(".") || Nt(e, s, t, o, c);
+  Ve(n, (o, i, c) => {
+    const a = i;
+    o !== "field" || !a.includes(".") || wt(e, s, t, a, c);
   });
   const r = [];
-  for (const [a, i] of s.joinMap.entries()) {
-    const c = S(a);
-    for (const o of i)
-      r.push(` LEFT JOIN "${c}" "${o.joinTableName}" ON ${o.on}`);
+  for (const [o, i] of s.joinMap.entries()) {
+    const c = S(o);
+    for (const a of i)
+      r.push(` LEFT JOIN "${c}" "${a.joinTableName}" ON ${a.on}`);
   }
   return { joinSQL: r.join(""), fieldAliasMap: s.fieldAliasMap };
-}, wt = (e, t, n, s) => {
+}, Tt = (e, t, n, s) => {
   if (s.length <= 1) return !1;
-  const [r, ...a] = s, i = t.propertyMap.get(r);
-  if (i && i.type === y.keyValue && a.length > 0) {
-    const c = a.join(".");
-    return e.fieldAliasMap.set(n, `json_extract(${N}."${r}", '$.${c}')`), !0;
+  const [r, ...o] = s, i = t.propertyMap.get(r);
+  if (i && i.type === y.keyValue && o.length > 0) {
+    const c = o.join(".");
+    return e.fieldAliasMap.set(n, `json_extract(${b}."${i.columnName}", '$.${c}')`), !0;
   }
   return !1;
-}, Nt = (e, t, n, s, r) => {
-  const a = s.split(".");
+}, wt = (e, t, n, s, r) => {
+  const o = s.split(".");
   try {
     const i = e.rxdb.schemaManager.getFieldRelations(n, s);
     if (i.isForeignKey) {
@@ -416,109 +523,103 @@ const re = (e, t) => {
       return;
     }
     const c = s.replace(`.${i.propertyName}`, "");
-    Ae(e, t, i.relations, c);
-    const o = i.relations[i.relations.length - 1];
-    if (e.rxdb.schemaManager.findMappedRelation(
-      o.metadata,
-      o.relation
-    )) {
-      const h = U(i.relations, c, o.relation), d = V(t, h);
-      t.fieldAliasMap.set(s, `"${d}"."${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}"`);
     return;
   } catch {
   }
-  wt(t, n, s, a) || mt(e, t, n, s, a);
-}, St = (e, t) => {
+  Tt(t, n, s, o) || _t(e, t, n, s, o);
+}, bt = (e, t) => {
   const n = S(e), s = [t.id];
   return {
     sql: `DELETE FROM "${n}" WHERE id = ?;`,
     params: s
   };
 }, Oe = (e, t, n) => {
-  const s = S(e), r = Ne(e, t);
+  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));
-  const a = /* @__PURE__ */ new Date();
-  e.propertyMap.has("createdAt") && r.createdAt === void 0 && (r.createdAt = n?.createdAt ?? a), e.propertyMap.has("updatedAt") && r.updatedAt === void 0 && (r.updatedAt = n?.updatedAt ?? a);
-  const i = Object.keys(r), c = re(e, r), o = Array(i.length).fill("?").join(","), l = Object.values(c);
-  let d = `${n?.useReplace ? "INSERT OR REPLACE" : "INSERT"} INTO "${s}" (${i.join(",")}) VALUES (${o})`;
-  return n?.returning !== !1 ? d += ` RETURNING rowid as ${L}, *;` : d += ";", {
-    sql: d,
+  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,
     params: l
   };
-}, oe = (e, t, n, s) => {
+}, ie = (e, t, n, s) => {
   const r = nt(e, n);
   e.propertyMap.has("updatedAt") && (r.updatedAt = s?.updatedAt ?? /* @__PURE__ */ new Date()), s?.userId && e.propertyMap.has("updatedBy") && (r.updatedBy = s.userId);
-  const a = re(e, r), i = Object.keys(r).map((u) => `${u} = ?`).join(","), c = [...Object.values(a)], o = S(e), l = Array.isArray(t), h = l ? t : [t];
-  let d = `UPDATE "${o}" SET ${i} WHERE id `;
-  return l ? d += `in (${h.map((u) => R(u.id)).join(",")})` : (c.push(t.id), d += "= ?"), s?.returning !== !1 ? d += ` RETURNING rowid as ${L}, *;` : d += ";", {
-    sql: d,
+  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,
     params: c
   };
-}, At = (e, t, n) => {
+}, St = (e, t, n) => {
   if (n.groupBy)
-    throw new b("groupBy not supported yet");
-  const { joinSQL: s, fieldAliasMap: r } = Ie(e, t, n.where), a = S(t), i = B(n.where, r, t, e), c = [`SELECT COUNT(${N}.rowid) AS count FROM "${a}" ${N}`];
+    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}`];
   return s && c.push(s), i && c.push(` WHERE ${i}`), { sql: c.join("") };
-}, te = (e, t, n) => {
+}, se = (e, t, n) => {
   const { joinSQL: s, fieldAliasMap: r } = Ie(e, t, n.where);
   return { sql: Re({
     tableName: S(t),
-    where: B(n.where, r, t, e),
-    orderBy: Tt(n.orderBy),
+    where: F(n.where, r, t, e),
+    orderBy: $t(n.orderBy, t),
     join: s,
     hasJoin: !!s,
     metadata: t,
     limit: n.limit,
     offset: n.offset
   }) };
-}, bt = (e, t) => ({ sql: Re({
+}, At = (e, t) => ({ sql: Re({
   tableName: S(e),
   where: `${L} IN (${t.join(",")})`,
   metadata: e
 }) }), Q = (e, t, n, s = !1) => {
-  const r = [], a = w(t), i = e.rxdb.entityManager;
-  return n.results.forEach(({ columns: c, rows: o }) => {
-    const l = c.findIndex((d) => d === "id"), h = c.findIndex((d) => d === L);
-    o.forEach((d) => {
-      const u = d[l];
+  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, u)) {
-        p = i.getEntityRef(t, u);
-        const E = ee(a, c, d);
-        if (a.computedPropertyMap.forEach((g, $) => {
-          $ in E && (p[$] = E[$]);
+      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]);
         }), s) {
-          const g = C(p);
-          g.origin = { ...E }, Object.assign(p, E);
+          const N = j(p);
+          N.origin = { ...m }, Object.assign(p, m);
         }
       } else {
-        const E = ee(a, c, d);
-        p = i.createEntityRef(t, E);
+        const m = te(o, c, f);
+        p = i.createEntityRef(t, m);
       }
       r.push(p);
-      const _ = C(p);
-      if (_.local = !0, _.modified = !1, h !== -1) {
-        const E = BigInt(d[h]);
-        e.cacheRowIdEntity(E, p);
+      const E = j(p);
+      if (E.local = !0, E.modified = !1, u !== -1) {
+        const m = BigInt(f[u]);
+        e.cacheRowIdEntity(m, p);
       }
     });
   }), r;
 }, Rt = (e, t, n) => {
   n.forEach((s) => {
     if (e.rxdb.entityManager.hasEntityRef(t, s)) {
-      const r = e.rxdb.entityManager.getEntityRef(t, s), a = C(r);
-      a.local = !1, a.removed = !0, a.modified = !1;
+      const r = e.rxdb.entityManager.getEntityRef(t, s), o = j(r);
+      o.local = !1, o.removed = !0, o.modified = !1;
     }
   });
 };
-class It extends je {
+class It extends De {
   constructor(t, n) {
     super(t.rxdb, n), this.adapter = t, this.metadata = w(n);
   }
   metadata;
   async findByRowIds(t) {
-    const { sql: n, params: s } = bt(this.metadata, t), r = await this.adapter.query(n, s);
+    const { sql: n, params: s } = At(this.metadata, t), r = await this.adapter.query(n, s);
     return this.addQueryCache(r);
   }
   /**
@@ -530,7 +631,7 @@ class It extends je {
     return Q(this.adapter, this.EntityType, t, n);
   }
 }
-class Me extends It {
+class Ce extends It {
   async get(t) {
     const n = {
       where: {
@@ -538,18 +639,18 @@ class Me extends It {
         rules: [{ field: "id", operator: "=", value: t }]
       }
     }, s = await this.findOne(n);
-    if (!s) throw new b(`Entity (${t}) not found`);
+    if (!s) throw new O(`Entity (${t}) not found`);
     return s;
   }
   async findOne(t) {
     return (await this.find({ ...t, limit: 1, offset: 0 }))[0];
   }
   async find(t) {
-    const { sql: n, params: s } = te(this.adapter, this.metadata, t), r = await this.adapter.query(n, s);
+    const { sql: n, params: s } = se(this.adapter, this.metadata, t), r = await this.adapter.query(n, s);
     return this.addQueryCache(r);
   }
   async count(t) {
-    const { sql: n, params: s } = At(this.adapter, this.metadata, 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 create(t) {
@@ -557,22 +658,22 @@ class Me extends It {
     return this.addQueryCache(r, !0), t;
   }
   async update(t, n) {
-    const { sql: s, params: r } = oe(this.metadata, t, n, this.rxdb.context), a = await this.adapter.query(s, r);
-    return this.addQueryCache(a, !0), t;
+    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 remove(t) {
-    const n = C(t), s = () => {
+    const n = j(t), s = () => {
       n.origin = structuredClone({ ...t }), n.modified = !1, n.removed = !0;
     };
     if (n.local === !0) {
-      const { sql: a, params: i } = St(this.metadata, t);
-      return await this.adapter.query(a, i), s(), t;
+      const { sql: o, params: i } = bt(this.metadata, t);
+      return await this.adapter.query(o, i), s(), t;
     }
     const r = w(t);
-    throw new b(`Remove Error${r.name}(${t.id}) not saved local.`);
+    throw new O(`Remove Error${r.name}(${t.id}) not saved local.`);
   }
 }
-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 || {});
+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) => {
   switch (e) {
     case 18:
@@ -582,7 +683,7 @@ const Ot = (e) => {
     case 23:
       return "UPDATE";
   }
-}, Mt = "sqlite", Lt = () => import("wa-sqlite/dist/wa-sqlite-async.mjs").then((e) => e.default), Ct = () => import("wa-sqlite/dist/wa-sqlite.mjs").then((e) => e.default), vt = [
+}, 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 = [
   {
     name: "MemoryVFS",
     vfsModule: () => import("wa-sqlite/src/examples/MemoryVFS.js").then((e) => e.MemoryVFS),
@@ -666,61 +767,63 @@ const Ot = (e) => {
     jsContext: !1,
     multipleConnections: !0
   }
-], Le = (e) => {
-  const t = vt.find((a) => a.name === e.vfs), { vfs: n, async: s, worker: r } = e;
-  if (!t) throw new b(`vfs ${n} not found`);
+], 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`);
   if (s !== void 0) {
     if (s && !t.async)
-      throw new b(`vfs ${n} not support async: true`);
+      throw new O(`vfs ${n} not support async: true`);
     if (!s && !t.sync)
-      throw new b(`vfs ${n} not support async: false`);
+      throw new O(`vfs ${n} not support async: false`);
   }
-  if (r && !t.worker) throw new b(`vfs ${n} not support worker`);
-  if (!r && !t.jsContext) throw new b(`vfs ${n} only support worker`);
+  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;
-}, qt = async (e) => {
-  const t = Le(e), n = e.async ?? !0;
+}, xt = async (e) => {
+  const t = Me(e), n = e.async ?? !0;
   let s;
-  n ? s = Lt : s = Ct;
-  const [r, a] = await Promise.all([s(), t.vfsModule()]), i = {};
+  n ? s = Mt : s = Lt;
+  const [r, o] = await Promise.all([s(), t.vfsModule()]), i = {};
   e.locateFile ? i.locateFile = e.locateFile : e.wasmPath && (i.locateFile = () => e.wasmPath);
-  const c = await r(i), o = Ye(c), l = await a.create(e.vfs, c, t.vfsOptions);
-  return o.vfs_register(l, !0), o;
-}, xt = async (e, t, n, s) => {
-  const r = performance.now(), a = s ? [s] : [[]], i = [];
+  const c = await r(i), a = Ye(c), l = await o.create(e.vfs, c, t.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;
-  const o = {
+  const a = {
     sql: n,
     results: i
   };
   for await (const l of e.statements(t, n)) {
     if (s)
-      for (const u of a)
-        e.reset(l), e.bind_collection(l, u);
-    const h = [];
+      for (const d of o)
+        e.reset(l), e.bind_collection(l, d);
+    const u = [];
     for (; await e.step(l) === Xe; ) {
-      const u = e.row(l);
-      h.push(u);
+      const d = e.row(l);
+      u.push(d);
     }
-    const d = e.column_names(l);
-    d.length && i.push({ columns: d, rows: h }), c += e.changes(t);
+    const f = e.column_names(l);
+    f.length && i.push({ columns: f, rows: u }), c += e.changes(t);
   }
   return {
-    ...o,
+    ...a,
     rowsAffected: c,
     elapsed: performance.now() - r
   };
-}, Dt = {
+}
+const qt = {
   BALANCED: 16
-}, Ee = Dt.BALANCED, jt = 50 * 1024, Ft = /* @__PURE__ */ new Set(["public$RxDBChange", "public$RxDBBranch", "public$RxDBMigration"]);
-class Pt extends Qe {
+}, Ee = qt.BALANCED, Dt = 50 * 1024, kt = /* @__PURE__ */ new Set(["public$rxdb_change", "public$rxdb_branch", "public$rxdb_migration"]);
+class Pt extends He {
   #n;
   #e;
   #r = !1;
   #s = !1;
   #c;
-  #a = [];
-  #o;
+  #o = [];
+  #a;
   #t = Ee;
   /**
    * 初始化数据库
@@ -731,15 +834,15 @@ class Pt extends Qe {
   async init(t, n) {
     if (this.#r) return;
     this.#r = !0, this.#c = new ge(1);
-    const s = await qt(n), r = `${t}.sqlite`;
-    this.#e = await s.open_v2(r), this.#n = s, this.#d(s, this.#e), this.#t = n?.batchTimeout ?? Ee;
-    const a = n?.cacheSizeKb ?? jt;
+    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;
     await this.execute(`
       PRAGMA temp_store = memory;
       PRAGMA foreign_keys = ON;
-      PRAGMA cache_size = -${a};
-    `), this.#n.update_hook(this.#e, (i, c, o, l) => {
-      !c || !o || !Ft.has(o) || (this.#a.push({ type: i, dbName: c, tableName: o, rowId: l }), this.#i());
+      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());
     });
   }
   /**
@@ -749,7 +852,7 @@ class Pt extends Qe {
    */
   async version() {
     const t = await this.execute("SELECT sqlite_version()");
-    return Ke(t, "results[0].rows[0][0]");
+    return Qe(t, "results[0].rows[0][0]");
   }
   /**
    * 断开数据库连接
@@ -780,15 +883,15 @@ class Pt extends Qe {
   async execute(t, n) {
     if (this.#s)
       throw new Error("SqliteClient has been disconnected");
-    return this.#c.addTask(() => xt(this.#n, this.#e, t, n));
+    return this.#c.addTask(() => vt(this.#n, this.#e, t, n));
   }
   /**
    * 调度批量发送
    * 使用防抖机制合并连续的变更事件
    */
   #i() {
-    this.#o && clearTimeout(this.#o), this.#o = setTimeout(() => {
-      this.#l(), this.#o = void 0;
+    this.#a && clearTimeout(this.#a), this.#a = setTimeout(() => {
+      this.#l(), this.#a = void 0;
     }, this.#t);
   }
   /**
@@ -796,7 +899,7 @@ class Pt extends Qe {
    * 将同类型、同表的事件合并后分发
    */
   #l() {
-    const t = Object.groupBy(this.#a, (n) => `${n.type}_${n.dbName}_${n.tableName}`);
+    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];
@@ -808,7 +911,7 @@ class Pt extends Qe {
         recordAt: /* @__PURE__ */ new Date()
       });
     }
-    this.#a.length = 0;
+    this.#o.length = 0;
   }
   /**
    * 注册自定义 SQL 函数
@@ -817,143 +920,152 @@ class Pt extends Qe {
    * - `regexp(pattern, text)` - 正则匹配
    * - `regexp_replace(pattern, text, replacement[, flags])` - 正则替换
    */
-  #d(t, n) {
-    Bt(t, n), kt(t, n);
+  #u(t, n) {
+    Ft(t, n), Bt(t, n);
   }
 }
-function Bt(e, t) {
-  e.create_function(t, "regexp", 2, Te | we, 0, (n, s) => {
-    const r = new RegExp(e.value_text(s[0])), a = e.value_text(s[1]);
-    e.result(n, r.test(a) ? 1 : 0);
+function Ft(e, t) {
+  e.create_function(t, "regexp", 2, $e | Te, 0, (n, 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);
+    } catch {
+      e.result(n, 0);
+    }
   });
 }
-function kt(e, t) {
-  e.create_function(t, "regexp_replace", -1, Te | we, 0, (n, s) => {
+function Bt(e, t) {
+  e.create_function(t, "regexp_replace", -1, $e | Te, 0, (n, s) => {
     if (s.length < 3) {
       e.result(n, "");
       return;
     }
-    const r = e.value_text(s[0]), a = e.value_text(s[1]), i = e.value_text(s[2]), c = s.length > 3 ? e.value_text(s[3]) : "";
-    e.result(n, a.replace(new RegExp(r, c), i));
+    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));
+    } catch {
+      e.result(n, e.value_text(s[1]));
+    }
   });
 }
-const Wt = async (e, t) => {
-  const { vfs: n, async: s, worker: r, wasmPath: a, locateFile: i, workerInstance: c, sharedWorkerInstance: o, sharedWorker: l } = t, h = {
+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: s,
     worker: r,
-    wasmPath: a,
+    wasmPath: o,
     locateFile: i
   };
-  Le(h);
-  let d;
-  return r && c ? d = ue(c) : l && o ? d = ue(o.port) : d = new Pt(), await d.init(e, h), d;
-}, Ut = (e, t) => t.map((n) => {
+  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;
+}
+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 a = s.propertyMap.get(r);
-    a && (n.inversePatch[r] = D(n.inversePatch[r], a));
+    const o = s.propertyMap.get(r);
+    o && (n.inversePatch[r] = v(n.inversePatch[r], o));
   }), n.patch && Object.keys(n.patch).forEach((r) => {
-    const a = s.propertyMap.get(r);
-    a && (n.patch[r] = D(n.patch[r], a));
+    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;
-}), Vt = (e, t) => {
+}), Kt = (e, t) => {
   const n = Object.groupBy(t, (r) => r.type), s = Object.entries(n);
   for (let r = 0; r < s.length; r++) {
-    const [a, i] = s[r];
+    const [o, i] = s[r];
     if (!i || i.length === 0) continue;
-    const c = i.map((o) => ({
-      namespace: o.namespace,
-      entity: o.entity,
-      type: o.type,
-      id: o.entityId,
-      patch: o.patch,
-      inversePatch: o.inversePatch,
-      recordAt: o.createdAt
+    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 (a) {
+    switch (o) {
       case "INSERT":
         e.rxdb.dispatchEvent(
-          new k(c)
+          new B(c)
         );
         break;
       case "UPDATE":
         e.rxdb.dispatchEvent(
-          new K(c)
+          new G(c)
         );
         break;
       case "DELETE":
         e.rxdb.dispatchEvent(
-          new ne(c)
+          new re(c)
         );
         break;
     }
   }
-}, Ht = (e, t) => {
-  const { tableName: n } = t, [s, r] = tt(n), a = e.rxdb.schemaManager.getEntityType(r, s);
-  if (!a) return;
-  const i = e.getRepository(a), c = w(a), o = w(F);
+}, Vt = (e, t) => {
+  const { tableName: n } = t, [s, r] = tt(n), 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 h = l;
-    if (c === o) {
-      if (h = Ut(e, l), t.type === v.SQLITE_INSERT) {
-        Vt(e, h);
-        const d = h.map((u) => ({
+    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: u.type,
-          id: u.id,
-          patch: { ...u },
+          type: d.type,
+          id: d.id,
+          patch: { ...d },
           inversePatch: null,
-          recordAt: u.createdAt
+          recordAt: d.createdAt
         }));
-        e.rxdb.dispatchEvent(new k(d));
+        e.rxdb.dispatchEvent(new B(f));
       }
     } else {
-      const d = Ot(t.type), u = h.map((p) => {
-        const f = {
+      const f = Ot(t.type), d = u.map((p) => {
+        const h = {
           namespace: c.namespace,
           entity: c.name,
-          type: d,
+          type: f,
           id: p.id,
           recordAt: p.createdAt || /* @__PURE__ */ new Date()
         };
         switch (t.type) {
-          case v.SQLITE_INSERT:
+          case x.SQLITE_INSERT:
             return {
-              ...f,
+              ...h,
               patch: { ...p },
               inversePatch: null
             };
-          case v.SQLITE_DELETE:
+          case x.SQLITE_DELETE:
             return {
-              ...f,
+              ...h,
               patch: null,
               inversePatch: { ...p }
             };
-          case v.SQLITE_UPDATE:
+          case x.SQLITE_UPDATE:
             return {
-              ...f,
+              ...h,
               // TODO: 这里没有办法拿到变更前的数据，只能把整个 entity 作为 patch 返回, 可能会有问题，先这样处理
               inversePatch: null,
               patch: { ...p }
             };
         }
       });
-      switch (d) {
+      switch (f) {
         case "UPDATE":
           e.rxdb.dispatchEvent(
-            new K(u)
+            new G(d)
           );
           break;
         case "DELETE":
           e.rxdb.dispatchEvent(
-            new ne(u)
+            new re(d)
           );
           break;
         case "INSERT":
           e.rxdb.dispatchEvent(
-            new k(u)
+            new B(d)
           );
           break;
       }
@@ -961,44 +1073,44 @@ const Wt = async (e, t) => {
   }).catch((l) => {
     console.error("Failed to handle RxDBChange insert event", l);
   });
-}, G = (e, t, n) => {
-  const { isCount: s, isFindDescendants: r, entityId: a, where: i } = n, c = !a, o = S(t);
-  let l = "";
-  const d = [`c.__level < ${n.level || 0}`, i && B(i, /* @__PURE__ */ new Map(), t, e)].filter(Boolean).join(" AND ");
-  d && (l = `WHERE ${d}`);
-  let u = "__children.*";
-  s ? c ? u = "count(*)" : u = "count(*)-1" : n.hasChildren && (u += `, EXISTS(SELECT 1 FROM "${o}" __sub WHERE __sub.parentId = __children.id) AS hasChildren`);
-  const p = c ? "parentId is null" : `id = '${a}'`;
+}, 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
-  FROM "${o}"
-  WHERE ${p}
+  FROM "${a}"
+  WHERE ${E}
   UNION ALL
   SELECT children.*,children.rowid as ${L}, c.__level + 1 AS __level
-  FROM "${o}" children
-  JOIN __children c ON ${r ? "children.parentId = c.id" : "children.id = c.parentId"}
-  ${l}
+  FROM "${a}" children
+  JOIN __children c ON ${r ? `children."${u}" = c.id` : `children.id = c."${u}"`}
+  ${f}
 )
 
-SELECT ${u} FROM __children ORDER BY __level, id;`
+SELECT ${h} FROM __children ORDER BY __level, id;`
   };
-}, Qt = (e, t, n) => G(e, t, {
+}, Ht = (e, t, n) => J(e, t, {
   ...n,
   isFindDescendants: !0,
   hasChildren: t.features?.tree?.hasChildren
-}), Kt = (e, t, n) => G(e, t, { ...n, isFindDescendants: !0, isCount: !0 }), Gt = (e, t, n) => G(e, t, {
+}), Qt = (e, t, n) => J(e, t, { ...n, isFindDescendants: !0, isCount: !0 }), Gt = (e, t, n) => J(e, t, {
   ...n,
   isFindDescendants: !1,
   hasChildren: t.features?.tree?.hasChildren
-}), Jt = (e, t, n) => G(e, t, { ...n, isFindDescendants: !1, isCount: !0 });
-class Yt extends Me {
+}), Jt = (e, t, n) => J(e, t, { ...n, isFindDescendants: !1, isCount: !0 });
+class Yt extends Ce {
   async findDescendants(t) {
-    const { sql: n } = Qt(this.adapter, this.metadata, t), s = await this.adapter.query(n);
+    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 } = Kt(this.adapter, this.metadata, t);
+    const { sql: n } = Qt(this.adapter, this.metadata, t);
     return (await this.adapter.query(n)).results[0].rows[0][0];
   }
   async findAncestors(t) {
@@ -1011,212 +1123,237 @@ class Yt extends Me {
   }
 }
 const Xt = (e, t) => {
-  const n = S(e), s = t.map((r) => `'${r.id}'`).join(",");
+  const n = S(e), s = t.map((r) => R(r.id)).join(",");
   return `DELETE FROM "${n}" WHERE id in (${s});`;
-}, Ce = (e, t, n) => {
-  const s = S(e), r = n?.userId && e.propertyMap.has("createdBy"), a = n?.userId && e.propertyMap.has("updatedBy"), i = [...e.propertyMap.keys(), ...e.foreignKeyNames], c = [];
+}, 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),
+    ...e.foreignKeyColumnNames || e.foreignKeyNames
+  ], c = [];
   t.forEach((l) => {
-    const h = Ne(e, l);
-    r && (h.createdBy = n.userId), a && (h.updatedBy = n.userId);
-    const d = re(e, h), u = [];
+    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 f = R(d[p]);
-      u.push(f);
-    }), c.push(u);
+      const h = R(f[p]);
+      d.push(h);
+    }), c.push(d);
   });
-  const o = c.map((l) => `(${l.join(",")})`).join(",");
-  return `INSERT INTO "${s}" (${i.join(",")}) VALUES ${o};`;
+  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 a = "";
+  let o = "";
   const i = /* @__PURE__ */ new Set();
-  return t.create.forEach((c, o) => {
+  return t.create.forEach((c, a) => {
     const l = Array.from(c);
-    l.forEach((E) => i.add(E));
-    const h = w(o), d = Ce(h, l, e.rxdb.context), u = l.map((E) => E.id);
-    u.forEach((E) => s.set(E, o));
-    const { sql: p, params: f } = te(e, h, {
+    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, {
       where: {
         combinator: "and",
-        rules: [{ field: "id", operator: "in", value: u }]
+        rules: [{ field: "id", operator: "in", value: d }]
       }
-    }), _ = P(p, f);
-    a += d + _;
-  }), t.update.forEach((c, o) => {
+    }), E = P(p, h);
+    o += f + E;
+  }), t.update.forEach((c, a) => {
     const l = Array.from(c);
-    l.forEach((u) => i.add(u));
-    const h = w(o), d = Object.groupBy(l, (u) => {
-      const p = C(u);
-      return $e(Object.keys(p.patch).sort());
+    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());
     });
-    Object.values(d).forEach((u) => {
-      const p = u[0], f = C(p), _ = oe(h, u, f.patch, {
+    Object.values(f).forEach((d) => {
+      const p = d[0], h = j(p), E = ie(u, d, h.patch, {
         ...e.rxdb.context,
         returning: !1,
         updatedAt: r
-      }), E = P(_.sql, _.params);
-      a += E;
-      const g = u.map((m) => m.id);
-      g.forEach((m) => s.set(m, o));
-      const $ = te(e, h, {
+      }), 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, {
         where: {
           combinator: "and",
-          rules: [{ field: "id", operator: "in", value: g }]
+          rules: [{ field: "id", operator: "in", value: N }]
         }
-      }), T = P($.sql, $.params);
-      a += T;
+      }), $ = P(g.sql, g.params);
+      o += $;
     });
-  }), t.remove.forEach((c, o) => {
-    const l = Array.from(c), h = w(o), d = Xt(h, l);
-    a += d;
-  }), a && (await e.query(a)).results.forEach(({ columns: o, rows: l }) => {
-    const h = o.findIndex((p) => p === "id"), d = o.findIndex((p) => p === L), u = e.rxdb.entityManager;
+  }), 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 f = p[h], _ = s.get(f), E = w(_);
-      if (u.hasEntityRef(_, f)) {
-        const g = u.getEntityRef(_, f), $ = ee(E, o, p);
-        e.getRepository(_).updateEntity(g, $);
-        const T = C(g);
-        if (T.local = !0, d !== -1) {
-          const m = BigInt(p[d]);
-          e.cacheRowIdEntity(m, g);
+      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);
         }
-        T.modified = !1;
+        $.modified = !1;
       }
     });
   }), t.remove.forEach(
-    (c) => c.forEach((o) => {
-      i.add(o);
-      const l = C(o);
-      l.origin = structuredClone({ ...o }), l.modified = !1, l.removed = !0, l.local = !1;
+    (c) => c.forEach((a) => {
+      i.add(a);
+      const l = j(a);
+      l.origin = structuredClone({ ...a }), l.modified = !1, l.removed = !0, l.local = !1;
     })
   ), Array.from(i);
 }, zt = (e, t) => {
   const n = S(t);
   let s = `CREATE TABLE "${n}" (`;
-  const r = [], a = [], i = [];
-  t.propertyMap.forEach((o) => {
-    let l = `"${o.name}" ${et(o)}`;
-    if (o.type === y.integer && o.primary ? l += " PRIMARY KEY AUTOINCREMENT" : (o.type === y.uuid || o.type === y.string) && o.primary && (l += " PRIMARY KEY", o.type === y.uuid && (l += " DEFAULT (lower(hex(randomblob(16))))")), !(o.type === y.uuid && o.primary) && Reflect.get(o, "default") !== void 0) {
-      let d = o.default;
-      de(o.default) && (d = o.default()), d === "CURRENT_TIMESTAMP" ? l += " DEFAULT(strftime('%FT%H:%M:%fZ'))" : (d = se(d, o), o.type === y.boolean || o.type === y.integer || o.type === y.number ? l += ` DEFAULT ${d}` : l += ` DEFAULT '${d}'`);
+  const r = [], o = [], i = [];
+  t.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}'`);
     }
-    switch (o.nullable || (l += " NOT NULL"), o.type) {
+    switch (a.nullable || (u += " NOT NULL"), a.type) {
       case y.json:
       case y.keyValue:
       case y.stringArray:
       case y.numberArray:
-        a.push(`CHECK ( JSON_VALID(${o.name})=1 )`);
+        o.push(`CHECK ( JSON_VALID(${l})=1 )`);
         break;
       case y.boolean:
-        a.push(`CHECK (${o.name} in(0,1))`);
+        o.push(`CHECK (${l} in(0,1))`);
         break;
     }
-    o.unique && r.push(
-      `CREATE UNIQUE INDEX ${pe(t, o)} on "${n}"(${o.name});`
-    ), i.push(l);
-  }), t.relationMap.forEach((o) => {
-    if (o.kind === A.ONE_TO_ONE || o.kind === A.MANY_TO_ONE) {
-      const l = `${o.name}Id`, h = e.rxdb.schemaManager.getEntityMetadata(
-        o.mappedEntity,
-        o.mappedNamespace
+    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(
+        a.mappedEntity,
+        a.mappedNamespace
       );
-      let d = "TEXT";
-      const u = h.propertyMap.get("id");
-      u.type === y.integer ? d = "INTEGER" : (u.type === y.uuid || u.type === y.string) && (d = "TEXT");
-      const p = o.onDelete === "SET NULL" || o.onUpdate === "SET NULL";
-      let f = `"${l}" ${d}`;
-      if (!o.nullable && !p && (f += " NOT NULL"), o.kind === A.MANY_TO_ONE && Reflect.get(o, "default") !== void 0) {
-        const _ = o;
-        let E = _.default;
-        de(_.default) && (E = _.default()), f += ` DEFAULT ${E}`;
+      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}`;
       }
-      if (o.mappedEntity) {
-        const _ = q(o.mappedEntity, o.mappedNamespace);
-        f += ` REFERENCES ${_}(id)`, o.onDelete && (f += ` ON DELETE ${o.onDelete}`), o.onUpdate && (f += ` ON UPDATE ${o.onUpdate}`);
+      if (a.mappedEntity) {
+        const E = e.rxdb.schemaManager.getEntityMetadata(
+          a.mappedEntity,
+          a.mappedNamespace
+        ), m = q(
+          E?.tableName ?? a.mappedEntity,
+          a.mappedNamespace
+        );
+        h += ` REFERENCES ${m}(id)`, a.onDelete && (h += ` ON DELETE ${a.onDelete}`), a.onUpdate && (h += ` ON UPDATE ${a.onUpdate}`);
       }
-      i.push(f), (o.unique || o.kind === A.ONE_TO_ONE) && r.push(
-        `CREATE UNIQUE INDEX ${pe(t, o)} on "${n}"(${l});`
+      i.push(h), (a.unique || a.kind === A.ONE_TO_ONE) && r.push(
+        `CREATE UNIQUE INDEX ${he(t, a)} on "${n}"(${l});`
       );
     }
   });
-  const c = [...i, ...a];
+  const c = [...i, ...o];
   if (c.length)
-    s += c.map((o) => `
-${o}`).join(","), s += `
+    s += c.map((a) => `
+${a}`).join(","), s += `
 );`;
   else
-    throw new b("columns is empty!");
+    throw new O("columns is empty!");
   return r.length && (s += `
 ` + r.join(`
-`)), t.indexes && t.indexes.length > 0 && t.indexes.forEach((o) => {
-    const l = `idx_${t.name}_${o.name}`, h = o.properties?.map((u) => `"${u}"`).join(", ") || `"${o.name}"`, d = o.unique ? "UNIQUE " : "";
+`)), 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]}"`;
+      }
+      return `"${d}"`;
+    }).join(", ") || `"${a.name}"`, f = a.unique ? "UNIQUE " : "";
     s += `
-CREATE ${d}INDEX "${l}" ON "${n}"(${h});`;
+CREATE ${f}INDEX "${l}" ON "${n}"(${u});`;
   }), s;
-}, Zt = (e, t) => zt(e, t), ie = (e, t = {}) => {
-  const n = S(e), s = w(F), r = S(s), { propertyMap: a, name: i, foreignKeyNames: c, namespace: o } = e, l = [...a.keys(), ...c].filter((m) => ["id"].includes(m) === !1), h = " type, namespace, entity, branchId, transactionId, entityId, inversePatch, patch", { transactionId: d, branchId: u } = t, p = R(d), f = R(u || "main"), _ = `'${o}','${i}',${f},${p}`, E = (m, I) => a.get(m)?.type === y.boolean ? `CASE WHEN ${I}.${m} = 1 THEN 1 ELSE 0 END` : `${I}.${m}`, g = `
+}, 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}"
   BEGIN
-    INSERT INTO ${r} (${h}) VALUES (
-    'INSERT',${_}, NEW.id, NULL,
-      json_object(${l.map((m) => `'${m}', ${E(m, "NEW")}`).join(`,
+    INSERT INTO ${r} (${d}) VALUES (
+    'INSERT',${N}, NEW.id, NULL,
+      json_object(${u.map((_) => `'${_.jsName}', ${g(_.dbColumn, _.jsName, "NEW")}`).join(`,
 `)})
     );
-  END;`, $ = `
+  END;`, T = `
   DROP TRIGGER IF EXISTS ${n}_update;
   CREATE TRIGGER ${n}_update AFTER UPDATE ON "${n}"
-    WHEN ( ${l.map((m) => `OLD.${m} IS NOT NEW.${m}`).join(` OR
+    WHEN ( ${u.map((_) => `OLD.${_.dbColumn} IS NOT NEW.${_.dbColumn}`).join(` OR
 `)} )
   BEGIN
-    INSERT INTO ${r} (${h}) VALUES (
-     'UPDATE',${_}, NEW.id,
+    INSERT INTO ${r} (${d}) VALUES (
+     'UPDATE',${N}, NEW.id,
       (
         SELECT json_group_object(key, value) FROM (
-          ${l.map((m) => `SELECT '${m}' AS key, ${E(m, "OLD")} AS value WHERE OLD.${m} IS NOT NEW.${m}`).join(`
+          ${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, value) FROM (
-          ${l.map((m) => `SELECT '${m}' AS key, ${E(m, "NEW")} AS value WHERE OLD.${m} IS NOT NEW.${m}`).join(`
+          ${u.map((_) => `SELECT '${_.jsName}' AS key, ${g(_.dbColumn, _.jsName, "NEW")} AS value WHERE OLD.${_.dbColumn} IS NOT NEW.${_.dbColumn}`).join(`
  UNION `)}
         )
       )
     );
-  END;`, T = `
+  END;`, C = `
   DROP TRIGGER IF EXISTS ${n}_delete;
   CREATE TRIGGER ${n}_delete AFTER DELETE ON "${n}"
   BEGIN
-    INSERT INTO ${r} (${h}) VALUES (
-      'DELETE',${_}, OLD.id,
-      json_object(${l.map((m) => `'${m}', ${E(m, "OLD")}`).join(`,
+    INSERT INTO ${r} (${d}) VALUES (
+      'DELETE',${N}, OLD.id,
+      json_object(${u.map((_) => `'${_.jsName}', ${g(_.dbColumn, _.jsName, "OLD")}`).join(`,
 `)}), NULL
     );
   END;`;
-  return g + `
-` + $ + `
-` + T;
+  return $ + `
+` + T + `
+` + C;
 }, en = (e, t, n) => {
   let s = "";
   for (let r = 0; r < t.length; r++) {
-    const a = t[r], i = w(a);
+    const o = t[r], i = w(o);
     if (s += `
 ` + Zt(e, i), i.log !== !1) {
-      const c = ie(i);
+      const c = ce(i);
       s += `
 ` + c;
     }
   }
   if (n) {
     const r = /* @__PURE__ */ new Map();
-    n.forEach((a) => {
-      const i = w(a);
-      r.has(i) === !1 && r.set(i, /* @__PURE__ */ new Set()), r.get(i).add(a);
+    n.forEach((o) => {
+      const i = w(o);
+      r.has(i) === !1 && r.set(i, /* @__PURE__ */ new Set()), r.get(i).add(o);
     });
-    for (const a of r.keys()) {
-      const i = Ce(a, Array.from(r.get(a)), e.rxdb.context);
+    for (const o of r.keys()) {
+      const i = Le(o, Array.from(r.get(o)), e.rxdb.context);
       s += `
 ` + i;
     }
@@ -1227,194 +1364,194 @@ CREATE ${d}INDEX "${l}" ON "${n}"(${h});`;
   return `DROP TRIGGER IF EXISTS ${t}_insert;
 DROP TRIGGER IF EXISTS ${t}_update;
 DROP TRIGGER IF EXISTS ${t}_delete;`;
-}, ve = (e) => {
+}, je = (e) => {
   let t = "";
   return e.rxdb.config.entities.forEach((n) => {
     const s = w(n);
     s.log !== !1 && (t += tn(s));
   }), t;
-}, qe = (e, t) => {
-  const { deletes: n, inserts: s, updates: r } = t, a = { deletes: [], inserts: [], updates: [] }, i = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map();
-  for (const [u, p] of n.entries()) {
-    const [f, _, E] = J(u), g = `${f}:${_}`, $ = i.get(g);
-    $ ? $.add(E) : i.set(g, /* @__PURE__ */ new Set([E]));
-    let T = c.get(g);
-    T || (T = /* @__PURE__ */ new Map(), c.set(g, T)), T.set(E, {
+}, 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
     });
   }
-  for (const [u, p] of i) {
-    const [f, _] = u.split(":"), E = e.rxdb.schemaManager.getEntityMetadata(_, f), g = S(E), $ = E.propertyMap.get("id").type === "integer";
-    let T = "";
-    $ ? T = Array.from(p).join(",") : T = Array.from(p).map((I) => `'${I}'`).join(",");
-    const m = `DELETE FROM "${g}" WHERE id in (${T});`;
-    a.deletes.push({
-      metadata: E,
+  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";
+    let $ = "";
+    g ? $ = Array.from(p).join(",") : $ = Array.from(p).map((C) => R(C)).join(",");
+    const T = `DELETE FROM "${N}" WHERE id in (${$});`;
+    o.deletes.push({
+      metadata: m,
       ids: p,
-      sql: m,
-      changes: c.get(u)
+      sql: T,
+      changes: c.get(d)
     });
   }
-  const o = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map();
-  for (const [u, p] of s.entries()) {
-    const [f, _, E] = J(u), g = `${f}:${_}`, $ = o.get(g), T = { ...p.patch, id: E };
-    $ ? $.push(T) : o.set(g, [T]);
-    let m = l.get(g);
-    m || (m = /* @__PURE__ */ new Map(), l.set(g, m)), m.set(E, {
+  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, p] of o) {
-    const [f, _] = u.split(":"), E = e.rxdb.schemaManager.getEntityMetadata(_, f);
-    let g = "";
-    p.forEach(($) => {
-      for (const [O, M] of E.propertyMap)
-        $[O] === void 0 && M.default !== void 0 && (typeof M.default == "function" ? $[O] = M.default() : $[O] = M.default);
-      const { sql: T, params: m } = Oe(E, $, { useReplace: !0 }), I = P(T, m);
-      g += I;
-    }), a.inserts.push({
-      metadata: E,
-      ids: new Set(p.filter(($) => $ != null).map(($) => $.id)),
-      sql: g,
-      changes: l.get(u)
+  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;
+    }), o.inserts.push({
+      metadata: m,
+      ids: new Set(p.filter((g) => g != null).map((g) => g.id)),
+      sql: N,
+      changes: l.get(d)
     });
   }
-  const h = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map();
-  for (const [u, p] of r.entries()) {
-    const [f, _, E] = J(u), g = `${f}:${_}`, $ = h.get(g), T = { ...p.patch, id: E };
-    $ ? $.push(T) : h.set(g, [T]);
-    let m = d.get(g);
-    m || (m = /* @__PURE__ */ new Map(), d.set(g, m));
-    const I = e.rxdb.schemaManager.getEntityMetadata(_, f), O = p.patch ? { ...p.patch } : null, M = p.inversePatch ? { ...p.inversePatch } : null;
-    I && (O && Object.keys(O).forEach((x) => {
-      const j = I.propertyMap.get(x);
-      j && (O[x] = D(O[x], j));
-    }), M && Object.keys(M).forEach((x) => {
-      const j = I.propertyMap.get(x);
-      j && (M[x] = D(M[x], j));
-    })), m.set(E, {
-      patch: O,
-      inversePatch: M
+  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
     });
   }
-  for (const [u, p] of h) {
-    const [f, _] = u.split(":"), E = e.rxdb.schemaManager.getEntityMetadata(_, f);
-    let g = "";
-    p.forEach(($) => {
-      let T;
-      E.propertyMap.has("updatedAt") && (T = $.updatedAt);
-      const { id: m, ...I } = $, { sql: O, params: M } = oe(E, { id: m }, I, {
-        updatedAt: T
+  for (const [d, p] of u) {
+    const [h, E] = d.split(":"), m = e.rxdb.schemaManager.getEntityMetadata(E, h);
+    let N = "";
+    p.forEach((g) => {
+      let $;
+      m.propertyMap.has("updatedAt") && ($ = g.updatedAt);
+      const { id: T, ...C } = g, { sql: _, params: I } = ie(m, { id: T }, C, {
+        updatedAt: $
       });
-      g += P(O, M);
-    }), a.updates.push({
-      metadata: E,
-      ids: new Set(p.filter(($) => $ != null).map(($) => $.id)),
-      sql: g,
-      changes: d.get(u)
+      N += P(_, I);
+    }), o.updates.push({
+      metadata: m,
+      ids: new Set(p.filter((g) => g != null).map((g) => g.id)),
+      sql: N,
+      changes: f.get(d)
     });
   }
-  return a;
-}, xe = (e, t) => {
+  return o;
+}, ve = (e, t) => {
   let n = "";
   e.rxdb.config.entities.forEach((i) => {
     const c = w(i);
     if (c.log !== !1)
       try {
-        const o = ie(c, {
+        const a = ce(c, {
           branchId: t
         });
-        o.trim() && (n += o);
-      } catch (o) {
-        console.warn(`Failed to generate trigger SQL for entity ${c.name}:`, o);
+        a.trim() && (n += a);
+      } catch (a) {
+        console.warn(`Failed to generate trigger SQL for entity ${c.name}:`, a);
       }
   });
-  const s = w(W), r = S(s), a = t.replace(/'/g, "''");
+  const s = w(W), r = S(s), o = t.replace(/'/g, "''");
   return n += `
     UPDATE "${r}"
     SET
       activated = CASE
-        WHEN id = '${a}' THEN 1
+        WHEN id = '${o}' THEN 1
         ELSE 0
       END,
       updatedAt = CASE
-        WHEN (id = '${a}' AND activated = 0) OR (id != '${a}' AND activated = 1) THEN CURRENT_TIMESTAMP
+        WHEN (id = '${o}' AND activated = 0) OR (id != '${o}' AND activated = 1) THEN CURRENT_TIMESTAMP
         ELSE updatedAt
       END
-    WHERE id = '${a}' OR activated = 1
+    WHERE id = '${o}' OR activated = 1
     RETURNING rowid as ${L},*;
     `, n;
 }, nn = async (e, t) => {
-  const { branchId: n, actions: s } = t, r = s && qe(e, s);
-  let a;
+  const { branchId: n, actions: s } = t, r = s && xe(e, s);
+  let o;
   try {
-    await e.transaction(async (o) => {
-      const l = ve(e);
-      if (l && await o.execute(l), r) {
+    await e.transaction(async (a) => {
+      const l = je(e);
+      if (l && await a.execute(l), r) {
         if (r.deletes.length)
-          for (const h of r.deletes)
-            await o.execute(h.sql);
+          for (const u of r.deletes)
+            await a.execute(u.sql);
         if (r.inserts.length)
-          for (const h of r.inserts)
-            h.successResults = await o.execute(h.sql);
+          for (const u of r.inserts)
+            u.successResults = await a.execute(u.sql);
         if (r.updates.length)
-          for (const h of r.updates)
-            h.successResults = await o.execute(h.sql);
+          for (const u of r.updates)
+            u.successResults = await a.execute(u.sql);
       }
       s?.updateRxDBChangeSequence !== void 0 && await e.setRxDBChangeSequence(s.updateRxDBChangeSequence);
     }, !1);
-    const i = xe(e, n);
-    a = await e.internalQuery(i);
-    const c = (o, l) => {
+    const i = ve(e, n);
+    o = await e.internalQuery(i);
+    const c = (a, l) => {
       if (l.length === 0) return;
-      const h = l.map((d) => {
-        const u = { ...d };
+      const u = l.map((f) => {
+        const d = { ...f };
         return {
-          namespace: o.namespace,
-          entity: o.name,
+          namespace: a.namespace,
+          entity: a.name,
           type: "UPDATE",
-          id: d.id,
-          patch: u,
-          inversePatch: u,
-          recordAt: d.createdAt
+          id: f.id,
+          patch: d,
+          inversePatch: d,
+          recordAt: f.createdAt
         };
       });
-      e.rxdb.dispatchEvent(new K(h));
+      e.rxdb.dispatchEvent(new G(u));
     };
-    if (a) {
-      const o = Q(e, W, a, !0), l = w(W);
-      c(l, o);
+    if (o) {
+      const a = Q(e, W, o, !0), l = w(W);
+      c(l, a);
     }
-    r && De(e, r);
+    r && qe(e, r);
   } catch (i) {
-    throw new b(`switch branch ${n} failed: ` + i);
+    throw new O(`switch branch ${n} failed: ` + i);
   }
 };
-async function sn(e, t, n, s = !1) {
-  if (await e.transaction(async (r) => {
-    if (s) {
-      const a = ve(e);
-      a && await r.execute(a);
+async function sn(e, t, n = !1) {
+  if (await e.transaction(async (s) => {
+    if (n) {
+      const r = je(e);
+      r && await s.execute(r);
     }
-    for (const a of t.deletes)
-      await r.execute(a.sql);
-    for (const a of t.inserts)
-      a.successResults = await r.execute(a.sql);
-    for (const a of t.updates)
-      a.successResults = await r.execute(a.sql);
-  }, !1), s) {
-    const r = await e.rxdb.versionManager.getCurrentBranch(), a = xe(e, r.id);
-    await e.internalQuery(a);
-  }
-  De(e, t);
+    for (const r of t.deletes)
+      await s.execute(r.sql);
+    for (const r of t.inserts)
+      r.successResults = await s.execute(r.sql);
+    for (const r of t.updates)
+      r.successResults = await s.execute(r.sql);
+  }, !1), n) {
+    const s = await e.rxdb.versionManager.getCurrentBranch(), r = ve(e, s.id);
+    await e.internalQuery(r);
+  }
+  qe(e, t);
 }
-function De(e, t) {
+function qe(e, t) {
   for (const n of t.deletes) {
-    const s = Y(n.metadata);
+    const s = X(n.metadata);
     Rt(e, s, Array.from(n.ids));
-    const r = n.metadata, a = Array.from(n.ids).map((i) => {
+    const r = n.metadata, o = Array.from(n.ids).map((i) => {
       const c = n.changes.get(String(i));
       return {
         namespace: r.namespace,
@@ -1426,45 +1563,45 @@ function De(e, t) {
         recordAt: /* @__PURE__ */ new Date()
       };
     });
-    e.rxdb.dispatchEvent(new ne(a));
+    e.rxdb.dispatchEvent(new re(o));
   }
   for (const n of t.inserts) {
-    const s = Y(n.metadata), r = Q(e, s, n.successResults), a = n.metadata, i = r.map((c) => {
-      const o = n.changes.get(String(c.id));
+    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));
       return {
-        namespace: a.namespace,
-        entity: a.name,
+        namespace: o.namespace,
+        entity: o.name,
         type: "INSERT",
         id: c.id,
-        patch: o?.patch ?? { ...c },
-        inversePatch: o?.inversePatch ?? null,
+        patch: a?.patch ?? { ...c },
+        inversePatch: a?.inversePatch ?? null,
         recordAt: c.createdAt
       };
     });
-    e.rxdb.dispatchEvent(new k(i));
+    e.rxdb.dispatchEvent(new B(i));
   }
   for (const n of t.updates) {
-    const s = Y(n.metadata), r = Q(e, s, n.successResults, !0), a = n.metadata, i = r.map((c) => {
-      const o = n.changes.get(String(c.id));
+    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));
       return {
-        namespace: a.namespace,
-        entity: a.name,
+        namespace: o.namespace,
+        entity: o.name,
         type: "UPDATE",
         id: c.id,
-        patch: o?.patch ?? { ...c },
-        inversePatch: o?.inversePatch ?? null,
+        patch: a?.patch ?? { ...c },
+        inversePatch: a?.inversePatch ?? null,
         recordAt: c.updatedAt || c.createdAt || /* @__PURE__ */ new Date()
       };
     });
-    e.rxdb.dispatchEvent(new K(i));
+    e.rxdb.dispatchEvent(new G(i));
   }
 }
-const me = (e, t, n) => {
+const ye = (e, t, n) => {
   let s = "";
   return e.rxdb.config.entities.forEach((r) => {
-    const a = w(r);
-    if (a.log !== !1) {
-      const i = ie(a, {
+    const o = w(r);
+    if (o.log !== !1) {
+      const i = ce(o, {
         branchId: t,
         transactionId: n
       });
@@ -1473,17 +1610,17 @@ const me = (e, t, n) => {
     }
   }), s;
 };
-class fn extends ke {
+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]);
     });
     const s = Ge((r) => {
-      this.#o || Ht(this, r);
+      this.#a || Vt(this, r);
     });
     this.#t().then((r) => {
-      r.addEventListener(v.SQLITE_INSERT, s), r.addEventListener(v.SQLITE_UPDATE, s), r.addEventListener(v.SQLITE_DELETE, s);
-    }), this.repository("Repository", Me), this.repository("TreeRepository", Yt);
+      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);
   }
   // SQLite 客户端缓存
   #n;
@@ -1499,13 +1636,13 @@ class fn extends ke {
   // 查询任务队列执行器
   #c = new ge(1);
   // sqlite 客户端
-  #a;
+  #o;
   // 是否已断开连接
-  #o = !1;
+  #a = !1;
   /**
    * 适配器名称
    */
-  name = Mt;
+  name = Ct;
   /**
    * 获取实体仓库
    * @param EntityType 实体类
@@ -1514,7 +1651,7 @@ class fn extends ke {
     if (!this.repository_cache.has(t)) {
       const n = w(t), s = this.repository_map.get(n.repository);
       if (!s)
-        throw new b(`Repository '${n.repository}' not found`);
+        throw new O(`Repository '${n.repository}' not found`);
       const r = new s(this, t);
       return this.repository_cache.set(t, r), r;
     }
@@ -1530,7 +1667,7 @@ class fn extends ke {
    * 断开连接
    */
   async disconnect() {
-    this.#o = !0, await this.#c.waitForAll(), this.#n && await this.#n.disconnect();
+    this.#a = !0, await this.#c.waitForAll(), this.#n && await this.#n.disconnect();
   }
   /**
    * 获取版本
@@ -1544,7 +1681,7 @@ class fn extends ke {
    * @param entities
    */
   async saveMany(t) {
-    const n = le({
+    const n = ue({
       need_save_entities: t,
       need_remove_entities: []
     });
@@ -1556,7 +1693,7 @@ class fn extends ke {
    * @returns
    */
   async removeMany(t) {
-    const n = le({
+    const n = ue({
       need_save_entities: [],
       need_remove_entities: t
     });
@@ -1601,13 +1738,12 @@ class fn extends ke {
    * 将 actions 转换为 SQL 操作实体表。
    *
    * @param actions - 压缩后的变更操作
-   * @param localChanges - （已废弃）不再使用，Pull 来的数据不应该生成 RxDBChange 记录
+   * @param _localChanges - （已废弃）不再使用
    * @param disableTriggers - 是否禁用触发器（用于 pull 等操作，避免创建 RxDBChange）
-   * @deprecated localChanges 参数已废弃，将在未来版本中移除
    */
   async mergeChanges(t, n, s = !1) {
-    const r = qe(this, t);
-    await sn(this, r, n, s);
+    const r = xe(this, t);
+    await sn(this, r, s);
   }
   /**
    * 缓存 RowId 与实体映射
@@ -1653,7 +1789,7 @@ class fn extends ke {
   query(t, n) {
     return this.#c.addTask(
       async () => (await this.rxdb.connect(this.name), (await this.#t()).execute(t, n)),
-      $e([t, n])
+      Ne([t, n])
     );
   }
   /**
@@ -1666,12 +1802,12 @@ class fn extends ke {
     await this.rxdb.connect(this.name);
     const s = await this.#t();
     this.#e = !0, this.rxdb.dispatchEvent(rn);
-    let r = "", a = "";
+    let r = "", o = "";
     if (n) {
       const i = We(), c = await this.rxdb.versionManager.getCurrentBranch();
       if (!c)
         throw new Error("currentBranch is undefined! Cannot start transaction with logging.");
-      r = me(this, c.id, i), a = me(this, c.id);
+      r = ye(this, c.id, i), o = ye(this, c.id);
     }
     await s.execute(`
           BEGIN;
@@ -1680,12 +1816,12 @@ class fn extends ke {
          `);
     try {
       const i = await t(s);
-      return await s.execute(`${a}
-COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
+      return await s.execute(`${o}
+COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(an), i;
     } catch (i) {
-      await s.execute("ROLLBACK"), this.#e = !1, this.rxdb.dispatchEvent(an);
+      await s.execute("ROLLBACK"), this.#e = !1, this.rxdb.dispatchEvent(on);
       const c = i?.message || "Transaction Error";
-      throw new b(c);
+      throw new O(c);
     }
   }
   /**
@@ -1707,14 +1843,14 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
    * 本地变更仓库
    */
   localRxDBChange() {
-    return this.getRepository(F);
+    return this.getRepository(k);
   }
   /**
    * 获取 RxDBChange 表的当前序列值
    * @returns
    */
   async getRxDBChangeSequence() {
-    const t = he(F);
+    const t = pe(k);
     return (await this.#i(`SELECT seq FROM sqlite_sequence WHERE name='${t}'`)).results[0].rows[0][0];
   }
   /**
@@ -1722,7 +1858,7 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
    * @param sequence 序列值
    */
   async setRxDBChangeSequence(t) {
-    const n = he(F);
+    const n = pe(k);
     await this.#i("UPDATE sqlite_sequence SET seq = ? WHERE name = ?", [t, n]);
   }
   // ============================================
@@ -1744,15 +1880,15 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
    * ```
    */
   getMetadataByIds(t, n) {
-    return X(() => {
+    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 Z(this.internalQuery(r, n)).pipe(
-        Je((a) => {
+        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) => {
           const i = /* @__PURE__ */ new Map();
-          if (a.results?.[0]?.rows)
-            for (const c of a.results[0].rows)
+          if (o.results?.[0]?.rows)
+            for (const c of o.results[0].rows)
               i.set(c[0], c[1]);
           return i;
         })
@@ -1775,9 +1911,9 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
    * ```
    */
   upsertMany(t, n) {
-    return X(() => n.length === 0 ? z(void 0) : Z(
+    return z(() => n.length === 0 ? Z(void 0) : ee(
       (async () => {
-        const s = Object.keys(n[0]), r = `(${s.map(() => "?").join(", ")})`, a = n.map(() => r).join(", "), i = `INSERT OR REPLACE INTO ${t} (${s.join(", ")}) VALUES ${a}`, c = n.flatMap((o) => s.map((l) => o[l]));
+        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]));
         await this.internalQuery(i, c);
       })()
     ));
@@ -1796,11 +1932,11 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
    * ```
    */
   deleteByIds(t, n) {
-    return X(() => {
+    return z(() => {
       if (n.length === 0)
-        return z(void 0);
-      const s = n.map(() => "?").join(", "), r = `DELETE FROM ${t} WHERE id IN (${s})`;
-      return Z(this.internalQuery(r, n).then(() => {
+        return Z(void 0);
+      const s = n.map(() => "?").join(", "), r = `DELETE FROM "${t}" WHERE id IN (${s})`;
+      return ee(this.internalQuery(r, n).then(() => {
       }));
     });
   }
@@ -1811,9 +1947,9 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
    * 获取 SQLite 客户端
    */
   #t() {
-    return this.#a || (this.#a = Wt(this.rxdb.config.dbName, this.options).then(
+    return this.#o || (this.#o = Wt(this.rxdb.config.dbName, this.options).then(
       (t) => (this.#n = t, t)
-    )), this.#a;
+    )), this.#o;
   }
   /**
    * 内部执行 sql
@@ -1828,16 +1964,16 @@ COMMIT;`), this.#e = !1, this.rxdb.dispatchEvent(on), i;
     return this.#r.has(t) === !1 && this.#r.set(t, /* @__PURE__ */ new Map()), this.#r.get(t);
   }
 }
-const rn = new Fe(), an = new Pe(), on = new Be();
+const rn = new ke(), on = new Pe(), an = new Fe();
 export {
   L as ROWID,
-  fn as RxDBAdapterSqlite,
-  b as RxDBAdapterSqliteError,
+  hn as RxDBAdapterSqlite,
+  O as RxDBAdapterSqliteError,
   Pt as SqliteClient,
-  Me as SqliteRepository,
-  vt as WA_SQLITE_VFS_LIST,
-  B as buildRuleGroup,
+  Ce as SqliteRepository,
+  jt as WA_SQLITE_VFS_LIST,
+  F as buildRuleGroup,
   q as sqliteGetTableName,
   S as sqliteGetTableNameByMetadata,
-  qt as sqliteLoad
+  xt as sqliteLoad
 };