move

Author: Miodec

frontend/src/ts/pages/test.ts

@@ -1,4 +1,3 @@
-import * as TestStats from "../test/test-stats";
 import * as TestLogic from "../test/test-logic";
 import * as Funbox from "../test/funbox/funbox";
 import Page from "./page";
@@ -7,6 +6,11 @@ import * as ModesNotice from "../elements/modes-notice";
 import * as Keymap from "../elements/keymap";
 import { blurInputElement } from "../input/input-element";
 import { qsr } from "../utils/dom";
+import {
+  resetIncompleteSeconds,
+  resetIncompleteTests,
+  resetRestartCount,
+} from "../states/test";
 
 export const page = new Page({
   id: "test",
@@ -25,7 +29,9 @@ export const page = new Page({
   },
   beforeShow: async (): Promise<void> => {
     updateFooterAndVerticalAds(false);
-    TestStats.resetIncomplete();
+    resetIncompleteTests();
+    resetIncompleteSeconds();
+    resetRestartCount();
     TestLogic.restart({
       noAnim: true,
     });

frontend/src/ts/states/test.ts

@@ -5,6 +5,8 @@ import { getActivePage } from "./core";
 import { canQuickRestart } from "../utils/quick-restart";
 import { getData as getCustomTextData } from "../test/custom-text";
 import { isCustomTextLong } from "../legacy-states/custom-text-name";
+import { CompletedEvent, IncompleteTest } from "@monkeytype/schemas/results";
+import { createSignalWithSetters } from "../hooks/createSignalWithSetters";
 
 export const [wordsHaveNewline, setWordsHaveNewline] = createSignal(false);
 export const [wordsHaveTab, setWordsHaveTab] = createSignal(false);
@@ -13,8 +15,33 @@ export const [getLoadedChallenge, setLoadedChallenge] =
   createSignal<Challenge | null>(null);
 export const [getResultVisible, setResultVisible] = createSignal(false);
 export const [getFocus, setFocus] = createSignal(false);
-
+export const [isTestInvalid, setIsTestInvalid] = createSignal(false);
 export const [isLongTest, setIsLongTest] = createSignal(false);
+export const [getLastResult, setLastResult] = createSignal<Omit<
+  CompletedEvent,
+  "hash" | "uid"
+> | null>(null);
+export const [
+  getRestartCount,
+  { increment: incrementRestartCount, reset: resetRestartCount },
+] = createSignalWithSetters(0)({
+  increment: (set) => set((n) => n + 1),
+  reset: (set) => set(0),
+});
+export const [
+  getIncompleteSeconds,
+  { increment: incrementIncompleteSeconds, reset: resetIncompleteSeconds },
+] = createSignalWithSetters(0)({
+  increment: (set, val: number) => set((n) => n + val),
+  reset: (set) => set(0),
+});
+export const [
+  getIncompleteTests,
+  { push: pushIncompleteTest, reset: resetIncompleteTests },
+] = createSignalWithSetters<IncompleteTest[]>([])({
+  push: (set, val: IncompleteTest) => set((arr) => [...arr, val]),
+  reset: (set) => set([]),
+});
 
 createEffect(() => {
   getActivePage(); // depend on active page

frontend/src/ts/test/result.ts

@@ -61,6 +61,7 @@ import * as ConnectionState from "../legacy-states/connection";
 import { currentQuote } from "./test-words";
 import { qs, qsa } from "../utils/dom";
 import { getTheme } from "../states/theme";
+import { isTestInvalid } from "../states/test";
 
 let result: CompletedEvent;
 let minChartVal: number;
@@ -833,7 +834,7 @@ function updateOther(
   if (afkDetected) {
     otherText += "<br>afk detected";
   }
-  if (TestStats.invalid) {
+  if (isTestInvalid()) {
     otherText += "<br>invalid";
     const extra: string[] = [];
     if (

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

@@ -29,6 +29,17 @@ import { clearQuoteStats } from "../states/quote-rate";
 import * as Result from "./result";
 import { getActivePage, isAuthenticated } from "../states/core";
 import {
+  getIncompleteSeconds,
+  getIncompleteTests,
+  getRestartCount,
+  incrementIncompleteSeconds,
+  incrementRestartCount,
+  pushIncompleteTest,
+  resetIncompleteSeconds,
+  resetIncompleteTests,
+  resetRestartCount,
+  setIsTestInvalid,
+  setLastResult,
   setResultVisible,
   setWordsHaveNewline,
   setWordsHaveTab,
@@ -253,10 +264,10 @@ export function restart(options = {} as RestartOptions): void {
       const afkseconds = TestStats.calculateAfkSeconds(testSeconds);
       let tt = Numbers.roundTo2(testSeconds - afkseconds);
       if (tt < 0) tt = 0;
-      TestStats.incrementIncompleteSeconds(tt);
-      TestStats.incrementRestartCount();
+      incrementIncompleteSeconds(tt);
+      incrementRestartCount();
       const acc = Numbers.roundTo2(TestStats.calculateAccuracy());
-      TestStats.pushIncompleteTest(acc, tt);
+      pushIncompleteTest({ acc, seconds: tt });
     }
   }
 
@@ -297,6 +308,7 @@ export function restart(options = {} as RestartOptions): void {
   }
 
   TestTimer.clear();
+  setIsTestInvalid(false);
   TestStats.restart();
   TestInput.restart();
   TestInput.corrected.reset();
@@ -846,12 +858,10 @@ function buildCompletedEvent(
     lazyMode: Config.lazyMode,
     timestamp: Date.now(),
     language: language,
-    restartCount: TestStats.restartCount,
-    incompleteTests: TestStats.incompleteTests,
+    restartCount: getRestartCount(),
+    incompleteTests: getIncompleteTests(),
     incompleteTestSeconds:
-      TestStats.incompleteSeconds < 0
-        ? 0
-        : Numbers.roundTo2(TestStats.incompleteSeconds),
+      getIncompleteSeconds() < 0 ? 0 : Numbers.roundTo2(getIncompleteSeconds()),
     difficulty: Config.difficulty,
     blindMode: Config.blindMode,
     tags: activeTagsIds,
@@ -1013,7 +1023,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
 
   const completedEvent = structuredClone(ce) as CompletedEvent;
 
-  TestStats.setLastResult(structuredClone(completedEvent));
+  setLastResult(structuredClone(completedEvent));
 
   ///////// completed event ready
 
@@ -1036,7 +1046,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
   ) {
     showNoticeNotification("Test invalid - inconsistent test duration");
     console.error("Test duration inconsistent", ce.testDuration, dateDur);
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     dontSave = true;
   } else if (difficultyFailed) {
     showNoticeNotification(`Test failed - ${failReason}`, {
@@ -1063,16 +1073,16 @@ export async function finish(difficultyFailed = false): Promise<void> {
     (Config.mode === "zen" && completedEvent.testDuration < 15)
   ) {
     showNoticeNotification("Test invalid - too short");
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     tooShort = true;
     dontSave = true;
   } else if (afkDetected) {
     showNoticeNotification("Test invalid - AFK detected");
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     dontSave = true;
   } else if (TestState.isRepeated) {
     showNoticeNotification("Test invalid - repeated");
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     dontSave = true;
   } else if (
     completedEvent.wpm < 0 ||
@@ -1084,7 +1094,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
       completedEvent.mode2 === "10")
   ) {
     showNoticeNotification("Test invalid - wpm");
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     dontSave = true;
   } else if (
     completedEvent.rawWpm < 0 ||
@@ -1096,7 +1106,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
       completedEvent.mode2 === "10")
   ) {
     showNoticeNotification("Test invalid - raw");
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     dontSave = true;
   } else if (
     (!DB.getSnapshot()?.lbOptOut &&
@@ -1105,7 +1115,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
       (completedEvent.acc < 50 || completedEvent.acc > 100))
   ) {
     showNoticeNotification("Test invalid - accuracy");
-    TestStats.setInvalid();
+    setIsTestInvalid(true);
     dontSave = true;
   }
 
@@ -1118,9 +1128,9 @@ export async function finish(difficultyFailed = false): Promise<void> {
       let tt = Numbers.roundTo2(testSeconds - afkseconds);
       if (tt < 0) tt = 0;
       const acc = completedEvent.acc;
-      TestStats.incrementIncompleteSeconds(tt);
-      TestStats.incrementRestartCount();
-      TestStats.pushIncompleteTest(acc, tt);
+      incrementIncompleteSeconds(tt);
+      incrementRestartCount();
+      pushIncompleteTest({ acc, seconds: tt });
     }
   }
 
@@ -1180,7 +1190,9 @@ export async function finish(difficultyFailed = false): Promise<void> {
     if (dontSave) {
       void AnalyticsController.log("testCompletedInvalid");
     } else {
-      TestStats.resetIncomplete();
+      resetIncompleteTests();
+      resetRestartCount();
+      resetIncompleteSeconds();
 
       if (!completedEvent.bailedOut) {
         const challenge = ChallengeContoller.verify(completedEvent);

frontend/src/ts/test/test-stats.ts

@@ -5,9 +5,9 @@ import * as TestInput from "./test-input";
 import * as TestWords from "./test-words";
 import * as TestState from "./test-state";
 import * as Numbers from "@monkeytype/util/numbers";
-import { CompletedEvent, IncompleteTest } from "@monkeytype/schemas/results";
 import { isFunboxActiveWithProperty } from "./funbox/list";
 import * as CustomText from "./custom-text";
+import { getLastResult } from "../states/test";
 
 type CharCount = {
   spaces: number;
@@ -33,21 +33,14 @@ export type Stats = {
   correctSpaces: number;
 };
 
-export let invalid = false;
 export let start: number, end: number;
 export let start2: number, end2: number;
 export let start3: number, end3: number;
 export let lastSecondNotRound = false;
 
-export let lastResult: Omit<CompletedEvent, "hash" | "uid">;
-
-export function setLastResult(result: CompletedEvent): void {
-  lastResult = result;
-}
-
 export function getStats(): unknown {
   const ret = {
-    lastResult,
+    lastResult: getLastResult(),
     start,
     end,
     start3,
@@ -106,37 +99,9 @@ export function getStats(): unknown {
 export function restart(): void {
   start = 0;
   end = 0;
-  invalid = false;
   lastSecondNotRound = false;
 }
 
-export let restartCount = 0;
-export let incompleteSeconds = 0;
-
-export let incompleteTests: IncompleteTest[] = [];
-
-export function incrementRestartCount(): void {
-  restartCount++;
-}
-
-export function incrementIncompleteSeconds(val: number): void {
-  incompleteSeconds += val;
-}
-
-export function pushIncompleteTest(acc: number, seconds: number): void {
-  incompleteTests.push({ acc, seconds });
-}
-
-export function resetIncomplete(): void {
-  restartCount = 0;
-  incompleteSeconds = 0;
-  incompleteTests = [];
-}
-
-export function setInvalid(): void {
-  invalid = true;
-}
-
 export function calculateTestSeconds(now?: number): number {
   let duration = (end - start) / 1000;