From d21c55b8dc2195da5420c2dfc39b02ee84b8393b Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Wed, 19 Feb 2025 00:02:34 +0800 Subject: [PATCH] fix: lint --- .../validation-class-validator/index.d.ts | 4 +- .../validation-class-validator/jest.setup.js | 2 +- .../validation-class-validator/src/index.ts | 47 ++++++++++--------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/packages/validation-class-validator/index.d.ts b/packages/validation-class-validator/index.d.ts index b1af4c70bbed..192fad957e61 100644 --- a/packages/validation-class-validator/index.d.ts +++ b/packages/validation-class-validator/index.d.ts @@ -2,6 +2,6 @@ import { ValidatorOptions } from 'class-validator'; declare module '@midwayjs/core/dist/interface' { interface MidwayConfig { - classValidator?: ValidatorOptions + classValidator?: ValidatorOptions; } -} \ No newline at end of file +} diff --git a/packages/validation-class-validator/jest.setup.js b/packages/validation-class-validator/jest.setup.js index 297c60889008..1399c9110e25 100644 --- a/packages/validation-class-validator/jest.setup.js +++ b/packages/validation-class-validator/jest.setup.js @@ -1 +1 @@ -jest.setTimeout(30000); \ No newline at end of file +jest.setTimeout(30000); diff --git a/packages/validation-class-validator/src/index.ts b/packages/validation-class-validator/src/index.ts index ccdb3a99b417..714f1d549920 100644 --- a/packages/validation-class-validator/src/index.ts +++ b/packages/validation-class-validator/src/index.ts @@ -1,5 +1,9 @@ import { IMidwayContainer, MidwayConfigService } from '@midwayjs/core'; -import { IValidationService, ValidateResult, ValidationExtendOptions } from '@midwayjs/validation'; +import { + IValidationService, + ValidateResult, + ValidationExtendOptions, +} from '@midwayjs/validation'; import { validateSync, ValidatorOptions } from 'class-validator'; import { plainToInstance } from 'class-transformer'; @@ -8,45 +12,46 @@ export class ClassValidatorService implements IValidationService { async init(container: IMidwayContainer) { const configService = container.get(MidwayConfigService); - this.options = configService.getConfiguration('validation')?.classValidatorOptions || {}; + this.options = + configService.getConfiguration('validation')?.classValidatorOptions || {}; } - validateWithSchema(schema: any, value: any, validationOptions: ValidationExtendOptions, validatorOptions: ValidatorOptions = {}): ValidateResult { + validateWithSchema( + schema: any, + value: any, + validationOptions: ValidationExtendOptions, + validatorOptions: ValidatorOptions = {} + ): ValidateResult { const instance = plainToInstance(schema, value); const errors = validateSync(instance, { ...this.options, - ...validatorOptions + ...validatorOptions, }); if (errors.length > 0) { - const message = errors.map(error => { - if (error.constraints) { - return Object.values(error.constraints).join(', '); - } - return ''; - }).filter(Boolean).join('; '); + const message = errors + .map(error => { + if (error.constraints) { + return Object.values(error.constraints).join(', '); + } + return ''; + }) + .filter(Boolean) + .join('; '); return { status: false, message, - error: errors[0] + error: errors[0], }; } return { status: true, - value: instance + value: instance, }; } - validate(schema: any, value: any, options?: ValidationExtendOptions): ValidateResult { - const defaultOptions: ValidationExtendOptions = { - locale: 'en', - fallbackLocale: 'en' - }; - return this.validateWithSchema(schema, value, options || defaultOptions, {}); - } - getSchema(schema: any) { return schema; } @@ -70,4 +75,4 @@ export class ClassValidatorService implements IValidationService { export default async (container: IMidwayContainer) => { return new ClassValidatorService(); -}; \ No newline at end of file +};