microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-05 04:25:39 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Look for top-level imports/exports before diving into the tree.

Browse Source
This commit is contained in:
Daniel Rosenwasser
2018-04-27 17:19:57 -07:00
parent 9672116d8c
commit bc0d3e1297
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/parser.ts
View File

@@ -6139,14 +6139,11 @@ namespace ts {
}
function setExternalModuleIndicator(sourceFile: SourceFile) {
// Usually we'd like to avoid a full tree walk, but it's possible
// that we have a deeper external module indicator (e.g. `import.meta`,
// and possibly nested import statements in the future).
// Ideally the first few statements will be an import/export anyway.
// Try to use the first top-level import/export when available, then
// fall back to looking for an 'import.meta' somewhere in the tree if necessary.
sourceFile.externalModuleIndicator =
!(sourceFile.flags & NodeFlags.PossiblyContainsImportMeta) ?
forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) :
walkTreeForExternalModuleIndicators(sourceFile);
forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) ||
getImportMetaIfNecessary(sourceFile);
}
function isAnExternalModuleIndicatorNode(node: Node) {
@@ -6155,13 +6152,22 @@ namespace ts {
|| node.kind === SyntaxKind.ImportDeclaration
|| node.kind === SyntaxKind.ExportAssignment
|| node.kind === SyntaxKind.ExportDeclaration
|| isMetaProperty(node) && node.keywordToken === SyntaxKind.ImportKeyword && node.name.escapedText === "meta"
? node
: undefined;
}
function getImportMetaIfNecessary(sourceFile: SourceFile) {
return sourceFile.flags & NodeFlags.PossiblyContainsImportMeta ?
walkTreeForExternalModuleIndicators(sourceFile) :
undefined;
}
function walkTreeForExternalModuleIndicators(node: Node): Node {
return isAnExternalModuleIndicatorNode(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
}
function isImportMeta(node: Node): boolean {
return isMetaProperty(node) && node.keywordToken === SyntaxKind.ImportKeyword && node.name.escapedText === "meta";
}
const enum ParsingContext {

6
src/compiler/types.ts
View File

@@ -2564,7 +2564,11 @@ namespace ts {
languageVersion: ScriptTarget;
/* @internal */ scriptKind: ScriptKind;
// The first node that causes this file to be an external module
/**
* The first "most obvious" node that makes a file an external module.
* This is intended to be the first top-level import/export,
* but could be arbitrarily nested (e.g. `import.meta`).
*/
/* @internal */ externalModuleIndicator: Node;
// The first node that causes this file to be a CommonJS module
/* @internal */ commonJsModuleIndicator: Node;