driftsql 1.0.9 → 1.0.10

package/dist/index.d.mts

@@ -1,10 +1,16 @@
-import { Config } from '@libsql/client';
-import { ConnectionOptions } from 'mysql2/promise';
-
 interface PostgresConfig {
     connectionString: string;
 }
 
+interface LibSQLConfig {
+    url: string;
+    authToken?: string;
+}
+
+interface MySQLConfig {
+    connectionString: string;
+}
+
 type Drivers = ClientOptions['drivers'];
 declare const inspectDB: (drivers: Drivers) => Promise<never>;
 
@@ -18,23 +24,18 @@ type UnifiedQueryResult<T extends Record<string, any>> = {
     }>;
 };
 interface ClientOptions {
-    drivers?: {
-        libsql?: Config;
+    drivers: {
+        libsql?: LibSQLConfig;
         postgres?: PostgresConfig;
-        mysql?: ConnectionOptions;
-    };
-    options?: {
-        defaultTimeout?: number;
+        mysql?: MySQLConfig;
     };
 }
 declare class DriftSQLClient<DT> {
     private postgres?;
-    private mysqlClient?;
-    private libsqlClient?;
-    private postgresClient?;
+    private libsql?;
+    private mysql?;
     private drivers;
     constructor(options: ClientOptions);
-    private convertLibsqlResult;
     readonly inspect: () => Promise<void>;
     query<T extends Record<string, any>>(query: string, args?: (string | number | boolean | null)[]): Promise<UnifiedQueryResult<T>>;
     findFirst<K extends keyof DT>(table: K, where?: Partial<DT[K]>): Promise<DT[K] | null>;

package/dist/index.d.ts

@@ -1,10 +1,16 @@
-import { Config } from '@libsql/client';
-import { ConnectionOptions } from 'mysql2/promise';
-
 interface PostgresConfig {
     connectionString: string;
 }
 
+interface LibSQLConfig {
+    url: string;
+    authToken?: string;
+}
+
+interface MySQLConfig {
+    connectionString: string;
+}
+
 type Drivers = ClientOptions['drivers'];
 declare const inspectDB: (drivers: Drivers) => Promise<never>;
 
@@ -18,23 +24,18 @@ type UnifiedQueryResult<T extends Record<string, any>> = {
     }>;
 };
 interface ClientOptions {
-    drivers?: {
-        libsql?: Config;
+    drivers: {
+        libsql?: LibSQLConfig;
         postgres?: PostgresConfig;
-        mysql?: ConnectionOptions;
-    };
-    options?: {
-        defaultTimeout?: number;
+        mysql?: MySQLConfig;
     };
 }
 declare class DriftSQLClient<DT> {
     private postgres?;
-    private mysqlClient?;
-    private libsqlClient?;
-    private postgresClient?;
+    private libsql?;
+    private mysql?;
     private drivers;
     constructor(options: ClientOptions);
-    private convertLibsqlResult;
     readonly inspect: () => Promise<void>;
     query<T extends Record<string, any>>(query: string, args?: (string | number | boolean | null)[]): Promise<UnifiedQueryResult<T>>;
     findFirst<K extends keyof DT>(table: K, where?: Partial<DT[K]>): Promise<DT[K] | null>;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import consola from 'consola';
-import { createClient } from '@libsql/client';
-import mysql from 'mysql2/promise';
 import postgres from 'postgres';
+import { createClient } from '@libsql/client';
+import * as mysql from 'mysql2/promise';
 import fs from 'node:fs/promises';
 
 const supportedDrivers = ["postgres", "postgresHTTP", "mysql", "libsql"];
@@ -283,18 +283,15 @@ class PostgresDriver {
   }
 }
 
-class DriftSQLClient {
-  postgres;
-  mysqlClient;
-  libsqlClient;
-  postgresClient;
-  drivers;
+class LibSQLDriver {
   constructor(options) {
-    this.postgres = options.drivers?.postgres ? new PostgresDriver({ connectionString: options.drivers.postgres.connectionString }) : void 0;
-    this.libsqlClient = options.drivers?.libsql ? createClient(options.drivers.libsql) : void 0;
-    this.mysqlClient = options.drivers?.mysql ? mysql.createConnection(options.drivers.mysql) : void 0;
-    this.drivers = options.drivers || {};
+    this.options = options;
+    this.client = createClient({
+      url: this.options.url,
+      ...this.options.authToken ? { authToken: this.options.authToken } : {}
+    });
   }
+  client;
   convertLibsqlResult(result) {
     const rows = result.rows.map((row) => {
       const obj = {};
@@ -310,16 +307,70 @@ class DriftSQLClient {
       fields: result.columns.map((col) => ({ name: col, dataTypeID: 0 }))
     };
   }
+  async query(query, params) {
+    try {
+      const result = await this.client.execute(query, params);
+      return this.convertLibsqlResult(result);
+    } catch (error) {
+      console.error("LibSQL query error:", error);
+      throw error;
+    }
+  }
+  async close() {
+    try {
+      this.client.close();
+    } catch (error) {
+      console.error("Error closing LibSQL client:", error);
+    }
+  }
+}
+
+class MySQLDriver {
+  constructor(options) {
+    this.options = options;
+    consola.warn("MySQL client is experimental and may not be compatible with the helper functions, since they originally designed for PostgreSQL and libsql. But .query() method should work.");
+    this.client = mysql.createConnection(this.options.connectionString);
+  }
+  client;
+  async query(query, params) {
+    try {
+      const [rows, fields] = await (await this.client).execute(query, params || []);
+      const rowCount = Array.isArray(rows) ? rows.length : 0;
+      return {
+        rows,
+        rowCount,
+        command: void 0,
+        fields: fields.map((field) => ({ name: field.name, dataTypeID: field.columnType }))
+      };
+    } catch (error) {
+      consola.error("MySQL query error:", error);
+      throw error;
+    }
+  }
+  async close() {
+    try {
+      await (await this.client).end();
+    } catch (error) {
+      consola.error("Error closing MySQL client:", error);
+    }
+  }
+}
+
+class DriftSQLClient {
+  postgres;
+  libsql;
+  mysql;
+  drivers;
+  constructor(options) {
+    this.postgres = options.drivers?.postgres ? new PostgresDriver({ connectionString: options.drivers.postgres.connectionString }) : void 0;
+    this.libsql = options.drivers?.libsql ? new LibSQLDriver(options.drivers.libsql) : void 0;
+    this.mysql = options.drivers?.mysql ? new MySQLDriver(options.drivers.mysql) : void 0;
+    this.drivers = options.drivers || {};
+  }
   inspect = async () => {
     return inspectDB(this.drivers);
   };
   async query(query, args) {
-    const driversCount = Object.keys(this.drivers).filter((key) => this.drivers[key] !== void 0).length;
-    if (driversCount > 1) {
-      const error2 = new Error("Multiple drivers are configured. Please use only one driver at a time.");
-      consola.error(error2);
-      throw error2;
-    }
     if (this.postgres) {
       try {
         const result = await this.postgres.query(query, args || []);
@@ -334,32 +385,31 @@ class DriftSQLClient {
         throw error2;
       }
     }
-    if (this.mysqlClient) {
+    if (this.mysql) {
       try {
-        consola.warn("MySQL client is experimental and may not be compatible with the helper functions, since they originally designed for PostgreSQL and libsql. But .query() method should work.");
-        const filteredArgs = (args || []).map((arg) => arg === void 0 ? null : arg);
-        const [rows, fields] = await (await this.mysqlClient).execute(query, filteredArgs);
+        const result = await this.mysql.query(query, args || []);
         return {
-          rows,
-          rowCount: Array.isArray(rows) ? rows.length : 0,
-          command: void 0,
-          // MySQL does not return command info
-          fields: fields.map((field) => ({ name: field.name, dataTypeID: field.columnType }))
+          rows: result.rows,
+          rowCount: result.rowCount || 0,
+          command: result.command,
+          fields: result.fields?.map((field) => ({ name: field.name, dataTypeID: field.dataTypeID })) || []
         };
       } catch (error2) {
         consola.error("Failed to execute query with MySQL:", error2);
         throw error2;
       }
     }
-    if (this.libsqlClient) {
+    if (this.libsql) {
       try {
-        const result = await this.libsqlClient.execute({
-          sql: query,
-          args: args || []
-        });
-        return this.convertLibsqlResult(result);
+        const result = await this.libsql.query(query, args || []);
+        return {
+          rows: result.rows,
+          rowCount: result.rowCount || 0,
+          command: result.command,
+          fields: void 0
+        };
       } catch (error2) {
-        consola.error("Failed to execute query with libsql:", error2);
+        consola.error("Failed to execute query with LibSQL:", error2);
         throw error2;
       }
     }
@@ -450,14 +500,11 @@ class DriftSQLClient {
     if (this.postgres) {
       await this.postgres.close();
     }
-    if (this.libsqlClient) {
-      this.libsqlClient.close();
-    }
-    if (this.mysqlClient) {
-      await (await this.mysqlClient).end();
+    if (this.libsql) {
+      this.libsql.close();
     }
-    if (this.postgresClient) {
-      await this.postgresClient.end();
+    if (this.mysql) {
+      await this.mysql.close();
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driftsql",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "author": "lasse vestergaard",
   "description": "A lightweight SQL client for TypeScript, supporting multiple databases like PostgreSQL, MySQL, and LibSQL.",
   "repository": "lassejlv/driftsql",