@nest-omni/core 4.1.3-3 → 4.1.3-5

package/decorators/auth-user.decorator.d.ts

@@ -1 +1 @@
-export declare function AuthUser(): ParameterDecorator;
+export declare function AuthUser(): any;

package/decorators/controller.decorator.d.ts

@@ -1 +1 @@
-export declare function Controller(field: string): <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare function Controller(field: string): any;

package/decorators/operation.decorator.d.ts

@@ -1 +1 @@
-export declare const OperationLog: (operation: string) => import("@nestjs/common").CustomDecorator<string>;
+export declare const OperationLog: (operation: string) => any;

package/decorators/timestamp-column.decorator.d.ts

@@ -1 +1 @@
-export declare function TimestampColumn(name: string, description?: string): <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare function TimestampColumn(name: string, description?: string): any;

package/decorators/user-check.decorator.d.ts

@@ -2,5 +2,5 @@ export interface IUser {
     uid: number;
     username: string;
 }
-export declare const User: (...dataOrPipes: (string | import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
+export declare const User: any;
 export declare function getUserData(req: any, data?: string): IUser | null;

package/decorators/user.decorator.d.ts

@@ -6,7 +6,7 @@ export interface IUser {
     admin: boolean;
     role: string;
 }
-export declare const User: (...dataOrPipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>> | keyof IUser)[]) => ParameterDecorator;
+export declare const User: any;
 export declare function getOmniAuthData<T extends keyof IUser>(request: {
     headers: Record<string, string>;
 }, key?: T): IUser[T] | IUser;

package/decorators/user_auth.decorator.d.ts

@@ -1 +1 @@
-export declare function UserFilter(field: string): <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare function UserFilter(field: string): any;

package/health-checker/health-checker.controller.js

@@ -17,6 +17,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HealthCheckerController = void 0;
 const ioredis_1 = require("ioredis");
@@ -62,8 +63,5 @@ __decorate([
 ], HealthCheckerController.prototype, "check", null);
 exports.HealthCheckerController = HealthCheckerController = __decorate([
     (0, common_1.Controller)('health'),
-    __metadata("design:paramtypes", [services_1.ApiConfigService,
-        terminus_1.HealthCheckService,
-        terminus_1.TypeOrmHealthIndicator,
-        nestjs_redis_health_1.RedisHealthIndicator])
+    __metadata("design:paramtypes", [services_1.ApiConfigService, typeof (_a = typeof terminus_1.HealthCheckService !== "undefined" && terminus_1.HealthCheckService) === "function" ? _a : Object, typeof (_b = typeof terminus_1.TypeOrmHealthIndicator !== "undefined" && terminus_1.TypeOrmHealthIndicator) === "function" ? _b : Object, nestjs_redis_health_1.RedisHealthIndicator])
 ], HealthCheckerController);

package/interceptors/language-interceptor.service.d.ts

@@ -3,4 +3,4 @@ import type { Observable } from 'rxjs';
 export declare class LanguageInterceptor implements NestInterceptor {
     intercept(context: ExecutionContext, next: CallHandler): Observable<undefined>;
 }
-export declare function UseLanguageInterceptor(): MethodDecorator & ClassDecorator;
+export declare function UseLanguageInterceptor(): any;

package/package.json

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

package/setup/bootstrap.setup.d.ts

@@ -1,2 +1 @@
-import type { NestExpressApplication } from '@nestjs/platform-express';
-export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;
+export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication>;

package/shared/services/api-config.service.js

@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var ApiConfigService_1;
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiConfigService = void 0;
 const common_1 = require("@nestjs/common");
@@ -294,5 +295,5 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
 exports.ApiConfigService = ApiConfigService;
 exports.ApiConfigService = ApiConfigService = ApiConfigService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_1.ConfigService])
+    __metadata("design:paramtypes", [typeof (_a = typeof config_1.ConfigService !== "undefined" && config_1.ConfigService) === "function" ? _a : Object])
 ], ApiConfigService);

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

@@ -21,9 +21,21 @@ export declare class IsUniqueValidator implements ValidatorConstraintInterface {
     validate<E>(value: string, args: IUniqueValidationArguments<E>): Promise<boolean>;
     defaultMessage(args: ValidationArguments): string;
 }
+/**
+ * IsUnique 配置选项
+ */
+export interface IsUniqueOptions {
+    /**
+     * 手动指定用于判断是否为新建的字段名
+     * 适用于视图（View）等没有主键的场景
+     * 例如：uniqueKeys: ['id'] 或 uniqueKeys: ['id', 'version']
+     */
+    uniqueKeys?: string[];
+}
 type UniqueValidationConstraints<E> = [
     ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string),
-    (validationArguments: ValidationArguments) => FindOptionsWhere<E>
+    (validationArguments: ValidationArguments) => FindOptionsWhere<E>,
+    IsUniqueOptions?
 ];
 interface IUniqueValidationArguments<E> extends ValidationArguments {
     constraints: UniqueValidationConstraints<E>;

package/validators/is-unique.validator.js

@@ -84,22 +84,45 @@ let IsUniqueValidator = class IsUniqueValidator {
     }
     validate(value, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [entityRef, findCondition] = args.constraints;
+            const [entityRef, findCondition, options] = args.constraints;
             // 解析 Entity 引用
             const entityClass = this.resolveEntity(entityRef, args.property, args.object);
             const repository = this.transactionHost.tx.getRepository(entityClass);
             args.value = value;
             let exists;
             const defCon = findCondition(args);
-            const pkCols = repository.metadata
-                .primaryColumns.map((column) => column.propertyName);
-            const isNew = pkCols.some((pk) => args.object[pk]);
-            if (!isNew) {
+            // 获取用于判断是否为新建的字段
+            // 优先使用手动配置的 uniqueKeys，否则使用主键
+            let pkCols;
+            if ((options === null || options === void 0 ? void 0 : options.uniqueKeys) && options.uniqueKeys.length > 0) {
+                // 使用手动指定的字段
+                pkCols = options.uniqueKeys;
+            }
+            else {
+                // 使用实体的主键
+                pkCols = repository.metadata
+                    .primaryColumns.map((column) => column.propertyName);
+                // 如果没有主键（例如视图），抛出错误提示
+                if (pkCols.length === 0) {
+                    throw new Error(`[IsUnique] Entity "${entityClass}" has no primary key. ` +
+                        `For views or entities without primary keys, please specify uniqueKeys option:\\n` +
+                        `Example: @IsUnique([Entity, condition, { uniqueKeys: ['id'] }])`);
+                }
+            }
+            // 修复：检查是否为新建记录
+            // 如果所有主键都没有值（null/undefined），则为新建
+            const isNew = !pkCols.some((pk) => {
+                const pkValue = args.object[pk];
+                return pkValue !== null && pkValue !== undefined && pkValue !== '';
+            });
+            if (isNew) {
+                // 新建场景：简单检查是否存在相同值的记录
                 exists =
                     (yield repository
                         .count({ where: defCon })) < 1;
             }
             else {
+                // 更新场景：需要排除当前记录（通过主键对比）
                 const entities = yield repository
                     .createQueryBuilder()
                     .where(defCon)
@@ -108,16 +131,19 @@ let IsUniqueValidator = class IsUniqueValidator {
                     .execute();
                 const entityCount = entities.length;
                 if (entityCount === 1) {
+                    // 只有一条记录，检查是否是当前记录本身
                     const entity = entities[0];
                     const oldPk = {};
                     const newPk = {};
-                    pkCols.map((pk) => {
+                    pkCols.forEach((pk) => {
                         oldPk[pk] = entity[pk];
                         newPk[pk] = args.object[pk];
                     });
+                    // 如果主键相同，说明是自己，允许（唯一）
                     exists = JSON.stringify(oldPk) === JSON.stringify(newPk);
                 }
                 else {
+                    // 0条或多条记录
                     exists = entityCount < 1;
                 }
             }

package/validators/skip-empty.validator.d.ts

@@ -3,4 +3,4 @@
  * @param field
  * @constructor
  */
-export declare function SkipEmpty(field?: string): <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare function SkipEmpty(field?: string): any;