@asla/yoursql 0.11.4 → 0.12.1

package/dist/client/DbCursor.d.ts

@@ -3,7 +3,7 @@ export interface DbCursorOption {
     defaultSize?: number;
 }
 /** @public */
-export declare abstract class DbCursor<T> {
+export declare abstract class DbCursor<T> implements AsyncDisposable, AsyncIterable<T> {
     /** 读取游标，如果读取结束，返回空数组 */
     abstract read(maxSize?: number): Promise<T[]>;
     /** 提前关闭游标，如果多次调用，会被忽略 */

package/dist/client/DbPoolConnection.d.ts

@@ -1,28 +1,5 @@
-import { DbQuery, MultipleQueryInput, QueryDataInput, QueryInput } from "./DbQuery.ts";
-import { type QueryRowsResult, type DbQueryBase, MultipleQueryResult } from "./DbQueryBase.ts";
-import type { SqlLike, TransactionMode } from "./interfaces.ts";
-/**
-
-/**
- * 池连接
- * @public
- */
-export declare class DbPoolConnection extends DbQuery {
-    #private;
-    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>>;
-    query<T = any>(sql: QueryInput): Promise<QueryRowsResult<T>>;
-    execute(sql: QueryInput | MultipleQueryInput): Promise<void>;
-    /** @deprecated 不建议使用 */
-    multipleQuery<T extends MultipleQueryResult = MultipleQueryResult>(sql: SqlLike | SqlLike[]): Promise<T>;
-    rollback(): Promise<void>;
-    commit(): Promise<void>;
-    get released(): boolean;
-    /** 调用 release() 时，如果事务未提交，则抛出异常 */
-    release(): void;
-    dispose(): void;
-    [Symbol.dispose](): void;
-}
+import { type DbQueryBase } from "./DbQueryBase.ts";
+import type { DbPoolConnection } from "./interfaces.ts";
+/** @public */
+export declare function createDbPoolConnection(conn: DbQueryBase, onRelease: (conn: DbQueryBase) => void, onDispose?: (conn: DbQueryBase) => void): DbPoolConnection;
 //# sourceMappingURL=DbPoolConnection.d.ts.map

package/dist/client/DbPoolConnection.js

@@ -1,13 +1,7 @@
 import { DbQuery } from './DbQuery.js';
 import { ConnectionNotAvailableError } from './errors.js';
 
-/**
-
-/**
- * 池连接
- * @public
- */
-class DbPoolConnection extends DbQuery {
+class DbPoolConnectionImpl extends DbQuery {
     constructor(conn, onRelease, onDispose = onRelease) {
         super();
         this.#conn = conn;
@@ -18,7 +12,7 @@ class DbPoolConnection extends DbQuery {
     #onDispose;
     //implement
     async begin(mode) {
-        await this.query("BEGIN" + (mode ? " TRANSACTION ISOLATION LEVEL " + mode : ""));
+        await this.execute("BEGIN" + (mode ? " TRANSACTION ISOLATION LEVEL " + mode : ""));
     }
     #conn;
     query(sql) {
@@ -43,11 +37,11 @@ class DbPoolConnection extends DbQuery {
     }
     //implement
     async rollback() {
-        await this.query("ROLLBACK");
+        await this.execute("ROLLBACK");
     }
     //implement
     async commit() {
-        await this.query("COMMIT");
+        await this.execute("COMMIT");
     }
     get released() {
         return !this.#conn;
@@ -72,5 +66,9 @@ class DbPoolConnection extends DbQuery {
         return this.release();
     }
 }
+/** @public */
+function createDbPoolConnection(conn, onRelease, onDispose = onRelease) {
+    return new DbPoolConnectionImpl(conn, onRelease, onDispose);
+}
 
-export { DbPoolConnection };
+export { createDbPoolConnection };

package/dist/client/DbPoolTransaction.d.ts

@@ -1,31 +1,9 @@
-import { DbQuery, MultipleQueryInput, QueryDataInput, QueryInput } from "./DbQuery.ts";
-import type { MultipleQueryResult, QueryRowsResult } from "./DbQueryBase.ts";
-import type { DbPoolConnection } from "./DbPoolConnection.ts";
-import type { DbTransaction, SqlLike, TransactionMode } from "./interfaces.ts";
+import type { DbPoolConnection, DbPoolTransaction, TransactionMode } from "./interfaces.ts";
 /** @public */
 export type DbPoolTransactionOption = {
     errorRollback?: boolean;
     mode?: TransactionMode;
 };
-/**
- * @public
- * 池连接事务
- */
-export declare class DbPoolTransaction extends DbQuery implements DbTransaction {
-    #private;
-    readonly mode?: TransactionMode;
-    constructor(connect: () => Promise<DbPoolConnection>, option?: TransactionMode | DbPoolTransactionOption);
-    commit(): Promise<void>;
-    rollback(): Promise<void>;
-    savePoint(savePoint: string): Promise<void>;
-    rollbackTo(savePoint: string): Promise<void>;
-    query<T extends MultipleQueryResult = MultipleQueryResult>(sql: MultipleQueryInput): Promise<T>;
-    query<T extends object = any>(sql: QueryDataInput<T>): Promise<QueryRowsResult<T>>;
-    query<T extends object = any>(sql: QueryInput): Promise<QueryRowsResult<T>>;
-    execute(sql: QueryInput | MultipleQueryInput): Promise<void>;
-    /** @deprecated 不建议使用 */
-    multipleQuery<T extends MultipleQueryResult = MultipleQueryResult>(sql: SqlLike | SqlLike[]): Promise<T>;
-    get released(): boolean;
-    [Symbol.asyncDispose](): Promise<void>;
-}
+/** @public */
+export declare function createDbPoolTransaction(connect: () => Promise<DbPoolConnection>, option?: TransactionMode | DbPoolTransactionOption): DbPoolTransaction;
 //# sourceMappingURL=DbPoolTransaction.d.ts.map

package/dist/client/DbPoolTransaction.js

@@ -1,11 +1,7 @@
 import { DbQuery } from './DbQuery.js';
 import { ParallelQueryError, ConnectionNotAvailableError } from './errors.js';
 
-/**
- * @public
- * 池连接事务
- */
-class DbPoolTransaction extends DbQuery {
+class DbPoolTransactionImpl extends DbQuery {
     #errorRollback;
     mode;
     #begin;
@@ -142,5 +138,9 @@ class DbPoolTransaction extends DbQuery {
         return this.rollback();
     }
 }
+/** @public */
+function createDbPoolTransaction(connect, option) {
+    return new DbPoolTransactionImpl(connect, option);
+}
 
-export { DbPoolTransaction };
+export { createDbPoolTransaction };

package/dist/client/DbQuery.d.ts

@@ -16,7 +16,10 @@ export declare abstract class DbQuery {
     abstract query<T extends MultipleQueryResult = MultipleQueryResult>(sql: MultipleQueryInput): Promise<T>;
     abstract query<T = any>(sql: QueryDataInput<T>): Promise<QueryRowsResult<T>>;
     abstract query<T = any>(sql: QueryInput): Promise<QueryRowsResult<T>>;
-    /** @deprecated 不建议使用。改用 query() */
+    /**
+     * 执行多语句的方法
+     * @deprecated 不建议使用。改用 query()
+     */
     abstract multipleQuery<T extends MultipleQueryResult = MultipleQueryResult>(sql: SqlLike | SqlLike[]): Promise<T>;
     /** 单语句查询受影响的行 */
     queryCount(sql: QueryInput): Promise<number>;

package/dist/client/DbQueryPool.d.ts

@@ -1,7 +1,6 @@
 import { DbCursor, DbCursorOption } from "./DbCursor.ts";
-import { DbPoolConnection } from "./DbPoolConnection.ts";
 import { DbQuery } from "./DbQuery.ts";
-import { DbPool, DbTransaction, SqlLike, TransactionMode } from "./interfaces.ts";
+import { DbPool, DbPoolConnection, DbTransaction, SqlLike, TransactionMode } from "./interfaces.ts";
 import { QueryRowsResult } from "./DbQueryBase.ts";
 import { SqlStatementDataset, InferQueryResult } from "./_type.ts";
 /** @public */

package/dist/client/interfaces.d.ts

@@ -1,5 +1,4 @@
 import { DbQuery } from "./DbQuery.ts";
-import { DbPoolConnection } from "./DbPoolConnection.ts";
 import { DbCursor, DbCursorOption } from "./DbCursor.ts";
 import { SqlStatementDataset, SqlTemplate } from "./_type.ts";
 /**
@@ -9,6 +8,18 @@ import { SqlStatementDataset, SqlTemplate } from "./_type.ts";
 export interface DbConnection extends DbQuery, AsyncDisposable {
     close(): Promise<void>;
 }
+/**
+ * 数据库池连接
+ * @public
+ */
+export interface DbPoolConnection extends DbQuery, Disposable {
+    release(): void;
+    dispose(): void;
+    begin(mode?: TransactionMode): Promise<void>;
+    commit(): Promise<void>;
+    rollback(): Promise<void>;
+    get released(): boolean;
+}
 /** @public */
 export type TransactionMode = "SERIALIZABLE" | "REPEATABLE READ" | "READ COMMITTED" | "READ UNCOMMITTED";
 /**
@@ -49,6 +60,14 @@ export interface DbTransaction extends DbQuery, AsyncDisposable {
     /** 提交，并释放连接 */
     commit(): Promise<void>;
 }
+/**
+ * @public
+ * 池连接事务
+ */
+export interface DbPoolTransaction extends DbTransaction {
+    readonly mode?: TransactionMode;
+    get released(): boolean;
+}
 /**
  * 数据库连接池
  * @public

package/dist/client/mod.js

@@ -2,6 +2,6 @@ export { ConnectionNotAvailableError, ParallelQueryError } from './errors.js';
 export { isSqlTemplate, sqlLikeToString } from './DbQueryBase.js';
 export { DbQuery } from './DbQuery.js';
 export { DbCursor } from './DbCursor.js';
-export { DbPoolConnection } from './DbPoolConnection.js';
-export { DbPoolTransaction } from './DbPoolTransaction.js';
+export { createDbPoolConnection } from './DbPoolConnection.js';
+export { createDbPoolTransaction } from './DbPoolTransaction.js';
 export { DbQueryPool } from './DbQueryPool.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asla/yoursql",
-  "version": "0.11.4",
+  "version": "0.12.1",
   "description": "",
   "type": "module",
   "types": "./dist/mod.d.ts",