@W-776022@ Give precedence to --tsconfig flag over cwd #131
Conversation
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
The previous implementation would thrown an error if a tsconfig.json file was found in the current working directory and the --tsconfig flag was specified on the command line. Allow this situation, giving precedence to the value provided to --tsconfig.
jbartolotta-sfdc
commented
Jul 7, 2020
| "InvalidNameTsConfigFromOptions": "File '%s' specified by the --tsconfig flag must be named '%s'", | ||
| "NotAFileTsConfigFromOptions": "Unable to find '%s' at location '%s' specified by the 'tsconfig' option", | ||
| "MultipleTsConfigs": "'%s' was found in current directory at location '%s', '%s' was also specified by the --tsconfig flag. Please change to another directory or remove the --tsconfig flag." | ||
| "NotAFileTsConfigFromOptions": "Unable to find '%s' at location '%s' specified by the 'tsconfig' option" |
Contributor
Author
There was a problem hiding this comment.
I checked the the docs/examples for the run command, they don't need to be changed based on this change.
| expect(fileFound).equals(engineOptionsVal); | ||
| }); | ||
|
|
||
|
|
Contributor
Author
There was a problem hiding this comment.
Moved this up negative test cases since it is now allowed.
jfeingold35
requested changes
Jul 7, 2020
Contributor
jfeingold35
left a comment
jfeingold35
left a comment
There was a problem hiding this comment.
This looks good, aside from the one style critique.
Comment on lines
140
to
149
| let foundTsConfig = await this.checkEngineOptionsForTsconfig(engineOptions); | ||
|
|
||
| if (!foundTsConfig) { | ||
| foundTsConfig = await this.checkWorkingDirectoryForTsconfig(); | ||
| if (!foundTsConfig) { | ||
| const cwd = path.resolve(); | ||
| // Not specified in engineOptions and not found in the current directory | ||
| throw SfdxError.create('@salesforce/sfdx-scanner', 'TypescriptEslintStrategy', 'MissingTsConfigFromCwd', | ||
| [TS_CONFIG, cwd, TS_CONFIG]); | ||
| } |
Contributor
There was a problem hiding this comment.
You could replace this with:
let foundTsConfig = (await this.checkEngineBlah()) || (await this.checkWorkingBlah()) || null;
if (!foundTsConfig) {
// Your code that throws an error
}
Contributor
Author
There was a problem hiding this comment.
Thanks, that's cleaner.
rmohan20
approved these changes
Jul 7, 2020
jbartolotta-sfdc
deleted the
d/jbartolotta/W-7760223-param-takes-precedence
branch
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.
The previous implementation would thrown an error if a tsconfig.json
file was found in the current working directory and the --tsconfig flag
was specified on the command line.
Allow this situation, giving precedence to the value provided to --tsconfig.