fix: test

Author: ioanatflowcrypt

test/source/test.ts

@@ -1,6 +1,6 @@
 /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */
 
-import test from 'ava';
+import test, { Implementation } from 'ava';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 
@@ -59,7 +59,7 @@ const testWithBrowser = (
   cb: (t: AvaContext, browser: BrowserHandle) => Promise<void>,
   flag?: 'FAILING',
   timeout = consts.TIMEOUT_EACH_RETRY
-) => {
+): Implementation<unknown[]> => {
   return async (t: AvaContext) => {
     const mockApi = isMock ? await startMockApiAndCopyBuild(t) : undefined;
     if (isMock) {

tooling/resolve-modules.ts

@@ -22,15 +22,16 @@ export interface TSConfig {
 }
 
 const { compilerOptions } = JSON.parse(readFileSync(tsconfigPath || './tsconfig.json').toString()) as TSConfig;
-const moduleMap: { [name: string]: string | null } = {};
+const moduleMap: { [name: string]: string | undefined } = {};
+const commentImportedModules = new Set<string>();
 for (const moduleName of Object.keys(compilerOptions.paths)) {
   if (compilerOptions.paths[moduleName].some((x: string) => x.endsWith('/COMMENT'))) {
     // COMMENT flag, remove such import statements from the code, because they will be imported with script tags for compatibility
-    moduleMap[moduleName] = null; // eslint-disable-line no-null/no-null
+    commentImportedModules.add(moduleName);
   } else {
     // replace import with full path from config
-    const selectedPath = compilerOptions.paths[moduleName].find((x: string) => /\.(mjs|js)$/.exec(x) !== null);
-    moduleMap[moduleName] = selectedPath?.replace(/^\.\/extension\//, '') || null; // eslint-disable-line no-null/no-null
+    const selectedPath = compilerOptions.paths[moduleName].find((x: string) => /\.(mjs|js)$/.test(x));
+    moduleMap[moduleName] = selectedPath?.replace(/^\.\/extension\//, '');
   }
 }
 
@@ -41,18 +42,18 @@ const importLineEndingWithJsNotStartingWithDot = /^(?!\s*\/\/)(?!\s*\/\*)(?:\s*i
 
 const resolveLineImports = (regex: RegExp, line: string, path: string) =>
   line.replace(regex, (found, prefix, libname: string, suffix) => {
-    // eslint-disable-next-line no-null/no-null
-    if (moduleMap[libname] === null) {
+    if (commentImportedModules.has(libname)) {
       return `// ${prefix}${libname}${suffix} // commented during build process: imported with script tag`;
-    } else if (!moduleMap[libname]) {
+    }
+    const mappedModulePath = moduleMap[libname];
+    if (!mappedModulePath) {
       return found;
-    } else {
-      const depth = path.split(sep).length;
-      const prePath = '../'.repeat(depth - 3); // todo:
-      const resolved = `${prefix}${prePath}${moduleMap[libname]}${suffix}`;
-      // console.info(`${path}: ${found} -> ${resolved}`);
-      return resolved;
     }
+    const depth = path.split(sep).length;
+    const prePath = '../'.repeat(depth - 3); // todo:
+    const resolved = `${prefix}${prePath}${mappedModulePath}${suffix}`;
+    // console.info(`${path}: ${found} -> ${resolved}`);
+    return resolved;
   });
 
 const errIfSrcMissingJsExtensionInImport = (src: string, path: string) => {