fix(transformer): 三元表达式其中有一个值为函数解析错误

NervJS · Oct 18, 2018 · fde2474 · fde2474
1 parent 8d32a34
commit fde2474
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/packages/taro-transformer-wx/__tests__/control-flow.spec.ts b/packages/taro-transformer-wx/__tests__/control-flow.spec.ts
@@ -372,16 +372,14 @@ describe('三元表达式', () => {
         `)
       })
 
-      console.log(code)
-
       expect(template).toMatch(prettyPrint(`
         <block>
             <view>
                 <block>
                     <block wx:if=\"{{title}}\">
                         <text>yes</text>
                     </block>
-                    <block wx:else>{{test}}</block>
+                    <block wx:else>{{anonymousState__temp}}</block>
                 </block>
             </view>
         </block>

diff --git a/packages/taro-transformer-wx/src/render.ts b/packages/taro-transformer-wx/src/render.ts
@@ -254,15 +254,13 @@ export class RenderParser {
           )
           setTemplate(name, jsxElementPath, this.templates)
         }
-      } else if (
-        (t.isJSXElement(consequent) && t.isCallExpression(alternate))
-        // ||
-        // (t.isJSXElement(alternate) && t.isCallExpression(consequent))
-      ) {
+      } else if (t.isJSXElement(consequent) && t.isCallExpression(alternate)) {
         const id = generateAnonymousState(this.renderScope!, parentPath.get('alternate') as any, this.referencedIdentifiers, true)
-        // block.children = [t.jSXExpressionContainer(alternate)]
         parentPath.get('alternate').replaceWith(id)
         //
+      } else if (t.isJSXElement(alternate) && t.isCallExpression(consequent)) {
+        const id = generateAnonymousState(this.renderScope!, parentPath.get('consequent') as any, this.referencedIdentifiers, true)
+        parentPath.get('consequent').replaceWith(id)
       } else {
         block.children = [t.jSXExpressionContainer(consequent)]
         newJSXIfAttr(block, test)