vm: move some common tests to the top #18816
Closed
Conversation
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
BridgeAR
reviewed
Feb 16, 2018
lib/vm.js
Outdated
| @@ -79,21 +79,21 @@ Script.prototype.runInNewContext = function(sandbox, options) { | |||
| return this.runInContext(context, options); | |||
| }; | |||
|
|
|||
| function validateType(prop, propName, type = 'string') { | |||
| if (prop !== undefined && | |||
| typeof prop !== type) { | |||
There was a problem hiding this comment.
Nit: this should fit on the line above.
lib/vm.js
Outdated
| @@ -79,21 +79,21 @@ Script.prototype.runInNewContext = function(sandbox, options) { | |||
| return this.runInContext(context, options); | |||
| }; | |||
|
|
|||
| function validateType(prop, propName, type = 'string') { | |||
There was a problem hiding this comment.
The type is always a string and setting a default value is a minor overhead. So instead, please just directly use 'string' in this function.
There was a problem hiding this comment.
In that case, please change the function name to validateString.
lib/vm.js
Outdated
| 'string', contextOptions.origin); | ||
| } | ||
| validateType(contextOptions.name, 'options.contextName'); | ||
| validateType(contextOptions.origin, 'options.contextOrigin'); | ||
| return contextOptions; |
There was a problem hiding this comment.
When you are here: would you be so kind and rewrite this to:
if (options) {
const contextOptions = {
name: ...
...
};
validateType(contextOptions.name, 'contextOptions.name');
validate...
return contextOptions;
}
return {};
lib/vm.js
Outdated
| 'string', contextOptions.origin); | ||
| } | ||
| validateType(contextOptions.name, 'options.contextName'); | ||
| validateType(contextOptions.origin, 'options.contextOrigin'); |
There was a problem hiding this comment.
Please do not change the error message itself here. So please stick to contextOptions.name and contextOptions.origin.
There was a problem hiding this comment.
@BridgeAR, the error messages are as it was.
lib/vm.js
Outdated
| throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'options.origin', | ||
| 'string', options.origin); | ||
| } else { | ||
| validateType(options.name, 'options.name'); |
There was a problem hiding this comment.
Please keep this as it was. Otherwise there is an extra check from now on.
BridgeAR
approved these changes
Feb 16, 2018
lib/vm.js
Outdated
| if (prop !== undefined && typeof prop !== 'string') | ||
| throw new errors.TypeError('ERR_INVALID_ARG_TYPE', propName, | ||
| 'string', prop); | ||
| } | ||
| function getContextOptions(options) { |
There was a problem hiding this comment.
Please add a new line in between functions.
BridgeAR
added
the
author ready
TimothyGu
approved these changes
Feb 17, 2018
lpinca
approved these changes
Feb 19, 2018
BridgeAR
pushed a commit
to BridgeAR/node
that referenced
this pull request
Feb 22, 2018
PR-URL: nodejs#18816 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
|
Landed in 3cb3618 🎉 |
addaleax
pushed a commit
to addaleax/node
that referenced
this pull request
Feb 26, 2018
PR-URL: nodejs#18816 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
addaleax
pushed a commit
that referenced
this pull request
Feb 26, 2018
PR-URL: #18816 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Closed
MayaLekova
pushed a commit
to MayaLekova/node
that referenced
this pull request
May 8, 2018
PR-URL: nodejs#18816 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Noticed some repeated tests, extract it into a function .
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
vm