-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Fix 10289: correctly generate tsconfig.json with --lib #10355
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
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1de0342
Separate generate tsconfig into its own function and implement init w…
ff3251e
Add tests and baselines; Update function name
19539bd
Use new MapLike interstead. Update unittest
bdd6bc0
Update JakeFile
cf643dd
Add tests for incorrect cases
7225973
Merge branch 'master' into fix10289
22d6e82
Address PR : remove explicity write node_modules
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
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
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
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,44 @@ | ||
/// <reference path="..\harness.ts" /> | ||
/// <reference path="..\..\compiler\commandLineParser.ts" /> | ||
|
||
namespace ts { | ||
describe("initTSConfig", () => { | ||
function initTSConfigCorrectly(name: string, commandLinesArgs: string[]) { | ||
describe(name, () => { | ||
const commandLine = parseCommandLine(commandLinesArgs); | ||
const initResult = generateTSConfig(commandLine.options, commandLine.fileNames); | ||
const outputFileName = `tsConfig/${name.replace(/[^a-z0-9\-. ]/ig, "")}/tsconfig.json`; | ||
|
||
it(`Correct output for ${outputFileName}`, () => { | ||
Harness.Baseline.runBaseline("Correct output", outputFileName, () => { | ||
if (initResult) { | ||
return JSON.stringify(initResult, undefined, 4); | ||
} | ||
else { | ||
// This can happen if compiler recieve invalid compiler-options | ||
/* tslint:disable:no-null-keyword */ | ||
return null; | ||
/* tslint:enable:no-null-keyword */ | ||
} | ||
}); | ||
}); | ||
}); | ||
} | ||
|
||
initTSConfigCorrectly("Default initialized TSConfig", ["--init"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with files options", ["--init", "file0.st", "file1.ts", "file2.ts"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with boolean value compiler options", ["--init", "--noUnusedLocals"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with enum value compiler options", ["--init", "--target", "es5", "--jsx", "react"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with list compiler options", ["--init", "--types", "jquery,mocha"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with list compiler options with enum value", ["--init", "--lib", "es5,es2015.core"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with incorrect compiler option", ["--init", "--someNonExistOption"]); | ||
|
||
initTSConfigCorrectly("Initialized TSConfig with incorrect compiler option value", ["--init", "--lib", "nonExistLib,es5,es2015.promise"]); | ||
}); | ||
} |
8 changes: 8 additions & 0 deletions
8
tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json
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,8 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
...reference/tsConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json
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,9 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false, | ||
"noUnusedLocals": true | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
...es/reference/tsConfig/Initialized TSConfig with enum value compiler options/tsconfig.json
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,9 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false, | ||
"jsx": "react" | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
tests/baselines/reference/tsConfig/Initialized TSConfig with files options/tsconfig.json
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,13 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false | ||
}, | ||
"files": [ | ||
"file0.st", | ||
"file1.ts", | ||
"file2.ts" | ||
] | ||
} |
12 changes: 12 additions & 0 deletions
12
...eference/tsConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json
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,12 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false, | ||
"lib": [ | ||
"es5", | ||
"es2015.promise" | ||
] | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
...ines/reference/tsConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json
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,8 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
...ce/tsConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json
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,12 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false, | ||
"lib": [ | ||
"es5", | ||
"es2015.core" | ||
] | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
...aselines/reference/tsConfig/Initialized TSConfig with list compiler options/tsconfig.json
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,12 @@ | ||
{ | ||
"compilerOptions": { | ||
"module": "commonjs", | ||
"target": "es5", | ||
"noImplicitAny": false, | ||
"sourceMap": false, | ||
"types": [ | ||
"jquery", | ||
"mocha" | ||
] | ||
} | ||
} |
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.
customTypeMap
is going to be undefined here forrootDirs
, and i believe this will causegetNameOfCompilerOptionValue
to throw.Uh oh!
There was an error while loading. Please reload this page.
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.
it actually won't be because for
rootDirs
will havecustomTypeMap
be undefined (asgetCustomTypeMapOfCommandLineOption
recursively call when you have "list" type and it will then return undefined) so it will already be catched hereThe reason we still have check for type of "list" here is that we will know whether to iterate over input or not
Unrelated but your comment reminds me is to add tests for invalid option and make sure we generate something that make sense. Should error in the cases of incorrect input and generate results? Currently we will just ignore those incorrect inputs
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 am a bit confused. the type of rootDirs is list, then we call
getCustomTypeMapOfCommandLineOption
with the element, the next time around the type of the element isstring
, so we returnundefined
. we can talk in person if you have time.