Fix removedExports to correctly track the exported item

closes #2834

src/Module.ts

@@ -66,7 +66,6 @@ export interface ImportDescription {
 export interface ExportDescription {
 	identifier?: string;
 	localName: string;
-	node?: Node;
 }
 
 export interface ReexportDescription {
@@ -334,8 +333,8 @@ export default class Module {
 		const renderedExports: string[] = [];
 		const removedExports: string[] = [];
 		for (const exportName in this.exports) {
-			const expt = this.exports[exportName];
-			(expt.node && expt.node.included ? renderedExports : removedExports).push(exportName);
+			const node = this.getVariableForExportName(exportName);
+			(node && node.included ? renderedExports : removedExports).push(exportName);
 		}
 		return { renderedExports, removedExports };
 	}
@@ -666,8 +665,7 @@ export default class Module {
 
 			this.exports.default = {
 				identifier: node.variable.getOriginalVariableName(),
-				localName: 'default',
-				node
+				localName: 'default'
 			};
 		} else if ((<ExportNamedDeclaration>node).declaration) {
 			// export var { foo, bar } = ...
@@ -679,13 +677,13 @@ export default class Module {
 			if (declaration.type === NodeType.VariableDeclaration) {
 				for (const decl of declaration.declarations) {
 					for (const localName of extractAssignedNames(decl.id)) {
-						this.exports[localName] = { localName, node };
+						this.exports[localName] = { localName };
 					}
 				}
 			} else {
 				// export function foo () {}
 				const localName = declaration.id.name;
-				this.exports[localName] = { localName, node };
+				this.exports[localName] = { localName };
 			}
 		} else {
 			// export { foo, bar, baz }
@@ -703,7 +701,7 @@ export default class Module {
 					);
 				}
 
-				this.exports[exportedName] = { localName, node };
+				this.exports[exportedName] = { localName };
 			}
 		}
 	}

test/misc/bundle-information.js

@@ -416,4 +416,95 @@ console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).the
 				);
 			});
 	});
+
+	it('contains correct information about rendered/removedExports', () => {
+		return Promise.all([
+			rollup
+				.rollup({
+					input: ['input'],
+					plugins: [
+						loader({
+							input: 'export { renderedFn, renderedClass, renderedConst } from "code"',
+							code:
+								'export function renderedFn() {}\nexport function removedFn() {}\n' +
+								'export class renderedClass {}\nexport class removedClass {}\n' +
+								'export const renderedConst = 1;\nexport const removedConst = 1;'
+						})
+					]
+				})
+				.then(bundle =>
+					bundle.generate({
+						format: 'esm'
+					})
+				),
+			rollup
+				.rollup({
+					input: ['input'],
+					plugins: [
+						loader({
+							input: 'export { renderedFn, renderedClass, renderedConst } from "code"',
+							code:
+								'function renderedFn() {}\nfunction removedFn() {}\n' +
+								'class renderedClass {}\nclass removedClass {}\n' +
+								'const renderedConst = 1;\nconst removedConst = 1;\n' +
+								'export { renderedFn, renderedClass, renderedConst, removedFn, removedClass, removedConst }'
+						})
+					]
+				})
+				.then(bundle =>
+					bundle.generate({
+						format: 'esm'
+					})
+				)
+		]).then(([{ output: output1 }, { output: output2 }]) => {
+			assert.deepEqual(
+				output1[0].code,
+				'function renderedFn() {}\nclass renderedClass {}\nconst renderedConst = 1;\n\nexport { renderedClass, renderedConst, renderedFn };\n',
+				'code'
+			);
+			assert.deepEqual(output1[0].code, output2[0].code, 'code');
+			assert.deepEqual(
+				output1[0].exports,
+				['renderedClass', 'renderedConst', 'renderedFn'],
+				'exports'
+			);
+			assert.deepEqual(output1[0].exports, output2[0].exports, 'exports');
+			assert.deepEqual(
+				output1[0].modules,
+				{
+					code: {
+						originalLength: 184,
+						removedExports: ['removedFn', 'removedClass', 'removedConst'],
+						renderedExports: ['renderedFn', 'renderedClass', 'renderedConst'],
+						renderedLength: 72
+					},
+					input: {
+						originalLength: 63,
+						removedExports: [],
+						renderedExports: [],
+						renderedLength: 0
+					}
+				},
+				'modules'
+			);
+			assert.deepEqual(
+				output2[0].modules,
+				{
+					code: {
+						originalLength: 233,
+						removedExports: ['removedFn', 'removedClass', 'removedConst'],
+						renderedExports: ['renderedFn', 'renderedClass', 'renderedConst'],
+						renderedLength: 72
+					},
+					input: {
+						originalLength: 63,
+						removedExports: [],
+						renderedExports: [],
+						renderedLength: 0
+					}
+				},
+				'modules'
+			);
+		});
+	});
 });