-
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
src: don't abort when package.json is a directory #18270
Conversation
@@ -474,14 +481,12 @@ static void InternalModuleReadJSON(const FunctionCallbackInfo<Value>& args) { | |||
numchars = uv_fs_read(loop, &read_req, fd, &buf, 1, offset, nullptr); | |||
uv_fs_req_cleanup(&read_req); | |||
|
|||
CHECK_GE(numchars, 0); | |||
if (numchars < 0) | |||
return; |
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.
please return the empty string so that it gets put into packageMainCache
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.
That doesn't sound right. ''
is for a package.json without a main
property, see the bottom of this function.
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.
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.
Yes, but that's for when we found (and read) a package.json. That's not the case here, it's closer to an ENOENT or EPERM condition.
edit: to be clear, that's the if (json === undefined) return false
a few lines up.
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 disagree, we found a package.json
it was a directory though.
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.
Exactly, not a file we can parse.
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.
The intent of this change is around package.json/
directories. This mimics a package.json
that was found but has no relevant "main"
entry : https://github.com/bnoordhuis/io.js/blob/ec93af3bd79c89088f832f72d788225abb106910/src/node_file.cc#L496-L497 . We can discern the "main"
we want to represent for it without the need to parse, and returning ""
causes the packageMainCache
to correctly store the falsey value to bail the module system.
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'm kind of done arguing but I'll address your last point: by your logic errors such as EPERM should also be interpreted as meaning "package.json without a main entry" - but we don't do that and rightly so.
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.
EPERM is different, you can EPERM a directory. We can inspect this entity on the file system.
merging to my PR. would like to see more cooperation towards mentorship in future. |
Heads up, I plan on landing this later today (without @bmeck's suggestion) so I can move forward with work that depends on it. |
@bnoordhuis I disagree on landing it, but would like to know if your block required the difference in our opinions. |
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.
explanation of landing difference
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.
LGTM as this is.
Given that I’d expect directories called package.json
to almost never show up in the real world, I’m okay with tending towards semantical correctness and not entering the entry into the cache.
(I’d also be okay with the other approach.)
@addaleax falsey values put into the cache don't even work today, hence my need of rereview of the "parent" PR. I still think semantics are closer to a file with empty content than a permissions error since we can inspect the entity on disk. |
@bmeck I disagree with your last statement. Also, is there any practical difference? |
Then we are at an impasse. I feel rather strongly one way, and others feel another way.
If it gets put into the cache or not, so C++ calls back into the function / stats. Likelyhood of this situation occurring is low but seems relevant still. Of note we also return |
I don't understand the question. What block? |
|
Still not sure I'm following... the work I'm referring to is unrelated to the module system - I want to factor out file reading in C++. |
So it can move forward without this PR? |
No, because I want to repurpose code that this PR touches. |
If it is not dependent on the module system, but needs some code this PR touches, Would your refactor be any different, due to making the As an alternative I'd also be fine removing The consistency between the two is my real issue with not returning |
I guess both PRs can go to tsc-review if we are stuck as well. |
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 seems good to me, the function is returning the package.json contents, so an empty return corresponding to no package.json file seems sensible in terms of the function's operation.
That said, the lack of a package.json can be cached just like the package.json itself, which doesn't currently seem to be the case. Having this scenario register into the cache may be a worthwhile followup PR especially with the ESM loader package.json checks which we should be getting to share this cache as well.
Cache of all package.json situations seems fine to me, but my concern is we don't have a clear definition with what it means to be an error. We have:
I'm trying to figure out how to make this more internally consistent: 1 doesn't cache errors, but doesn't treat it as having a value. I would like to choose one of 1, 2, 3, or caching the error and throwing as a consistent behavior with a personal preference on always caching the results. I think this preference is from working with ESM to a small extent that by spec caches errors permanently when importing other modules. |
@bmeck Can you retract your red X? It's fine if you want to discuss semantics but please open a new issue. It shouldn't hold up a bug fix. |
@bnoordhuis we have a disagreement, so no. Per stopping fixes, you also keep a red X on my PR. Your choice to open a new PR and not contribute to the original makes this rather hard as well. Maybe keeping things in one place would have been better, but now we have 2 PRs that neither of us likes apparently. One that does acknowledge both contributors involved and solved the review comments. You can remove your X on mine or take one of the 2 suggestions above we can land either PR. In the future, I highly recommend a different approach to superceding PRs be looked into as your behavior of open a PR that only you commit to ontop of mine has happened a couple times and this scenario seems to be common that you give me a red X and tell me that I am blocking progress or have even insulted me in the past. |
Well, okay then. @nodejs/tsc Please weigh in. |
I think we should treat this the same as ENOENT here and make all of this more consistent in a subsequent PR. |
Fixes: #8307
No overhead alternative to #18261.
CI: https://ci.nodejs.org/job/node-test-commit/15553/