Include reexported names in list of exported names (#38809)

Author: weswigham

src/compiler/transformers/module/system.ts

@@ -339,37 +339,6 @@ namespace ts {
  }
  }
 
- for (const externalImport of moduleInfo.externalImports) {
- if (externalImport.kind !== SyntaxKind.ExportDeclaration) {
- continue;
- }
-
- if (!externalImport.exportClause) {
- // export * from ...
- continue;
- }
-
- if (isNamedExports(externalImport.exportClause)) {
- for (const element of externalImport.exportClause.elements) {
- // write name of indirectly exported entry, i.e. 'export {x} from ...'
- exportedNames.push(
- createPropertyAssignment(
- createLiteral(idText(element.name || element.propertyName)),
- createTrue()
- )
- );
- }
- }
- else {
- exportedNames.push(
- createPropertyAssignment(
- createLiteral(idText(externalImport.exportClause.name)),
- createTrue()
- )
- );
- }
- }
-
  const exportedNamesStorageRef = createUniqueName("exportedNames");
  statements.push(
  createVariableStatement(

src/compiler/transformers/utilities.ts

@@ -112,26 +112,22 @@ namespace ts {
  // export * as ns from "mod"
  // export { x, y } from "mod"
  externalImports.push(<ExportDeclaration>node);
+ if (isNamedExports((node as ExportDeclaration).exportClause!)) {
+ addExportedNamesForExportDeclaration(node as ExportDeclaration);
+ }
+ else {
+ const name = ((node as ExportDeclaration).exportClause as NamespaceExport).name;
+ if (!uniqueExports.get(idText(name))) {
+ multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name);
+ uniqueExports.set(idText(name), true);
+ exportedNames = append(exportedNames, name);
+ }
+ }
  }
  }
  else {
  // export { x, y }
- for (const specifier of cast((<ExportDeclaration>node).exportClause, isNamedExports).elements) {
- if (!uniqueExports.get(idText(specifier.name))) {
- const name = specifier.propertyName || specifier.name;
- exportSpecifiers.add(idText(name), specifier);
-
- const decl = resolver.getReferencedImportDeclaration(name)
- || resolver.getReferencedValueDeclaration(name);
-
- if (decl) {
- multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
- }
-
- uniqueExports.set(idText(specifier.name), true);
- exportedNames = append(exportedNames, specifier.name);
- }
- }
+ addExportedNamesForExportDeclaration(node as ExportDeclaration);
  }
  break;
 
@@ -200,6 +196,25 @@ namespace ts {
  }
 
  return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues, exportedBindings, exportedNames, externalHelpersImportDeclaration };
+
+ function addExportedNamesForExportDeclaration(node: ExportDeclaration) {
+ for (const specifier of cast(node.exportClause, isNamedExports).elements) {
+ if (!uniqueExports.get(idText(specifier.name))) {
+ const name = specifier.propertyName || specifier.name;
+ exportSpecifiers.add(idText(name), specifier);
+
+ const decl = resolver.getReferencedImportDeclaration(name)
+ || resolver.getReferencedValueDeclaration(name);
+
+ if (decl) {
+ multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+ }
+
+ uniqueExports.set(idText(specifier.name), true);
+ exportedNames = append(exportedNames, specifier.name);
+ }
+ }
+ }
  }
 
  function collectExportedVariableInfo(decl: VariableDeclaration | BindingElement, uniqueExports: Map<boolean>, exportedNames: Identifier[] | undefined) {

tests/baselines/reference/ambientShorthand_reExport.js

@@ -26,6 +26,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
  o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports.x = void 0;
 var jquery_1 = require("jquery");
 __createBinding(exports, jquery_1, "x");
 //// [reExportAll.js]

tests/baselines/reference/commentsOnRequireStatement.js

@@ -29,6 +29,7 @@ exports.subject1 = 10;
 //// [2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.subject1 = exports.subject = void 0;
 /* blah0 */
 // blah 
 // blah 

tests/baselines/reference/constEnumPreserveEmitReexport.js

@@ -36,5 +36,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
  o[k2] = m[k];
 }));
 exports.__esModule = true;
+exports["default"] = void 0;
 var ConstEnum_1 = require("./ConstEnum");
 __createBinding(exports, ConstEnum_1, "MyConstEnum", "default");

tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js

@@ -37,6 +37,7 @@ exports.x = 10;
 //// [client.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = exports.instantiatedModule = exports.c2 = exports.c = void 0;
 var server_1 = require("./server");
 Object.defineProperty(exports, "c", { enumerable: true, get: function () { return server_1.c; } });
 var server_2 = require("./server");

tests/baselines/reference/es6ExportEqualsInterop.js

@@ -220,6 +220,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
  for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 exports.__esModule = true;
+exports.a0 = exports.a9 = exports.a8 = exports.a7 = exports.a6 = exports.a5 = exports.a4 = exports.a3 = exports.a2 = exports.a1 = void 0;
 var z2 = require("variable");
 var z3 = require("interface-variable");
 var z4 = require("module");

tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js

@@ -37,6 +37,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
  for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 exports.__esModule = true;
+exports.y = exports.x = void 0;
 var fs = __importStar(require("./fs"));
 fs;
 __exportStar(require("./fs"), exports);

tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js

@@ -37,6 +37,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
  for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.y = exports.x = void 0;
 var fs = __importStar(require("./fs"));
 fs;
 __exportStar(require("./fs"), exports);

tests/baselines/reference/exportAsNamespace1(module=amd).js

@@ -27,6 +27,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./0"], function (require, exports, ns) {
  "use strict";
  exports.__esModule = true;
+ exports.ns = void 0;
  exports.ns = ns;
  ns.a;
  ns.b;