Turn area_names into an array, and prepare to remove area_keys

This is part of #62

Signed-off-by: Oriol Brufau <[email protected]>

Author: Loirooriol

index.js

@@ -78,7 +78,6 @@ async function recalc_scores (runs_dir) {
     const new_run = await read_compressed(`./${runs_dir}/${all_runs[all_runs.length - 1]}`)
     console.log('Building focus area map')
     const test_to_areas = focus_areas_map(new_run)
-    const { area_keys } = get_focus_areas()
     for (const [i, r] of all_runs.entries()) {
         const [date] = r.split('.')
         console.log(`Reading run ${runs_dir}/${r} (${i}/${run_count})`)
@@ -88,12 +87,10 @@ async function recalc_scores (runs_dir) {
         const row = [
             date,
             run.run_info.revision.substring(0, 9),
-            run.run_info.browser_version
+            run.run_info.browser_version,
+            ...score
         ]
 
-        for (const area of area_keys) {
-            row.push(score[area])
-        }
         scores.push(row)
     }
 
@@ -115,7 +112,8 @@ async function main () {
     const scores = await recalc_scores('runs-2020')
     const scores_last_run = scores[scores.length - 1]
 
-    const { area_keys, area_names: focus_areas } = get_focus_areas()
+    const focus_areas = get_focus_areas()
+    const area_keys = Object.keys(focus_areas)
 
     console.log('Writing site/scores.json')
     await mkdir('./site', { recursive: true })

process-wpt-results.js

@@ -125,14 +125,7 @@ const FOCUS_AREAS = [
 ]
 
 export function get_focus_areas () {
-    const area_keys = []
-    const area_names = {}
-    for (const [key, area] of Object.entries(FOCUS_AREAS)) {
-        area_keys.push(key)
-        area_names[key] = area.name
-    }
-
-    return { area_keys, area_names }
+    return FOCUS_AREAS.map(area => area.name)
 }
 
 export function score_run (run, against_run, focus_areas_map) {

test/process-wpt-results.test.js

@@ -504,7 +504,7 @@ describe('focus areas', () => {
             }
         }
         const map = focus_areas_map(run)
-        const { area_names } = get_focus_areas()
+        const area_names = get_focus_areas()
         for (const key of Object.keys(map)) {
             map[key] = map[key].map(index => area_names[index])
         }