@aiao/rxdb-adapter-sqlite 0.0.2 → 0.0.3

package/index.js

@@ -1,29 +1,29 @@
-import { RxDBError as me, PropertyType as m, 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 { 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";
   }
 }, 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;
@@ -32,17 +32,17 @@ const Pe = (r) => `SELECT * FROM sqlite_master WHERE type='table' AND name='${r}
   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;
     }
-}, ce = (r, e) => `${e}$${r}`, y = (r) => ce(r.name, r.namespace), le = (r, e) => `idx_${r.name}_${e.name}`;
-class E extends me {
+}, 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 H = (r, e) => {
   const t = {};
@@ -64,7 +64,7 @@ const H = (r, e) => {
   }), s;
 }, Je = (r, e) => {
   let t = "";
-  const s = y(e);
+  const s = E(e);
   return Array.from(e.relationMap.values()).forEach((n) => {
     switch (n.kind) {
       case I.ONE_TO_ONE:
@@ -83,21 +83,21 @@ ALTER TABLE ${s} ADD COLUMN "${a}" TEXT`, n.nullable || (t += " NOT NULL"), n.ma
     }
   }), t;
 }, Ye = (r, e) => {
-  const t = y(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;
       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;
     }
@@ -111,7 +111,7 @@ ALTER TABLE ${s} ADD COLUMN "${a}" TEXT`, n.nullable || (t += " NOT NULL"), n.ma
 ${i}`).join(","), s += `
 );`;
   else
-    throw new E("columns is empty!");
+    throw new m("columns is empty!");
   return n.length && (s += `
 ` + n.join(`
 `)), s;
@@ -119,7 +119,7 @@ ${i}`).join(","), s += `
   let t = "";
   return t += Ye(r, e), t += Je(r, e), t;
 }, ze = (r, e) => {
-  const t = y(e), s = q(Ee), n = y(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}
+  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,
@@ -245,10 +245,10 @@ const ue = "sqlite", Xe = () => import("@journeyapps/wa-sqlite/dist/wa-sqlite-as
   }
 ], de = (r) => {
   const e = et.find((a) => a.name === r.vfs), { vfs: t, async: s, worker: n } = r;
-  if (!e) throw new E(`vfs ${t} not found`);
-  if (s !== s) throw new E(`vfs ${t} not support async: ${s}`);
-  if (n && !e.worker) throw new E(`vfs ${t} not support worker`);
-  if (!n && !e.jsContext) throw new E(`vfs ${t} only support worker`);
+  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;
 }, tt = async (r) => {
   const e = de(r), t = r.async ?? !0;
@@ -297,7 +297,6 @@ class nt {
     this.changeChanel = new BroadcastChannel(o), this.#e.update_hook(
       this.#t,
       (c, i, l, u) => {
-        if (!l) return;
         const h = {
           type: c,
           dbName: i,
@@ -322,13 +321,13 @@ class nt {
   }
 }
 const rt = (r, e, t) => {
-  const s = y(r), n = [e.id];
+  const s = E(r), n = [e.id];
   return {
     sql: `DELETE FROM ${s} WHERE id = ?;`,
     params: n
   };
 }, at = (r, e, t) => {
-  const s = y(r), n = Ke(r, e);
+  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 = H(r, n), c = Array(a.length).fill("?").join(","), i = Object.values(o);
   return {
@@ -338,7 +337,7 @@ const rt = (r, e, t) => {
 }, it = (r, e, t) => {
   const s = {};
   s.removedAt = /* @__PURE__ */ new Date(), t?.userId && (s.removedBy = t.userId);
-  const n = y(r), o = Object.keys(s).map((l) => `${l} = ?`).join(","), c = H(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 ${S},*;`,
     params: i
@@ -348,7 +347,7 @@ const rt = (r, e, t) => {
   n.updatedAt = /* @__PURE__ */ new Date(), s?.userId && (n.updatedBy = s.userId);
   const a = Object.keys(n), o = H(r, n), c = a.map((h) => `${h} = ?`).join(","), i = [...Object.values(o), e.id];
   return {
-    sql: `UPDATE ${y(r)} SET ${c} WHERE id = ? RETURNING rowid as ${S},*;`,
+    sql: `UPDATE ${E(r)} SET ${c} WHERE id = ? RETURNING rowid as ${S},*;`,
     params: i
   };
 }, J = (r) => r?.map((e) => `${e.field} ${e.order}`).join(", "), v = (r, e = /* @__PURE__ */ new Map()) => {
@@ -426,7 +425,7 @@ const rt = (r, e, t) => {
     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 E("mappedRelation not found");
+      if (!k) throw new m("mappedRelation not found");
       const P = () => {
         const g = G(k.metadata), $ = F(T), x = i($);
         return {
@@ -483,7 +482,7 @@ const rt = (r, e, t) => {
   });
   let l = "";
   for (const [u, h] of s.entries()) {
-    const _ = y(u);
+    const _ = E(u);
     for (const p of h)
       l += ` LEFT JOIN ${_} '${p.joinTableName}' ON ${p.on}`;
   }
@@ -494,21 +493,21 @@ const rt = (r, e, t) => {
   return a && (o += a), t && (o += ` where ${t}`), n && (o += ` order by ${n}`), s && (o += ` limit ${s}`), o += ";", o;
 }, ht = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = y(e), c = v(t, a), i = J(s?.orderBy);
+  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = J(s?.orderBy);
   return {
     sql: Y({ tableName: o, where: c, orderBy: i, join: n }),
     params: []
   };
 }, _t = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = y(e), c = v(t, a), i = J(s?.orderBy);
+  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = J(s?.orderBy);
   return {
     sql: Y({ tableName: o, where: c, orderBy: i, join: n }),
     params: []
   };
 }, ft = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = y(e), c = v(t, a);
+  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} _`;
   return n && (i += n), c && (i += ` where ${c}`), {
     sql: i,
@@ -516,7 +515,7 @@ const rt = (r, e, t) => {
   };
 }, V = (r, e, t, s) => {
   t = structuredClone(t);
-  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = y(e), c = v(t, a), i = J(s?.orderBy);
+  const { joinSQL: n, fieldAliasMap: a } = j(r, e, t), o = E(e), c = v(t, a), i = J(s?.orderBy);
   return {
     sql: Y({ tableName: o, where: c, orderBy: i, join: n, limit: 1 }),
     params: []
@@ -641,7 +640,7 @@ class _e extends pt {
     return this.#s("get", a, s, t), a.result$.pipe(
       f((o) => this.#t(a, o)),
       f((o) => {
-        if (o.length === 0) throw new E("not found");
+        if (o.length === 0) throw new m("not found");
         return o[0];
       })
     );
@@ -659,7 +658,7 @@ class _e extends pt {
       f((a) => this.#t(n, a)),
       f((a) => {
         if (a.length === 0)
-          throw new E("not found");
+          throw new m("not found");
         return a[0];
       })
     );
@@ -673,7 +672,7 @@ class _e extends pt {
     return this.#s("findAll", n, e, t), n.result$.pipe(f((a) => this.#t(n, a)));
   }
   findByCursor(e, t) {
-    throw new E("Method not implemented.");
+    throw new m("Method not implemented.");
   }
   count(e, t) {
     const s = ft(this.adapter, this.metadata, e), n = this.create_query_task(s);
@@ -706,7 +705,7 @@ class _e extends pt {
       return O(c);
     }
     const n = q(e);
-    throw new E(`Remove Error${n.name}(${e.id}) not saved local.`);
+    throw new m(`Remove Error${n.name}(${e.id}) not saved local.`);
   }
   /**
    * 根据 type 计算主动更新缓存策略
@@ -728,7 +727,7 @@ class _e extends pt {
           this.#l(n, s, t);
           break;
         default:
-          throw new E("unknown type");
+          throw new m("unknown type");
       }
     }
   }
@@ -807,7 +806,7 @@ class _e extends pt {
   }
 }
 const D = (r, e, t, s) => {
-  const n = s?.level || 0, a = y(r), o = n > 0 ? `c.level < ${n}` : "";
+  const n = s?.level || 0, a = E(r), o = n > 0 ? `c.level < ${n}` : "";
   let c = "";
   const i = [o, v(t)].filter(Boolean).join(" AND ");
   return i && (c = `WHERE ${i}`), {
@@ -864,7 +863,7 @@ class bt extends _e {
           this.#n(n, s, t);
           break;
         default:
-          throw new E("unknown type");
+          throw new m("unknown type");
       }
     }
   }
@@ -982,7 +981,7 @@ class Rt extends Oe {
         A(() => setTimeout(() => this.#n.delete(e.key), 0)),
         Le((s) => {
           const n = s.message || "执行错误";
-          return t.error(new E(`${n} ${e.sql} ${JSON.stringify(e.bindings)}`)), Me({ error: s });
+          return t.error(new m(`${n} ${e.sql} ${JSON.stringify(e.bindings)}`)), Me({ error: s });
         })
       );
     }),
@@ -1032,7 +1031,7 @@ class Rt extends Oe {
           s = new bt(this, this.#a, e);
           break;
         default:
-          throw new E("Unsupported repository type: " + t.repository);
+          throw new m("Unsupported repository type: " + t.repository);
       }
       return this.#t.set(e, s), s;
     }
@@ -1050,7 +1049,7 @@ class Rt extends Oe {
    * @param EntityType
    */
   isTableExisted$(e) {
-    const t = q(e), s = y(t);
+    const t = q(e), s = E(t);
     return this.#d(Pe(s)).pipe(f((n) => Ve(n) === !1));
   }
   /**
@@ -1097,7 +1096,7 @@ class Rt extends Oe {
         } catch (s) {
           await t.execute("ROLLBACK"), this.rxdb.dispatchEvent(Tt);
           const n = s?.message || "Transaction Error";
-          throw new E(n);
+          throw new m(n);
         }
       })
     );
@@ -1118,7 +1117,7 @@ class Rt extends Oe {
 const Nt = new Te(), wt = new ge(), Tt = new Ie();
 export {
   Rt as RxDBAdapterSqlite,
-  E as RxdbAdapterSqliteError,
+  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.2",
+  "version": "0.0.3",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@aiao/rxdb": "0.0.2",
-    "@aiao/utils": "0.0.2",
+    "@aiao/rxdb": "0.0.3",
+    "@aiao/utils": "0.0.3",
     "rxjs": "~7.8.0",
     "@journeyapps/wa-sqlite": "^1.2.4",
     "comlink": "^4.4.2"