fix(bug): fixes issue with default exports of varying types

Author: wessberg

package.json

@@ -51,9 +51,9 @@
 "@wessberg/scaffold": "^1.0.17",
 "@wessberg/ts-config": "^0.0.39",
 "standard-changelog": "^2.0.7",
-"@wessberg/rollup-plugin-ts": "^1.1.45",
-"tslint": "^5.15.0",
-"prettier": "^1.16.4",
+"@wessberg/rollup-plugin-ts": "^1.1.46",
+"tslint": "^5.16.0",
+"prettier": "^1.17.0",
 "pretty-quick": "^1.10.0",
 "husky": "^1.3.1",
 "np": "^4.0.2"
@@ -73,9 +73,9 @@
 "@types/mkdirp": "^0.5.2",
 "@types/node": "^11.13.4",
 "@types/resolve": "0.0.8",
-"@wessberg/browserslist-generator": "1.0.16",
+"@wessberg/browserslist-generator": "1.0.18",
 "@wessberg/stringutil": "^1.0.18",
-"browserslist": "^4.5.4",
+"browserslist": "^4.5.5",
 "find-up": "^3.0.0",
 "magic-string": "^0.25.2",
 "mkdirp": "^0.5.1",

src/service/transformer/declaration-bundler/i-declaration-bundler-options.ts

@@ -1,14 +1,16 @@
 import {OutputChunk} from "rollup";
+import {SyntaxKind, TypeChecker} from "typescript";
 
 export interface IDeclarationBundlerOptions {
 chunk: OutputChunk;
 usedExports: Set<string>;
+typeChecker: TypeChecker;
 supportedExtensions: string[];
 localModuleNames: string[];
 moduleNames: string[];
 relativeOutFileName: string;
 absoluteOutFileName: string;
 entryFileNames: string[];
 chunkToOriginalFileMap: Map<string, string[]>;
-identifiersForDefaultExportsForModules: Map<string, string>;
+identifiersForDefaultExportsForModules: Map<string, [string, SyntaxKind]>;
 }

src/service/transformer/declaration-bundler/update-exports/visitor/visit-class-declaration.ts

@@ -29,7 +29,7 @@ export function visitClassDeclaration({
 
 // If the node has a default export, mark it as the identifier for the default export of that module
 if (hasDefaultExportModifier(node.modifiers)) {
-identifiersForDefaultExportsForModules.set(sourceFile.fileName, node.name!.text);
+identifiersForDefaultExportsForModules.set(sourceFile.fileName, [node.name!.text, node.kind]);
 } else {
 // Add the node name to the exported symbols
 parsedExportedSymbols.add(node.name!.text);

src/service/transformer/declaration-bundler/update-exports/visitor/visit-enum-declaration.ts

@@ -29,7 +29,7 @@ export function visitEnumDeclaration({
 
 // If the node has a default export, mark it as the identifier for the default export of that module
 if (hasDefaultExportModifier(node.modifiers)) {
-identifiersForDefaultExportsForModules.set(sourceFile.fileName, node.name.text);
+identifiersForDefaultExportsForModules.set(sourceFile.fileName, [node.name.text, node.kind]);
 } else {
 // Add the node name to the exported symbols
 parsedExportedSymbols.add(node.name.text);

src/service/transformer/declaration-bundler/update-exports/visitor/visit-export-assignment.ts

@@ -1,15 +1,26 @@
-import {ExportAssignment, VariableStatement} from "typescript";
+import {ExportAssignment, isIdentifier, VariableStatement} from "typescript";
 import {UpdateExportsVisitorOptions} from "../update-exports-visitor-options";
+import {getAliasedDeclaration} from "../../util/symbol/get-aliased-declaration";
 
 /**
  * Visits the given ExportAssignment.
  * @param {UpdateExportsVisitorOptions<ExportAssignment>} options
  * @returns {ExportAssignment | VariableStatement | undefined}
  */
-export function visitExportAssignment({node, isEntry}: UpdateExportsVisitorOptions<ExportAssignment>): ExportAssignment | VariableStatement | undefined {
+export function visitExportAssignment({
+node,
+sourceFile,
+isEntry,
+typeChecker,
+identifiersForDefaultExportsForModules
+}: UpdateExportsVisitorOptions<ExportAssignment>): ExportAssignment | VariableStatement | undefined {
 // Only preserve the node if it is part of the entry file for the chunk
 if (isEntry) {
 return node;
+} else if (isIdentifier(node.expression)) {
+const declaration = getAliasedDeclaration(node.expression, typeChecker);
+const kind = declaration == null ? node.expression.kind : declaration.kind;
+identifiersForDefaultExportsForModules.set(sourceFile.fileName, [node.expression.text, kind]);
 }
 
 return undefined;

src/service/transformer/declaration-bundler/update-exports/visitor/visit-export-declaration.ts

@@ -37,6 +37,7 @@ export function visitExportDeclaration({
 const specifier = node.moduleSpecifier;
 const symbol = (node as {symbol?: Symbol}).symbol;
 const isExportStar = symbol != null && (symbol.flags & SymbolFlags.ExportStar) !== 0;
+
 if (specifier == null || !isStringLiteralLike(specifier)) {
 // Remove the export if it exports no bindings at all
 if (node.moduleSpecifier == null && node.exportClause != null && node.exportClause.elements.length < 1) return undefined;
@@ -85,9 +86,9 @@ export function visitExportDeclaration({
 if (identifiersForDefaultExportsForModules.has(path)) {
 // We have a match!
 if (element.propertyName != null) {
-exportSpecifiersWithReplacements.set(element, createExportSpecifier(identifiersForDefaultExportsForModules.get(path)!, element.name));
+exportSpecifiersWithReplacements.set(element, createExportSpecifier(identifiersForDefaultExportsForModules.get(path)![0], element.name));
 } else {
-exportSpecifiersWithReplacements.set(element, createExportSpecifier(identifiersForDefaultExportsForModules.get(path)!, "default"));
+exportSpecifiersWithReplacements.set(element, createExportSpecifier(identifiersForDefaultExportsForModules.get(path)![0], "default"));
 }
 break;
 }

src/service/transformer/declaration-bundler/update-exports/visitor/visit-function-declaration.ts

@@ -29,7 +29,7 @@ export function visitFunctionDeclaration({
 
 // If the Function has a default export, mark it as the identifier for the default export of that module
 if (hasDefaultExportModifier(node.modifiers)) {
-identifiersForDefaultExportsForModules.set(sourceFile.fileName, node.name!.text);
+identifiersForDefaultExportsForModules.set(sourceFile.fileName, [node.name!.text, node.kind]);
 } else {
 // Add the function name to the exported symbols
 parsedExportedSymbols.add(node.name!.text);

src/service/transformer/declaration-bundler/update-exports/visitor/visit-import-declaration.ts

@@ -2,13 +2,17 @@ import {
 createIdentifier,
 createModifier,
 createStringLiteral,
+createTypeAliasDeclaration,
+createTypeQueryNode,
+createTypeReferenceNode,
 createVariableDeclaration,
 createVariableDeclarationList,
 createVariableStatement,
 ImportDeclaration,
 isStringLiteralLike,
 NodeFlags,
 SyntaxKind,
+TypeAliasDeclaration,
 updateImportDeclaration,
 VariableStatement
 } from "typescript";
@@ -20,7 +24,7 @@ import {setExtension} from "../../../../../util/path/path-util";
 /**
  * Visits the given ImportDeclaration.
  * @param {UpdateExportsVisitorOptions<ImportDeclaration>} options
- * @returns {VariableStatement | undefined}
+ * @returns {ImportDeclaration | VariableStatement | TypeAliasDeclaration | undefined}
  */
 export function visitImportDeclaration({
 node,
@@ -30,7 +34,7 @@ export function visitImportDeclaration({
 relativeOutFileName,
 chunkToOriginalFileMap,
 identifiersForDefaultExportsForModules
-}: UpdateExportsVisitorOptions<ImportDeclaration>): ImportDeclaration | VariableStatement | undefined {
+}: UpdateExportsVisitorOptions<ImportDeclaration>): ImportDeclaration | VariableStatement | TypeAliasDeclaration | undefined {
 const specifier = node.moduleSpecifier;
 if (specifier == null || !isStringLiteralLike(specifier)) return node;
 
@@ -51,10 +55,36 @@ export function visitImportDeclaration({
 for (const extension of ["", ...supportedExtensions]) {
 const path = extension === "" ? join(dirname(sourceFile.fileName), specifier.text) : setExtension(join(dirname(sourceFile.fileName), specifier.text), extension);
 if (identifiersForDefaultExportsForModules.has(path)) {
-return createVariableStatement(
-[createModifier(SyntaxKind.DeclareKeyword)],
-createVariableDeclarationList([createVariableDeclaration(node.importClause.name.text, undefined, createIdentifier(identifiersForDefaultExportsForModules.get(path)!))], NodeFlags.Const)
-);
+const [identifier, kind] = identifiersForDefaultExportsForModules.get(path)!;
+
+// If the name of the identifier is identical to that of the import, it is already in the scope with the correct name. Leave it be
+if (identifier === node.importClause.name.text) continue;
+
+switch (kind) {
+case SyntaxKind.ClassDeclaration:
+case SyntaxKind.ClassExpression: {
+return createVariableStatement(
+[createModifier(SyntaxKind.DeclareKeyword)],
+createVariableDeclarationList([createVariableDeclaration(node.importClause.name.text, createTypeQueryNode(createIdentifier(identifier)))], NodeFlags.Const)
+);
+}
+
+case SyntaxKind.TypeAliasDeclaration:
+case SyntaxKind.InterfaceDeclaration:
+case SyntaxKind.EnumDeclaration: {
+return createTypeAliasDeclaration(undefined, [createModifier(SyntaxKind.DeclareKeyword)], node.importClause.name.text, undefined, createTypeReferenceNode(identifier, undefined));
+}
+
+case SyntaxKind.FunctionDeclaration:
+case SyntaxKind.FunctionExpression:
+case SyntaxKind.VariableDeclaration:
+default: {
+return createVariableStatement(
+[createModifier(SyntaxKind.DeclareKeyword)],
+createVariableDeclarationList([createVariableDeclaration(node.importClause.name.text, undefined, createIdentifier(identifier))], NodeFlags.Const)
+);
+}
+}
 }
 }
 }

src/service/transformer/declaration-bundler/update-exports/visitor/visit-interface-declaration.ts

@@ -29,7 +29,7 @@ export function visitInterfaceDeclaration({
 
 // If the node has a default export, mark it as the identifier for the default export of that module
 if (hasDefaultExportModifier(node.modifiers)) {
-identifiersForDefaultExportsForModules.set(sourceFile.fileName, node.name.text);
+identifiersForDefaultExportsForModules.set(sourceFile.fileName, [node.name.text, node.kind]);
 } else {
 // Add the node name to the exported symbols
 parsedExportedSymbols.add(node.name.text);

src/service/transformer/declaration-bundler/update-exports/visitor/visit-module-declaration.ts

@@ -29,7 +29,7 @@ export function visitModuleDeclaration({
 
 // If the node has a default export, mark it as the identifier for the default export of that module
 if (hasDefaultExportModifier(node.modifiers)) {
-identifiersForDefaultExportsForModules.set(sourceFile.fileName, node.name.text);
+identifiersForDefaultExportsForModules.set(sourceFile.fileName, [node.name.text, node.kind]);
 } else {
 // Add the node name to the exported symbols
 parsedExportedSymbols.add(node.name.text);