@zhin.js/database 1.0.3 → 1.0.5

package/lib/base/query-classes.js

@@ -72,9 +72,40 @@ export class Creation extends ThenableQuery {
         };
     }
 }
+/**
+ * SELECT 查询类
+ * 实现 Subquery<S[T][K]> 以支持类型安全的子查询
+ *
+ * @template S Schema 类型
+ * @template T 表名
+ * @template K 选择的字段
+ * @template C 连接类型
+ * @template D 方言类型
+ *
+ * @example
+ * ```ts
+ * // 子查询类型推断示例
+ * interface Schema {
+ *   users: { id: number; name: string };
+ *   orders: { id: number; userId: number; amount: number };
+ * }
+ *
+ * // ✅ 正确：userId 是 number，匹配 users.id
+ * db.select('users', ['id']).where({
+ *   id: { $in: db.select('orders', ['userId']) }
+ * });
+ *
+ * // ❌ 类型错误：name 是 string，不能与 number 的 id 匹配
+ * db.select('users', ['id']).where({
+ *   id: { $in: db.select('users', ['name']) }  // Type error!
+ * });
+ * ```
+ */
 export class Selection extends ThenableQuery {
     modelName;
     fields;
+    __isSubquery = true;
+    __returnType;
     conditions = {};
     groupings = [];
     orderings = [];
@@ -105,6 +136,43 @@ export class Selection extends ThenableQuery {
         this.offsetCount = count;
         return this;
     }
+    // ========================================================================
+    // JOIN Methods - 返回带扩展类型的 JoinedSelection
+    // ========================================================================
+    /**
+     * INNER JOIN - 只返回两表都有匹配的行
+     * 返回类型扩展为包含关联表字段
+     *
+     * @example
+     * ```ts
+     * const result = await db.select('users', ['id', 'name'])
+     *   .join('orders', 'id', 'userId');
+     * // result 类型: { users: { id, name }, orders: { id, userId, amount } }[]
+     * ```
+     */
+    join(table, leftField, rightField) {
+        return new JoinedSelection(this.database, this.modelName, this.fields, table, 'INNER', leftField, rightField, this.conditions, this.orderings, this.groupings, this.limitCount, this.offsetCount);
+    }
+    /**
+     * LEFT JOIN - 返回左表所有行，右表无匹配则为 NULL
+     */
+    leftJoin(table, leftField, rightField) {
+        return new JoinedSelection(this.database, this.modelName, this.fields, table, 'LEFT', leftField, rightField, this.conditions, this.orderings, this.groupings, this.limitCount, this.offsetCount);
+    }
+    /**
+     * RIGHT JOIN - 返回右表所有行，左表无匹配则为 NULL
+     */
+    rightJoin(table, leftField, rightField) {
+        return new JoinedSelection(this.database, this.modelName, this.fields, table, 'RIGHT', leftField, rightField, this.conditions, this.orderings, this.groupings, this.limitCount, this.offsetCount);
+    }
+    /**
+     * 转换为子查询 SQL
+     * 用于 $in / $nin 等操作符中嵌套查询
+     */
+    toSQL() {
+        const { query, params } = this.database.buildQuery(this.getQueryParams());
+        return { sql: String(query), params };
+    }
     getQueryParams() {
         return {
             type: 'select',
@@ -118,6 +186,101 @@ export class Selection extends ThenableQuery {
         };
     }
 }
+/**
+ * JOIN 查询类 - 支持类型安全的关联查询
+ *
+ * @template S Schema 类型
+ * @template T 主表名
+ * @template K 主表选择的字段
+ * @template J 关联表名
+ * @template LeftNullable LEFT JOIN 时主表可能为 null
+ * @template RightNullable RIGHT JOIN 时关联表可能为 null
+ */
+export class JoinedSelection extends ThenableQuery {
+    modelName;
+    fields;
+    conditions;
+    orderings;
+    groupings;
+    limitCount;
+    offsetCount;
+    joinClauses = [];
+    constructor(database, modelName, fields, joinTable, joinType, leftField, rightField, conditions = {}, orderings = [], groupings = [], limitCount, offsetCount) {
+        super(database, database.dialect);
+        this.modelName = modelName;
+        this.fields = fields;
+        this.conditions = conditions;
+        this.orderings = orderings;
+        this.groupings = groupings;
+        this.limitCount = limitCount;
+        this.offsetCount = offsetCount;
+        this.joinClauses.push({
+            type: joinType,
+            table: joinTable,
+            leftField,
+            rightField: rightField
+        });
+    }
+    where(query) {
+        this.conditions = { ...this.conditions, ...query };
+        return this;
+    }
+    orderBy(field, direction = "ASC") {
+        this.orderings.push({ field, direction });
+        return this;
+    }
+    limit(count) {
+        this.limitCount = count;
+        return this;
+    }
+    offset(count) {
+        this.offsetCount = count;
+        return this;
+    }
+    /**
+     * 继续 JOIN 更多表
+     */
+    join(table, leftField, rightField) {
+        this.joinClauses.push({
+            type: 'INNER',
+            table,
+            leftField,
+            rightField: rightField
+        });
+        return this;
+    }
+    leftJoin(table, leftField, rightField) {
+        this.joinClauses.push({
+            type: 'LEFT',
+            table,
+            leftField,
+            rightField: rightField
+        });
+        return this;
+    }
+    rightJoin(table, leftField, rightField) {
+        this.joinClauses.push({
+            type: 'RIGHT',
+            table,
+            leftField,
+            rightField: rightField
+        });
+        return this;
+    }
+    getQueryParams() {
+        return {
+            type: 'select',
+            tableName: this.modelName,
+            fields: this.fields,
+            conditions: this.conditions,
+            groupings: this.groupings,
+            orderings: this.orderings,
+            limitCount: this.limitCount,
+            offsetCount: this.offsetCount,
+            joins: this.joinClauses
+        };
+    }
+}
 export class Insertion extends ThenableQuery {
     modelName;
     data;
@@ -175,4 +338,117 @@ export class Deletion extends ThenableQuery {
         };
     }
 }
+/**
+ * 批量插入查询类
+ */
+export class BatchInsertion extends ThenableQuery {
+    modelName;
+    data;
+    constructor(database, modelName, data) {
+        super(database, database.dialect);
+        this.modelName = modelName;
+        this.data = data;
+    }
+    // 重写 then 方法来转换返回值
+    then(onfulfilled, onrejected) {
+        const params = this.getQueryParams();
+        const { query, params: queryParams } = this.database.buildQuery(params);
+        // 使用 database.query 以支持日志记录
+        return this.database.query(query, queryParams).then((result) => {
+            // 转换不同数据库的返回格式
+            const normalized = {
+                affectedRows: result?.changes ?? result?.affectedRows ?? this.data.length,
+                insertIds: result?.lastID ? [result.lastID] : result?.insertIds
+            };
+            return onfulfilled ? onfulfilled(normalized) : normalized;
+        }, onrejected);
+    }
+    getQueryParams() {
+        return {
+            type: 'insert_many',
+            tableName: this.modelName,
+            data: this.data
+        };
+    }
+}
+/**
+ * 聚合查询类
+ */
+export class Aggregation extends ThenableQuery {
+    modelName;
+    conditions = {};
+    groupings = [];
+    havingConditions = {};
+    aggregates = [];
+    constructor(database, modelName) {
+        super(database, database.dialect);
+        this.modelName = modelName;
+    }
+    /**
+     * COUNT 聚合
+     */
+    count(field = '*', alias) {
+        this.aggregates.push({ fn: 'count', field, alias: alias || `count_${String(field)}` });
+        return this;
+    }
+    /**
+     * SUM 聚合
+     */
+    sum(field, alias) {
+        this.aggregates.push({ fn: 'sum', field, alias: alias || `sum_${String(field)}` });
+        return this;
+    }
+    /**
+     * AVG 聚合
+     */
+    avg(field, alias) {
+        this.aggregates.push({ fn: 'avg', field, alias: alias || `avg_${String(field)}` });
+        return this;
+    }
+    /**
+     * MIN 聚合
+     */
+    min(field, alias) {
+        this.aggregates.push({ fn: 'min', field, alias: alias || `min_${String(field)}` });
+        return this;
+    }
+    /**
+     * MAX 聚合
+     */
+    max(field, alias) {
+        this.aggregates.push({ fn: 'max', field, alias: alias || `max_${String(field)}` });
+        return this;
+    }
+    /**
+     * WHERE 条件
+     */
+    where(query) {
+        this.conditions = { ...this.conditions, ...query };
+        return this;
+    }
+    /**
+     * GROUP BY
+     */
+    groupBy(...fields) {
+        this.groupings.push(...fields);
+        return this;
+    }
+    /**
+     * HAVING 条件（用于聚合后的过滤）
+     */
+    having(query) {
+        this.havingConditions = { ...this.havingConditions, ...query };
+        return this;
+    }
+    getQueryParams() {
+        return {
+            type: 'aggregate',
+            tableName: this.modelName,
+            aggregates: this.aggregates,
+            conditions: this.conditions,
+            groupings: this.groupings,
+            havingConditions: this.havingConditions
+        };
+    }
+}
 //# sourceMappingURL=query-classes.js.map

package/lib/base/query-classes.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-classes.js","sourceRoot":"","sources":["../../src/base/query-classes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-classes.js","sourceRoot":"","sources":["../../src/base/query-classes.ts"],"names":[],"mappings":"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"}

package/lib/base/thenable.d.ts

@@ -1,15 +1,15 @@
 import type { Database } from "./database.js";
 import type { Dialect } from "./dialect.js";
 import { QueryParams } from "../types.js";
-export declare abstract class ThenableQuery<T = any, C = any, D = string> implements PromiseLike<T>, AsyncIterable<T> {
-    protected readonly database: Database<C, Record<string, object>, D>;
-    protected readonly dialect: Dialect<C, D>;
-    protected constructor(database: Database<C, Record<string, object>, D>, dialect: Dialect<C, D>);
-    protected abstract getQueryParams(): QueryParams;
+export declare abstract class ThenableQuery<R, S extends Record<string, object>, T extends keyof S, C = any, D = string> implements PromiseLike<R>, AsyncIterable<R> {
+    protected readonly database: Database<C, S, D>;
+    protected readonly dialect: Dialect<C, S, D>;
+    protected constructor(database: Database<C, S, D>, dialect: Dialect<C, S, D>);
+    protected abstract getQueryParams(): QueryParams<S, T>;
     [Symbol.toStringTag]: string;
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
+    then<TResult1 = R, TResult2 = never>(onfulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
     catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<any | TResult>;
     finally(onfinally?: (() => void) | undefined | null): Promise<any>;
-    [Symbol.asyncIterator](): AsyncIterator<T, void, unknown>;
+    [Symbol.asyncIterator](): AsyncIterator<R, void, unknown>;
 }
 //# sourceMappingURL=thenable.d.ts.map

package/lib/base/thenable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thenable.d.ts","sourceRoot":"","sources":["../../src/base/thenable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,8BAAsB,aAAa,CAAC,CAAC,GAAG,GAAG,EAAC,CAAC,GAAC,GAAG,EAAC,CAAC,GAAC,MAAM,CACxD,YAAW,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IAErB,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAC,CAAC,CAAC;IAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAC,CAAC,CAAC;IAAhI,SAAS,aAAgC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAC,CAAC,CAAC,EAAoB,OAAO,EAAE,OAAO,CAAC,CAAC,EAAC,CAAC,CAAC;IAGhI,SAAS,CAAC,QAAQ,CAAC,cAAc,IAAI,WAAW;IAChD,CAAC,MAAM,CAAC,WAAW,CAAC,SAAmB;IACvC,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,EACjC,WAAW,CAAC,EACR,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GAChD,SAAS,GACT,IAAI,EACR,UAAU,CAAC,EACP,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GACnD,SAAS,GACT,IAAI,GACP,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAM/B,KAAK,CAAC,OAAO,GAAG,KAAK,EACnB,UAAU,CAAC,EACP,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,GACjD,SAAS,GACT,IAAI,GACP,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IAMzB,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;IAM3D,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC;CAQjE"}
+{"version":3,"file":"thenable.d.ts","sourceRoot":"","sources":["../../src/base/thenable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,8BAAsB,aAAa,CAAC,CAAC,EAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAC,CAAC,GAAC,GAAG,EAAC,CAAC,GAAC,MAAM,CACtG,YAAW,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IAErB,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC;IAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC;IAA7G,SAAS,aAAgC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,EAAoB,OAAO,EAAE,OAAO,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC;IAG7G,SAAS,CAAC,QAAQ,CAAC,cAAc,IAAI,WAAW,CAAC,CAAC,EAAC,CAAC,CAAC;IACrD,CAAC,MAAM,CAAC,WAAW,CAAC,SAAmB;IACvC,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,EACjC,WAAW,CAAC,EACR,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GAChD,SAAS,GACT,IAAI,EACR,UAAU,CAAC,EACP,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GACnD,SAAS,GACT,IAAI,GACP,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAO/B,KAAK,CAAC,OAAO,GAAG,KAAK,EACnB,UAAU,CAAC,EACP,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,GACjD,SAAS,GACT,IAAI,GACP,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IAMzB,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;IAM3D,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC;CAQjE"}

package/lib/base/thenable.js

@@ -9,22 +9,23 @@ export class ThenableQuery {
     then(onfulfilled, onrejected) {
         const params = this.getQueryParams();
         const { query, params: queryParams } = this.database.buildQuery(params);
-        return this.dialect.query(query, queryParams).then(onfulfilled, onrejected);
+        // 使用 database.query 以支持日志记录
+        return this.database.query(query, queryParams).then(onfulfilled, onrejected);
     }
     catch(onrejected) {
         const params = this.getQueryParams();
         const { query, params: queryParams } = this.database.buildQuery(params);
-        return this.dialect.query(query, queryParams).catch(onrejected);
+        return this.database.query(query, queryParams).catch(onrejected);
     }
     finally(onfinally) {
         const params = this.getQueryParams();
         const { query, params: queryParams } = this.database.buildQuery(params);
-        return this.dialect.query(query, queryParams).finally(onfinally);
+        return this.database.query(query, queryParams).finally(onfinally);
     }
     async *[Symbol.asyncIterator]() {
         const params = this.getQueryParams();
         const { query, params: queryParams } = this.database.buildQuery(params);
-        const rows = await this.dialect.query(query, queryParams);
+        const rows = await this.database.query(query, queryParams);
         for (const row of Array.isArray(rows) ? rows : [rows]) {
             yield row;
         }

package/lib/base/thenable.js.map

@@ -1 +1 @@
-{"version":3,"file":"thenable.js","sourceRoot":"","sources":["../../src/base/thenable.ts"],"names":[],"mappings":"AAKA,MAAM,OAAgB,aAAa;IAGQ;IAAkE;IAA3G,YAAyC,QAA8C,EAAoB,OAAqB;QAAvF,aAAQ,GAAR,QAAQ,CAAsC;QAAoB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAIpI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC;IACvC,IAAI,CACF,WAGQ,EACR,UAGQ;QAER,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAI,KAAK,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CACH,UAGQ;QAER,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,SAA2C;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1D,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"thenable.js","sourceRoot":"","sources":["../../src/base/thenable.ts"],"names":[],"mappings":"AAKA,MAAM,OAAgB,aAAa;IAGQ;IAA6C;IAAtF,YAAyC,QAAyB,EAAoB,OAAuB;QAApE,aAAQ,GAAR,QAAQ,CAAiB;QAAoB,YAAO,GAAP,OAAO,CAAgB;IAAG,CAAC;IAIjH,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC;IACvC,IAAI,CACF,WAGQ,EACR,UAGQ;QAER,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,4BAA4B;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAI,KAAK,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CACH,UAGQ;QAER,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,CAAC,SAA2C;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3D,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;CACF"}

package/lib/base/transaction.d.ts

@@ -0,0 +1,46 @@
+import { Transaction, TransactionContext, TransactionSelection, TransactionUpdation, TransactionDeletion } from '../types.js';
+import type { Database } from './database.js';
+/**
+ * 增强的事务上下文实现
+ * 支持链式调用的事务操作
+ */
+export declare class TransactionContextImpl<S extends Record<string, object>> implements TransactionContext<S> {
+    private readonly db;
+    private readonly trx;
+    constructor(db: Database<any, S, string>, trx: Transaction);
+    /**
+     * 提交事务
+     */
+    commit(): Promise<void>;
+    /**
+     * 回滚事务
+     */
+    rollback(): Promise<void>;
+    /**
+     * 执行原生 SQL
+     */
+    query<T = any>(sql: string, params?: any[]): Promise<T>;
+    /**
+     * 插入单条数据
+     */
+    insert<T extends keyof S>(tableName: T, data: S[T]): Promise<S[T]>;
+    /**
+     * 批量插入数据
+     */
+    insertMany<T extends keyof S>(tableName: T, data: S[T][]): Promise<{
+        affectedRows: number;
+    }>;
+    /**
+     * 查询数据 - 返回链式选择器
+     */
+    select<T extends keyof S>(tableName: T, fields?: (keyof S[T])[]): TransactionSelection<S, T>;
+    /**
+     * 更新数据 - 返回链式更新器
+     */
+    update<T extends keyof S>(tableName: T, data: Partial<S[T]>): TransactionUpdation<S, T>;
+    /**
+     * 删除数据 - 返回链式删除器
+     */
+    delete<T extends keyof S>(tableName: T): TransactionDeletion<S, T>;
+}
+//# sourceMappingURL=transaction.d.ts.map

package/lib/base/transaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/base/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EAGpB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAuH9C;;;GAGG;AACH,qBAAa,sBAAsB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAE,YAAW,kBAAkB,CAAC,CAAC,CAAC;IAElG,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBADH,EAAE,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,EAC5B,GAAG,EAAE,WAAW;IAGnC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAI7D;;OAEG;IACG,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAWxE;;OAEG;IACG,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAelG;;OAEG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC;IAI5F;;OAEG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC;IAIvF;;OAEG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC;CAGnE"}

package/lib/base/transaction.js

@@ -0,0 +1,186 @@
+/**
+ * 事务查询选择器实现
+ */
+class TrxSelection {
+    db;
+    trx;
+    tableName;
+    fields;
+    conditions = {};
+    orderings = [];
+    limitCount;
+    offsetCount;
+    constructor(db, trx, tableName, fields) {
+        this.db = db;
+        this.trx = trx;
+        this.tableName = tableName;
+        this.fields = fields;
+    }
+    where(condition) {
+        this.conditions = { ...this.conditions, ...condition };
+        return this;
+    }
+    orderBy(field, direction = 'ASC') {
+        this.orderings.push({ field, direction });
+        return this;
+    }
+    limit(count) {
+        this.limitCount = count;
+        return this;
+    }
+    offset(count) {
+        this.offsetCount = count;
+        return this;
+    }
+    then(onfulfilled) {
+        const { query, params } = this.db.buildQuery({
+            type: 'select',
+            tableName: this.tableName,
+            fields: this.fields,
+            conditions: this.conditions,
+            orderings: this.orderings,
+            limitCount: this.limitCount,
+            offsetCount: this.offsetCount
+        });
+        return this.trx.query(query, params).then(onfulfilled);
+    }
+}
+/**
+ * 事务更新器实现
+ */
+class TrxUpdation {
+    db;
+    trx;
+    tableName;
+    data;
+    conditions = {};
+    constructor(db, trx, tableName, data) {
+        this.db = db;
+        this.trx = trx;
+        this.tableName = tableName;
+        this.data = data;
+    }
+    where(condition) {
+        this.conditions = { ...this.conditions, ...condition };
+        return this;
+    }
+    then(onfulfilled) {
+        const { query, params } = this.db.buildQuery({
+            type: 'update',
+            tableName: this.tableName,
+            update: this.data,
+            conditions: this.conditions
+        });
+        return this.trx.query(query, params)
+            .then(result => {
+            const affected = result.affectedRows ?? result.changes ?? 0;
+            return onfulfilled ? onfulfilled(affected) : affected;
+        });
+    }
+}
+/**
+ * 事务删除器实现
+ */
+class TrxDeletion {
+    db;
+    trx;
+    tableName;
+    conditions = {};
+    constructor(db, trx, tableName) {
+        this.db = db;
+        this.trx = trx;
+        this.tableName = tableName;
+    }
+    where(condition) {
+        this.conditions = { ...this.conditions, ...condition };
+        return this;
+    }
+    then(onfulfilled) {
+        const { query, params } = this.db.buildQuery({
+            type: 'delete',
+            tableName: this.tableName,
+            conditions: this.conditions
+        });
+        return this.trx.query(query, params)
+            .then(result => {
+            const affected = result.affectedRows ?? result.changes ?? 0;
+            return onfulfilled ? onfulfilled(affected) : affected;
+        });
+    }
+}
+/**
+ * 增强的事务上下文实现
+ * 支持链式调用的事务操作
+ */
+export class TransactionContextImpl {
+    db;
+    trx;
+    constructor(db, trx) {
+        this.db = db;
+        this.trx = trx;
+    }
+    /**
+     * 提交事务
+     */
+    async commit() {
+        return this.trx.commit();
+    }
+    /**
+     * 回滚事务
+     */
+    async rollback() {
+        return this.trx.rollback();
+    }
+    /**
+     * 执行原生 SQL
+     */
+    async query(sql, params) {
+        return this.trx.query(sql, params);
+    }
+    /**
+     * 插入单条数据
+     */
+    async insert(tableName, data) {
+        const { query, params } = this.db.buildQuery({
+            type: 'insert',
+            tableName,
+            data
+        });
+        await this.trx.query(query, params);
+        return data;
+    }
+    /**
+     * 批量插入数据
+     */
+    async insertMany(tableName, data) {
+        if (!data.length) {
+            return { affectedRows: 0 };
+        }
+        const { query, params } = this.db.buildQuery({
+            type: 'insert_many',
+            tableName,
+            data
+        });
+        const result = await this.trx.query(query, params);
+        return { affectedRows: result.affectedRows ?? result.changes ?? data.length };
+    }
+    /**
+     * 查询数据 - 返回链式选择器
+     */
+    select(tableName, fields) {
+        return new TrxSelection(this.db, this.trx, tableName, fields);
+    }
+    /**
+     * 更新数据 - 返回链式更新器
+     */
+    update(tableName, data) {
+        return new TrxUpdation(this.db, this.trx, tableName, data);
+    }
+    /**
+     * 删除数据 - 返回链式删除器
+     */
+    delete(tableName) {
+        return new TrxDeletion(this.db, this.trx, tableName);
+    }
+}
+//# sourceMappingURL=transaction.js.map

package/lib/base/transaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/base/transaction.ts"],"names":[],"mappings":"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"}