-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9941 from Microsoft/configuration-inheritance
Configuration Inheritance
- Loading branch information
Showing
11 changed files
with
319 additions
and
13 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| /// <reference path="..\harness.ts" /> | ||
| /// <reference path="..\virtualFileSystem.ts" /> | ||
|
|
||
| namespace ts { | ||
| const testContents = { | ||
| "/dev/tsconfig.json": `{ | ||
| "extends": "./configs/base", | ||
| "files": [ | ||
| "main.ts", | ||
| "supplemental.ts" | ||
| ] | ||
| }`, | ||
| "/dev/tsconfig.nostrictnull.json": `{ | ||
| "extends": "./tsconfig", | ||
| "compilerOptions": { | ||
| "strictNullChecks": false | ||
| } | ||
| }`, | ||
| "/dev/configs/base.json": `{ | ||
| "compilerOptions": { | ||
| "allowJs": true, | ||
| "noImplicitAny": true, | ||
| "strictNullChecks": true | ||
| } | ||
| }`, | ||
| "/dev/configs/tests.json": `{ | ||
| "compilerOptions": { | ||
| "preserveConstEnums": true, | ||
| "removeComments": false, | ||
| "sourceMap": true | ||
| }, | ||
| "exclude": [ | ||
| "../tests/baselines", | ||
| "../tests/scenarios" | ||
| ], | ||
| "include": [ | ||
| "../tests/**/*.ts" | ||
| ] | ||
| }`, | ||
| "/dev/circular.json": `{ | ||
| "extends": "./circular2", | ||
| "compilerOptions": { | ||
| "module": "amd" | ||
| } | ||
| }`, | ||
| "/dev/circular2.json": `{ | ||
| "extends": "./circular", | ||
| "compilerOptions": { | ||
| "module": "commonjs" | ||
| } | ||
| }`, | ||
| "/dev/missing.json": `{ | ||
| "extends": "./missing2", | ||
| "compilerOptions": { | ||
| "types": [] | ||
| } | ||
| }`, | ||
| "/dev/failure.json": `{ | ||
| "extends": "./failure2.json", | ||
| "compilerOptions": { | ||
| "typeRoots": [] | ||
| } | ||
| }`, | ||
| "/dev/failure2.json": `{ | ||
| "excludes": ["*.js"] | ||
| }`, | ||
| "/dev/configs/first.json": `{ | ||
| "extends": "./base", | ||
| "compilerOptions": { | ||
| "module": "commonjs" | ||
| }, | ||
| "files": ["../main.ts"] | ||
| }`, | ||
| "/dev/configs/second.json": `{ | ||
| "extends": "./base", | ||
| "compilerOptions": { | ||
| "module": "amd" | ||
| }, | ||
| "include": ["../supplemental.*"] | ||
| }`, | ||
| "/dev/extends.json": `{ "extends": 42 }`, | ||
| "/dev/extends2.json": `{ "extends": "configs/base" }`, | ||
| "/dev/main.ts": "", | ||
| "/dev/supplemental.ts": "", | ||
| "/dev/tests/unit/spec.ts": "", | ||
| "/dev/tests/utils.ts": "", | ||
| "/dev/tests/scenarios/first.json": "", | ||
| "/dev/tests/baselines/first/output.ts": "" | ||
| }; | ||
|
|
||
| const caseInsensitiveBasePath = "c:/dev/"; | ||
| const caseInsensitiveHost = new Utils.MockParseConfigHost(caseInsensitiveBasePath, /*useCaseSensitiveFileNames*/ false, mapObject(testContents, (key, content) => [`c:${key}`, content])); | ||
|
|
||
| const caseSensitiveBasePath = "/dev/"; | ||
| const caseSensitiveHost = new Utils.MockParseConfigHost(caseSensitiveBasePath, /*useCaseSensitiveFileNames*/ true, testContents); | ||
|
|
||
| function verifyDiagnostics(actual: Diagnostic[], expected: {code: number, category: DiagnosticCategory, messageText: string}[]) { | ||
| assert.isTrue(expected.length === actual.length, `Expected error: ${JSON.stringify(expected)}. Actual error: ${JSON.stringify(actual)}.`); | ||
| for (let i = 0; i < actual.length; i++) { | ||
| const actualError = actual[i]; | ||
| const expectedError = expected[i]; | ||
| assert.equal(actualError.code, expectedError.code, "Error code mismatch"); | ||
| assert.equal(actualError.category, expectedError.category, "Category mismatch"); | ||
| assert.equal(flattenDiagnosticMessageText(actualError.messageText, "\n"), expectedError.messageText); | ||
| } | ||
| } | ||
|
|
||
| describe("Configuration Extension", () => { | ||
| forEach<[string, string, Utils.MockParseConfigHost], void>([ | ||
| ["under a case insensitive host", caseInsensitiveBasePath, caseInsensitiveHost], | ||
| ["under a case sensitive host", caseSensitiveBasePath, caseSensitiveHost] | ||
| ], ([testName, basePath, host]) => { | ||
| function testSuccess(name: string, entry: string, expected: CompilerOptions, expectedFiles: string[]) { | ||
| it(name, () => { | ||
| const {config, error} = ts.readConfigFile(entry, name => host.readFile(name)); | ||
| assert(config && !error, flattenDiagnosticMessageText(error && error.messageText, "\n")); | ||
| const parsed = ts.parseJsonConfigFileContent(config, host, basePath, {}, entry); | ||
| assert(!parsed.errors.length, flattenDiagnosticMessageText(parsed.errors[0] && parsed.errors[0].messageText, "\n")); | ||
| expected.configFilePath = entry; | ||
| assert.deepEqual(parsed.options, expected); | ||
| assert.deepEqual(parsed.fileNames, expectedFiles); | ||
| }); | ||
| } | ||
|
|
||
| function testFailure(name: string, entry: string, expectedDiagnostics: {code: number, category: DiagnosticCategory, messageText: string}[]) { | ||
| it(name, () => { | ||
| const {config, error} = ts.readConfigFile(entry, name => host.readFile(name)); | ||
| assert(config && !error, flattenDiagnosticMessageText(error && error.messageText, "\n")); | ||
| const parsed = ts.parseJsonConfigFileContent(config, host, basePath, {}, entry); | ||
| verifyDiagnostics(parsed.errors, expectedDiagnostics); | ||
| }); | ||
| } | ||
|
|
||
| describe(testName, () => { | ||
| testSuccess("can resolve an extension with a base extension", "tsconfig.json", { | ||
| allowJs: true, | ||
| noImplicitAny: true, | ||
| strictNullChecks: true, | ||
| }, [ | ||
| combinePaths(basePath, "main.ts"), | ||
| combinePaths(basePath, "supplemental.ts"), | ||
| ]); | ||
|
|
||
| testSuccess("can resolve an extension with a base extension that overrides options", "tsconfig.nostrictnull.json", { | ||
| allowJs: true, | ||
| noImplicitAny: true, | ||
| strictNullChecks: false, | ||
| }, [ | ||
| combinePaths(basePath, "main.ts"), | ||
| combinePaths(basePath, "supplemental.ts"), | ||
| ]); | ||
|
|
||
| testFailure("can report errors on circular imports", "circular.json", [ | ||
| { | ||
| code: 18000, | ||
| category: DiagnosticCategory.Error, | ||
| messageText: `Circularity detected while resolving configuration: ${[combinePaths(basePath, "circular.json"), combinePaths(basePath, "circular2.json"), combinePaths(basePath, "circular.json")].join(" -> ")}` | ||
| } | ||
| ]); | ||
|
|
||
| testFailure("can report missing configurations", "missing.json", [{ | ||
| code: 6096, | ||
| category: DiagnosticCategory.Message, | ||
| messageText: `File './missing2' does not exist.` | ||
| }]); | ||
|
|
||
| testFailure("can report errors in extended configs", "failure.json", [{ | ||
| code: 6114, | ||
| category: DiagnosticCategory.Error, | ||
| messageText: `Unknown option 'excludes'. Did you mean 'exclude'?` | ||
| }]); | ||
|
|
||
| testFailure("can error when 'extends' is not a string", "extends.json", [{ | ||
| code: 5024, | ||
| category: DiagnosticCategory.Error, | ||
| messageText: `Compiler option 'extends' requires a value of type string.` | ||
| }]); | ||
|
|
||
| testFailure("can error when 'extends' is neither relative nor rooted.", "extends2.json", [{ | ||
| code: 18001, | ||
| category: DiagnosticCategory.Error, | ||
| messageText: `The path in an 'extends' options must be relative or rooted.` | ||
| }]); | ||
| }); | ||
| }); | ||
| }); | ||
| } |
Oops, something went wrong.