-
Notifications
You must be signed in to change notification settings - Fork 29.6k
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
lib: improve validation utils and refactor vm argument validation #31480
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,87 @@ | ||
| // Flags: --expose-internals | ||
| 'use strict'; | ||
|
|
||
| require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| validateInteger | ||
| validateArray, | ||
| validateBoolean, | ||
| validateInteger, | ||
| validateObject, | ||
| } = require('internal/validators'); | ||
| const { MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } = Number; | ||
| const outOfRangeError = { | ||
| code: 'ERR_OUT_OF_RANGE', | ||
| name: 'RangeError' | ||
| name: 'RangeError', | ||
| }; | ||
| const invalidArgTypeError = { | ||
| code: 'ERR_INVALID_ARG_TYPE', | ||
| name: 'TypeError', | ||
| }; | ||
| const invalidArgValueError = { | ||
| code: 'ERR_INVALID_ARG_VALUE', | ||
| name: 'TypeError', | ||
| }; | ||
|
|
||
| { | ||
| // validateInteger tests. | ||
|
|
||
| // validateInteger() defaults to validating safe integers. | ||
| validateInteger(MAX_SAFE_INTEGER, 'foo'); | ||
| validateInteger(MIN_SAFE_INTEGER, 'foo'); | ||
| assert.throws(() => { | ||
| validateInteger(MAX_SAFE_INTEGER + 1, 'foo'); | ||
| }, outOfRangeError); | ||
| assert.throws(() => { | ||
| validateInteger(MIN_SAFE_INTEGER - 1, 'foo'); | ||
| }, outOfRangeError); | ||
|
|
||
| // validateInteger() works with unsafe integers. | ||
| validateInteger(MAX_SAFE_INTEGER + 1, 'foo', 0, MAX_SAFE_INTEGER + 1); | ||
| validateInteger(MIN_SAFE_INTEGER - 1, 'foo', MIN_SAFE_INTEGER - 1); | ||
| } | ||
|
|
||
| { | ||
| // validateArray tests. | ||
| validateArray([], 'foo'); | ||
| validateArray([1, 2, 3], 'foo'); | ||
|
|
||
| [undefined, null, true, false, 0, 0.0, 42, '', 'string', {}] | ||
| .forEach((val) => { | ||
| assert.throws(() => { | ||
| validateArray(val, 'foo'); | ||
| }, invalidArgTypeError); | ||
| }); | ||
|
|
||
| validateArray([1], 'foo', { minLength: 1 }); | ||
| assert.throws(() => { | ||
| validateArray([], 'foo', { minLength: 1 }); | ||
| }, invalidArgValueError); | ||
| } | ||
|
|
||
| { | ||
| // validateBoolean tests. | ||
| validateBoolean(true, 'foo'); | ||
| validateBoolean(false, 'foo'); | ||
|
|
||
| [undefined, null, 0, 0.0, 42, '', 'string', {}, []].forEach((val) => { | ||
| assert.throws(() => { | ||
| validateBoolean(val, 'foo'); | ||
| }, invalidArgTypeError); | ||
| }); | ||
| } | ||
|
|
||
| { | ||
| // validateObject tests. | ||
| validateObject({}, 'foo'); | ||
| validateObject({ a: 42, b: 'foo' }, 'foo'); | ||
|
|
||
| [undefined, null, true, false, 0, 0.0, 42, '', 'string', []] | ||
| .forEach((val) => { | ||
| assert.throws(() => { | ||
| validateObject(val, 'foo'); | ||
| }, invalidArgTypeError); | ||
| }); | ||
|
|
||
| // validateInteger() defaults to validating safe integers. | ||
| validateInteger(MAX_SAFE_INTEGER, 'foo'); | ||
| validateInteger(MIN_SAFE_INTEGER, 'foo'); | ||
| assert.throws(() => { | ||
| validateInteger(MAX_SAFE_INTEGER + 1, 'foo'); | ||
| }, outOfRangeError); | ||
| assert.throws(() => { | ||
| validateInteger(MIN_SAFE_INTEGER - 1, 'foo'); | ||
| }, outOfRangeError); | ||
|
|
||
| // validateInteger() works with unsafe integers. | ||
| validateInteger(MAX_SAFE_INTEGER + 1, 'foo', 0, MAX_SAFE_INTEGER + 1); | ||
| validateInteger(MIN_SAFE_INTEGER - 1, 'foo', MIN_SAFE_INTEGER - 1); | ||
| validateObject(null, 'foo', { nullable: true }); | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not changed as currently, it skips Arrays to the
_isContextfunction which in turn rejects them. If I usevalidateObjectit would change the error message for Arrays passed to theisContextfromexpected to be vm.Contexttoexpected to be an Objectand since we have explicit tests for this case I decided to not change this for now.