@devbro/neko-sql 0.1.38 → 0.1.40

package/dist/cjs/index.d.ts

@@ -1,5 +1,6 @@
 import { EventEmittor } from '@devbro/neko-helper';
-import { PoolClient, Pool, PoolConfig } from 'pg';
+import pg, { PoolClient, PoolConfig } from 'pg';
+import pg_cursor from 'pg-cursor';
 import Database from 'better-sqlite3';
 import mysql from 'mysql2/promise';
 
@@ -385,8 +386,10 @@ declare class PostgresqlConnection extends Connection {
     on(event: connection_events, listener: (...args: any[]) => void): this;
     off(event: connection_events, listener: (...args: any[]) => void): this;
     emit(event: connection_events, ...args: any[]): Promise<boolean>;
+    static pg: typeof pg;
+    static pg_cursor: typeof pg_cursor;
     connection: PoolClient | undefined;
-    static pool: Pool;
+    static pool: pg.Pool;
     static defaults: PoolConfig;
     constructor(params: PoolConfig);
     connect(): Promise<boolean>;
@@ -461,6 +464,7 @@ declare class SqliteConnection extends Connection {
     /** Default configuration values for SQLite connections */
     static defaults: Partial<SqliteConfig>;
     constructor(params: SqliteConfig);
+    static sqlite: typeof Database;
     /**
      * Establishes a connection to the SQLite database
      * Creates or opens the database file specified in the configuration
@@ -576,6 +580,7 @@ declare class MysqlConnection extends Connection {
     connection: mysql.PoolConnection | undefined;
     static pool: mysql.Pool;
     static poolConfig: mysql.PoolOptions;
+    static mysql: typeof mysql;
     static defaults: mysql.PoolOptions;
     constructor(params: mysql.PoolOptions);
     connect(): Promise<boolean>;

package/dist/cjs/index.js

@@ -60,10 +60,6 @@ var Connection = class {
   }
 };
 
-// src/databases/postgresql/PostgresqlConnection.mts
-var import_pg = require("pg");
-var import_pg2 = require("pg");
-
 // src/Query.mts
 var Query = class _Query {
   constructor(connection, grammar) {
@@ -1212,8 +1208,25 @@ var PostgresqlSchemaGrammar = class extends SchemaGrammar {
 };
 
 // src/databases/postgresql/PostgresqlConnection.mts
-var import_pg_cursor = __toESM(require("pg-cursor"), 1);
 var import_neko_helper3 = require("@devbro/neko-helper");
+
+// src/helper.mts
+var import_module = require("module");
+var import_meta = {};
+var req = (0, import_module.createRequire)(import_meta.url);
+function loadPackage(name) {
+  try {
+    return req(name);
+  } catch (error) {
+    if (Error.isError(error) && error.code === "MODULE_NOT_FOUND") {
+      error.message = `Package "${name}" is not installed. Please install proper db driver to use this database connection.`;
+    }
+    throw error;
+  }
+}
+__name(loadPackage, "loadPackage");
+
+// src/databases/postgresql/PostgresqlConnection.mts
 var PostgresqlConnection = class _PostgresqlConnection extends Connection {
   static {
     __name(this, "PostgresqlConnection");
@@ -1230,6 +1243,8 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
   emit(event, ...args) {
     return this.eventManager.emit(event, ...args);
   }
+  static pg;
+  static pg_cursor;
   connection;
   static pool;
   static defaults = {
@@ -1244,8 +1259,15 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
   };
   constructor(params) {
     super();
+    if (!_PostgresqlConnection.pg) {
+      _PostgresqlConnection.pg = loadPackage("pg");
+      _PostgresqlConnection.pg_cursor = loadPackage("pg-cursor");
+    }
     if (!_PostgresqlConnection.pool) {
-      _PostgresqlConnection.pool = new import_pg2.Pool({ ..._PostgresqlConnection.defaults, ...params });
+      _PostgresqlConnection.pool = new _PostgresqlConnection.pg.Pool({
+        ..._PostgresqlConnection.defaults,
+        ...params
+      });
     }
   }
   async connect() {
@@ -1272,7 +1294,7 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
     return result?.rows;
   }
   async runCursor(sql) {
-    return this.connection?.query(new import_pg_cursor.default(sql.sql, sql.bindings));
+    return this.connection?.query(new _PostgresqlConnection.pg_cursor(sql.sql, sql.bindings));
   }
   async disconnect() {
     if (this.connection === void 0) {
@@ -1345,7 +1367,7 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
       await this.runQuery(`CREATE DATABASE ${safeName2}`);
       return;
     }
-    const conn = new import_pg.Client({
+    const conn = new _PostgresqlConnection.pg.Client({
       ..._PostgresqlConnection.pool.options,
       database: "postgres"
     });
@@ -1360,7 +1382,7 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
       await this.runQuery(`DROP DATABASE ${safeName2}`);
       return;
     }
-    const conn = new import_pg.Client({
+    const conn = new _PostgresqlConnection.pg.Client({
       ..._PostgresqlConnection.pool.options,
       database: "postgres"
       // connect to default 'postgres' database to drop others
@@ -1381,15 +1403,13 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
   }
   async existsDatabase(name) {
     if (!this.isConnected()) {
-      const conn = new import_pg.Client({
+      const conn = new _PostgresqlConnection.pg.Client({
         ..._PostgresqlConnection.pool.options,
         database: "postgres"
       });
       await conn.connect();
       const safeName = this.validateAndEscapeIdentifier(name);
-      const result2 = await conn.query("SELECT 1 FROM pg_database WHERE datname = $1", [
-        safeName
-      ]);
+      const result2 = await conn.query("SELECT 1 FROM pg_database WHERE datname = $1", [safeName]);
       await conn.end();
       return result2.rows.length > 0;
     }
@@ -1400,9 +1420,6 @@ var PostgresqlConnection = class _PostgresqlConnection extends Connection {
   }
 };
 
-// src/databases/sqlite/SqliteConnection.mts
-var import_better_sqlite3 = __toESM(require("better-sqlite3"), 1);
-
 // src/databases/sqlite/SqliteQueryGrammar.mts
 var import_neko_helper4 = require("@devbro/neko-helper");
 var SqliteQueryGrammar = class extends QueryGrammar {
@@ -1520,8 +1537,12 @@ var SqliteConnection = class _SqliteConnection extends Connection {
   };
   constructor(params) {
     super();
+    if (!_SqliteConnection.sqlite) {
+      _SqliteConnection.sqlite = loadPackage("better-sqlite3");
+    }
     this.config = { ..._SqliteConnection.defaults, ...params };
   }
+  static sqlite;
   /**
    * Establishes a connection to the SQLite database
    * Creates or opens the database file specified in the configuration
@@ -1529,7 +1550,7 @@ var SqliteConnection = class _SqliteConnection extends Connection {
   async connect() {
     this.eventManager.emit("connect").catch(() => {
     });
-    this.connection = new import_better_sqlite3.default(this.config.filename, {
+    this.connection = new _SqliteConnection.sqlite(this.config.filename, {
       readonly: this.config.readonly,
       fileMustExist: this.config.fileMustExist,
       timeout: this.config.timeout,
@@ -1688,7 +1709,7 @@ var SqliteConnection = class _SqliteConnection extends Connection {
    */
   async createDatabase(name) {
     const dbPath = name.endsWith(".db") ? name : `${name}.db`;
-    const tempDb = new import_better_sqlite3.default(dbPath);
+    const tempDb = new _SqliteConnection.sqlite(dbPath);
     tempDb.close();
   }
   /**
@@ -1723,9 +1744,6 @@ var SqliteConnection = class _SqliteConnection extends Connection {
   }
 };
 
-// src/databases/mysql/MysqlConnection.mts
-var import_promise = __toESM(require("mysql2/promise"), 1);
-
 // src/databases/mysql/MysqlQueryGrammar.mts
 var MysqlQueryGrammar = class extends QueryGrammar {
   static {
@@ -1817,6 +1835,7 @@ var MysqlConnection = class _MysqlConnection extends Connection {
   connection;
   static pool;
   static poolConfig;
+  static mysql;
   static defaults = {
     port: 3306,
     connectionLimit: 20,
@@ -1827,9 +1846,12 @@ var MysqlConnection = class _MysqlConnection extends Connection {
   };
   constructor(params) {
     super();
+    if (!_MysqlConnection.mysql) {
+      _MysqlConnection.mysql = loadPackage("mysql2/promise");
+    }
     if (!_MysqlConnection.pool) {
       _MysqlConnection.poolConfig = { ..._MysqlConnection.defaults, ...params };
-      _MysqlConnection.pool = import_promise.default.createPool(_MysqlConnection.poolConfig);
+      _MysqlConnection.pool = _MysqlConnection.mysql.createPool(_MysqlConnection.poolConfig);
     }
   }
   async connect() {
@@ -1928,19 +1950,18 @@ var MysqlConnection = class _MysqlConnection extends Connection {
   }
   async createDatabase(name) {
     if (!this.isConnected()) {
-      const tempConn2 = await import_promise.default.createConnection({
+      const tempConn2 = await _MysqlConnection.mysql.createConnection({
         host: _MysqlConnection.poolConfig.host,
         user: _MysqlConnection.poolConfig.user,
         password: _MysqlConnection.poolConfig.password,
         port: _MysqlConnection.poolConfig.port
       });
       const safeName2 = this.validateAndEscapeIdentifier(name);
-      console.log(safeName2);
-      let [rows] = await tempConn2.query(`CREATE DATABASE ${safeName2}`);
+      await tempConn2.query(`CREATE DATABASE ${safeName2}`);
       await tempConn2.end();
       return;
     }
-    const tempConn = await import_promise.default.createConnection({
+    const tempConn = await _MysqlConnection.mysql.createConnection({
       host: _MysqlConnection.poolConfig.host,
       user: _MysqlConnection.poolConfig.user,
       password: _MysqlConnection.poolConfig.password,
@@ -1954,7 +1975,7 @@ var MysqlConnection = class _MysqlConnection extends Connection {
     if (this.isConnected()) {
       throw new Error("Cannot drop database while connected.");
     }
-    const tempConn = await import_promise.default.createConnection({
+    const tempConn = await _MysqlConnection.mysql.createConnection({
       host: _MysqlConnection.poolConfig.host,
       user: _MysqlConnection.poolConfig.user,
       password: _MysqlConnection.poolConfig.password,
@@ -1973,13 +1994,13 @@ var MysqlConnection = class _MysqlConnection extends Connection {
   }
   async existsDatabase(name) {
     if (!this.isConnected()) {
-      const tempConn = await import_promise.default.createConnection({
+      const tempConn = await _MysqlConnection.mysql.createConnection({
         host: _MysqlConnection.poolConfig.host,
         user: _MysqlConnection.poolConfig.user,
         password: _MysqlConnection.poolConfig.password,
         port: _MysqlConnection.poolConfig.port
       });
-      let [rows2] = await tempConn.query(
+      const [rows2] = await tempConn.query(
         "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ?",
         [name]
       );