When tsconfig file doesnt contain file names, consume .js files of directory only if specified in the options

sheetalkamat · sheetalkamat · commit fce9f32bd452 · 2015-09-16T13:57:51.000-07:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -245,6 +245,10 @@ namespace ts {
             },
             description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
             error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,
+        },
+        {
+            name: "consumeJsFiles",
+            type: "boolean",
         }
     ];
 
@@ -414,8 +418,9 @@ namespace ts {
     export function parseConfigFile(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine {
         let errors: Diagnostic[] = [];
 
+        let options = getCompilerOptions();
         return {
-            options: getCompilerOptions(),
+            options,
             fileNames: getFileNames(),
             errors
         };
@@ -474,7 +479,10 @@ namespace ts {
             }
             else {
                 let exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
-                let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)).concat(host.readDirectory(basePath, ".js", exclude));
+                let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
+                if (options.consumeJsFiles) {
+                    sysFiles = sysFiles.concat(host.readDirectory(basePath, ".js", exclude));
+                }
                 for (let i = 0; i < sysFiles.length; i++) {
                     let name = sysFiles[i];
                     if (fileExtensionIs(name, ".js")) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2061,7 +2061,8 @@ namespace ts {
         experimentalDecorators?: boolean;
         experimentalAsyncFunctions?: boolean;
         emitDecoratorMetadata?: boolean;
-        moduleResolution?: ModuleResolutionKind
+        moduleResolution?: ModuleResolutionKind;
+        consumeJsFiles?: boolean;
         /* @internal */ stripInternal?: boolean;
 
         // Skip checking lib.d.ts to help speed up tests.
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json
@@ -6,8 +6,7 @@
     "project": "DifferentNamesNotSpecified",
     "resolvedInputFiles": [
         "lib.d.ts",
-        "DifferentNamesNotSpecified/a.ts",
-        "DifferentNamesNotSpecified/b.js"
+        "DifferentNamesNotSpecified/a.ts"
     ],
     "emittedFiles": [
         "test.js",
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json
@@ -6,8 +6,7 @@
     "project": "DifferentNamesNotSpecified",
     "resolvedInputFiles": [
         "lib.d.ts",
-        "DifferentNamesNotSpecified/a.ts",
-        "DifferentNamesNotSpecified/b.js"
+        "DifferentNamesNotSpecified/a.ts"
     ],
     "emittedFiles": [
         "test.js",
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts",
+        "DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.d.ts
@@ -0,0 +1 @@
+declare var test: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/amd/test.js
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts",
+        "DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.d.ts
@@ -0,0 +1 @@
+declare var test: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles/node/test.js
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,12 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "SameNameDTsNotSpecifiedWithConsumeJsFiles/a.d.ts"
+    ],
+    "emittedFiles": []
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,12 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "SameNameDTsNotSpecifiedWithConsumeJsFiles/a.d.ts"
+    ],
+    "emittedFiles": []
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts
@@ -0,0 +1 @@
+declare var test: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/amd/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,15 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts"
+    ],
+    "emittedFiles": [
+        "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js",
+        "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts
@@ -0,0 +1 @@
+declare var test: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles/node/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,15 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts"
+    ],
+    "emittedFiles": [
+        "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js",
+        "SameNameFilesNotSpecifiedWithConsumeJsFiles/a.d.ts"
+    ]
+}
diff --git a/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationDifferentNamesNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,7 @@
+{
+  "scenario": "Verify when different named .ts and .js file exists in the folder and tsconfig.json doesnt specify any files and consumeJsFiles is true",
+  "projectRoot": "tests/cases/projects/jsFileCompilation",
+  "baselineCheck": true,
+  "declaration": true,
+  "project": "DifferentNamesNotSpecifiedWithConsumeJsFiles"
+}
diff --git a/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameDtsNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,7 @@
+{
+  "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true",
+  "projectRoot": "tests/cases/projects/jsFileCompilation",
+  "baselineCheck": true,
+  "declaration": true,
+  "project": "SameNameDTsNotSpecifiedWithConsumeJsFiles"
+}
diff --git a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecifiedWithConsumeJsFiles.json
@@ -0,0 +1,7 @@
+{
+  "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json and consumeJsFiles is true",
+  "projectRoot": "tests/cases/projects/jsFileCompilation",
+  "baselineCheck": true,
+  "declaration": true,
+  "project": "SameNameFilesNotSpecifiedWithConsumeJsFiles"
+}
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/b.js
@@ -1 +1 @@
-var test2 = 10; // Should get compiled
+var test2 = 10; // Shouldnt get compiled
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/a.ts
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/b.js
@@ -0,0 +1 @@
+var test2 = 10; // Should get compiled
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithConsumeJsFiles/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "out": "test.js",
+    "consumeJsFiles":  true
+  }
+}
diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.d.ts
@@ -0,0 +1 @@
+declare var a: number;
diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/a.js
@@ -0,0 +1 @@
+var test1 = 10; // Shouldnt get compiled
diff --git a/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameDtsNotSpecifiedWithConsumeJsFiles/tsconfig.json
@@ -0,0 +1 @@
+{ "compilerOptions": { "consumeJsFiles": true } }
diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.js
@@ -0,0 +1 @@
+var test1 = 10; // Shouldnt get compiled
diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/a.ts
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecifiedWithConsumeJsFiles/tsconfig.json
@@ -0,0 +1 @@
+{ "compilerOptions": { "consumeJsFiles": true } }
