@tarojs/taroize 3.8.0-canary.0 → 4.0.0-alpha.2

package/lib/src/wxml.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseContent = exports.removEmptyTextAndComment = exports.parseWXML = exports.createWxmlVistor = exports.wxTemplateCommand = exports.WX_ELSE = exports.WX_KEY = exports.WX_FOR_INDEX = exports.WX_FOR_ITEM = exports.WX_FOR = exports.WX_ELSE_IF = exports.WX_IF = exports.NodeType = void 0;
+exports.parseStyle = exports.parseContent = exports.removeEmptyTextAndComment = exports.parseWXML = exports.createWxmlVistor = exports.getWxsImports = exports.createPreWxmlVistor = exports.convertStyleUnit = exports.wxTemplateCommand = exports.WX_SHOW = exports.WX_ELSE = exports.WX_KEY = exports.WX_FOR_INDEX = exports.WX_FOR_ITEM = exports.WX_FOR = exports.WX_ELSE_IF = exports.WX_IF = exports.NodeType = void 0;
 /* eslint-disable camelcase */
-const babel_traverse_1 = require("babel-traverse");
-const t = require("babel-types");
-const babylon_1 = require("babylon");
+const parser_1 = require("@babel/parser");
+const traverse_1 = require("@babel/traverse");
+const t = require("@babel/types");
+const helper_1 = require("@tarojs/helper");
+// @ts-ignore
+const shared_1 = require("@tarojs/shared");
 const himalaya_wxml_1 = require("himalaya-wxml");
 const lodash_1 = require("lodash");
 const cache_1 = require("./cache");
@@ -14,6 +17,7 @@ const global_1 = require("./global");
 const template_1 = require("./template");
 const utils_1 = require("./utils");
 const { prettyPrint } = require('html');
+const pathTool = require('path');
 const allCamelCase = (str) => str.charAt(0).toUpperCase() + (0, lodash_1.camelCase)(str.substr(1));
 function buildSlotName(slotName) {
     return `render${slotName[0].toUpperCase() + slotName.replace('-', '').slice(1)}`;
@@ -31,37 +35,183 @@ exports.WX_FOR_ITEM = 'wx:for-item';
 exports.WX_FOR_INDEX = 'wx:for-index';
 exports.WX_KEY = 'wx:key';
 exports.WX_ELSE = 'wx:else';
-exports.wxTemplateCommand = [
-    exports.WX_IF,
-    exports.WX_ELSE_IF,
-    exports.WX_FOR,
-    exports.WX_FOR_ITEM,
-    exports.WX_FOR_INDEX,
-    exports.WX_KEY,
-    'wx:else'
-];
+exports.WX_SHOW = 'wx:show';
+exports.wxTemplateCommand = [exports.WX_IF, exports.WX_ELSE_IF, exports.WX_FOR, exports.WX_FOR_ITEM, exports.WX_FOR_INDEX, exports.WX_KEY, 'wx:else'];
 function buildElement(name, children = [], attributes = []) {
     return {
         tagName: name,
         type: NodeType.Element,
         attributes,
-        children
+        children,
     };
 }
-const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) => {
+// 将 style 属性中属性名转小驼峰格式 并且将 {{}} 转为 ${}格式生成对应ast节点
+function convertStyleAttrs(styleAttrsMap) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] convertStyleAttrs - 进入函数 ${(0, utils_1.getLineBreak)()}`);
+    styleAttrsMap.forEach((attr) => {
+        attr.attrName = (0, shared_1.toCamelCase)(attr.attrName.trim());
+        // 匹配 {{}} 内部以及左右两边值
+        const attrValueReg = /([^{}]*)\{\{([^{}]*)\}\}([^{}]*)/;
+        const matchs = attrValueReg.exec(attr.value);
+        if (matchs !== null) {
+            const tempLeftValue = matchs[1] || '';
+            const tempMidValue = matchs[2] || '';
+            const tempRightValue = matchs[3] || '';
+            // 将模版中的内容转换为 ast 节点
+            const tempMidValueAst = (0, parser_1.parse)(tempMidValue).program.body[0];
+            attr.value = t.templateLiteral([t.templateElement({ raw: tempLeftValue }), t.templateElement({ raw: tempRightValue }, true)], [tempMidValueAst.expression]);
+        }
+        else {
+            attr.value = t.stringLiteral(attr.value.trim());
+        }
+    });
+}
+/**
+ * 对 style 中单个属性值进行解析
+ *
+ * @param { any[] } styleAttrsMap 元素为单个属性值的数组
+ * @param { any[] } attrKeyValueMap 属性解析为 {attrName: attrValue} 形式的数组
+ */
+function parseStyleAttrs(styleAttrsMap, attrKeyValueMap) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseStyleAttrs - 进入函数 ${(0, utils_1.getLineBreak)()}`);
+    styleAttrsMap.forEach((attr) => {
+        if (attr) {
+            // 对含三元运算符的写法 style="width:{{ xx ? xx : xx }}" 匹配第一个 : 避免匹配三元表达式中的 : 运算符
+            const reg = /([^:]+):\s*([^;]+)/;
+            const matchs = attr.match(reg);
+            const attrName = matchs[1];
+            const value = matchs[2];
+            if (attrName) {
+                attrKeyValueMap.push({ attrName, value });
+            }
+        }
+    });
+}
+function convertStyleUnit(value) {
+    let tempValue = value;
+    // 尺寸单位转换 都转为rem : 1rpx 转为 1/40rem,,1px 转为 1/20rem
+    if (tempValue.indexOf('px') !== -1) {
+        // 把 xxx="...[数字]rpx/px" 的尺寸单位都转为 rem, 转换方法类似postcss-taro-unit-transform
+        try {
+            tempValue = tempValue
+                .replace(/\s*-?([0-9.]+)(px)\b/gi, function (match, size, unit) {
+                if (Number(size) === 0) {
+                    return match.replace(size, '0').replace(unit, 'rem');
+                }
+                return match.replace(size, parseFloat(size) / 20 + '').replace(unit, 'rem');
+            })
+                .replace(/\s*-?([0-9.]+)(rpx)\b/gi, function (match, size, unit) {
+                if (Number(size) === 0) {
+                    return match.replace(size, '0').replace(unit, 'rem');
+                }
+                return match.replace(size, parseFloat(size) / 40 + '').replace(unit, 'rem');
+            });
+            // 把 xx="...{{参数}}rpx/px"的尺寸单位都转为rem,比如"{{参数}}rpx" -> "{{参数/40}}rem"
+            tempValue = tempValue
+                .replace(/\{\{([^{}]*)\}\}(px)/gi, function (match, size, unit) {
+                // 判断{{}}是否包含加减乘除算式和三元表达式, 是的话得加括号
+                if (match.match(/[+\-*/?]/g)) {
+                    return match.replace(size, '(' + size + ')/20').replace(unit, 'rem');
+                }
+                return match.replace(size, size + '/20').replace(unit, 'rem');
+            })
+                .replace(/\{\{([^{}]*)\}\}(rpx)/gi, function (match, size, unit) {
+                if (match.match(/[+\-*/?]/g)) {
+                    return match.replace(size, '(' + size + ')/40').replace(unit, 'rem');
+                }
+                return match.replace(size, size + '/40').replace(unit, 'rem');
+            });
+        }
+        catch (error) {
+            (0, utils_1.createErrorCodeMsg)('WxmlUnitConversionError', `wxml内px/rpx单位转换失败: ${error}`, tempValue, global_1.globals.currentParseFile);
+            (0, helper_1.printLog)("error" /* processTypeEnum.ERROR */, `wxml内px/rpx单位转换失败: ${error}`);
+            (0, utils_1.updateLogFileContent)(`WARN [taroize] convertStyleUnit - wxml内px/rpx单位转换异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
+        }
+    }
+    return tempValue;
+}
+exports.convertStyleUnit = convertStyleUnit;
+/**
+ * 预解析，收集wxml所有的模板信息
+ *
+ * @param { any[] } templates wxml页面下的模板信息
+ * @returns Visitor
+ */
+const createPreWxmlVistor = (templates) => {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] createPreWxmlVistor - 入参 ${(0, utils_1.getLineBreak)()}templates: ${templates} ${(0, utils_1.getLineBreak)()}`);
+    // const Applys = new Map<string, string[]>()
+    return {
+        JSXElement: {
+            enter(path) {
+                const openingElement = path.get('openingElement');
+                const jsxName = openingElement.get('name');
+                if (!jsxName.isJSXIdentifier()) {
+                    return;
+                }
+                const tagName = jsxName.node.name;
+                if (tagName !== 'Template') {
+                    return;
+                }
+                const templateInfo = (0, template_1.preParseTemplate)(path);
+                if (templateInfo) {
+                    templates.set(templateInfo.name, {
+                        funcs: templateInfo.funcs,
+                        applyTemplates: templateInfo.applys,
+                    });
+                }
+            },
+        },
+    };
+};
+exports.createPreWxmlVistor = createPreWxmlVistor;
+/**
+ * 根据template中使用的wxs组装需要导入的wxs语句
+ * 如： import xxx from '../xxx.wxs.js'
+ *
+ * @param templateFileName template模版文件名
+ * @param usedWxses template中使用的变量是wxs模块的集合
+ * @param dirPath 当前解析文件的路径
+ * @returns 需要导入的wxs语句集合
+ */
+function getWxsImports(templateFileName, usedWxses, dirPath) {
+    const templatePath = pathTool.join(global_1.globals.rootPath, 'imports', `${templateFileName}.js`);
+    const wxsImports = [];
+    for (const usedWxs of usedWxses) {
+        const wxsAbsPath = pathTool.resolve(dirPath, `${usedWxs.src}.js`);
+        const wxsRelPath = pathTool.relative(pathTool.dirname(templatePath), wxsAbsPath);
+        wxsImports.push((0, utils_1.buildImportStatement)((0, utils_1.normalizePath)(wxsRelPath), [], usedWxs.module));
+    }
+    return wxsImports;
+}
+exports.getWxsImports = getWxsImports;
+const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = [], templates) => {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 入参 ${(0, utils_1.getLineBreak)()}dirPath: ${dirPath} ${(0, utils_1.getLineBreak)()}`);
     const jsxAttrVisitor = (path) => {
+        (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析JSXAttribute ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
         const name = path.node.name;
-        const jsx = path.findParent(p => p.isJSXElement());
+        const jsx = path.findParent((p) => p.isJSXElement());
         // 把 hidden 转换为 wxif
         if (name.name === 'hidden') {
             const value = path.get('value');
-            if (t.isJSXExpressionContainer(value)) {
+            if (t.isJSXExpressionContainer(value) && !t.isJSXEmptyExpression(value.node.expression)) {
                 const exclamation = t.unaryExpression('!', value.node.expression);
                 path.set('value', t.jSXExpressionContainer(exclamation));
                 path.set('name', t.jSXIdentifier(exports.WX_IF));
             }
         }
+        // 当设置图片mode="",则改为默认值(且taro不支持mode空值)
+        if (name.name === 'mode' && path.node.value === null) {
+            path.set('value', t.stringLiteral('scaleToFill'));
+        }
+        // 当设置 style 属性但未赋值则删除该属性
+        if (name.name === 'style' && !path.node.value) {
+            path.remove();
+            return;
+        }
         const valueCopy = (0, lodash_1.cloneDeep)(path.get('value').node);
+        if (typeof valueCopy === 'undefined' || t.isJSXFragment(valueCopy)) {
+            return;
+        }
         transformIf(name.name, path, jsx, valueCopy);
         const loopItem = transformLoop(name.name, path, jsx, valueCopy);
         if (loopItem) {
@@ -74,14 +224,31 @@ const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) =>
         }
     };
     const renameJSXKey = (path) => {
+        var _a, _b, _c, _d;
+        (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析JSXIdentifier ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
         const nodeName = path.node.name;
         if (path.parentPath.isJSXAttribute()) {
-            if (nodeName === exports.WX_KEY) {
-                path.replaceWith(t.jSXIdentifier('key'));
+            const cacheNode = (0, lodash_1.cloneDeep)(path.parentPath.parentPath.parent);
+            if (nodeName === exports.WX_SHOW) {
+                path.replaceWith(t.jSXIdentifier(exports.WX_IF)); // wx:show转换后不支持，不频繁切换的话wx:if可替代
+                const position = {
+                    col: ((_a = cacheNode.position) === null || _a === void 0 ? void 0 : _a.start.column) || 0,
+                    row: ((_b = cacheNode.position) === null || _b === void 0 ? void 0 : _b.start.line) || 0
+                };
+                (0, utils_1.createErrorCodeMsg)('uncompilableAttribute', `属性  ${nodeName}不能编译,会被替换为wx:if`, (0, utils_1.astToCode)(cacheNode) || '', global_1.globals.currentParseFile, position);
+                // eslint-disable-next-line no-console
+                console.log(`属性  ${nodeName}不能编译,会被替换为wx:if`);
+                (0, utils_1.updateLogFileContent)(`WARN [taroize] createWxmlVistor - ${nodeName} 属性不能编译，会被替换为 wx:if ${(0, utils_1.getLineBreak)()}`);
             }
-            if (nodeName.startsWith('wx:') && !exports.wxTemplateCommand.includes(nodeName)) {
+            else if (nodeName.startsWith('wx:') && !exports.wxTemplateCommand.includes(nodeName)) {
+                const position = {
+                    col: ((_c = cacheNode.position) === null || _c === void 0 ? void 0 : _c.start.column) || 0,
+                    row: ((_d = cacheNode.position) === null || _d === void 0 ? void 0 : _d.start.line) || 0
+                };
+                (0, utils_1.createErrorCodeMsg)('unknownScopeAttribute', `未知 wx 作用域属性： ${nodeName}，该属性会被移除掉。`, (0, utils_1.astToCode)(cacheNode) || '', global_1.globals.currentParseFile, position);
                 // eslint-disable-next-line no-console
                 console.log(`未知 wx 作用域属性： ${nodeName}，该属性会被移除掉。`);
+                (0, utils_1.updateLogFileContent)(`WARN [taroize] createWxmlVistor - 未知 wx 作用域属性: ${nodeName}，该属性会被移除掉 ${(0, utils_1.getLineBreak)()}`);
                 path.parentPath.remove();
             }
         }
@@ -89,8 +256,25 @@ const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) =>
     return {
         JSXAttribute: jsxAttrVisitor,
         JSXIdentifier: renameJSXKey,
+        Identifier: {
+            enter(path) {
+                (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析Identifier ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
+                if (!path.isReferencedIdentifier()) {
+                    return;
+                }
+                const jsxExprContainer = path.findParent((p) => p.isJSXExpressionContainer());
+                if (!jsxExprContainer || !jsxExprContainer.isJSXExpressionContainer()) {
+                    return;
+                }
+                if ((0, utils_1.isValidVarName)(path.node.name)) {
+                    refIds.add(path.node.name);
+                }
+            },
+        },
         JSXElement: {
             enter(path) {
+                var _a, _b, _c;
+                (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析JSXElement ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
                 const openingElement = path.get('openingElement');
                 const jsxName = openingElement.get('name');
                 const attrs = openingElement.get('attributes');
@@ -98,31 +282,22 @@ const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) =>
                     return;
                 }
                 path.traverse({
-                    Identifier(p) {
-                        if (!p.isReferencedIdentifier()) {
-                            return;
-                        }
-                        const jsxExprContainer = p.findParent(p => p.isJSXExpressionContainer());
-                        if (!jsxExprContainer || !jsxExprContainer.isJSXExpressionContainer()) {
-                            return;
-                        }
-                        if ((0, utils_1.isValidVarName)(p.node.name)) {
-                            refIds.add(p.node.name);
-                        }
-                    },
                     JSXAttribute: jsxAttrVisitor,
-                    JSXIdentifier: renameJSXKey
+                    JSXIdentifier: renameJSXKey,
                 });
-                const slotAttr = attrs.find(a => { var _a; return ((_a = a.node) === null || _a === void 0 ? void 0 : _a.name.name) === 'slot'; });
-                if (slotAttr) {
+                const slotAttr = attrs.find((a) => { var _a; return t.isJSXAttribute(a.node) && ((_a = a.node) === null || _a === void 0 ? void 0 : _a.name.name) === 'slot'; });
+                if (slotAttr && t.isJSXAttribute(slotAttr.node)) {
                     const slotValue = slotAttr.node.value;
+                    let slotName = '';
                     if (slotValue && t.isStringLiteral(slotValue)) {
-                        const slotName = slotValue.value;
-                        const parentComponent = path.findParent(p => p.isJSXElement() && t.isJSXIdentifier(p.node.openingElement.name) && !utils_1.DEFAULT_Component_SET.has(p.node.openingElement.name.name));
+                        slotName = slotValue.value;
+                        const parentComponent = path.findParent((p) => p.isJSXElement() &&
+                            t.isJSXIdentifier(p.node.openingElement.name) &&
+                            !utils_1.DEFAULT_Component_SET.has(p.node.openingElement.name.name));
                         if (parentComponent && parentComponent.isJSXElement()) {
                             slotAttr.remove();
                             path.traverse({
-                                JSXAttribute: jsxAttrVisitor
+                                JSXAttribute: jsxAttrVisitor,
                             });
                             const block = (0, utils_1.buildBlockElement)();
                             block.children = [(0, lodash_1.cloneDeep)(path.node)];
@@ -131,19 +306,26 @@ const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) =>
                         }
                     }
                     else {
-                        throw (0, utils_1.codeFrameError)(slotValue, 'slot 的值必须是一个字符串');
+                        // 当元素设置slot标签且值为空串时，移除slot属性
+                        slotAttr.remove();
                     }
                 }
                 const tagName = jsxName.node.name;
                 if (tagName === 'Slot') {
-                    const nameAttr = attrs.find(a => a.node.name.name === 'name');
+                    (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - tagName: Slot ${(0, utils_1.getLineBreak)()}`);
+                    const nameAttr = attrs.find((a) => t.isJSXAttribute(a.node) && a.node.name.name === 'name');
                     let slotName = '';
-                    if (nameAttr) {
+                    if (nameAttr && t.isJSXAttribute(nameAttr.node)) {
                         if (nameAttr.node.value && t.isStringLiteral(nameAttr.node.value)) {
                             slotName = nameAttr.node.value.value;
                         }
                         else {
-                            throw (0, utils_1.codeFrameError)(jsxName.node, 'slot 的值必须是一个字符串');
+                            (0, utils_1.updateLogFileContent)(`ERROR [taroize] createWxmlVistor - slot 的值不是一个字符串 ${(0, utils_1.getLineBreak)()}`);
+                            // const error = codeFrameError(jsxName.node, 'slot 的值必须是一个字符串')
+                            // @ts-ignore
+                            const { line, column } = ((_b = (_a = path.node) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.start) || { line: 0, column: 0 };
+                            const position = { col: column, row: line };
+                            throw new utils_1.IReportError('slot 的值必须是一个字符串', 'SlotValueTypeError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
                         }
                     }
                     const children = t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('props')), t.identifier(slotName ? buildSlotName(slotName) : 'children'));
@@ -151,60 +333,137 @@ const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) =>
                         path.replaceWith(path.parentPath.isJSXElement() ? t.jSXExpressionContainer(children) : children);
                     }
                     catch (error) {
+                        (0, utils_1.updateLogFileContent)(`WARN [taroize] createWxmlVistor - Slot 节点替换异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
                         //
                     }
                 }
                 if (tagName === 'Wxs') {
-                    wxses.push(getWXS(attrs.map(a => a.node), path, imports));
+                    (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - tagName: Wxs ${(0, utils_1.getLineBreak)()}`);
+                    wxses.push(getWXS(attrs.map((a) => a.node), path, imports));
                 }
                 if (tagName === 'Template') {
-                    // path.traverse({
-                    //   JSXAttribute: jsxAttrVisitor
-                    // })
-                    const template = (0, template_1.parseTemplate)(path, dirPath);
+                    (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - tagName: Template ${(0, utils_1.getLineBreak)()}`);
+                    const template = (0, template_1.parseTemplate)(path, dirPath, wxses);
                     if (template) {
-                        const { ast: classDecl, name } = template;
-                        const taroComponentsImport = (0, utils_1.buildImportStatement)('@tarojs/components', [
-                            ...global_1.usedComponents
-                        ]);
+                        let funcs = new Set();
+                        const { ast: classDecl, name, tmplName, usedWxses } = template;
+                        const wxsImports = getWxsImports(name, usedWxses, dirPath);
+                        const taroComponentsImport = (0, utils_1.buildImportStatement)('@tarojs/components', [...global_1.usedComponents]);
                         const taroImport = (0, utils_1.buildImportStatement)('@tarojs/taro', [], 'Taro');
                         const reactImport = (0, utils_1.buildImportStatement)('react', [], 'React');
-                        // const withWeappImport = buildImportStatement(
-                        //   '@tarojs/with-weapp',
-                        //   [],
-                        //   'withWeapp'
-                        // )
+                        // 引入 @tarojs/with-weapp
+                        const withWeappImport = (0, utils_1.buildImportStatement)('@tarojs/with-weapp', [], 'withWeapp');
                         const ast = t.file(t.program([]));
-                        ast.program.body.unshift(taroComponentsImport, reactImport, taroImport, 
-                        // withWeappImport,
-                        t.exportDefaultDeclaration(classDecl));
+                        ast.program.body.unshift(taroComponentsImport, reactImport, taroImport, withWeappImport, ...wxsImports, classDecl, t.exportDefaultDeclaration(t.identifier(name)));
                         const usedTemplate = new Set();
-                        (0, babel_traverse_1.default)(ast, {
+                        // funcs的值首先来源于预解析结果
+                        if (templates) {
+                            const applyFuncs = (_c = templates.get(name)) === null || _c === void 0 ? void 0 : _c.funcs;
+                            if (applyFuncs) {
+                                funcs = applyFuncs;
+                            }
+                        }
+                        (0, traverse_1.default)(ast, {
                             JSXIdentifier(path) {
+                                (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析JSXIdentifier ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
                                 const node = path.node;
                                 if (node.name.endsWith('Tmpl') && node.name.length > 4 && path.parentPath.isJSXOpeningElement()) {
                                     usedTemplate.add(node.name);
+                                    // 传递的方法有两处来源
+                                    const templateImport = imports.find((tmplImport) => tmplImport.name === `${node.name}`);
+                                    const templateInfo = templates === null || templates === void 0 ? void 0 : templates.get(node.name);
+                                    let templateFuncs = templateImport === null || templateImport === void 0 ? void 0 : templateImport.funcs;
+                                    if (templateInfo === null || templateInfo === void 0 ? void 0 : templateInfo.funcs) {
+                                        if (templateFuncs) {
+                                            templateFuncs = new Set([...templateFuncs, ...templateInfo.funcs]);
+                                        }
+                                        else {
+                                            templateFuncs = templateInfo.funcs;
+                                        }
+                                    }
+                                    if (templateFuncs && templateFuncs.size > 0) {
+                                        const openingElement = path.parentPath.node;
+                                        const attributes = openingElement.attributes;
+                                        templateFuncs.forEach((templateFunc) => {
+                                            const value = t.jsxExpressionContainer(t.identifier(templateFunc));
+                                            const name = t.jsxIdentifier(templateFunc);
+                                            // 传递的方法插入到Tmpl标签属性中
+                                            attributes.push(t.jsxAttribute(name, value));
+                                            if (!funcs.has(templateFunc)) {
+                                                funcs.add(templateFunc);
+                                            }
+                                        });
+                                    }
                                 }
-                            }
+                            },
+                            JSXAttribute(path) {
+                                (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析JSXAttribute ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
+                                // 识别template使用到的处理事件的func
+                                const node = path.node;
+                                if (t.isJSXExpressionContainer(node.value) &&
+                                    t.isMemberExpression(node.value.expression) &&
+                                    t.isThisExpression(node.value.expression.object) &&
+                                    t.isIdentifier(node.value.expression.property)) {
+                                    const funcName = node.value.expression.property.name;
+                                    // func的调用形式 this.func --> func
+                                    path.replaceWith(t.jsxAttribute(node.name, t.jsxExpressionContainer(t.identifier(funcName))));
+                                }
+                            },
                         });
-                        usedTemplate.forEach(componentName => {
+                        (0, traverse_1.default)(ast, {
+                            // 将使用到的处理事件的func写入到props
+                            BlockStatement(path) {
+                                (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - 解析BlockStatement ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
+                                if (funcs.size > 0) {
+                                    const body = path.node.body;
+                                    if (t.isVariableDeclaration(body[0])) {
+                                        // 如果已经定义了props
+                                        const declarator = body[0].declarations[0];
+                                        if (t.isObjectPattern(declarator.id)) {
+                                            const properties = declarator.id.properties;
+                                            funcs.forEach((func) => {
+                                                properties.push(t.objectProperty(t.identifier(func), t.identifier(func), false, true));
+                                            });
+                                        }
+                                    }
+                                    else {
+                                        // 没有定义，则插入 const {xxx} = this.props
+                                        const properties = [];
+                                        funcs.forEach((func) => {
+                                            properties.push(t.objectProperty(t.identifier(func), t.identifier(func), false, true));
+                                        });
+                                        const id = t.objectPattern(properties);
+                                        const init = t.memberExpression(t.thisExpression(), t.identifier('props'));
+                                        const declarator = t.variableDeclarator(id, init);
+                                        const declaration = t.variableDeclaration('const', [declarator]);
+                                        body.splice(0, 0, declaration);
+                                    }
+                                }
+                                path.stop();
+                            },
+                        });
+                        usedTemplate.forEach((componentName) => {
                             if (componentName !== classDecl.id.name) {
                                 ast.program.body.unshift((0, utils_1.buildImportStatement)(`./${componentName}`, [], componentName));
                             }
                         });
                         imports.push({
                             ast,
-                            name
+                            name,
+                            funcs,
+                            tmplName,
                         });
                     }
                 }
                 if (tagName === 'Import') {
+                    (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - tagName: Import ${(0, utils_1.getLineBreak)()}`);
                     const mods = (0, template_1.parseModule)(path, dirPath, 'import');
                     if (mods) {
                         imports.push(...mods);
                     }
                 }
                 if (tagName === 'Include') {
+                    (0, utils_1.updateLogFileContent)(`INFO [taroize] createWxmlVistor - tagName: Include ${(0, utils_1.getLineBreak)()}`);
                     (0, template_1.parseModule)(path, dirPath, 'include');
                 }
             },
@@ -217,33 +476,85 @@ const createWxmlVistor = (loopIds, refIds, dirPath, wxses = [], imports = []) =>
                 const children = path.node.children;
                 if (children.length === 1) {
                     const caller = children[0];
-                    if (t.isJSXExpressionContainer(caller) && t.isCallExpression(caller.expression) && !path.parentPath.isExpressionStatement()) {
+                    if (t.isJSXExpressionContainer(caller) &&
+                        t.isCallExpression(caller.expression) &&
+                        !path.parentPath.isExpressionStatement()) {
                         try {
                             path.replaceWith(caller);
                         }
                         catch (error) {
+                            (0, utils_1.updateLogFileContent)(`WARN [taroize] createWxmlVistor - block 节点替换异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
                             //
                         }
                     }
                 }
-            }
-        }
+            },
+        },
     };
 };
 exports.createWxmlVistor = createWxmlVistor;
-function parseWXML(dirPath, wxml, parseImport) {
-    let parseResult = (0, cache_1.getCacheWxml)(dirPath);
-    if (parseResult) {
-        return parseResult;
+/**
+ * @description 根据模板信息中的直接调用，遍历获取完整的调用
+ * @param templates 模板信息
+ */
+function templateBfs(templates) {
+    var _a;
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] templateBfs - 进入函数 ${(0, utils_1.getLineBreak)()}`);
+    const names = [];
+    const applys = new Map();
+    for (const key of templates.keys()) {
+        names.push(key);
+        const templateInfo = templates.get(key);
+        if (templateInfo) {
+            applys.set(key, templateInfo.applyTemplates);
+        }
+    }
+    for (const name of names) {
+        const templateInfo = templates.get(name);
+        if (!templateInfo || templateInfo.applyTemplates.size === 0) {
+            continue;
+        }
+        const visited = new Set();
+        const queue = [name];
+        while (queue.length > 0) {
+            const template = queue.shift();
+            if (visited.has(template)) {
+                continue;
+            }
+            visited.add(template);
+            const templateApplys = applys.get(template);
+            if (!templateApplys || templateApplys.size === 0) {
+                continue;
+            }
+            templateApplys.forEach((item) => {
+                if (names.includes(item)) {
+                    queue.push(item);
+                }
+            });
+        }
+        visited.delete(name);
+        templateInfo.applyTemplates = visited;
+        for (const item of visited) {
+            const applyFuncs = (_a = templates.get(item)) === null || _a === void 0 ? void 0 : _a.funcs;
+            if (applyFuncs) {
+                const funcs = templateInfo.funcs;
+                templateInfo.funcs = new Set([...funcs, ...applyFuncs]);
+            }
+        }
+        templates.set(name, templateInfo);
     }
+}
+function parseWXML(dirPath, wxml, parseImport) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseWXML - 入参 ${(0, utils_1.getLineBreak)()}dirPath: ${dirPath} ${(0, utils_1.getLineBreak)()}parseImport: ${parseImport} ${(0, utils_1.getLineBreak)()}`);
     try {
         wxml = prettyPrint(wxml, {
             max_char: 0,
             indent_char: 0,
-            unformatted: ['text', 'wxs']
+            unformatted: ['text', 'wxs'],
         });
     }
     catch (error) {
+        (0, utils_1.updateLogFileContent)(`WARN [taroize] parseWXML - wxml代码格式化异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
         //
     }
     if (!parseImport) {
@@ -255,21 +566,35 @@ function parseWXML(dirPath, wxml, parseImport) {
     const imports = [];
     const refIds = new Set();
     const loopIds = new Set();
+    // 模板信息
+    const templates = new Map();
     if (!wxml) {
         return {
             wxses,
             imports,
             refIds,
-            wxml: t.nullLiteral()
+            wxml: t.nullLiteral(),
         };
     }
-    const nodes = removEmptyTextAndComment((0, himalaya_wxml_1.parse)(wxml.trim()));
-    const ast = t.file(t.program([
-        t.expressionStatement(parseNode(buildElement('block', nodes)))
-    ], []));
-    (0, babel_traverse_1.default)(ast, (0, exports.createWxmlVistor)(loopIds, refIds, dirPath, wxses, imports));
-    refIds.forEach(id => {
-        if (loopIds.has(id) || imports.filter(i => i.wxs).map(i => i.name).includes(id)) {
+    const nodes = removeEmptyTextAndComment((0, himalaya_wxml_1.parse)(wxml.trim(), Object.assign(Object.assign({}, himalaya_wxml_1.parseDefaults), { includePositions: true })));
+    const ast = t.file(t.program([t.expressionStatement(parseNode(buildElement('block', nodes)))], []));
+    // 确认当前解析页面是否已经解析过，如果解析过则直接获取缓存解析
+    let parseResult = (0, cache_1.getCacheWxml)(dirPath, hydrate(ast));
+    if (parseResult) {
+        return parseResult;
+    }
+    // 在解析wxml页面前，先进行预解析
+    // 当前预解析主要为了抽取页面下的模板信息
+    (0, traverse_1.default)(ast, (0, exports.createPreWxmlVistor)(templates));
+    // 获取template调用后，需要通过遍历，获取某个模板完整的调用关系
+    templateBfs(templates);
+    (0, traverse_1.default)(ast, (0, exports.createWxmlVistor)(loopIds, refIds, dirPath, wxses, imports, templates));
+    refIds.forEach((id) => {
+        if (loopIds.has(id) ||
+            imports
+                .filter((i) => i.wxs)
+                .map((i) => i.name)
+                .includes(id)) {
             refIds.delete(id);
         }
     });
@@ -277,13 +602,14 @@ function parseWXML(dirPath, wxml, parseImport) {
         wxses,
         imports,
         wxml: hydrate(ast),
-        refIds
+        refIds,
     };
     (0, cache_1.saveCacheWxml)(dirPath, parseResult);
     return parseResult;
 }
 exports.parseWXML = parseWXML;
 function getWXS(attrs, path, imports) {
+    var _a, _b, _c, _d, _e, _f;
     let moduleName = null;
     let src = null;
     for (const attr of attrs) {
@@ -292,13 +618,16 @@ function getWXS(attrs, path, imports) {
             const attrValue = attr.value;
             let value = null;
             if (attrValue === null) {
-                throw new Error('WXS 标签的属性值不得为空');
+                // @ts-ignore
+                const { line, column } = ((_b = (_a = path.node) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.start) || { line: 0, column: 0 };
+                const position = { col: column, row: line };
+                (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - wxs 标签的属性值为空 ${(0, utils_1.getLineBreak)()}`);
+                throw new utils_1.IReportError('wxs 标签的属性值不得为空', 'WxsTagAttributeEmptyError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
             }
             if (t.isStringLiteral(attrValue)) {
                 value = attrValue.value;
             }
-            else if (t.isJSXExpressionContainer(attrValue) &&
-                t.isStringLiteral(attrValue.expression)) {
+            else if (t.isJSXExpressionContainer(attrValue) && t.isStringLiteral(attrValue.expression)) {
                 value = attrValue.expression.value;
             }
             if (attrName === 'module') {
@@ -310,32 +639,116 @@ function getWXS(attrs, path, imports) {
         }
     }
     if (!src) {
-        const { children: [script] } = path.node;
+        const { children: [script], } = path.node;
         if (!t.isJSXText(script)) {
-            throw new Error('wxs 如果没有 src 属性，标签内部必须有 wxs 代码。');
+            // @ts-ignore
+            const { line, column } = ((_d = (_c = path.node) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.start) || { line: 0, column: 0 };
+            const position = { col: column, row: line };
+            (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - wxs 没有 src 属性且标签内部没有 wxs 代码 ${(0, utils_1.getLineBreak)()}`);
+            throw new utils_1.IReportError('wxs 如果没有 src 属性，标签内部必须有 wxs 代码。', 'WxsTagCodeMissingError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
         }
         src = './wxs__' + moduleName;
         const ast = (0, utils_1.parseCode)(script.value);
-        (0, babel_traverse_1.default)(ast, {
+        (0, traverse_1.default)(ast, {
             CallExpression(path) {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+                (0, utils_1.updateLogFileContent)(`INFO [taroize] getWXS - 解析CallExpression ${(0, utils_1.getLineBreak)()}${path} ${(0, utils_1.getLineBreak)()}`);
+                // wxs标签中getRegExp转换为new RegExp
                 if (t.isIdentifier(path.node.callee, { name: 'getRegExp' })) {
-                    console.warn((0, utils_1.codeFrameError)(path.node, '请使用 JavaScript 标准正则表达式把这个 getRegExp 函数重构。'));
+                    // 根据正则表达式是否定义了正则匹配修饰符，有则不变，没有就用默认
+                    if (path.node.arguments.length > 1) {
+                        const regex = path.node.arguments[0];
+                        const modifier = path.node.arguments[1];
+                        if (t.isStringLiteral(regex) && t.isStringLiteral(modifier)) {
+                            const regexStr = (_a = regex.extra) === null || _a === void 0 ? void 0 : _a.raw;
+                            const regexModifier = (_b = modifier.extra) === null || _b === void 0 ? void 0 : _b.rawValue;
+                            const regexWithoutQuotes = regexStr.replace(/^['"](.*)['"]$/, '$1');
+                            const newExpr = t.newExpression(t.identifier('RegExp'), [
+                                t.stringLiteral(regexWithoutQuotes),
+                                t.stringLiteral(regexModifier),
+                            ]);
+                            path.replaceWith(newExpr);
+                        }
+                        else if (t.isIdentifier(regex) || t.isIdentifier(modifier)) {
+                            // @ts-ignore
+                            const { line, column } = ((_d = (_c = path.node) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.start) || { line: 0, column: 0 };
+                            const position = { col: column, row: line };
+                            (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - getRegExp 函数暂不支持传入变量类型的参数 ${(0, utils_1.getLineBreak)()}`);
+                            throw new utils_1.IReportError('getRegExp 函数暂不支持传入变量类型的参数', 'GetRegExpVariableTypeError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
+                        }
+                        else {
+                            // @ts-ignore
+                            const { line, column } = ((_f = (_e = path.node) === null || _e === void 0 ? void 0 : _e.position) === null || _f === void 0 ? void 0 : _f.start) || { line: 0, column: 0 };
+                            const position = { col: column, row: line };
+                            (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - getRegExp 函数暂不支持传入非字符串类型的参数 ${(0, utils_1.getLineBreak)()}`);
+                            throw new utils_1.IReportError('getRegExp 函数暂不支持传入非字符串类型的参数', 'GetRegExpParameterTypeError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
+                        }
+                    }
+                    else if (path.node.arguments.length === 1) {
+                        const regex = path.node.arguments[0];
+                        if (t.isStringLiteral(regex)) {
+                            const regexStr = (_g = regex.extra) === null || _g === void 0 ? void 0 : _g.raw;
+                            const regexWithoutQuotes = regexStr.replace(/^['"](.*)['"]$/, '$1');
+                            const newExpr = t.newExpression(t.identifier('RegExp'), [t.stringLiteral(regexWithoutQuotes)]);
+                            path.replaceWith(newExpr);
+                        }
+                        else if (t.isIdentifier(regex)) {
+                            // @ts-ignore
+                            const { line, column } = ((_j = (_h = path.node) === null || _h === void 0 ? void 0 : _h.position) === null || _j === void 0 ? void 0 : _j.start) || { line: 0, column: 0 };
+                            const position = { col: column, row: line };
+                            (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - getRegExp 函数暂不支持传入变量类型的参数 ${(0, utils_1.getLineBreak)()}`);
+                            throw new utils_1.IReportError('getRegExp 函数暂不支持传入变量类型的参数', 'GetRegExpVariableTypeError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
+                        }
+                        else {
+                            // @ts-ignore
+                            const { line, column } = ((_l = (_k = path.node) === null || _k === void 0 ? void 0 : _k.position) === null || _l === void 0 ? void 0 : _l.start) || { line: 0, column: 0 };
+                            const position = { col: column, row: line };
+                            (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - getRegExp 函数暂不支持传入非字符串类型的参数 ${(0, utils_1.getLineBreak)()}`);
+                            throw new utils_1.IReportError('getRegExp 函数暂不支持传入非字符串类型的参数', 'GetRegExpParameterTypeError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
+                        }
+                    }
+                    else {
+                        const newExpr = t.newExpression(t.identifier('RegExp'), []);
+                        path.replaceWith(newExpr);
+                    }
                 }
-            }
+                // wxs标签中getDate()转换为new Date()
+                if (t.isIdentifier(path.node.callee, { name: 'getDate' })) {
+                    let argument = [];
+                    let newDate;
+                    const date = path.node.arguments[0];
+                    if (t.isStringLiteral(date)) {
+                        argument = path.node.arguments.map((item) => { var _a; return t.stringLiteral((_a = item.extra) === null || _a === void 0 ? void 0 : _a.rawValue); });
+                        newDate = t.newExpression(t.identifier('Date'), [...argument]);
+                    }
+                    else if (t.isNumericLiteral(date)) {
+                        argument = path.node.arguments.map((item) => { var _a; return t.numericLiteral((_a = item.extra) === null || _a === void 0 ? void 0 : _a.rawValue); });
+                        newDate = t.newExpression(t.identifier('Date'), [...argument]);
+                    }
+                    else {
+                        newDate = t.newExpression(t.identifier('Date'), []);
+                    }
+                    path.replaceWith(newDate);
+                }
+            },
         });
         imports.push({
             ast,
             name: moduleName,
-            wxs: true
+            wxs: true,
         });
     }
     if (!moduleName || !src) {
-        throw new Error('一个 WXS 需要同时存在两个属性：`wxs`, `src`');
+        // @ts-ignore
+        const { line, column } = ((_f = (_e = path.node) === null || _e === void 0 ? void 0 : _e.position) === null || _f === void 0 ? void 0 : _f.start) || { line: 0, column: 0 };
+        const position = { col: column, row: line };
+        (0, utils_1.updateLogFileContent)(`ERROR [taroize] getWXS - wxs 未同时存在 wxs、src 两个属性 ${(0, utils_1.getLineBreak)()}`);
+        throw new utils_1.IReportError('一个 wxs 需要同时存在两个属性：`module`, `src`', 'WxsTagAttributesMissingError', 'WXML_FILE', (0, utils_1.astToCode)(path.node) || '', position);
     }
     path.remove();
     return {
         module: moduleName,
-        src
+        src,
     };
 }
 function hydrate(file) {
@@ -344,9 +757,7 @@ function hydrate(file) {
         const jsx = ast.expression;
         if (jsx.children.length === 1) {
             const children = jsx.children[0];
-            return t.isJSXExpressionContainer(children)
-                ? children.expression
-                : children;
+            return t.isJSXExpressionContainer(children) ? children.expression : children;
         }
         else {
             return jsx;
@@ -354,16 +765,21 @@ function hydrate(file) {
     }
 }
 function transformLoop(name, attr, jsx, value) {
+    var _a, _b;
     const jsxElement = jsx.get('openingElement');
     if (!jsxElement.node) {
         return;
     }
-    const attrs = jsxElement.get('attributes').map(a => a.node);
-    const wxForItem = attrs.find(a => a.name.name === exports.WX_FOR_ITEM);
-    const hasSinglewxForItem = wxForItem && wxForItem.value && t.isJSXExpressionContainer(wxForItem.value);
+    const attrs = jsxElement.get('attributes').map((a) => a.node);
+    const wxForItem = attrs.find((a) => t.isJSXAttribute(a) && a.name.name === exports.WX_FOR_ITEM);
+    const hasSinglewxForItem = wxForItem && t.isJSXAttribute(wxForItem) && wxForItem.value && t.isJSXExpressionContainer(wxForItem.value);
     if (hasSinglewxForItem || name === exports.WX_FOR || name === 'wx:for-items') {
         if (!value || !t.isJSXExpressionContainer(value)) {
-            throw new Error('wx:for 的值必须使用 "{{}}"  包裹');
+            // @ts-ignore
+            const { line, column } = ((_b = (_a = jsx.node) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.start) || { line: 0, column: 0 };
+            const position = { col: column, row: line };
+            (0, utils_1.updateLogFileContent)(`ERROR [taroize] transformLoop - wx:for 的值未用 "{{}}" 包裹 ${(0, utils_1.getLineBreak)()}`);
+            throw new utils_1.IReportError('wx:for 的值必须使用 "{{}}"  包裹', 'WxForValueFormatError', 'WXML_FILE', (0, utils_1.astToCode)(jsx.node) || '', position);
         }
         attr.remove();
         let item = t.stringLiteral('item');
@@ -371,18 +787,27 @@ function transformLoop(name, attr, jsx, value) {
         jsx
             .get('openingElement')
             .get('attributes')
-            .forEach(p => {
+            .forEach((p) => {
+            var _a, _b, _c, _d;
             const node = p.node;
             if (node.name.name === exports.WX_FOR_ITEM) {
                 if (!node.value || !t.isStringLiteral(node.value)) {
-                    throw new Error(exports.WX_FOR_ITEM + ' 的值必须是一个字符串');
+                    // @ts-ignore
+                    const { line, column } = ((_b = (_a = jsx.node) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.start) || { line: 0, column: 0 };
+                    const position = { col: column, row: line };
+                    (0, utils_1.updateLogFileContent)(`ERROR [taroize] transformLoop - ${exports.WX_FOR_ITEM} 的值不是一个字符串 ${(0, utils_1.getLineBreak)()}`);
+                    throw new utils_1.IReportError(exports.WX_FOR_ITEM + ' 的值必须是一个字符串', 'WxForItemValueError', 'WXML_FILE', (0, utils_1.astToCode)(jsx.node) || '', position);
                 }
                 item = node.value;
                 p.remove();
             }
             if (node.name.name === exports.WX_FOR_INDEX) {
                 if (!node.value || !t.isStringLiteral(node.value)) {
-                    throw new Error(exports.WX_FOR_INDEX + ' 的值必须是一个字符串');
+                    // @ts-ignore
+                    const { line, column } = ((_d = (_c = jsx.node) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.start) || { line: 0, column: 0 };
+                    const position = { col: column, row: line };
+                    (0, utils_1.updateLogFileContent)(`ERROR [taroize] transformLoop - ${exports.WX_FOR_INDEX} 的值不是一个字符串 ${(0, utils_1.getLineBreak)()}`);
+                    throw new utils_1.IReportError(exports.WX_FOR_INDEX + ' 的值必须是一个字符串', 'WxForIndexValueError', 'WXML_FILE', (0, utils_1.astToCode)(jsx.node) || '', position);
                 }
                 index = node.value;
                 p.remove();
@@ -391,19 +816,50 @@ function transformLoop(name, attr, jsx, value) {
         jsx
             .get('openingElement')
             .get('attributes')
-            .forEach(p => {
+            .forEach((p) => {
             const node = p.node;
-            if (node.name.name === exports.WX_KEY && t.isStringLiteral(node.value)) {
-                if (node.value.value === '*this') {
-                    node.value = t.jSXExpressionContainer(t.identifier(item.value));
+            if (node.name.name === exports.WX_KEY) {
+                node.name = t.jSXIdentifier('key');
+                if (t.isStringLiteral(node.value)) {
+                    if (node.value.value === '*this') {
+                        node.value = t.jSXExpressionContainer(t.identifier(item.value));
+                    }
+                    else if (node.value.value === 'index') {
+                        // index表示item在数组里的下标, 并不是item的某个property, 单独抽出来处理
+                        node.value = t.jSXExpressionContainer(t.identifier(node.value.value));
+                    }
+                    else {
+                        node.value = t.jSXExpressionContainer(t.memberExpression(t.identifier(item.value), t.identifier(node.value.value)));
+                    }
                 }
-                else {
-                    node.value = t.jSXExpressionContainer(t.memberExpression(t.identifier(item.value), t.identifier(node.value.value)));
+            }
+        });
+        jsx
+            .get('openingElement')
+            .get('attributes')
+            .forEach((p) => {
+            const node = p.node;
+            if (node.name.name === exports.WX_IF) {
+                // 如果同时使用了 wx:if，分离
+                const ifBlock = (0, utils_1.buildBlockElement)();
+                ifBlock.children = [(0, lodash_1.cloneDeep)(jsx.node)];
+                try {
+                    jsx.replaceWith(ifBlock);
                 }
+                catch (error) {
+                    (0, utils_1.updateLogFileContent)(`WARN [taroize] transformLoop - wx:if和wx:for合用时父组件使用wx:if导致使用replaceWith异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
+                    // jsx外层是wx:if的转换，替换（replaceWith）时会抛出异常
+                    // catch异常后，正常替换
+                }
+                p.remove();
             }
         });
+        if (t.isJSXEmptyExpression(value.expression)) {
+            (0, helper_1.printLog)("warning" /* processTypeEnum.WARNING */, 'value.expression', 'wxml.ts -> t.isJSXEmptyExpression(value.expression)');
+            return;
+        }
         const replacement = t.jSXExpressionContainer(t.callExpression(t.memberExpression(value.expression, t.identifier('map')), [
-            t.arrowFunctionExpression([t.identifier(item.value), t.identifier(index.value)], t.blockStatement([t.returnStatement(jsx.node)]))
+            t.arrowFunctionExpression([t.identifier(item.value), t.identifier(index.value)], t.blockStatement([t.returnStatement(jsx.node)])),
         ]));
         const block = (0, utils_1.buildBlockElement)();
         block.children = [replacement];
@@ -411,31 +867,47 @@ function transformLoop(name, attr, jsx, value) {
             jsx.replaceWith(block);
         }
         catch (error) {
+            (0, utils_1.updateLogFileContent)(`WARN [taroize] transformLoop - 节点替换异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
             //
         }
         return {
             item: item.value,
-            index: index.value
+            index: index.value,
         };
     }
 }
 function transformIf(name, attr, jsx, value) {
+    var _a, _b;
     if (name !== exports.WX_IF) {
         return;
     }
-    if (jsx.node.openingElement.attributes.some(a => a.name.name === 'slot')) {
+    if (jsx.node.openingElement.attributes.some((a) => t.isJSXAttribute(a) && a.name.name === 'slot')) {
+        return;
+    }
+    // 考虑到wx:if和wx:for的优先级，如果同时使用，先解析wx:for
+    if (jsx.node.openingElement.attributes.some((a) => t.isJSXAttribute(a) && (a.name.name === 'wx:for' || a.name.name === 'wx:for-items'))) {
         return;
     }
     const conditions = [];
     let siblings = [];
     try {
-        siblings = jsx.getAllNextSiblings().filter(s => !(s.isJSXExpressionContainer() && s.get('expression').isJSXEmptyExpression()));
+        siblings = jsx
+            .getAllNextSiblings()
+            .filter((s) => !(s.isJSXExpressionContainer() && t.isJSXEmptyExpression(s.get('expression'))));
     }
     catch (error) {
+        (0, utils_1.updateLogFileContent)(`WARN [taroize] transformIf - 节点过滤异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
         return;
     }
     if (value === null || !t.isJSXExpressionContainer(value)) {
+        const cacheNode = (0, lodash_1.cloneDeep)(attr.parentPath.parent);
+        const position = {
+            col: ((_a = cacheNode.position) === null || _a === void 0 ? void 0 : _a.start.column) || 0,
+            row: ((_b = cacheNode.position) === null || _b === void 0 ? void 0 : _b.start.line) || 0,
+        };
+        (0, utils_1.createErrorCodeMsg)('wxIfValueFormatError', 'wx:if 的值需要用双括号 `{{}}` 包裹它的值', (0, utils_1.astToCode)(cacheNode) || '', global_1.globals.currentParseFile, position);
         console.error('wx:if 的值需要用双括号 `{{}}` 包裹它的值');
+        (0, utils_1.updateLogFileContent)(`WARN [taroize] transformIf - wx:if 的值需要用双括号 {{}} 包裹它的值 ${(0, utils_1.getLineBreak)()}`);
         if (value && t.isStringLiteral(value)) {
             value = t.jSXExpressionContainer((0, utils_1.buildTemplate)(value.value));
         }
@@ -443,11 +915,13 @@ function transformIf(name, attr, jsx, value) {
     conditions.push({
         condition: exports.WX_IF,
         path: jsx,
-        tester: value
+        tester: value,
+        cachePath: (0, lodash_1.cloneDeep)(jsx)
     });
     attr.remove();
     for (let index = 0; index < siblings.length; index++) {
         const sibling = siblings[index];
+        const cacheSibling = (0, lodash_1.cloneDeep)(sibling);
         const next = (0, lodash_1.cloneDeep)(siblings[index + 1]);
         const currMatches = findWXIfProps(sibling);
         const nextMatches = findWXIfProps(next);
@@ -457,7 +931,8 @@ function transformIf(name, attr, jsx, value) {
         conditions.push({
             condition: currMatches.reg.input,
             path: sibling,
-            tester: currMatches.tester
+            tester: currMatches.tester,
+            cachePath: cacheSibling
         });
         if (nextMatches === null) {
             break;
@@ -466,33 +941,48 @@ function transformIf(name, attr, jsx, value) {
     handleConditions(conditions);
 }
 function handleConditions(conditions) {
+    var _a, _b;
     if (conditions.length === 1) {
         const ct = conditions[0];
-        try {
-            ct.path.replaceWith(t.jSXExpressionContainer(t.logicalExpression('&&', ct.tester.expression, (0, lodash_1.cloneDeep)(ct.path.node))));
-        }
-        catch (error) {
-            //
+        if (!t.isJSXEmptyExpression(ct.tester.expression)) {
+            try {
+                ct.path.replaceWith(t.jSXExpressionContainer(t.logicalExpression('&&', ct.tester.expression, (0, lodash_1.cloneDeep)(ct.path.node))));
+            }
+            catch (error) {
+                (0, utils_1.updateLogFileContent)(`WARN [taroize] handleConditions - 替换节点异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
+                //
+            }
         }
     }
     if (conditions.length > 1) {
         const lastLength = conditions.length - 1;
         const lastCon = conditions[lastLength];
+        // 记录当前操作的 condition
+        let currentCondition = null;
         let lastAlternate = (0, lodash_1.cloneDeep)(lastCon.path.node);
         try {
-            if (lastCon.condition === exports.WX_ELSE_IF) {
+            if (lastCon.condition === exports.WX_ELSE_IF && !t.isJSXEmptyExpression(lastCon.tester.expression)) {
                 lastAlternate = t.logicalExpression('&&', lastCon.tester.expression, lastAlternate);
             }
-            const node = conditions
-                .slice(0, lastLength)
-                .reduceRight((acc, condition) => {
+            const node = conditions.slice(0, lastLength).reduceRight((acc, condition) => {
+                currentCondition = condition;
+                if (t.isJSXEmptyExpression(condition.tester.expression)) {
+                    (0, helper_1.printLog)("warning" /* processTypeEnum.WARNING */, 'condition.tester.expression', 't.isJSXEmptyExpression(condition.tester.expression)');
+                    (0, utils_1.updateLogFileContent)(`WARN [taroize] handleConditions - t.isJSXEmptyExpression(condition.tester.expression) ${(0, utils_1.getLineBreak)()}`);
+                    return null;
+                }
                 return t.conditionalExpression(condition.tester.expression, (0, lodash_1.cloneDeep)(condition.path.node), acc);
             }, lastAlternate);
-            conditions[0].path.replaceWith(t.jSXExpressionContainer(node));
-            conditions.slice(1).forEach(c => c.path.remove());
+            if (node != null) {
+                conditions[0].path.replaceWith(t.jSXExpressionContainer(node));
+                conditions.slice(1).forEach((c) => c.path.remove());
+            }
         }
         catch (error) {
-            console.error('wx:elif 的值需要用双括号 `{{}}` 包裹它的值');
+            (0, utils_1.updateLogFileContent)(`WARN [taroize] handleConditions - wx:elif 转换异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
+            const { line, column } = ((_b = (_a = currentCondition.cachePath.node) === null || _a === void 0 ? void 0 : _a.position) === null || _b === void 0 ? void 0 : _b.start) || { line: 0, column: 0 };
+            const position = { col: column, row: line };
+            throw new utils_1.IReportError('属性转换错误 wx:elif 的值需要用双括号 `{{}}` 包裹它的值', 'wxElifValueFormatError', 'WXML_FILE', (0, utils_1.astToCode)(currentCondition.cachePath.node) || '', position);
         }
     }
 }
@@ -503,9 +993,9 @@ function findWXIfProps(jsx) {
         jsx
             .get('openingElement')
             .get('attributes')
-            .some(path => {
+            .some((path) => {
             const attr = path.node;
-            if (t.isJSXIdentifier(attr.name)) {
+            if (t.isJSXIdentifier(attr.name) && attr != null) {
                 const name = attr.name.name;
                 if (name === exports.WX_IF) {
                     return true;
@@ -515,7 +1005,7 @@ function findWXIfProps(jsx) {
                     path.remove();
                     matches = {
                         reg: match,
-                        tester: attr.value
+                        tester: attr.value,
                     };
                     return true;
                 }
@@ -525,20 +1015,25 @@ function findWXIfProps(jsx) {
     return matches;
 }
 function parseNode(node, tagName) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseNode - 入参 ${(0, utils_1.getLineBreak)()}tagName: ${tagName} ${(0, utils_1.getLineBreak)()}`);
     if (node.type === NodeType.Text) {
         return parseText(node, tagName);
     }
     else if (node.type === NodeType.Comment) {
         const emptyStatement = t.jSXEmptyExpression();
-        emptyStatement.innerComments = [{
+        emptyStatement.innerComments = [
+            {
                 type: 'CommentBlock',
-                value: ' ' + node.content + ' '
-            }];
-        return t.jSXExpressionContainer(emptyStatement);
+                value: ' ' + node.content + ' ',
+            },
+        ];
+        const jsxExpressionContainer = t.jSXExpressionContainer(emptyStatement);
+        return (0, utils_1.addLocInfo)(jsxExpressionContainer, node);
     }
     return parseElement(node);
 }
 function parseElement(element) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseElement - 进入函数 ${(0, utils_1.getLineBreak)()}`);
     const tagName = t.jSXIdentifier(global_1.THIRD_PARTY_COMPONENTS.has(element.tagName) ? element.tagName : allCamelCase(element.tagName));
     if (utils_1.DEFAULT_Component_SET.has(tagName.name)) {
         global_1.usedComponents.add(tagName.name);
@@ -546,7 +1041,7 @@ function parseElement(element) {
     let attributes = element.attributes;
     if (tagName.name === 'Template') {
         let isSpread = false;
-        attributes = attributes.map(attr => {
+        attributes = attributes.map((attr) => {
             if (attr.key === 'data') {
                 const value = attr.value || '';
                 const content = parseContent(value);
@@ -562,9 +1057,9 @@ function parseElement(element) {
                             // (...a) => {{a}}
                             attr.value = `{{${str.slice(4, strLastIndex)}}}`;
                         }
-                        else if (/^\(([A-Za-z]+)\)$/.test(str)) {
+                        else if (/^\(([A-Za-z,\s]+)\)$/.test(str)) {
                             // (a) => {{a:a}}
-                            attr.value = `{{${str.replace(/^\(([A-Za-z]+)\)$/, '$1:$1')}}}`;
+                            attr.value = `{{${str.slice(1, strLastIndex).replace(/([A-Za-z]+)/g, '$1:$1')}}}`;
                         }
                         else {
                             // (a:'a') => {{a:'a'}}
@@ -581,41 +1076,56 @@ function parseElement(element) {
         if (isSpread) {
             attributes.push({
                 key: 'spread',
-                value: null
+                value: null,
             });
         }
     }
-    return t.jSXElement(t.jSXOpeningElement(tagName, attributes.map(parseAttribute)), t.jSXClosingElement(tagName), removEmptyTextAndComment(element.children).map((el) => parseNode(el, element.tagName)), false);
+    // return t.jSXElement(
+    //   t.jSXOpeningElement(tagName, attributes.map(parseAttribute)),
+    //   t.jSXClosingElement(tagName),
+    //   removeEmptyTextAndComment(element.children).map((el) => parseNode(el, element.tagName)),
+    //   false
+    // )
+    const jSXElement = t.jSXElement(t.jSXOpeningElement(tagName, attributes.map(parseAttribute)), t.jSXClosingElement(tagName), removeEmptyTextAndComment(element.children).map((el) => parseNode(el, element.tagName)), false);
+    return (0, utils_1.addLocInfo)(jSXElement, element);
 }
-function removEmptyTextAndComment(nodes) {
-    return nodes.filter(node => {
-        return node.type === NodeType.Element ||
+function removeEmptyTextAndComment(nodes) {
+    return nodes
+        .filter((node) => {
+        return (node.type === NodeType.Element ||
             (node.type === NodeType.Text && node.content.trim().length !== 0) ||
-            node.type === NodeType.Comment;
-    }).filter((node, index) => !(index === 0 && node.type === NodeType.Comment));
+            node.type === NodeType.Comment);
+    })
+        .filter((node, index) => !(index === 0 && node.type === NodeType.Comment));
 }
-exports.removEmptyTextAndComment = removEmptyTextAndComment;
+exports.removeEmptyTextAndComment = removeEmptyTextAndComment;
 function parseText(node, tagName) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseText - 进入函数 ${(0, utils_1.getLineBreak)()}`);
     if (tagName === 'wxs') {
-        return t.jSXText(node.content);
+        // return t.jSXText(node.content)
+        return (0, utils_1.addLocInfo)(t.jSXText(node.content), node);
     }
     const { type, content } = parseContent(node.content);
     if (type === 'raw') {
         const text = content.replace(/([{}]+)/g, "{'$1'}");
-        return t.jSXText(text);
+        // return t.jSXText(text)
+        return (0, utils_1.addLocInfo)(t.jSXText(text), node);
     }
-    return t.jSXExpressionContainer((0, utils_1.buildTemplate)(content));
+    // return t.jSXExpressionContainer(buildTemplate(content))
+    return (0, utils_1.addLocInfo)(t.jSXExpressionContainer((0, utils_1.buildTemplate)(content)), node);
 }
+// 匹配{{content}}
 const handlebarsRE = /\{\{((?:.|\n)+?)\}\}/g;
 function singleQuote(s) {
     return `'${s}'`;
 }
 function parseContent(content, single = false) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseContent - 进入函数 ${(0, utils_1.getLineBreak)()}`);
     content = content.trim();
     if (!handlebarsRE.test(content)) {
         return {
             type: 'raw',
-            content
+            content,
         };
     }
     const tokens = [];
@@ -641,22 +1151,85 @@ function parseContent(content, single = false) {
     }
     return {
         type: 'expression',
-        content: tokens.join('+')
+        content: tokens.join('+'),
     };
 }
 exports.parseContent = parseContent;
+/**
+ * 判断 style 中的属性是否都是 attrName: attrValue 格式
+ *
+ * @param styleAttrsMap
+ */
+function isAllKeyValueFormat(styleAttrsMap) {
+    // 匹配 attrName: attrValue 格式
+    const isKeyValueFormat = /^(([A-Za-z-]+)\s*):(\s*).*/;
+    const filterStyleAttrs = styleAttrsMap.filter((attr) => attr.trim() !== '');
+    const isStringAttr = filterStyleAttrs.every((attr) => isKeyValueFormat.test(attr.trim()));
+    return isStringAttr;
+}
+/**
+ * 解析内联style属性
+ *
+ * @param key 内联属性的类型
+ * @param value 内联属性的值
+ * @returns
+ */
+function parseStyle(key, value) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseStyle - 入参 ${(0, utils_1.getLineBreak)()}key: ${key} ${(0, utils_1.getLineBreak)()}value: ${value} ${(0, utils_1.getLineBreak)()}`);
+    const styleAttrs = value.trim().split(';');
+    // 针对attrName: attrValue 格式做转换处理, 其他类型采用'+'连接符
+    if (isAllKeyValueFormat(styleAttrs)) {
+        const attrKeyValueMap = [];
+        parseStyleAttrs(styleAttrs, attrKeyValueMap);
+        convertStyleAttrs(attrKeyValueMap);
+        const objectLiteral = t.objectExpression(attrKeyValueMap.map((attr) => t.objectProperty(t.identifier(attr.attrName), attr.value)));
+        return t.jSXAttribute(t.jSXIdentifier(key), t.jsxExpressionContainer(objectLiteral));
+    }
+    else {
+        return parseContent(value);
+    }
+}
+exports.parseStyle = parseStyle;
 function parseAttribute(attr) {
+    (0, utils_1.updateLogFileContent)(`INFO [taroize] parseAttribute - 入参 ${(0, utils_1.getLineBreak)()}attr: ${JSON.stringify(attr)} ${(0, utils_1.getLineBreak)()}`);
     let { key, value } = attr;
     let jsxValue = null;
+    let type = '';
+    let content = '';
     if (value) {
+        const cacheValue = value;
         if (key === 'class' && value.startsWith('[') && value.endsWith(']')) {
             value = value.slice(1, value.length - 1).replace(',', '');
+            (0, utils_1.createErrorCodeMsg)('unsupportedClassArray', 'Taro/React 不支持 class 传入数组，此写法可能无法得到正确的 class', `class=${JSON.stringify(cacheValue).replace(/"/g, "'")}`, global_1.globals.currentParseFile);
+            (0, utils_1.updateLogFileContent)(`WARN [taroize] parseAttribute - Taro/React 不支持 class 传入数组，此写法可能无法得到正确的 class ${(0, utils_1.getLineBreak)()}`);
             // eslint-disable-next-line no-console
             console.log((0, utils_1.codeFrameError)(attr, 'Taro/React 不支持 class 传入数组，此写法可能无法得到正确的 class'));
         }
-        const { type, content } = parseContent(value);
+        value = convertStyleUnit(value);
+        // 判断属性是否为style属性
+        if (key === 'style' && value) {
+            try {
+                const styleParseReslut = parseStyle(key, value);
+                if (t.isJSXAttribute(styleParseReslut)) {
+                    return styleParseReslut;
+                }
+                else {
+                    content = styleParseReslut.content;
+                    type = styleParseReslut.type;
+                }
+            }
+            catch (error) {
+                (0, utils_1.updateLogFileContent)(`ERROR [taroize] parseAttribute - 属性 style="${value}" 解析异常 ${(0, utils_1.getLineBreak)()}${error} ${(0, utils_1.getLineBreak)()}`);
+                throw new utils_1.IReportError(`属性解析失败 style="${value}"解析失败，${error}`, 'StyleAttributeParsingError', 'WXML_FILE', `style="${value}"`);
+            }
+        }
+        else {
+            const parseContentResult = parseContent(value);
+            content = parseContentResult.content;
+            type = parseContentResult.type;
+        }
         if (type === 'raw') {
-            jsxValue = t.stringLiteral(content.replace(/"/g, '\''));
+            jsxValue = t.stringLiteral(content.replace(/"/g, "'"));
         }
         else {
             let expr;
@@ -671,27 +1244,33 @@ function parseAttribute(attr) {
                         expr = t.stringLiteral('');
                     }
                     else {
-                        throw new Error(err);
+                        (0, utils_1.updateLogFileContent)(`ERROR [taroize] parseAttribute - 模板参数转换异常 ${(0, utils_1.getLineBreak)()}${err} ${(0, utils_1.getLineBreak)()}`);
+                        throw new utils_1.IReportError(err, 'TemplateParameterConversionError', 'WXML_FILE', `${key}: ${value}`);
                     }
                 }
-                else if (content.includes(':') || (content.includes('...') && content.includes(','))) {
-                    const file = (0, babylon_1.parse)(`var a = ${attr.value.slice(1, attr.value.length - 1)}`, { plugins: ['objectRestSpread'] });
+                else if (content.includes(':') || content.includes('...')) {
+                    const file = (0, parser_1.parse)(`var a = ${attr.value.slice(1, attr.value.length - 1)}`, {
+                        plugins: ['objectRestSpread'],
+                    });
                     expr = file.program.body[0].declarations[0].init;
                 }
                 else {
                     const err = `转换模板参数： \`${key}: ${value}\` 报错`;
-                    throw new Error(err);
+                    (0, utils_1.updateLogFileContent)(`ERROR [taroize] parseAttribute - 模板参数转换异常 ${(0, utils_1.getLineBreak)()}${err} ${(0, utils_1.getLineBreak)()}`);
+                    throw new utils_1.IReportError(err, 'TemplateParameterConversionError', 'WXML_FILE', `${key}: ${value}`);
                 }
             }
             if (t.isThisExpression(expr)) {
+                (0, utils_1.createErrorCodeMsg)('ThisKeywordUsageWarning', '在参数中使用 `this` 可能会造成意想不到的结果，已将此参数修改为 `__placeholder__`，你可以在转换后的代码查找这个关键字修改。', value, global_1.globals.currentParseFile);
+                (0, utils_1.updateLogFileContent)(`WARN [taroize] parseAttribute - 在参数中使用 this 可能会造成意想不到的结果 ${(0, utils_1.getLineBreak)()}`);
                 console.error('在参数中使用 `this` 可能会造成意想不到的结果，已将此参数修改为 `__placeholder__`，你可以在转换后的代码查找这个关键字修改。');
                 expr = t.stringLiteral('__placeholder__');
             }
             jsxValue = t.jSXExpressionContainer(expr);
         }
     }
-    const jsxKey = handleAttrKey(key);
-    if (/^on[A-Z]/.test(jsxKey) && !(/^catch/.test(key)) && jsxValue && t.isStringLiteral(jsxValue)) {
+    let jsxKey = handleAttrKey(key);
+    if (/^on[A-Z]/.test(jsxKey) && !/^catch/.test(key) && jsxValue && t.isStringLiteral(jsxValue)) {
         jsxValue = t.jSXExpressionContainer(t.memberExpression(t.thisExpression(), t.identifier(jsxValue.value)));
     }
     if (key.startsWith('catch') && value) {
@@ -700,15 +1279,20 @@ function parseAttribute(attr) {
             global_1.globals.hasCatchTrue = true;
         }
         else if (t.isStringLiteral(jsxValue)) {
-            jsxValue = t.jSXExpressionContainer(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('privateStopNoop')), t.identifier('bind')), [t.thisExpression(), t.memberExpression(t.thisExpression(), t.identifier(jsxValue.value))]));
+            jsxValue = t.jSXExpressionContainer(t.memberExpression(t.thisExpression(), t.identifier(jsxValue.value)));
+        }
+    }
+    // 如果data-xxx自定义属性名xxx不是以-分隔的写法就要转成全小写属性名
+    if (value && jsxKey.startsWith('data-')) {
+        const realKey = jsxKey.replace(/^data-/, '');
+        if (realKey.indexOf('-') === -1) {
+            jsxKey = `data-${realKey.toLowerCase()}`;
         }
     }
     return t.jSXAttribute(t.jSXIdentifier(jsxKey), jsxValue);
 }
 function handleAttrKey(key) {
-    if (key.startsWith('wx:') ||
-        key.startsWith('wx-') ||
-        key.startsWith('data-')) {
+    if (key.startsWith('wx:') || key.startsWith('wx-') || key.startsWith('data-')) {
         return key;
     }
     else if (key === 'class') {
@@ -722,7 +1306,8 @@ function handleAttrKey(key) {
             key = key.replace(/^(bind:|catch:|bind|catch)/, 'on');
             key = (0, lodash_1.camelCase)(key);
             if (!(0, utils_1.isValidVarName)(key)) {
-                throw new Error(`"${key}" 不是一个有效 JavaScript 变量名`);
+                (0, utils_1.updateLogFileContent)(`ERROR [taroize] handleAttrKey - ${key} 不是一个有效 JavaScript 变量名 ${(0, utils_1.getLineBreak)()}`);
+                throw new utils_1.IReportError(`属性名"${key}" 不是一个有效 JavaScript 变量名`, 'InvalidVariableNameError', 'WXML_FILE', `${key}`);
             }
             return key.substr(0, 2) + key[2].toUpperCase() + key.substr(3);
         }