microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-16 07:13:45 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix paths showConfig, exhaustively test showConfig

Browse Source
This commit is contained in:
Wesley Wigham
2018-12-04 16:24:25 -08:00
parent ee987a25e2
commit 19de47f2db
93 changed files with 590 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/testRunner/unittests/showConfig.ts
View File

@@ -1,12 +1,34 @@
namespace ts {
describe("showTSConfig", () => {
function showTSConfigCorrectly(name: string, commandLinesArgs: string[]) {
describe("showConfig", () => {
function showTSConfigCorrectly(name: string, commandLinesArgs: string[], configJson?: object) {
describe(name, () => {
const commandLine = parseCommandLine(commandLinesArgs);
const initResult = convertToTSConfig(commandLine, `/${name}/tsconfig.json`, { getCurrentDirectory() { return `/${name}`; }, useCaseSensitiveFileNames: true });
const outputFileName = `showConfig/${name.replace(/[^a-z0-9\-. ]/ig, "")}/tsconfig.json`;
const outputFileName = `showConfig/${name.replace(/[^a-z0-9\-./ ]/ig, "")}/tsconfig.json`;
it(`Correct output for ${outputFileName}`, () => {
const cwd = `/${name}`;
const configPath = combinePaths(cwd, "tsconfig.json");
const configContents = configJson ? JSON.stringify(configJson) : undefined;
const configParseHost: ParseConfigFileHost = {
fileExists: path =>
comparePaths(getNormalizedAbsolutePath(path, cwd), configPath) === Comparison.EqualTo ? true : false,
getCurrentDirectory() { return cwd; },
useCaseSensitiveFileNames: true,
onUnRecoverableConfigFileDiagnostic: d => {
throw new Error(flattenDiagnosticMessageText(d.messageText, "\n"));
},
readDirectory() { return []; },
readFile: path =>
comparePaths(getNormalizedAbsolutePath(path, cwd), configPath) === Comparison.EqualTo ? configContents : undefined,
};
let commandLine = parseCommandLine(commandLinesArgs);
if (commandLine.options.project) {
const result = getParsedCommandLineOfConfigFile(commandLine.options.project, commandLine.options, configParseHost);
if (result) {
commandLine = result;
}
}
const initResult = convertToTSConfig(commandLine, configPath, configParseHost);
// tslint:disable-next-line:no-null-keyword
Harness.Baseline.runBaseline(outputFileName, JSON.stringify(initResult, null, 4) + "\n");
});
@@ -30,5 +52,100 @@ namespace ts {
showTSConfigCorrectly("Show TSConfig with incorrect compiler option value", ["--showConfig", "--lib", "nonExistLib,es5,es2015.promise"]);
showTSConfigCorrectly("Show TSConfig with advanced options", ["--showConfig", "--declaration", "--declarationDir", "lib", "--skipLibCheck", "--noErrorTruncation"]);
// Regression test for https://github.com/Microsoft/TypeScript/issues/28836
showTSConfigCorrectly("Show TSConfig with paths and more", ["-p", "tsconfig.json"], {
compilerOptions: {
allowJs: true,
outDir: "./lib",
esModuleInterop: true,
module: "commonjs",
moduleResolution: "node",
target: "ES2017",
sourceMap: true,
baseUrl: ".",
paths: {
"@root/*": ["./*"],
"@configs/*": ["src/configs/*"],
"@common/*": ["src/common/*"],
"*": [
"node_modules/*",
"src/types/*"
]
},
experimentalDecorators: true,
emitDecoratorMetadata: true,
resolveJsonModule: true
},
include: [
"./src/**/*"
]
});
// Bulk validation of all option declarations
for (const option of optionDeclarations) {
if (option.name === "project") continue;
let configObject: object | undefined;
let args: string[];
switch (option.type) {
case "boolean": {
if (option.isTSConfigOnly) {
args = ["-p", "tsconfig.json"];
configObject = { compilerOptions: { [option.name]: true } };
}
else {
args = [`--${option.name}`];
}
break;
}
case "list": {
if (option.isTSConfigOnly) {
args = ["-p", "tsconfig.json"];
configObject = { compilerOptions: { [option.name]: [] } };
}
else {
args = [`--${option.name}`];
}
break;
}
case "string": {
if (option.isTSConfigOnly) {
args = ["-p", "tsconfig.json"];
configObject = { compilerOptions: { [option.name]: "someString" } };
}
else {
args = [`--${option.name}`, "someString"];
}
break;
}
case "number": {
if (option.isTSConfigOnly) {
args = ["-p", "tsconfig.json"];
configObject = { compilerOptions: { [option.name]: 0 } };
}
else {
args = [`--${option.name}`, "0"];
}
break;
}
case "object": {
args = ["-p", "tsconfig.json"];
configObject = { compilerOptions: { [option.name]: {} } };
break;
}
default: {
const val = option.type.keys().next().value;
if (option.isTSConfigOnly) {
args = ["-p", "tsconfig.json"];
configObject = { compilerOptions: { [option.name]: val } };
}
else {
args = [`--${option.name}`, val];
}
break;
}
}
showTSConfigCorrectly(`Shows tsconfig for single option/${option.name}`, args, configObject);
}
});
}
}