Merge pull request #278 from timocov/external-inlines-with-re-exports

Fixed accidentally inlining export statements while inlining a library with namespaced imports/exports

src/bundle-generator.ts

@@ -207,7 +207,18 @@ export function generateDtsBundle(entries: readonly EntryPointConfig[], options:
 				for (const declaration of getDeclarationsForExportedValues(exportAssignment)) {
 					let exportedDeclarations: readonly ts.Statement[] = [];
 
-					if (ts.isModuleDeclaration(declaration)) {
+					if (ts.isExportDeclaration(exportAssignment) && ts.isSourceFile(declaration)) {
+						const referencedModule = getReferencedModuleInfo(exportAssignment, criteria, typeChecker);
+						if (referencedModule !== null) {
+							if (visitedModules.has(referencedModule.fileName)) {
+								continue;
+							}
+
+							visitedModules.add(referencedModule.fileName);
+						}
+
+						exportedDeclarations = declaration.statements;
+					} else if (ts.isModuleDeclaration(declaration)) {
 						if (declaration.body !== undefined && ts.isModuleBlock(declaration.body)) {
 							const referencedModule = getReferencedModuleInfo(declaration, criteria, typeChecker);
 							if (referencedModule !== null) {
@@ -258,7 +269,7 @@ export function generateDtsBundle(entries: readonly EntryPointConfig[], options:
 					}
 
 					if (ts.isExportDeclaration(statement)) {
-						if (!currentModule.isExternal) {
+						if (currentModule.type === ModuleType.ShouldBeInlined) {
 							continue;
 						}
 

src/helpers/typescript.ts

@@ -541,7 +541,13 @@ export function getClosestSourceFileLikeNode(node: ts.Node): ts.SourceFile | ts.
 	return ts.isSourceFile(node) ? node : node.parent;
 }
 
-export type NodeWithReferencedModule = ts.ExportDeclaration | ts.ModuleDeclaration | ts.ImportTypeNode | ts.ImportEqualsDeclaration | ts.ImportDeclaration;
+export type NodeWithReferencedModule =
+	| ts.ExportDeclaration
+	| ts.ImportDeclaration
+	| ts.ImportEqualsDeclaration
+	| ts.ImportTypeNode
+	| ts.ModuleDeclaration
+;
 
 export function resolveReferencedModule(node: NodeWithReferencedModule, typeChecker: ts.TypeChecker): ts.SourceFile | ts.ModuleDeclaration | null {
 	let moduleName: ts.Expression | ts.LiteralTypeNode | undefined;