fix: wip

Author: sxzz

packages/reactivity-transform/src/reactivityTransform.ts

@@ -261,6 +261,27 @@ export function transformAST(
     return s.original.slice(node.start! + offset, node.end! + offset)
   }
 
+  const WRAPPER_NODE_TYPES = [
+    'ParenthesizedExpression', // (foo)
+    'TSNonNullExpression', // foo!
+    'TSAsExpression', // foo as number
+    'TSTypeAssertion', // (<number>foo)
+    'TSInstantiationExpression' // foo<string>
+  ]
+  function findUpParent() {
+    return parentStack
+      .slice()
+      .reverse()
+      .find(({ type }) => !WRAPPER_NODE_TYPES.includes(type))
+  }
+  function unwrapNode(node: Node): Node {
+    if (WRAPPER_NODE_TYPES.includes(node.type)) {
+      return unwrapNode((node as any).expression)
+    } else {
+      return node
+    }
+  }
+
   function walkScope(node: Program | BlockStatement, isRoot = false) {
     for (const stmt of node.body) {
       if (stmt.type === 'VariableDeclaration') {
@@ -297,20 +318,13 @@ export function transformAST(
     }
     for (const decl of stmt.declarations) {
       let refCall
+      const init = decl.init ? unwrapNode(decl.init) : null
       const isCall =
-        decl.init &&
-        decl.init.type === 'CallExpression' &&
-        decl.init.callee.type === 'Identifier'
-      if (
-        isCall &&
-        (refCall = isRefCreationCall((decl as any).init.callee.name))
-      ) {
-        processRefDeclaration(
-          refCall,
-          decl.id,
-          decl.init as CallExpression,
-          stmt.kind === 'const'
-        )
+        init &&
+        init.type === 'CallExpression' &&
+        init.callee.type === 'Identifier'
+      if (isCall && (refCall = isRefCreationCall((init.callee as any).name))) {
+        processRefDeclaration(refCall, decl.id, init, stmt.kind === 'const')
       } else {
         const isProps =
           isRoot && isCall && (decl as any).init.callee.name === 'defineProps'
@@ -663,9 +677,7 @@ export function transformAST(
       if (
         parent &&
         parent.type.startsWith('TS') &&
-        parent.type !== 'TSAsExpression' &&
-        parent.type !== 'TSNonNullExpression' &&
-        parent.type !== 'TSTypeAssertion'
+        !WRAPPER_NODE_TYPES.includes(parent.type)
       ) {
         return this.skip()
       }
@@ -692,6 +704,7 @@ export function transformAST(
         const callee = node.callee.name
 
         const refCall = isRefCreationCall(callee)
+        const parent = findUpParent()
         if (refCall && (!parent || parent.type !== 'VariableDeclarator')) {
           return error(
             `${refCall} can only be used as the initializer of ` +
@@ -762,6 +775,8 @@ export function transformAST(
     }
   })
 
+  console.log(s.toString())
+
   return {
     rootRefs: Object.keys(rootScope).filter(key => {
       const binding = rootScope[key]