fix: smarter auto semi insertion

Author: sxzz

.prettierignore

@@ -1 +1 @@
-tests/fixtures/basic.js
+tests/fixtures/semi.js

src/core/index.ts

@@ -47,7 +47,7 @@ export function transformQuansync(
   function findUpExpressionStatement(): t.ExpressionStatement | undefined {
     for (let i = nodeStack.length - 1; i >= 0; i--) {
       const node = nodeStack[i]
-      if (isFunctionType(node)) return
+      if (isFunctionType(node) || node.type === 'BlockStatement') return
       if (node.type === 'ExpressionStatement') {
         return node
       }
@@ -80,7 +80,9 @@ export function transformQuansync(
           s.appendLeft(node.end!, ')')
 
           const stmt = findUpExpressionStatement()
-          if (stmt) prependSemi(stmt)
+          if (stmt && stmt.start === node.start) {
+            prependSemi(stmt)
+          }
         }
         return
       }

tests/__snapshots__/transform.test.ts.snap

@@ -88,15 +88,6 @@ export const fn7 = quansync(function* () {
   }
 })
 
-quansync(function* () {
-  ;!(yield 1)
-  ;'' + (yield 1)
-  ;false && (yield 1)
-  fn7()
-  ;(yield 1) < (yield 10)
-  const x = (yield 1) < (yield 10)
-})
-
 export default async () => {
   await expect(getNumber(1)).resolves.toBe(1)
   expect(getNumber.sync(1)).toBe(1)
@@ -170,12 +161,25 @@ export default async () => {
 "
 `;
 
-exports[`transform > ./fixtures/parens.js 1`] = `
+exports[`transform > ./fixtures/semi.js 1`] = `
 "import { quansync } from 'quansync/macro'
 
-const parens = quansync(function* (obj) {
-  const config = yield (obj + 1)
+quansync(function* (obj) {
+  let config = yield (obj + 1)
+  if (true) config = (yield 10) || 10
   return config
 })
+
+quansync(function* () {
+  !(yield 1)
+  '' + (yield 1)
+  false && (yield 1)
+  fn()
+  ;(yield 1) < (yield 10)
+  const x = (yield 1) < (yield 10)
+
+  ;[]
+  [yield 10]
+})
 "
 `;

tests/fixtures/basic.js

@@ -56,15 +56,6 @@ export const fn7 = quansync(async () => {
   }
 })
 
-quansync(async () => {
-  !await 1
-  '' + await 1
-  false && await 1
-  fn7()
-  await 1 < await 10
-  const x = await 1 < await 10
-})
-
 export default async () => {
   await expect(getNumber(1)).resolves.toBe(1)
   expect(getNumber.sync(1)).toBe(1)

tests/fixtures/parens.js

@@ -0,0 +1,19 @@
+import { quansync } from 'quansync/macro'
+
+quansync(async (obj) => {
+  let config = await (obj + 1)
+  if (true) config = await 10 || 10
+  return config
+})
+
+quansync(async () => {
+  !await 1
+  '' + await 1
+  false && await 1
+  fn()
+  await 1 < await 10
+  const x = await 1 < await 10
+
+  ;[]
+  [await 10]
+})