Skip to content
Merged
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
10 changes: 10 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,13 @@
export function isPromise<T = any>(p: any): p is Promise<T> {
return p !== null && typeof p === "object" && typeof p.then === "function";
}

/**
* Convert Map, Set to Array
*/
export function convertToArray<T>(val: Array<T> | Set<T> | Map<any, T>): Array<T> {
if (val instanceof Map) {
return Array.from(val.values());
}
return Array.isArray(val) ? val : Array.from(val);
}
38 changes: 12 additions & 26 deletions src/validation/ValidationExecutor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {ValidationTypes} from "./ValidationTypes";
import {ConstraintMetadata} from "../metadata/ConstraintMetadata";
import {ValidationArguments} from "./ValidationArguments";
import {ValidationUtils} from "./ValidationUtils";
import {isPromise} from "../utils";
import {isPromise, convertToArray} from "../utils";

/**
* Executes validation over given object.
Expand Down Expand Up @@ -225,8 +225,9 @@ export class ValidationExecutor {
return metadatas
.filter(metadata => {
if (metadata.each) {
if (value instanceof Array) {
return !value.every((subValue: any) => this.validator.validateValueByMetadata(subValue, metadata));
if (value instanceof Array || value instanceof Set || value instanceof Map) {
const arrayValue = convertToArray(value);
return !arrayValue.every((subValue: any) => this.validator.validateValueByMetadata(subValue, metadata));
}

} else {
Expand Down Expand Up @@ -259,7 +260,7 @@ export class ValidationExecutor {
constraints: metadata.constraints
};

if (!metadata.each || !(value instanceof Array)) {
if (!metadata.each || !(value instanceof Array || value instanceof Set || value instanceof Map)) {
const validatedValue = customConstraintMetadata.instance.validate(value, validationArguments);
if (isPromise(validatedValue)) {
const promise = validatedValue.then(isValid => {
Expand All @@ -279,8 +280,10 @@ export class ValidationExecutor {
return;
}

// convert set and map into array
const arrayValue = convertToArray(value);
// Validation needs to be applied to each array item
const validatedSubValues = value.map((subValue: any) => customConstraintMetadata.instance.validate(subValue, validationArguments));
const validatedSubValues = arrayValue.map((subValue: any) => customConstraintMetadata.instance.validate(subValue, validationArguments));
const validationIsAsync = validatedSubValues
.some((validatedSubValue: boolean | Promise<boolean>) => isPromise(validatedSubValue));

Expand Down Expand Up @@ -338,33 +341,16 @@ export class ValidationExecutor {

const targetSchema = typeof metadata.target === "string" ? metadata.target as string : undefined;

if (value instanceof Array) {
value.forEach((subValue: any, index: number) => {
if (value instanceof Array || value instanceof Set || value instanceof Map) {
// 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) => {
const validationError = this.generateValidationError(value, subValue, index.toString());
errors.push(validationError);

this.execute(subValue, targetSchema, validationError.children);
});

} else if (value instanceof Set) {
let index = 0;
value.forEach((subValue: any) => {
const validationError = this.generateValidationError(value, subValue, index.toString());
errors.push(validationError);

this.execute(subValue, targetSchema, validationError.children);

++index;
});

} else if (value instanceof Map) {
value.forEach((subValue: any, key: any) => {
const validationError = this.generateValidationError(value, subValue, key.toString());
errors.push(validationError);

this.execute(subValue, targetSchema, validationError.children);
});

} else if (value instanceof Object) {
this.execute(value, targetSchema, errors);

Expand Down
Loading