change triple-slash ref emit critaera, add a new tests and accept new…

… baselines
microsoft · weswigham · Nov 9, 2015 · Sep 30, 2015 · Oct 1, 2015 · Oct 2, 2015
commit c165be8b3a28bee144a35eb880fe0ba5dd49178d
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -107,23 +107,25 @@ namespace ts {
             let emittedReferencedFiles: SourceFile[] = [];
             let prevModuleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[] = [];
             forEach(host.getSourceFiles(), sourceFile => {
-                if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                    noDeclare = false;
+                if (!isDeclarationFile(sourceFile)) {
                     // Check what references need to be added
                     if (!compilerOptions.noResolve) {
                         forEach(sourceFile.referencedFiles, fileReference => {
                             let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference);
 
-                            // If the reference file is a declaration file or an external module, emit that reference
-                            if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
+                            // If the reference file is a declaration file, emit that reference
+                            if (referencedFile && (isDeclarationFile(referencedFile) &&
                                 !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted
 
                                 writeReferencePath(referencedFile);
                                 emittedReferencedFiles.push(referencedFile);
                             }
                         });
                     }
+                }
 
+                if (!isExternalModuleOrDeclarationFile(sourceFile)) {
+                    noDeclare = false;
                     emitSourceFile(sourceFile);
                 }
                 else if (isExternalModule(sourceFile)) {

diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -0,0 +1,116 @@
+//// [tests/cases/compiler/outModuleTripleSlashRefs.ts] ////
+
+//// [a.ts]
+
+/// <reference path="./b.ts" />
+export class A {
+	member: typeof GlobalFoo;
+}
+
+//// [b.ts]
+/// <reference path="./c.d.ts" />
+class Foo {
+	member: Bar;
+}
+declare var GlobalFoo: Foo;
+
+//// [c.d.ts]
+/// <reference path="./d.d.ts" />
+declare class Bar {
+	member: Baz;
+}
+
+//// [d.d.ts]
+declare class Baz {
+	member: number;
+}
+
+//// [b.ts]
+import {A} from "./ref/a";
+export class B extends A { }
+
+
+//// [a.js]
+define(["require", "exports"], function (require, exports) {
+    /// <reference path="./b.ts" />
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+//# sourceMappingURL=a.js.map//// [b.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+define(["require", "exports", "./ref/a"], function (require, exports, a_1) {
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=b.js.map//// [all.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+/// <reference path="./c.d.ts" />
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+})();
+define("tests/cases/compiler/ref/a", ["require", "exports"], function (require, exports) {
+    /// <reference path="./b.ts" />
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    })();
+    exports.A = A;
+});
+define("tests/cases/compiler/b", ["require", "exports", "tests/cases/compiler/ref/a"], function (require, exports, a_1) {
+    var B = (function (_super) {
+        __extends(B, _super);
+        function B() {
+            _super.apply(this, arguments);
+        }
+        return B;
+    })(a_1.A);
+    exports.B = B;
+});
+//# sourceMappingURL=all.js.map
+
+//// [a.d.ts]
+/// <reference path="../../../../all.d.ts" />
+export declare class A {
+    member: typeof GlobalFoo;
+}
+//// [b.d.ts]
+import { A } from "./ref/a";
+export declare class B extends A {
+}
+//// [all.d.ts]
+/// <reference path="tests/cases/compiler/ref/c.d.ts" />
+declare class Foo {
+    member: Bar;
+}
+declare var GlobalFoo: Foo;
+declare module "tests/cases/compiler/ref/a" {
+    export class A {
+        member: typeof GlobalFoo;
+    }
+}
+declare module "tests/cases/compiler/b" {
+    import { A } from "tests/cases/compiler/ref/a";
+    export class B extends A {
+    }
+}
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map