Skip to content

Commit

Permalink
Fix for namespace exports as well and add evaluation tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbuckton
rbuckton committed Feb 10, 2021
1 parent 0bf051b commit b788c09
Show file tree
Hide file tree
Showing 13 changed files with 369 additions and 112 deletions.
90 changes: 42 additions & 48 deletions src/compiler/transformers/module/module.ts
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
/*@internal*/
namespace ts {

const enum ImportOrExportBindingReferenceKind {
None,
ImportedHelper,
TopLevelExportBinding,
ImportClause,
ImportSpecifier,
}

type ImportOrExportBindingReferenceResult =
| { kind: ImportOrExportBindingReferenceKind.None, node: undefined }
| { kind: ImportOrExportBindingReferenceKind.ImportedHelper, node: Identifier }
| { kind: ImportOrExportBindingReferenceKind.TopLevelExportBinding, node: undefined }
| { kind: ImportOrExportBindingReferenceKind.ImportClause, node: ImportClause }
| { kind: ImportOrExportBindingReferenceKind.ImportSpecifier, node: ImportSpecifier };

const noReferenceResult: ImportOrExportBindingReferenceResult = { kind: ImportOrExportBindingReferenceKind.None, node: undefined };
const topLevelExportReferenceResult: ImportOrExportBindingReferenceResult = { kind: ImportOrExportBindingReferenceKind.TopLevelExportBinding, node: undefined };

export function transformModule(context: TransformationContext) {
interface AsynchronousDependencies {
aliasedModuleNames: Expression[];
Expand Down Expand Up @@ -67,7 +49,7 @@ namespace ts {
let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored.
let needUMDDynamicImportHelper: boolean;
let bindingReferenceCache: ESMap<Node, ImportOrExportBindingReferenceResult> | undefined;
let bindingReferenceCache: ESMap<Node, Identifier | SourceFile | ImportClause | ImportSpecifier | undefined> | undefined;

return chainBundle(context, transformSourceFile);

Expand Down Expand Up @@ -1776,49 +1758,61 @@ namespace ts {
return node;
}

function getImportOrExportBindingReferenceWorker(node: Identifier): ImportOrExportBindingReferenceResult {
/**
* For an Identifier, gets the import or export binding that it references.
* @returns One of the following:
* - An `Identifier` if node references an external helpers module (i.e., `tslib`).
* - A `SourceFile` if the node references an export in the file.
* - An `ImportClause` or `ImportSpecifier` if the node references an import binding.
* - Otherwise, `undefined`.
*/
function getImportOrExportBindingReferenceWorker(node: Identifier): Identifier | SourceFile | ImportClause | ImportSpecifier | undefined {
if (getEmitFlags(node) & EmitFlags.HelperName) {
const externalHelpersModuleName = getExternalHelpersModuleName(currentSourceFile);
if (externalHelpersModuleName) {
return { kind: ImportOrExportBindingReferenceKind.ImportedHelper, node: externalHelpersModuleName };
return externalHelpersModuleName;
}
}
else if (!(isGeneratedIdentifier(node) && !(node.autoGenerateFlags & GeneratedIdentifierFlags.AllowNameSubstitution)) && !isLocalName(node)) {
const exportContainer = resolver.getReferencedExportContainer(node, isExportName(node));
if (exportContainer?.kind === SyntaxKind.SourceFile) {
return topLevelExportReferenceResult;
return exportContainer;
}
const importDeclaration = resolver.getReferencedImportDeclaration(node);
if (importDeclaration) {
if (isImportClause(importDeclaration)) return { kind: ImportOrExportBindingReferenceKind.ImportClause, node: importDeclaration };
if (isImportSpecifier(importDeclaration)) return { kind: ImportOrExportBindingReferenceKind.ImportSpecifier, node: importDeclaration };
if (importDeclaration && (isImportClause(importDeclaration) || isImportSpecifier(importDeclaration))) {
return importDeclaration;
}
}
return noReferenceResult;
return undefined;
}

function getImportOrExportBindingReference(node: Identifier, removeEntry: boolean): ImportOrExportBindingReferenceResult {
bindingReferenceCache ||= new Map();
let result = bindingReferenceCache.get(node);
if (!result) {
/**
* For an Identifier, gets the import or export binding that it references.
* @param removeEntry When `false`, the result is cached to avoid recomputing the result in a later substitution.
* When `true`, any cached result for the node is removed.
* @returns One of the following:
* - An `Identifier` if node references an external helpers module (i.e., `tslib`).
* - A `SourceFile` if the node references an export in the file.
* - An `ImportClause` or `ImportSpecifier` if the node references an import binding.
* - Otherwise, `undefined`.
*/
function getImportOrExportBindingReference(node: Identifier, removeEntry: boolean): Identifier | SourceFile | ImportClause | ImportSpecifier | undefined {
let result = bindingReferenceCache?.get(node);
if (!result && !bindingReferenceCache?.has(node)) {
result = getImportOrExportBindingReferenceWorker(node);
if (!removeEntry) {
switch (result.kind) {
case ImportOrExportBindingReferenceKind.ImportedHelper:
case ImportOrExportBindingReferenceKind.ImportClause:
case ImportOrExportBindingReferenceKind.ImportSpecifier:
bindingReferenceCache.set(node, result);
}
bindingReferenceCache ||= new Map();
bindingReferenceCache.set(node, result);
}
}
else if (removeEntry) {
bindingReferenceCache.delete(node);
bindingReferenceCache?.delete(node);
}
return result;
}

function substituteCallExpression(node: CallExpression) {
if (isIdentifier(node.expression) && getImportOrExportBindingReference(node.expression, /*removeEntry*/ false).kind !== ImportOrExportBindingReferenceKind.None) {
if (isIdentifier(node.expression) && getImportOrExportBindingReference(node.expression, /*removeEntry*/ false)) {
return isCallChain(node) ?
factory.updateCallChain(node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.expression), node.expression),
Expand All @@ -1834,7 +1828,7 @@ namespace ts {
}

function substituteTaggedTemplateExpression(node: TaggedTemplateExpression) {
if (isIdentifier(node.tag) && getImportOrExportBindingReference(node.tag, /*removeEntry*/ false).kind !== ImportOrExportBindingReferenceKind.None) {
if (isIdentifier(node.tag) && getImportOrExportBindingReference(node.tag, /*removeEntry*/ false)) {
return factory.updateTaggedTemplateExpression(
node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.tag), node.tag),
Expand All @@ -1852,30 +1846,30 @@ namespace ts {
*/
function substituteExpressionIdentifier(node: Identifier): Expression {
const result = getImportOrExportBindingReference(node, /*removeEntry*/ true);
switch (result.kind) {
case ImportOrExportBindingReferenceKind.ImportedHelper:
return factory.createPropertyAccessExpression(result.node, node);
case ImportOrExportBindingReferenceKind.TopLevelExportBinding:
switch (result?.kind) {
case SyntaxKind.Identifier: // tslib import
return factory.createPropertyAccessExpression(result, node);
case SyntaxKind.SourceFile: // top-level export
return setTextRange(
factory.createPropertyAccessExpression(
factory.createIdentifier("exports"),
factory.cloneNode(node)
),
/*location*/ node
);
case ImportOrExportBindingReferenceKind.ImportClause:
case SyntaxKind.ImportClause:
return setTextRange(
factory.createPropertyAccessExpression(
factory.getGeneratedNameForNode(result.node.parent),
factory.getGeneratedNameForNode(result.parent),
factory.createIdentifier("default")
),
/*location*/ node
);
case ImportOrExportBindingReferenceKind.ImportSpecifier:
const name = result.node.propertyName || result.node.name;
case SyntaxKind.ImportSpecifier:
const name = result.propertyName || result.name;
return setTextRange(
factory.createPropertyAccessExpression(
factory.getGeneratedNameForNode(result.node.parent?.parent?.parent || result.node),
factory.getGeneratedNameForNode(result.parent?.parent?.parent || result),
factory.cloneNode(name)
),
/*location*/ node
Expand Down
69 changes: 62 additions & 7 deletions src/compiler/transformers/ts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ namespace ts {
context.onSubstituteNode = onSubstituteNode;

// Enable substitution for property/element access to emit const enum values.
context.enableSubstitution(SyntaxKind.Identifier);
context.enableSubstitution(SyntaxKind.PropertyAccessExpression);
context.enableSubstitution(SyntaxKind.ElementAccessExpression);
context.enableSubstitution(SyntaxKind.CallExpression);
context.enableSubstitution(SyntaxKind.TaggedTemplateExpression);

// These variables contain state that changes as we descend into the tree.
let currentSourceFile: SourceFile;
Expand All @@ -73,6 +76,7 @@ namespace ts {
* They are persisted between each SourceFile transformation and should not be reset.
*/
let enabledSubstitutions: TypeScriptSubstitutionFlags;
let bindingReferrenceCache: ESMap<Node, ModuleDeclaration | EnumDeclaration | undefined> | undefined;

/**
* A map that keeps track of aliases created for classes with decorators to avoid issues
Expand Down Expand Up @@ -3275,6 +3279,10 @@ namespace ts {
return substitutePropertyAccessExpression(<PropertyAccessExpression>node);
case SyntaxKind.ElementAccessExpression:
return substituteElementAccessExpression(<ElementAccessExpression>node);
case SyntaxKind.CallExpression:
return substituteCallExpression(<CallExpression>node);
case SyntaxKind.TaggedTemplateExpression:
return substituteTaggedTemplateExpression(<TaggedTemplateExpression>node);
}

return node;
Expand Down Expand Up @@ -3310,7 +3318,7 @@ namespace ts {
return undefined;
}

function trySubstituteNamespaceExportedName(node: Identifier): Expression | undefined {
function getExportBindingReferenceWorker(node: Identifier) {
// If this is explicitly a local name, do not substitute.
if (enabledSubstitutions & applicableSubstitutions && !isGeneratedIdentifier(node) && !isLocalName(node)) {
// If we are nested within a namespace declaration, we may need to qualifiy
Expand All @@ -3320,18 +3328,65 @@ namespace ts {
const substitute =
(applicableSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && container.kind === SyntaxKind.ModuleDeclaration) ||
(applicableSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers && container.kind === SyntaxKind.EnumDeclaration);
if (substitute) {
return setTextRange(
factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(container), node),
/*location*/ node
);
}
if (substitute) return container;
}
}
return undefined;
}

function getExportBindingReference(node: Identifier, removeEntry: boolean) {
let result = bindingReferrenceCache?.get(node);
if (!result) {
result = getExportBindingReferenceWorker(node);
if (!removeEntry) {
bindingReferrenceCache ||= new Map();
bindingReferrenceCache.set(node, result);
}
}
else if (removeEntry) {
bindingReferrenceCache?.delete(node);
}
return result;
}

function trySubstituteNamespaceExportedName(node: Identifier): Expression | undefined {
const container = getExportBindingReference(node, /*removeEntry*/ true);
if (container) {
return setTextRange(
factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(container), node),
/*location*/ node
);
}
return undefined;
}

function substituteCallExpression(node: CallExpression) {
if (isIdentifier(node.expression) && getExportBindingReference(node.expression, /*removeEntry*/ false)) {
return isCallChain(node) ?
factory.updateCallChain(node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.expression), node.expression),
node.questionDotToken,
/*typeArguments*/ undefined,
node.arguments) :
factory.updateCallExpression(node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.expression), node.expression),
/*typeArguments*/ undefined,
node.arguments);
}
return node;
}

function substituteTaggedTemplateExpression(node: TaggedTemplateExpression) {
if (isIdentifier(node.tag) && getExportBindingReference(node.tag, /*removeEntry*/ false)) {
return factory.updateTaggedTemplateExpression(
node,
setTextRange(factory.createComma(factory.createNumericLiteral(0), node.tag), node.tag),
/*typeArguments*/ undefined,
node.template);
}
return node;
}

function substitutePropertyAccessExpression(node: PropertyAccessExpression) {
return substituteConstantValue(node);
}
Expand Down
Loading

0 comments on commit b788c09

Please sign in to comment.