[pull] master from monkeytypegame:master

frontend/__tests__/input/helpers/validation.spec.ts

@@ -14,10 +14,15 @@ vi.mock("../../../src/ts/test/funbox/list", () => ({
   findSingleActiveFunboxWithFunction: vi.fn(),
 }));
 
-vi.mock("../../../src/ts/utils/strings", () => ({
-  areCharactersVisuallyEqual: vi.fn(),
-  isSpace: vi.fn(),
-}));
+vi.mock("../../../src/ts/utils/strings", async () => {
+  const actual = await vi.importActual<typeof Strings>(
+    "../../../src/ts/utils/strings"
+  );
+  return {
+    ...actual,
+    areCharactersVisuallyEqual: vi.fn(),
+  };
+});
 
 describe("isCharCorrect", () => {
   beforeEach(() => {
@@ -34,7 +39,6 @@ describe("isCharCorrect", () => {
       null
     );
     (Strings.areCharactersVisuallyEqual as any).mockReturnValue(false);
-    (Strings.isSpace as any).mockReturnValue(false);
   });
 
   afterAll(() => {
@@ -133,7 +137,6 @@ describe("isCharCorrect", () => {
 
 describe("shouldInsertSpaceCharacter", () => {
   beforeEach(() => {
-    (Strings.isSpace as any).mockReturnValue(true);
     replaceConfig({
       mode: "time",
       stopOnError: "off",
@@ -147,7 +150,6 @@ describe("shouldInsertSpaceCharacter", () => {
   });
 
   it("returns null if data is not a space", () => {
-    (Strings.isSpace as any).mockReturnValue(false);
     expect(
       shouldInsertSpaceCharacter({
         data: "a",

frontend/__tests__/utils/strings.spec.ts

@@ -474,14 +474,14 @@ describe("string utils", () => {
       ["\u2003", 0x2003, "em space", true],
       ["\u2009", 0x2009, "thin space", true],
       ["　", 0x3000, "ideographic space", true],
+      ["\u00A0", 0x00a0, "non-breaking space", true],
+      ["\u2007", 0x2007, "figure space", true],
+      ["\u2008", 0x2008, "punctuation space", true],
+      ["\u200A", 0x200a, "hair space", true],
+      ["​", 0x200b, "zero-width space", true],
 
       // Should return false for other characters
       ["\t", 0x0009, "tab", false],
-      ["\u00A0", 0x00a0, "non-breaking space", false],
-      ["\u2007", 0x2007, "figure space", false],
-      ["\u2008", 0x2008, "punctuation space", false],
-      ["\u200A", 0x200a, "hair space", false],
-      ["​", 0x200b, "zero-width space", false],
       ["a", 0x0061, "letter a", false],
       ["A", 0x0041, "letter A", false],
       ["1", 0x0031, "digit 1", false],

frontend/src/ts/commandline/commandline-metadata.ts

@@ -703,6 +703,12 @@ export const commandlineConfigMetadata: CommandlineConfigMetadataObject = {
       options: "fromSchema",
     },
   },
+  showPb: {
+    subgroup: {
+      options: "fromSchema",
+    },
+    alias: "pb",
+  },
   monkeyPowerLevel: {
     alias: "powermode",
     isVisible: false,

frontend/src/ts/commandline/lists.ts

@@ -52,6 +52,7 @@ const confidenceModeCommand = buildCommandForConfigKey("confidenceMode");
 const lazyModeCommand = buildCommandForConfigKey("lazyMode");
 const layoutCommand = buildCommandForConfigKey("layout");
 const showAverageCommand = buildCommandForConfigKey("showAverage");
+const showPbCommand = buildCommandForConfigKey("showPb");
 const keymapLayoutCommand = buildCommandForConfigKey("keymapLayout");
 const customThemeCommand = buildCommandForConfigKey("customTheme");
 const adsCommand = buildCommandForConfigKey("ads");
@@ -216,6 +217,7 @@ export const commands: CommandsSubgroup = {
       "showOutOfFocusWarning",
       "capsLockWarning",
       showAverageCommand,
+      showPbCommand,
       "monkeyPowerLevel",
       "monkey"
     ),
@@ -377,6 +379,7 @@ const lists = {
   lazyMode: lazyModeCommand.subgroup,
   paceCaretMode: paceCaretCommand.subgroup,
   showAverage: showAverageCommand.subgroup,
+  showPb: showPbCommand.subgroup,
   minWpm: minSpeedCommand.subgroup,
   minAcc: minAccCommand.subgroup,
   minBurst: MinBurstCommands[0]?.subgroup,

frontend/src/ts/config-metadata.ts

@@ -742,6 +742,11 @@ export const configMetadata: ConfigMetadataObject = {
     displayString: "show average",
     changeRequiresRestart: false,
   },
+  showPb: {
+    icon: "fa-crown",
+    displayString: "show personal best",
+    changeRequiresRestart: false,
+  },
 
   // other (hidden)
   accountChart: {

frontend/src/ts/constants/default-config.ts

@@ -97,6 +97,7 @@ const obj: Config = {
   britishEnglish: false,
   lazyMode: false,
   showAverage: "off",
+  showPb: false,
   tapeMode: "off",
   tapeMargin: 50,
   maxLineWidth: 0,

frontend/src/ts/elements/modes-notice.ts

@@ -9,8 +9,8 @@ import { isAuthenticated } from "../firebase";
 import * as CustomTextState from "../states/custom-text-name";
 import { getLanguageDisplayString } from "../utils/strings";
 import Format from "../utils/format";
-import { getActiveFunboxNames } from "../test/funbox/list";
-import { escapeHTML } from "../utils/misc";
+import { getActiveFunboxes, getActiveFunboxNames } from "../test/funbox/list";
+import { escapeHTML, getMode2 } from "../utils/misc";
 
 ConfigEvent.subscribe((eventKey) => {
   const configKeys: ConfigEvent.ConfigEventKey[] = [
@@ -26,6 +26,7 @@ ConfigEvent.subscribe((eventKey) => {
     "confidenceMode",
     "layout",
     "showAverage",
+    "showPb",
     "typingSpeedUnit",
     "quickRestart",
     "customPolyglot",
@@ -191,6 +192,36 @@ export async function update(): Promise<void> {
     }
   }
 
+  if (Config.showPb) {
+    if (!isAuthenticated()) {
+      return;
+    }
+    const mode2 = getMode2(Config, TestWords.currentQuote);
+    const pb = await DB.getLocalPB(
+      Config.mode,
+      mode2,
+      Config.punctuation,
+      Config.numbers,
+      Config.language,
+      Config.difficulty,
+      Config.lazyMode,
+      getActiveFunboxes()
+    );
+
+    let str = "no pb";
+
+    if (pb !== undefined) {
+      str = `${Format.typingSpeed(pb.wpm, {
+        showDecimalPlaces: true,
+        suffix: ` ${Config.typingSpeedUnit}`,
+      })} ${pb?.acc}% acc`;
+    }
+
+    $(".pageTest #testModesNotice").append(
+      `<button class="textButton" commands="showPb"><i class="fas fa-crown"></i>${str}</button>`
+    );
+  }
+
   if (Config.minWpm !== "off") {
     $(".pageTest #testModesNotice").append(
       `<button class="textButton" commands="minWpm"><i class="fas fa-bomb"></i>min ${Format.typingSpeed(
@@ -277,15 +308,3 @@ export async function update(): Promise<void> {
     }
   } catch {}
 }
-
-if (import.meta.hot !== undefined) {
-  import.meta.hot.dispose(() => {
-    //
-  });
-  import.meta.hot.accept(() => {
-    //
-  });
-  import.meta.hot.on("vite:afterUpdate", () => {
-    void update();
-  });
-}

frontend/src/ts/event-handlers/global.ts

@@ -10,6 +10,7 @@ import { focusWords } from "../test/test-ui";
 import * as TestLogic from "../test/test-logic";
 import { navigate } from "../controllers/route-controller";
 import { isInputElementFocused } from "../input/input-element";
+import * as ManualRestart from "../test/manual-restart-tracker";
 
 document.addEventListener("keydown", (e) => {
   if (PageTransition.get()) return;
@@ -74,6 +75,9 @@ document.addEventListener("keydown", (e) => {
     ) {
       e.preventDefault();
       if (ActivePage.get() === "test") {
+        if (e.shiftKey) {
+          ManualRestart.set();
+        }
         TestLogic.restart();
       } else {
         void navigate("");

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

@@ -51,8 +51,8 @@ export function onBeforeInsertText(data: string): boolean {
     return true;
   }
 
-  //only allow newlines if the test has newlines
-  if (data === "\n" && !TestWords.hasNewline) {
+  //only allow newlines if the test has newlines or in zen mode
+  if (data === "\n" && !TestWords.hasNewline && Config.mode !== "zen") {
     return true;
   }
 

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

@@ -217,6 +217,7 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
     const result = await goToNextWord({
       correctInsert: correct,
       isCompositionEnding: isCompositionEnding === true,
+      zenNewline: charIsNewline && Config.mode === "zen",
     });
     lastBurst = result.lastBurst;
     increasedWordIndex = result.increasedWordIndex;

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

@@ -11,6 +11,7 @@ import * as Notifications from "../../elements/notifications";
 import * as KeyConverter from "../../utils/key-converter";
 import * as ShiftTracker from "../../test/shift-tracker";
 import * as CompositionState from "../../states/composition";
+import * as ManualRestart from "../../test/manual-restart-tracker";
 import { canQuickRestart } from "../../utils/quick-restart";
 import * as CustomText from "../../test/custom-text";
 import * as CustomTextState from "../../states/custom-text-name";
@@ -28,6 +29,9 @@ export async function handleTab(e: KeyboardEvent, now: number): Promise<void> {
   if (Config.quickRestart === "tab") {
     e.preventDefault();
     if ((TestWords.hasTab && e.shiftKey) || !TestWords.hasTab) {
+      if (e.shiftKey) {
+        ManualRestart.set();
+      }
       TestLogic.restart();
       return;
     }
@@ -81,6 +85,9 @@ export async function handleEnter(
   if (Config.quickRestart === "enter") {
     e.preventDefault();
     if ((TestWords.hasNewline && e.shiftKey) || !TestWords.hasNewline) {
+      if (e.shiftKey) {
+        ManualRestart.set();
+      }
       TestLogic.restart();
       return;
     }
@@ -206,6 +213,11 @@ export async function onKeydown(event: KeyboardEvent): Promise<void> {
 
   if (event.key === "Escape" && Config.quickRestart === "esc") {
     event.preventDefault();
+
+    if (event.shiftKey) {
+      ManualRestart.set();
+    }
+
     TestLogic.restart();
     return;
   }

frontend/src/ts/input/helpers/input-type.ts

@@ -1,15 +1,15 @@
 export type InsertInputType =
   | "insertText"
   | "insertCompositionText"
+  | "insertFromComposition" // safari firing a deprecated input type - thanks apple!
   | "insertLineBreak";
-
 export type DeleteInputType = "deleteWordBackward" | "deleteContentBackward";
 
-export type SupportedInputType = InsertInputType | DeleteInputType;
-
+type SupportedInputType = InsertInputType | DeleteInputType;
 const SUPPORTED_INPUT_TYPES: Set<SupportedInputType> = new Set([
   "insertText",
   "insertCompositionText",
+  "insertFromComposition",
   "insertLineBreak",
   "deleteWordBackward",
   "deleteContentBackward",

frontend/src/ts/input/helpers/validation.ts

@@ -25,7 +25,7 @@ export function isCharCorrect(options: {
     throw new Error("Failed to check if char is correct - data is undefined");
   }
 
-  if (data === " ") {
+  if (isSpace(data)) {
     return inputValue === targetWord;
   }
 

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

@@ -21,6 +21,7 @@ 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;
 };
 
 type GoToNextWordReturn = {
@@ -31,13 +32,18 @@ type GoToNextWordReturn = {
 export async function goToNextWord({
   correctInsert,
   isCompositionEnding,
+  zenNewline,
 }: GoToNextWordParams): Promise<GoToNextWordReturn> {
   const ret = {
     increasedWordIndex: false,
     lastBurst: 0,
   };
 
-  TestUI.beforeTestWordChange("forward", correctInsert, isCompositionEnding);
+  TestUI.beforeTestWordChange(
+    "forward",
+    correctInsert,
+    isCompositionEnding || zenNewline === true
+  );
 
   if (correctInsert) {
     Replay.addReplayEvent("submitCorrectWord");

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

@@ -1,9 +1,6 @@
 import { onDelete } from "../handlers/delete";
 import { onInsertText } from "../handlers/insert-text";
-import {
-  isSupportedInputType,
-  SupportedInputType,
-} from "../helpers/input-type";
+import { isSupportedInputType } from "../helpers/input-type";
 import { getInputElement } from "../input-element";
 import {
   getLastInsertCompositionTextData,
@@ -56,7 +53,10 @@ inputEl.addEventListener("beforeinput", async (event) => {
     inputType === "deleteContentBackward"
   ) {
     onBeforeDelete(event);
-  } else if (inputType === "insertCompositionText") {
+  } else if (
+    inputType === "insertCompositionText" ||
+    inputType === "insertFromComposition"
+  ) {
     // firefox fires this extra event which we dont want to handle
     if (!event.isComposing) {
       event.preventDefault();
@@ -80,11 +80,16 @@ inputEl.addEventListener("input", async (event) => {
     value: (event.target as HTMLInputElement).value,
   });
 
+  // this shouldnt be neccesary because beforeinput already prevents default
+  // but some browsers (LIKE SAFARI) seem to ignore that, so just double checking here
+  if (!isSupportedInputType(event.inputType)) {
+    event.preventDefault();
+    return;
+  }
+
   const now = performance.now();
 
-  // this is ok to cast because we are preventing default
-  // in the input listener for unsupported input types
-  const inputType = event.inputType as SupportedInputType;
+  const inputType = event.inputType;
 
   if (
     (inputType === "insertText" && event.data !== null) ||
@@ -105,7 +110,10 @@ inputEl.addEventListener("input", async (event) => {
     inputType === "deleteContentBackward"
   ) {
     onDelete(inputType);
-  } else if (inputType === "insertCompositionText") {
+  } else if (
+    inputType === "insertCompositionText" ||
+    inputType === "insertFromComposition"
+  ) {
     // in case the data is the same as the last one, just ignore it
     if (getLastInsertCompositionTextData() !== event.data) {
       setLastInsertCompositionTextData(event.data ?? "");

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

@@ -597,6 +597,17 @@ async function init(): Promise<boolean> {
     void Keymap.refresh();
   }
 
+  if (
+    generatedWords
+      .join()
+      .normalize()
+      .match(
+        /[\uac00-\ud7af]|[\u1100-\u11ff]|[\u3130-\u318f]|[\ua960-\ua97f]|[\ud7b0-\ud7ff]/g
+      )
+  ) {
+    TestInput.input.setKoreanStatus(true);
+  }
+
   for (let i = 0; i < generatedWords.length; i++) {
     TestWords.words.push(
       generatedWords[i] as string,