chore: avoid await expressions (jestjs#14815)

AmerAlkaki · Dec 30, 2023 · 2f6984d · 2f6984d
1 parent 9ced685
commit 2f6984d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 28 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -234,9 +234,10 @@ module.exports = {
         'no-undef': 'off',
         'no-unused-vars': 'off',
         'sort-keys': 'off',
-        'unicorn/prefer-number-properties': 'off',
-        'unicorn/no-static-only-class': 'off',
         'unicorn/consistent-function-scoping': 'off',
+        'unicorn/no-await-expression-member': 'off',
+        'unicorn/no-static-only-class': 'off',
+        'unicorn/prefer-number-properties': 'off',
       },
     },
     // demonstration of matchers usage
@@ -345,6 +346,7 @@ module.exports = {
       ],
       rules: {
         '@typescript-eslint/explicit-module-boundary-types': 'off',
+        'unicorn/no-await-expression-member': 'off',
         'unicorn/consistent-function-scoping': 'off',
       },
     },
@@ -711,7 +713,6 @@ module.exports = {
     // TODO: turn on at some point
     'unicorn/catch-error-name': 'off',
     'unicorn/error-message': 'off',
-    'unicorn/no-await-expression-member': 'off',
     'unicorn/no-object-as-default-parameter': 'off',
     'unicorn/no-typeof-undefined': 'off',
     'unicorn/prefer-object-from-entries': 'off',

diff --git a/e2e/__tests__/hasteMapSize.test.ts b/e2e/__tests__/hasteMapSize.test.ts
@@ -38,7 +38,7 @@ const options = {
 
 test('reports the correct file size', async () => {
   const hasteMap = await HasteMap.create(options);
-  const hasteFS = (await hasteMap.build()).hasteFS;
+  const {hasteFS} = await hasteMap.build();
   expect(hasteFS.getSize(path.join(DIR, 'file.js'))).toBe(5);
 });
 

diff --git a/packages/jest-changed-files/src/index.ts b/packages/jest-changed-files/src/index.ts
@@ -43,9 +43,12 @@ export const getChangedFilesForRoots = async (
     sl.findChangedFiles(repo, changedFilesOptions),
   );
 
-  const changedFiles = (
-    await Promise.all([...gitPromises, ...hgPromises, ...slPromises])
-  ).reduce((allFiles, changedFilesInTheRepo) => {
+  const allVcs = await Promise.all([
+    ...gitPromises,
+    ...hgPromises,
+    ...slPromises,
+  ]);
+  const changedFiles = allVcs.reduce((allFiles, changedFilesInTheRepo) => {
     for (const file of changedFilesInTheRepo) {
       allFiles.add(file);
     }

diff --git a/packages/jest-core/src/runJest.ts b/packages/jest-core/src/runJest.ts
@@ -274,17 +274,16 @@ export default async function runJest({
     const changedFilesInfo = await changedFilesPromise;
     if (changedFilesInfo.changedFiles) {
       testSchedulerContext.changedFiles = changedFilesInfo.changedFiles;
-      const sourcesRelatedToTestsInChangedFilesArray = (
-        await Promise.all(
-          contexts.map(async (_, index) => {
-            const searchSource = searchSources[index];
-
-            return searchSource.findRelatedSourcesFromTestsInChangedFiles(
-              changedFilesInfo,
-            );
-          }),
-        )
-      ).flat();
+      const relatedFiles = await Promise.all(
+        contexts.map(async (_, index) => {
+          const searchSource = searchSources[index];
+
+          return searchSource.findRelatedSourcesFromTestsInChangedFiles(
+            changedFilesInfo,
+          );
+        }),
+      );
+      const sourcesRelatedToTestsInChangedFilesArray = relatedFiles.flat();
       testSchedulerContext.sourcesRelatedToTestsInChangedFiles = new Set(
         sourcesRelatedToTestsInChangedFilesArray,
       );

diff --git a/packages/jest-snapshot/src/worker.ts b/packages/jest-snapshot/src/worker.ts
@@ -10,6 +10,12 @@ import {processPrettierAst} from './utils';
 
 let prettier: typeof import('prettier');
 
+async function getInferredParser(filepath: string) {
+  const fileInfo = await prettier.getFileInfo(filepath);
+
+  return fileInfo.inferredParser;
+}
+
 runAsWorker(
   async (
     prettierPath: string,
@@ -25,8 +31,9 @@ runAsWorker(
     });
 
     const inferredParser: string | null =
-      (typeof config?.parser === 'string' && config.parser) ||
-      (await prettier.getFileInfo(filepath)).inferredParser;
+      typeof config?.parser === 'string'
+        ? config.parser
+        : await getInferredParser(filepath);
 
     if (!inferredParser) {
       throw new Error(`Could not infer Prettier parser for file ${filepath}`);
@@ -51,13 +58,13 @@ runAsWorker(
     // after the initial format because we don't know where the call expression
     // will be placed (specifically its indentation), so we have to do two
     // prettier.format calls back-to-back.
-    return /** @ts-expect-error private API */ (
-      await prettier.__debug.formatAST(ast, {
-        ...config,
-        filepath,
-        originalText: sourceFileWithSnapshots,
-        parser: inferredParser,
-      })
-    ).formatted;
+    // @ts-expect-error private API
+    const formatAST = await prettier.__debug.formatAST(ast, {
+      ...config,
+      filepath,
+      originalText: sourceFileWithSnapshots,
+      parser: inferredParser,
+    });
+    return formatAST.formatted;
   },
 );