From 1c849e6732b0f4f6df7b561e24dfddfd672ed58c Mon Sep 17 00:00:00 2001
From: canfoo <178774618@qq.com>
Date: Sun, 28 Jun 2020 18:03:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(alita-core):=20=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E5=88=86=E6=9E=90=E6=96=B9=E5=BC=8F=E7=BC=A9?=
 =?UTF-8?q?=E5=87=8Fwxml=E5=86=85=E5=AE=B9=E5=A4=A7=E5=B0=8F&=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=AD=A4=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fixtures/sizeRNvsMPvsAlita/src/CommonPage.js |   6 +
 fixtures/sizeRNvsMPvsAlita/src/Page2.js      | 101 +++++
 fixtures/sizeRNvsMPvsAlita/src/index.js      |   2 +
 packages/alita-core/src/tran/addTempName.js  | 366 ++++++++++++++++---
 4 files changed, 418 insertions(+), 57 deletions(-)
 create mode 100644 fixtures/sizeRNvsMPvsAlita/src/Page2.js

diff --git a/fixtures/sizeRNvsMPvsAlita/src/CommonPage.js b/fixtures/sizeRNvsMPvsAlita/src/CommonPage.js
index d1589a6..b00323e 100644
--- a/fixtures/sizeRNvsMPvsAlita/src/CommonPage.js
+++ b/fixtures/sizeRNvsMPvsAlita/src/CommonPage.js
@@ -17,6 +17,12 @@ export default class CommonPage extends Component {
 						history.push('Page1')
 					}}
 				/>
+                <Button
+					title={"to Page2"}
+					onPress={() => {
+						history.push('Page2')
+					}}
+				/>
             </View>
 
         );
diff --git a/fixtures/sizeRNvsMPvsAlita/src/Page2.js b/fixtures/sizeRNvsMPvsAlita/src/Page2.js
new file mode 100644
index 0000000..3c73528
--- /dev/null
+++ b/fixtures/sizeRNvsMPvsAlita/src/Page2.js
@@ -0,0 +1,101 @@
+import React, { Component } from "react";
+import { StyleSheet, Text, View, Platform } from "react-native"
+
+/*
+    经过静态解析方式，以下代码由原来会生成以下6块代码段减少到0块
+    <template name="c">
+        <block wx:if="{{_t.l(d)}}">{{d}}</block>
+        <_g wx:elif="{{d._generic}}" diuu="{{d._generic}}" style="{{_t.s(d._genericstyle)}}"/>
+        <template wx:elif="{{d.tempName}}" is="{{d.tempName}}" data="{{...d}}"/>
+        <block wx:else>
+            <block wx:for="{{d}}" wx:key="key">
+                <block wx:if="{{_t.l(item)}}">{{item}}</block>
+                <_g wx:elif="{{item._generic}}" diuu="{{item._generic}}" style="{{_t.s(item._genericstyle)}}"/>
+                <template wx:else is="{{item.tempName}}" data="{{...item}}"/>
+            </block>
+        </block>
+    </template>
+ */
+
+const styles = StyleSheet.create({
+    container: {
+        textAlign: 'center',
+        paddingTop: 50
+    },
+    red: {
+        color: 'red',
+        fontSize: 20
+    },
+    blue: {
+        color: 'blue',
+        fontSize: 20
+    }
+});
+
+
+export default class Page2 extends Component {
+    a() {
+        return (
+            <View>
+                {this.b()}
+            </View>
+        )
+    }
+
+    b() {
+        return (
+            <View>
+                {this.c()}
+            </View>
+        )
+    }
+
+    c() {
+        return (
+            <View>
+                <Text style={styles.red}>
+                    ccc
+                </Text>
+            </View>
+        )
+    }
+
+    render() {
+        const d = <View><Text style={styles.blue}>ddd</Text></View>
+        let e = null
+        e = <View><Text style={styles.red}>eee</Text></View>
+        const isTrue = true
+
+        return (
+            <View style={styles.container}>
+                <View>
+                    {this.a()}
+                    {this.c()}
+                    <View>
+                        <View>
+                            {d}
+                            {e}
+                            <View>
+                                {
+                                    isTrue && d
+                                }
+                                {
+                                    isTrue && this.c()
+                                }
+                                <View>
+                                    {
+                                        isTrue ? d : e
+                                    }
+                                    {
+                                        isTrue ? this.c() : e
+                                    }
+                                </View>
+                            </View>
+                        </View>
+                    </View>
+                </View>
+            </View>
+        );
+    }
+}
+
diff --git a/fixtures/sizeRNvsMPvsAlita/src/index.js b/fixtures/sizeRNvsMPvsAlita/src/index.js
index 76cb767..dc54ac0 100644
--- a/fixtures/sizeRNvsMPvsAlita/src/index.js
+++ b/fixtures/sizeRNvsMPvsAlita/src/index.js
@@ -13,6 +13,7 @@ import React, {PureComponent} from 'react'
 import {Router, Route, TabRouter} from '@areslabs/router'
 
 import Page1 from './Page1'
+import Page2 from './Page2'
 import CommonPage from './CommonPage'
 
 import {f1} from './util'
@@ -42,6 +43,7 @@ export default class App extends PureComponent {
 
 				{/*分包用来测试体积*/}
                 <Route subpage="one" key={"Page1"} component={Page1}/>
+                <Route subpage="two" key={"Page2"} component={Page2}/>
             </Router>
         )
     }
diff --git a/packages/alita-core/src/tran/addTempName.js b/packages/alita-core/src/tran/addTempName.js
index 5593ea0..9b1ae44 100644
--- a/packages/alita-core/src/tran/addTempName.js
+++ b/packages/alita-core/src/tran/addTempName.js
@@ -19,80 +19,332 @@ export default function addTempName (ast, info) {
 
 	errorLogTraverse(ast, {
         exit: path => {
-            if (path.type === 'JSXElement'
-                && (!isJSXChild(path) || isChildCompChild(path, info.filepath))
-            ) {
-                const jsxOp = path.node.openingElement
+					if (path.type === 'JSXElement'
+							&& (!isJSXChild(path) || isChildCompChild(path, info.filepath))
+					) {
+							const jsxOp = path.node.openingElement
 
-                const tempName = tempNameCount.next
-                jsxOp.attributes.push(t.jsxAttribute(t.jsxIdentifier('tempName'), t.stringLiteral(tempName)))
-            }
+							const tempName = tempNameCount.next
+							jsxOp.attributes.push(t.jsxAttribute(t.jsxIdentifier('tempName'), t.stringLiteral(tempName)))
+					}
 
 
-			// 如果只使用一个child 小程序会报递归， 然后就不渲染了
-			if (path.type === 'JSXElement'
-				&& !isChildComp(path.node.openingElement.name.name, info.filepath)
-			) {
-				const children = path.node.children
-				let tempName = null
+					// 如果只使用一个child 小程序会报递归， 然后就不渲染了
+					if (path.type === 'JSXElement'
+						&& !isChildComp(path.node.openingElement.name.name, info.filepath)
+					) {
+						const children = path.node.children
+						let tempName = null
 
-				const isTextEle = isTextElement(path.node.openingElement)
+						const isTextEle = isTextElement(path.node.openingElement)
 
-				path.node.children = children.map(ele => {
-					if (ele.type === 'JSXExpressionContainer') {
+						path.node.children = children.map(ele => {
+							if (ele.type === 'JSXExpressionContainer') {
+								ele.isJsxExpress = false
 
-						if (!tempName) {
-							tempName = tempNameCount.next
-						}
+								// 以下几种情况，不用生成动态wxml来判断当前节点类型
+								// 1. 如果JSXExpressionContainer为{this.xxx()}，且xxx()方法返回的类型
+								// 		都为JSXElement，则直接生成对应的template
+								if (ele.expression && ele.expression.type === 'CallExpression') {
+									const expression = ele.expression
+									ele.isJsxExpress = checkFuncIsJsx(expression, ast)
+								} 
+								// 2. 如果JSXExpressionContainer为{<xxx></xxx>}，则直接生成对应的template
+								else if (ele.expression && ele.expression.type === 'JSXElement') {
+									ele.isJsxExpress = true
+								}
+								// 3. 如果JSXExpressionContainer为{a}，且a类型为JSXElement，则直接生成对应
+								//    的template
+								else if (ele.expression && ele.expression.type === 'Identifier') {
+									const varnName = ele.expression.name
+									ele.isJsxExpress = checkVarnIsJsx(varnName, ast)
+								}
+								// 4. 如果JSXExpressionContainer为{yyy && <xxx></xxx>}，且则直接生成对应的
+								//    template
+								else if (ele.expression && ele.expression.type === 'LogicalExpression') {
+									ele.isJsxExpress = checkLogiIsJsx(ele.expression, ast)
+								}
+								// 5. 如果JSXExpressionContainer为{aaa ? <xxx></xxx> : <yyy></yyy>}，且则直
+								// 		接生成对应的template
+								else if (ele.expression && ele.expression.type === 'ConditionalExpression') {
+									if (checkExpressionIsJsx(ele.expression.consequent, ast)
+										&& checkExpressionIsJsx(ele.expression.alternate, ast)
+									) {
+										ele.isJsxExpress = true
+									}
+								}
 
-						const datakey = datakeyCount.next
+								let templateAttris = []
+								const datakey = datakeyCount.next
+								templateAttris = [
+									t.jsxAttribute(t.jsxIdentifier('datakey'), t.stringLiteral(datakey)),
+									t.jsxAttribute(t.jsxIdentifier('tempVnode'), ele),
+								]
 
+								if (ele.isJsxExpress) {
+									templateAttris.push(
+										t.jsxAttribute(t.jsxIdentifier('wx:if'), t.stringLiteral(`{{${datakey} && ${datakey}.tempName}}`))
+									)
+									templateAttris.push(
+										t.jsxAttribute(t.jsxIdentifier('is'), t.stringLiteral(`{{${datakey}.tempName}}`))
+									)
+									templateAttris.push(
+										t.jsxAttribute(t.jsxIdentifier('data'), t.stringLiteral(`{{...${datakey}}}`))
+									)
+								} else {
+									if (!tempName) {
+										tempName = tempNameCount.next
+									}
+									templateAttris.push(
+										t.jsxAttribute(t.jsxIdentifier('wx:if'), t.stringLiteral(`{{${datakey}}} !== undefined`))
+									)
+									templateAttris.push(
+										t.jsxAttribute(t.jsxIdentifier('is'), t.stringLiteral(tempName))
+									)
+									templateAttris.push(
+										t.jsxAttribute(t.jsxIdentifier('data'), t.stringLiteral(`{{d: ${datakey}}}`))
+									)
+								}
+								
+								ele.isJsxExpress = false
 
-						const templateAttris = [
-							t.jsxAttribute(t.jsxIdentifier('datakey'), t.stringLiteral(datakey)),
-							t.jsxAttribute(t.jsxIdentifier('tempVnode'), ele),
-							t.jsxAttribute(t.jsxIdentifier('wx:if'), t.stringLiteral(`{{${datakey}}} !== undefined`)),
-							t.jsxAttribute(t.jsxIdentifier('is'), t.stringLiteral(tempName)),
-							t.jsxAttribute(t.jsxIdentifier('data'), t.stringLiteral(`{{d: ${datakey}}}`))
-						]
+								if (isTextEle) {
+									templateAttris.push(t.jsxAttribute(t.jsxIdentifier('isTextElement')))
+								}
 
-						if (isTextEle) {
-							templateAttris.push(t.jsxAttribute(t.jsxIdentifier('isTextElement')))
-						}
+								return t.jsxElement(
+									t.jsxOpeningElement(
+										t.jsxIdentifier('template'),
+										templateAttris
+									),
+									t.jsxClosingElement(
+										t.jsxIdentifier('template')
+									),
+									[],
+									true
+								)
+							}
+							return ele
+						})
 
-						return t.jsxElement(
-							t.jsxOpeningElement(
-								t.jsxIdentifier('template'),
-								templateAttris
-							),
-							t.jsxClosingElement(
-								t.jsxIdentifier('template')
-							),
-							[],
-							true
-						)
+						if (tempName && !isTextEle) {
+							info.childTemplates.push(tempName)
+						}
 					}
-					return ele
-				})
-
-				if (tempName && !isTextEle) {
-					info.childTemplates.push(tempName)
-				}
-			}
 
 
-            if (path.type === 'JSXOpeningElement') {
-                const jsxOp = path.node
+					if (path.type === 'JSXOpeningElement') {
+							const jsxOp = path.node
 
-                const key = diuuCount.next
+							const key = diuuCount.next
 
-                jsxOp.attributes.push(
-                    t.jsxAttribute(t.jsxIdentifier('diuu'), t.stringLiteral(key))
-                )
-            }
+							jsxOp.attributes.push(
+									t.jsxAttribute(t.jsxIdentifier('diuu'), t.stringLiteral(key))
+							)
+					}
         }
     })
-
     return ast
+}
+
 
-}
\ No newline at end of file
+/**
+ * 判断方法返回的结果是否是JSX类型
+ * @param {*} expression 
+ * @param {*} ast 
+ */
+function checkFuncIsJsx(expression, ast) {
+	let isJsxExpress = false
+	if (expression.callee
+		&&expression.callee.type === 'MemberExpression'
+		&& expression.callee.object
+		&& expression.callee.object.type === 'ThisExpression'
+		&& expression.callee.property
+		&& expression.callee.property.type === 'Identifier'
+	) {
+		const funcName = expression.callee.property.name
+	
+		errorLogTraverse(ast, {
+			exit: path => {
+				if ((path.node.type === 'ClassMethod'
+					&& path.node.key
+					&& path.node.key.type === 'Identifier'
+					&& path.node.key.name === funcName
+					&& path.node.body.type === 'BlockStatement')
+					|| (
+						path.node.type === 'ClassProperty'
+						&& path.node.key
+						&& path.node.key.type === 'Identifier'
+						&& path.node.key.name === funcName
+						&& path.node.value
+						&& path.node.value.type === 'ArrowFunctionExpression'
+					)
+				) {
+					let runturnIsJsx = true
+					let runturnCount = 0
+
+					path.traverse({
+						ReturnStatement(path) {
+							runturnCount++
+							if (path.node.argument
+								&& path.node.argument.type !== 'NullLiteral'
+								&& !checkExpressionIsJsx(path.node.argument, ast)
+							) {
+								runturnIsJsx = false
+								path.skip()
+							}
+						}
+					})
+
+					if (!runturnIsJsx || (runturnIsJsx && runturnCount === 0)) {
+						isJsxExpress = false
+					} else {
+						isJsxExpress = true
+					}
+				}
+			}
+		})
+	}
+	return isJsxExpress
+}
+
+/**
+ * 判断变量是否是JSX类型
+ * @param {*} varnName 
+ * @param {*} ast 
+ */
+function checkVarnIsJsx(varnName, ast) {
+	let isJsxExpress = false
+	let varnNameCount = 0 // ele.expression.name 已经算了一次了，所以从-1算起
+	errorLogTraverse(ast, {
+		exit: (path) => {
+			if ((
+					path.node.type === 'VariableDeclarator'
+					&& path.node.id
+					&& path.node.id.type === 'Identifier'
+					&& path.node.id.name === varnName
+				)
+					|| (
+					path.node.type === 'AssignmentExpression'
+					&& path.node.operator === '='
+					&& path.node.left 
+					&& path.node.left.type === 'Identifier'
+					&& path.node.left.name === varnName
+				)
+			) {
+				varnNameCount++
+			}
+		}
+	})
+	if (varnNameCount === 1) {
+			errorLogTraverse(ast, {
+				exit: (path) => {
+					if (path.node.type === 'VariableDeclarator'
+						&& path.node.id
+						&& path.node.id.type === 'Identifier'
+						&& path.node.id.name === varnName
+						&& path.node.init
+						&& checkEquationIsJSX(path.node.init, ast)
+					) {
+						isJsxExpress = true
+					}
+				}
+			})
+	} else if (varnNameCount > 1) {
+		let declCount = 0
+		errorLogTraverse(ast, {
+			exit: (path) => {
+				if (path.node.type === 'VariableDeclarator'
+					&& path.node.id
+					&& path.node.id.type === 'Identifier'
+					&& path.node.id.name === varnName
+				) {
+					declCount++
+				}
+			}
+		})
+		if (declCount === 1) {
+			let varnIsJsx = true
+			errorLogTraverse(ast, {
+				exit: (path) => {
+					if (path.node.type === 'AssignmentExpression'
+						&& path.node.operator === '='
+						&& path.node.left 
+						&& path.node.left.type === 'Identifier'
+						&& path.node.left.name === varnName
+						&& path.node.right
+						&& !checkEquationIsJSX(path.node.right, ast)
+					) {
+						varnIsJsx = false
+					}
+				}
+			})
+			if (varnIsJsx) {
+				isJsxExpress = true
+			}
+		}
+	}
+	return isJsxExpress
+}
+
+/**
+ * 判断 xx && yy 的结果是否为JSX类型
+ * @param {*} node 
+ * @param {*} ast 
+ */
+function checkLogiIsJsx(node, ast) {
+	if (node.left
+		&& checkExpressionIsJsx(node.right, ast)
+	) {
+		return true
+	}
+	return false
+}
+
+/**
+ * 判断等式右边结果是否为JSX类型
+ * @param {*} node
+ * @param {*} ast
+ */
+function checkEquationIsJSX(node, ast) {
+	if (
+		node.type === 'JSXElement'
+		|| (
+			node.type === 'CallExpression'
+			&& checkFuncIsJsx(node, ast)
+		)
+		|| (
+			node.type === 'LogicalExpression'
+			&& checkLogiIsJsx(node, ast)
+		)
+		|| (
+			node.type === 'ConditionalExpression'
+			&& checkExpressionIsJsx(node.consequent, ast)
+			&& checkExpressionIsJsx(node.alternate, ast)
+		)
+	) {
+		return true
+	}
+	return false
+}
+
+/**
+ * 判断式子是否是JSX类型，分别判断以下三种情况
+ * 1. 如果为<xxx></xxx>，则是JSX类型
+ * 2. 如果是方法，如this.xx()，判断this.xx()方法返回的是否是JSX类型
+ * 3. 如果是变量，如 x ，判断 x 变量是否是JSX类型
+ * @param {*} node 
+ * @param {*} ast 
+ */
+function checkExpressionIsJsx(node, ast) {
+	if (node.type === 'JSXElement'
+		|| checkFuncIsJsx(node, ast)
+		|| (
+			node.type === 'Identifier'
+			&& checkVarnIsJsx(node.name, ast)
+		)
+	) {
+		return true
+	}
+	return false
+}

From e303e8d2a713449d45996a375ac662e281be4077 Mon Sep 17 00:00:00 2001
From: canfoo <178774618@qq.com>
Date: Tue, 30 Jun 2020 14:54:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore(alita-core):=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/alita-core/src/tran/addTempName.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/alita-core/src/tran/addTempName.js b/packages/alita-core/src/tran/addTempName.js
index 9b1ae44..7823a65 100644
--- a/packages/alita-core/src/tran/addTempName.js
+++ b/packages/alita-core/src/tran/addTempName.js
@@ -215,7 +215,7 @@ function checkFuncIsJsx(expression, ast) {
  */
 function checkVarnIsJsx(varnName, ast) {
 	let isJsxExpress = false
-	let varnNameCount = 0 // ele.expression.name 已经算了一次了，所以从-1算起
+	let varnNameCount = 0
 	errorLogTraverse(ast, {
 		exit: (path) => {
 			if ((