Skip to content

Commit 20a9999

Browse files
ortaorta
committed
Gets tests green
1 parent 29a97f1 commit 20a9999

File tree

18 files changed

+203
-932
lines changed

18 files changed

+203
-932
lines changed

‎src/compiler/commandLineParser.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2212,11 +2212,8 @@ namespace ts {
22122212

22132213
function isAllowedOption({ category, name }: CommandLineOption): boolean {
22142214
// Skip options which do not have a category or have categories which are more niche
2215-
// Exclude all possible `Advanced_Options` in tsconfig.json which were NOT defined in command line
22162215
const categoriesToSkip = [Diagnostics.Command_line_Options, Diagnostics.Editor_Support, Diagnostics.Debugging_the_Compiler, Diagnostics.Backwards_Compatibility, Diagnostics.Watch_and_Build_Modes];
2217-
return category !== undefined
2218-
&& !categoriesToSkip.includes(category)
2219-
&& (category !== Diagnostics.Editor_Support || compilerOptionsMap.has(name));
2216+
return category !== undefined && (!categoriesToSkip.includes(category) || compilerOptionsMap.has(name));
22202217
}
22212218

22222219
function writeConfigurations() {

‎src/testRunner/unittests/config/commandLineParsing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ namespace ts {
515515
name: "optionName",
516516
type: type(),
517517
isTSConfigOnly: true,
518-
category: Diagnostics.Basic_Options,
518+
category: Diagnostics.Backwards_Compatibility,
519519
description: Diagnostics.Enable_project_compilation,
520520
}
521521
];

‎tests/baselines/reference/showConfig/Shows tsconfig for single option/locale/tsconfig.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"compilerOptions": {
3-
"locale": "someString"
4-
}
2+
"compilerOptions": {}
53
}

‎tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json

Lines changed: 11 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,20 @@
22
"compilerOptions": {
33
/* Visit https://aka.ms/tsconfig.json to read more about this file */
44

5-
/* Basic Options */
6-
// "incremental": true, /* Enable incremental compilation */
7-
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
8-
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
9-
// "lib": [], /* Specify library files to be included in the compilation. */
10-
// "allowJs": true, /* Allow javascript files to be compiled. */
11-
// "checkJs": true, /* Report errors in .js files. */
12-
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
13-
// "declaration": true, /* Generates corresponding '.d.ts' file. */
14-
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
15-
// "sourceMap": true, /* Generates corresponding '.map' file. */
16-
// "outFile": "./", /* Concatenate and emit output to single file. */
17-
// "outDir": "./", /* Redirect output structure to the directory. */
18-
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
19-
// "composite": true, /* Enable project compilation */
20-
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
21-
// "removeComments": true, /* Do not emit comments to output. */
22-
// "noEmit": true, /* Do not emit outputs. */
23-
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
24-
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
25-
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
5+
/* Language */
6+
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
267

27-
/* Strict Type-Checking Options */
28-
"strict": true, /* Enable all strict type-checking options. */
29-
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
30-
// "strictNullChecks": true, /* Enable strict null checks. */
31-
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
32-
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
33-
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
34-
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
35-
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
8+
/* Modules */
9+
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
3610

37-
/* Additional Checks */
38-
// "noUnusedLocals": true, /* Report errors on unused locals. */
39-
// "noUnusedParameters": true, /* Report errors on unused parameters. */
40-
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
41-
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
42-
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
43-
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
11+
/* Strictness */
12+
"strict": true, /* Enable all strict type-checking options. */
4413

45-
/* Module Resolution Options */
46-
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
47-
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
48-
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
49-
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
50-
// "typeRoots": [], /* List of folders to include type definitions from. */
51-
// "types": [], /* Type declaration files to be included in compilation. */
52-
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
53-
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
54-
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
55-
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
14+
/* Interop Constraints */
15+
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
16+
"forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
5617

57-
/* Source Map Options */
58-
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
59-
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
60-
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
61-
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
62-
63-
/* Experimental Options */
64-
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
65-
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
66-
67-
/* Advanced Options */
68-
"skipLibCheck": true, /* Skip type checking of declaration files. */
69-
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
18+
/* Type Checking */
19+
"skipLibCheck": true /* Skip type checking of declaration files. */
7020
}
7121
}

‎tests/baselines/reference/tsConfig/Initialized TSConfig with advanced options/tsconfig.json

Lines changed: 15 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,25 @@
22
"compilerOptions": {
33
/* Visit https://aka.ms/tsconfig.json to read more about this file */
44

5-
/* Basic Options */
6-
// "incremental": true, /* Enable incremental compilation */
7-
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
8-
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
9-
// "lib": [], /* Specify library files to be included in the compilation. */
10-
// "allowJs": true, /* Allow javascript files to be compiled. */
11-
// "checkJs": true, /* Report errors in .js files. */
12-
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
13-
"declaration": true, /* Generates corresponding '.d.ts' file. */
14-
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
15-
// "sourceMap": true, /* Generates corresponding '.map' file. */
16-
// "outFile": "./", /* Concatenate and emit output to single file. */
17-
// "outDir": "./", /* Redirect output structure to the directory. */
18-
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
19-
// "composite": true, /* Enable project compilation */
20-
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
21-
// "removeComments": true, /* Do not emit comments to output. */
22-
// "noEmit": true, /* Do not emit outputs. */
23-
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
24-
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
25-
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
5+
/* Language */
6+
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
267

27-
/* Strict Type-Checking Options */
28-
"strict": true, /* Enable all strict type-checking options. */
29-
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
30-
// "strictNullChecks": true, /* Enable strict null checks. */
31-
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
32-
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
33-
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
34-
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
35-
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
8+
/* Modules */
9+
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
3610

37-
/* Additional Checks */
38-
// "noUnusedLocals": true, /* Report errors on unused locals. */
39-
// "noUnusedParameters": true, /* Report errors on unused parameters. */
40-
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
41-
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
42-
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
43-
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
11+
/* Emit */
12+
"declaration": true, /* Generates corresponding '.d.ts' file. */
13+
"declarationDir": "lib", /* Output directory for generated declaration files. */
4414

45-
/* Module Resolution Options */
46-
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
47-
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
48-
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
49-
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
50-
// "typeRoots": [], /* List of folders to include type definitions from. */
51-
// "types": [], /* Type declaration files to be included in compilation. */
52-
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
53-
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
54-
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
55-
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
15+
/* Strictness */
16+
"strict": true, /* Enable all strict type-checking options. */
5617

57-
/* Source Map Options */
58-
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
59-
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
60-
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
61-
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
18+
/* Interop Constraints */
19+
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
20+
"forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
6221

63-
/* Experimental Options */
64-
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
65-
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
66-
67-
/* Advanced Options */
68-
"noErrorTruncation": true, /* Do not truncate error messages. */
69-
"declarationDir": "lib", /* Output directory for generated declaration files. */
70-
"skipLibCheck": true, /* Skip type checking of declaration files. */
71-
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
22+
/* Type Checking */
23+
"noErrorTruncation": true, /* Do not truncate error messages. */
24+
"skipLibCheck": true /* Skip type checking of declaration files. */
7225
}
7326
}

0 commit comments

Comments
 (0)