fix: insert semi before ExpressionStatement

Author: sxzz

.prettierignore

@@ -0,0 +1 @@
+tests/fixtures/basic.js

src/core/index.ts

@@ -3,6 +3,7 @@ import {
   getLang,
   isCallOf,
   isFunctionType,
+  isTypeOf,
   walkAST,
   walkImportDeclaration,
   type ImportBinding,
@@ -38,11 +39,46 @@ export function transformQuansync(
 
   const s = new MagicString(code)
   const functionScopes: boolean[] = []
+  const nodeStack: t.Node[] = []
+
+  function findUpExpressionStatement(): t.ExpressionStatement | undefined {
+    for (let i = nodeStack.length - 1; i >= 0; i--) {
+      const node = nodeStack[i]
+      if (isFunctionType(node)) return
+      if (node.type === 'ExpressionStatement') {
+        return node
+      }
+    }
+  }
+
+  function prependSemi(stmt: t.Statement & { semi?: boolean }) {
+    if (stmt.semi) return
+    s.prependLeft(stmt.start!, `;`)
+    stmt.semi = true
+  }
 
   walkAST<t.Node>(program, {
     enter(node, parent) {
+      nodeStack.push(node)
       if (node.type === 'AwaitExpression' && functionScopes.at(-1)) {
-        s.overwrite(node.start!, node.argument.start!, 'yield ')
+        const needParen = isTypeOf(parent, [
+          'UnaryExpression',
+          'BinaryExpression',
+          'LogicalExpression',
+          'TSAsExpression',
+          'TSSatisfiesExpression',
+        ])
+        s.overwrite(
+          node.start!,
+          node.argument.start!,
+          `${needParen ? '(' : ''}yield `,
+        )
+        if (needParen) {
+          s.appendLeft(node.end!, ')')
+
+          const stmt = findUpExpressionStatement()
+          if (stmt) prependSemi(stmt)
+        }
         return
       }
 
@@ -78,6 +114,7 @@ export function transformQuansync(
       }
     },
     leave(node) {
+      nodeStack.pop()
       if (isFunctionType(node)) {
         functionScopes.pop()
       }

tests/__snapshots__/transform.test.ts.snap

@@ -94,6 +94,20 @@ return function* () {
 }.call(this)
 })
 
+quansync(() => {
+return function* () {
+  // prettier-ignore
+  ;!(yield 1)
+  // prettier-ignore
+  ;'' + (yield 1)
+  // prettier-ignore
+  ;false && (yield 1)
+  fn7()
+  ;(yield 1) < (yield 10)
+  const x = (yield 1) < (yield 10)
+}.call(this)
+})
+
 export default async () => {
   await expect(getNumber(1)).resolves.toBe(1)
   expect(getNumber.sync(1)).toBe(1)
@@ -119,7 +133,7 @@ const echoNewLine = quansync(
   /** @param {string|Promise<string>} v */ (v) =>
     {
 return function* () {
-return (yield echo(yield v)) + '\\n'
+return ((yield echo(yield v))) + '\\n'
 }.call(this)
 },
 )

tests/fixtures/basic.js

@@ -56,6 +56,18 @@ export const fn7 = quansync(async () => {
   }
 })
 
+quansync(async () => {
+  // prettier-ignore
+  !await 1
+  // prettier-ignore
+  '' + await 1
+  // prettier-ignore
+  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)