interaqt 2.0.1 → 2.0.3

package/dist/drivers.js

@@ -1,11 +1,11 @@
-import m from "better-sqlite3";
-import { sqliteEncodeLiteral as I, dbConsoleLogger as f, asyncInteractionContext as l, ROW_ID_ATTR as p, defaultEncodeLiteral as S, RequireSerializableRetry as N } from "interaqt";
-import { AsyncLocalStorage as b } from "node:async_hooks";
-import { createHash as A } from "node:crypto";
-import R from "pg";
-import { PGlite as L } from "@electric-sql/pglite";
-import E from "mysql2/promise";
-let w = class {
+import N from "better-sqlite3";
+import { sqliteEncodeLiteral as I, dbConsoleLogger as S, asyncInteractionContext as l, ROW_ID_ATTR as E, defaultEncodeLiteral as y, RequireSerializableRetry as b } from "interaqt";
+import { AsyncLocalStorage as A } from "node:async_hooks";
+import { createHash as L } from "node:crypto";
+import w from "pg";
+import { PGlite as R } from "@electric-sql/pglite";
+import m from "mysql2/promise";
+let C = class {
   constructor(e) {
     this.db = e;
   }
@@ -46,13 +46,13 @@ class K {
       supportsCreateIndexIfNotExists: !0,
       encodeLiteral: I,
       constraints: { unique: !0, filteredUnique: !0, nonNull: !1 }
-    }, this.idSystem = new w(this), this.logger = this.options?.logger || f;
+    }, this.idSystem = new C(this), this.logger = this.options?.logger || S;
   }
   async open() {
-    this.db = new m(this.file, this.options), await this.idSystem.setup();
+    this.db = new N(this.file, this.options), await this.idSystem.setup();
   }
   async openForSchemaRead() {
-    this.db = new m(this.file, this.options);
+    this.db = new N(this.file, this.options);
   }
   async setupInternalComputationState() {
     await this.scheme(`
@@ -75,7 +75,7 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
 )`, "setup scoped sequence table");
   }
   async query(e, t = [], s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => i === !1 ? 0 : i === !0 ? 1 : i);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
     return n.info({
       type: "query",
       name: s,
@@ -84,25 +84,25 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     }), this.db.prepare(e).all(...a);
   }
   async update(e, t, s, r = "") {
-    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), i = `${e} ${s ? `RETURNING ${s} AS id` : ""}`, o = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c === !1 ? 0 : c === !0 ? 1 : c);
+    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), o = `${e} ${s ? `RETURNING ${s} AS id` : ""}`, i = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c === !1 ? 0 : c === !0 ? 1 : c);
     return a.info({
       type: "update",
       name: r,
-      sql: i,
-      params: o
-    }), s ? this.db.prepare(i).all(...o) : this.db.prepare(i).run(...o);
+      sql: o,
+      params: i
+    }), s ? this.db.prepare(o).all(...i) : this.db.prepare(o).run(...i);
   }
   async insert(e, t, s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => typeof o == "object" && o !== null ? JSON.stringify(o) : o === !1 ? 0 : o === !0 ? 1 : o);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => typeof i == "object" && i !== null ? JSON.stringify(i) : i === !1 ? 0 : i === !0 ? 1 : i);
     return n.info({
       type: "insert",
       name: s,
       sql: e,
       params: a
-    }), this.db.prepare(`${e} RETURNING ${p}`).all(...a)[0];
+    }), this.db.prepare(`${e} RETURNING ${E}`).all(...a)[0];
   }
   async delete(e, t, s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => i === !1 ? 0 : i === !0 ? 1 : i);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
     return n.info({
       type: "delete",
       name: s,
@@ -124,13 +124,13 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
   }
-  parseMatchExpression(e, t, s, r, n, a, i) {
+  parseMatchExpression(e, t, s, r, n, a, o) {
     if (r === "JSON" && t[0].toLowerCase() === "contains")
       return {
         fieldValue: `NOT NULL AND EXISTS (
     SELECT 1
     FROM json_each(${s})
-    WHERE json_each.value = ${i()}
+    WHERE json_each.value = ${o()}
 )`,
         fieldParams: [t[1]]
       };
@@ -139,8 +139,8 @@ 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: d, Pool: C } = R;
-let O = class {
+const { Client: g, Pool: O } = w;
+let q = class {
   constructor(e) {
     this.db = e, this.initialized = /* @__PURE__ */ new Set(), this.recordToSequenceName = /* @__PURE__ */ new Map();
   }
@@ -154,7 +154,7 @@ let O = class {
     return this.sequenceNameForKey(e, e);
   }
   sequenceNameForKey(e, t) {
-    return `seq_${A("sha1").update(e).digest("hex").slice(0, 12)}_${this.sanitizeIdentifierPart(t)}`.slice(0, 63);
+    return `seq_${L("sha1").update(e).digest("hex").slice(0, 12)}_${this.sanitizeIdentifierPart(t)}`.slice(0, 63);
   }
   quoteIdentifier(e) {
     return `"${e.replace(/"/g, '""')}"`;
@@ -170,21 +170,21 @@ let O = class {
       this.recordToSequenceName.set(r.recordName, n);
       const a = this.quoteIdentifier(n);
       await this.db.scheme(`CREATE SEQUENCE IF NOT EXISTS ${a} START WITH 1`, `create sequence ${r.recordName}`);
-      const i = await this.db.query(
+      const o = await this.db.query(
         `SELECT COALESCE(MAX("${r.idField}"), 0) AS max FROM ${this.quoteIdentifier(r.tableName)}`,
         [],
         `read max id for ${r.recordName}`
       );
-      let o = 0;
+      let i = 0;
       if (t) {
-        const T = await this.db.query(
+        const u = await this.db.query(
           'SELECT COALESCE(MAX("last"), 0) AS last FROM "_IDS_" WHERE "name" = $1',
           [r.recordName],
           `read legacy id for ${r.recordName}`
         );
-        o = Number(T[0]?.last ?? 0);
+        i = Number(u[0]?.last ?? 0);
       }
-      const c = Math.max(Number(i[0]?.max ?? 0), o);
+      const c = Math.max(Number(o[0]?.max ?? 0), i);
       s.set(a, Math.max(s.get(a) ?? 0, c)), this.initialized.add(r.recordName);
     }
     for (const [r, n] of s)
@@ -205,9 +205,9 @@ let O = class {
     ))[0].id;
   }
 };
-class J {
+class G {
   constructor(e, t = {}) {
-    this.database = e, this.options = t, this.transactionContext = new b(), this.supportsSelectForUpdate = !0, this.maxQueryParams = 65e3, this.transactionCapability = {
+    this.database = e, this.options = t, this.transactionContext = new A(), this.supportsSelectForUpdate = !0, this.maxQueryParams = 65e3, this.transactionCapability = {
       transactions: !0,
       isolationLevels: ["READ COMMITTED", "SERIALIZABLE"],
       transactionBoundConnection: !0,
@@ -224,28 +224,28 @@ class J {
       name: "postgres",
       maxIdentifierLength: 63,
       supportsCreateIndexIfNotExists: !0,
-      encodeLiteral: S,
+      encodeLiteral: y,
       constraints: { unique: !0, filteredUnique: !0, nonNull: !0 }
-    }, this.idSystem = new O(this), this.logger = this.options?.logger || f, this.db = new d({ ...t });
+    }, 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);
-    const t = new d({
+    const t = new g({
       ...this.options
     });
-    await t.connect(), (await t.query("SELECT FROM pg_database WHERE datname = $1", [this.database])).rows.length === 0 ? await t.query(`CREATE DATABASE "${this.database}"`) : e && (await t.query(`DROP DATABASE "${this.database}" WITH (FORCE)`), await t.query(`CREATE DATABASE "${this.database}"`)), await t.end(), this.pool || (this.pool = this.createPool(), this.db = new d({
+    await t.connect(), (await t.query("SELECT FROM pg_database WHERE datname = $1", [this.database])).rows.length === 0 ? await t.query(`CREATE DATABASE "${this.database}"`) : e && (await t.query(`DROP DATABASE "${this.database}" WITH (FORCE)`), await t.query(`CREATE DATABASE "${this.database}"`)), await t.end(), this.pool || (this.pool = this.createPool(), this.db = new g({
       ...this.options,
       database: this.database
     }));
   }
   async openForSchemaRead() {
-    this.pool || (this.pool = this.createPool(), this.db = new d({
+    this.pool || (this.pool = this.createPool(), this.db = new g({
       ...this.options,
       database: this.database
     }));
   }
   createPool() {
-    const e = new C({
+    const e = new O({
       ...this.options,
       database: this.database
     });
@@ -269,7 +269,7 @@ class J {
     const s = this.transactionContext.getStore();
     if (s && s.depth > 0) {
       if (s.isolation !== "SERIALIZABLE" && (e.isolation ?? "READ COMMITTED") === "SERIALIZABLE")
-        throw new N(`${e.name || "nested transaction"} requires SERIALIZABLE isolation`);
+        throw new b(`${e.name || "nested transaction"} requires SERIALIZABLE isolation`);
       s.depth++;
       try {
         return await t();
@@ -280,20 +280,20 @@ class J {
     if (!this.pool)
       throw new Error("PostgreSQL pool is not initialized. Call open() before starting a transaction.");
     const r = e.isolation ?? "READ COMMITTED", n = await this.pool.connect(), a = { client: n, depth: 1, isolation: r };
-    let i = !1;
+    let o = !1;
     try {
       await n.query(`BEGIN ISOLATION LEVEL ${r}`);
-      const o = await this.transactionContext.run(a, t);
-      return await n.query("COMMIT"), o;
-    } catch (o) {
+      const i = await this.transactionContext.run(a, t);
+      return await n.query("COMMIT"), i;
+    } catch (i) {
       try {
         await n.query("ROLLBACK");
       } finally {
-        n.release(), i = !0;
+        n.release(), o = !0;
       }
-      throw o;
+      throw i;
     } finally {
-      i || n.release();
+      o || n.release();
     }
   }
   async setupInternalComputationState() {
@@ -326,24 +326,24 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     }), (await this.getQueryable().query(e, a)).rows;
   }
   async update(e, t, s, r = "") {
-    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), i = `${e} ${s ? `RETURNING "${s}" AS id` : ""}`, o = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c);
+    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), o = `${e} ${s ? `RETURNING "${s}" AS id` : ""}`, i = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c);
     return a.info({
       type: "update",
       name: r,
-      sql: i,
-      params: o
-    }), (await this.getQueryable().query(i, o)).rows;
+      sql: o,
+      params: i
+    }), (await this.getQueryable().query(o, i)).rows;
   }
   async insert(e, t, s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => typeof o == "object" && o !== null ? JSON.stringify(o) : o);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => typeof i == "object" && i !== null ? JSON.stringify(i) : i);
     n.info({
       type: "insert",
       name: s,
       sql: e,
       params: a
     });
-    const i = `${e} RETURNING "${p}"`;
-    return (await this.getQueryable().query(i, a)).rows[0];
+    const o = `${e} RETURNING "${E}"`;
+    return (await this.getQueryable().query(o, a)).rows[0];
   }
   async delete(e, t, s = "") {
     const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t;
@@ -371,13 +371,28 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
   setupRecordSequences(e) {
     return this.idSystem.setupSequences(e);
   }
-  parseMatchExpression(e, t, s, r, n, a, i) {
-    if (r === "JSON" && t[0].toLowerCase() === "contains") {
-      const o = s.split(".").map((c) => `"${c}"`).join(".");
-      return {
-        fieldValue: `IS NOT NULL AND ${i()} = ANY (SELECT json_array_elements_text(${o}))`,
-        fieldParams: [t[1]]
-      };
+  parseMatchExpression(e, t, s, r, n, a, o) {
+    if (r === "JSON") {
+      if (t[0].toLowerCase() === "contains") {
+        const c = s.split(".").map((u) => `"${u}"`).join(".");
+        return {
+          fieldValue: `IS NOT NULL AND ${o()} = ANY (SELECT json_array_elements_text(${c}))`,
+          fieldParams: [t[1]]
+        };
+      }
+      if (t[0] === "=" || t[0] === "!=")
+        return {
+          fieldValue: `IS NOT NULL AND ${s.split(".").map((u) => `"${u}"`).join(".")}::jsonb ${t[0]} ${o()}::jsonb`,
+          fieldParams: [JSON.stringify(t[1])]
+        };
+      const i = t[0].toLowerCase();
+      if ((i === "in" || i === "not in") && Array.isArray(t[1]) && t[1].length > 0) {
+        const c = s.split(".").map((h) => `"${h}"`).join("."), u = t[1].map(() => `${o()}::jsonb`).join(",");
+        return {
+          fieldValue: `IS NOT NULL AND ${c}::jsonb ${i === "in" ? "IN" : "NOT IN"} (${u})`,
+          fieldParams: t[1].map((h) => JSON.stringify(h))
+        };
+      }
     }
   }
   getPlaceholder() {
@@ -388,8 +403,8 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     return e === "pk" ? "INT GENERATED ALWAYS AS IDENTITY" : e === "id" ? "INT" : t || e === "object" ? "JSON" : e === "string" ? "TEXT" : e === "boolean" ? "BOOLEAN" : e === "number" ? "DOUBLE PRECISION" : e === "timestamp" ? "TIMESTAMP" : e;
   }
 }
-const g = "0123456789abcdef";
-class h {
+const p = "0123456789abcdef";
+class f {
   /** @param bytes - The 16-byte byte array representation. */
   constructor(e) {
     this.bytes = e;
@@ -406,7 +421,7 @@ class h {
   static ofInner(e) {
     if (e.length !== 16)
       throw new TypeError("not 128-bit length");
-    return new h(e);
+    return new f(e);
   }
   /**
    * Builds a byte array from UUIDv7 field values.
@@ -421,7 +436,7 @@ class h {
     if (!Number.isInteger(e) || !Number.isInteger(t) || !Number.isInteger(s) || !Number.isInteger(r) || e < 0 || t < 0 || s < 0 || r < 0 || e > 281474976710655 || t > 4095 || s > 1073741823 || r > 4294967295)
       throw new RangeError("invalid field value");
     const n = new Uint8Array(16);
-    return n[0] = e / 2 ** 40, n[1] = e / 2 ** 32, n[2] = e / 2 ** 24, n[3] = e / 2 ** 16, n[4] = e / 2 ** 8, n[5] = e, n[6] = 112 | t >>> 8, n[7] = t, n[8] = 128 | s >>> 24, n[9] = s >>> 16, n[10] = s >>> 8, n[11] = s, n[12] = r >>> 24, n[13] = r >>> 16, n[14] = r >>> 8, n[15] = r, new h(n);
+    return n[0] = e / 2 ** 40, n[1] = e / 2 ** 32, n[2] = e / 2 ** 24, n[3] = e / 2 ** 16, n[4] = e / 2 ** 8, n[5] = e, n[6] = 112 | t >>> 8, n[7] = t, n[8] = 128 | s >>> 24, n[9] = s >>> 16, n[10] = s >>> 8, n[11] = s, n[12] = r >>> 24, n[13] = r >>> 16, n[14] = r >>> 8, n[15] = r, new f(n);
   }
   /**
    * Builds a byte array from a string representation.
@@ -455,12 +470,12 @@ class h {
         break;
     }
     if (a) {
-      const i = new Uint8Array(16);
-      for (let o = 0; o < 16; o += 4) {
-        const c = parseInt(a.substring(2 * o, 2 * o + 8), 16);
-        i[o + 0] = c >>> 24, i[o + 1] = c >>> 16, i[o + 2] = c >>> 8, i[o + 3] = c;
+      const o = new Uint8Array(16);
+      for (let i = 0; i < 16; i += 4) {
+        const c = parseInt(a.substring(2 * i, 2 * i + 8), 16);
+        o[i + 0] = c >>> 24, o[i + 1] = c >>> 16, o[i + 2] = c >>> 8, o[i + 3] = c;
       }
-      return new h(i);
+      return new f(o);
     } else
       throw new SyntaxError("could not parse UUID string");
   }
@@ -471,7 +486,7 @@ class h {
   toString() {
     let e = "";
     for (let t = 0; t < this.bytes.length; t++)
-      e += g.charAt(this.bytes[t] >>> 4), e += g.charAt(this.bytes[t] & 15), (t === 3 || t === 5 || t === 7 || t === 9) && (e += "-");
+      e += p.charAt(this.bytes[t] >>> 4), e += p.charAt(this.bytes[t] & 15), (t === 3 || t === 5 || t === 7 || t === 9) && (e += "-");
     return e;
   }
   /**
@@ -481,7 +496,7 @@ class h {
   toHex() {
     let e = "";
     for (let t = 0; t < this.bytes.length; t++)
-      e += g.charAt(this.bytes[t] >>> 4), e += g.charAt(this.bytes[t] & 15);
+      e += p.charAt(this.bytes[t] >>> 4), e += p.charAt(this.bytes[t] & 15);
     return e;
   }
   /** @returns The 8-4-4-4-12 canonical hexadecimal string representation. */
@@ -519,7 +534,7 @@ class h {
   }
   /** Creates an object from `this`. */
   clone() {
-    return new h(this.bytes.slice(0));
+    return new f(this.bytes.slice(0));
   }
   /** Returns true if `this` is equivalent to `other`. */
   equals(e) {
@@ -538,14 +553,14 @@ class h {
     return 0;
   }
 }
-class q {
+class $ {
   /**
    * Creates a generator object with the default random number generator, or
    * with the specified one if passed as an argument. The specified random
    * number generator should be cryptographically strong and securely seeded.
    */
   constructor(e) {
-    this.timestamp = 0, this.counter = 0, this.random = e ?? _();
+    this.timestamp = 0, this.counter = 0, this.random = e ?? D();
   }
   /**
    * Generates a new UUIDv7 object from the current timestamp, or resets the
@@ -617,7 +632,7 @@ class q {
       this.counter++, this.counter > 4398046511103 && (this.timestamp++, this.resetCounter());
     else
       return;
-    return h.fromFieldsV7(this.timestamp, Math.trunc(this.counter / 2 ** 30), this.counter & 2 ** 30 - 1, this.random.nextUint32());
+    return f.fromFieldsV7(this.timestamp, Math.trunc(this.counter / 2 ** 30), this.counter & 2 ** 30 - 1, this.random.nextUint32());
   }
   /** Initializes the counter at a 42-bit random integer. */
   resetCounter() {
@@ -630,19 +645,19 @@ class q {
    */
   generateV4() {
     const e = new Uint8Array(Uint32Array.of(this.random.nextUint32(), this.random.nextUint32(), this.random.nextUint32(), this.random.nextUint32()).buffer);
-    return e[6] = 64 | e[6] >>> 4, e[8] = 128 | e[8] >>> 2, h.ofInner(e);
+    return e[6] = 64 | e[6] >>> 4, e[8] = 128 | e[8] >>> 2, f.ofInner(e);
   }
 }
-const _ = () => {
+const D = () => {
   if (typeof crypto < "u" && typeof crypto.getRandomValues < "u")
-    return new D();
+    return new _();
   if (typeof UUIDV7_DENY_WEAK_RNG < "u" && UUIDV7_DENY_WEAK_RNG)
     throw new Error("no cryptographically strong RNG available");
   return {
     nextUint32: () => Math.trunc(Math.random() * 65536) * 65536 + Math.trunc(Math.random() * 65536)
   };
 };
-class D {
+class _ {
   constructor() {
     this.buffer = new Uint32Array(8), this.cursor = 65535;
   }
@@ -650,9 +665,9 @@ class D {
     return this.cursor >= this.buffer.length && (crypto.getRandomValues(this.buffer), this.cursor = 0), this.buffer[this.cursor++];
   }
 }
-let y;
-const U = () => $().toString(), $ = () => (y || (y = new q())).generate();
-let x = class {
+let T;
+const U = () => x().toString(), x = () => (T || (T = new $())).generate();
+let P = class {
   constructor(e) {
     this.db = e;
   }
@@ -663,7 +678,7 @@ let x = class {
     return U();
   }
 };
-class k {
+class z {
   constructor(e, t = {}) {
     this.database = e, this.options = t, this.supportsSelectForUpdate = !0, this.maxQueryParams = 65e3, this.transactionCapability = {
       transactions: !0,
@@ -685,9 +700,9 @@ class k {
       name: "postgres",
       maxIdentifierLength: 63,
       supportsCreateIndexIfNotExists: !0,
-      encodeLiteral: S,
+      encodeLiteral: y,
       constraints: { unique: !0, filteredUnique: !0, nonNull: !0 }
-    }, this.idSystem = new x(this), this.logger = this.options?.logger || f, this.db = new L(this.database);
+    }, this.idSystem = new P(this), this.logger = this.options?.logger || S, this.db = new R(this.database);
   }
   async open(e = !1) {
     if (e) {
@@ -745,33 +760,33 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
     }
   }
   async update(e, t, s, r = "") {
-    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), i = `${e} ${s ? `RETURNING "${s}" AS id` : ""}`, o = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c);
+    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), o = `${e} ${s ? `RETURNING "${s}" AS id` : ""}`, i = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c);
     return a.info({
       type: "update",
       name: r,
-      sql: i,
-      params: o
-    }), (await this.db.query(i, o)).rows;
+      sql: o,
+      params: i
+    }), (await this.db.query(o, i)).rows;
   }
   async insert(e, t, s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => typeof o == "object" && o !== null ? JSON.stringify(o) : o);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => typeof i == "object" && i !== null ? JSON.stringify(i) : i);
     n.info({
       type: "insert",
       name: s,
       sql: e,
       params: a
     });
-    const i = `${e} RETURNING "${p}"`;
+    const o = `${e} RETURNING "${E}"`;
     try {
-      return (await this.db.query(i, a)).rows[0];
-    } catch (o) {
+      return (await this.db.query(o, a)).rows[0];
+    } catch (i) {
       throw n.error({
         type: "insert",
         name: s,
-        sql: i,
+        sql: o,
         params: a,
-        error: o instanceof Error ? o.message : String(o)
-      }), o;
+        error: i instanceof Error ? i.message : String(i)
+      }), i;
     }
   }
   async delete(e, t, s = "") {
@@ -807,13 +822,28 @@ CREATE TABLE IF NOT EXISTS "_ScopedSequence_" (
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
   }
-  parseMatchExpression(e, t, s, r, n, a, i) {
-    if (r.toLowerCase() === "json" && t[0].toLowerCase() === "contains") {
-      const o = s.split(".").map((c) => `"${c}"`).join(".");
-      return {
-        fieldValue: `IS NOT NULL AND ${i()} = ANY (SELECT json_array_elements_text(${o}))`,
-        fieldParams: [t[1]]
-      };
+  parseMatchExpression(e, t, s, r, n, a, o) {
+    if (r.toLowerCase() === "json") {
+      if (t[0].toLowerCase() === "contains") {
+        const c = s.split(".").map((u) => `"${u}"`).join(".");
+        return {
+          fieldValue: `IS NOT NULL AND ${o()} = ANY (SELECT json_array_elements_text(${c}))`,
+          fieldParams: [t[1]]
+        };
+      }
+      if (t[0] === "=" || t[0] === "!=")
+        return {
+          fieldValue: `IS NOT NULL AND ${s.split(".").map((u) => `"${u}"`).join(".")}::jsonb ${t[0]} ${o()}::jsonb`,
+          fieldParams: [JSON.stringify(t[1])]
+        };
+      const i = t[0].toLowerCase();
+      if ((i === "in" || i === "not in") && Array.isArray(t[1]) && t[1].length > 0) {
+        const c = s.split(".").map((h) => `"${h}"`).join("."), u = t[1].map(() => `${o()}::jsonb`).join(",");
+        return {
+          fieldValue: `IS NOT NULL AND ${c}::jsonb ${i === "in" ? "IN" : "NOT IN"} (${u})`,
+          fieldParams: t[1].map((h) => JSON.stringify(h))
+        };
+      }
     }
   }
   getPlaceholder() {
@@ -847,7 +877,7 @@ ON DUPLICATE KEY UPDATE last = LAST_INSERT_ID(last + 1)`,
     }), t;
   }
 }
-class W {
+class Z {
   constructor(e, t = {}) {
     this.database = e, this.options = t, this.supportsSelectForUpdate = !0, this.maxQueryParams = 65e3, this.transactionCapability = {
       transactions: !1,
@@ -862,12 +892,12 @@ class W {
       name: "mysql",
       maxIdentifierLength: 64,
       supportsCreateIndexIfNotExists: !1,
-      encodeLiteral: S,
+      encodeLiteral: y,
       constraints: { unique: !1, filteredUnique: !1, nonNull: !1 }
-    }, this.idSystem = new M(this), this.logger = this.options?.logger || f;
+    }, this.idSystem = new M(this), this.logger = this.options?.logger || S;
   }
   async open(e = !1) {
-    const t = await E.createConnection({
+    const t = await m.createConnection({
       ...this.options
     });
     await t.connect();
@@ -877,19 +907,19 @@ class W {
     } finally {
       await t.end();
     }
-    this.db = await E.createConnection({
+    this.db = await m.createConnection({
       ...this.options,
       database: this.database
     }), await this.db.connect(), await this.db.query("SET sql_mode='ANSI_QUOTES'"), await this.idSystem.setup();
   }
   async openForSchemaRead() {
-    this.db || (this.db = await E.createConnection({
+    this.db || (this.db = await m.createConnection({
       ...this.options,
       database: this.database
     }), await this.db.connect(), await this.db.query("SET sql_mode='ANSI_QUOTES'"));
   }
   async query(e, t = [], s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => i === !1 ? 0 : i === !0 ? 1 : i);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
     return n.info({
       type: "query",
       name: s,
@@ -898,13 +928,13 @@ class W {
     }), (await this.db.query(e, a))[0];
   }
   async update(e, t, s, r = "") {
-    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), i = t.map((o) => typeof o == "object" && o !== null ? JSON.stringify(o) : o === !1 ? 0 : o === !0 ? 1 : o);
+    const n = l.getStore(), a = this.logger.child(n?.logContext || {}), o = t.map((i) => typeof i == "object" && i !== null ? JSON.stringify(i) : i === !1 ? 0 : i === !0 ? 1 : i);
     return a.info({
       type: "update",
       name: r,
       sql: e,
-      params: i
-    }), (await this.db.query(e, i))[0];
+      params: o
+    }), (await this.db.query(e, o))[0];
   }
   async insert(e, t, s = "") {
     const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((c) => typeof c == "object" && c !== null ? JSON.stringify(c) : c === !1 ? 0 : c === !0 ? 1 : c);
@@ -914,11 +944,11 @@ class W {
       sql: e,
       params: a
     }), await this.db.query(e, a);
-    const [i] = await this.db.query("SELECT LAST_INSERT_ID();");
-    return { id: i[0]["LAST_INSERT_ID()"] };
+    const [o] = await this.db.query("SELECT LAST_INSERT_ID();");
+    return { id: o[0]["LAST_INSERT_ID()"] };
   }
   async delete(e, t, s = "") {
-    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((i) => i === !1 ? 0 : i === !0 ? 1 : i);
+    const r = l.getStore(), n = this.logger.child(r?.logContext || {}), a = t.map((o) => o === !1 ? 0 : o === !0 ? 1 : o);
     return n.info({
       type: "delete",
       name: s,
@@ -940,12 +970,27 @@ class W {
   async getAutoId(e) {
     return this.idSystem.getAutoId(e);
   }
-  parseMatchExpression(e, t, s, r, n, a, i) {
-    if (r === "JSON" && t[0].toLowerCase() === "contains")
-      return {
-        fieldValue: `IS NOT NULL AND JSON_CONTAINS(${s.split(".").map((c) => `"${c}"`).join(".")}, ${i()}, '$')`,
-        fieldParams: [JSON.stringify(t[1])]
-      };
+  parseMatchExpression(e, t, s, r, n, a, o) {
+    if (r === "JSON") {
+      if (t[0].toLowerCase() === "contains")
+        return {
+          fieldValue: `IS NOT NULL AND JSON_CONTAINS(${s.split(".").map((u) => `"${u}"`).join(".")}, ${o()}, '$')`,
+          fieldParams: [JSON.stringify(t[1])]
+        };
+      if (t[0] === "=" || t[0] === "!=")
+        return {
+          fieldValue: `IS NOT NULL AND ${s.split(".").map((u) => `"${u}"`).join(".")} ${t[0]} CAST(${o()} AS JSON)`,
+          fieldParams: [JSON.stringify(t[1])]
+        };
+      const i = t[0].toLowerCase();
+      if ((i === "in" || i === "not in") && Array.isArray(t[1]) && t[1].length > 0) {
+        const c = s.split(".").map((h) => `"${h}"`).join("."), u = t[1].map(() => `CAST(${o()} AS JSON)`).join(",");
+        return {
+          fieldValue: `IS NOT NULL AND ${c} ${i === "in" ? "IN" : "NOT IN"} (${u})`,
+          fieldParams: t[1].map((h) => JSON.stringify(h))
+        };
+      }
+    }
   }
   getPlaceholder() {
     return () => "?";
@@ -955,9 +1000,9 @@ class W {
   }
 }
 export {
-  W as MysqlDB,
-  k as PGLiteDB,
-  J as PostgreSQLDB,
+  Z as MysqlDB,
+  z as PGLiteDB,
+  G as PostgreSQLDB,
   K as SQLiteDB
 };
 //# sourceMappingURL=drivers.js.map