impr(polyglot): Add hasChar method to Wordset to escape direct refer to Wordset.words.

Small refactoring in Wordset classes.
(@IliyaZinoviev)

Author: IliyaZinoviev

frontend/src/ts/test/funbox/funbox-functions.ts

@@ -161,7 +161,7 @@ export class PolyglotWordset extends Wordset {
     this.wordsMap = wordsMap;
     this.resetIndexes();
     this.length = Array.from(this.wordsMap.values()).reduce(
-      (sum, ws) => sum + ws.words.length,
+      (sum, ws) => sum + ws.length,
       0,
     );
     this.currLang = this.langs[0] as Language;
@@ -172,7 +172,7 @@ export class PolyglotWordset extends Wordset {
   }
 
   override resetIndexes(): void {
-    this.wordsMap.forEach((ws, _) => {
+    this.wordsMap.forEach((ws) => {
       ws.resetIndexes();
     });
   }
@@ -199,6 +199,12 @@ export class PolyglotWordset extends Wordset {
   override nextWord(): string {
     return this.getWordset().nextWord();
   }
+
+  override hasChar(c: string): boolean {
+    return Array.from(this.wordsMap.values()).some((ws) =>
+      ws.words.includes(c),
+    );
+  }
 }
 
 const list: Partial<Record<FunboxName, FunboxFunctions>> = {

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

@@ -707,12 +707,12 @@ export async function generateWords(
 
   ret.hasTab =
     ret.words.some((w) => w.includes("\t")) ||
-    currentWordset.words.some((w) => w.includes("\t")) ||
+    currentWordset.hasChar("\t") ||
     (Config.mode === "quote" &&
       (quote as QuoteWithTextSplit).textSplit.some((w) => w.includes("\t")));
   ret.hasNewline =
     ret.words.some((w) => w.includes("\n")) ||
-    currentWordset.words.some((w) => w.includes("\n")) ||
+    currentWordset.hasChar("\n") ||
     (Config.mode === "quote" &&
       (quote as QuoteWithTextSplit).textSplit.some((w) => w.includes("\n")));
 

frontend/src/ts/test/wordset.ts

@@ -25,7 +25,7 @@ export class Wordset {
 
   randomWord(mode: FunboxWordsFrequency): string {
     if (mode === "zipf") {
-      return this.words[zipfyRandomArrayIndex(this.words.length)] as string;
+      return this.words[zipfyRandomArrayIndex(this.length)] as string;
     } else {
       return randomElementFromArray(this.words);
     }
@@ -52,6 +52,10 @@ export class Wordset {
     }
     return this.words[this.orderedIndex++] as string;
   }
+
+  hasChar(c: string): boolean {
+    return this.words.some((w) => w.includes(c));
+  }
 }
 
 export async function withWords(words: string[]): Promise<Wordset> {