Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ron Buckton
2024-03-11 17:15:32 -04:00
committed by GitHub
parent 193d3ccef7
commit aa18962892
7 changed files with 75 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/transformers/utilities.ts
+8 -4
View File
@@ -68,6 +68,7 @@ import {
map,
MethodDeclaration,
ModifierFlags,
NamedExportBindings,
NamedImportBindings,
NamespaceExport,
Node,
@@ -109,14 +110,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 */
@@ -216,6 +219,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;
tests/baselines/reference/importHelpersNoEmitHelpersExportDefault.js
+36
View File
@@ -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; } });
tests/baselines/reference/nodeModulesAllowJsImportHelpersCollisions3(module=node16).js
+3 -5
View File
@@ -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]
tests/baselines/reference/nodeModulesAllowJsImportHelpersCollisions3(module=nodenext).js
+3 -5
View File
@@ -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]
tests/baselines/reference/nodeModulesImportHelpersCollisions3(module=node16).js
+2 -4
View File
@@ -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";
tests/baselines/reference/nodeModulesImportHelpersCollisions3(module=nodenext).js
+2 -4
View File
@@ -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";
tests/cases/compiler/importHelpersNoEmitHelpersExportDefault.ts
+21
View File
@@ -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;
}