Skip to content

Commit f6c9c1b

Browse files
committed
Gets tests green
1 parent 29a97f1 commit f6c9c1b

File tree

18 files changed

+809
-533
lines changed

18 files changed

+809
-533
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
];
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: 53 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,68 @@
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 */
5+
/* Language */
76
"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'. */
97
// "lib": [], /* Specify library files to be included in the compilation. */
8+
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
9+
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
10+
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
11+
// "jsxFactory": "", /* Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'. */
12+
// "jsxFragmentFactory": "", /* Specify the JSX fragment factory function to use when targeting 'react' JSX emit with 'jsxFactory' compiler option is specified, e.g. 'Fragment'. */
13+
// "jsxImportSource": "", /* Specify the module specifier to be used to import the `jsx` and `jsxs` factory functions from. eg, react */
14+
// "resolveJsonModule": true, /* Include modules imported with '.json' extension */
15+
// "noLib": true, /* Do not include the default library file (lib.d.ts). */
16+
17+
/* Modules */
18+
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
19+
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
20+
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
21+
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
22+
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
23+
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
24+
// "typeRoots": [], /* List of folders to include type definitions from. */
25+
// "types": [], /* Type declaration files to be included in compilation. */
26+
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
27+
// "noResolve": true, /* Do not add triple-slash references or imported modules to the list of compiled files. */
28+
29+
/* JavaScript Support */
1030
// "allowJs": true, /* Allow javascript files to be compiled. */
1131
// "checkJs": true, /* Report errors in .js files. */
12-
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
32+
// "maxNodeModuleJsDepth": 1, /* The maximum dependency depth to search under node_modules and load JavaScript files. */
33+
34+
/* Emit */
1335
// "declaration": true, /* Generates corresponding '.d.ts' file. */
1436
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
37+
// "emitDeclarationOnly": true, /* Only emit '.d.ts' declaration files. */
1538
// "sourceMap": true, /* Generates corresponding '.map' file. */
1639
// "outFile": "./", /* Concatenate and emit output to single file. */
1740
// "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 */
2141
// "removeComments": true, /* Do not emit comments to output. */
2242
// "noEmit": true, /* Do not emit outputs. */
2343
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
2444
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
45+
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
46+
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
47+
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
48+
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
49+
// "newLine": "crlf", /* Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix). */
50+
// "stripInternal": true, /* Do not emit declarations for code that has an '@internal' annotation. */
51+
// "noImplicitUseStrict": true, /* Do not emit 'use strict' directives in module output. */
52+
// "noEmitHelpers": true, /* Do not generate custom helper functions like '__extends' in compiled output. */
53+
// "noEmitOnError": true, /* Do not emit outputs if any errors were reported. */
54+
// "declarationDir": "./", /* Output directory for generated declaration files. */
55+
// "useDefineForClassFields": true, /* Emit class fields with Define instead of Set. */
56+
57+
/* Interop Constraints */
58+
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */
2559
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
60+
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
61+
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
62+
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
63+
// "preserveConstEnums": true, /* Do not erase const enum declarations in generated code. */
64+
"forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
2665

27-
/* Strict Type-Checking Options */
66+
/* Strictness */
2867
"strict": true, /* Enable all strict type-checking options. */
2968
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
3069
// "strictNullChecks": true, /* Enable strict null checks. */
@@ -34,38 +73,18 @@
3473
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
3574
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
3675

37-
/* Additional Checks */
76+
/* Strictness - Linters */
3877
// "noUnusedLocals": true, /* Report errors on unused locals. */
3978
// "noUnusedParameters": true, /* Report errors on unused parameters. */
4079
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
4180
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
4281
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
4382
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
83+
// "allowUnusedLabels": true, /* Do not report errors on unused labels. */
84+
// "allowUnreachableCode": true, /* Do not report errors on unreachable code. */
4485

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. */
56-
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. */
86+
/* Type Checking */
87+
// "noErrorTruncation": true, /* Do not truncate error messages. */
88+
"skipLibCheck": true /* Skip type checking of declaration files. */
7089
}
7190
}

0 commit comments

Comments
 (0)