@nest-omni/core 4.1.3-14 → 4.1.3-15

package/decorators/field.decorators.d.ts

@@ -69,7 +69,7 @@ export declare function FQDNFieldOptional(options?: Omit<ApiPropertyOptions, 'ty
 export declare function DateField(options?: Omit<ApiPropertyOptions, 'type'> & IDateFieldOptions): PropertyDecorator;
 export declare function DateFieldOptional(options?: Omit<ApiPropertyOptions, 'type' | 'required'> & IDateFieldOptions): PropertyDecorator;
 export declare function IpFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IIPFieldOptions & IStringFieldOptions): PropertyDecorator;
-export declare function IpField(options: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions & IIPFieldOptions): PropertyDecorator;
+export declare function IpField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions & IIPFieldOptions): PropertyDecorator;
 export declare function ObjectField(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export declare function ObjectFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export declare function TimeZoneField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "4.1.3-14",
+  "version": "4.1.3-15",
   "description": "A comprehensive NestJS framework for building enterprise-grade applications with best practices",
   "main": "index.js",
   "types": "index.d.ts",

package/transaction/base-service-transaction.d.ts

@@ -4,12 +4,19 @@ import { TransactionManager, Propagation, IsolationLevel, TransactionStatus } fr
 /**
  * 事务感知的基础服务类
  * 提供统一的数据操作接口，自动处理事务
+ *
+ * 注意：TransactionManager 现在是可选的，@Transactional 装饰器会自动使用全局 TransactionManager
  */
 export declare abstract class BaseService {
-    protected readonly transactionManager: TransactionManager;
+    protected readonly transactionManager?: TransactionManager;
     protected readonly defaultDataSourceName: string;
     protected readonly logger: Logger;
-    constructor(transactionManager: TransactionManager, defaultDataSourceName?: string);
+    constructor(transactionManager?: TransactionManager, defaultDataSourceName?: string);
+    /**
+     * 获取事务管理器实例
+     * 优先使用注入的实例，其次使用全局持有者
+     */
+    protected getTransactionManager(): TransactionManager | undefined;
     /**
      * 获取指定数据源的 EntityManager
      */

package/transaction/base-service-transaction.js

@@ -25,9 +25,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseService = void 0;
 const common_1 = require("@nestjs/common");
 const transaction_manager_1 = require("./transaction-manager");
+const transaction_manager_holder_1 = require("./transaction-manager.holder");
 /**
  * 事务感知的基础服务类
  * 提供统一的数据操作接口，自动处理事务
+ *
+ * 注意：TransactionManager 现在是可选的，@Transactional 装饰器会自动使用全局 TransactionManager
  */
 let BaseService = BaseService_1 = class BaseService {
     constructor(transactionManager, defaultDataSourceName = 'default') {
@@ -35,12 +38,23 @@ let BaseService = BaseService_1 = class BaseService {
         this.defaultDataSourceName = defaultDataSourceName;
         this.logger = new common_1.Logger(BaseService_1.name);
     }
+    /**
+     * 获取事务管理器实例
+     * 优先使用注入的实例，其次使用全局持有者
+     */
+    getTransactionManager() {
+        return this.transactionManager || transaction_manager_holder_1.TransactionManagerHolder.getManager();
+    }
     /**
      * 获取指定数据源的 EntityManager
      */
     getEntityManager(dataSourceName) {
+        const tm = this.getTransactionManager();
+        if (!tm) {
+            throw new Error('TransactionManager not available. Make sure TransactionModule is imported.');
+        }
         const dsName = dataSourceName || this.defaultDataSourceName;
-        const em = this.transactionManager.getCurrentEntityManager(dsName);
+        const em = tm.getCurrentEntityManager(dsName);
         if (!em) {
             throw new Error(`No active transaction for dataSource: ${dsName}. ` +
                 `Use @Transactional decorator to start a transaction.`);
@@ -52,7 +66,11 @@ let BaseService = BaseService_1 = class BaseService {
      */
     executeInTransaction(callback, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const status = yield this.transactionManager.getTransaction({
+            const tm = this.getTransactionManager();
+            if (!tm) {
+                throw new Error('TransactionManager not available. Make sure TransactionModule is imported.');
+            }
+            const status = yield tm.getTransaction({
                 propagation: (options === null || options === void 0 ? void 0 : options.propagation) || transaction_manager_1.Propagation.REQUIRED,
                 readOnly: (options === null || options === void 0 ? void 0 : options.readOnly) || false,
                 isolationLevel: options === null || options === void 0 ? void 0 : options.isolation,
@@ -62,11 +80,11 @@ let BaseService = BaseService_1 = class BaseService {
             try {
                 const em = this.getEntityManager(options === null || options === void 0 ? void 0 : options.dataSource);
                 const result = yield callback(em);
-                yield this.transactionManager.commit(status);
+                yield tm.commit(status);
                 return result;
             }
             catch (error) {
-                yield this.transactionManager.rollback(status);
+                yield tm.rollback(status);
                 throw error;
             }
         });
@@ -186,12 +204,16 @@ let BaseService = BaseService_1 = class BaseService {
      */
     executeAcrossDataSources(operations, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const tm = this.getTransactionManager();
+            if (!tm) {
+                throw new Error('TransactionManager not available. Make sure TransactionModule is imported.');
+            }
             const results = [];
             const startedTransactions = [];
             try {
                 // 在每个数据源上开始事务
                 for (const op of operations) {
-                    const status = yield this.transactionManager.getTransaction({
+                    const status = yield tm.getTransaction({
                         propagation: transaction_manager_1.Propagation.REQUIRED,
                         dataSourceName: op.dataSourceName,
                     });
@@ -205,7 +227,7 @@ let BaseService = BaseService_1 = class BaseService {
                 }
                 // 提交所有事务
                 for (const status of startedTransactions) {
-                    yield this.transactionManager.commit(status);
+                    yield tm.commit(status);
                 }
                 return results;
             }
@@ -214,7 +236,7 @@ let BaseService = BaseService_1 = class BaseService {
                 if ((options === null || options === void 0 ? void 0 : options.rollbackOnError) !== false) {
                     for (const status of startedTransactions.reverse()) {
                         try {
-                            yield this.transactionManager.rollback(status);
+                            yield tm.rollback(status);
                         }
                         catch (rollbackError) {
                             this.logger.error(`Failed to rollback transaction on ${status.dataSourceName}:`, rollbackError);
@@ -265,21 +287,30 @@ let BaseService = BaseService_1 = class BaseService {
      * 检查是否在事务中
      */
     isInTransaction(dataSourceName) {
+        const tm = this.getTransactionManager();
+        if (!tm) {
+            return false;
+        }
         const dsName = dataSourceName || this.defaultDataSourceName;
-        const status = this.transactionManager.getCurrentTransaction(dsName);
+        const status = tm.getCurrentTransaction(dsName);
         return status !== null && !status.isCompleted;
     }
     /**
      * 获取当前事务状态
      */
     getCurrentTransactionStatus(dataSourceName) {
+        const tm = this.getTransactionManager();
+        if (!tm) {
+            return null;
+        }
         const dsName = dataSourceName || this.defaultDataSourceName;
-        return this.transactionManager.getCurrentTransaction(dsName);
+        return tm.getCurrentTransaction(dsName);
     }
 };
 exports.BaseService = BaseService;
 exports.BaseService = BaseService = BaseService_1 = __decorate([
     (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Optional)()),
     __param(1, (0, common_1.Optional)()),
     __param(1, (0, common_1.Inject)('DEFAULT_DATA_SOURCE_NAME')),
     __metadata("design:paramtypes", [transaction_manager_1.TransactionManager, String])

package/transaction/index.d.ts

@@ -1,4 +1,5 @@
 export { TransactionManager, TransactionDefinition, TransactionStatus, Propagation, IsolationLevel, TransactionTimeoutCallback, TransactionContextManager } from './transaction-manager';
+export { TransactionManagerHolder } from './transaction-manager.holder';
 export { TransactionSynchronizationManager, TransactionSynchronization, TransactionSynchronizationStatus, } from './transaction-synchronization';
 export { Transactional, ClassTransactional, TransactionalInterceptor, Tx, UseTransactional, TransactionalOptions } from './transactional.decorator';
 export { BaseService } from './base-service-transaction';

package/transaction/index.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionModule = exports.addDataSources = exports.addDataSource = exports.withTransaction = exports.withDataSource = exports.isDataSourceAvailable = exports.getDefaultDataSource = exports.getDataSourceSafe = exports.getDataSource = exports.DataSourceUtil = exports.DatabaseAdapter = exports.TransactionErrorHandler = exports.TransactionError = exports.TRANSACTION_LOGGING_INTERCEPTOR = exports.LoggingTransactionalInterceptor = exports.isDynamicDataSourceEntity = exports.hasEntityDataSource = exports.getEntityDataSource = exports.BaseEntityWithDataSource = exports.DynamicDataSource = exports.DataSource = exports.ClsServiceManager = exports.ClsCompatibilityService = exports.TransactionContextService = exports.DataSourceRegistryService = exports.GlobalMultiTypeOrmModule = exports.TypeOrmModuleWrapper = exports.BaseService = exports.UseTransactional = exports.Tx = exports.TransactionalInterceptor = exports.ClassTransactional = exports.Transactional = exports.TransactionSynchronizationStatus = exports.TransactionSynchronizationManager = exports.TransactionContextManager = exports.IsolationLevel = exports.Propagation = exports.TransactionManager = void 0;
+exports.TransactionModule = exports.addDataSources = exports.addDataSource = exports.withTransaction = exports.withDataSource = exports.isDataSourceAvailable = exports.getDefaultDataSource = exports.getDataSourceSafe = exports.getDataSource = exports.DataSourceUtil = exports.DatabaseAdapter = exports.TransactionErrorHandler = exports.TransactionError = exports.TRANSACTION_LOGGING_INTERCEPTOR = exports.LoggingTransactionalInterceptor = exports.isDynamicDataSourceEntity = exports.hasEntityDataSource = exports.getEntityDataSource = exports.BaseEntityWithDataSource = exports.DynamicDataSource = exports.DataSource = exports.ClsServiceManager = exports.ClsCompatibilityService = exports.TransactionContextService = exports.DataSourceRegistryService = exports.GlobalMultiTypeOrmModule = exports.TypeOrmModuleWrapper = exports.BaseService = exports.UseTransactional = exports.Tx = exports.TransactionalInterceptor = exports.ClassTransactional = exports.Transactional = exports.TransactionSynchronizationStatus = exports.TransactionSynchronizationManager = exports.TransactionManagerHolder = exports.TransactionContextManager = exports.IsolationLevel = exports.Propagation = exports.TransactionManager = void 0;
 // 核心事务管理
 var transaction_manager_1 = require("./transaction-manager");
 Object.defineProperty(exports, "TransactionManager", { enumerable: true, get: function () { return transaction_manager_1.TransactionManager; } });
 Object.defineProperty(exports, "Propagation", { enumerable: true, get: function () { return transaction_manager_1.Propagation; } });
 Object.defineProperty(exports, "IsolationLevel", { enumerable: true, get: function () { return transaction_manager_1.IsolationLevel; } });
 Object.defineProperty(exports, "TransactionContextManager", { enumerable: true, get: function () { return transaction_manager_1.TransactionContextManager; } });
+// 事务管理器持有者（用于装饰器访问）
+var transaction_manager_holder_1 = require("./transaction-manager.holder");
+Object.defineProperty(exports, "TransactionManagerHolder", { enumerable: true, get: function () { return transaction_manager_holder_1.TransactionManagerHolder; } });
 // 事务同步机制（对标 Spring TransactionSynchronization）
 var transaction_synchronization_1 = require("./transaction-synchronization");
 Object.defineProperty(exports, "TransactionSynchronizationManager", { enumerable: true, get: function () { return transaction_synchronization_1.TransactionSynchronizationManager; } });

package/transaction/transaction-manager.holder.d.ts

@@ -0,0 +1,31 @@
+import { TransactionManager } from './transaction-manager';
+/**
+ * 事务管理器持有者
+ * 提供全局访问，使装饰器能够获取 TransactionManager 实例
+ * 而不需要在每个 Service 中手动注入
+ */
+declare class TransactionManagerHolderClass {
+    private _manager;
+    /**
+     * 设置事务管理器实例
+     * 由 TransactionModule 在初始化时调用
+     */
+    setManager(manager: TransactionManager): void;
+    /**
+     * 获取事务管理器实例
+     */
+    getManager(): TransactionManager | null;
+    /**
+     * 清除事务管理器实例
+     */
+    clearManager(): void;
+    /**
+     * 检查是否已设置管理器
+     */
+    hasManager(): boolean;
+}
+/**
+ * 全局事务管理器持有者实例
+ */
+export declare const TransactionManagerHolder: TransactionManagerHolderClass;
+export {};

package/transaction/transaction-manager.holder.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionManagerHolder = void 0;
+/**
+ * 事务管理器持有者
+ * 提供全局访问，使装饰器能够获取 TransactionManager 实例
+ * 而不需要在每个 Service 中手动注入
+ */
+class TransactionManagerHolderClass {
+    constructor() {
+        this._manager = null;
+    }
+    /**
+     * 设置事务管理器实例
+     * 由 TransactionModule 在初始化时调用
+     */
+    setManager(manager) {
+        this._manager = manager;
+    }
+    /**
+     * 获取事务管理器实例
+     */
+    getManager() {
+        return this._manager;
+    }
+    /**
+     * 清除事务管理器实例
+     */
+    clearManager() {
+        this._manager = null;
+    }
+    /**
+     * 检查是否已设置管理器
+     */
+    hasManager() {
+        return this._manager !== null;
+    }
+}
+/**
+ * 全局事务管理器持有者实例
+ */
+exports.TransactionManagerHolder = new TransactionManagerHolderClass();

package/transaction/transaction.module.js

@@ -5,7 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var TransactionModule_1;
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var TransactionModuleInitService_1, TransactionModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionModule = void 0;
 const common_1 = require("@nestjs/common");
@@ -15,6 +21,27 @@ const transaction_manager_1 = require("./transaction-manager");
 const transaction_manager_2 = require("./transaction-manager");
 const data_source_registry_1 = require("./data-source-registry");
 const logging_transactional_interceptor_1 = require("./logging-transactional.interceptor");
+const transaction_manager_holder_1 = require("./transaction-manager.holder");
+/**
+ * 事务模块初始化服务
+ * 用于在模块启动时设置全局 TransactionManager 持有者
+ */
+let TransactionModuleInitService = TransactionModuleInitService_1 = class TransactionModuleInitService {
+    constructor(transactionManager) {
+        this.transactionManager = transactionManager;
+        this.logger = new common_1.Logger(TransactionModuleInitService_1.name);
+    }
+    onModuleInit() {
+        // 设置全局事务管理器持有者
+        transaction_manager_holder_1.TransactionManagerHolder.setManager(this.transactionManager);
+        this.logger.log('TransactionManagerHolder initialized');
+    }
+};
+TransactionModuleInitService = TransactionModuleInitService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => transaction_manager_1.TransactionManager))),
+    __metadata("design:paramtypes", [transaction_manager_1.TransactionManager])
+], TransactionModuleInitService);
 /**
  * 事务模块
  */
@@ -26,6 +53,7 @@ let TransactionModule = TransactionModule_1 = class TransactionModule {
             transaction_manager_2.TransactionContextManager,
             transaction_manager_1.TransactionManager,
             transactional_decorator_1.TransactionalInterceptor,
+            TransactionModuleInitService,
             {
                 provide: 'TRANSACTION_CONFIG',
                 useValue: {

package/transaction/transactional.decorator.js

@@ -27,6 +27,7 @@ const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 const transaction_manager_1 = require("./transaction-manager");
 const nestjs_cls_1 = require("nestjs-cls");
+const transaction_manager_holder_1 = require("./transaction-manager.holder");
 /**
  * 事务元数据键
  */
@@ -50,11 +51,11 @@ function Transactional(options) {
         descriptor.value = function (...args) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a;
-                // 获取事务管理器
-                const transactionManager = this.transactionManager;
+                // 获取事务管理器 - 优先使用全局持有者，兼容手动注入的方式
+                let transactionManager = transaction_manager_holder_1.TransactionManagerHolder.getManager() || this.transactionManager;
                 const logger = new common_1.Logger('Transactional');
                 if (!transactionManager) {
-                    logger.warn('TransactionManager not found, executing without transaction');
+                    logger.warn('TransactionManager not found. Make sure TransactionModule is imported. Executing without transaction.');
                     return yield originalMethod.apply(this, args);
                 }
                 // 获取事务定义