@zhin.js/database 1.1.4 → 1.1.5

package/lib/base/database.d.ts

@@ -22,6 +22,10 @@ export declare abstract class Database<D = any, S extends Record<string, object>
     readonly models: Database.Models<S, D, Q>;
     private _logger?;
     private _logging;
+    private readonly transactionContext;
+    private connectionTail;
+    /** 单连接事务独占连接；连接池仍允许不相关操作并行。 */
+    private acquireConnection;
     constructor(dialect: Dialect<D, S, Q>, definitions?: Database.DefinitionObj<S>);
     /**
      * 若方言支持按列声明类型处理（如 SQLite 读路径的 json 反序列化），向其注册表结构

package/lib/base/database.js

@@ -1,3 +1,4 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
 import * as QueryClasses from './query-classes.js';
 import { TransactionContextImpl } from './transaction.js';
 import { getLogger } from '@zhin.js/logger';
@@ -21,6 +22,19 @@ export class Database {
     models = new Database.Models();
     _logger;
     _logging = false;
+    transactionContext = new AsyncLocalStorage();
+    connectionTail = Promise.resolve();
+    /** 单连接事务独占连接；连接池仍允许不相关操作并行。 */
+    async acquireConnection() {
+        if (this.dialect.name !== 'sqlite'
+            && (!['mysql', 'pg'].includes(this.dialect.name) || this.config?.pool))
+            return () => undefined;
+        const previous = this.connectionTail;
+        let release;
+        this.connectionTail = new Promise(resolve => { release = resolve; });
+        await previous;
+        return release;
+    }
     constructor(dialect, definitions) {
         this.dialect = dialect;
         for (const key in definitions) {
@@ -108,9 +122,15 @@ export class Database {
         if (!this.isStarted) {
             throw new Error('Database not started');
         }
+        const context = this.transactionContext.getStore();
+        if (context && !context.active)
+            throw new Error('Database transaction is already closed');
+        const release = context ? () => undefined : await this.acquireConnection();
         const start = Date.now();
         try {
-            const result = await this.dialect.query(sql, params);
+            const result = context
+                ? await context.transaction.query(sql, params)
+                : await this.dialect.query(sql, params);
             this.log(String(sql), params, Date.now() - start);
             return result;
         }
@@ -118,6 +138,9 @@ export class Database {
             this.log(String(sql), params, Date.now() - start, error);
             throw error;
         }
+        finally {
+            release();
+        }
     }
     /**
      * 获取数据库方言名称
@@ -198,16 +221,37 @@ export class Database {
         if (!this.isStarted) {
             throw new Error('Database not started');
         }
-        const trx = await this.dialect.beginTransaction(options);
-        const trxContext = new TransactionContextImpl(this, trx);
+        if (this.transactionContext.getStore())
+            throw new Error('Nested database transactions are not supported');
+        const release = await this.acquireConnection();
         try {
-            const result = await callback(trxContext);
-            await trxContext.commit();
-            return result;
+            const trx = await this.dialect.beginTransaction(options);
+            const frame = { transaction: trx, active: true };
+            // 所有入口（含 model 查询）都绑定同一个事务，禁止异步逃逸后继续访问。
+            const guarded = {
+                query: (sql, params) => {
+                    if (!frame.active)
+                        return Promise.reject(new Error('Database transaction is already closed'));
+                    return trx.query(sql, params);
+                },
+                commit: () => trx.commit(),
+                rollback: () => trx.rollback(),
+            };
+            const trxContext = new TransactionContextImpl(this, guarded);
+            try {
+                const result = await this.transactionContext.run(frame, () => callback(trxContext));
+                frame.active = false;
+                await trxContext.commit();
+                return result;
+            }
+            catch (error) {
+                frame.active = false;
+                await trxContext.rollback();
+                throw error;
+            }
         }
-        catch (error) {
-            await trxContext.rollback();
-            throw error;
+        finally {
+            release();
         }
     }
     /**

package/lib/base/transaction.js

@@ -32,7 +32,7 @@ class TrxSelection {
         this.offsetCount = count;
         return this;
     }
-    then(onfulfilled) {
+    then(onfulfilled, onrejected) {
         const { query, params } = this.db.buildQuery({
             type: 'select',
             tableName: this.tableName,
@@ -42,7 +42,7 @@ class TrxSelection {
             limitCount: this.limitCount,
             offsetCount: this.offsetCount
         });
-        return this.trx.query(query, params).then(onfulfilled);
+        return this.trx.query(query, params).then(onfulfilled, onrejected);
     }
 }
 /**
@@ -64,18 +64,15 @@ class TrxUpdation {
         this.conditions = { ...this.conditions, ...condition };
         return this;
     }
-    then(onfulfilled) {
+    then(onfulfilled, onrejected) {
         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 = affectedRows(result);
-            return onfulfilled ? onfulfilled(affected) : affected;
-        });
+        return this.trx.query(this.db.dialectName === 'pg' ? `${query} RETURNING 1` : query, params)
+            .then(affectedRows).then(onfulfilled, onrejected);
     }
 }
 /**
@@ -95,20 +92,19 @@ class TrxDeletion {
         this.conditions = { ...this.conditions, ...condition };
         return this;
     }
-    then(onfulfilled) {
+    then(onfulfilled, onrejected) {
         const { query, params } = this.db.buildQuery({
             type: 'delete',
             tableName: this.tableName,
             conditions: this.conditions
         });
-        return this.trx.query(query, params)
-            .then(result => {
-            const affected = affectedRows(result);
-            return onfulfilled ? onfulfilled(affected) : affected;
-        });
+        return this.trx.query(this.db.dialectName === 'pg' ? `${query} RETURNING 1` : query, params)
+            .then(affectedRows).then(onfulfilled, onrejected);
     }
 }
 function affectedRows(result) {
+    if (Array.isArray(result))
+        return result.length;
     return typeof result === 'number'
         ? result
         : result.affectedRows ?? result.changes ?? 0;

package/lib/dialects/pg.js

@@ -175,7 +175,7 @@ export class PostgreSQLDialect extends Dialect {
     }
     formatColumnDefinition(field, column) {
         const name = this.quoteIdentifier(String(field));
-        const type = this.mapColumnType(column.type);
+        const type = column.type === 'text' && column.length ? 'VARCHAR' : this.mapColumnType(column.type);
         const length = column.length ? `(${column.length})` : '';
         const nullable = column.nullable === false ? ' NOT NULL' : '';
         const primary = column.primary ? ' PRIMARY KEY' : '';

package/lib/index.d.ts

@@ -16,3 +16,4 @@ export * from './dialects/redis.js';
 export * from './dialects/sqlite.js';
 export * from './dialects/mongodb.js';
 export * from './migration.js';
+export * from './structured-schema.js';

package/lib/index.js

@@ -16,3 +16,4 @@ export * from './dialects/redis.js';
 export * from './dialects/sqlite.js';
 export * from './dialects/mongodb.js';
 export * from './migration.js';
+export * from './structured-schema.js';

package/lib/structured-schema.d.ts

@@ -0,0 +1,10 @@
+import type { Database } from './base/database.js';
+export type StructuredDatabase = Database<unknown, Record<string, Record<string, unknown>>, string>;
+import type { Column } from './types.js';
+/** Explicit additive migrations for a declared table; never removes old columns/data. */
+export declare function ensureDatabaseColumns(database: StructuredDatabase, table: string, columns: Record<string, Column>): Promise<void>;
+/** Index migration with exact identifier quoting; MySQL TEXT needs a bounded prefix. */
+export declare function ensureDatabaseIndex(database: StructuredDatabase, table: string, name: string, columns: readonly {
+    name: string;
+    text?: boolean;
+}[]): Promise<void>;

package/lib/structured-schema.js

@@ -0,0 +1,32 @@
+/** Explicit additive migrations for a declared table; never removes old columns/data. */
+export async function ensureDatabaseColumns(database, table, columns) {
+    const dialect = database.dialectName;
+    if (!['sqlite', 'mysql', 'pg'].includes(dialect))
+        return;
+    const quote = (name) => dialect === 'mysql' ? `\`${name.replaceAll('`', '``')}\`` : `"${name.replaceAll('"', '""')}"`;
+    const rows = dialect === 'sqlite'
+        ? await database.query(`PRAGMA table_info(${quote(table)})`)
+        : dialect === 'mysql' ? await database.query(`SHOW COLUMNS FROM ${quote(table)}`)
+            : await database.query('SELECT column_name FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = $1', [table]);
+    if (!rows.length)
+        throw new Error(`Cannot migrate missing table '${table}'`);
+    const existing = new Set(rows.map(row => String(row.name ?? row.Field ?? row.column_name)));
+    for (const [name, definition] of Object.entries(columns)) {
+        if (!existing.has(name))
+            await database.alter(table, { [name]: { action: 'add', ...definition } });
+    }
+}
+/** Index migration with exact identifier quoting; MySQL TEXT needs a bounded prefix. */
+export async function ensureDatabaseIndex(database, table, name, columns) {
+    const dialect = database.dialectName;
+    if (!['sqlite', 'mysql', 'pg'].includes(dialect))
+        return;
+    const quote = (value) => dialect === 'mysql' ? `\`${value.replaceAll('`', '``')}\`` : `"${value.replaceAll('"', '""')}"`;
+    if (dialect === 'mysql') {
+        const rows = await database.query(`SHOW INDEX FROM ${quote(table)} WHERE Key_name = ?`, [name]);
+        if (rows.length)
+            return;
+    }
+    const fields = columns.map(column => quote(column.name) + (dialect === 'mysql' && column.text ? '(128)' : '')).join(', ');
+    await database.query(`CREATE INDEX ${dialect === 'mysql' ? '' : 'IF NOT EXISTS '}${quote(name)} ON ${quote(table)} (${fields})`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/database",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Universal database abstraction layer for Zhin.js - supports SQLite, MySQL, PostgreSQL, MongoDB, Redis",
   "type": "module",
   "main": "./lib/index.js",