Merge pull request microsoft#6791 from Microsoft/port-6789

vladima · vladima · commit a4af38a62295 · 2016-02-01T12:05:45.000-08:00
Ports microsoft#6789 into release-1.8
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1359,7 +1359,7 @@ namespace ts {
             }
 
             // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
-            if (!options.noEmit) {
+            if (!options.noEmit && !options.suppressOutputPathCheck) {
                 const emitHost = getEmitHost();
                 const emitFilesSeen = createFileMap<boolean>(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined);
                 forEachExpectedEmitFile(emitHost, (emitFileNames, sourceFiles, isBundledEmit) => {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2438,6 +2438,8 @@ namespace ts {
 
         // Skip checking lib.d.ts to help speed up tests.
         /* @internal */ skipDefaultLibCheck?: boolean;
+        // Do not perform validation of output file name in transpile scenarios
+        /* @internal */ suppressOutputPathCheck?: boolean;
 
         [option: string]: string | number | boolean;
     }
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1875,6 +1875,9 @@ namespace ts {
 
         options.isolatedModules = true;
 
+        // transpileModule does not write anything to disk so there is no need to verify that there are no conflicts between input and output paths. 
+        options.suppressOutputPathCheck = true;
+
         // Filename can be non-ts file.
         options.allowNonTsExtensions = true;
 
diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts
@@ -291,5 +291,14 @@ var x = 0;`,
                 options: { compilerOptions: { jsx: JsxEmit.React, newLine: NewLineKind.LineFeed } }
             })
         });
+        it("transpile .js files", () => {
+            const input = "const a = 10;";
+            const output = `"use strict";\nvar a = 10;\n`;
+            test(input, {
+                expectedOutput: output,
+                options: { compilerOptions: { newLine: NewLineKind.LineFeed, module: ModuleKind.CommonJS }, fileName: "input.js", reportDiagnostics: true },
+                expectedDiagnosticCodes: []
+            });
+        })
     });
 }

Original file line number	Diff line number	Diff line change
`@@ -1359,7 +1359,7 @@ namespace ts {`
`1359`	`1359`	`}`
`1360`	`1360`
`1361`	`1361`	`// If the emit is enabled make sure that every output file is unique and not overwriting any of the input files`
`1362`		`- if (!options.noEmit) {`
	`1362`	`+ if (!options.noEmit && !options.suppressOutputPathCheck) {`
`1363`	`1363`	`const emitHost = getEmitHost();`
`1364`	`1364`	`const emitFilesSeen = createFileMap<boolean>(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined);`
`1365`	`1365`	`forEachExpectedEmitFile(emitHost, (emitFileNames, sourceFiles, isBundledEmit) => {`
Original file line number	Diff line number	Diff line change
`@@ -2438,6 +2438,8 @@ namespace ts {`
`2438`	`2438`
`2439`	`2439`	`// Skip checking lib.d.ts to help speed up tests.`
`2440`	`2440`	`/* @internal */ skipDefaultLibCheck?: boolean;`
	`2441`	`+ // Do not perform validation of output file name in transpile scenarios`
	`2442`	`+ /* @internal */ suppressOutputPathCheck?: boolean;`
`2441`	`2443`
`2442`	`2444`	`[option: string]: string \| number \| boolean;`
`2443`	`2445`	`}`