Such clean nested aliasing, very wow

weswigham · weswigham · commit 2cfc9a3d4cf9 · 2019-07-16T16:17:20.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
diff --git a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -51,18 +51,18 @@ module.exports.Strings = Strings;
 
 
 //// [bar.d.ts]
+export = Bar;
 declare class Bar {
 }
-export = Bar;
 //// [cls.d.ts]
+export = Foo;
+declare var Strings_1: {
+    a: string;
+    b: string;
+};
 declare const Foo_base: typeof import("./bar");
 declare class Foo extends Foo_base {
 }
-export = Foo;
 declare namespace Foo {
-    var Strings_1: {
-        a: string;
-        b: string;
-    };
     export { Strings_1 as Strings };
 }
diff --git a/tests/baselines/reference/jsDeclarationsClasses.js b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -481,13 +481,9 @@ export class F<T, U> {
     constructor(a: T, b: U);
     field: T & U;
 }
-declare class G {
-}
-declare class HH {
-}
 export class I {
 }
-declare class J {
+export class J {
 }
 export class K {
     p1: number;
@@ -517,4 +513,8 @@ export class HasStatics {
 export class ExtendsStatics extends HasStatics {
     static also(): void;
 }
-export { G, HH as H, I as II, J as JJ };
+export class G {
+}
+declare class HH {
+}
+export { HH as H, I as II, J as JJ };
diff --git a/tests/baselines/reference/jsDeclarationsComputedNames.js b/tests/baselines/reference/jsDeclarationsComputedNames.js
@@ -67,8 +67,6 @@ exports.MyClass = MyClass;
 
 
 //// [index.d.ts]
-declare const TopLevelSym: unique symbol;
-declare const InnerSym: unique symbol;
 declare const _exports: {
     [TopLevelSym](x?: number): number;
     items: {
@@ -78,12 +76,14 @@ declare const _exports: {
     };
 };
 export = _exports;
-//// [index2.d.ts]
-declare const InnerSym: unique symbol;
 declare const TopLevelSym: unique symbol;
+declare const InnerSym: unique symbol;
+//// [index2.d.ts]
 export class MyClass {
     static [TopLevelSym]: number;
     constructor(_p?: typeof TopLevelSym | typeof InnerSym);
     [InnerSym]: string;
 }
+declare const InnerSym: unique symbol;
+declare const TopLevelSym: unique symbol;
 export {};
diff --git a/tests/baselines/reference/jsDeclarationsDefault.js b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -126,11 +126,11 @@ export default class Foo {
 export const X: typeof Foo;
 export { Foo as Bar };
 //// [index4.d.ts]
-import Fab from "./index3";
+export default Bar;
 declare class Bar extends Fab {
     x: Bar;
 }
-export default Bar;
+import Fab from "./index3";
 //// [index5.d.ts]
 type _default = string | number;
 declare var _default: 12;
diff --git a/tests/baselines/reference/jsDeclarationsDefaultsErr.js b/tests/baselines/reference/jsDeclarationsDefaultsErr.js
@@ -69,15 +69,15 @@ exports.default = x;
 
 //// [index1.d.ts]
 export type Cls = string | number;
+export default Cls;
 declare class Cls {
     static y: string;
     x: number;
 }
-export default Cls;
 //// [index2.d.ts]
 export default class C {
 }
 //// [index3.d.ts]
 export type _default = string | number;
-declare const x: 12;
 export { x as default };
+declare const x: 12;
diff --git a/tests/baselines/reference/jsDeclarationsEnums.js b/tests/baselines/reference/jsDeclarationsEnums.js
@@ -123,13 +123,9 @@ export enum A {
 export enum B {
     Member = 0
 }
-declare enum C {
-}
-declare enum DD {
-}
 export enum E {
 }
-declare enum F {
+export enum F {
 }
 export enum G {
     A = 1,
@@ -164,4 +160,8 @@ export const enum L {
     C = 4,
     Mask = 7
 }
-export { C, DD as D, E as EE, F as FF };
+export enum C {
+}
+declare enum DD {
+}
+export { DD as D, E as EE, F as FF };
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.js b/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.js
@@ -29,13 +29,13 @@ module.exports.Strings = Strings;
 
 
 //// [index.d.ts]
+declare var Strings_1: {
+    a: string;
+    b: string;
+};
 export declare const thing: string;
 export declare const also: string;
 export declare namespace desc {
     export const item: string;
 }
-declare var Strings_1: {
-    a: string;
-    b: string;
-};
 export { Strings_1 as Strings };
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.js b/tests/baselines/reference/jsDeclarationsExportForms.js
@@ -145,23 +145,22 @@ export * from "./cls";
 export * from "./func";
 export * from "./cls";
 //// [baz.d.ts]
-import { Foo } from "./cls";
 export { Foo };
+import { Foo } from "./cls";
 //// [bat.d.ts]
-import * as ns from "./cls";
 export default ns;
-//// [ban.d.ts]
 import * as ns from "./cls";
+//// [ban.d.ts]
 export { ns };
-//// [bol.d.ts]
 import * as ns from "./cls";
+//// [bol.d.ts]
 export { ns as classContainer };
+import * as ns from "./cls";
 //// [cjs.d.ts]
-declare const ns: typeof import("./cls");
-export { ns };
+export const ns: typeof import("./cls");
 //// [cjs2.d.ts]
-declare const ns: typeof import("./cls");
 export = ns;
+declare const ns: typeof import("./cls");
 //// [cjs3.d.ts]
 declare var ns_1: typeof import("./cls");
 export { ns_1 as ns };
diff --git a/tests/baselines/reference/jsDeclarationsExportFormsErr.js b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
@@ -58,8 +58,8 @@ require("./globalNs");
 export class Foo {
 }
 //// [bar.d.ts]
-import ns = require("./bar");
 export = ns;
+import ns = require("./bar");
 //// [bin.d.ts]
 export {};
 //// [globalNs.d.ts]
diff --git a/tests/baselines/reference/jsDeclarationsExportSubAssignments.js b/tests/baselines/reference/jsDeclarationsExportSubAssignments.js
@@ -22,13 +22,13 @@ module.exports.Strings = Strings;
 
 
 //// [cls.d.ts]
+export = Foo;
+declare var Strings_1: {
+    a: string;
+    b: string;
+};
 declare class Foo {
 }
-export = Foo;
 declare namespace Foo {
-    var Strings_1: {
-        a: string;
-        b: string;
-    };
     export { Strings_1 as Strings };
 }
diff --git a/tests/baselines/reference/jsDeclarationsFunctions.js b/tests/baselines/reference/jsDeclarationsFunctions.js
@@ -129,8 +129,6 @@ export namespace b {
 }
 export function c(): void;
 export namespace c {
-    class Cls {
-    }
     export { Cls };
 }
 export function d(a: number, b: number): string;
@@ -141,7 +139,9 @@ export namespace f {
 }
 export function i(): void;
 export function j(): void;
-declare function g(a: {
+declare class Cls {
+}
+export function g(a: {
     x: string;
 }, b: {
     y: typeof b;
@@ -151,4 +151,4 @@ declare function hh(a: {
 }, b: {
     y: typeof b;
 }): void;
-export { g, hh as h, i as ii, j as jj };
+export { hh as h, i as ii, j as jj };
diff --git a/tests/baselines/reference/jsDeclarationsFunctionsCjs.js b/tests/baselines/reference/jsDeclarationsFunctionsCjs.js
@@ -131,6 +131,12 @@ declare var f_1: {
     <T>(a: T): T;
     self: any;
 };
+declare var g_1: typeof g;
+declare var h_1: typeof hh;
+declare var i_1: () => void;
+declare var ii_1: () => void;
+declare var jj_1: () => void;
+declare var j_1: () => void;
 declare function g(a: {
     x: string;
 }, b: {
@@ -139,7 +145,6 @@ declare function g(a: {
         cat: string;
     };
 }): void;
-declare var g_1: typeof g;
 declare function hh(a: {
     x: string;
 }, b: {
@@ -148,9 +153,4 @@ declare function hh(a: {
         cat: string;
     };
 }): void;
-declare var h_1: typeof hh;
-declare var i_1: () => void;
-declare var ii_1: () => void;
-declare var jj_1: () => void;
-declare var j_1: () => void;
 export { a_1 as a, b_1 as b, c_1 as c, d_1 as d, e_1 as e, f_1 as f, g_1 as g, h_1 as h, i_1 as i, ii_1 as ii, jj_1 as jj, j_1 as j };
diff --git a/tests/baselines/reference/jsDeclarationsInterfaces.js b/tests/baselines/reference/jsDeclarationsInterfaces.js
@@ -149,13 +149,9 @@ export interface C<T_1, U_1> {
     method(...args: any[]): number;
     optMethod?(): number;
 }
-interface G {
-}
-interface HH {
-}
 export interface I {
 }
-interface J {
+export interface J {
 }
 export interface K extends I, J {
     x: string;
@@ -232,4 +228,8 @@ export interface CC extends Y {
         y: 0;
     };
 }
-export { G, HH as H, I as II, J as JJ };
+export interface G {
+}
+interface HH {
+}
+export { HH as H, I as II, J as JJ };
diff --git a/tests/baselines/reference/jsDeclarationsJson.js b/tests/baselines/reference/jsDeclarationsJson.js
@@ -44,6 +44,7 @@ export declare namespace obj {
     })[];
 }
 //// [index.d.ts]
+export = j;
 declare const j: {
     "x": number;
     "y": number;
@@ -63,4 +64,3 @@ declare const j: {
         })[];
     };
 };
-export = j;
diff --git a/tests/baselines/reference/jsDeclarationsPackageJson.js b/tests/baselines/reference/jsDeclarationsPackageJson.js
@@ -103,6 +103,7 @@ export declare namespace config {
     export const o: string[];
 }
 //// [index.d.ts]
+export = j;
 declare const j: {
     "name": string;
     "version": string;
@@ -132,4 +133,3 @@ declare const j: {
         "o": string[];
     };
 };
-export = j;
diff --git a/tests/baselines/reference/jsDeclarationsTypeAliases.js b/tests/baselines/reference/jsDeclarationsTypeAliases.js
@@ -113,16 +113,16 @@ export type MixinName<T> = T & {
 };
 export type Identity<T> = (x: T) => T;
 //// [mixed.d.ts]
-declare class LocalThing {
-    y: string;
-}
-declare function doTheThing(x: number): number | {
-    x: string;
-} | LocalThing | typeof ExportedThing;
-declare class ExportedThing {
-    z: string;
-}
 export type SomeType = number | {
     x: string;
 } | LocalThing | ExportedThing;
-export { doTheThing, ExportedThing };
+export function doTheThing(x: number): number | {
+    x: string;
+} | LocalThing | ExportedThing;
+export class ExportedThing {
+    z: string;
+}
+declare class LocalThing {
+    y: string;
+}
+export {};
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences.js b/tests/baselines/reference/jsDeclarationsTypeReferences.js
@@ -26,5 +26,4 @@ module.exports = {
 
 //// [index.d.ts]
 /// <reference types="node" />
-declare const thing: import("fs").Something;
-export { thing };
+export const thing: import("fs").Something;
diff --git a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.js b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.js
@@ -63,18 +63,18 @@ module.exports = {
 
 
 //// [conn.d.ts]
+export = Conn;
+type Whatever = string | number;
 declare class Conn {
     item: number;
     method(): void;
 }
-export = Conn;
 declare namespace Conn {
-    export type Whatever = string | number;
+    export { Whatever };
 }
 //// [usage.d.ts]
-declare class Wrap {
+export type Conn = import("./conn");
+export class Wrap {
     constructor(c: import("./conn"));
     connItem: number;
 }
-export { Wrap };
-export type Conn = import("./conn");
diff --git a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.js b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.js
diff --git a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.symbols b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
diff --git a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
diff --git a/tests/baselines/reference/noCircularDefinitionOnExportOfPrivateInMergedNamespace.js b/tests/baselines/reference/noCircularDefinitionOnExportOfPrivateInMergedNamespace.js
diff --git a/tests/baselines/reference/noCircularDefinitionOnExportOfPrivateInMergedNamespace.symbols b/tests/baselines/reference/noCircularDefinitionOnExportOfPrivateInMergedNamespace.symbols
diff --git a/tests/baselines/reference/noCircularDefinitionOnExportOfPrivateInMergedNamespace.types b/tests/baselines/reference/noCircularDefinitionOnExportOfPrivateInMergedNamespace.types
diff --git a/tests/cases/compiler/noCircularDefinitionOnExportOfPrivateInMergedNamespace.ts b/tests/cases/compiler/noCircularDefinitionOnExportOfPrivateInMergedNamespace.ts
diff --git a/tests/cases/conformance/jsdoc/declarations/jsDeclarationsTypedefPropertyAndExportAssignment.ts b/tests/cases/conformance/jsdoc/declarations/jsDeclarationsTypedefPropertyAndExportAssignment.ts

Original file line number	Diff line number	Diff line change
`@@ -481,13 +481,9 @@ export class F<T, U> {`
`481`	`481`	`constructor(a: T, b: U);`
`482`	`482`	`field: T & U;`
`483`	`483`	`}`
`484`		`-declare class G {`
`485`		`-}`
`486`		`-declare class HH {`
`487`		`-}`
`488`	`484`	`export class I {`
`489`	`485`	`}`
`490`		`-declare class J {`
	`486`	`+export class J {`
`491`	`487`	`}`
`492`	`488`	`export class K {`
`493`	`489`	`p1: number;`
`@@ -517,4 +513,8 @@ export class HasStatics {`
`517`	`513`	`export class ExtendsStatics extends HasStatics {`
`518`	`514`	`static also(): void;`
`519`	`515`	`}`
`520`		`-export { G, HH as H, I as II, J as JJ };`
	`516`	`+export class G {`
	`517`	`+}`
	`518`	`+declare class HH {`
	`519`	`+}`
	`520`	`+export { HH as H, I as II, J as JJ };`
Original file line number	Diff line number	Diff line change
`@@ -123,13 +123,9 @@ export enum A {`
`123`	`123`	`export enum B {`
`124`	`124`	`Member = 0`
`125`	`125`	`}`
`126`		`-declare enum C {`
`127`		`-}`
`128`		`-declare enum DD {`
`129`		`-}`
`130`	`126`	`export enum E {`
`131`	`127`	`}`
`132`		`-declare enum F {`
	`128`	`+export enum F {`
`133`	`129`	`}`
`134`	`130`	`export enum G {`
`135`	`131`	`A = 1,`
`@@ -164,4 +160,8 @@ export const enum L {`
`164`	`160`	`C = 4,`
`165`	`161`	`Mask = 7`
`166`	`162`	`}`
`167`		`-export { C, DD as D, E as EE, F as FF };`
	`163`	`+export enum C {`
	`164`	`+}`
	`165`	`+declare enum DD {`
	`166`	`+}`
	`167`	`+export { DD as D, E as EE, F as FF };`
Original file line number	Diff line number	Diff line change
`@@ -149,13 +149,9 @@ export interface C<T_1, U_1> {`
`149`	`149`	`method(...args: any[]): number;`
`150`	`150`	`optMethod?(): number;`
`151`	`151`	`}`
`152`		`-interface G {`
`153`		`-}`
`154`		`-interface HH {`
`155`		`-}`
`156`	`152`	`export interface I {`
`157`	`153`	`}`
`158`		`-interface J {`
	`154`	`+export interface J {`
`159`	`155`	`}`
`160`	`156`	`export interface K extends I, J {`
`161`	`157`	`x: string;`
`@@ -232,4 +228,8 @@ export interface CC extends Y {`
`232`	`228`	`y: 0;`
`233`	`229`	`};`
`234`	`230`	`}`
`235`		`-export { G, HH as H, I as II, J as JJ };`
	`231`	`+export interface G {`
	`232`	`+}`
	`233`	`+interface HH {`
	`234`	`+}`
	`235`	`+export { HH as H, I as II, J as JJ };`