lib: make safeRequire() return tuple
#226
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
aqrln
reviewed
Jun 20, 2017
lib/record-serialization.js
Outdated
| @@ -12,7 +12,7 @@ module.exports = jsrs; | |||
| // one of our priorities to optimize it. | |||
| const USE_NATIVE_SERIALIZER = false; | |||
|
|
|||
| const jstpNative = | |||
| const [error, jstpNative] = | |||
| safeRequire('../build/Release/jstp') || | |||
aqrln
reviewed
Jun 20, 2017
test/node/common-safe-require.js
Outdated
|
|
||
| test.equal(common.safeRequire(nonExistingModule), null, | ||
| test.equal(common.safeRequire(nonExistingModule)[1], null, |
aqrln
reviewed
Jun 20, 2017
test/node/common-safe-require.js
Outdated
| @@ -7,7 +7,7 @@ const common = require('../../lib/common'); | |||
| const existingModule = 'fs'; | |||
| const nonExistingModule = '__non_existing_module__'; | |||
|
|
|||
| test.ok(common.safeRequire(existingModule), 'must require existing module'); | |||
| test.ok(common.safeRequire(existingModule), 'must require existing module'[1]); | |||
There was a problem hiding this comment.
I believe you didn't mean to compare an array with 'm' ;)
There was a problem hiding this comment.
That's error message =). But yeah it was funny.
There was a problem hiding this comment.
ah, it's not a comparison, but a test message
lundibundi
reviewed
Jun 20, 2017
test/node/common-safe-require.js
Outdated
| @@ -7,7 +7,7 @@ const common = require('../../lib/common'); | |||
| const existingModule = 'fs'; | |||
| const nonExistingModule = '__non_existing_module__'; | |||
|
|
|||
| test.ok(common.safeRequire(existingModule), 'must require existing module'); | |||
| test.ok(common.safeRequire(existingModule), 'must require existing module'[1]); | |||
There was a problem hiding this comment.
I think [1] should be in a different place =).
test/node/common-safe-require.js
Outdated
|
|
||
| test.equal(common.safeRequire(nonExistingModule), null, | ||
| test.equal(common.safeRequire(nonExistingModule)[1], null, |
There was a problem hiding this comment.
Why don't we test this with notOk as the one above is tested with ok?
UPD: @nechaido ping.
belochub
reviewed
Jun 20, 2017
lib/record-serialization.js
Outdated
| let [error, jstpNative] = safeRequire('../build/Release/jstp'); | ||
|
|
||
| if (error) { | ||
| [error, jstpNative] = safeRequire('../build/Debug/jstp'); |
There was a problem hiding this comment.
error will be overwritten here, losing the original error.
There was a problem hiding this comment.
Yeah, I'd rather only show the error that occurred trying to load the release build when both failed if we opt for showing only one. Alternatively, we may show both, like we do now. I'm fine with it both ways, slightly leaning towards the former one.
|
Alternative PR: #216. Whichever wins the race will land on master. |
nechaido
force-pushed
the
safe-require-return-tuple
branch
from
b7bfda3
to
805b708
Compare
belochub
approved these changes
Jun 21, 2017
aqrln
approved these changes
Jun 21, 2017
lundibundi
approved these changes
Jun 22, 2017
|
Landed in 35c6a8c. |
Merged
belochub
pushed a commit
to metarhia/mdsf
that referenced
this pull request
Jul 19, 2018
Refs: metarhia/jstp#216 Closes: metarhia/jstp#188 PR-URL: metarhia/jstp#226 Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Mykola Bilochub <nbelochub@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
belochub
pushed a commit
to metarhia/mdsf
that referenced
this pull request
Jul 19, 2018
Refs: metarhia/jstp#216 Closes: metarhia/jstp#188 PR-URL: metarhia/jstp#226 Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Mykola Bilochub <nbelochub@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
belochub
pushed a commit
to metarhia/mdsf
that referenced
this pull request
Jul 21, 2018
Refs: metarhia/jstp#216 Closes: metarhia/jstp#188 PR-URL: metarhia/jstp#226 Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Mykola Bilochub <nbelochub@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
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.
As we discussed in #216 I add a PR that fixes #188 using different approach.
Refs:#216.
Closes: #188.