-
-
Notifications
You must be signed in to change notification settings - Fork 480
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
fix: Improve cleanPath
platform compatability
#249
base: master
Are you sure you want to change the base?
Conversation
doctoc.js
Outdated
, minimist = require('minimist') | ||
, file = require('./lib/file') | ||
, transform = require('./lib/transform') | ||
, files; | ||
|
||
function cleanPath(path) { | ||
var homeExpanded = (path.indexOf('~') === 0) ? process.env.HOME + path.substr(1) : path; | ||
var homeExpanded = (path.indexOf('~') === 0) ? path.join(os.homedir() + path.substr(1)) : path; |
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.
While using os.homedir()
indeed improves cross-platform compatibility, I noticed that the introduction of path.join()
deviates slightly from the existing style. I'm unsure if this stylistic change was intended for this PR.
Additionally, if path.join()
is used, it should accept multiple arguments (e.g., path.join(os.homedir(), path.substr(1))
) rather than a single concatenated string.
Let me know your thoughts on this!
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.
Agreed! Embarrassingly, when I first tested these changes I must have forgotten to quote:
$ ./doctoc.js ~/Documents/...
$ ./doctoc.js '~/Documents/...'
I re-ran and it works as expected. I also fixed up the code to allow for using path.join
by renaming the parameter in the function. path.join
is also more cross platform.
function cleanPath(path) { | ||
var homeExpanded = (path.indexOf('~') === 0) ? process.env.HOME + path.substr(1) : path; | ||
function cleanPath(filepath) { | ||
var homeExpanded = (filepath.indexOf('~') === 0) ? path.join(os.homedir(), filepath.substr(1)) : filepath; |
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.
Is renaming path
to filepath
a mistake because it's unrelated to the topic?
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.
Nope it's intentional; I renamed path
to filepath
because the path
parameter in the cleanPath
function was shadowing the path
variable defined at the top of the file (var path = require('path')
). And this caused a bug, since path.join
is a function exported from the path
module - String.prototype.join()
does not exist. A mistake in my testing prevented me from catching this earlier
As I understand both files and folders can be passed to the cleanPath
function, maybe you prefer a different rename?
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.
Oh, okay, I thought it was about the rewrite of process.env.HOME
only, will take a deeper look at it.
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.
Hi @hyperupcall,
I rechecked the change, and it looks like the naming change is helpful but out of the platform compatibility scope, so I'll respectfully suggest two solutions:
- Revert the naming change for now, and once this PR is merged, we can have another pull request to handle it.
- Keep them in this pull request, but rewrite the subject and description to properly and fully cover the naming issue.
It'll be great to ensure the commit history is clean and clear, not just to help debug and understand the code but also to make sure each change is atomic. So, I'll also encourage you to open an issue for the second change and revise its commit message to mention your thoughts. What do you think?
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.
Just a friendly example of how the second commit message might look like:
Rename
path
parameter to avoid shadowingpath
moduleThe
path
parameter in thecleanPath
function was shadowing
thepath
module imported at the top of the file. This caused
issues when callingpath.join()
, as it was mistakenly treated
as a string method. Renaming the parameter tofilepath
resolves
this issue and improves code clarity.
Or a shorter version could be:
Rename
path
to avoid conflict withpath
moduleRenaming the
path
parameter tofilepath
prevents shadowing
the importedpath
module and fixes related issues.
I hope this could be helpful 😄
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.
Approved to change
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.
Copilot reviewed 1 out of 1 changed files in this pull request and generated no suggestions.
Comments skipped due to low confidence (1)
doctoc.js:13
- [nitpick] The parameter name 'filepath' should be consistent with the rest of the codebase. Ensure that 'filepath' is the appropriate name and is used consistently.
function cleanPath(filepath) {
Uses
os.homedir()
since that works better on non-POSIXy platforms.I know this code uses old conventions and methods, so if NodeJS version compatability is a concern (even though they have been unsupported for decades), these are when these functions were added to NodeJS:
v2.3.0
v0.1.16