Checkjs implies allowjs (#40275)

sandersn · web-flow · commit b0011feee125 · 2020-09-01T10:16:08.000-07:00
* Passing --checkJs always sets --allowJS

Even if you have `"allowJs": false`. This is not a useful combination.

Changing this makes the compiler more friendly and easier to describe.

* only set allowjs if not explicitly set

* remove stray newline

* restore bad config error

* use an accessor function instead
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2846,7 +2846,7 @@ namespace ts {
                         && !options.noResolve
                         && i < file.imports.length
                         && !elideImport
-                        && !(isJsFile && !options.allowJs)
+                        && !(isJsFile && !getAllowJSCompilerOption(options))
                         && (isInJSFile(file.imports[i]) || !(file.imports[i].flags & NodeFlags.JSDoc));
 
                     if (elideImport) {
@@ -3160,7 +3160,7 @@ namespace ts {
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");
             }
 
-            if (options.checkJs && !options.allowJs) {
+            if (options.checkJs && !getAllowJSCompilerOption(options)) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"));
             }
 
@@ -3774,7 +3774,7 @@ namespace ts {
             return options.jsx ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
         }
         function needAllowJs() {
-            return options.allowJs || !getStrictOptionValue(options, "noImplicitAny") ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;
+            return getAllowJSCompilerOption(options) || !getStrictOptionValue(options, "noImplicitAny") ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;
         }
         function needResolveJsonModule() {
             return options.resolveJsonModule ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -5933,6 +5933,10 @@ namespace ts {
         return compilerOptions[flag] === undefined ? !!compilerOptions.strict : !!compilerOptions[flag];
     }
 
+    export function getAllowJSCompilerOption(compilerOptions: CompilerOptions): boolean {
+        return compilerOptions.allowJs === undefined ? !!compilerOptions.checkJs : compilerOptions.allowJs;
+    }
+
     export function compilerOptionsAffectSemanticDiagnostics(newOptions: CompilerOptions, oldOptions: CompilerOptions): boolean {
         return oldOptions !== newOptions &&
             semanticDiagnosticsOptionDeclarations.some(option => !isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)));
@@ -6386,7 +6390,7 @@ namespace ts {
     export function getSupportedExtensions(options?: CompilerOptions): readonly Extension[];
     export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: readonly FileExtensionInfo[]): readonly string[];
     export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: readonly FileExtensionInfo[]): readonly string[] {
-        const needJsExtensions = options && options.allowJs;
+        const needJsExtensions = options && getAllowJSCompilerOption(options);
 
         if (!extraFileExtensions || extraFileExtensions.length === 0) {
             return needJsExtensions ? allSupportedExtensions : supportedTSExtensions;
diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
@@ -623,7 +623,7 @@ namespace FourSlash {
             ts.forEachKey(this.inputFiles, fileName => {
                 if (!ts.isAnySupportedFileExtension(fileName)
                     || Harness.getConfigNameFromFileName(fileName)
-                    || !this.getProgram().getCompilerOptions().allowJs && !ts.resolutionExtensionIsTSOrJson(ts.extensionFromPath(fileName))) return;
+                    || !ts.getAllowJSCompilerOption(this.getProgram().getCompilerOptions()) && !ts.resolutionExtensionIsTSOrJson(ts.extensionFromPath(fileName))) return;
                 const errors = this.getDiagnostics(fileName).filter(e => e.category !== ts.DiagnosticCategory.Suggestion);
                 if (errors.length) {
                     this.printErrorLog(/*expectErrors*/ false, errors);
diff --git a/src/harness/harnessIO.ts b/src/harness/harnessIO.ts
@@ -469,7 +469,7 @@ namespace Harness {
                 if (vpath.isDeclaration(file.unitName) || vpath.isJson(file.unitName)) {
                     dtsFiles.push(file);
                 }
-                else if (vpath.isTypeScript(file.unitName) || (vpath.isJavaScript(file.unitName) && options.allowJs)) {
+                else if (vpath.isTypeScript(file.unitName) || (vpath.isJavaScript(file.unitName) && ts.getAllowJSCompilerOption(options))) {
                     const declFile = findResultCodeFile(file.unitName);
                     if (declFile && !findUnit(declFile.file, declInputFiles) && !findUnit(declFile.file, declOtherFiles)) {
                         dtsFiles.push({ unitName: declFile.file, content: Utils.removeByteOrderMark(declFile.text) });
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -274,7 +274,7 @@ namespace ts.server {
                 this.compilerOptions.allowNonTsExtensions = true;
                 this.compilerOptions.allowJs = true;
             }
-            else if (hasExplicitListOfFiles || this.compilerOptions.allowJs || this.projectService.hasDeferredExtension()) {
+            else if (hasExplicitListOfFiles || getAllowJSCompilerOption(this.compilerOptions) || this.projectService.hasDeferredExtension()) {
                 // If files are listed explicitly or allowJs is specified, allow all extensions
                 this.compilerOptions.allowNonTsExtensions = true;
             }
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
@@ -71,7 +71,7 @@ namespace ts.server {
 
     function compilerOptionsChanged(opt1: CompilerOptions, opt2: CompilerOptions): boolean {
         // TODO: add more relevant properties
-        return opt1.allowJs !== opt2.allowJs;
+        return getAllowJSCompilerOption(opt1) !== getAllowJSCompilerOption(opt2);
     }
 
     function unresolvedImportsChanged(imports1: SortedReadonlyArray<string> | undefined, imports2: SortedReadonlyArray<string> | undefined): boolean {
diff --git a/tests/cases/conformance/salsa/inferringClassMembersFromAssignments2.ts b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments2.ts
@@ -1,4 +1,3 @@
-// @allowJs: true
 // @checkJs: true
 // @noEmit: true
 // @filename: a.js
diff --git a/tests/cases/conformance/salsa/moduleExportAlias4.ts b/tests/cases/conformance/salsa/moduleExportAlias4.ts
@@ -1,5 +1,4 @@
 // @checkJs: true
-// @allowJS: true
 // @noEmit: true
 // @Filename: bug24024.js
 // #24024

Original file line number	Diff line number	Diff line change
`@@ -2846,7 +2846,7 @@ namespace ts {`
`2846`	`2846`	`&& !options.noResolve`
`2847`	`2847`	`&& i < file.imports.length`
`2848`	`2848`	`&& !elideImport`
`2849`		`- && !(isJsFile && !options.allowJs)`
	`2849`	`+ && !(isJsFile && !getAllowJSCompilerOption(options))`
`2850`	`2850`	`&& (isInJSFile(file.imports[i]) \|\| !(file.imports[i].flags & NodeFlags.JSDoc));`
`2851`	`2851`
`2852`	`2852`	`if (elideImport) {`
`@@ -3160,7 +3160,7 @@ namespace ts {`
`3160`	`3160`	`createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");`
`3161`	`3161`	`}`
`3162`	`3162`
`3163`		`- if (options.checkJs && !options.allowJs) {`
	`3163`	`+ if (options.checkJs && !getAllowJSCompilerOption(options)) {`
`3164`	`3164`	`programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"));`
`3165`	`3165`	`}`
`3166`	`3166`
`@@ -3774,7 +3774,7 @@ namespace ts {`
`3774`	`3774`	`return options.jsx ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;`
`3775`	`3775`	`}`
`3776`	`3776`	`function needAllowJs() {`
`3777`		`- return options.allowJs \|\| !getStrictOptionValue(options, "noImplicitAny") ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;`
	`3777`	`+ return getAllowJSCompilerOption(options) \|\| !getStrictOptionValue(options, "noImplicitAny") ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;`
`3778`	`3778`	`}`
`3779`	`3779`	`function needResolveJsonModule() {`
`3780`	`3780`	`return options.resolveJsonModule ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used;`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ namespace Harness {`
`469`	`469`	`if (vpath.isDeclaration(file.unitName) \|\| vpath.isJson(file.unitName)) {`
`470`	`470`	`dtsFiles.push(file);`
`471`	`471`	`}`
`472`		`- else if (vpath.isTypeScript(file.unitName) \|\| (vpath.isJavaScript(file.unitName) && options.allowJs)) {`
	`472`	`+ else if (vpath.isTypeScript(file.unitName) \|\| (vpath.isJavaScript(file.unitName) && ts.getAllowJSCompilerOption(options))) {`
`473`	`473`	`const declFile = findResultCodeFile(file.unitName);`
`474`	`474`	`if (declFile && !findUnit(declFile.file, declInputFiles) && !findUnit(declFile.file, declOtherFiles)) {`
`475`	`475`	`dtsFiles.push({ unitName: declFile.file, content: Utils.removeByteOrderMark(declFile.text) });`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ namespace ts.server {`
`274`	`274`	`this.compilerOptions.allowNonTsExtensions = true;`
`275`	`275`	`this.compilerOptions.allowJs = true;`
`276`	`276`	`}`
`277`		`- else if (hasExplicitListOfFiles \|\| this.compilerOptions.allowJs \|\| this.projectService.hasDeferredExtension()) {`
	`277`	`+ else if (hasExplicitListOfFiles \|\| getAllowJSCompilerOption(this.compilerOptions) \|\| this.projectService.hasDeferredExtension()) {`
`278`	`278`	`// If files are listed explicitly or allowJs is specified, allow all extensions`
`279`	`279`	`this.compilerOptions.allowNonTsExtensions = true;`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ namespace ts.server {`
`71`	`71`
`72`	`72`	`function compilerOptionsChanged(opt1: CompilerOptions, opt2: CompilerOptions): boolean {`
`73`	`73`	`// TODO: add more relevant properties`
`74`		`- return opt1.allowJs !== opt2.allowJs;`
	`74`	`+ return getAllowJSCompilerOption(opt1) !== getAllowJSCompilerOption(opt2);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`function unresolvedImportsChanged(imports1: SortedReadonlyArray<string> \| undefined, imports2: SortedReadonlyArray<string> \| undefined): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// @allowJs: true`
`2`	`1`	`// @checkJs: true`
`3`	`2`	`// @noEmit: true`
`4`	`3`	`// @filename: a.js`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// @checkJs: true`
`2`		`-// @allowJS: true`
`3`	`2`	`// @noEmit: true`
`4`	`3`	`// @Filename: bug24024.js`
`5`	`4`	`// #24024`