fix(comiler): unwrap type for expressions

Author: zhiyuanzmj

packages/compiler/src/utils.ts

@@ -16,6 +16,7 @@ import {
   createSimpleExpression,
   isLiteralWhitelisted,
   NodeTypes,
+  unwrapTSNode,
   walkIdentifiers,
   type SimpleExpressionNode,
   type TextNode,
@@ -130,14 +131,16 @@ export function resolveExpression(
   context: TransformContext,
   effect = false,
 ): SimpleExpressionNode {
-  node = node?.type === 'JSXExpressionContainer' ? node.expression : node
+  if (!node) return createSimpleExpression('', true)
+  node = unwrapTSNode(
+    node.type === 'JSXExpressionContainer' ? node.expression : node,
+  )
   const isStatic =
-    !!node &&
-    (node.type === 'StringLiteral' ||
-      node.type === 'JSXText' ||
-      node.type === 'JSXIdentifier')
+    node.type === 'StringLiteral' ||
+    node.type === 'JSXText' ||
+    node.type === 'JSXIdentifier'
   let source =
-    !node || node.type === 'JSXEmptyExpression'
+    node.type === 'JSXEmptyExpression'
       ? ''
       : node.type === 'JSXIdentifier'
         ? node.name
@@ -148,16 +151,16 @@ export function resolveExpression(
             : node.type === 'Identifier'
               ? node.name
               : context.ir.source.slice(node.start!, node.end!)
-  const location = node ? node.loc : null
-  const isResolved = node && resolvedExpressions.has(node)
+  const location = node.loc
+  const isResolved = resolvedExpressions.has(node)
   if (source && !isStatic && effect && !isConstant(node)) {
     source = `() => (${source})`
     if (location && node && !isResolved) {
       location.start.column -= 7
       node.start! -= 7
     }
   }
-  if (node && !isResolved) {
+  if (!isResolved) {
     const offset = node.start! - 1
     walkIdentifiers(
       node,

packages/compiler/test/transforms/__snapshots__/expression.spec.ts.snap

@@ -67,6 +67,23 @@ exports[`compiler: expression > conditional expression with v-once 1`] = `
 "
 `;
 
+exports[`compiler: expression > expression with type 1`] = `
+"
+  const n5 = t2()
+  _setInsertionState(n5)
+  const n0 = _createIf(() => (ok), () => {
+    const n2 = t0()
+    const x2 = _child(n2)
+    _setNodes(x2, () => (msg))
+    return n2
+  }, () => {
+    const n4 = t1()
+    return n4
+  })
+  return n5
+"
+`;
+
 exports[`compiler: expression > logical expression 1`] = `
 "
   const n0 = _createIf(() => (ok), () => {

packages/compiler/test/transforms/vOn.spec.ts

@@ -329,4 +329,16 @@ describe('v-on', () => {
       '_delegate(n0, "click", _withModifiers(e => _ctx.test(e), ["stop"]))',
     )
   })
+
+  test('expression with type', () => {
+    const { code } = compileWithVOn(`<div onClick={handleClick as any} />`)
+    expect(code).toMatchInlineSnapshot(`
+      "
+        const n0 = t0()
+        n0.$evtclick = e => handleClick(e)
+        return n0
+      "
+    `)
+    expect(code).contains('n0.$evtclick = e => handleClick(e)')
+  })
 })