Infer names for anonymous functions in optional calls

Summary: TSIA

Reviewed By: rh389

Differential Revision: D33427901

fbshipit-source-id: 42ba28c32f94cf3bf145a97877b148508ce72c69

Author: motiz88

packages/metro-source-map/src/__tests__/generateFunctionMap-test.js

@@ -893,6 +893,52 @@ function parent2() {
     `);
   });
 
+  it('callback of optional method', () => {
+    const ast = getAst(`
+      object?.method(() => {}, [])
+    `);
+
+    expect(generateCompactRawMappings(ast)).toMatchInlineSnapshot(`
+      "
+      <global> from 1:0
+      object.method$argument_0 from 2:21
+      <global> from 2:29
+      "
+    `);
+    expect(generateFunctionMap(ast)).toMatchInlineSnapshot(`
+      Object {
+        "mappings": "AAA;qBCC,QD",
+        "names": Array [
+          "<global>",
+          "object.method$argument_0",
+        ],
+      }
+    `);
+  });
+
+  it('optional call', () => {
+    const ast = getAst(`
+      func?.(() => {}, [])
+    `);
+
+    expect(generateCompactRawMappings(ast)).toMatchInlineSnapshot(`
+      "
+      <global> from 1:0
+      func$argument_0 from 2:13
+      <global> from 2:21
+      "
+    `);
+    expect(generateFunctionMap(ast)).toMatchInlineSnapshot(`
+      Object {
+        "mappings": "AAA;aCC,QD",
+        "names": Array [
+          "<global>",
+          "func$argument_0",
+        ],
+      }
+    `);
+  });
+
   it('JSX prop', () => {
     const ast = getAst(`
       <Button onClick={() => {}} />

packages/metro-source-map/src/generateFunctionMap.js

@@ -17,7 +17,6 @@ import type {Node} from '@babel/types';
 import traverse from '@babel/traverse';
 import {
   isAssignmentExpression,
-  isCallExpression,
   isClassBody,
   isClassMethod,
   isClassProperty,
@@ -29,7 +28,6 @@ import {
   isJSXExpressionContainer,
   isJSXIdentifier,
   isLiteral,
-  isNewExpression,
   isNullLiteral,
   isObjectExpression,
   isObjectMethod,
@@ -246,7 +244,7 @@ function getNameForPath(path: NodePath<>): string {
 
   if (name == null) {
     // We couldn't find a name directly. Try the parent in certain cases.
-    if (isCallExpression(parent) || isNewExpression(parent)) {
+    if (isAnyCallExpression(parent)) {
       // foo(function () {})
       const argIndex = parent.arguments.indexOf(node);
       if (argIndex !== -1) {
@@ -296,9 +294,19 @@ function getNameForPath(path: NodePath<>): string {
   return name;
 }
 
+function isAnyCallExpression(node: Node): boolean %checks {
+  return (
+    node.type === 'CallExpression' ||
+    node.type === 'NewExpression' ||
+    node.type === 'OptionalCallExpression'
+  );
+}
+
 function isAnyMemberExpression(node: Node): boolean %checks {
   return (
-    node.type === 'MemberExpression' || node.type === 'JSXMemberExpression'
+    node.type === 'MemberExpression' ||
+    node.type === 'JSXMemberExpression' ||
+    node.type === 'OptionalMemberExpression'
   );
 }
 
@@ -331,7 +339,7 @@ function getNamePartsFromId(id: Node): $ReadOnlyArray<string> {
     return [];
   }
 
-  if (isCallExpression(id) || isNewExpression(id)) {
+  if (isAnyCallExpression(id)) {
     return getNamePartsFromId(id.callee);
   }