[Breaking] add ChainExpression; CallExpression now includes arguments

Author: ljharb

__tests__/src/getPropValue-babelparser-test.js

@@ -526,7 +526,7 @@ describe('getPropValue', () => {
     it('should return string representation of callee', () => {
       const prop = extractProp('<div foo={bar()} />');
 
-      const expected = 'bar';
+      const expected = 'bar()';
       const actual = getPropValue(prop);
 
       assert.equal(actual, expected);
@@ -535,7 +535,7 @@ describe('getPropValue', () => {
     it('should return string representation of callee', () => {
       const prop = extractProp('<div foo={bar.call()} />');
 
-      const expected = 'bar.call';
+      const expected = 'bar.call()';
       const actual = getPropValue(prop);
 
       assert.equal(actual, expected);

__tests__/src/getPropValue-flowparser-test.js

@@ -390,7 +390,7 @@ describe('getPropValue', () => {
     it('should return string representation of callee', () => {
       const prop = extractProp('<div foo={bar()} />');
 
-      const expected = 'bar';
+      const expected = 'bar()';
       const actual = getPropValue(prop);
 
       assert.equal(actual, expected);
@@ -399,7 +399,7 @@ describe('getPropValue', () => {
     it('should return string representation of callee', () => {
       const prop = extractProp('<div foo={bar.call()} />');
 
-      const expected = 'bar.call';
+      const expected = 'bar.call()';
       const actual = getPropValue(prop);
 
       assert.equal(actual, expected);

src/values/expressions/CallExpression.js

@@ -10,5 +10,6 @@
 export default function extractValueFromCallExpression(value) {
   // eslint-disable-next-line global-require
   const getValue = require('./index.js').default;
-  return getValue(value.callee);
+  const args = Array.isArray(value.arguments) ? value.arguments.map((x) => getValue(x)).join(', ') : '';
+  return `${getValue(value.callee)}${value.optional ? '?.' : ''}(${args})`;
 }

src/values/expressions/ChainExpression.js

@@ -0,0 +1,13 @@
+/**
+ * Extractor function for a ChainExpression type value node.
+ * A member expression is accessing a property on an object `obj.property`.
+ *
+ * @param - value - AST Value object with type `ChainExpression`
+ * @returns - The extracted value converted to correct type
+ *  and maintaing `obj?.property` convention.
+ */
+export default function extractValueFromChainExpression(value) {
+  // eslint-disable-next-line global-require
+  const getValue = require('./index.js').default;
+  return getValue(value.expression);
+}

src/values/expressions/MemberExpression.js

@@ -9,5 +9,5 @@
 export default function extractValueFromMemberExpression(value) {
   // eslint-disable-next-line global-require
   const getValue = require('./index.js').default;
-  return `${getValue(value.object)}.${getValue(value.property)}`;
+  return `${getValue(value.object)}${value.optional ? '?.' : '.'}${getValue(value.property)}`;
 }

src/values/expressions/index.js

@@ -6,6 +6,7 @@ import TemplateLiteral from './TemplateLiteral';
 import FunctionExpression from './FunctionExpression';
 import LogicalExpression from './LogicalExpression';
 import MemberExpression from './MemberExpression';
+import ChainExpression from './ChainExpression';
 import OptionalCallExpression from './OptionalCallExpression';
 import OptionalMemberExpression from './OptionalMemberExpression';
 import CallExpression from './CallExpression';
@@ -32,6 +33,7 @@ const TYPES = {
   FunctionExpression,
   LogicalExpression,
   MemberExpression,
+  ChainExpression,
   OptionalCallExpression,
   OptionalMemberExpression,
   CallExpression,