@mpxjs/webpack-plugin 2.10.15 → 2.10.16-beta.11

package/lib/template-compiler/compiler.js

@@ -1,7 +1,7 @@
 const JSON5 = require('json5')
 const he = require('he')
 const config = require('../config')
-const { MPX_ROOT_VIEW, MPX_APP_MODULE_ID, PARENT_MODULE_ID } = require('../utils/const')
+const { MPX_ROOT_VIEW, MPX_APP_MODULE_ID, PARENT_MODULE_ID, MPX_TAG_PAGE_SELECTOR } = require('../utils/const')
 const normalize = require('../utils/normalize')
 const { normalizeCondition } = require('../utils/match-condition')
 const isValidIdentifierStr = require('../utils/is-valid-identifier-str')
@@ -15,7 +15,8 @@ const { isNonPhrasingTag } = require('../utils/dom-tag-config')
 const setBaseWxml = require('../runtime-render/base-wxml')
 const { parseExp } = require('./parse-exps')
 const shallowStringify = require('../utils/shallow-stringify')
-const { isReact, isWeb } = require('../utils/env')
+const { isReact, isWeb, isNoMode } = require('../utils/env')
+const { capitalToHyphen } = require('../utils/string')
 
 const no = function () {
   return false
@@ -119,6 +120,8 @@ const rulesResultMap = new Map()
 let usingComponents = []
 let usingComponentsInfo = {}
 let componentGenerics = {}
+// 跨平台语法检测的配置，在模块加载时初始化一次
+let crossPlatformConfig = null
 
 function updateForScopesMap () {
   forScopesMap = {}
@@ -147,11 +150,11 @@ const deleteErrorInResultMap = (node) => {
 }
 
 function baseWarn (msg) {
-  console.warn(('[template compiler]: ' + msg))
+  console.warn(('[Mpx template warning]: ' + msg))
 }
 
 function baseError (msg) {
-  console.error(('[template compiler]: ' + msg))
+  console.error(('[Mpx template error]: ' + msg))
 }
 
 const decodeMap = {
@@ -176,11 +179,11 @@ const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
 const i18nWxsLoaderPath = normalize.lib('wxs/i18n-loader.js')
 // 添加~前缀避免wxs绝对路径在存在projectRoot时被拼接为错误路径
 const i18nWxsRequest = '~' + i18nWxsLoaderPath + '!' + i18nWxsPath
-const i18nModuleName = '_i'
+const i18nModuleName = '_i_'
 const stringifyWxsPath = '~' + normalize.lib('runtime/stringify.wxs')
-const stringifyModuleName = '_s'
+const stringifyModuleName = '_s_'
 const optionalChainWxsPath = '~' + normalize.lib('runtime/oc.wxs')
-const optionalChainWxsName = '_oc' // 改成_oc解决web下_o重名问题
+const optionalChainWxsName = '_oc_' // 改成_oc解决web下_o重名问题
 
 const tagRES = /(\{\{(?:.|\n|\r)+?\}\})(?!})/
 const tagRE = /\{\{((?:.|\n|\r)+?)\}\}(?!})/
@@ -637,8 +640,9 @@ function parse (template, options) {
   processingTemplate = false
   rulesResultMap.clear()
   componentGenerics = options.componentGenerics || {}
+  // 初始化跨平台语法检测配置（每次解析时只初始化一次）
+  crossPlatformConfig = initCrossPlatformConfig()
 
-  if (typeof options.usingComponentsInfo === 'string') options.usingComponentsInfo = JSON.parse(options.usingComponentsInfo)
   usingComponents = Object.keys(options.usingComponentsInfo)
   usingComponentsInfo = options.usingComponentsInfo
 
@@ -681,7 +685,6 @@ function parse (template, options) {
     meta.options.virtualHost = true
   }
   let currentParent
-  let multiRootError
   // 用于记录模板用到的组件，匹配引用组件，看是否有冗余
   const tagNames = new Set()
 
@@ -760,6 +763,7 @@ function parse (template, options) {
       if (!currentParent) genTempRoot()
 
       const children = currentParent.children
+
       if (currentParent.tag !== 'text') {
         text = text.trim()
       } else {
@@ -793,9 +797,10 @@ function parse (template, options) {
     }
   })
 
-  if (multiRootError) {
-    error$1('Template fields should has one single root, considering wrapping your template content with <view> or <text> tag!')
-  }
+  // multiRoot
+  // if (root.tag === 'temp-node' && root.children && root.children.filter(node => node.tag !== 'temp-node').length > 1) {
+  //   error$1('Template fields should has one single root, considering wrapping your template content with <view> or <text> tag!')
+  // }
 
   if (hasI18n) {
     if (i18nInjectableComputed.length) {
@@ -1000,12 +1005,34 @@ function processComponentIs (el, options) {
   }
 
   const range = getAndRemoveAttr(el, 'range').val
-  const isInRange = makeMap(range || '')
-  el.components = (usingComponents).filter(i => {
-    if (!range) return true
-    return isInRange(i)
+
+  // Map<CurrentName, SourceName>
+  let ranges
+  if (range) {
+    ranges = range.split(',').map(i => i.trim()).filter(i => i)
+  } else {
+    // 根据原始用户写的usingComponents字段生成ranges
+    ranges = options.originalUsingComponents
+  }
+
+  const rangeMap = new Map()
+  ranges.forEach(name => {
+    rangeMap.set(['ali', 'swan'].includes(mode) ? capitalToHyphen(name) : name, name)
   })
-  if (!el.components.length) {
+
+  // Map<CurrentName, SourceName>
+  el.componentMap = new Map()
+  usingComponents.forEach((name) => {
+    if (rangeMap.size === 0) {
+      el.componentMap.set(name, name)
+    } else {
+      if (rangeMap.has(name)) {
+        el.componentMap.set(name, rangeMap.get(name))
+      }
+    }
+  })
+
+  if (el.componentMap.size === 0) {
     warn$1('Component in which <component> tag is used must have a non blank usingComponents field')
   }
 
@@ -1383,7 +1410,11 @@ function processEvent (el, options) {
         const targetConfigs = isCapture ? eventConfigMap[type].captureConfigs : eventConfigMap[type].configs
         targetConfigs.push(Object.assign({ name }, parsedFunc))
         if (modifiers.indexOf('proxy') > -1 || options.forceProxyEvent) {
-          eventConfigMap[type].proxy = true
+          if (isCapture) {
+            eventConfigMap[type].captureProxy = true
+          } else {
+            eventConfigMap[type].proxy = true
+          }
         }
       }
     }
@@ -1423,10 +1454,10 @@ function processEvent (el, options) {
   }
 
   for (const type in eventConfigMap) {
-    const { configs = [], captureConfigs = [], proxy } = eventConfigMap[type]
+    const { configs = [], captureConfigs = [], proxy, captureProxy } = eventConfigMap[type]
 
     let needBubblingBind = isNeedBind(configs, proxy)
-    let needCaptureBind = isNeedBind(captureConfigs, proxy)
+    let needCaptureBind = isNeedBind(captureConfigs, captureProxy)
 
     const escapedType = dash2hump(type)
     // 排除特殊情况
@@ -1588,7 +1619,7 @@ function parseOptionalChaining (str) {
     }
     if (grammarMap.checkState() && haveNotGetValue) {
       // 值查找结束但是语法未闭合或者处理到边界还未结束，抛异常
-      throw new Error('[optionChain] option value illegal!!!')
+      throw new Error('[Mpx template error]: optionChain option value illegal!!!')
     }
     haveNotGetValue = true
     let keyValue = ''
@@ -1638,7 +1669,7 @@ function parseOptionalChaining (str) {
     }
     if (grammarMap.checkState() && haveNotGetValue) {
       // key值查找结束但是语法未闭合或者处理到边界还未结束，抛异常
-      throw new Error('[optionChain] option key illegal!!!')
+      throw new Error('[Mpx template error]: optionChain option key illegal!!!')
     }
     if (keyValue) {
       chainKey += `,'${keyValue}'`
@@ -1851,24 +1882,25 @@ function processRefReact (el, meta) {
     /**
      * selectorsConf: [type, [[prefix, selector], [prefix, selector]]]
      */
-    if (!val) {
-      const rawId = el.attrsMap.id
-      const rawClass = el.attrsMap.class
-      const rawDynamicClass = el.attrsMap[config[mode].directive.dynamicClass]
-
-      if (rawId) {
-        const staticId = parseMustacheWithContext(rawId).result
-        selectors.push({ prefix: '#', selector: `${staticId}` })
-      }
-      if (rawClass || rawDynamicClass) {
-        const staticClass = parseMustacheWithContext(rawClass).result
-        const dynamicClass = parseMustacheWithContext(rawDynamicClass).result
-        selectors.push({ prefix: '.', selector: `this.__getClass(${staticClass}, ${dynamicClass})` })
-      }
-    } else {
+    if (val) {
       meta.refs.push(refConf)
       selectors.push({ prefix: '', selector: `"${refConf.key}"` })
     }
+
+    const rawId = el.attrsMap.id
+    const rawClass = el.attrsMap.class
+    const rawDynamicClass = el.attrsMap[config[mode].directive.dynamicClass]
+
+    if (rawId) {
+      const staticId = parseMustacheWithContext(rawId).result
+      selectors.push({ prefix: '#', selector: `${staticId}` })
+    }
+    if (rawClass || rawDynamicClass) {
+      const staticClass = parseMustacheWithContext(rawClass).result
+      const dynamicClass = parseMustacheWithContext(rawDynamicClass).result
+      selectors.push({ prefix: '.', selector: `this.__getClass(${staticClass}, ${dynamicClass})` })
+    }
+
     const selectorsConf = selectors.map(item => `["${item.prefix}", ${item.selector}]`)
     const refFnId = forScopes.reduce((preV, curV) => {
       return `${preV} + "_" + ${curV.index}`
@@ -2080,13 +2112,24 @@ function postProcessIf (el) {
         replaceNode(el, getTempNode())._if = false
       }
     } else {
+      el._if = null
       attrs = [{
         name: config[mode].directive.if,
         value: el.if.raw
       }]
     }
   } else if (el.elseif) {
+    if (el.for) {
+      error$1(`wx:elif (wx:elif="${el.elseif.raw}") invalidly used on the for-list <"${el.tag}"> which has a wx:for directive, please create a block element to wrap the for-list and move the elif-directive to it`)
+      return
+    }
+
     prevNode = findPrevNode(el)
+    if (!prevNode || prevNode._if === undefined) {
+      error$1(`wx:elif="${el.elseif.raw}" used on element [${el.tag}] without corresponding wx:if or wx:elif.`)
+      return
+    }
+
     if (prevNode._if === true) {
       removeNode(el)
     } else if (prevNode._if === false) {
@@ -2106,6 +2149,7 @@ function postProcessIf (el) {
           removeNode(el)
         }
       } else {
+        el._if = null
         attrs = [{
           name: config[mode].directive.elseif,
           value: el.elseif.raw
@@ -2113,7 +2157,17 @@ function postProcessIf (el) {
       }
     }
   } else if (el.else) {
+    if (el.for) {
+      error$1(`wx:else invalidly used on the for-list <"${el.tag}"> which has a wx:for directive, please create a block element to wrap the for-list and move the else-directive to it`)
+      return
+    }
+
     prevNode = findPrevNode(el)
+    if (!prevNode || prevNode._if === undefined) {
+      error$1(`wx:else used on element [${el.tag}] without corresponding wx:if or wx:elif.`)
+      return
+    }
+
     if (prevNode._if === true) {
       removeNode(el)
     } else if (prevNode._if === false) {
@@ -2137,23 +2191,100 @@ function addIfCondition (el, condition) {
   el.ifConditions.push(condition)
 }
 
+function getIfConditions (el) {
+  return el?.ifConditions || []
+}
+
 function postProcessIfReact (el) {
-  let prevNode
+  let prevNode, ifNode, result, ifConditions
   if (el.if) {
-    addIfCondition(el, {
-      exp: el.if.exp,
-      block: el
-    })
-  } else if (el.elseif || el.else) {
-    prevNode = findPrevNode(el)
-    if (prevNode && prevNode.if) {
-      addIfCondition(prevNode, {
-        exp: el.elseif && el.elseif.exp,
+    // 取值
+    // false -> 节点变为temp-node，并添加_if=false
+    // true -> 添加_if=true，移除if
+    // dynamic -> addIfCondition
+    result = evalExp(el.if.exp)
+    if (result.success) {
+      if (result.result) {
+        el._if = true
+        delete el.if
+      } else {
+        replaceNode(el, getTempNode())._if = false
+      }
+    } else {
+      el._if = null
+      addIfCondition(el, {
+        exp: el.if.exp,
         block: el
       })
-      removeNode(el, true)
+    }
+  } else if (el.elseif) {
+    if (el.for) {
+      error$1(`wx:elif (wx:elif="${el.elseif.raw}") invalidly used on the for-list <"${el.tag}"> which has a wx:for directive, please create a block element to wrap the for-list and move the elif-directive to it`)
+      return
+    }
+
+    ifNode = findPrevNode(el)
+    ifConditions = getIfConditions(ifNode)
+    prevNode = ifConditions.length > 0 ? ifConditions[ifConditions.length - 1].block : ifNode
+
+    if (!prevNode || prevNode._if === undefined) {
+      error$1(`wx:elif="${el.elseif.raw}" used on element [${el.tag}] without corresponding wx:if or wx:elif.`)
+      return
+    }
+
+    if (prevNode._if === true) {
+      removeNode(el)
+    } else if (prevNode._if === false) {
+      el.if = el.elseif
+      delete el.elseif
+      postProcessIfReact(el)
     } else {
-      warn$1(`wx:${el.elseif ? `elif="${el.elseif.raw}"` : 'else'} used on element [${el.tag}] without corresponding wx:if.`)
+      result = evalExp(el.elseif.exp)
+      if (result.success) {
+        if (result.result) {
+          delete el.elseif
+          el._if = true
+          addIfCondition(ifNode, {
+            exp: el.elseif.exp,
+            block: el
+          })
+          removeNode(el, true)
+        } else {
+          removeNode(el)
+        }
+      } else {
+        el._if = null
+        addIfCondition(ifNode, {
+          exp: el.elseif.exp,
+          block: el
+        })
+        removeNode(el, true)
+      }
+    }
+  } else if (el.else) {
+    if (el.for) {
+      error$1(`wx:else invalidly used on the for-list <"${el.tag}"> which has a wx:for directive, please create a block element to wrap the for-list and move the else-directive to it`)
+      return
+    }
+
+    ifNode = findPrevNode(el)
+    ifConditions = getIfConditions(ifNode)
+    prevNode = ifConditions.length > 0 ? ifConditions[ifConditions.length - 1].block : ifNode
+
+    if (!prevNode || prevNode._if === undefined) {
+      error$1(`wx:else used on element [${el.tag}] without corresponding wx:if or wx:elif.`)
+      return
+    }
+
+    if (prevNode._if === true) {
+      removeNode(el)
+    } else if (prevNode._if === false) {
+      delete el.else
+    } else {
+      addIfCondition(ifNode, {
+        block: el
+      })
+      removeNode(el, true)
     }
   }
 }
@@ -2520,6 +2651,16 @@ function getVirtualHostRoot (options, meta) {
     if (isWeb(mode) && ctorType === 'page') {
       return createASTElement('page')
     }
+    if (isReact(mode) && ctorType === 'page') {
+      const rootView = createASTElement('view', [
+        {
+          name: 'class',
+          value: MPX_TAG_PAGE_SELECTOR
+        }
+      ])
+      processElement(rootView, rootView, options, meta)
+      return rootView
+    }
   }
   return getTempNode()
 }
@@ -2577,7 +2718,7 @@ function postProcessTemplate (el) {
   }
 }
 
-const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,ios,android,harmony,noMode')
+const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,ios,android,harmony,ks,noMode')
 
 function isValidModeP (i) {
   return isValidMode(i[0] === '_' ? i.slice(1) : i)
@@ -2713,6 +2854,78 @@ function processNoTransAttrs (el) {
   }
 }
 
+function initCrossPlatformConfig () {
+  // 定义平台与前缀的双向映射关系
+  const platformPrefixMap = {
+    wx: 'wx:',
+    ali: 'a:',
+    swan: 's-',
+    qq: 'qq:',
+    tt: 'tt:',
+    dd: 'dd:',
+    jd: 'jd:',
+    qa: 'qa:',
+    web: 'v-'
+  }
+
+  if (isNoMode(mode)) {
+    return null
+  }
+
+  return {
+    currentPrefix: platformPrefixMap[mode] || 'wx:',
+    platformPrefixMap
+  }
+}
+
+// 检测跨平台语法使用情况并给出警告
+function processCrossPlatformSyntaxWarning (el) {
+  // 使用转换后的属性列表进行检查
+  if (!el.attrsList || el.attrsList.length === 0) {
+    return
+  }
+
+  // 如果配置为空，说明不需要检测
+  if (!crossPlatformConfig) {
+    return
+  }
+
+  const { currentPrefix, platformPrefixMap } = crossPlatformConfig
+
+  // 检查转换后的属性列表
+  el.attrsList.forEach(attr => {
+    const attrName = attr.name
+
+    // 检查是否使用了平台前缀
+    for (const [platformName, prefix] of Object.entries(platformPrefixMap)) {
+      if (attrName.startsWith(prefix)) {
+        if (isReact(mode)) {
+          // React Native 平台：只允许使用 wx: 前缀，其他前缀报错
+          if (prefix !== 'wx:') {
+            error$1(
+              `React Native mode "${mode}" does not support "${prefix}" prefix. ` +
+              `Use "wx:" prefix instead. Found: "${attrName}"`
+            )
+          }
+        } else {
+          // 小程序平台：检测跨平台语法使用
+          if (platformName !== mode) {
+            // 构建建议的正确属性名
+            const suffixPart = attrName.substring(prefix.length)
+            const suggestedAttr = currentPrefix + suffixPart
+
+            warn$1(
+              `Your target mode is "${mode}", but used "${attrName}". ` +
+              `Did you mean "${suggestedAttr}"?`
+            )
+          }
+        }
+        break
+      }
+    }
+  })
+}
+
 function processMpxTagName (el) {
   const mpxTagName = getAndRemoveAttr(el, 'mpxTagName').val
   if (mpxTagName) {
@@ -2742,6 +2955,9 @@ function processElement (el, root, options, meta) {
 
   processDuplicateAttrsList(el)
 
+  // 检测跨平台语法使用情况并给出警告
+  processCrossPlatformSyntaxWarning(el)
+
   processInjectWxs(el, meta, options)
 
   const transAli = mode === 'ali' && srcMode === 'wx'
@@ -2886,7 +3102,7 @@ function cloneAttrsList (attrsList) {
 }
 
 function postProcessComponentIs (el, postProcessChild) {
-  if (el.is && el.components) {
+  if (el.is && el.componentMap && el.componentMap.size > 0) {
     let tempNode
     if (el.for || el.if || el.elseif || el.else) {
       tempNode = createASTElement('block')
@@ -2896,11 +3112,12 @@ function postProcessComponentIs (el, postProcessChild) {
     replaceNode(el, tempNode, true)
     postMoveBaseDirective(tempNode, el)
 
-    el.components.forEach(function (component) {
-      const newChild = createASTElement(component, cloneAttrsList(el.attrsList), tempNode)
+    // Map<CurrentName, SourceName>
+    el.componentMap.forEach((source, name) => {
+      const newChild = createASTElement(name, cloneAttrsList(el.attrsList), tempNode)
       newChild.if = {
-        raw: `{{${el.is} === ${stringify(component)}}}`,
-        exp: `${el.is} === ${stringify(component)}`
+        raw: `{{${el.is} === ${stringify(source)}}}`,
+        exp: `${el.is} === ${stringify(source)}`
       }
       el.children.forEach((child) => {
         addChild(newChild, cloneNode(child))
@@ -3025,30 +3242,12 @@ function genIf (node) {
 
 function genElseif (node) {
   node.elseifProcessed = true
-  if (node.for) {
-    error$1(`wx:elif (wx:elif="${node.elseif.raw}") invalidly used on the for-list <"${node.tag}"> which has a wx:for directive, please create a block element to wrap the for-list and move the if-directive to it`)
-    return
-  }
-  const preNode = findPrevNode(node)
-  if (preNode && (preNode.if || preNode.elseif)) {
-    return `else if(${node.elseif.exp}){\n${genNode(node)}}\n`
-  } else {
-    error$1(`wx:elif (wx:elif="${node.elseif.raw}") invalidly used on the element <"${node.tag}"> without corresponding wx:if or wx:elif.`)
-  }
+  return `else if(${node.elseif.exp}){\n${genNode(node)}}\n`
 }
 
 function genElse (node) {
   node.elseProcessed = true
-  if (node.for) {
-    error$1(`wx:else invalidly used on the for-list <"${node.tag}"> which has a wx:for directive, please create a block element to wrap the for-list and move the if-directive to it`)
-    return
-  }
-  const preNode = findPrevNode(node)
-  if (preNode && (preNode.if || preNode.elseif)) {
-    return `else{\n${genNode(node)}}\n`
-  } else {
-    error$1(`wx:else invalidly used on the element <"${node.tag}"> without corresponding wx:if or wx:elif.`)
-  }
+  return `else{\n${genNode(node)}}\n`
 }
 
 function genExps (node) {
@@ -3061,7 +3260,7 @@ function genFor (node) {
   node.forProcessed = true
   const index = node.for.index || 'index'
   const item = node.for.item || 'item'
-  return `_i(${node.for.exp}, function(${item},${index}){\n${genNode(node)}});\n`
+  return `mpx_i(${node.for.exp}, function(${item},${index}){\n${genNode(node)}});\n`
 }
 
 function genNode (node) {
@@ -3259,5 +3458,6 @@ module.exports = {
   findPrevNode,
   removeNode,
   replaceNode,
-  createASTElement
+  createASTElement,
+  evalExp
 }

package/lib/template-compiler/gen-node-react.js

@@ -9,7 +9,8 @@ function genIfConditions (conditions) {
   if (!conditions.length) return 'null'
   const condition = conditions.shift()
   if (condition.exp) {
-    return `(${condition.exp})?${genNode(condition.block)}:${genIfConditions(conditions)}`
+    // 此处 condition.exp 无需括号包裹，condition.exp本身已经包含括号
+    return `${condition.exp}?${genNode(condition.block)}:${genIfConditions(conditions)}`
   } else {
     return genNode(condition.block)
   }
@@ -30,7 +31,7 @@ function mapAttrName (name) {
   return name
 }
 
-function genNode (node) {
+function genNode (node, isRoot = false) {
   let exp = ''
   if (node) {
     if (node.type === 3) {
@@ -72,18 +73,29 @@ function genNode (node) {
             }
 
             if (!node.unary && node.children.length) {
-              exp += ','
-              exp += node.children.map((child) => {
+              const childNode = node.children.map((child) => {
                 return genNode(child)
               }).filter(fragment => fragment).join(',')
+
+              // child可能为temp-node等无效节点，所以增加判断确保存在childNode再添加逗号
+              if (childNode) {
+                exp += ','
+                exp += childNode
+              }
             }
             exp += ')'
           }
         }
       } else {
-        exp += node.children.map((child) => {
+        const nodes = node.children.map((child) => {
           return genNode(child)
-        }).filter(fragment => fragment).join(',')
+        }).filter(fragment => fragment && fragment !== 'null')
+        if (isRoot && nodes.length > 1) {
+          // 如果存在多个根节点，使用 block 包裹
+          exp = `createElement(getComponent("block"), null, ${nodes.join(',')})`
+        } else {
+          exp += nodes.join(',')
+        }
       }
     }
   }

package/lib/template-compiler/index.js

@@ -24,14 +24,15 @@ module.exports = function (raw) {
   const packageName = queryObj.packageRoot || mpx.currentPackageRoot || 'main'
   const wxsContentMap = mpx.wxsContentMap
   const optimizeRenderRules = mpx.optimizeRenderRules
-  const usingComponentsInfo = queryObj.usingComponentsInfo || {}
+  const usingComponentsInfo = queryObj.usingComponentsInfo ? JSON.parse(queryObj.usingComponentsInfo) : {}
+  const originalUsingComponents = queryObj.originalUsingComponents ? JSON.parse(queryObj.originalUsingComponents) : []
   const componentPlaceholder = queryObj.componentPlaceholder || []
   const hasComment = queryObj.hasComment
   const isNative = queryObj.isNative
   const ctorType = queryObj.ctorType
   const hasScoped = queryObj.hasScoped
   const runtimeCompile = queryObj.isDynamic
-  const moduleId = queryObj.moduleId || mpx.getModuleId(resourcePath)
+  const moduleId = queryObj.moduleId || mpx.getModuleId(resourcePath, false, queryObj.moduleId ? null : this)
 
   let optimizeRenderLevel = 0
   for (const rule of optimizeRenderRules) {
@@ -43,13 +44,13 @@ module.exports = function (raw) {
 
   const warn = (msg) => {
     this.emitWarning(
-      new Error('[template compiler][' + this.resource + ']: ' + msg)
+      new Error('[Mpx template warning][' + this.resource + ']: ' + msg)
     )
   }
 
   const error = (msg) => {
     this.emitError(
-      new Error('[template compiler][' + this.resource + ']: ' + msg)
+      new Error('[Mpx template error][' + this.resource + ']: ' + msg)
     )
   }
 
@@ -70,6 +71,7 @@ module.exports = function (raw) {
     hasScoped,
     moduleId,
     usingComponentsInfo,
+    originalUsingComponents,
     // 这里需传递rawResourcePath和wxsContentMap保持一致
     filePath: rawResourcePath,
     i18n,
@@ -110,10 +112,10 @@ module.exports = function (raw) {
   if (rawCode) {
     try {
       const ignoreMap = Object.assign({
-        _i: true,
-        _c: true,
-        _sc: true,
-        _r: true
+        mpx_i: true,
+        mpx_c: true,
+        mpx_sc: true,
+        mpx_r: true
       }, meta.wxsModuleMap)
       const bindResult = optimizeRenderLevel === 2
         ? bindThis.transformSimple(rawCode, {
@@ -124,9 +126,9 @@ module.exports = function (raw) {
           renderReduce: optimizeRenderLevel === 1,
           ignoreMap
         })
-      resultSource += `global.currentInject.render = function (_i, _c, _r, _sc) {
+      resultSource += `global.currentInject.render = function (mpx_i, mpx_c, mpx_r, mpx_sc) {
 ${bindResult.code}
-_r(${optimizeRenderLevel === 2 ? 'true' : ''});
+mpx_r(${optimizeRenderLevel === 2 ? 'true' : ''});
 };\n`
       if ((mode === 'tt' || mode === 'swan') && bindResult.propKeys) {
         resultSource += `global.currentInject.propKeys = ${JSON.stringify(bindResult.propKeys)};\n`