Encode enclosing line/column numbers in ReactCallSite

If we don't have the ability to get enclosing line/column we encode it as
zero. This will point to the beginning of the file which is likely to cause
a miss in source mapping to an identifier which is better since it falls
back to getting the name of the function in that case instead.

Author: sebmarkbage

packages/react-client/src/ReactFlightReplyClient.js

@@ -1279,16 +1279,16 @@ export function createBoundServerReference<A: Iterable<any>, T>(
     const location = metaData.location;
     if (location) {
       const functionName = metaData.name || '';
-      const [, filename, line, col] = location;
+      const [, filename, , , enclosingLine, enclosingCol] = location;
       const env = metaData.env || 'Server';
       const sourceMap =
         findSourceMapURL == null ? null : findSourceMapURL(filename, env);
       action = createFakeServerFunction(
         functionName,
         filename,
         sourceMap,
-        line,
-        col,
+        enclosingLine,
+        enclosingCol,
         env,
         action,
       );
@@ -1350,10 +1350,11 @@ function parseStackLocation(error: Error): null | ReactCallSite {
   if (filename === '<anonymous>') {
     filename = '';
   }
+  // This is really the enclosingLine/Column.
   const line = +(parsed[3] || parsed[6]);
   const col = +(parsed[4] || parsed[7]);
 
-  return [name, filename, line, col];
+  return [name, filename, line, col, line, col];
 }
 
 export function createServerReference<A: Iterable<any>, T>(
@@ -1374,7 +1375,7 @@ export function createServerReference<A: Iterable<any>, T>(
     // multiple passes of compilation as long as we can find the final source map.
     const location = parseStackLocation(new Error('react-stack-top-frame'));
     if (location !== null) {
-      const [, filename, line, col] = location;
+      const [, filename, , , line, col] = location;
       // While the environment that the Server Reference points to can be
       // in any environment, what matters here is where the compiled source
       // is from and that's in the currently executing environment. We hard

packages/react-server/src/ReactFlightStackConfigV8.js

@@ -63,7 +63,7 @@ function collectStackTrace(
       // Skip everything after the bottom frame since it'll be internals.
       break;
     } else if (callSite.isNative()) {
-      result.push([name, '', 0, 0]);
+      result.push([name, '', 0, 0, 0, 0]);
     } else {
       // We encode complex function calls as if they're part of the function
       // name since we cannot simulate the complex ones and they look the same
@@ -88,7 +88,17 @@ function collectStackTrace(
       }
       const line = callSite.getLineNumber() || 0;
       const col = callSite.getColumnNumber() || 0;
-      result.push([name, filename, line, col]);
+      const enclosingLine: number =
+        // $FlowFixMe[prop-missing]
+        typeof callSite.getEnclosingLineNumber === 'function'
+          ? (callSite: any).getEnclosingLineNumber() || 0
+          : 0;
+      const enclosingCol: number =
+        // $FlowFixMe[prop-missing]
+        typeof callSite.getEnclosingColumnNumber === 'function'
+          ? (callSite: any).getEnclosingColumnNumber() || 0
+          : 0;
+      result.push([name, filename, line, col, enclosingLine, enclosingCol]);
     }
   }
   // At the same time we generate a string stack trace just in case someone
@@ -179,7 +189,7 @@ export function parseStackTrace(
     }
     const line = +(parsed[3] || parsed[6]);
     const col = +(parsed[4] || parsed[7]);
-    parsedFrames.push([name, filename, line, col]);
+    parsedFrames.push([name, filename, line, col, 0, 0]);
   }
   return parsedFrames;
 }

packages/shared/ReactTypes.js

@@ -186,6 +186,8 @@ export type ReactCallSite = [
   string, // file name TODO: model nested eval locations as nested arrays
   number, // line number
   number, // column number
+  number, // enclosing line number
+  number, // enclosing column number
 ];
 
 export type ReactStackTrace = Array<ReactCallSite>;