fix(transformer): 加强对 JSX children 的判定

NervJS · Jun 21, 2018 · a2335f1 · a2335f1
1 parent 513243b
commit a2335f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/taro-transformer-wx/.gitignore b/packages/taro-transformer-wx/.gitignore
@@ -7,4 +7,5 @@ yarn-error.log
 _book
 .idea
 lib
-t.js
+t.js
+tt.js
diff --git a/packages/taro-transformer-wx/src/render.ts b/packages/taro-transformer-wx/src/render.ts
@@ -161,11 +161,15 @@ export class RenderParser {
           t.isReturnStatement(parentNode) ||
           (
             isReturnStatement &&
-            !t.isArrowFunctionExpression(parentNode) &&
-            !jsxElementPath.findParent(p => p.isJSXExpressionContainer())
+            !t.isArrowFunctionExpression(parentNode)
           )
         ) {
-          if (!isFinalReturn) {
+          let isChildren = false
+          this.loopComponents.forEach((component) => {
+            isChildren = !!jsxElementPath.findParent(p => p === component)
+          })
+          const JSXExpr = jsxElementPath.findParent(p => p.isJSXExpressionContainer())
+          if (!isFinalReturn && (!isChildren || isContainFunction(JSXExpr))) {
             const callExpr = parentPath.findParent(p => p.isCallExpression())
             if (callExpr.isCallExpression()) {
               const callee = callExpr.node.callee