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

#2043 introduce ValidationErrorNoStack class to improve error creation performance #2142

Merged
merged 5 commits into from
Mar 6, 2024
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
97 changes: 73 additions & 24 deletions src/ValidationError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,59 @@ let strReg = /\$\{\s*(\w+)\s*\}/g;

type Params = Record<string, unknown>;

export default class ValidationError extends Error {
class ValidationErrorNoStack implements ValidationError {
name: string;
message: string;

value: any;
path?: string;
type?: string;
params?: Params;

errors: string[];
inner: ValidationError[];

constructor(
errorOrErrors: string | ValidationError | readonly ValidationError[],
value?: any,
field?: string,
type?: string,
) {
this.name = 'ValidationError';
this.value = value;
this.path = field;
this.type = type;

this.errors = [];
this.inner = [];

toArray(errorOrErrors).forEach((err) => {
if (ValidationError.isError(err)) {
this.errors.push(...err.errors);
const innerErrors = err.inner.length ? err.inner : [err];
this.inner.push(...innerErrors);
} else {
this.errors.push(err);
}
});

this.message =
this.errors.length > 1
? `${this.errors.length} errors occurred`
: this.errors[0];
}

[Symbol.toStringTag] = 'Error';
}

export default class ValidationError extends Error {
value: any;
path?: string;
type?: string;
params?: Params;

inner: ValidationError[];
errors: string[] = [];
inner: ValidationError[] = [];

static formatError(
message: string | ((params: Params) => string) | unknown,
Expand All @@ -40,33 +84,38 @@ export default class ValidationError extends Error {
type?: string,
disableStack?: boolean,
) {
super();

this.name = 'ValidationError';
this.value = value;
this.path = field;
this.type = type;
const errorNoStack = new ValidationErrorNoStack(
errorOrErrors,
value,
field,
type,
);

this.errors = [];
this.inner = [];
if (disableStack) {
return errorNoStack;
}

toArray(errorOrErrors).forEach((err) => {
if (ValidationError.isError(err)) {
this.errors.push(...err.errors);
const innerErrors = err.inner.length ? err.inner : [err];
this.inner.push(...innerErrors);
} else {
this.errors.push(err);
}
});
super();

this.message =
this.errors.length > 1
? `${this.errors.length} errors occurred`
: this.errors[0];
this.name = errorNoStack.name;
this.message = errorNoStack.message;
this.type = errorNoStack.type;
this.value = errorNoStack.value;
this.path = errorNoStack.path;
this.errors = errorNoStack.errors;
this.inner = errorNoStack.inner;

if (!disableStack && Error.captureStackTrace)
if (Error.captureStackTrace) {
Error.captureStackTrace(this, ValidationError);
}
}

static [Symbol.hasInstance](inst: any) {
return (
ValidationErrorNoStack[Symbol.hasInstance](inst) ||
super[Symbol.hasInstance](inst)
);
}

[Symbol.toStringTag] = 'Error';
}
8 changes: 3 additions & 5 deletions src/util/createValidation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export default function createValidation(config: {
label: schema.spec.label,
path: overrides.path || path,
spec: schema.spec,
disableStackTrace: overrides.disableStackTrace || disableStackTrace,
...params,
...overrides.params,
};
Expand All @@ -111,7 +112,7 @@ export default function createValidation(config: {
value,
nextParams.path,
overrides.type || name,
overrides.disableStackTrace ?? disableStackTrace,
nextParams.disableStackTrace,
);
error.params = nextParams;
return error;
Expand Down Expand Up @@ -158,10 +159,7 @@ export default function createValidation(config: {
`This test will finish after the validate call has returned`,
);
}
return Promise.resolve(result).then(
handleResult,
handleError,
);
return Promise.resolve(result).then(handleResult, handleError);
}
} catch (err: any) {
handleError(err);
Expand Down
7 changes: 7 additions & 0 deletions test/ValidationError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,11 @@ describe('ValidationError', () => {
expect(str).toContain('0');
});
});

it('should disable stacks', () => {
const disabled = new ValidationError('error', 1, 'field', 'type', true);

expect(disabled.constructor.name).toEqual('ValidationErrorNoStack');
expect(disabled).toBeInstanceOf(ValidationError);
});
});
13 changes: 13 additions & 0 deletions test/array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,19 @@ describe('Array types', () => {
);
});

it('should respect disableStackTrace', async () => {
let inst = array().of(object({ str: string().required() }));

const data = [{ str: undefined }, { str: undefined }];
return Promise.all([
expect(inst.strict().validate(data)).rejects.toHaveProperty('stack'),

expect(
inst.strict().validate(data, { disableStackTrace: true }),
).rejects.not.toHaveProperty('stack'),
]);
});

it('should compact arrays', () => {
let arr = ['', 1, 0, 4, false, null],
inst = array();
Expand Down
19 changes: 14 additions & 5 deletions test/mixed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,16 @@ describe('Mixed Types ', () => {
]);
});

it('should respect disableStackTrace', () => {
// let inst = string().trim();
// return Promise.all([
// expect(inst.strict().validate(' hi ')).rejects.toHaveProperty('stack'),
// expect(
// inst.strict().validate(' hi ', { disableStackTrace: true }),
// ).not.toHaveProperty('stack'),
// ]);
});

it('should overload test()', () => {
let inst = mixed().test('test', noop);

Expand Down Expand Up @@ -967,11 +977,10 @@ describe('Mixed Types ', () => {
then: (s) => s.defined(),
}),
baz: tuple([string(), number()]),
})
.when(['dummy'], (_, s) => {
}).when(['dummy'], (_, s) => {
return s.shape({
when: string()
})
when: string(),
});
});
});

Expand Down Expand Up @@ -1201,7 +1210,7 @@ describe('Mixed Types ', () => {
oneOf: [],
optional: true,
tests: [],
}
},
},
});
});
Expand Down
Loading