Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix type errors in a bunch of files #2401

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const defaultContainer: { get<T>(someClass: { new (...args: any[]): T } | Functi
})();

let userContainer: { get<T>(someClass: { new (...args: any[]): T } | Function): T };
let userContainerOptions: UseContainerOptions;
let userContainerOptions: UseContainerOptions | undefined;

/**
* Sets container to be used by this library.
Expand Down
4 changes: 2 additions & 2 deletions src/decorator/common/Validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ export function Validate(
constraintsOrValidationOptions?: any[] | ValidationOptions,
maybeValidationOptions?: ValidationOptions
): PropertyDecorator {
return function (object: object, propertyName: string): void {
return function (object: object, propertyName: string | symbol): void {
const args: ValidationMetadataArgs = {
type: ValidationTypes.CUSTOM_VALIDATION,
target: object.constructor,
propertyName: propertyName,
propertyName: propertyName as string,
constraintCls: constraintClass,
constraints: Array.isArray(constraintsOrValidationOptions) ? constraintsOrValidationOptions : undefined,
validationOptions: !Array.isArray(constraintsOrValidationOptions)
Expand Down
7 changes: 5 additions & 2 deletions src/decorator/common/ValidateBy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ export function buildMessage(
};
}

/**
* Validate properties
*/
export function ValidateBy(options: ValidateByOptions, validationOptions?: ValidationOptions): PropertyDecorator {
return function (object: object, propertyName: string): void {
return function (object: object, propertyName: string | symbol): void {
registerDecorator({
name: options.name,
target: object.constructor,
propertyName: propertyName,
propertyName: propertyName as string,
options: validationOptions,
constraints: options.constraints,
validator: options.validator,
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/ConstraintMetadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class ConstraintMetadata {

constructor(target: Function, name?: string, async: boolean = false) {
this.target = target;
this.name = name;
this.name = name || '';
this.async = async;
}

Expand Down
15 changes: 11 additions & 4 deletions src/metadata/MetadataStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,15 @@ export class MetadataStorage {
groupByPropertyName(metadata: ValidationMetadata[]): { [propertyName: string]: ValidationMetadata[] } {
const grouped: { [propertyName: string]: ValidationMetadata[] } = {};
metadata.forEach(metadata => {
if (!grouped[metadata.propertyName]) grouped[metadata.propertyName] = [];
grouped[metadata.propertyName].push(metadata);
if (!metadata.propertyName) return;

const propertyName = metadata.propertyName.toString();

if (!grouped[propertyName]) {
grouped[propertyName] = [];
}

grouped[propertyName].push(metadata);
});
return grouped;
}
Expand All @@ -74,7 +81,7 @@ export class MetadataStorage {
*/
getTargetValidationMetadatas(
targetConstructor: Function,
targetSchema: string,
targetSchema: string | undefined,
always: boolean,
strictGroups: boolean,
groups?: string[]
Expand Down Expand Up @@ -151,7 +158,7 @@ export class MetadataStorage {
/**
* Gets all validator constraints for the given object.
*/
getTargetValidatorConstraints(target: Function): ConstraintMetadata[] {
getTargetValidatorConstraints(target?: Function): ConstraintMetadata[] {
return this.constraintMetadatas.get(target) || [];
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/metadata/ValidationMetadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ export class ValidationMetadata {
/**
* Constraint class that performs validation. Used only for custom validations.
*/
constraintCls: Function;
constraintCls?: Function;

/**
* Array of constraints of this validation.
*/
constraints: any[];
constraints?: any[];

/**
* Validation message to be shown in the case of error.
*/
message: string | ((args: ValidationArguments) => string);
message?: string | ((args: ValidationArguments) => string);

/**
* Validation groups used for this validation.
Expand Down Expand Up @@ -83,9 +83,9 @@ export class ValidationMetadata {
this.validationTypeOptions = args.validationTypeOptions;
if (args.validationOptions) {
this.message = args.validationOptions.message;
this.groups = args.validationOptions.groups;
this.groups = args.validationOptions.groups || [];
this.always = args.validationOptions.always;
this.each = args.validationOptions.each;
this.each = args.validationOptions.each ?? false;
this.context = args.validationOptions.context;
}
}
Expand Down
46 changes: 36 additions & 10 deletions src/validation/ValidationExecutor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class ValidationExecutor {
// Public Methods
// -------------------------------------------------------------------------

execute(object: object, targetSchema: string, validationErrors: ValidationError[]): void {
execute(object: object, targetSchema: string | undefined, validationErrors: ValidationError[]): void {
/**
* If there is no metadata registered it means possibly the dependencies are not flatterned and
* more than one instance is used.
Expand Down Expand Up @@ -151,8 +151,8 @@ export class ValidationExecutor {
error.children = this.stripEmptyErrors(error.children);
}

if (Object.keys(error.constraints).length === 0) {
if (error.children.length === 0) {
if (Object.keys(error.constraints || {}).length === 0) {
if (error.children?.length === 0) {
return false;
} else {
delete error.constraints;
Expand Down Expand Up @@ -244,7 +244,7 @@ export class ValidationExecutor {

private conditionalValidations(object: object, value: any, metadatas: ValidationMetadata[]): ValidationMetadata[] {
return metadatas
.map(metadata => metadata.constraints[0](object, value))
.map(metadata => metadata.constraints?.[0](object, value))
.reduce((resultA, resultB) => resultA && resultB, true);
}

Expand All @@ -264,16 +264,23 @@ export class ValidationExecutor {
property: metadata.propertyName,
object: object,
value: value,
constraints: metadata.constraints,
constraints: metadata.constraints || [],
};

if (!metadata.each || !(Array.isArray(value) || value instanceof Set || value instanceof Map)) {
const validatedValue = customConstraintMetadata.instance.validate(value, validationArguments);

if (isPromise(validatedValue)) {
const promise = validatedValue.then(isValid => {
if (!isValid) {
const [type, message] = this.createValidationError(object, value, metadata, customConstraintMetadata);

if (!error.constraints) {
error.constraints = {};
}

error.constraints[type] = message;

if (metadata.context) {
if (!error.contexts) {
error.contexts = {};
Expand All @@ -282,10 +289,16 @@ export class ValidationExecutor {
}
}
});

this.awaitingPromises.push(promise);
} else {
if (!validatedValue) {
const [type, message] = this.createValidationError(object, value, metadata, customConstraintMetadata);

if (!error.constraints) {
error.constraints = {};
}

error.constraints[type] = message;
}
}
Expand Down Expand Up @@ -313,7 +326,12 @@ export class ValidationExecutor {
const validationResult = flatValidatedValues.every((isValid: boolean) => isValid);
if (!validationResult) {
const [type, message] = this.createValidationError(object, value, metadata, customConstraintMetadata);

if (!error.constraints) {
error.constraints = {};
}
error.constraints[type] = message;

if (metadata.context) {
if (!error.contexts) {
error.contexts = {};
Expand All @@ -329,9 +347,13 @@ export class ValidationExecutor {
return;
}

const validationResult = validatedSubValues.every((isValid: boolean) => isValid);
const validationResult = validatedSubValues.every(isValid => isValid);
if (!validationResult) {
const [type, message] = this.createValidationError(object, value, metadata, customConstraintMetadata);

if (!error.constraints) {
error.constraints = {};
}
error.constraints[type] = message;
}
});
Expand All @@ -358,13 +380,17 @@ export class ValidationExecutor {
// Treats Set as an array - as index of Set value is value itself and it is common case to have Object as value
const arrayLikeValue = value instanceof Set ? Array.from(value) : value;
arrayLikeValue.forEach((subValue: any, index: any) => {
this.performValidations(value, subValue, index.toString(), [], metadatas, error.children);
this.performValidations(value, subValue, index.toString(), [], metadatas, error.children || []);
});
} else if (value instanceof Object) {
const targetSchema = typeof metadata.target === 'string' ? metadata.target : metadata.target.name;
this.execute(value, targetSchema, error.children);
this.execute(value, targetSchema, error.children || []);
} else {
const [type, message] = this.createValidationError(metadata.target as object, value, metadata);

if (!error.constraints) {
error.constraints = {};
}
error.constraints[type] = message;
}
});
Expand All @@ -381,7 +407,7 @@ export class ValidationExecutor {

const type = this.getConstraintType(metadata, customConstraint);

if (error.constraints[type]) {
if (error.constraints?.[type]) {
if (!error.contexts) {
error.contexts = {};
}
Expand All @@ -405,7 +431,7 @@ export class ValidationExecutor {
property: metadata.propertyName,
object: object,
value: value,
constraints: metadata.constraints,
constraints: metadata.constraints || [],
};

let message = metadata.message || '';
Expand Down
3 changes: 2 additions & 1 deletion src/validation/ValidationUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ export class ValidationUtils {
message: string | ((args: ValidationArguments) => string),
validationArguments: ValidationArguments
): string {
let messageString: string;
let messageString = '';

if (message instanceof Function) {
messageString = (message as (args: ValidationArguments) => string)(validationArguments);
} else if (typeof message === 'string') {
Expand Down