fix(transformer): if 语句中循环体内的变量不需要变量提升

Author: yuche

packages/taro-transformer-wx/__tests__/state.spec.ts

@@ -94,7 +94,7 @@ describe('State', () => {
       const instance = evalClass(ast)
 
       expect(instance.state.anonymousState__temp).toBe(undefined)
-      expect(template).toMatch(`<view style="{{\" width: \" + rate + \"px; \"}}">`)
+      expect(template).toMatch(`<view style=\"{{'width: ' + rate + 'px;'}}\">`)
     })
 
     test('可以使用array of object', () => {

packages/taro-transformer-wx/src/jsx.ts

@@ -1,5 +1,4 @@
 import generate from 'babel-generator'
-import * as prettier from 'prettier'
 import { NodePath } from 'babel-traverse'
 import * as t from 'babel-types'
 import { kebabCase } from 'lodash'
@@ -164,13 +163,8 @@ export function parseJSXElement (element: t.JSXElement): string {
             quotes: 'single',
             concise: true
           })
-          code = prettier.format(code, {
-            singleQuote: true,
-            parser: 'babylon',
-            semi: false,
-            trailingComma: 'none'
-          }).slice(0, -1)
           code = code
+            .replace(/"/g, "'")
             .replace(/(this\.props\.)|(this\.state\.)/g, '')
             .replace(/this\./g, '')
           value = isBindEvent ? code : `{{${code}}}`

packages/taro-transformer-wx/src/render.ts

@@ -18,7 +18,8 @@ import {
   hasComplexExpression,
   findMethodName,
   isVarName,
-  setParentCondition
+  setParentCondition,
+  isContainJSXElement
 } from './utils'
 import { difference } from 'lodash'
 import {
@@ -391,11 +392,15 @@ export class RenderParser {
             //
           } else {
             const ifStatement = parentPath.findParent(p => p.isIfStatement())
-            const blockStatement = parentPath.findParent(p => p.isBlockStatement() && p.parentPath === ifStatement) as NodePath<t.BlockStatement>
+            const blockStatement = parentPath.findParent(p => p.isBlockStatement() && (p.parentPath === ifStatement)) as NodePath<t.BlockStatement>
             if (blockStatement && blockStatement.isBlockStatement()) {
               blockStatement.traverse({
                 VariableDeclarator: (p) => {
                   const { id, init } = p.node
+                  const ifStem = p.parentPath.parentPath.parentPath
+                  if (!ifStem.isIfStatement() || isContainJSXElement(p)) {
+                    return
+                  }
                   if (t.isIdentifier(id)) {
                     if (id.name.startsWith('loopArray')) {
                       this.renderPath.node.body.body.unshift(
@@ -406,7 +411,7 @@ export class RenderParser {
                       )
                     } else {
                       const newId = this.renderScope.generateDeclaredUidIdentifier('$' + id.name)
-                      this.renderScope.rename(id.name, newId.name)
+                      blockStatement.scope.rename(id.name, newId.name)
                       p.parentPath.replaceWith(
                         template('ID = INIT;')({ ID: newId, INIT: init })
                       )
@@ -901,21 +906,26 @@ export class RenderParser {
               replaceOriginal(path, parent, name)
             }
           })
+          const replacements = new Set()
           component.traverse({
             Identifier (path) {
               const name = path.node.name
               const parent = path.parent
+              if (replacements.has(parent)) {
+                return
+              }
               if (stateToBeAssign.has(name) && path.isReferencedIdentifier()) {
-                path.replaceWith(
-                  t.memberExpression(
-                    t.identifier(item.name),
-                    path.node
-                  )
+                const replacement = t.memberExpression(
+                  t.identifier(item.name),
+                  path.node
                 )
+                path.replaceWith(replacement)
+                replacements.add(replacement)
                 hasOriginalRef = true
+              } else {
+                replaceOriginal(path, parent, name)
               }
 
-              replaceOriginal(path, parent, name)
             },
             MemberExpression (path) {
               const id = findFirstIdentifierFromMemberExpression(path.node)