Skip to content

Fix emit for export { default } from ... when both importHelpers and esModuleInterop are enabled #57220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2024
Merged

Fix emit for export { default } from ... when both importHelpers and esModuleInterop are enabled #57220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/compiler/transformers/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import {
map,
MethodDeclaration,
ModifierFlags,
NamedExportBindings,
NamedImportBindings,
NamespaceExport,
Node,
Expand Down Expand Up @@ -108,14 +109,16 @@ export interface ExternalModuleInfo {
hasExportStarsToExportValues: boolean; // whether this module contains export*
}

function containsDefaultReference(node: NamedImportBindings | undefined) {
function containsDefaultReference(node: NamedImportBindings | NamedExportBindings | undefined) {
if (!node) return false;
if (!isNamedImports(node)) return false;
if (!isNamedImports(node) && !isNamedExports(node)) return false;
return some(node.elements, isNamedDefaultReference);
}

function isNamedDefaultReference(e: ImportSpecifier): boolean {
return e.propertyName !== undefined && e.propertyName.escapedText === InternalSymbolName.Default;
function isNamedDefaultReference(e: ImportSpecifier | ExportSpecifier): boolean {
return e.propertyName !== undefined ?
e.propertyName.escapedText === InternalSymbolName.Default :
e.name.escapedText === InternalSymbolName.Default;
}

/** @internal */
Expand Down Expand Up @@ -214,6 +217,7 @@ export function collectExternalModuleInfo(context: TransformationContext, source
externalImports.push(node as ExportDeclaration);
if (isNamedExports((node as ExportDeclaration).exportClause!)) {
addExportedNamesForExportDeclaration(node as ExportDeclaration);
hasImportDefault ||= containsDefaultReference((node as ExportDeclaration).exportClause);
}
else {
const name = ((node as ExportDeclaration).exportClause as NamespaceExport).name;
Expand Down
36 changes: 36 additions & 0 deletions tests/baselines/reference/importHelpersNoEmitHelpersExportDefault.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//// [tests/cases/compiler/importHelpersNoEmitHelpersExportDefault.ts] ////

//// [main.ts]
// https://github.com/microsoft/TypeScript/issues/40328
export { default as A } from "./other";

//// [main2.ts]
export { default } from "./other";

//// [other.ts]
export default {};

//// [tslib.d.ts]
declare module "tslib" {
function __importDefault(m: any): void;
}

//// [other.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = {};
//// [main.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.A = void 0;
var tslib_1 = require("tslib");
// https://github.com/microsoft/TypeScript/issues/40328
var other_1 = require("./other");
Object.defineProperty(exports, "A", { enumerable: true, get: function () { return tslib_1.__importDefault(other_1).default; } });
//// [main2.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = void 0;
var tslib_1 = require("tslib");
var other_1 = require("./other");
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(other_1).default; } });
8 changes: 3 additions & 5 deletions tests/baselines/reference/nodeModulesAllowJsImportHelpersCollisions3(module=node16).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@ declare module "tslib" {

//// [index.js]
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.baz = exports.foo = exports.default = void 0;
var tslib_1 = require("tslib");
// cjs format file
var fs_1 = require("fs");
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(fs_1).default; } });
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } });
var fs_2 = require("fs");
Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return __importDefault(fs_2).default; } });
Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_2).default; } });
var fs_3 = require("fs");
Object.defineProperty(exports, "baz", { enumerable: true, get: function () { return fs_3.bar; } });
//// [index.js]
Expand Down
8 changes: 3 additions & 5 deletions tests/baselines/reference/nodeModulesAllowJsImportHelpersCollisions3(module=nodenext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@ declare module "tslib" {

//// [index.js]
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.baz = exports.foo = exports.default = void 0;
var tslib_1 = require("tslib");
// cjs format file
var fs_1 = require("fs");
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(fs_1).default; } });
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } });
var fs_2 = require("fs");
Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return __importDefault(fs_2).default; } });
Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_2).default; } });
var fs_3 = require("fs");
Object.defineProperty(exports, "baz", { enumerable: true, get: function () { return fs_3.bar; } });
//// [index.js]
Expand Down
6 changes: 2 additions & 4 deletions tests/baselines/reference/nodeModulesImportHelpersCollisions3(module=node16).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ declare module "tslib" {

//// [index.js]
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = void 0;
var tslib_1 = require("tslib");
// cjs format file
var fs_1 = require("fs");
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(fs_1).default; } });
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } });
//// [index.js]
// esm format file
export { default } from "fs";
Expand Down
6 changes: 2 additions & 4 deletions tests/baselines/reference/nodeModulesImportHelpersCollisions3(module=nodenext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ declare module "tslib" {

//// [index.js]
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = void 0;
var tslib_1 = require("tslib");
// cjs format file
var fs_1 = require("fs");
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(fs_1).default; } });
Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } });
//// [index.js]
// esm format file
export { default } from "fs";
Expand Down
21 changes: 21 additions & 0 deletions tests/cases/compiler/importHelpersNoEmitHelpersExportDefault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// @target: es5
// @module: commonjs
// @importHelpers: true
// @noEmitHelpers: true
// @esModuleInterop: true
// @noTypesAndSymbols: true

// @filename: main.ts
// https://github.com/microsoft/TypeScript/issues/40328
export { default as A } from "./other";

// @filename: main2.ts
export { default } from "./other";

// @filename: other.ts
export default {};

// @filename: tslib.d.ts
declare module "tslib" {
function __importDefault(m: any): void;
}