better return type

Author: fehmer

frontend/src/ts/collections/results.ts

@@ -390,7 +390,7 @@ export async function getUserAverage<M extends Mode>(
     last10Only: boolean;
     lastDayOnly: boolean;
   }>,
-): Promise<[number, number]> {
+): Promise<{ wpm: number; acc: number }> {
   const activeTagIds = getSnapshot()
     ?.tags.filter((it) => it.active === true)
     .map((it) => it._id);
@@ -423,6 +423,7 @@ export async function getUserAverage<M extends Mode>(
     return query.select(({ r }) => ({ wpm: avg(r.wpm), acc: avg(r.acc) }));
   }).toArrayWhenReady();
 
-  if (result.length !== 1) return [0, 0];
-  return [result[0]?.wpm ?? 0, result[0]?.acc ?? 0];
+  return result.length === 1 && result[0] !== undefined
+    ? result[0]
+    : { wpm: 0, acc: 0 };
 }

frontend/src/ts/elements/last-10-average.ts

@@ -10,9 +10,13 @@ let averageAcc = 0;
 export async function update(): Promise<void> {
   const mode2 = Misc.getMode2(Config, TestWords.currentQuote);
 
-  const [wpm, acc] = (
-    await getUserAverage({ ...Config, mode2, last10Only: true })
-  ).map(Numbers.roundTo2) as [number, number];
+  const average = await getUserAverage({
+    ...Config,
+    mode2,
+    last10Only: true,
+  });
+  const wpm = Numbers.roundTo2(average.wpm);
+  const acc = Numbers.roundTo2(average.acc);
 
   averageWPM = Config.alwaysShowDecimalPlaces ? wpm : Math.round(wpm);
   averageAcc = Config.alwaysShowDecimalPlaces ? acc : Math.floor(acc);

frontend/src/ts/test/pace-caret.ts

@@ -83,12 +83,13 @@ export async function init(): Promise<void> {
       Config.lazyMode,
     );
   } else if (Config.paceCaret === "average") {
-    [wpm] = await getUserAverage({ ...Config, mode2, last10Only: true });
-
-    wpm = Math.round(wpm);
+    wpm = Math.round(
+      (await getUserAverage({ ...Config, mode2, last10Only: true })).wpm,
+    );
   } else if (Config.paceCaret === "daily") {
-    [wpm] = await getUserAverage({ ...Config, mode2, lastDayOnly: true });
-    wpm = Math.round(wpm);
+    wpm = Math.round(
+      (await getUserAverage({ ...Config, mode2, lastDayOnly: true })).wpm,
+    );
   } else if (Config.paceCaret === "custom") {
     wpm = Config.paceCaretCustomSpeed;
   } else if (Config.paceCaret === "last" || TestState.isPaceRepeat) {