fix(transformer): objectExpression property key'type (#3932)

NervJS · Jul 25, 2019 · c6f587c · c6f587c
1 parent 2d3bd05
commit c6f587c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/packages/taro-transformer-wx/__tests__/template.spec.ts b/packages/taro-transformer-wx/__tests__/template.spec.ts
@@ -916,4 +916,45 @@ describe('字符不转义', () => {
       expect(inst.state.anonymousState__temp).toEqual('')
     })
   })
+
+  describe("ObjectExpression property key", () => {
+    test("StringLiteral", () => {
+      const { template, ast, code } = transform({
+        ...baseOptions,
+        isRoot: true,
+        code: buildComponent(`
+          return {
+              'weapp': (
+                  <View>weapp</View>
+              ),
+              'h5': (
+                  <View>h5</View>
+              )
+          }[process.env.TARO_ENV]
+        `)
+      })
+
+      const inst = evalClass(ast, "", true);
+      expect(template).toMatch(`'weapp' === 'weapp'`);
+    })
+    test("Identifier", () => {
+      const { template, ast, code } = transform({
+        ...baseOptions,
+        isRoot: true,
+        code: buildComponent(`
+          return {
+              weapp: (
+                  <View>weapp</View>
+              ),
+              h5: (
+                  <View>h5</View>
+              )
+          }[process.env.TARO_ENV]
+        `)
+      })
+
+      const inst = evalClass(ast, "", true);
+      expect(template).toMatch(`'weapp' === 'weapp'`);
+    })
+  })
 })
diff --git a/packages/taro-transformer-wx/src/render.ts b/packages/taro-transformer-wx/src/render.ts
@@ -221,7 +221,8 @@ export class RenderParser {
       }
       const children = properties.map(p => p.node).map((p, index) => {
         const block = buildBlockElement()
-        const tester = t.binaryExpression('===', p.key, rval.node as any)
+        const leftExpression = t.isStringLiteral(p.key) ? p.key : t.stringLiteral(p.key.name)
+        const tester = t.binaryExpression('===', leftExpression, rval.node as any)
         block.children = [t.jSXExpressionContainer(p.value)]
         if (index === 0) {
           newJSXIfAttr(block, tester)