@aiao/rxdb-adapter-sqlite 0.0.1 → 0.0.3

package/index.js

@@ -1,57 +1,57 @@
-import { RxDBError as Ee, PropertyType as m, RelationKind as y, getEntityMetadata as q, RxDBChange as ye, RepositoryBase as $e, TRANSACTION_BEGIN as be, TRANSACTION_COMMIT as Ne, TRANSACTION_ROLLBACK as Te, getEntityStatus as ae, isEntityMatchRuleGroup as S, isEntityEffectOrderBy as we, TransactionBeginEvent as ge, TransactionCommitEvent as Oe, TransactionRollbackEvent as Ie, RxDBAdapterLocalBase as Ae, RxDBAdapterUpdateChangeEvent as qe, RxDBAdapterInsertChangeEvent as Re, RxDBAdapterDeleteChangeEvent as Se } from "@aiao/rxdb";
-import { wrap as ve } from "comlink";
-import { Subject as ke, auditTime as xe, ReplaySubject as U, BehaviorSubject as ie, Observable as oe, shareReplay as L, switchMap as w, take as Q, takeUntil as K, map as f, firstValueFrom as I, tap as A, fromEvent as Ce, defer as Le, filter as Z, catchError as Me, of as je, from as ee } from "rxjs";
-import { pickBy as ce, isFunction as De, get as Be, traverseObjectKeys as Fe } from "@aiao/utils";
-import { Factory as We, SQLITE_ROW as Pe } from "@journeyapps/wa-sqlite";
-const Ve = (r) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${r}' limit 1;`, Ue = (r) => !!r.sql && (r.results.length === 0 || r.results[0].rows.length === 0), R = "_rowid", te = (r) => {
+import { RxDBError as me, PropertyType as y, RelationKind as I, getEntityMetadata as q, RxDBChange as Ee, RepositoryBase as ye, TRANSACTION_BEGIN as $e, TRANSACTION_COMMIT as be, TRANSACTION_ROLLBACK as Ne, getEntityStatus as re, isEntityMatchRuleGroup as R, isEntityEffectOrderBy as we, TransactionBeginEvent as Te, TransactionCommitEvent as ge, TransactionRollbackEvent as Ie, RxDBAdapterLocalBase as Oe, RxDBAdapterUpdateChangeEvent as Ae, RxDBAdapterInsertChangeEvent as qe, RxDBAdapterDeleteChangeEvent as Se } from "@aiao/rxdb";
+import { wrap as Re } from "comlink";
+import { Subject as ve, auditTime as xe, ReplaySubject as U, BehaviorSubject as ae, Observable as ie, shareReplay as L, switchMap as w, take as Q, takeUntil as K, map as f, firstValueFrom as O, tap as A, fromEvent as Ce, defer as ke, filter as Z, catchError as Le, of as Me, from as ee } from "rxjs";
+import { pickBy as oe, isFunction as je, get as De, traverseObjectKeys as Be } from "@aiao/utils";
+import { Factory as Fe, SQLITE_ROW as We } from "@journeyapps/wa-sqlite";
+const Pe = (r) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${r}' limit 1;`, Ve = (r) => !!r.sql && (r.results.length === 0 || r.results[0].rows.length === 0), S = "_rowid", te = (r) => {
   switch (r.type) {
-    case m.uuid:
-    case m.string:
-    case m.json:
+    case y.uuid:
+    case y.string:
+    case y.json:
       return "TEXT";
-    case m.number:
+    case y.number:
       return "REAL";
-    case m.integer:
-    case m.boolean:
+    case y.integer:
+    case y.boolean:
       return "INTEGER";
-    case m.date:
+    default:
       return "TEXT";
   }
-}, Qe = (r, e) => {
+}, Ue = (r, e) => {
   if (r === null && e.nullable) return null;
   if (r !== void 0)
     switch (e.type) {
-      case m.boolean:
+      case y.boolean:
         return r ? 1 : 0;
-      case m.date:
+      case y.date:
         return r instanceof Date ? r.toISOString() : r;
       default:
         return r;
     }
-}, Ke = (r, e) => {
+}, Qe = (r, e) => {
   if (r === null && e.nullable) return null;
   if (r !== void 0)
     switch (e.type) {
-      case m.boolean:
+      case y.boolean:
         return !!r;
-      case m.date:
+      case y.date:
         return r;
-      case m.json:
+      case y.json:
         return r ? JSON.parse(r) : null;
       default:
         return r;
     }
-}, le = (r, e) => `${e}$${r}`, E = (r) => le(r.name, r.namespace), ue = (r, e) => `idx_${r.name}_${e.name}`;
-class $ extends Ee {
+}, ce = (r, e) => `${e}$${r}`, E = (r) => ce(r.name, r.namespace), le = (r, e) => `idx_${r.name}_${e.name}`;
+class m extends me {
 }
-const Y = (r, e) => {
+const H = (r, e) => {
   const t = {};
   return Object.keys(e).forEach((s) => {
     s.endsWith("Id") && (t[s] = e[s]);
     const n = r.propertyMap.get(s);
-    n && (t[s] = Qe(e[s], n));
+    n && (t[s] = Ue(e[s], n));
   }), t;
-}, Ye = (r, e) => ce(e, (t, s) => r.propertyMap.has(s) || r.foreignKeyNames.includes(s)), He = (r, e) => ce(e, (t, s) => r.propertyMap.get(s)?.readonly !== !0), se = (r, e, t) => {
+}, Ke = (r, e) => oe(e, (t, s) => r.propertyMap.has(s) || r.foreignKeyNames.includes(s)), He = (r, e) => oe(e, (t, s) => r.propertyMap.get(s)?.readonly !== !0), se = (r, e, t) => {
   const s = {};
   return t.forEach((n, a) => {
     const o = e[a];
@@ -59,55 +59,50 @@ const Y = (r, e) => {
       s[o] = n;
     else {
       const c = r.propertyMap.get(o);
-      c && (s[o] = Ke(n, c));
+      c && (s[o] = Qe(n, c));
     }
   }), s;
-}, ne = {
-  [y.ONE_TO_ONE]: 0,
-  [y.ONE_TO_MANY]: 1,
-  [y.MANY_TO_ONE]: 2,
-  [y.MANY_TO_MANY]: 3
 }, Je = (r, e) => {
   let t = "";
   const s = E(e);
-  return Array.from(e.relationMap.values())?.toSorted((n, a) => ne[n.kind] - ne[a.kind]).forEach((n) => {
+  return Array.from(e.relationMap.values()).forEach((n) => {
     switch (n.kind) {
-      case y.ONE_TO_ONE:
-      case y.MANY_TO_ONE:
+      case I.ONE_TO_ONE:
+      case I.MANY_TO_ONE:
         {
           const a = `${n.name}Id`;
           if (t += `
 ALTER TABLE ${s} ADD COLUMN "${a}" TEXT`, n.nullable || (t += " NOT NULL"), n.mappedEntity) {
-            const o = le(n.mappedEntity, n.mappedNamespace);
+            const o = ce(n.mappedEntity, n.mappedNamespace);
             t += ` REFERENCES ${o}(id)`;
           }
-          n.kind === y.MANY_TO_ONE && (t += " ON DELETE CASCADE"), t += ";", (n.unique || n.kind === y.ONE_TO_ONE) && (t += `
- CREATE UNIQUE INDEX ${ue(e, n)} on ${s}(${a});`);
+          n.kind === I.MANY_TO_ONE && (t += " ON DELETE CASCADE"), t += ";", (n.unique || n.kind === I.ONE_TO_ONE) && (t += `
+ CREATE UNIQUE INDEX ${le(e, n)} on ${s}(${a});`);
         }
         break;
     }
   }), t;
-}, Ge = (r, e) => {
+}, Ye = (r, e) => {
   const t = E(e);
   let s = `CREATE TABLE ${t} (`;
   const n = [], a = [], o = [];
   e.propertyMap.forEach((i) => {
     let l = "";
-    if (l += `"${i.name}"`, i.primary ? i.type === m.integer ? l += " INTEGER PRIMARY KEY AUTOINCREMENT" : l += ` ${te(i)} PRIMARY KEY` : l += ` ${te(i)}`, !i.nullable) l += " NOT NULL";
+    if (l += `"${i.name}"`, i.primary ? i.type === y.integer ? l += " INTEGER PRIMARY KEY AUTOINCREMENT" : l += ` ${te(i)} PRIMARY KEY` : l += ` ${te(i)}`, !i.nullable) l += " NOT NULL";
     else if (Reflect.get(i, "default") !== void 0) {
       let u = i.default;
-      De(i.default) && (u = i.default()), l += ` DEFAULT ${String(u)}`;
+      je(i.default) && (u = i.default()), l += ` DEFAULT ${String(u)}`;
     }
     switch (i.type) {
-      case m.json:
+      case y.json:
         a.push(`CHECK ( JSON_VALID(${i.name})=1 )`);
         break;
-      case m.boolean:
+      case y.boolean:
         a.push(`CHECK (${i.name} in(0,1))`);
         break;
     }
     i.unique && n.push(
-      `CREATE UNIQUE INDEX ${ue(e, i)} on ${t}(${i.name});`
+      `CREATE UNIQUE INDEX ${le(e, i)} on ${t}(${i.name});`
     ), o.push(l);
   });
   const c = [...o, ...a];
@@ -116,15 +111,15 @@ ALTER TABLE ${s} ADD COLUMN "${a}" TEXT`, n.nullable || (t += " NOT NULL"), n.ma
 ${i}`).join(","), s += `
 );`;
   else
-    throw new $("columns is empty!");
+    throw new m("columns is empty!");
   return n.length && (s += `
 ` + n.join(`
 `)), s;
-}, ze = (r, e) => {
+}, Ge = (r, e) => {
   let t = "";
-  return t += Ge(r, e), t += Je(r, e), t;
-}, Xe = (r, e) => {
-  const t = E(e), s = q(ye), n = E(s), { propertyMap: a, name: o, foreignKeyNames: c, namespace: i } = e, l = [...a.keys(), ...c].filter((d) => ["id", "updatedAt"].includes(d) === !1), u = "namespace, entity, type, entityId, inversePatch, patch", h = `CREATE TRIGGER ${t}_insert AFTER INSERT ON ${t}
+  return t += Ye(r, e), t += Je(r, e), t;
+}, ze = (r, e) => {
+  const t = E(e), s = q(Ee), n = E(s), { propertyMap: a, name: o, foreignKeyNames: c, namespace: i } = e, l = [...a.keys(), ...c].filter((d) => ["id", "updatedAt"].includes(d) === !1), u = "namespace, entity, type, entityId, inversePatch, patch", h = `CREATE TRIGGER ${t}_insert AFTER INSERT ON ${t}
 BEGIN
   INSERT INTO ${n} (${u}) VALUES (
     '${i}', '${o}', 'INSERT', NEW.id, NULL,
@@ -164,7 +159,7 @@ END;`;
 ` + p;
 };
 var M = /* @__PURE__ */ ((r) => (r[r.SQLITE_DELETE = 9] = "SQLITE_DELETE", r[r.SQLITE_INSERT = 18] = "SQLITE_INSERT", r[r.SQLITE_UPDATE = 23] = "SQLITE_UPDATE", r))(M || {});
-const de = "sqlite", Ze = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs").then((r) => r.default), et = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite.mjs").then((r) => r.default), tt = [
+const ue = "sqlite", Xe = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs").then((r) => r.default), Ze = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite.mjs").then((r) => r.default), et = [
   {
     name: "MemoryVFS",
     vfsModule: () => import("@journeyapps/wa-sqlite/src/examples/MemoryVFS.js").then((r) => r.MemoryVFS),
@@ -248,22 +243,22 @@ const de = "sqlite", Ze = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite-as
     jsContext: !1,
     multipleConnections: !0
   }
-], he = (r) => {
-  const e = tt.find((a) => a.name === r.vfs), { vfs: t, async: s, worker: n } = r;
-  if (!e) throw new $(`vfs ${t} not found`);
-  if (s !== s) throw new $(`vfs ${t} not support async: ${s}`);
-  if (n && !e.worker) throw new $(`vfs ${t} not support worker`);
-  if (!n && !e.jsContext) throw new $(`vfs ${t} only support worker`);
+], de = (r) => {
+  const e = et.find((a) => a.name === r.vfs), { vfs: t, async: s, worker: n } = r;
+  if (!e) throw new m(`vfs ${t} not found`);
+  if (s !== s) throw new m(`vfs ${t} not support async: ${s}`);
+  if (n && !e.worker) throw new m(`vfs ${t} not support worker`);
+  if (!n && !e.jsContext) throw new m(`vfs ${t} only support worker`);
   return e;
-}, st = async (r) => {
-  const e = he(r), t = r.async ?? !0;
+}, tt = async (r) => {
+  const e = de(r), t = r.async ?? !0;
   let s;
-  t ? s = Ze : s = et;
+  t ? s = Xe : s = Ze;
   const [n, a] = await Promise.all([s(), e.vfsModule()]), o = {};
   r.wasmPath && (o.locateFile = () => r.wasmPath);
-  const c = await n(o), i = We(c), l = await a.create(r.vfs, c, e.vfsOptions);
+  const c = await n(o), i = Fe(c), l = await a.create(r.vfs, c, e.vfsOptions);
   return i.vfs_register(l, !0), i;
-}, _e = (r, e) => `${de}:${r}:${e}`, nt = async (r, e, t, s) => {
+}, he = (r, e) => `${ue}:${r}:${e}`, st = async (r, e, t, s) => {
   const n = performance.now(), a = s ? [s] : [[]], o = [];
   let c = 0;
   const i = {
@@ -276,7 +271,7 @@ const de = "sqlite", Ze = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite-as
       for (const _ of a)
         r.reset(l), s && r.bind_collection(l, _);
     const u = [];
-    for (; await r.step(l) === Pe; ) {
+    for (; await r.step(l) === We; ) {
       const _ = r.row(l);
       u.push(_);
     }
@@ -289,20 +284,19 @@ const de = "sqlite", Ze = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite-as
     runEnd: performance.now()
   };
 };
-class rt {
+class nt {
   #e;
   #t;
   changeChanel;
   async init(e, t) {
-    const s = await st(t), n = e + ".sqlite";
+    const s = await tt(t), n = e + ".sqlite";
     this.#t = await s.open_v2(n), this.#e = s, await this.execute("PRAGMA temp_store = memory;"), await this.execute("PRAGMA foreign_keys = ON;");
     const a = t?.cacheSizeKb || 50 * 1024;
     await this.execute(`PRAGMA cache_size = -${a};`);
-    const o = _e(e, "changes");
+    const o = he(e, "changes");
     this.changeChanel = new BroadcastChannel(o), this.#e.update_hook(
       this.#t,
       (c, i, l, u) => {
-        if (!l) return;
         const h = {
           type: c,
           dbName: i,
@@ -317,51 +311,51 @@ class rt {
   }
   async version() {
     const e = await this.execute("SELECT sqlite_version()");
-    return Be(e, "results[0].rows[0][0]");
+    return De(e, "results[0].rows[0][0]");
   }
   async disconnect() {
     await this.#e.close(this.#t);
   }
   async execute(e, t) {
-    return nt(this.#e, this.#t, e, t);
+    return st(this.#e, this.#t, e, t);
   }
 }
-const at = (r, e, t) => {
+const rt = (r, e, t) => {
   const s = E(r), n = [e.id];
   return {
     sql: `DELETE FROM ${s} WHERE id = ?;`,
     params: n
   };
-}, it = (r, e, t) => {
-  const s = E(r), n = Ye(r, e);
+}, at = (r, e, t) => {
+  const s = E(r), n = Ke(r, e);
   t?.userId && (n.createdBy = t.userId, n.updatedBy = t.userId), n.createdAt = /* @__PURE__ */ new Date(), n.updatedAt = n.createdAt;
-  const a = Object.keys(n), o = Y(r, n), c = Array(a.length).fill("?").join(","), i = Object.values(o);
+  const a = Object.keys(n), o = H(r, n), c = Array(a.length).fill("?").join(","), i = Object.values(o);
   return {
-    sql: `INSERT INTO ${s} (${a.join(",")}) VALUES (${c}) RETURNING rowid as ${R},*;`,
+    sql: `INSERT INTO ${s} (${a.join(",")}) VALUES (${c}) RETURNING rowid as ${S},*;`,
     params: i
   };
-}, ot = (r, e, t) => {
+}, it = (r, e, t) => {
   const s = {};
   s.removedAt = /* @__PURE__ */ new Date(), t?.userId && (s.removedBy = t.userId);
-  const n = E(r), o = Object.keys(s).map((l) => `${l} = ?`).join(","), c = Y(r, s), i = [...Object.values(c), e.id];
+  const n = E(r), o = Object.keys(s).map((l) => `${l} = ?`).join(","), c = H(r, s), i = [...Object.values(c), e.id];
   return {
-    sql: `UPDATE ${n} SET ${o} WHERE id = ? and removedAt is null and removedBy is null RETURNING rowid as ${R},*;`,
+    sql: `UPDATE ${n} SET ${o} WHERE id = ? and removedAt is null and removedBy is null RETURNING rowid as ${S},*;`,
     params: i
   };
-}, ct = (r, e, t, s) => {
+}, ot = (r, e, t, s) => {
   const n = He(r, t);
   n.updatedAt = /* @__PURE__ */ new Date(), s?.userId && (n.updatedBy = s.userId);
-  const a = Object.keys(n), o = Y(r, n), c = a.map((h) => `${h} = ?`).join(","), i = [...Object.values(o), e.id];
+  const a = Object.keys(n), o = H(r, n), c = a.map((h) => `${h} = ?`).join(","), i = [...Object.values(o), e.id];
   return {
-    sql: `UPDATE ${E(r)} SET ${c} WHERE id = ? RETURNING rowid as ${R},*;`,
+    sql: `UPDATE ${E(r)} SET ${c} WHERE id = ? RETURNING rowid as ${S},*;`,
     params: i
   };
-}, H = (r) => r?.map((e) => `${e.field} ${e.order}`).join(", "), v = (r, e = /* @__PURE__ */ new Map()) => {
-  const t = r.rules.map((s) => re(s) ? v(s, e) : lt(s, e)).filter(Boolean);
-  return t.length === 0 ? "" : t.length === 1 ? t[0] : `(${t.join(re(r) ? ` ${r.combinator} ` : " ")})`;
-}, lt = (r, e) => {
+}, J = (r) => r?.map((e) => `${e.field} ${e.order}`).join(", "), v = (r, e = /* @__PURE__ */ new Map()) => {
+  const t = r.rules.map((s) => ne(s) ? v(s, e) : ct(s, e)).filter(Boolean);
+  return t.length === 0 ? "" : t.length === 1 ? t[0] : `(${t.join(ne(r) ? ` ${r.combinator} ` : " ")})`;
+}, ct = (r, e) => {
   let t, s;
-  if (r?.value === null ? r.operator === "=" ? (t = "", s = "is null") : r.operator === "!=" && (t = "", s = "is not null") : (t = dt(r.operator).toLowerCase(), s = ht(r)), !s && ["in", "notIn", "between", "notBetween"].includes(r.operator)) return "";
+  if (r?.value === null ? r.operator === "=" ? (t = "", s = "is null") : r.operator === "!=" && (t = "", s = "is not null") : (t = ut(r.operator).toLowerCase(), s = dt(r)), !s && ["in", "notIn", "between", "notBetween"].includes(r.operator)) return "";
   let n = String(r.field);
   if (e.has(n))
     n = e.get(n);
@@ -370,7 +364,7 @@ const at = (r, e, t) => {
     n = `'${o}'.${c}`;
   }
   return `${n} ${t} ${s}`.replaceAll(/ +/g, " ").trim();
-}, re = (r) => "rules" in r && "combinator" in r, ut = {
+}, ne = (r) => "rules" in r && "combinator" in r, lt = {
   "=": "=",
   "!=": "!=",
   ">": ">",
@@ -387,7 +381,7 @@ const at = (r, e, t) => {
   notBeginWith: "NOT LIKE",
   endWith: "LIKE",
   notEndWith: "NOT LIKE"
-}, dt = (r) => ut[r] || r, ht = (r) => {
+}, ut = (r) => lt[r] || r, dt = (r) => {
   switch (r.operator) {
     case "in":
     case "notIn":
@@ -420,61 +414,61 @@ const at = (r, e, t) => {
     const h = u.includes("_") ? u : u.split("_")[0], _ = c(h);
     return o.set(u, _), _;
   };
-  Fe(t, (u, h, _) => {
+  Be(t, (u, h, _) => {
     const p = h;
     if (u !== "field" || p.includes(".") === !1) return;
-    const { relations: d, isForeignKey: x, propertyName: B } = r.rxdb.schema.getFieldRelations(e, h);
-    if (x) {
+    const { relations: d, isForeignKey: C, propertyName: B } = r.rxdb.schema.getFieldRelations(e, h);
+    if (C) {
       _.field = B;
       return;
     }
-    const pe = p.replace(`.${B}`, ""), F = (N) => d.length === 1 ? N.name : `${pe}_${N.name}`, G = (N) => (s.has(N) || s.set(N, []), s.get(N));
-    d.forEach(({ metadata: N, relation: g }, z) => {
-      const C = r.rxdb.schema.findMappedRelation(N, g);
-      if (!C) throw new $("mappedRelation not found");
+    const fe = p.replace(`.${B}`, ""), F = (b) => d.length === 1 ? b.name : `${fe}_${b.name}`, G = (b) => (s.has(b) || s.set(b, []), s.get(b));
+    d.forEach(({ metadata: b, relation: T }, z) => {
+      const k = r.rxdb.schema.findMappedRelation(b, T);
+      if (!k) throw new m("mappedRelation not found");
       const P = () => {
-        const O = G(C.metadata), b = F(g), k = i(b);
+        const g = G(k.metadata), $ = F(T), x = i($);
         return {
-          joinArray: O,
-          uniqueAlias: k
+          joinArray: g,
+          uniqueAlias: x
         };
       };
-      let T = "_";
+      let N = "_";
       if (z > 0) {
-        const O = d[z - 1], b = F(O.relation);
-        T = i(b);
+        const g = d[z - 1], $ = F(g.relation);
+        N = i($);
       }
-      switch (g.kind) {
-        case y.ONE_TO_ONE:
-        case y.ONE_TO_MANY:
+      switch (T.kind) {
+        case I.ONE_TO_ONE:
+        case I.ONE_TO_MANY:
           {
-            const { joinArray: O, uniqueAlias: b } = P();
-            O.push({
-              joinTableName: b,
-              on: `'${b}'.${C.relation.name}Id = ${T === "_" ? T : `'${T}'`}.id`
+            const { joinArray: g, uniqueAlias: $ } = P();
+            g.push({
+              joinTableName: $,
+              on: `'${$}'.${k.relation.name}Id = ${N === "_" ? N : `'${N}'`}.id`
             });
           }
           break;
-        case y.MANY_TO_ONE:
+        case I.MANY_TO_ONE:
           {
-            const { joinArray: O, uniqueAlias: b } = P();
-            O.push({
-              joinTableName: b,
-              on: `'${b}'.id = ${T === "_" ? T : `'${T}'`}.${g.name}Id`
+            const { joinArray: g, uniqueAlias: $ } = P();
+            g.push({
+              joinTableName: $,
+              on: `'${$}'.id = ${N === "_" ? N : `'${N}'`}.${T.name}Id`
             });
           }
           break;
-        case y.MANY_TO_MANY:
+        case I.MANY_TO_MANY:
           {
-            const O = q(g.junctionEntityType), b = G(O), k = c(`${g.name}_m_n`);
-            b.push({
-              joinTableName: k,
-              on: `'${k}'.${C.relation.name}Id = ${T === "_" ? T : `'${T}'`}.id`
+            const g = q(T.junctionEntityType), $ = G(g), x = c(`${T.name}_m_n`);
+            $.push({
+              joinTableName: x,
+              on: `'${x}'.${k.relation.name}Id = ${N === "_" ? N : `'${N}'`}.id`
             });
-            const { joinArray: me, uniqueAlias: X } = P();
-            me.push({
+            const { joinArray: pe, uniqueAlias: X } = P();
+            pe.push({
               joinTableName: X,
-              on: `'${X}'.id = '${k}'.${g.name}Id`
+              on: `'${X}'.id = '${x}'.${T.name}Id`
             });
           }
           break;
@@ -482,8 +476,8 @@ const at = (r, e, t) => {
     });
     const W = d[d.length - 1];
     if (r.rxdb.schema.findMappedRelation(W.metadata, W.relation)) {
-      const N = F(W.relation), g = i(N);
-      a.set(p, `'${g}'.${B}`);
+      const b = F(W.relation), T = i(b);
+      a.set(p, `'${T}'.${B}`);
     }
   });
   let l = "";
@@ -493,25 +487,25 @@ const at = (r, e, t) => {
       l += ` LEFT JOIN ${_} '${p.joinTableName}' ON ${p.on}`;
   }
   return { joinSQL: l, fieldAliasMap: a };
-}, J = (r) => {
+}, Y = (r) => {
   const { tableName: e, where: t, limit: s, orderBy: n, join: a } = r;
-  let o = `SELECT _.rowid as ${R}, _.* FROM ${e} _`;
+  let o = `SELECT _.rowid as ${S}, _.* FROM ${e} _`;
   return a && (o += a), t && (o += ` where ${t}`), n && (o += ` order by ${n}`), s && (o += ` limit ${s}`), o += ";", o;
-}, _t = (r, e, t, s) => {
+}, ht = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = H(s?.orderBy);
+  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = J(s?.orderBy);
   return {
-    sql: J({ tableName: o, where: c, orderBy: i, join: n }),
+    sql: Y({ tableName: o, where: c, orderBy: i, join: n }),
     params: []
   };
-}, ft = (r, e, t, s) => {
+}, _t = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = H(s?.orderBy);
+  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = J(s?.orderBy);
   return {
-    sql: J({ tableName: o, where: c, orderBy: i, join: n }),
+    sql: Y({ tableName: o, where: c, orderBy: i, join: n }),
     params: []
   };
-}, pt = (r, e, t, s) => {
+}, ft = (r, e, t, s) => {
   t = structuredClone(t);
   const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a);
   let i = `SELECT count(_.rowid) as count FROM ${o} _`;
@@ -521,24 +515,24 @@ const at = (r, e, t) => {
   };
 }, V = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = H(s?.orderBy);
+  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = J(s?.orderBy);
   return {
-    sql: J({ tableName: o, where: c, orderBy: i, join: n, limit: 1 }),
+    sql: Y({ tableName: o, where: c, orderBy: i, join: n, limit: 1 }),
     params: []
   };
 };
-class mt extends $e {
+class pt extends ye {
   constructor(e, t, s) {
-    super(e.rxdb, s), this.adapter = e, this.client$ = t, this.metadata = q(s), this.run_task$.subscribe(() => this.#e()), this.rxdb.addEventListener(be, () => {
+    super(e.rxdb, s), this.adapter = e, this.client$ = t, this.metadata = q(s), this.run_task$.subscribe(() => this.#e()), this.rxdb.addEventListener($e, () => {
       this.transaction_pending = !0;
-    }), this.rxdb.addEventListener(Ne, () => {
+    }), this.rxdb.addEventListener(be, () => {
       this.transaction_pending = !1, this.transaction_entities.forEach((n) => this.merge_cache(n.type, n.entities)), this.transaction_entities = [];
-    }), this.rxdb.addEventListener(Te, () => {
+    }), this.rxdb.addEventListener(Ne, () => {
       this.transaction_pending = !1, this.transaction_entities = [];
     });
   }
   metadata;
-  need_run_task = new ke();
+  need_run_task = new ve();
   run_task$ = this.need_run_task.asObservable().pipe(xe(16));
   cache_query_task_map = /* @__PURE__ */ new Map();
   cache_query_tasks = [];
@@ -561,7 +555,7 @@ class mt extends $e {
   add_query_cache(e, t = !1) {
     const s = [];
     return e.results.forEach(({ columns: n, rows: a }) => {
-      const o = n.findIndex((i) => i === "id"), c = n.findIndex((i) => i === R);
+      const o = n.findIndex((i) => i === "id"), c = n.findIndex((i) => i === S);
       a.forEach((i) => {
         const l = i[o];
         let u;
@@ -574,7 +568,7 @@ class mt extends $e {
           const _ = se(this.metadata, n, i);
           u = this.createEntityRef(_), s.push(u);
         }
-        const h = ae(u);
+        const h = re(u);
         h.local = !0, c !== -1 && (h.rowId = BigInt(i[c])), h.modified = !1;
       });
     }), s;
@@ -586,13 +580,13 @@ class mt extends $e {
     const { sql: t, params: s } = e, n = t + s.join(",");
     let a;
     if (this.cache_query_task_map.has(n) === !1) {
-      const o = new U(), c = o.asObservable(), i = new ie(0), l = i.asObservable(), u = new oe((p) => {
+      const o = new U(), c = o.asObservable(), i = new ae(0), l = i.asObservable(), u = new ie((p) => {
         const d = this.cache_query_task_map.get(n);
         return d.observerCount++, a = p, _(), () => {
           if (d.observerCount--, d.observerCount <= 0) {
             o.next(), o.complete(), this.cache_query_task_map.delete(n);
-            const x = this.cache_query_tasks.indexOf(d);
-            x >= 0 && this.cache_query_tasks.splice(x, 1);
+            const C = this.cache_query_tasks.indexOf(d);
+            C >= 0 && this.cache_query_tasks.splice(C, 1);
           }
         };
       }).pipe(L(1)), h = {
@@ -630,7 +624,7 @@ class mt extends $e {
     });
   }
 }
-class fe extends mt {
+class _e extends pt {
   #e = /* @__PURE__ */ new Map();
   get(e, t) {
     const s = {
@@ -646,7 +640,7 @@ class fe extends mt {
     return this.#s("get", a, s, t), a.result$.pipe(
       f((o) => this.#t(a, o)),
       f((o) => {
-        if (o.length === 0) throw new $("not found");
+        if (o.length === 0) throw new m("not found");
         return o[0];
       })
     );
@@ -664,54 +658,54 @@ class fe extends mt {
       f((a) => this.#t(n, a)),
       f((a) => {
         if (a.length === 0)
-          throw new $("not found");
+          throw new m("not found");
         return a[0];
       })
     );
   }
   find(e, t) {
-    const s = _t(this.adapter, this.metadata, e, t), n = this.create_query_task(s);
+    const s = ht(this.adapter, this.metadata, e, t), n = this.create_query_task(s);
     return this.#s("find", n, e, t), n.result$.pipe(f((a) => this.#t(n, a)));
   }
   findAll(e, t) {
-    const s = ft(this.adapter, this.metadata, e, t), n = this.create_query_task(s);
+    const s = _t(this.adapter, this.metadata, e, t), n = this.create_query_task(s);
     return this.#s("findAll", n, e, t), n.result$.pipe(f((a) => this.#t(n, a)));
   }
   findByCursor(e, t) {
-    throw new Error("Method not implemented.");
+    throw new m("Method not implemented.");
   }
   count(e, t) {
-    const s = pt(this.adapter, this.metadata, e), n = this.create_query_task(s);
+    const s = ft(this.adapter, this.metadata, e), n = this.create_query_task(s);
     return this.#s("count", n, e, t), n.result$.pipe(f((a) => a.results[0].rows[0][0]));
   }
   create(e) {
-    return I(this.#r(e));
+    return O(this.#r(e));
   }
   update(e, t) {
-    return I(this.#i(e, t));
+    return O(this.#i(e, t));
   }
   remove(e) {
-    const t = ae(e), s = () => {
+    const t = re(e), s = () => {
       t.origin = structuredClone({ ...e }), t.modified = !1, t.removed = !0;
     };
     if (t.local === !0) {
-      const { sql: a, params: o } = at(this.metadata, e, this.rxdb.context), c = this.client$.pipe(
+      const { sql: a, params: o } = rt(this.metadata, e, this.rxdb.context), c = this.client$.pipe(
         Q(1),
         w(() => this.adapter.execute(a, o)),
         f(() => (e.removedAt = /* @__PURE__ */ new Date(), this.rxdb.context?.userId && (e.removedBy = this.rxdb.context.userId), s(), e)),
         A(() => s()),
         A((i) => this.merge_cache("remove", [i]))
       );
-      return I(c);
+      return O(c);
     } else if (t.remote === !0) {
-      const { sql: a, params: o } = ot(this.metadata, e, this.rxdb.context), c = this.#n("remove", a, o).pipe(
+      const { sql: a, params: o } = it(this.metadata, e, this.rxdb.context), c = this.#n("remove", a, o).pipe(
         A(() => s()),
         f((i) => i[0])
       );
-      return I(c);
+      return O(c);
     }
     const n = q(e);
-    throw new $(`Remove Error${n.name}(${e.id}) not saved local.`);
+    throw new m(`Remove Error${n.name}(${e.id}) not saved local.`);
   }
   /**
    * 根据 type 计算主动更新缓存策略
@@ -733,7 +727,7 @@ class fe extends mt {
           this.#l(n, s, t);
           break;
         default:
-          throw new Error("unknown type");
+          throw new m("unknown type");
       }
     }
   }
@@ -742,11 +736,11 @@ class fe extends mt {
     return e.resultEntities = s, e.resultEntityIds = s.map((n) => n.id), s;
   }
   #r(e) {
-    const { sql: t, params: s } = it(this.metadata, e, this.rxdb.context);
+    const { sql: t, params: s } = at(this.metadata, e, this.rxdb.context);
     return this.#n("create", t, s).pipe(f((n) => n[0]));
   }
   #i(e, t) {
-    const { sql: s, params: n } = ct(this.metadata, e, t, this.rxdb.context);
+    const { sql: s, params: n } = ot(this.metadata, e, t, this.rxdb.context);
     return this.#n("update", s, n).pipe(f((a) => a[0]));
   }
   #s(e, t, s, n) {
@@ -776,12 +770,12 @@ class fe extends mt {
       case "findByCursor":
       case "count":
       case "findAll":
-        s.some((c) => S(c, a)) && t.refresh();
+        s.some((c) => R(c, a)) && t.refresh();
         break;
     }
   }
   #c(e, t, s) {
-    const n = s.map((u) => u.id), a = t.resultEntityIds.some((u) => n.includes(u)), { type: o, where: c, options: i } = e, l = s.some((u) => S(u, c));
+    const n = s.map((u) => u.id), a = t.resultEntityIds.some((u) => n.includes(u)), { type: o, where: c, options: i } = e, l = s.some((u) => R(u, c));
     switch (o) {
       case "count":
         l !== a && t.refresh();
@@ -806,7 +800,7 @@ class fe extends mt {
       case "findByCursor":
       case "count":
       case "findAll":
-        (a || s.some((i) => S(i, c))) && t.refresh();
+        (a || s.some((i) => R(i, c))) && t.refresh();
         break;
     }
   }
@@ -817,11 +811,11 @@ const D = (r, e, t, s) => {
   const i = [o, v(t)].filter(Boolean).join(" AND ");
   return i && (c = `WHERE ${i}`), {
     sql: `WITH RECURSIVE __children AS (
-  SELECT *,rowid as ${R}, 0 AS level
+  SELECT *,rowid as ${S}, 0 AS level
   FROM ${a}
   WHERE id = ?
   UNION ALL
-  SELECT children.*,children.rowid as ${R}, c.level + 1
+  SELECT children.*,children.rowid as ${S}, c.level + 1
   FROM ${a} children
   JOIN __children c ON ${s.descendants ? "children.parentId = c.id" : "children.id = c.parentId"}
   ${c}
@@ -830,23 +824,23 @@ SELECT ${s.count ? "count(*)-1 as count" : "*"} FROM __children
 ORDER BY level, id;`,
     params: [e]
   };
-}, Et = (r, e, t, s) => D(r, e, t, { ...s, descendants: !0 }), yt = (r, e, t, s) => D(r, e, t, { ...s, descendants: !1 }), $t = (r, e, t, s) => D(r, e, t, { ...s, descendants: !0, count: !0 }), bt = (r, e, t, s) => D(r, e, t, { ...s, descendants: !1, count: !0 });
-class Nt extends fe {
+}, mt = (r, e, t, s) => D(r, e, t, { ...s, descendants: !0 }), Et = (r, e, t, s) => D(r, e, t, { ...s, descendants: !1 }), yt = (r, e, t, s) => D(r, e, t, { ...s, descendants: !0, count: !0 }), $t = (r, e, t, s) => D(r, e, t, { ...s, descendants: !1, count: !0 });
+class bt extends _e {
   #e = /* @__PURE__ */ new Map();
   findDescendants(e, t, s) {
-    const n = Et(this.metadata, e.id, t, s), a = this.create_query_task(n);
+    const n = mt(this.metadata, e.id, t, s), a = this.create_query_task(n);
     return this.#r("findDescendants", a, e.id, t, s), a.result$.pipe(f((o) => this.#t(a, o)));
   }
   countDescendants(e, t, s) {
-    const n = $t(this.metadata, e.id, t, s), a = this.create_query_task(n);
+    const n = yt(this.metadata, e.id, t, s), a = this.create_query_task(n);
     return this.#r("countDescendants", a, e.id, t, s), a.result$.pipe(f((o) => o.results[0].rows[0][0]));
   }
   findAncestors(e, t, s) {
-    const n = yt(this.metadata, e.id, t, s), a = this.create_query_task(n);
+    const n = Et(this.metadata, e.id, t, s), a = this.create_query_task(n);
     return this.#r("findAncestors", a, e.id, t, s), a.result$.pipe(f((o) => this.#t(a, o)));
   }
   countAncestors(e, t, s) {
-    const n = bt(this.metadata, e.id, t, s), a = this.create_query_task(n);
+    const n = $t(this.metadata, e.id, t, s), a = this.create_query_task(n);
     return this.#r("countAncestors", a, e.id, t, s), a.result$.pipe(f((o) => o.results[0].rows[0][0]));
   }
   /**
@@ -869,7 +863,7 @@ class Nt extends fe {
           this.#n(n, s, t);
           break;
         default:
-          throw new Error("unknown type");
+          throw new m("unknown type");
       }
     }
   }
@@ -888,7 +882,7 @@ class Nt extends fe {
   #i(e, t, s) {
     const { type: n, where: a } = e, o = s.map((l) => l.parentId), c = t.resultEntityIds.some((l) => o.includes(l));
     let i = !0;
-    switch (a.rules.length > 0 && (i = s.some((l) => S(l, a))), n) {
+    switch (a.rules.length > 0 && (i = s.some((l) => R(l, a))), n) {
       case "findDescendants":
       case "countDescendants":
         c && i && t.refresh();
@@ -898,7 +892,7 @@ class Nt extends fe {
   #s(e, t, s) {
     const { type: n, where: a } = e, o = s.map((l) => l.parentId), c = t.resultEntityIds.some((l) => o.includes(l));
     let i = !0;
-    switch (a.rules.length > 0 && (i = s.some((l) => S(l, a))), n) {
+    switch (a.rules.length > 0 && (i = s.some((l) => R(l, a))), n) {
       case "findDescendants":
       case "countDescendants":
       case "findAncestors":
@@ -910,7 +904,7 @@ class Nt extends fe {
   #n(e, t, s) {
     const { type: n, where: a } = e, o = s.map((l) => l.parentId), c = t.resultEntityIds.some((l) => o.includes(l));
     let i = !0;
-    switch (a.rules.length > 0 && (i = s.some((l) => S(l, a))), n) {
+    switch (a.rules.length > 0 && (i = s.some((l) => R(l, a))), n) {
       case "findDescendants":
       case "countDescendants":
       case "findAncestors":
@@ -920,10 +914,10 @@ class Nt extends fe {
     }
   }
 }
-class vt extends Ae {
+class Rt extends Oe {
   constructor(e, t) {
     super(e), this.options = t;
-    const s = _e(e.options.dbName, "changes");
+    const s = he(e.options.dbName, "changes");
     this.#r = new BroadcastChannel(s), this.#i = Ce(this.#r, "message"), this.#i.pipe(K(this.#e)).subscribe((n) => {
       const a = n.data, { dbName: o, tableName: c, rowid: i, recordAt: l, timeStamp: u } = a;
       if (!o || !c || !i) return;
@@ -939,10 +933,10 @@ class vt extends Ae {
           this.rxdb.dispatchEvent(new Se(p, d));
           break;
         case M.SQLITE_INSERT:
-          this.rxdb.dispatchEvent(new Re(p, d));
+          this.rxdb.dispatchEvent(new qe(p, d));
           break;
         case M.SQLITE_UPDATE:
-          this.rxdb.dispatchEvent(new qe(p, d));
+          this.rxdb.dispatchEvent(new Ae(p, d));
           break;
       }
     }), this.#_.pipe(K(this.#e)).subscribe();
@@ -956,22 +950,22 @@ class vt extends Ae {
   #s = [];
   #n = /* @__PURE__ */ new Map();
   #o = !1;
-  #c = new ie(0);
+  #c = new ae(0);
   #l = this.#c.asObservable();
   // sqlite 客户端
-  #a = new oe((e) => {
+  #a = new ie((e) => {
     const { vfs: t, async: s, worker: n, wasmPath: a, workerInstance: o } = this.options, c = {
       vfs: t,
       async: s,
       worker: n,
       wasmPath: a
     };
-    he(c);
+    de(c);
     let i;
-    n && o ? i = ve(o) : i = new rt(), i.init(this.rxdb.options.dbName, c).then(() => e.next(i));
+    n && o ? i = Re(o) : i = new nt(), i.init(this.rxdb.options.dbName, c).then(() => e.next(i));
   }).pipe(L(1));
   // 已连接
-  #h = Le(() => this.rxdb.connect(this.name)).pipe(L(1));
+  #h = ke(() => this.rxdb.connect(this.name)).pipe(L(1));
   // 队列
   #_ = this.#l.pipe(
     Z(() => this.#o === !1),
@@ -985,15 +979,9 @@ class vt extends Ae {
         w((s) => s.execute(e.sql, e.bindings)),
         A((s) => t.next(s)),
         A(() => setTimeout(() => this.#n.delete(e.key), 0)),
-        Me((s) => {
+        Le((s) => {
           const n = s.message || "执行错误";
-          return t.error(
-            new $("${msg} ${sql} ${bindings}", {
-              msg: n,
-              sql: e.sql,
-              bindings: JSON.stringify(e.bindings)
-            })
-          ), je({ error: s });
+          return t.error(new m(`${n} ${e.sql} ${JSON.stringify(e.bindings)}`)), Me({ error: s });
         })
       );
     }),
@@ -1001,7 +989,7 @@ class vt extends Ae {
       this.#o = !1, this.#u();
     })
   );
-  name = de;
+  name = ue;
   /**
    * 数据库版本
    */
@@ -1025,7 +1013,7 @@ class vt extends Ae {
    * 获取版本
    */
   version() {
-    return I(this.version$);
+    return O(this.version$);
   }
   /**
    * 获取实体仓库
@@ -1037,13 +1025,13 @@ class vt extends Ae {
       let s;
       switch (t.repository) {
         case "Repository":
-          s = new fe(this, this.#a, e);
+          s = new _e(this, this.#a, e);
           break;
         case "TreeRepository":
-          s = new Nt(this, this.#a, e);
+          s = new bt(this, this.#a, e);
           break;
         default:
-          throw new $("Unsupported repository type: " + t.repository);
+          throw new m("Unsupported repository type: " + t.repository);
       }
       return this.#t.set(e, s), s;
     }
@@ -1054,7 +1042,7 @@ class vt extends Ae {
    * @param EntityType
    */
   isTableExisted(e) {
-    return I(this.isTableExisted$(e));
+    return O(this.isTableExisted$(e));
   }
   /**
    * 判断表是否存在
@@ -1062,7 +1050,7 @@ class vt extends Ae {
    */
   isTableExisted$(e) {
     const t = q(e), s = E(t);
-    return this.#d(Ve(s)).pipe(f((n) => Ue(n) === !1));
+    return this.#d(Pe(s)).pipe(f((n) => Ve(n) === !1));
   }
   /**
    * 创建 table
@@ -1070,13 +1058,13 @@ class vt extends Ae {
    */
   createTable(e) {
     const t = q(e);
-    let s = ze(this, t);
+    let s = Ge(this, t);
     if (t.log !== !1) {
-      const n = Xe(this, t);
+      const n = ze(this, t);
       s += `
 ` + n;
     }
-    return I(this.#d(s).pipe(f(() => !0)));
+    return O(this.#d(s).pipe(f(() => !0)));
   }
   /**
    * 执行 sql
@@ -1096,19 +1084,19 @@ class vt extends Ae {
    * @param callback
    */
   transaction(e) {
-    return I(this.transaction$(e));
+    return O(this.transaction$(e));
   }
   transaction$(e) {
     return this.#a.pipe(
       w(async (t) => {
-        this.rxdb.dispatchEvent(Tt), await t.execute("BEGIN; PRAGMA defer_foreign_keys = ON;");
+        this.rxdb.dispatchEvent(Nt), await t.execute("BEGIN; PRAGMA defer_foreign_keys = ON;");
         try {
           const s = await e();
           return await t.execute("COMMIT"), this.rxdb.dispatchEvent(wt), s;
         } catch (s) {
-          await t.execute("ROLLBACK"), this.rxdb.dispatchEvent(gt);
+          await t.execute("ROLLBACK"), this.rxdb.dispatchEvent(Tt);
           const n = s?.message || "Transaction Error";
-          throw new $(n);
+          throw new m(n);
         }
       })
     );
@@ -1126,11 +1114,11 @@ class vt extends Ae {
     return this.#a.pipe(w((s) => ee(s.execute(e, t))));
   }
 }
-const Tt = new ge(), wt = new Oe(), gt = new Ie();
+const Nt = new Te(), wt = new ge(), Tt = new Ie();
 export {
-  vt as RxDBAdapterSqlite,
-  $ as RxdbAdapterSqliteError,
-  rt as SqliteClient,
-  tt as WA_SQLITE_VFS_LIST,
-  st as sqliteLoad
+  Rt as RxDBAdapterSqlite,
+  m as RxdbAdapterSqliteError,
+  nt as SqliteClient,
+  et as WA_SQLITE_VFS_LIST,
+  tt as sqliteLoad
 };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@aiao/rxdb-adapter-sqlite",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@aiao/rxdb": "*",
-    "@aiao/utils": "0.0.1",
+    "@aiao/rxdb": "0.0.3",
+    "@aiao/utils": "0.0.3",
     "rxjs": "~7.8.0",
     "@journeyapps/wa-sqlite": "^1.2.4",
     "comlink": "^4.4.2"