fix: support literal property names in object. fixes #170 (#172)

callstack · Nov 13, 2017 · 1ffce6b · 1ffce6b
1 parent 3a1ef42
commit 1ffce6b
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 2 deletions.
diff --git a/src/babel/preval-extract/__tests__/index.spec.js b/src/babel/preval-extract/__tests__/index.spec.js
@@ -231,7 +231,7 @@ describe('preval-extract/index', () => {
       expect(prevalStyles.mock.calls[0][1]).toBe('test');
     });
 
-    it('should prevalStyles with object property', () => {
+    it('should prevalStyles with object property with identifier', () => {
       const { visitor } = prevalExtractPlugin(babel);
 
       const parent = {
@@ -269,6 +269,82 @@ describe('preval-extract/index', () => {
       expect(prevalStyles.mock.calls[0][1]).toBe('foo');
     });
 
+    it('should prevalStyles with object property with string literal', () => {
+      const { visitor } = prevalExtractPlugin(babel);
+
+      const parent = {
+        type: 'ObjectProperty',
+        node: {
+          type: 'ObjectProperty',
+          key: {
+            type: 'StringLiteral',
+            value: 'foo',
+          },
+        },
+      };
+
+      visitor.TaggedTemplateExpression(
+        {
+          node: {
+            type: 'TaggedTemplateExpression',
+            tag: {
+              type: 'Identifier',
+              name: 'css',
+            },
+          },
+          traverse: () => {},
+          findParent: check => (check(parent) ? parent : null),
+          replaceWith: () => {},
+          addComment: () => {},
+        },
+        {
+          skipFile: false,
+          foundLinariaTaggedLiterals: false,
+        }
+      );
+
+      expect(prevalStyles).toHaveBeenCalled();
+      expect(prevalStyles.mock.calls[0][1]).toBe('foo');
+    });
+
+    it('should prevalStyles with object property with numeric literal', () => {
+      const { visitor } = prevalExtractPlugin(babel);
+
+      const parent = {
+        type: 'ObjectProperty',
+        node: {
+          type: 'ObjectProperty',
+          key: {
+            type: 'NumericLiteral',
+            value: 42,
+          },
+        },
+      };
+
+      visitor.TaggedTemplateExpression(
+        {
+          node: {
+            type: 'TaggedTemplateExpression',
+            tag: {
+              type: 'Identifier',
+              name: 'css',
+            },
+          },
+          traverse: () => {},
+          findParent: check => (check(parent) ? parent : null),
+          replaceWith: () => {},
+          addComment: () => {},
+        },
+        {
+          skipFile: false,
+          foundLinariaTaggedLiterals: false,
+        }
+      );
+
+      expect(prevalStyles).toHaveBeenCalled();
+      expect(prevalStyles.mock.calls[0][1]).toBe(42);
+    });
+
     it('should prevalStyles with JSX opening element', () => {
       const { visitor } = prevalExtractPlugin(babel);
 

diff --git a/src/babel/preval-extract/index.js b/src/babel/preval-extract/index.js
@@ -100,7 +100,7 @@ export default (babel: BabelCore) => {
 
           if (parent) {
             if (types.isObjectProperty(parent)) {
-              title = parent.node.key.name;
+              title = parent.node.key.name || parent.node.key.value;
             } else if (types.isJSXOpeningElement(parent)) {
               title = parent.node.name.name;
             } else if (types.isVariableDeclarator(parent)) {