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

refactor(bazel): dont rely on language target to downlevel for loop (#24534) 

PR Close #24534
This commit is contained in:
Fabian Wiles 2018-06-15 21:31:25 +12:00 committed by Kara Erickson
parent dc0715142f
commit b0d86c1c2f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/bazel/src/ngc-wrapped/index.ts
View File

@ -76,7 +76,8 @@ export function runOneBuild(args: string[], inputs?: {[path: string]: string}):
export function relativeToRootDirs(filePath: string, rootDirs: string[]): string { export function relativeToRootDirs(filePath: string, rootDirs: string[]): string {
if (!filePath) return filePath; if (!filePath) return filePath;
// NB: the rootDirs should have been sorted longest-first // NB: the rootDirs should have been sorted longest-first
for (const dir of rootDirs || []) { for (let i = 0; i < rootDirs.length; i++) {
const dir = rootDirs[i];
const rel = path.posix.relative(dir, filePath); const rel = path.posix.relative(dir, filePath);
if (rel.indexOf('.') != 0) return rel; if (rel.indexOf('.') != 0) return rel;
} }
@ -106,7 +107,9 @@ export function compile({allowNonHermeticReads, allDepsCompiledWithBazel = true,
fileLoader = new CachedFileLoader(fileCache, allowNonHermeticReads); fileLoader = new CachedFileLoader(fileCache, allowNonHermeticReads);
// Resolve the inputs to absolute paths to match TypeScript internals // Resolve the inputs to absolute paths to match TypeScript internals
const resolvedInputs: {[path: string]: string} = {}; const resolvedInputs: {[path: string]: string} = {};
for (const key of Object.keys(inputs)) { const inputKeys = Object.keys(inputs);
for (let i = 0; i < inputKeys.length; i++) {
const key = inputKeys[i];
resolvedInputs[resolveNormalizedPath(key)] = inputs[key]; resolvedInputs[resolveNormalizedPath(key)] = inputs[key];
} }
fileCache.updateCache(resolvedInputs); fileCache.updateCache(resolvedInputs);
@ -306,8 +309,8 @@ export function compile({allowNonHermeticReads, allDepsCompiledWithBazel = true,
fs.writeFileSync(bazelOpts.tsickleExternsPath, externs); fs.writeFileSync(bazelOpts.tsickleExternsPath, externs);
} }
for (const missing of writtenExpectedOuts) { for (let i = 0; i < writtenExpectedOuts.length; i++) {
originalWriteFile(missing, '', false); originalWriteFile(writtenExpectedOuts[i], '', false);
} }
return {program, diagnostics}; return {program, diagnostics};
@ -323,7 +326,8 @@ function generateMetadataJson(
program: ts.Program, files: string[], rootDirs: string[], bazelBin: string, program: ts.Program, files: string[], rootDirs: string[], bazelBin: string,
tsHost: ts.CompilerHost) { tsHost: ts.CompilerHost) {
const collector = new ng.MetadataCollector(); const collector = new ng.MetadataCollector();
for (const file of files) { for (let i = 0; i < files.length; i++) {
const file = files[i];
const sourceFile = program.getSourceFile(file); const sourceFile = program.getSourceFile(file);
if (sourceFile) { if (sourceFile) {
const metadata = collector.getMetadata(sourceFile); const metadata = collector.getMetadata(sourceFile);
@ -353,7 +357,9 @@ function gatherDiagnosticsForInputsOnly(
// program.getDeclarationDiagnostics() it somehow corrupts the emit. // program.getDeclarationDiagnostics() it somehow corrupts the emit.
diagnostics.push(...tsProgram.getOptionsDiagnostics()); diagnostics.push(...tsProgram.getOptionsDiagnostics());
diagnostics.push(...tsProgram.getGlobalDiagnostics()); diagnostics.push(...tsProgram.getGlobalDiagnostics());
for (const sf of tsProgram.getSourceFiles().filter(f => isCompilationTarget(bazelOpts, f))) { const programFiles = tsProgram.getSourceFiles().filter(f => isCompilationTarget(bazelOpts, f));
for (let i = 0; i < programFiles.length; i++) {
const sf = programFiles[i];
// Note: We only get the diagnostics for individual files // Note: We only get the diagnostics for individual files
// to e.g. not check libraries. // to e.g. not check libraries.
diagnostics.push(...tsProgram.getSyntacticDiagnostics(sf)); diagnostics.push(...tsProgram.getSyntacticDiagnostics(sf));