Do not emit javascript files

2026-05-27 13:42:16 -05:00 · 2015-09-16 13:18:29 -07:00
parent 14b608241d
commit 2860435a2e
40 changed files with 26 additions and 80 deletions
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -104,7 +104,7 @@ namespace ts {
            // Emit references corresponding to this file
            let emittedReferencedFiles: SourceFile[] = [];
            forEach(host.getSourceFiles(), sourceFile => {
-                if (!isExternalModuleOrDeclarationFile(sourceFile)) {
+                if (!isExternalModuleOrDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) {
                    // Check what references need to be added
                    if (!compilerOptions.noResolve) {
                        forEach(sourceFile.referencedFiles, fileReference => {
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -88,7 +88,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, shouldEmitJsx(targetSourceFile) ? ".jsx" : ".js");
                emitFile(jsFilePath, targetSourceFile);
            }
-            else if (!isDeclarationFile(targetSourceFile) && (compilerOptions.outFile || compilerOptions.out)) {
+            else if (!isDeclarationFile(targetSourceFile) &&
+                !isJavaScript(targetSourceFile.fileName) &&
+                (compilerOptions.outFile || compilerOptions.out)) {
                emitFile(compilerOptions.outFile || compilerOptions.out);
            }
        }
@@ -199,7 +201,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
            }
            else {
                forEach(host.getSourceFiles(), sourceFile => {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
+                    if (!isJavaScript(sourceFile.fileName) && !isExternalModuleOrDeclarationFile(sourceFile)) {
                        emitSourceFile(sourceFile);
                    }
                });
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1778,7 +1778,7 @@ namespace ts {
    }

    export function shouldEmitToOwnFile(sourceFile: SourceFile, compilerOptions: CompilerOptions): boolean {
-        if (!isDeclarationFile(sourceFile)) {
+        if (!isDeclarationFile(sourceFile) && !isJavaScript(sourceFile.fileName)) {
            if ((isExternalModule(sourceFile) || !(compilerOptions.outFile || compilerOptions.out))) {
                // 1. in-browser single file compilation scenario
                // 2. non supported extension file
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile3.baseline
@@ -2,5 +2,4 @@ EmitSkipped: false
 FileName : declSingle.js
 var x = "hello";
 var x1 = 1000;
-var x2 = 1000;

--- a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    declare var v;
    ~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,1): error TS8017: 'decorators' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    @internal class C { }
    ~~~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js
+++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js
@@ -15,11 +15,8 @@ var c = (function () {
    }
    return c;
 })();
-function foo() {
-}


 //// [out.d.ts]
 declare class c {
 }
-declare function foo(): void;
--- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js
+++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js
@@ -19,15 +19,8 @@ var c = (function () {
    }
    return c;
 })();
-function bar() {
-}
-/// <reference path="c.js"/>
-function foo() {
-}


 //// [out.d.ts]
 declare class c {
 }
-declare function bar(): void;
-declare function foo(): void;
--- a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    enum E { }
         ~
--- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    export = b;
    ~~~~~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    class C implements D { }
            ~~~~~~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    import a = b;
    ~~~~~~~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    interface I { }
              ~
--- a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    module M { }
           ~
--- a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    function F(p?) { }
                ~
--- a/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationPropertySyntaxOfClass.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,11): error TS8014: 'property declarations' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    class C { v }
              ~
--- a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    class C {
        public foo() {
--- a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,23): error TS8012: 'parameter modifiers' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    class C { constructor(public x) { }}
                          ~~~~~~
--- a/tests/baselines/reference/jsFileCompilationRestParameter.js
+++ b/tests/baselines/reference/jsFileCompilationRestParameter.js
@@ -2,4 +2,3 @@
 function foo(...a) { }

 //// [b.js]
-function foo(...a) { }
--- a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    function F(): number { }
                  ~~~~~~
--- a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(3,6): error TS1223: 'type' tag already specified.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    /**
      * @type {number}
--- a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,1): error TS8008: 'type aliases' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    type a = b;
    ~~~~~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    Foo<number>();
        ~~~~~~
--- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    var v = <string>undefined;
             ~~~~~~
--- a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    function F(a: number) { }
                  ~~~~~~
--- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,9): error TS8004: 'type parameter declarations' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    class C<T> { }
            ~
--- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,12): error TS8004: 'type parameter declarations' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    function F<T>() { }
               ~
--- a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt
@@ -1,8 +1,6 @@
-error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 tests/cases/compiler/a.js(1,8): error TS8010: 'types' can only be used in a .ts file.


-!!! error TS5054: Could not write file 'tests/cases/compiler/a.js' which is one of the input files.
 ==== tests/cases/compiler/a.js (1 errors) ====
    var v: () => number;
           ~~~~~~~~~~~~
--- a/tests/baselines/reference/jsFileCompilationWithOut.js
+++ b/tests/baselines/reference/jsFileCompilationWithOut.js
@@ -15,5 +15,3 @@ var c = (function () {
    }
    return c;
 })();
-function foo() {
-}
--- a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt
@@ -1,12 +0,0 @@
-error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files.
-
-
-!!! error TS5054: Could not write file 'tests/cases/compiler/b.js' which is one of the input files.
-==== tests/cases/compiler/a.ts (0 errors) ====
-    class c {
-    }
-    
-==== tests/cases/compiler/b.js (0 errors) ====
-    function foo() {
-    }
-    
--- a/tests/baselines/reference/jsFileCompilationWithoutOut.symbols
+++ b/tests/baselines/reference/jsFileCompilationWithoutOut.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/a.ts ===
+class c {
+>c : Symbol(c, Decl(a.ts, 0, 0))
+}
+
+=== tests/cases/compiler/b.js ===
+function foo() {
+>foo : Symbol(foo, Decl(b.js, 0, 0))
+}
+
--- a/tests/baselines/reference/jsFileCompilationWithoutOut.types
+++ b/tests/baselines/reference/jsFileCompilationWithoutOut.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/a.ts ===
+class c {
+>c : c
+}
+
+=== tests/cases/compiler/b.js ===
+function foo() {
+>foo : () => void
+}
+
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts
@@ -1,2 +1 @@
 declare var test: number;
-declare var test2: number;
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js
@@ -1,2 +1 @@
 var test = 10;
-var test2 = 10; // Should get compiled
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts
@@ -1,2 +1 @@
 declare var test: number;
-declare var test2: number;
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js
@@ -1,2 +1 @@
 var test = 10;
-var test2 = 10; // Should get compiled
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
@@ -1,2 +1 @@
 declare var test: number;
-declare var test2: number;
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
@@ -1,2 +1 @@
 var test = 10;
-var test2 = 10; // Should get compiled
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
@@ -1,2 +1 @@
 declare var test: number;
-declare var test2: number;
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
@@ -1,2 +1 @@
 var test = 10;
-var test2 = 10; // Should get compiled