fix: show the C and Swift file counts on the HTML index page

The index page only loads the main step and the targets, so counting
detail steps there always gave 0. Write the counts from the reporter
instead.

Author: alielsokary

Resources/js/app.js

@@ -195,14 +195,9 @@ function loadMainData() {
     targets = buildData.filter(function (step) {
         return step.type === 'target' && step.fetchedFromCache === false;
     });
-    cFiles = buildData.filter(function (step) {
-        return step.type === 'detail' && step.detailStepType === cCompilation
-            && step.fetchedFromCache === false;
-    });
-    swiftFiles = buildData.filter(function (step) {
-        return step.type === 'detail' && step.detailStepType === swiftCompilation
-            && step.fetchedFromCache === false;
-    });
+    // buildData only has the main step and the targets here, the counts come from top_files.js
+    cFiles = new Array(cFilesCount);
+    swiftFiles = new Array(swiftFilesCount);
 }
 
 function loadTargetData(target) {

Sources/XCLogParser/generated/HtmlReporterResources.swift

@@ -287,14 +287,9 @@ function loadMainData() {
     targets = buildData.filter(function (step) {
         return step.type === 'target' && step.fetchedFromCache === false;
     });
-    cFiles = buildData.filter(function (step) {
-        return step.type === 'detail' && step.detailStepType === cCompilation
-            && step.fetchedFromCache === false;
-    });
-    swiftFiles = buildData.filter(function (step) {
-        return step.type === 'detail' && step.detailStepType === swiftCompilation
-            && step.fetchedFromCache === false;
-    });
+    // buildData only has the main step and the targets here, the counts come from top_files.js
+    cFiles = new Array(cFilesCount);
+    swiftFiles = new Array(swiftFilesCount);
 }
 
 function loadTargetData(target) {

Sources/XCLogParser/reporter/HtmlReporter.swift

@@ -243,26 +243,25 @@ public struct HtmlReporter: LogReporter {
         swiftTypeCheckTimes.sort { $0.durationMS > $1.durationMS }
         let topTypeChecks = Array(swiftTypeCheckTimes.prefix(Self.maxSwifTypeChecks))
 
-        try write(
-            slowestSwiftFiles: Array(swiftSteps.prefix(Self.maxSlowestFiles)),
-            slowestCFiles: Array(cSteps.prefix(Self.maxSlowestFiles)),
-            swiftFunctionTimes: topFunctions,
-            swiftTypeCheckTimes: topTypeChecks,
-            toDir: buildDir)
+        try write(swiftSteps: swiftSteps,
+                  cSteps: cSteps,
+                  swiftFunctionTimes: topFunctions,
+                  swiftTypeCheckTimes: topTypeChecks,
+                  toDir: buildDir)
 
     }
 
-    private func write(slowestSwiftFiles: [BuildStep],
-                       slowestCFiles: [BuildStep],
+    private func write(swiftSteps: [BuildStep],
+                       cSteps: [BuildStep],
                        swiftFunctionTimes: [SwiftFunctionTime],
                        swiftTypeCheckTimes: [SwiftTypeCheck],
                        toDir buildDir: String) throws {
         let encoder = JSONEncoder()
         encoder.outputFormatting = .prettyPrinted
         let functionsJson = try encoder.encode(swiftFunctionTimes)
         let typeChecksJson = try encoder.encode(swiftTypeCheckTimes)
-        let swiftJson = try encoder.encode(slowestSwiftFiles)
-        let cJson = try encoder.encode(slowestCFiles)
+        let swiftJson = try encoder.encode(Array(swiftSteps.prefix(Self.maxSlowestFiles)))
+        let cJson = try encoder.encode(Array(cSteps.prefix(Self.maxSlowestFiles)))
         guard let functionsString = String(data: functionsJson, encoding: .utf8),
               let typeChecksString = String(data: typeChecksJson, encoding: .utf8),
               let swiftString = String(data: swiftJson, encoding: .utf8),
@@ -278,6 +277,10 @@ public struct HtmlReporter: LogReporter {
         const topSwiftFunctions = \(functionsString);
 
         const topSwifTypeChecks = \(typeChecksString);
+
+        const swiftFilesCount = \(swiftSteps.count);
+
+        const cFilesCount = \(cSteps.count);
         """.write(toFile: "\(buildDir)/js/top_files.js", atomically: true, encoding: .utf8)
     }
 }

Tests/XCLogParserTests/HtmlReporterTests.swift

@@ -0,0 +1,30 @@
+import XCTest
+@testable import XCLogParser
+
+class HtmlReporterTests: XCTestCase {
+
+    func testIndexFileCountsComeFromAllTargets() throws {
+        let compile = { (title: String, type: DetailStepType) -> BuildStep in
+            makeFakeBuildStep(title: title, type: .detail, detailStepType: type,
+                              startTimestamp: 0, fetchedFromCache: false)
+        }
+        let foo = makeFakeBuildStep(title: "Build target Foo", type: .target, detailStepType: .none,
+                                    startTimestamp: 0, fetchedFromCache: false)
+            .with(subSteps: [compile("Compile a.swift", .swiftCompilation),
+                             compile("Compile b.swift", .swiftCompilation),
+                             compile("Compile c.c", .cCompilation)])
+        let bar = makeFakeBuildStep(title: "Build target Bar", type: .target, detailStepType: .none,
+                                    startTimestamp: 0, fetchedFromCache: false)
+            .with(subSteps: [compile("Compile d.swift", .swiftCompilation)])
+        let build = makeFakeBuildStep(title: "Build", type: .main, detailStepType: .none,
+                                      startTimestamp: 0, fetchedFromCache: false)
+            .with(subSteps: [foo, bar])
+        let dir = try TestUtils.createRandomTestDir()
+
+        try HtmlReporter().report(build: build, output: FileOutput(path: dir.path), rootOutput: dir.path)
+
+        let topFiles = try String(contentsOf: dir.appendingPathComponent("js/top_files.js"))
+        XCTAssertTrue(topFiles.contains("const swiftFilesCount = 3;"))
+        XCTAssertTrue(topFiles.contains("const cFilesCount = 1;"))
+    }
+}

Tests/XCLogParserTests/XCTestManifests.swift

@@ -38,6 +38,15 @@ extension GroupedByTargetTests {
     ]
 }
 
+extension HtmlReporterTests {
+    // DO NOT MODIFY: This is autogenerated, use:
+    //   `swift test --generate-linuxmain`
+    // to regenerate.
+    static let __allTests__HtmlReporterTests = [
+        ("testIndexFileCountsComeFromAllTargets", testIndexFileCountsComeFromAllTargets),
+    ]
+}
+
 extension IssuesReporterTests {
     // DO NOT MODIFY: This is autogenerated, use:
     //   `swift test --generate-linuxmain`
@@ -157,6 +166,7 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(ActivityParserTests.__allTests__ActivityParserTests),
         testCase(ChromeTracerOutputTests.__allTests__ChromeTracerOutputTests),
         testCase(GroupedByTargetTests.__allTests__GroupedByTargetTests),
+        testCase(HtmlReporterTests.__allTests__HtmlReporterTests),
         testCase(IssuesReporterTests.__allTests__IssuesReporterTests),
         testCase(LexRedactorTests.__allTests__LexRedactorTests),
         testCase(LexerTests.__allTests__LexerTests),