refactor: test events phase 2 (@miodec)

frontend/__tests__/test/events/data.spec.ts

@@ -63,7 +63,7 @@ function timerData(
   if (event === "step") {
     return { event, timer, drift: 0 };
   }
-  return { event, timer };
+  return { event, timer, date: 0 };
 }
 
 describe("data.ts", () => {

frontend/__tests__/test/events/stats.spec.ts

@@ -112,7 +112,7 @@ function timer(
   if (event === "step") {
     return { event, timer: timerVal, drift: 0 };
   }
-  return { event, timer: timerVal };
+  return { event, timer: timerVal, date: 0 };
 }
 
 // Helper: sets up a basic test with timer start, steps at 1s intervals,

frontend/src/ts/commandline/lists.ts

@@ -24,11 +24,9 @@ import { randomizeTheme } from "../controllers/theme-controller";
 import { showModal } from "../states/modals";
 import {
   showErrorNotification,
-  showSuccessNotification,
   clearAllNotifications,
 } from "../states/notifications";
 import * as VideoAdPopup from "../popups/video-ad-popup";
-import * as TestStats from "../test/test-stats";
 import { Command, CommandsSubgroup } from "./types";
 import { buildCommandForConfigKey } from "./util";
 import { CommandlineConfigMetadataObject } from "./commandline-metadata";
@@ -288,22 +286,23 @@ export const commands: CommandsSubgroup = {
         alert(await caches.keys());
       },
     },
-    {
-      id: "copyResultStats",
-      display: "Copy result stats",
-      icon: "fa-cog",
-      visible: false,
-      exec: async (): Promise<void> => {
-        navigator.clipboard
-          .writeText(JSON.stringify(TestStats.getStats()))
-          .then(() => {
-            showSuccessNotification("Copied to clipboard");
-          })
-          .catch((e: unknown) => {
-            showErrorNotification("Failed to copy to clipboard", { error: e });
-          });
-      },
-    },
+    // todo: bring back?
+    // {
+    //   id: "copyResultStats",
+    //   display: "Copy result stats",
+    //   icon: "fa-cog",
+    //   visible: false,
+    //   exec: async (): Promise<void> => {
+    //     navigator.clipboard
+    //       .writeText(JSON.stringify(TestStats.getStats()))
+    //       .then(() => {
+    //         showSuccessNotification("Copied to clipboard");
+    //       })
+    //       .catch((e: unknown) => {
+    //         showErrorNotification("Failed to copy to clipboard", { error: e });
+    //       });
+    //   },
+    // },
     {
       id: "fpsCounter",
       display: "FPS counter...",

frontend/src/ts/controllers/chart-controller.ts

@@ -58,13 +58,13 @@ Chart.defaults.elements.line.fill = "origin";
 import "chartjs-adapter-date-fns";
 import { Config } from "../config/store";
 import { configEvent } from "../events/config";
-import * as TestInput from "../test/test-input";
 import * as Arrays from "../utils/arrays";
 import { blendTwoHexColors } from "../utils/colors";
 import { typedKeys } from "../utils/misc";
 import { getTheme } from "../states/theme";
 import { Theme } from "../constants/themes";
 import { createDebouncedEffectOn } from "../hooks/effects";
+import { getWordIndexesForSecond } from "../test/events/stats";
 
 export class ChartWithUpdateColors<
   TType extends ChartType = ChartType,
@@ -274,8 +274,7 @@ export const result = new ChartWithUpdateColors<
             prevTi = ti;
             try {
               const keypressIndex = Math.round(parseFloat(ti.label)) - 1;
-              const wordsToHighlight =
-                TestInput.errorHistory[keypressIndex]?.words;
+              const wordsToHighlight = getWordIndexesForSecond(keypressIndex);
 
               const unique = [...new Set(wordsToHighlight)];
               const firstHighlightWordIndex = unique[0];

frontend/src/ts/index.ts

@@ -15,7 +15,6 @@ import * as DB from "./db";
 import "./ui";
 import "./controllers/ad-controller";
 import { Config } from "./config/store";
-import * as TestStats from "./test/test-stats";
 import * as Replay from "./test/replay";
 import * as TestTimer from "./test/test-timer";
 import * as Result from "./test/result";
@@ -88,7 +87,6 @@ addToGlobal({
   snapshot: DB.getSnapshot,
   config: Config,
   glarsesMode: enable,
-  stats: TestStats.getStats,
   replay: Replay.getReplayExport,
   enableTimerDebug: TestTimer.enableTimerDebug,
   getTimerStats: TestTimer.getTimerStats,

frontend/src/ts/input/handlers/delete.ts

@@ -19,7 +19,6 @@ export function onDelete(inputType: DeleteInputType, now: number): void {
   TestInput.input.syncWithInputElement();
 
   Replay.addReplayEvent("setLetterIndex", TestInput.input.current.length);
-  TestInput.setCurrentNotAfk();
 
   const beforeDeleteOnlyTabs = /^\t*$/.test(inputBeforeDelete);
   const allTabsCorrect = TestWords.words

frontend/src/ts/input/handlers/insert-text.ts

@@ -162,22 +162,11 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
   }
 
   // general per keypress updates
-  TestInput.setCurrentNotAfk();
   Replay.addReplayEvent(correct ? "correctLetter" : "incorrectLetter", data);
-  TestInput.incrementAccuracy(correct);
   WeakSpot.updateScore(data, correct);
-  TestInput.incrementKeypressCount();
-  TestInput.pushKeypressWord(wordIndex);
-  if (!correct) {
-    TestInput.incrementKeypressErrors();
-    TestInput.pushMissedWord(TestWords.words.getCurrentText());
-  }
   if (Config.keymapMode === "react") {
     flash(data, correct);
   }
-  if (testInput.length === 0 && !isCompositionEnding) {
-    TestInput.setBurstStart(now);
-  }
   if (!shouldGoToNextWord) {
     TestInput.corrected.update(data, correct);
   }
@@ -221,6 +210,7 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
       correctInsert: correct,
       isCompositionEnding: isCompositionEnding === true,
       zenNewline: charIsNewline && Config.mode === "zen",
+      now,
     });
     lastBurst = result.lastBurst;
     increasedWordIndex = result.increasedWordIndex;

frontend/src/ts/input/handlers/keydown.ts

@@ -1,5 +1,4 @@
 import { Config } from "../../config/store";
-import * as TestInput from "../../test/test-input";
 import * as TestLogic from "../../test/test-logic";
 import { getCharFromEvent } from "../../test/layout-emulator";
 import * as Monkey from "../../test/monkey";
@@ -133,9 +132,6 @@ export async function onKeydown(event: KeyboardEvent): Promise<void> {
   }
 
   const now = performance.now();
-  if (!TestState.resultCalculating) {
-    TestInput.recordKeydownTime(now, event);
-  }
 
   logTestEvent("keydown", now, {
     code: getTestEventCode(event),

frontend/src/ts/input/handlers/keyup.ts

@@ -1,12 +1,10 @@
 import { Config } from "../../config/store";
-import * as TestInput from "../../test/test-input";
 import * as Monkey from "../../test/monkey";
 import { logTestEvent } from "../../test/events/data";
 import { getTestEventCode } from "../../test/events/helpers";
 
 export async function onKeyup(event: KeyboardEvent): Promise<void> {
   const now = performance.now();
-  TestInput.recordKeyupTime(now, event);
   logTestEvent("keyup", now, {
     code: getTestEventCode(event),
     ctrl: event.ctrlKey,

frontend/src/ts/input/helpers/word-navigation.ts

@@ -9,19 +9,20 @@ import {
   getActiveFunboxesWithFunction,
   isFunboxActiveWithProperty,
 } from "../../test/funbox/list";
-import * as TestStats from "../../test/test-stats";
 import * as Replay from "../../test/replay";
 import * as Funbox from "../../test/funbox/funbox";
 import { showLoaderBar, hideLoaderBar } from "../../states/loader-bar";
 import { setInputElementValue } from "../input-element";
 import { setAwaitingNextWord } from "../state";
 import { DeleteInputType } from "./input-type";
+import { getWordBurst } from "../../test/events/stats";
 
 type GoToNextWordParams = {
   correctInsert: boolean;
   // this is used to tell test ui to update the word before moving to the next word (in case of a composition that ends with a space)
   isCompositionEnding: boolean;
   zenNewline?: boolean;
+  now: number;
 };
 
 type GoToNextWordReturn = {
@@ -33,6 +34,7 @@ export async function goToNextWord({
   correctInsert,
   isCompositionEnding,
   zenNewline,
+  now,
 }: GoToNextWordParams): Promise<GoToNextWordReturn> {
   const ret = {
     increasedWordIndex: false,
@@ -56,8 +58,7 @@ export async function goToNextWord({
   }
 
   //burst calculation and fail
-  const burst: number = TestStats.calculateBurst();
-  TestInput.pushBurstToHistory(burst);
+  const burst = getWordBurst(TestState.activeWordIndex, now);
   ret.lastBurst = burst;
 
   PaceCaret.handleSpace(correctInsert, TestWords.words.getCurrentText());
@@ -88,7 +89,7 @@ export async function goToNextWord({
 
   setInputElementValue("");
   TestInput.input.syncWithInputElement();
-  void TestUI.afterTestWordChange("forward");
+  void TestUI.afterTestWordChange("forward", burst);
 
   return ret;
 }

frontend/src/ts/input/listeners/composition.ts

@@ -2,7 +2,6 @@ import { getInputElement } from "../input-element";
 import * as CompositionState from "../../legacy-states/composition";
 import * as TestState from "../../test/test-state";
 import * as TestLogic from "../../test/test-logic";
-import * as TestInput from "../../test/test-input";
 import { setLastInsertCompositionTextData } from "../state";
 import * as CompositionDisplay from "../../elements/composition-display";
 import { onInsertText } from "../handlers/insert-text";
@@ -25,9 +24,6 @@ inputEl.addEventListener("compositionstart", (event) => {
   if (!TestState.isActive) {
     TestLogic.startTest(now);
   }
-  if (TestInput.input.current.length === 0) {
-    TestInput.setBurstStart(now);
-  }
 
   logTestEvent("composition", now, {
     event: "start",

frontend/src/ts/test/events/data.ts

@@ -14,7 +14,6 @@ import {
   TimerEventData,
 } from "./types";
 import { keysToTrack } from "./helpers";
-import { start } from "../test-stats";
 import { Keycode } from "../../constants/keys";
 import { roundTo2 } from "@monkeytype/util/numbers";
 import { resultCalculating } from "../test-state";
@@ -222,6 +221,9 @@ export function cleanupData(): void {
 export function getAllTestEvents(): TestEvent[] {
   if (cachedAllEvents !== undefined) return cachedAllEvents;
 
+  const startEventMs =
+    timerEvents.find((e) => e.data.event === "start")?.ms ?? 0;
+
   // cachedAllEvents = testData300;
   // return cachedAllEvents;
   cachedAllEvents = [
@@ -237,7 +239,7 @@ export function getAllTestEvents(): TestEvent[] {
         (a.type === "timer" ? 1 : 0) - (b.type === "timer" ? 1 : 0),
     )
     .map((event) => {
-      event.testMs = roundTo2(event.ms - start);
+      event.testMs = roundTo2(event.ms - startEventMs);
       return event;
     });