microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-08 08:14:51 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

"fix(services): convert to es6 module generate invalid code with .default" (#43309)

Browse Source
This commit is contained in:
Sang 2021-03-31 09:24:31 +11:00 committed by GitHub
parent b549467368
commit a8ee22f73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/services/codefixes/convertToEs6Module.ts
View File

@ -436,7 +436,9 @@ namespace ts.codefix {
/**
* Convert `import x = require("x").`
* Also converts uses like `x.y()` to `y()` and uses a named import.
* Also:
* - Convert `x.default()` to `x()` to handle ES6 default export
* - Converts uses like `x.y()` to `y()` and uses a named import.
*/
function convertSingleIdentifierImport(name: Identifier, moduleSpecifier: StringLiteralLike, checker: TypeChecker, identifiers: Identifiers, quotePreference: QuotePreference): ConvertedImports {
const nameSymbol = checker.getSymbolAtLocation(name);
@ -454,15 +456,23 @@ namespace ts.codefix {
const { parent } = use;
if (isPropertyAccessExpression(parent)) {
const { expression, name: { text: propertyName } } = parent;
Debug.assert(expression === use, "Didn't expect expression === use"); // Else shouldn't have been in `collectIdentifiers`
let idName = namedBindingsNames.get(propertyName);
if (idName === undefined) {
idName = makeUniqueName(propertyName, identifiers);
namedBindingsNames.set(propertyName, idName);
}
const { name: { text: propertyName } } = parent;
if (propertyName === "default") {
needDefaultImport = true;
(useSitesToUnqualify ??= new Map()).set(parent, factory.createIdentifier(idName));
const importDefaultName = use.getText();
(useSitesToUnqualify ??= new Map()).set(parent, factory.createIdentifier(importDefaultName));
}
else {
Debug.assert(parent.expression === use, "Didn't expect expression === use"); // Else shouldn't have been in `collectIdentifiers`
let idName = namedBindingsNames.get(propertyName);
if (idName === undefined) {
idName = makeUniqueName(propertyName, identifiers);
namedBindingsNames.set(propertyName, idName);
}
(useSitesToUnqualify ??= new Map()).set(parent, factory.createIdentifier(idName));
}
}
else {
needDefaultImport = true;

19
tests/cases/fourslash/refactorConvertToEs6Module_import_es6DefaultImport.ts Normal file
View File

@ -0,0 +1,19 @@
/// <reference path='fourslash.ts' />
// @allowJs: true
// @target: esnext
// @Filename: /a.js
////const x = require('x');
////x.default();
////const y = require('y').default;
////y();
verify.codeFix({
description: "Convert to ES6 module",
newFileContent:
`import x from 'x';
x();
import y from 'y';
y();`,
});