Include export specifiers in the list of syntactic defaults (microsoft#24549)

weswigham · web-flow · commit f8503f26328b · 2018-06-01T10:40:30.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1784,7 +1784,7 @@ namespace ts {
         }
 
         function isSyntacticDefault(node: Node) {
-            return ((isExportAssignment(node) && !node.isExportEquals) || hasModifier(node, ModifierFlags.Default));
+            return ((isExportAssignment(node) && !node.isExportEquals) || hasModifier(node, ModifierFlags.Default) || isExportSpecifier(node));
         }
 
         function canHaveSyntheticDefault(file: SourceFile | undefined, moduleSymbol: Symbol, dontResolveAlias: boolean) {
diff --git a/tests/baselines/reference/reexportDefaultIsCallable.js b/tests/baselines/reference/reexportDefaultIsCallable.js
@@ -0,0 +1,36 @@
+//// [tests/cases/compiler/reexportDefaultIsCallable.ts] ////
+
+//// [schema.d.ts]
+export default class Schema {}
+//// [reexporter.d.ts]
+export { default } from "./schema";
+//// [usage.ts]
+import Base from "./reexporter";
+export default class Mine extends Base {}
+
+
+//// [usage.js]
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+var reexporter_1 = __importDefault(require("./reexporter"));
+var Mine = /** @class */ (function (_super) {
+    __extends(Mine, _super);
+    function Mine() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return Mine;
+}(reexporter_1["default"]));
+exports["default"] = Mine;
diff --git a/tests/baselines/reference/reexportDefaultIsCallable.symbols b/tests/baselines/reference/reexportDefaultIsCallable.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/schema.d.ts ===
+export default class Schema {}
+>Schema : Symbol(Schema, Decl(schema.d.ts, 0, 0))
+
+=== tests/cases/compiler/reexporter.d.ts ===
+export { default } from "./schema";
+>default : Symbol(default, Decl(reexporter.d.ts, 0, 8))
+
+=== tests/cases/compiler/usage.ts ===
+import Base from "./reexporter";
+>Base : Symbol(Base, Decl(usage.ts, 0, 6))
+
+export default class Mine extends Base {}
+>Mine : Symbol(Mine, Decl(usage.ts, 0, 32))
+>Base : Symbol(Base, Decl(usage.ts, 0, 6))
+
diff --git a/tests/baselines/reference/reexportDefaultIsCallable.types b/tests/baselines/reference/reexportDefaultIsCallable.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/schema.d.ts ===
+export default class Schema {}
+>Schema : Schema
+
+=== tests/cases/compiler/reexporter.d.ts ===
+export { default } from "./schema";
+>default : typeof import("tests/cases/compiler/schema").default
+
+=== tests/cases/compiler/usage.ts ===
+import Base from "./reexporter";
+>Base : typeof Base
+
+export default class Mine extends Base {}
+>Mine : Mine
+>Base : Base
+
diff --git a/tests/cases/compiler/reexportDefaultIsCallable.ts b/tests/cases/compiler/reexportDefaultIsCallable.ts
@@ -0,0 +1,8 @@
+// @esModuleInterop: true
+// @filename: schema.d.ts
+export default class Schema {}
+// @filename: reexporter.d.ts
+export { default } from "./schema";
+// @filename: usage.ts
+import Base from "./reexporter";
+export default class Mine extends Base {}

Original file line number	Diff line number	Diff line change
`@@ -1784,7 +1784,7 @@ namespace ts {`
`1784`	`1784`	`}`
`1785`	`1785`
`1786`	`1786`	`function isSyntacticDefault(node: Node) {`
`1787`		`- return ((isExportAssignment(node) && !node.isExportEquals) \|\| hasModifier(node, ModifierFlags.Default));`
	`1787`	`+ return ((isExportAssignment(node) && !node.isExportEquals) \|\| hasModifier(node, ModifierFlags.Default) \|\| isExportSpecifier(node));`
`1788`	`1788`	`}`
`1789`	`1789`
`1790`	`1790`	`function canHaveSyntheticDefault(file: SourceFile \| undefined, moduleSymbol: Symbol, dontResolveAlias: boolean) {`