@asla/yoursql 0.11.3 → 0.11.4

package/dist/client/DbPoolConnection.d.ts

@@ -9,7 +9,7 @@ import type { SqlLike, TransactionMode } from "./interfaces.ts";
  */
 export declare class DbPoolConnection extends DbQuery {
     #private;
-    constructor(conn: DbQueryBase, onRelease: (conn: DbQueryBase) => void);
+    constructor(conn: DbQueryBase, onRelease: (conn: DbQueryBase) => void, onDispose?: (conn: DbQueryBase) => void);
     begin(mode?: TransactionMode): Promise<void>;
     query<T extends MultipleQueryResult = MultipleQueryResult>(sql: MultipleQueryInput): Promise<T>;
     query<T = any>(sql: QueryDataInput<T>): Promise<QueryRowsResult<T>>;
@@ -22,6 +22,7 @@ export declare class DbPoolConnection extends DbQuery {
     get released(): boolean;
     /** 调用 release() 时，如果事务未提交，则抛出异常 */
     release(): void;
+    dispose(): void;
     [Symbol.dispose](): void;
 }
 //# sourceMappingURL=DbPoolConnection.d.ts.map

package/dist/client/DbPoolConnection.js

@@ -8,12 +8,14 @@ import { ConnectionNotAvailableError } from './errors.js';
  * @public
  */
 class DbPoolConnection extends DbQuery {
-    constructor(conn, onRelease) {
+    constructor(conn, onRelease, onDispose = onRelease) {
         super();
         this.#conn = conn;
         this.#onRelease = onRelease;
+        this.#onDispose = onDispose;
     }
     #onRelease;
+    #onDispose;
     //implement
     async begin(mode) {
         await this.query("BEGIN" + (mode ? " TRANSACTION ISOLATION LEVEL " + mode : ""));
@@ -58,6 +60,13 @@ class DbPoolConnection extends DbQuery {
             this.#onRelease(conn);
         }
     }
+    dispose() {
+        const conn = this.#conn;
+        if (conn) {
+            this.#conn = undefined;
+            this.#onDispose(conn);
+        }
+    }
     //implement
     [Symbol.dispose]() {
         return this.release();

package/dist/client/DbPoolTransaction.js

@@ -26,23 +26,19 @@ class DbPoolTransaction extends DbQuery {
     #conn;
     async commit() {
         if (this.#conn) {
-            const promise = this.#conn.execute("COMMIT");
-            this.#release(this.#conn);
+            const conn = this.#conn;
+            const promise = conn.execute("COMMIT").then(() => conn.release(), (e) => conn.dispose());
             return promise;
         }
-        else {
-            this.#release(undefined);
-        }
+        this.#release(undefined);
     }
     async rollback() {
         if (this.#conn) {
-            const promise = this.#conn.execute("ROLLBACK");
-            this.#release(this.#conn);
+            const conn = this.#conn;
+            const promise = conn.execute("ROLLBACK").then(() => conn.release(), (e) => conn.dispose());
             return promise;
         }
-        else {
-            this.#release(undefined);
-        }
+        this.#release(undefined);
     }
     savePoint(savePoint) {
         return this.execute("SAVEPOINT " + savePoint);
@@ -51,7 +47,7 @@ class DbPoolTransaction extends DbQuery {
         return this.execute("ROLLBACK TO " + savePoint);
     }
     #pending;
-    #getConnQuery(call, callIfFirst = call, queryError) {
+    #getConnQuery(call, callIfFirst = call, queryErrorCatch) {
         if (this.#pending) {
             return Promise.reject(new ParallelQueryError());
         }
@@ -67,11 +63,8 @@ class DbPoolTransaction extends DbQuery {
                 }
                 this.#conn = conn;
                 let promise = callIfFirst(conn);
-                if (queryError) {
-                    promise = promise.catch((e) => {
-                        queryError();
-                        throw e;
-                    });
+                if (queryErrorCatch) {
+                    promise = promise.catch(queryErrorCatch);
                 }
                 return promise;
             }, (e) => {
@@ -81,11 +74,8 @@ class DbPoolTransaction extends DbQuery {
         }
         else {
             promise = call(this.#conn);
-            if (queryError) {
-                promise = promise.catch((e) => {
-                    queryError();
-                    throw e;
-                });
+            if (queryErrorCatch) {
+                promise = promise.catch(queryErrorCatch);
             }
         }
         this.#pending = promise;
@@ -94,12 +84,16 @@ class DbPoolTransaction extends DbQuery {
         });
     }
     #query(call, callIfFirst) {
-        const onError = () => {
+        const onError = (e) => {
             if (this.#errorRollback) {
-                this.rollback();
+                const passError = () => {
+                    throw e;
+                };
+                return this.rollback().then(passError, passError);
             }
             else {
                 this.#release(this.#conn);
+                throw e;
             }
         };
         return this.#getConnQuery(call, callIfFirst, onError);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asla/yoursql",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "",
   "type": "module",
   "types": "./dist/mod.d.ts",
@@ -21,7 +21,6 @@
     "rollup": "^4.22.4",
     "tslib": "^2.7.0",
     "typescript": "^5.6.2",
-    "typescritp": "^1.0.0",
     "vitest": "^2.1.1"
   },
   "repository": {