@nest-omni/core 4.1.3-11 → 4.1.3-12

package/validators/is-exists.validator.js

@@ -23,11 +23,9 @@ exports.IsExists = IsExists;
 const class_validator_1 = require("class-validator");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const common_1 = require("@nestjs/common");
-const transactional_1 = require("@nestjs-cls/transactional");
+const transaction_1 = require("../transaction");
 let IsExistsValidator = class IsExistsValidator {
-    constructor(transactionHost) {
-        this.transactionHost = transactionHost;
-    }
+    constructor() { }
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -91,7 +89,7 @@ let IsExistsValidator = class IsExistsValidator {
             const [entityRef, findCondition] = args.constraints;
             // 解析 Entity 引用
             const entityClass = this.resolveEntity(entityRef, args.property, args.object);
-            const repository = this.transactionHost.tx.getRepository(entityClass);
+            const repository = transaction_1.TransactionContextService.getDataSource().getRepository(entityClass);
             args.value = value;
             return ((yield repository.count({
                 where: findCondition(args),
@@ -106,7 +104,7 @@ exports.IsExistsValidator = IsExistsValidator;
 exports.IsExistsValidator = IsExistsValidator = __decorate([
     (0, common_1.Injectable)(),
     (0, class_validator_1.ValidatorConstraint)({ name: 'isExists', async: true }),
-    __metadata("design:paramtypes", [transactional_1.TransactionHost])
+    __metadata("design:paramtypes", [])
 ], IsExistsValidator);
 function IsExists(constraints, validationOptions) {
     return (object, propertyName) => {

package/validators/is-unique.validator.d.ts

@@ -1,10 +1,7 @@
 import type { ValidationArguments, ValidationOptions, ValidatorConstraintInterface } from 'class-validator';
 import { EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
-import { TransactionHost } from '@nestjs-cls/transactional';
-import { TransactionalAdapterTypeOrm } from '@nestjs-cls/transactional-adapter-typeorm';
 export declare class IsUniqueValidator implements ValidatorConstraintInterface {
-    private readonly transactionHost;
-    constructor(transactionHost: TransactionHost<TransactionalAdapterTypeOrm>);
+    constructor();
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -33,7 +30,7 @@ export interface IsUniqueOptions {
     uniqueKeys?: string[];
 }
 type UniqueValidationConstraints<E> = [
-    ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string),
+    (ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string)),
     (validationArguments: ValidationArguments) => FindOptionsWhere<E>,
     IsUniqueOptions?
 ];

package/validators/is-unique.validator.js

@@ -23,11 +23,9 @@ exports.IsUnique = IsUnique;
 const class_validator_1 = require("class-validator");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const common_1 = require("@nestjs/common");
-const transactional_1 = require("@nestjs-cls/transactional");
+const transaction_1 = require("../transaction");
 let IsUniqueValidator = class IsUniqueValidator {
-    constructor(transactionHost) {
-        this.transactionHost = transactionHost;
-    }
+    constructor() { }
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -87,7 +85,7 @@ let IsUniqueValidator = class IsUniqueValidator {
             const [entityRef, findCondition, options] = args.constraints;
             // 解析 Entity 引用
             const entityClass = this.resolveEntity(entityRef, args.property, args.object);
-            const repository = this.transactionHost.tx.getRepository(entityClass);
+            const repository = transaction_1.TransactionContextService.getDataSource().getRepository(entityClass);
             args.value = value;
             let exists;
             const defCon = findCondition(args);
@@ -100,8 +98,7 @@ let IsUniqueValidator = class IsUniqueValidator {
             }
             else {
                 // 2. 使用实体的主键
-                pkCols = repository.metadata
-                    .primaryColumns.map((column) => column.propertyName);
+                pkCols = repository.metadata.primaryColumns.map((column) => column.propertyName);
             }
             // 如果没有主键也没有 uniqueKeys，使用简化逻辑
             // 查询条件本身表示唯一性，只要存在记录就不允许
@@ -118,9 +115,7 @@ let IsUniqueValidator = class IsUniqueValidator {
             });
             if (isNew) {
                 // 新建场景：简单检查是否存在相同值的记录
-                exists =
-                    (yield repository
-                        .count({ where: defCon })) < 1;
+                exists = (yield repository.count({ where: defCon })) < 1;
             }
             else {
                 // 更新场景：需要排除当前记录（通过主键对比）
@@ -158,7 +153,7 @@ exports.IsUniqueValidator = IsUniqueValidator;
 exports.IsUniqueValidator = IsUniqueValidator = __decorate([
     (0, common_1.Injectable)(),
     (0, class_validator_1.ValidatorConstraint)({ name: 'isUnique', async: true }),
-    __metadata("design:paramtypes", [transactional_1.TransactionHost])
+    __metadata("design:paramtypes", [])
 ], IsUniqueValidator);
 function IsUnique(constraints, validationOptions) {
     return function (object, propertyName) {

package/shared/services/validator.service.d.ts

@@ -1,3 +0,0 @@
-export declare class ValidatorService {
-    isImage(mimeType: string): boolean;
-}

package/shared/services/validator.service.js

@@ -1,20 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidatorService = void 0;
-const common_1 = require("@nestjs/common");
-let ValidatorService = class ValidatorService {
-    isImage(mimeType) {
-        const imageMimeTypes = ['image/jpeg', 'image/png'];
-        return imageMimeTypes.includes(mimeType);
-    }
-};
-exports.ValidatorService = ValidatorService;
-exports.ValidatorService = ValidatorService = __decorate([
-    (0, common_1.Injectable)()
-], ValidatorService);