Skip to content

Commit 75df545

Browse files
committed
Allow using Advanced_Options with --init. Exclude all possible Advanced_Options in tsconfig.json which were NOT defined in command line
1 parent e40f294 commit 75df545

File tree

3 files changed

+75
-1
lines changed

3 files changed

+75
-1
lines changed

src/compiler/commandLineParser.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,12 +1341,21 @@ namespace ts {
13411341
return Array(paddingLength + 1).join(" ");
13421342
}
13431343

1344+
function isAllowedOption({ category, name }: CommandLineOption): boolean {
1345+
// Skip options which do not have a category or have category `Command_line_Options`
1346+
// Exclude all possible `Advanced_Options` in tsconfig.json which were NOT defined in command line
1347+
return category !== undefined
1348+
&& category !== Diagnostics.Command_line_Options
1349+
&& (category !== Diagnostics.Advanced_Options || compilerOptionsMap.has(name));
1350+
}
1351+
13441352
function writeConfigurations() {
13451353
// Filter applicable options to place in the file
13461354
const categorizedOptions = createMultiMap<CommandLineOption>();
13471355
for (const option of optionDeclarations) {
13481356
const { category } = option;
1349-
if (category !== undefined && category !== Diagnostics.Command_line_Options && category !== Diagnostics.Advanced_Options) {
1357+
1358+
if (isAllowedOption(option)) {
13501359
categorizedOptions.add(getLocaleSpecificMessage(category), option);
13511360
}
13521361
}

src/harness/unittests/initializeTSConfig.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,7 @@ namespace ts {
3030
initTSConfigCorrectly("Initialized TSConfig with incorrect compiler option", ["--init", "--someNonExistOption"]);
3131

3232
initTSConfigCorrectly("Initialized TSConfig with incorrect compiler option value", ["--init", "--lib", "nonExistLib,es5,es2015.promise"]);
33+
34+
initTSConfigCorrectly("Initialized TSConfig with advanced options", ["--init", "--declaration", "--declarationDir", "lib", "--skipLibCheck", "--noErrorTruncation"]);
3335
});
3436
}
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"compilerOptions": {
3+
/* Basic Options */
4+
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
5+
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
6+
// "lib": [], /* Specify library files to be included in the compilation. */
7+
// "allowJs": true, /* Allow javascript files to be compiled. */
8+
// "checkJs": true, /* Report errors in .js files. */
9+
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
10+
"declaration": true, /* Generates corresponding '.d.ts' file. */
11+
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
12+
// "sourceMap": true, /* Generates corresponding '.map' file. */
13+
// "outFile": "./", /* Concatenate and emit output to single file. */
14+
// "outDir": "./", /* Redirect output structure to the directory. */
15+
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
16+
// "removeComments": true, /* Do not emit comments to output. */
17+
// "noEmit": true, /* Do not emit outputs. */
18+
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
19+
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
20+
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
21+
22+
/* Strict Type-Checking Options */
23+
"strict": true, /* Enable all strict type-checking options. */
24+
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
25+
// "strictNullChecks": true, /* Enable strict null checks. */
26+
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
27+
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
28+
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
29+
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
30+
31+
/* Additional Checks */
32+
// "noUnusedLocals": true, /* Report errors on unused locals. */
33+
// "noUnusedParameters": true, /* Report errors on unused parameters. */
34+
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
35+
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
36+
37+
/* Module Resolution Options */
38+
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
39+
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
40+
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
41+
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
42+
// "typeRoots": [], /* List of folders to include type definitions from. */
43+
// "types": [], /* Type declaration files to be included in compilation. */
44+
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
45+
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
46+
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
47+
48+
/* Source Map Options */
49+
// "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
50+
// "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
51+
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
52+
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
53+
54+
/* Experimental Options */
55+
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
56+
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
57+
58+
/* Advanced Options */
59+
"noErrorTruncation": true, /* Do not truncate error messages. */
60+
"declarationDir": "lib", /* Output directory for generated declaration files. */
61+
"skipLibCheck": true /* Skip type checking of declaration files. */
62+
}
63+
}

0 commit comments

Comments
 (0)