fix(transformers): use Array.sort in hoisting transformer (#3498)

fixes #3476
kulshekhar · May 18, 2022 · c89a907 · c89a907
1 parent 8fc3e07
commit c89a907
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 42 deletions.
diff --git a/e2e/transform-js/package-lock.json b/e2e/transform-js/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/config/__snapshots__/config-set.spec.ts.snap b/src/config/__snapshots__/config-set.spec.ts.snap
@@ -60,7 +60,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
   ],
 }
@@ -74,7 +74,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
     Object {
       "factory": [Function],
@@ -93,7 +93,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
     Object {
       "factory": [Function],
@@ -118,7 +118,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
   ],
 }
@@ -138,7 +138,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
   ],
 }
@@ -152,7 +152,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
     Object {
       "factory": [Function],

diff --git a/src/transformers/hoist-jest.spec.ts b/src/transformers/hoist-jest.spec.ts
@@ -168,7 +168,7 @@ const printer = ts.createPrinter()
 describe('hoist-jest', () => {
   test('should have correct transformer name and version', () => {
     expect(name).toBe('hoist-jest')
-    expect(version).toBe(3)
+    expect(version).toBe(4)
   })
 
   test('should hoist correctly when not using @jest/globals', () => {

diff --git a/src/transformers/hoist-jest.ts b/src/transformers/hoist-jest.ts
@@ -8,7 +8,7 @@ import type { TsCompilerInstance } from '../types'
  * Remember to increase the version whenever transformer's content is changed. This is to inform Jest to not reuse
  * the previous cache which contains old transformer's content
  */
-export const version = 3
+export const version = 4
 // Used for constructing cache key
 export const name = 'hoist-jest'
 
@@ -87,21 +87,13 @@ export function factory({ configSet }: TsCompilerInstance) {
     if (statements.length <= 1) {
       return statements
     }
-    const pivot = statements[0]
-    const leftPart: _ts.Statement[] = []
-    const rightPart: _ts.Statement[] = []
-    for (let i = 1; i < statements.length; i++) {
-      const currentStatement = statements[i]
-      if (isJestGlobalImport(currentStatement)) {
-        leftPart.push(currentStatement)
-      } else {
-        isHoistableStatement(currentStatement) && !isHoistableStatement(pivot) && !isJestGlobalImport(pivot)
-          ? leftPart.push(currentStatement)
-          : rightPart.push(currentStatement)
-      }
-    }
 
-    return sortStatements(leftPart).concat(pivot, sortStatements(rightPart))
+    return statements.sort((stmtA, stmtB) =>
+      isJestGlobalImport(stmtA) ||
+      (isHoistableStatement(stmtA) && !isHoistableStatement(stmtB) && !isJestGlobalImport(stmtB))
+        ? -1
+        : 1,
+    )
   }
 
   const createVisitor = (ctx: _ts.TransformationContext, _: _ts.SourceFile) => {