-
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: correctly alias re-exported bindings which themselves may be ali…
…ased from other source files from the same chunk. Closes #176
- Loading branch information
Showing
27 changed files
with
434 additions
and
107 deletions.
There are no files selected for viewing
This file contains 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
50 changes: 50 additions & 0 deletions
50
...aration-bundler/transformers/deconflicter/visitor/deconflict-import-equals-declaration.ts
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import {DeconflicterVisitorOptions} from "../deconflicter-visitor-options"; | ||
import {TS} from "../../../../../../type/ts"; | ||
import {addBindingToLexicalEnvironment} from "../../../util/add-binding-to-lexical-environment"; | ||
import {isIdentifierFree} from "../../../util/is-identifier-free"; | ||
import {generateUniqueBinding} from "../../../util/generate-unique-binding"; | ||
import {preserveMeta} from "../../../util/clone-node-with-meta"; | ||
import {getOriginalSourceFile} from "../../../util/get-original-source-file"; | ||
import {getIdForNode} from "../../../util/get-id-for-node"; | ||
import { isNodeInternalAlias } from "../../../util/node-util"; | ||
|
||
/** | ||
* Deconflicts the given ImportClause. | ||
*/ | ||
export function deconflictImportEqualsDeclaration(options: DeconflicterVisitorOptions<TS.ImportEqualsDeclaration>): TS.ImportEqualsDeclaration | undefined { | ||
const {node, lexicalEnvironment, sourceFile, typescript, factory, declarationToDeconflictedBindingMap} = options; | ||
let nameContResult: TS.ImportClause["name"]; | ||
const originalSourceFile = getOriginalSourceFile(node, sourceFile, typescript); | ||
|
||
const id = getIdForNode({...options}); | ||
|
||
if (isIdentifierFree(lexicalEnvironment, node.name.text, originalSourceFile.fileName, isNodeInternalAlias(node, typescript))) { | ||
nameContResult = node.name; | ||
|
||
if (id != null) { | ||
declarationToDeconflictedBindingMap.set(id, node.name.text); | ||
} | ||
|
||
// The name creates a new local binding within the current LexicalEnvironment | ||
addBindingToLexicalEnvironment(lexicalEnvironment, originalSourceFile.fileName, node.name.text); | ||
} else { | ||
// Otherwise, deconflict it | ||
const uniqueBinding = generateUniqueBinding(lexicalEnvironment, node.name.text); | ||
nameContResult = factory.createIdentifier(uniqueBinding); | ||
|
||
if (id != null) { | ||
declarationToDeconflictedBindingMap.set(id, uniqueBinding); | ||
} | ||
|
||
// The name creates a new local binding within the current LexicalEnvironment | ||
addBindingToLexicalEnvironment(lexicalEnvironment, originalSourceFile.fileName, uniqueBinding, node.name.text); | ||
} | ||
|
||
const isIdentical = nameContResult === node.name; | ||
|
||
if (isIdentical) { | ||
return node; | ||
} | ||
|
||
return preserveMeta(factory.updateImportEqualsDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, nameContResult, node.moduleReference), node, options); | ||
} |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.