Merge branch 'master' of github.com:Microsoft/TypeScript

Author: weswigham

src/compiler/transformers/declarations.ts

@@ -157,7 +157,15 @@ ${sanitizeDockerfileOutput(result.stderr.toString())}`;
 }
 
 function sanitizeDockerfileOutput(result: string): string {
-    return stripAbsoluteImportPaths(sanitizeTimestamps(sanitizeVersionSpecifiers(stripRushStageNumbers(stripANSIEscapes(normalizeNewlines(result))))));
+    return [
+        normalizeNewlines,
+        stripANSIEscapes,
+        stripRushStageNumbers,
+        sanitizeVersionSpecifiers,
+        sanitizeTimestamps,
+        sanitizeUnimportantGulpOutput,
+        stripAbsoluteImportPaths,
+    ].reduce((result, f) => f(result), result);
 }
 
 function normalizeNewlines(result: string): string {
@@ -172,17 +180,28 @@ function stripRushStageNumbers(result: string): string {
     return result.replace(/\d+ of \d+:/g, "XX of XX:");
 }
 
+/**
+ * Gulp's output order within a `parallel` block is nondeterministic (and there's no way to configure it to execute in series),
+ * so we purge as much of the gulp output as we can
+ */
+function sanitizeUnimportantGulpOutput(result: string): string {
+    return result.replace(/^.*(\] (Starting)|(Finished)).*$/gm, "") // task start/end messages (nondeterministic order)
+        .replace(/^.*\] Respawned to PID: \d+.*$/gm, "") // PID of child is OS and system-load dependent (likely stableish in a container but still dangerous)
+        .replace(/\n+/g, "\n");
+}
+
 function sanitizeTimestamps(result: string): string {
     return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]")
-        .replace(/\d+(\.\d+)? seconds?/g, "? seconds")
-        .replace(/\d+(\.\d+)? minutes?/g, "")
-        .replace(/\d+(\.\d+)?s/g, "?s");
+        .replace(/\[\d?\d:\d\d:\d\d\]/g, "[XX:XX:XX]")
+        .replace(/\d+(\.\d+)? sec(onds?)?/g, "? seconds")
+        .replace(/\d+(\.\d+)? min(utes?)?/g, "")
+        .replace(/\d+(\.\d+)?( m)?s/g, "?s");
 }
 
 function sanitizeVersionSpecifiers(result: string): string {
     return result
         .replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx")
-        .replace(/@\d+\.\d+\.\d+/g, "@X.X.X");
+        .replace(/([@v])\d+\.\d+\.\d+/g, "$1X.X.X");
 }
 
 /**

src/testRunner/externalCompileRunner.ts

@@ -16,4 +16,5 @@ declare module M {
     module N {
     }
     export import X = N;
+    export {};
 }

tests/baselines/reference/aliasInaccessibleModule.js

@@ -31,4 +31,5 @@ declare module M {
     }
     import R = N;
     export import X = R;
+    export {};
 }

tests/baselines/reference/aliasInaccessibleModule2.js

@@ -264,13 +264,13 @@ var m;
 declare module m {
     class private1 {
     }
-    class public1 {
+    export class public1 {
     }
     module m2 {
         class public2 {
         }
     }
-    class c {
+    export class c {
         readonly foo1: private1;
         readonly foo2: private1;
         foo3: private1;
@@ -287,4 +287,5 @@ declare module m {
         foo114: m2.public2;
         foo115: m2.public2;
     }
+    export {};
 }

tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js

@@ -111,16 +111,17 @@ var m;
 declare module m {
     class private1 {
     }
-    class public1 {
+    export class public1 {
     }
-    function foo3(param: private1): void;
-    function foo4(param?: private1): void;
-    function foo13(param: public1): void;
-    function foo14(param?: public1): void;
+    export function foo3(param: private1): void;
+    export function foo4(param?: private1): void;
+    export function foo13(param: public1): void;
+    export function foo14(param?: public1): void;
     module m2 {
         class public2 {
         }
     }
-    function foo113(param: m2.public2): void;
-    function foo114(param?: m2.public2): void;
+    export function foo113(param: m2.public2): void;
+    export function foo114(param?: m2.public2): void;
+    export {};
 }

tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js

@@ -129,16 +129,17 @@ var m;
 declare module m {
     class private1 {
     }
-    class public1 {
+    export class public1 {
     }
-    function foo3(): private1;
-    function foo4(): private1;
-    function foo13(): public1;
-    function foo14(): public1;
+    export function foo3(): private1;
+    export function foo4(): private1;
+    export function foo13(): public1;
+    export function foo14(): public1;
     module m2 {
         class public2 {
         }
     }
-    function foo113(): m2.public2;
-    function foo114(): m2.public2;
+    export function foo113(): m2.public2;
+    export function foo114(): m2.public2;
+    export {};
 }

tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js

@@ -95,11 +95,12 @@ interface Window {
 }
 declare module M {
     type W = Window | string;
-    module N {
+    export module N {
         class Window {
         }
         var p: W;
     }
+    export {};
 }
 declare module M1 {
     type W = Window | string;
@@ -118,7 +119,8 @@ declare module M2 {
         class public1 {
         }
     }
-    type t2 = private1;
-    type t12 = public1;
-    type t112 = m3.public1;
+    export type t2 = private1;
+    export type t12 = public1;
+    export type t112 = m3.public1;
+    export {};
 }

tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js

@@ -71,29 +71,30 @@ declare module m {
         class public1 {
         }
     }
-    var x: {
+    export var x: {
         x: private1;
         y: m2.public1;
         (): m2.public1[];
         method(): private1;
         [n: number]: private1;
         [s: string]: m2.public1;
     };
-    var x2: {
+    export var x2: {
         x: private1;
         y: m2.public1;
         method(): private1;
     };
-    var x3: {
+    export var x3: {
         (): m2.public1[];
         [s: string]: m2.public1;
         [n: number]: private1;
         x: private1;
         y: m2.public1;
         method(): private1;
     };
-    var y: (a: private1) => m2.public1;
-    var y2: (a: private1) => m2.public1;
-    var z: new (a: private1) => m2.public1;
-    var z2: new (a: private1) => m2.public1;
+    export var y: (a: private1) => m2.public1;
+    export var y2: (a: private1) => m2.public1;
+    export var z: new (a: private1) => m2.public1;
+    export var z2: new (a: private1) => m2.public1;
+    export {};
 }

tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js

@@ -72,16 +72,17 @@ var m;
 declare module m {
     class private1 {
     }
-    class public1 {
+    export class public1 {
     }
-    var k: private1;
-    var l: private1;
-    var k2: public1;
-    var l2: public1;
+    export var k: private1;
+    export var l: private1;
+    export var k2: public1;
+    export var l2: public1;
     module m2 {
         class public2 {
         }
     }
-    var k3: m2.public2;
-    var l3: m2.public2;
+    export var k3: m2.public2;
+    export var l3: m2.public2;
+    export {};
 }