-
-
Notifications
You must be signed in to change notification settings - Fork 35.4k
fs: fix always return promise from fs.openAsBlob
#62655
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
Open
mattskel
wants to merge
3
commits into
nodejs:main
Choose a base branch
from
mattskel:fix-fs-api-promise-based-contract
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+28
−2
Open
Changes from all commits
Commits
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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| 'use strict'; | ||
|
|
||
| const assert = require('assert'); | ||
| const fs = require('fs'); | ||
|
|
||
| // Verify invalid paths throw synchronously and return a Promise | ||
| (async () => { | ||
| let promise; | ||
| assert.doesNotThrow(() => { promise = fs.openAsBlob('does-not-exist'); }); | ||
| assert.strictEqual(typeof promise?.then, 'function'); | ||
| await assert.rejects(promise, { code: 'ERR_INVALID_ARG_VALUE' }); | ||
| })(); | ||
|
|
||
|
|
||
| // Verify that invalid arguments throw synchronously and return a Promise | ||
| (async () => { | ||
| let promise; | ||
| assert.doesNotThrow(() => { promise = fs.openAsBlob(123); }); | ||
| assert.strictEqual(typeof promise?.then, 'function'); | ||
| await assert.rejects(promise, { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| })(); |
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 can be done in a one-liner by substituting
PromiseResolveforPromiseTrynowadays. (Though idk whether the primordial forPromise.tryis already defined.)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.
@Slayer95 I tried implementing Promise.try. I tried adding the primordial
PromiseTrybut from what I could tellPromise.trywas not available when primordials were built. I assume this is due to it being a relatively new feature. I also tried using thePromiseprimordial directly and this did work, but from what I understand thePromiseprimordial is not safe from monkey-patching so I abandoned this approach.I have updated the approach to wrap the entire functional block in try/catch. I think this is more inline with the original issue than the previous implementation and ensures the function always returns a promise. Plus I think to achieve that with the
PromiseTryapproach could be a bit hard to read.I also replaced
Promise.rejectwith the primordial for consistency.Let me know what you think of this updated approach.
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.
Your new approach would be equivalent to just making
openAsBlobasync, wouldn't it?Now, however, there are two error-handling camps:
While I sympathize with camp 1, I think mixing throws and rejections is a huge no-no, since it's effectively mixing sync with async, violating function coloring rules.
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.
I have reverted the try/catch changes as well as added tests.