Skip to content

Commit 9b0fa0d

Browse files
IgorMinarIgorMinar
committed
build(broccoli): TreeDiffer should log associated plugin name rather than inputPath
Usually we don't care what we are diffing, but why we are diffing it. With this change we see what is causing build slowdown due to diffing.
1 parent 533c64d commit 9b0fa0d

3 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎tools/broccoli/diffing-broccoli-plugin.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ class DiffingPluginWrapper implements BroccoliTree {
102102
let includeExtensions = this.pluginClass.includeExtensions || [];
103103
let excludeExtensions = this.pluginClass.excludeExtensions || [];
104104
this.initialized = true;
105-
this.treeDiffer = new TreeDiffer(this.inputPath, includeExtensions, excludeExtensions);
105+
this.treeDiffer =
106+
new TreeDiffer(this.description, this.inputPath, includeExtensions, excludeExtensions);
106107
this.wrappedPlugin =
107108
new this.pluginClass(this.inputPath, this.cachePath, this.wrappedPluginArguments[1]);
108109
}

‎tools/broccoli/tree-differ.spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('TreeDiffer', () => {
2626
};
2727
mockfs(testDir);
2828

29-
let differ = new TreeDiffer('dir1');
29+
let differ = new TreeDiffer('testLabel', 'dir1');
3030

3131
let diffResult = differ.diffTree();
3232

@@ -49,7 +49,7 @@ describe('TreeDiffer', () => {
4949
};
5050
mockfs(testDir);
5151

52-
let differ = new TreeDiffer('dir1');
52+
let differ = new TreeDiffer('testLabel', 'dir1');
5353

5454
let diffResult = differ.diffTree();
5555

@@ -76,7 +76,7 @@ describe('TreeDiffer', () => {
7676
};
7777
mockfs(testDir);
7878

79-
let differ = new TreeDiffer('dir1');
79+
let differ = new TreeDiffer('testLabel', 'dir1');
8080

8181
let diffResult = differ.diffTree();
8282

@@ -123,7 +123,7 @@ describe('TreeDiffer', () => {
123123
};
124124
mockfs(testDir);
125125

126-
let differ = new TreeDiffer('symlinks');
126+
let differ = new TreeDiffer('testLabel', 'symlinks');
127127

128128
let diffResult = differ.diffTree();
129129

@@ -190,7 +190,7 @@ describe('TreeDiffer', () => {
190190
};
191191
mockfs(testDir);
192192

193-
let differ = new TreeDiffer('dir1', ['.js', '.coffee']);
193+
let differ = new TreeDiffer('testLabel', 'dir1', ['.js', '.coffee']);
194194

195195
let diffResult = differ.diffTree();
196196

@@ -236,7 +236,7 @@ describe('TreeDiffer', () => {
236236
};
237237
mockfs(testDir);
238238

239-
let differ = new TreeDiffer('dir1', ['.ts', '.cs'], ['.d.ts', '.d.cs']);
239+
let differ = new TreeDiffer('testLabel', 'dir1', ['.ts', '.cs'], ['.d.ts', '.d.cs']);
240240

241241
let diffResult = differ.diffTree();
242242

@@ -277,7 +277,7 @@ describe('TreeDiffer', () => {
277277
};
278278
mockfs(testDir);
279279

280-
let differ = new TreeDiffer('dir1');
280+
let differ = new TreeDiffer('testLabel', 'dir1');
281281
differ.diffTree();
282282

283283
testDir['dir1']['file-2.txt'] = 'new file';
@@ -295,7 +295,7 @@ describe('TreeDiffer', () => {
295295
};
296296
mockfs(testDir);
297297

298-
let differ = new TreeDiffer('dir1');
298+
let differ = new TreeDiffer('testLabel', 'dir1');
299299
differ.diffTree();
300300

301301
testDir['dir1']['file-1.txt'] = 'new content';
@@ -316,7 +316,7 @@ describe('TreeDiffer', () => {
316316
};
317317
mockfs(testDir);
318318

319-
let differ = new TreeDiffer('dir1');
319+
let differ = new TreeDiffer('testLabel', 'dir1');
320320
differ.diffTree();
321321

322322
delete testDir['dir1']['file-1.txt'];
@@ -339,7 +339,7 @@ describe('TreeDiffer', () => {
339339

340340
mockfs(testDir);
341341

342-
let differ = new TreeDiffer('dir1');
342+
let differ = new TreeDiffer('testLabel', 'dir1');
343343
differ.diffTree();
344344

345345
testDir['dir1']['file-1.txt'] = 'changed content';

‎tools/broccoli/tree-differ.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class TreeDiffer {
2121
private include: RegExp = null;
2222
private exclude: RegExp = null;
2323

24-
constructor(private rootPath: string, includeExtensions?: string[],
24+
constructor(private label: string, private rootPath: string, includeExtensions?: string[],
2525
excludeExtensions?: string[]) {
2626
this.rootDirName = path.basename(rootPath);
2727

@@ -40,7 +40,7 @@ export class TreeDiffer {
4040

4141

4242
public diffTree(): DiffResult {
43-
let result = new DirtyCheckingDiffResult(this.rootDirName);
43+
let result = new DirtyCheckingDiffResult(this.label, this.rootDirName);
4444
this.dirtyCheckPath(this.rootPath, result);
4545
this.detectDeletionsAndUpdateFingerprints(result);
4646
result.endTime = Date.now();
@@ -127,12 +127,12 @@ class DirtyCheckingDiffResult {
127127
public startTime: number = Date.now();
128128
public endTime: number = null;
129129

130-
constructor(public name: string) {}
130+
constructor(public label:string, public directoryName: string) {}
131131

132132
toString() {
133-
return `${pad(this.name, 40)}, duration: ${pad(this.endTime - this.startTime, 5)}ms, ` +
134-
`${pad(this.changedPaths.length + this.removedPaths.length, 5)} changes detected ` +
135-
`(files: ${pad(this.filesChecked, 5)}, directories: ${pad(this.directoriesChecked, 4)})`;
133+
return `${pad(this.label, 30)}, ${pad(this.endTime - this.startTime, 5)}ms, ` +
134+
`${pad(this.changedPaths.length + this.removedPaths.length, 5)} changes ` +
135+
`(files: ${pad(this.filesChecked, 5)}, dirs: ${pad(this.directoriesChecked, 4)})`;
136136
}
137137

138138
log(verbose) {

0 commit comments

Comments
 (0)