@holo-js/db-mysql 0.2.5 → 0.3.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { PoolOptions } from 'mysql2/promise';
-import { DriverAdapter, DriverQueryResult, DriverExecutionResult } from '@holo-js/db';
+import { DriverAdapter, DriverQueryResult, DriverExecutionResult, DatabaseDriverFactory } from '@holo-js/db';
 export { DriverAdapter, DriverExecutionResult, DriverQueryResult } from '@holo-js/db';
 
 interface MySQLQueryableLike {
@@ -13,14 +13,15 @@ interface MySQLPoolLike extends MySQLQueryableLike {
     getConnection(): Promise<MySQLClientLike>;
     end(): Promise<void>;
 }
-interface MySQLAdapterOptions {
+interface MySQLAdapterOptions<TConfig extends PoolOptions = PoolOptions> {
     uri?: string;
-    config?: PoolOptions;
+    config?: TConfig;
     client?: MySQLClientLike;
     pool?: MySQLPoolLike;
-    createPool?: (config: PoolOptions) => MySQLPoolLike;
+    createPool?: (config: TConfig) => MySQLPoolLike;
 }
-declare class MySQLAdapter implements DriverAdapter {
+declare class MySQLAdapter<TConfig extends PoolOptions = PoolOptions> implements DriverAdapter {
+    readonly supportsConcurrentTransactionScopes = true;
     private pool?;
     private readonly directClient?;
     private readonly createPoolInstance?;
@@ -29,7 +30,7 @@ declare class MySQLAdapter implements DriverAdapter {
     private transactionClient?;
     private leasedTransactionClient;
     private readonly transactionScope;
-    constructor(options?: MySQLAdapterOptions);
+    constructor(options?: MySQLAdapterOptions<TConfig>);
     initialize(): Promise<void>;
     isDatabaseMissingError(error: unknown): boolean;
     disconnect(): Promise<void>;
@@ -52,6 +53,7 @@ declare class MySQLAdapter implements DriverAdapter {
     private releaseScopedTransaction;
     private normalizeSavepointName;
 }
-declare function createMySQLAdapter(options?: MySQLAdapterOptions): MySQLAdapter;
+declare function createMySQLAdapter<TConfig extends PoolOptions = PoolOptions>(options?: MySQLAdapterOptions<TConfig>): MySQLAdapter<TConfig>;
+declare const mysqlDatabaseDriverFactory: DatabaseDriverFactory;
 
-export { MySQLAdapter, type MySQLAdapterOptions, type MySQLClientLike, type MySQLPoolLike, type MySQLQueryableLike, createMySQLAdapter };
+export { MySQLAdapter, type MySQLAdapterOptions, type MySQLClientLike, type MySQLPoolLike, type MySQLQueryableLike, createMySQLAdapter, mysqlDatabaseDriverFactory };

package/dist/index.mjs

@@ -67,6 +67,7 @@ function isMySQLDatabaseMissing(error) {
   return typeof error === "object" && error !== null && ("code" in error && error.code === "ER_BAD_DB_ERROR" || "errno" in error && error.errno === 1049);
 }
 var MySQLAdapter = class {
+  supportsConcurrentTransactionScopes = true;
   pool;
   directClient;
   createPoolInstance;
@@ -122,16 +123,14 @@ var MySQLAdapter = class {
     await this.initialize();
     if (this.directClient) {
       return this.transactionScope.run({
-        client: this.directClient,
-        leased: false
+        client: this.directClient
       }, callback);
     }
     if (!this.pool) {
       throw new TransactionError("MySQL adapter is not initialized with a pool or client.");
     }
     const state = {
-      client: await this.pool.getConnection(),
-      leased: true
+      client: await this.pool.getConnection()
     };
     return this.transactionScope.run(state, async () => {
       try {
@@ -268,9 +267,6 @@ var MySQLAdapter = class {
     this.leasedTransactionClient = false;
   }
   releaseScopedTransaction(state) {
-    if (!state.leased) {
-      return;
-    }
     state.client.release?.();
   }
   normalizeSavepointName(name) {
@@ -283,7 +279,22 @@ var MySQLAdapter = class {
 function createMySQLAdapter(options = {}) {
   return new MySQLAdapter(options);
 }
+var mysqlDatabaseDriverFactory = Object.freeze({
+  driver: "mysql",
+  supportsConcurrentTransactionScopes: true,
+  create(connection) {
+    return connection.url ? createMySQLAdapter({ uri: connection.url }) : createMySQLAdapter({ config: {
+      host: connection.host,
+      port: connection.port,
+      user: connection.username,
+      password: connection.password,
+      database: connection.database,
+      ssl: connection.ssl === true ? {} : connection.ssl || void 0
+    } });
+  }
+});
 export {
   MySQLAdapter,
-  createMySQLAdapter
+  createMySQLAdapter,
+  mysqlDatabaseDriverFactory
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/db-mysql",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Holo-JS Framework - MySQL database adapter",
   "type": "module",
   "license": "MIT",
@@ -24,13 +24,13 @@
     "test:integration": "HOLO_MYSQL_INTEGRATION=1 vitest --run tests/mysql.test.ts"
   },
   "peerDependencies": {
-    "@holo-js/db": "^0.2.5"
+    "@holo-js/db": "^0.3.0"
   },
   "dependencies": {
     "mysql2": "^3.17.1"
   },
   "devDependencies": {
-    "@holo-js/db": "^0.2.5",
+    "@holo-js/db": "^0.3.0",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
     "vitest": "^4.1.5"