yeet missed words

Author: Miodec

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

@@ -164,9 +164,6 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
   // general per keypress updates
   Replay.addReplayEvent(correct ? "correctLetter" : "incorrectLetter", data);
   WeakSpot.updateScore(data, correct);
-  if (!correct) {
-    TestInput.pushMissedWord(TestWords.words.getCurrentText());
-  }
   if (Config.keymapMode === "react") {
     flash(data, correct);
   }

frontend/src/ts/test/events/stats.ts

@@ -753,6 +753,29 @@ export function forceReleaseAllKeys(): void {
   }
 }
 
+export function getMissedWords(): Record<string, number> {
+  const events = getAllTestEvents();
+
+  const missedWords: Record<string, number> = {};
+
+  for (const event of events) {
+    if (
+      event.type === "input" &&
+      event.data.inputType === "insertText" &&
+      !event.data.correct
+    ) {
+      const word = TestWords.words.getText(event.data.wordIndex);
+      if (missedWords[word] === undefined) {
+        missedWords[word] = 1;
+      } else {
+        missedWords[word]++;
+      }
+    }
+  }
+
+  return missedWords;
+}
+
 export const __testing = {
   getTimerBoundaries,
 };

frontend/src/ts/test/practise-words.ts

@@ -9,7 +9,7 @@ import { configEvent } from "../events/config";
 import { setCustomTextName } from "../legacy-states/custom-text-name";
 import { Mode } from "@monkeytype/schemas/shared";
 import { CustomTextSettings } from "@monkeytype/schemas/results";
-import { getBurstHistory } from "./events/stats";
+import { getBurstHistory, getMissedWords } from "./events/stats";
 
 type Before = {
   mode: Mode | null;
@@ -38,11 +38,13 @@ export function init(
     limit = 10;
   }
 
+  const missedWords = getMissedWords();
+
   // missed word, previous word, count
   let sortableMissedWords: [string, number][] = [];
   if (missed === "words") {
-    Object.keys(TestInput.missedWords).forEach((missedWord) => {
-      const missedWordCount = TestInput.missedWords[missedWord];
+    Object.keys(missedWords).forEach((missedWord) => {
+      const missedWordCount = missedWords[missedWord];
       if (missedWordCount !== undefined) {
         sortableMissedWords.push([missedWord, missedWordCount]);
       }
@@ -57,7 +59,7 @@ export function init(
   if (missed === "biwords") {
     for (let i = 0; i < TestWords.words.length; i++) {
       const missedWord = TestWords.words.getText(i);
-      const missedWordCount = TestInput.missedWords[missedWord];
+      const missedWordCount = missedWords[missedWord];
       if (missedWordCount !== undefined) {
         if (i === 0) {
           sortableMissedBiwords.push([missedWord, "", missedWordCount]);

frontend/src/ts/test/test-input.ts

@@ -111,21 +111,3 @@ class Corrected {
 
 export const input = new Input();
 export const corrected = new Corrected();
-
-type MissedWordsType = Record<string, number>;
-// We're using Object.create(null) to make sure that __proto__ won't have any special meaning when it's used to index the missedWords object (so if a user mistypes the word __proto__ it will appear in the practise words test)
-export let missedWords: MissedWordsType = Object.create(
-  null,
-) as MissedWordsType;
-
-export function pushMissedWord(word: string): void {
-  if (!Object.keys(missedWords).includes(word)) {
-    missedWords[word] = 1;
-  } else {
-    (missedWords[word] as number) += 1;
-  }
-}
-
-export function restart(): void {
-  missedWords = Object.create(null) as MissedWordsType;
-}

frontend/src/ts/test/test-logic.ts

@@ -318,7 +318,6 @@ export function restart(options = {} as RestartOptions): void {
   resetTestEvents();
   TestTimer.clear();
   setIsTestInvalid(false);
-  TestInput.restart();
   TestInput.corrected.reset();
   ShiftTracker.reset();
   AltTracker.reset();

frontend/src/ts/test/test-ui.ts

@@ -68,7 +68,11 @@ import {
 import { getTheme } from "../states/theme";
 import { skipBreakdownEvent } from "../states/header";
 import { wordsHaveNewline } from "../states/test";
-import { getBurstHistory, getCurrentAccuracy } from "./events/stats";
+import {
+  getBurstHistory,
+  getCurrentAccuracy,
+  getMissedWords,
+} from "./events/stats";
 
 export const updateHintsPositionDebounced = Misc.debounceUntilResolved(
   updateHintsPosition,
@@ -1962,7 +1966,7 @@ qs(".pageTest #copyMissedWordsListButton")?.on("click", async () => {
   if (Config.mode === "zen") {
     words = TestInput.input.getHistory().join(" ");
   } else {
-    words = Object.keys(TestInput.missedWords ?? {}).join(" ");
+    words = (Object.keys(getMissedWords()) ?? {}).join(" ");
   }
   await copyToClipboard(words);
 });