Merge branch 'main' into chore/internet/password-cleanup

Author: prisis

package.json

@@ -99,7 +99,7 @@
     "c8": "~7.11.0",
     "conventional-changelog-cli": "~2.2.2",
     "cypress": "~9.5.3",
-    "esbuild": "~0.14.30",
+    "esbuild": "~0.14.31",
     "eslint": "~8.12.0",
     "eslint-config-prettier": "~8.5.0",
     "eslint-define-config": "~1.3.0",

pnpm-lock.yaml

@@ -477,22 +477,19 @@ export class Helpers {
    */
   mustache(
     str: string | undefined,
-    data: Record<
-      string,
-      string | ((substring: string, ...args: any[]) => string)
-    >
+    data: Record<string, string | Parameters<string['replace']>[1]>
   ): string {
     if (str == null) {
       return '';
     }
     for (const p in data) {
       const re = new RegExp('{{' + p + '}}', 'g');
-      str = str.replace(
-        re,
-        // TODO @Shinigami92 2022-01-14: Try to improve the type or maybe use `if`
-        // @ts-expect-error
-        data[p]
-      );
+      const value = data[p];
+      if (typeof value === 'string') {
+        str = str.replace(re, value);
+      } else {
+        str = str.replace(re, value);
+      }
     }
     return str;
   }

src/helpers.ts

@@ -326,7 +326,7 @@ export class Random {
       const randomWordMethod = this.faker.random.arrayElement(wordMethods);
 
       result = randomWordMethod();
-    } while (bannedChars.some((char) => result.includes(char)));
+    } while (!result || bannedChars.some((char) => result.includes(char)));
 
     return this.faker.random.arrayElement(result.split(' '));
   }