Fix namespace name conflict detection in "Convert named imports to namespace import" action #45019
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
typescript-bot
added
the
For Milestone Bug
gabritto
commented
Jul 14, 2021
| if (!neededNamedImports.some(n => n.name === element.name)) { | ||
| neededNamedImports.push(factory.createImportSpecifier(element.propertyName && factory.createIdentifier(element.propertyName.text), factory.createIdentifier(element.name.text))); | ||
| } | ||
| else if (isExportSpecifier(id.parent)) { |
There was a problem hiding this comment.
Old code disregarded named export clauses that aliased the reference to the named import, so code such as
import { a } from "m";
export { a as b };was in fact incorrectly refactored into
import { a } from "m";
export { m.a as b };
gabritto
commented
Jul 14, 2021
| const neededNamedImports: ImportSpecifier[] = []; | ||
| // Imports that need to be kept as named imports in the refactored code, to avoid changing the semantics. | ||
| // More specifically, those are named imports that appear in named exports in the original code, e.g. `a` in `import { a } from "m"; export { a }`. | ||
| const neededNamedImports: Set<ImportSpecifier> = new Set(); |
There was a problem hiding this comment.
Changed to use a set instead of an array. The old code used the array as a set by comparing the named imports' name properties (of type Identifiers) (element.name in for loop below), but it pushed into the array a node with a newly-created Identifier as name, so in fact this new node's name would never be equal to the named imports' name, and therefore the same named import could be repeated, as in:
import { a, b } from "m";
export { b };
export { b as c };would become
import * as m from "m";
import { b, b } from "m"; // Duplicate b import
export { b };
export { b as c };
gabritto
changed the title
andrewbranch
approved these changes
Jul 14, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #44267