fix(commandDir): make dir relative to caller instead of require.main.filename #548
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
| @@ -62,14 +60,11 @@ module.exports = function (yargs, usage, validation) { | |||
| if (~context.files.indexOf(joined)) return visited | |||
| // keep track of visited files in context.files | |||
| context.files.push(joined) | |||
| // map "command path" to the directory path it came from | |||
| // so that dir can be relative in the API | |||
| context.dirs[context.commands.concat(parseCommand(visited.command || commandFromFilename(filename)).cmd).join('|')] = dir | |||
There was a problem hiding this comment.
I love how much this simplifies things; except for the fact that yargs' documentation is terrifyingly verbose at this point, I'm really feeling like the command functionality is knocking it out of the park -- phew, that was hard work wasn't it.
|
love it |
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.
Pull in
get-caller-fileto always interpret the directory given to.commandDir()as relative to the caller. This actually helps simplify the logic a good bit since I no longer need to keep track of a command-to-dir mapping between calls.The
requireis deliberately lazy, so we only load the dependency if.commandDir()is called.There are a few different packages that provide the "get filename of caller" functionality, but I chose
get-caller-filebecause it was the only one that already had passing tests for the range of Node we need and includes Windows tests (callerseems to be popular but is lacking the fuller range of testing, andcaller-pathseems to be broken on Node 4+). An added benefit is thatget-caller-filealso seems to be the smallest and only pulls in one dependency.Fixes #529.