iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler): workaround bugs in TS when combining transformers (#18912) 

PR Close #18912
This commit is contained in:
Tobias Bosch 2017-08-29 16:26:37 -07:00 committed by Jason Aden
parent f1e526f046
commit 4059a72710
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/compiler-cli/src/transformers/lower_expressions.ts
View File

@ -67,7 +67,7 @@ function transformSourceFile(
} }
function visitSourceFile(sourceFile: ts.SourceFile): ts.SourceFile { function visitSourceFile(sourceFile: ts.SourceFile): ts.SourceFile {
function topLevelStatement(node: ts.Node): ts.Node { function topLevelStatement(node: ts.Statement): ts.Statement {
const declarations: Declaration[] = []; const declarations: Declaration[] = [];
function visitNode(node: ts.Node): ts.Node { function visitNode(node: ts.Node): ts.Node {
@ -99,12 +99,11 @@ function transformSourceFile(
return result; return result;
} }
const traversedSource = ts.visitEachChild(sourceFile, topLevelStatement, context); const newStatements = sourceFile.statements.map(topLevelStatement);
if (inserts.length) { if (inserts.length) {
// Insert the declarations before the rewritten statement that references them. // Insert the declarations before the rewritten statement that references them.
const insertMap = toMap(inserts, i => i.priorTo); const insertMap = toMap(inserts, i => i.priorTo);
const newStatements: ts.Statement[] = [...traversedSource.statements];
for (let i = newStatements.length; i >= 0; i--) { for (let i = newStatements.length; i >= 0; i--) {
const statement = newStatements[i]; const statement = newStatements[i];
const insert = insertMap.get(statement); const insert = insertMap.get(statement);
@ -131,9 +130,16 @@ function transformSourceFile(
.map( .map(
declaration => ts.createExportSpecifier( declaration => ts.createExportSpecifier(
/* propertyName */ undefined, declaration.name))))); /* propertyName */ undefined, declaration.name)))));
return ts.updateSourceFileNode(traversedSource, newStatements);
} }
return traversedSource; // Note: We cannot use ts.updateSourcefile here as
// it does not work well with decorators.
// See https://github.com/Microsoft/TypeScript/issues/17384
const newSf = ts.getMutableClone(sourceFile);
if (!(sourceFile.flags & ts.NodeFlags.Synthesized)) {
newSf.flags &= ~ts.NodeFlags.Synthesized;
}
newSf.statements = ts.setTextRange(ts.createNodeArray(newStatements), sourceFile.statements);
return newSf;
} }
return visitSourceFile(sourceFile); return visitSourceFile(sourceFile);