interaqt 4.0.5 → 4.1.0

package/dist/drivers.js

@@ -1,11 +1,11 @@
 import N from "better-sqlite3";
-import { sqliteEncodeLiteral as I, dbConsoleLogger as S, asyncInteractionContext as l, ROW_ID_ATTR as m, defaultEncodeLiteral as y, RequireSerializableRetry as b } from "interaqt";
+import { sqliteEncodeLiteral as b, dbConsoleLogger as S, asyncInteractionContext as l, ROW_ID_ATTR as m, defaultEncodeLiteral as y, RequireSerializableRetry as I } from "interaqt";
 import { AsyncLocalStorage as A } from "node:async_hooks";
 import { createHash as L } from "node:crypto";
-import R from "pg";
-import { PGlite as w } from "@electric-sql/pglite";
+import w from "pg";
+import { PGlite as R } from "@electric-sql/pglite";
 import E from "mysql2/promise";
-let O = class {
+let C = class {
   constructor(e) {
     this.db = e;
   }
@@ -45,9 +45,9 @@ class K {
       maxIdentifierLength: 63,
       supportsCreateIndexIfNotExists: !0,
       enforceMaxIdentifierLength: !1,
-      encodeLiteral: I,
+      encodeLiteral: b,
       constraints: { unique: !0, filteredUnique: !0, nonNull: !1 }
-    }, this.idSystem = new O(this), this.logger = this.options?.logger || S;
+    }, this.idSystem = new C(this), this.logger = this.options?.logger || S;
   }
   async open(e = !1) {
     if ((!this.db || !this.db.open) && (this.db = new N(this.file, this.options)), e) {
@@ -127,13 +127,17 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     }), this.db.prepare(e).run();
   }
   async close() {
-    this.db.close();
+    if (!(!this.db || !this.db.open))
+      try {
+        this.db.close();
+      } catch {
+      }
   }
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
   }
   parseMatchExpression(e, t, s, r, n, o, a) {
-    if (r === "JSON" && t[0].toLowerCase() === "contains")
+    if (r.toLowerCase() === "json" && t[0].toLowerCase() === "contains")
       return {
         fieldValue: `NOT NULL AND EXISTS (
     SELECT 1
@@ -147,7 +151,7 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     return e === "pk" ? "INTEGER PRIMARY KEY" : e === "id" ? "INT" : t || e === "object" || e === "json" ? "JSON" : e === "string" ? "TEXT" : e === "boolean" ? "INT(2)" : e === "number" || e === "timestamp" ? "INT" : e;
   }
 }
-const { Client: g, Pool: C } = R;
+const { Client: g, Pool: O } = w;
 let q = class {
   constructor(e) {
     this.db = e, this.initialized = /* @__PURE__ */ new Set(), this.recordToSequenceName = /* @__PURE__ */ new Map();
@@ -235,10 +239,10 @@ class G {
       enforceMaxIdentifierLength: !0,
       encodeLiteral: y,
       constraints: { unique: !0, filteredUnique: !0, nonNull: !0 }
-    }, this.idSystem = new q(this), this.logger = this.options?.logger || S, this.db = new g({ ...t });
+    }, this.closed = !1, this.idSystem = new q(this), this.logger = this.options?.logger || S, this.db = new g({ ...t });
   }
   async open(e = !1) {
-    this.pool && e && (await this.pool.end(), this.pool = void 0);
+    this.closed = !1, this.pool && e && (await this.pool.end(), this.pool = void 0);
     const t = new g({
       ...this.options
     });
@@ -260,7 +264,7 @@ class G {
     }));
   }
   createPool() {
-    const e = new C({
+    const e = new O({
       ...this.options,
       database: this.database
     });
@@ -284,7 +288,7 @@ class G {
     const s = this.transactionContext.getStore();
     if (s && s.depth > 0) {
       if (s.isolation !== "SERIALIZABLE" && (e.isolation ?? "READ COMMITTED") === "SERIALIZABLE")
-        throw new b(`${e.name || "nested transaction"} requires SERIALIZABLE isolation`);
+        throw new I(`${e.name || "nested transaction"} requires SERIALIZABLE isolation`);
       s.depth++;
       try {
         return await t();
@@ -377,8 +381,18 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
       sql: e
     }), await this.getQueryable().query(e);
   }
-  close() {
-    return this.pool ? this.pool.end() : this.db.end();
+  async close() {
+    if (!this.closed) {
+      if (this.closed = !0, this.pool) {
+        await this.pool.end(), this.pool = void 0;
+        return;
+      }
+      if (this.db && typeof this.db.end == "function")
+        try {
+          await this.db.end();
+        } catch {
+        }
+    }
   }
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
@@ -387,7 +401,7 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     return this.idSystem.setupSequences(e);
   }
   parseMatchExpression(e, t, s, r, n, o, a) {
-    if (r === "JSON") {
+    if (r.toLowerCase() === "json") {
       if (t[0].toLowerCase() === "contains") {
         const c = s.split(".").map((u) => `"${u}"`).join(".");
         return {
@@ -718,7 +732,7 @@ class z {
       enforceMaxIdentifierLength: !0,
       encodeLiteral: y,
       constraints: { unique: !0, filteredUnique: !0, nonNull: !0 }
-    }, this.idSystem = new M(this), this.logger = this.options?.logger || S, this.db = new w(this.database);
+    }, this.closed = !1, this.idSystem = new M(this), this.logger = this.options?.logger || S, this.db = new R(this.database);
   }
   async open(e = !1) {
     if (e) {
@@ -832,8 +846,14 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
       }), n;
     }
   }
-  close() {
-    return this.db.close();
+  async close() {
+    if (!(this.closed || !this.db)) {
+      this.closed = !0;
+      try {
+        await this.db.close();
+      } catch {
+      }
+    }
   }
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
@@ -893,7 +913,7 @@ ON DUPLICATE KEY UPDATE last = LAST_INSERT_ID(last + 1)`,
     }), t;
   }
 }
-class H {
+class v {
   constructor(e, t = {}) {
     this.database = e, this.options = t, this.supportsSelectForUpdate = !0, this.maxQueryParams = 65e3, this.returnsParsedJSON = !0, this.transactionCapability = {
       transactions: !1,
@@ -911,23 +931,26 @@ class H {
       enforceMaxIdentifierLength: !0,
       encodeLiteral: y,
       constraints: { unique: !1, filteredUnique: !1, nonNull: !1 }
-    }, this.idSystem = new P(this), this.logger = this.options?.logger || S;
+    }, this.closed = !1, this.idSystem = new P(this), this.logger = this.options?.logger || S;
   }
   async open(e = !1) {
-    const t = await E.createConnection({
-      ...this.options
-    });
-    await t.connect();
-    try {
-      const s = `\`${this.database.replace(/`/g, "``")}\``, [r] = await t.query("SHOW DATABASES LIKE ?", [this.database]);
-      r.length === 0 ? await t.query(`CREATE DATABASE ${s}`) : e && (await t.query(`DROP DATABASE ${s}`), await t.query(`CREATE DATABASE ${s}`));
-    } finally {
-      await t.end();
+    if (this.closed = !1, this.db && e && (await this.db.end(), this.db = void 0), !this.db) {
+      const t = await E.createConnection({
+        ...this.options
+      });
+      await t.connect();
+      try {
+        const s = `\`${this.database.replace(/`/g, "``")}\``, [r] = await t.query("SHOW DATABASES LIKE ?", [this.database]);
+        r.length === 0 ? await t.query(`CREATE DATABASE ${s}`) : e && (await t.query(`DROP DATABASE ${s}`), await t.query(`CREATE DATABASE ${s}`));
+      } finally {
+        await t.end();
+      }
+      this.db = await E.createConnection({
+        ...this.options,
+        database: this.database
+      }), await this.db.connect(), await this.db.query("SET sql_mode='ANSI_QUOTES'");
     }
-    this.db = await E.createConnection({
-      ...this.options,
-      database: this.database
-    }), await this.db.connect(), await this.db.query("SET sql_mode='ANSI_QUOTES'"), await this.idSystem.setup();
+    await this.idSystem.setup();
   }
   async openForSchemaRead() {
     this.db || (this.db = await E.createConnection({
@@ -945,7 +968,7 @@ class H {
     }), (await this.db.query(e, o))[0];
   }
   async update(e, t, s, r = "") {
-    const n = l.getStore(), o = this.logger.child(n?.logContext || {}), a = t.map((i) => typeof i == "object" && i !== null ? JSON.stringify(i) : i === !1 ? 0 : i === !0 ? 1 : i);
+    const n = l.getStore(), o = this.logger.child(n?.logContext || {}), a = t.map((i) => typeof i == "object" && i !== null && !(i instanceof Date) ? JSON.stringify(i) : i === !1 ? 0 : i === !0 ? 1 : i);
     return o.info({
       type: "update",
       name: r,
@@ -954,7 +977,7 @@ class H {
     }), (await this.db.query(e, a))[0];
   }
   async insert(e, t, s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), o = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c === !1 ? 0 : c === !0 ? 1 : c);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), o = t.map((c) => typeof c == "object" && c !== null && !(c instanceof Date) ? JSON.stringify(c) : c === !1 ? 0 : c === !0 ? 1 : c);
     n.info({
       type: "insert",
       name: s,
@@ -981,14 +1004,20 @@ class H {
       sql: e
     }), await this.db.query(e);
   }
-  close() {
-    return this.db.end();
+  async close() {
+    if (!(this.closed || !this.db)) {
+      this.closed = !0;
+      try {
+        await this.db.end();
+      } catch {
+      }
+    }
   }
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
   }
   parseMatchExpression(e, t, s, r, n, o, a) {
-    if (r === "JSON") {
+    if (r.toLowerCase() === "json") {
       if (t[0].toLowerCase() === "contains")
         return {
           fieldValue: `IS NOT NULL AND JSON_CONTAINS(${s.split(".").map((u) => `"${u}"`).join(".")}, ${a()}, '$')`,
@@ -1017,7 +1046,7 @@ class H {
   }
 }
 export {
-  H as MysqlDB,
+  v as MysqlDB,
   z as PGLiteDB,
   G as PostgreSQLDB,
   K as SQLiteDB