review

Author: nadalaba

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

@@ -511,17 +511,16 @@ async function init(): Promise<boolean> {
   let wordsHaveNumbers = false;
   let wordsHaveTab = false;
   let wordsHaveNewline = false;
+  let wordsKoreanStatus = false;
   let allLigatures: boolean | undefined = undefined;
   let generatedWords: TestWords.Word[] = [];
-  let generatedWordsText: string[] = [];
-  let generatedSectionIndexes: number[] = [];
   try {
     const gen = await WordsGenerator.generateWords(language);
     generatedWords = gen.words;
-    generatedWordsText = generatedWords.map((w) => w.text);
     wordsHaveNumbers = gen.hasNumbers;
     wordsHaveTab = gen.hasTab;
     wordsHaveNewline = gen.hasNewline;
+    wordsKoreanStatus = gen.koreanStatus;
 
     ({ allLigatures } = gen);
   } catch (e) {
@@ -549,20 +548,10 @@ async function init(): Promise<boolean> {
   TestWords.words.haveNumbers = wordsHaveNumbers;
   TestWords.words.haveNewlines = wordsHaveNewline;
   TestWords.words.haveTabs = wordsHaveTab;
+  TestWords.words.koreanStatus = wordsKoreanStatus;
   setWordsHaveTab(wordsHaveTab);
   setWordsHaveNewline(wordsHaveNewline);
 
-  if (
-    generatedWordsText
-      .join()
-      .normalize()
-      .match(
-        /[\uac00-\ud7af]|[\u1100-\u11ff]|[\u3130-\u318f]|[\ua960-\ua97f]|[\ud7b0-\ud7ff]/g,
-      )
-  ) {
-    TestWords.words.koreanStatus = true;
-  }
-
   TestWords.words.push(generatedWords);
 
   if (Config.keymapMode === "next" && Config.mode !== "zen") {
@@ -575,11 +564,7 @@ async function init(): Promise<boolean> {
   Funbox.toggleScript(TestWords.words.getCurrentText());
   TestUI.setLigatures(allLigatures ?? language.ligatures ?? false);
 
-  console.debug("Test initialized with words", generatedWordsText);
-  console.debug(
-    "Test initialized with section indexes",
-    generatedSectionIndexes,
-  );
+  console.debug("Test initialized with words", generatedWords);
   return true;
 }
 

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

@@ -370,10 +370,10 @@ async function updateHintsPosition(): Promise<void> {
     await joinOverlappingHints(hintIndices, letterElements, wordHintsElements);
   }
 }
-
+/*
 type RequireOnly<T, K extends keyof T> = Required<Pick<T, K>> &
-  Partial<Omit<T, K>>;
-type WordTextWithDirection = RequireOnly<TestWords.Word, "text" | "direction">;
+  Partial<Omit<T, K>>;*/
+type WordTextWithDirection = Pick<TestWords.Word, "text" | "direction">;
 
 function buildWordHTML(word: WordTextWithDirection, wordIndex: number): string {
   let newlineafter = false;

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

@@ -593,6 +593,9 @@ async function getQuoteWordList(
   return TestWords.currentQuote.textSplit;
 }
 
+const koreanRegex =
+  /[\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\uac00-\ud7af\ud7b0-\ud7ff]/;
+
 let currentWordset: Wordset | null = null;
 let currentLanguage: LanguageObject | null = null;
 let isCurrentlyUsingFunboxSection = false;
@@ -602,6 +605,7 @@ type GenerateWordsReturn = {
   hasTab: boolean;
   hasNewline: boolean;
   hasNumbers: boolean;
+  koreanStatus: boolean;
   allRightToLeft?: boolean;
   allLigatures?: boolean;
 };
@@ -625,6 +629,7 @@ export async function generateWords(
     hasTab: false,
     hasNewline: false,
     hasNumbers: false,
+    koreanStatus: false,
     allRightToLeft: language.rightToLeft,
     allLigatures: language.ligatures ?? false,
   };
@@ -720,9 +725,20 @@ export async function generateWords(
     throw new WordGenError("Random quote is null");
   }
 
-  ret.hasTab = currentWordset.words.some((w) => w.includes("\t"));
-  ret.hasNewline = currentWordset.words.some((w) => w.includes("\n"));
-  ret.hasNumbers = currentWordset.words.some((w) => /\d/g.test(w));
+  // we need to test both because ret.words has only first 100 words
+  // and currentWordset.words may be changed inside getNextWord() by funboxes
+  ret.hasTab =
+    ret.words.some((w) => w.text.includes("\t")) ||
+    currentWordset.words.some((w) => w.includes("\t"));
+  ret.hasNewline =
+    ret.words.some((w) => w.text.includes("\n")) ||
+    currentWordset.words.some((w) => w.includes("\n"));
+  ret.hasNumbers =
+    ret.words.some((w) => /\d/g.test(w.text)) ||
+    currentWordset.words.some((w) => /\d/g.test(w));
+  ret.koreanStatus =
+    ret.words.some((w) => koreanRegex.test(w.text.normalize())) ||
+    currentWordset.words.some((w) => koreanRegex.test(w.normalize()));
 
   sectionHistory = []; //free up a bit of memory? is that even a thing?
   return ret;