@holo-js/db-mysql 0.1.3 → 0.1.5

package/dist/index.d.ts

@@ -1,27 +1,7 @@
 import { PoolOptions } from 'mysql2/promise';
+import { DriverAdapter, DriverQueryResult, DriverExecutionResult } from '@holo-js/db';
+export { DriverAdapter, DriverExecutionResult, DriverQueryResult } from '@holo-js/db';
 
-interface DriverQueryResult<TRow extends Record<string, unknown> = Record<string, unknown>> {
-    rows: TRow[];
-    rowCount: number;
-}
-interface DriverExecutionResult {
-    affectedRows?: number;
-    lastInsertId?: number | string;
-}
-interface DriverAdapter {
-    initialize(): Promise<void>;
-    disconnect(): Promise<void>;
-    isConnected(): boolean;
-    runWithTransactionScope?<T>(callback: () => Promise<T>): Promise<T>;
-    query<TRow extends Record<string, unknown> = Record<string, unknown>>(sql: string, bindings?: readonly unknown[]): Promise<DriverQueryResult<TRow>>;
-    execute(sql: string, bindings?: readonly unknown[]): Promise<DriverExecutionResult>;
-    beginTransaction(): Promise<void>;
-    commit(): Promise<void>;
-    rollback(): Promise<void>;
-    createSavepoint?(name: string): Promise<void>;
-    rollbackToSavepoint?(name: string): Promise<void>;
-    releaseSavepoint?(name: string): Promise<void>;
-}
 interface MySQLQueryableLike {
     query(sql: string, bindings?: readonly unknown[]): Promise<readonly [unknown, unknown]>;
 }
@@ -72,4 +52,4 @@ declare class MySQLAdapter implements DriverAdapter {
 }
 declare function createMySQLAdapter(options?: MySQLAdapterOptions): MySQLAdapter;
 
-export { type DriverAdapter, type DriverExecutionResult, type DriverQueryResult, MySQLAdapter, type MySQLAdapterOptions, type MySQLClientLike, type MySQLPoolLike, type MySQLQueryableLike, createMySQLAdapter };
+export { MySQLAdapter, type MySQLAdapterOptions, type MySQLClientLike, type MySQLPoolLike, type MySQLQueryableLike, createMySQLAdapter };

package/dist/index.mjs

@@ -38,8 +38,8 @@ var MySQLAdapter = class {
   leasedTransactionClient = false;
   transactionScope = new AsyncLocalStorage();
   constructor(options = {}) {
-    this.directClient = options.client ? wrapMySQLClient(options.client) : void 0;
-    this.pool = options.pool ? wrapMySQLPool(options.pool) : void 0;
+    this.directClient = options.client;
+    this.pool = options.pool;
     this.createPoolInstance = options.createPool ?? (options.client || options.pool ? void 0 : (config) => wrapMySQLPool(mysql.createPool(config)));
     this.config = options.config ?? (options.uri ? { uri: options.uri } : {});
     this.connected = !!(options.client || options.pool);
@@ -82,8 +82,7 @@ var MySQLAdapter = class {
     if (this.directClient) {
       return this.transactionScope.run({
         client: this.directClient,
-        leased: false,
-        released: false
+        leased: false
       }, callback);
     }
     if (!this.pool) {
@@ -91,8 +90,7 @@ var MySQLAdapter = class {
     }
     const state = {
       client: await this.pool.getConnection(),
-      leased: true,
-      released: false
+      leased: true
     };
     return this.transactionScope.run(state, async () => {
       try {
@@ -125,26 +123,26 @@ var MySQLAdapter = class {
   }
   async beginTransaction() {
     const client = await this.leaseTransactionClient();
-    await client.query("START TRANSACTION");
+    await client.query("START TRANSACTION", []);
   }
   async commit() {
     const client = this.requireTransactionClient();
-    await client.query("COMMIT");
+    await client.query("COMMIT", []);
     this.releaseTransactionClient();
   }
   async rollback() {
     const client = this.requireTransactionClient();
-    await client.query("ROLLBACK");
+    await client.query("ROLLBACK", []);
     this.releaseTransactionClient();
   }
   async createSavepoint(name) {
-    await this.requireTransactionClient().query(`SAVEPOINT ${this.normalizeSavepointName(name)}`);
+    await this.requireTransactionClient().query(`SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
   }
   async rollbackToSavepoint(name) {
-    await this.requireTransactionClient().query(`ROLLBACK TO SAVEPOINT ${this.normalizeSavepointName(name)}`);
+    await this.requireTransactionClient().query(`ROLLBACK TO SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
   }
   async releaseSavepoint(name) {
-    await this.requireTransactionClient().query(`RELEASE SAVEPOINT ${this.normalizeSavepointName(name)}`);
+    await this.requireTransactionClient().query(`RELEASE SAVEPOINT ${this.normalizeSavepointName(name)}`, []);
   }
   async getQueryable() {
     const scoped = this.transactionScope.getStore();
@@ -202,11 +200,10 @@ var MySQLAdapter = class {
     this.leasedTransactionClient = false;
   }
   releaseScopedTransaction(state) {
-    if (!state.leased || state.released) {
+    if (!state.leased) {
       return;
     }
     state.client.release?.();
-    state.released = true;
   }
   normalizeSavepointName(name) {
     if (!/^[A-Z_]\w*$/i.test(name)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/db-mysql",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Holo-JS Framework - MySQL database adapter",
   "type": "module",
   "license": "MIT",
@@ -20,18 +20,19 @@
     "build": "tsup",
     "stub": "tsup --watch",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest --run"
+    "test": "vitest --run",
+    "test:integration": "HOLO_MYSQL_INTEGRATION=1 vitest --run tests/mysql.test.ts"
   },
   "peerDependencies": {
-    "@holo-js/db": "^0.1.3"
+    "@holo-js/db": "^0.1.5"
   },
   "dependencies": {
     "mysql2": "^3.17.1"
   },
   "devDependencies": {
-    "@holo-js/db": "workspace:*",
+    "@holo-js/db": "^0.1.5",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.8"
+    "vitest": "^4.1.5"
   }
 }