Merge pull request #13 from fink-lang/latest-larix

feat(object): support calculated props

package.json

@@ -37,8 +37,8 @@
   "devDependencies": {
     "@babel/cli": "^7.2.3",
     "@babel/plugin-proposal-pipeline-operator": "^7.3.2",
-    "@babel/preset-env": "^7.3.4",
-    "@fink/larix": "^4.0.0",
+    "@babel/preset-env": "^7.8.6",
+    "@fink/larix": "^4.1.0",
     "@nearmap/eslint-config-base": "^1.1.0",
     "babel-eslint": "^10.1.0",
     "commitizen": "^4.0.3",
@@ -51,8 +51,8 @@
     "semantic-release": "^17.0.4"
   },
   "dependencies": {
-    "@babel/generator": "^7.8.4",
-    "@babel/traverse": "^7.8.4",
-    "@babel/types": "^7.8.3"
+    "@babel/generator": "^7.8.6",
+    "@babel/traverse": "^7.8.6",
+    "@babel/types": "^7.8.6"
   }
 }

src/index.js

@@ -87,7 +87,8 @@ const binary_ops = {
 
   '.': transform_member,
 
-  call: transform_call
+  call: transform_call,
+  infix: transform_inifx
 };
 
 const block_like = {
@@ -119,8 +120,7 @@ const transformers = {
   ...block_like,
   ...control_flow,
   ...iterables,
-  ...jsx,
-  infix: transform_inifx
+  ...jsx
 };
 
 

src/transform/__snapshots__/object.test.js.snap

@@ -1,5 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`calculated props 1`] = `
+"const foo = {
+  \\"foo\\": foo,
+  [Symbol(\`foo\`)]: 123,
+  [\`spam\`]: 456,
+  \\"ni\\": ni
+};
+Object.assign(module.exports, {
+  foo
+});"
+`;
+
 exports[`destructuring object 1`] = `
 "const {
   \\"a\\": a,

src/transform/object.js

@@ -14,24 +14,25 @@ const str_key = ({value, loc})=> (
 );
 
 
+const get_key = ({key}, ctx)=> {
+  if (key.type === 'group' || key.type === 'string') {
+    return [ctx.transform(key), true];
+  }
+
+  return [str_key(key), false];
+};
+
+
 export const transform_prop = (node, ctx)=> {
   if (node.key.type === 'spread') {
     return ctx.transform(node.key);
   }
 
-  const is_str_key = node.key.type === 'string';
-  const is_default_assignment = node.value.type === 'assign';
-
-  const key = (
-    is_str_key
-      ? ctx.transform(node.key)
-      : str_key(node.key)
-  );
-
+  const [key, computed] = get_key(node, ctx);
   const value = ctx.transform(node.value);
 
-  const computed = is_str_key;
   const shorthand = (node.key === node.value);
+  const is_default_assignment = node.value.type === 'assign';
 
   return objectProperty(
     key,