fix(taroize): export default 和装饰器混用导致 babel 解析失败

NervJS · Dec 3, 2018 · 146e6c6 · 146e6c6
1 parent bff2b14
commit 146e6c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/taroize/src/script.ts b/packages/taroize/src/script.ts
@@ -81,7 +81,7 @@ export function parseScript (
         if (componentType !== 'App') {
           classDecl.decorators = [buildDecorator(componentType)]
         }
-        path.insertAfter(t.exportDefaultDeclaration(classDecl))
+        path.insertAfter(t.exportDefaultDeclaration(t.identifier(defaultClassName)))
         path.remove()
       }
     }

diff --git a/packages/taroize/src/utils.ts b/packages/taroize/src/utils.ts
@@ -28,7 +28,7 @@ export function buildRender (
   if (stateKeys.length) {
     const stateDecl = t.variableDeclaration('const', [
       t.variableDeclarator(
-        t.objectPattern(stateKeys.map(s =>
+        t.objectPattern(Array.from(new Set(stateKeys)).map(s =>
           t.objectProperty(t.identifier(s), t.identifier(s))
         ) as any),
         t.memberExpression(t.thisExpression(), t.identifier('state'))
@@ -38,7 +38,7 @@ export function buildRender (
   }
 
   if (propsKeys.length) {
-    let patterns = t.objectPattern(propsKeys.map(s =>
+    let patterns = t.objectPattern(Array.from(new Set(propsKeys)).map(s =>
       t.objectProperty(t.identifier(s), t.identifier(s))
     ) as any)
     if (typeof templateType === 'string') {

diff --git a/packages/taroize/src/wxml.ts b/packages/taroize/src/wxml.ts
@@ -309,7 +309,7 @@ function transformLoop (
   const attrs = jsx.get('openingElement').get('attributes').map(a => a.node)
   const wxForItem = attrs.find(a => a.name.name === WX_FOR_ITEM)
   const hasSinglewxForItem = wxForItem && wxForItem.value && t.isJSXExpressionContainer(wxForItem.value)
-  if (hasSinglewxForItem || name === WX_FOR) {
+  if (hasSinglewxForItem || name === WX_FOR || name === 'wx:for-items') {
     if (!value || !t.isJSXExpressionContainer(value)) {
       throw new Error('wx:for 的值必须使用 "{{}}"  包裹')
     }