metro-source-map 0.66.2 → 0.67.0

package/src/generateFunctionMap.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,41 +10,39 @@
 
 'use strict';
 
-const B64Builder = require('./B64Builder');
-
-const fsPath = require('path');
-const nullthrows = require('nullthrows');
-const t = require('@babel/types');
-
 import type {FBSourceFunctionMap} from './source-map';
-import traverse from '@babel/traverse';
 import type {NodePath} from '@babel/traverse';
+import type {Node} from '@babel/types';
+
+import traverse from '@babel/traverse';
 import {
-  isProgram,
+  isAssignmentExpression,
+  isClassBody,
+  isClassMethod,
+  isClassProperty,
+  isExportDefaultDeclaration,
   isIdentifier,
+  isImport,
+  isJSXAttribute,
+  isJSXElement,
+  isJSXExpressionContainer,
   isJSXIdentifier,
-  isCallExpression,
-  isNewExpression,
-  isTypeCastExpression,
-  isRegExpLiteral,
-  isTemplateLiteral,
   isLiteral,
+  isNullLiteral,
+  isObjectExpression,
   isObjectMethod,
-  isClassMethod,
   isObjectProperty,
-  isClassProperty,
+  isProgram,
+  isRegExpLiteral,
+  isTemplateLiteral,
+  isTypeCastExpression,
   isVariableDeclarator,
-  isAssignmentExpression,
-  isJSXExpressionContainer,
-  isJSXElement,
-  isJSXAttribute,
-  isNullLiteral,
-  isImport,
-  isClassBody,
-  isObjectExpression,
-  isExportDefaultDeclaration,
 } from '@babel/types';
-import type {Node} from '@babel/types';
+
+const B64Builder = require('./B64Builder');
+const t = require('@babel/types');
+const nullthrows = require('nullthrows');
+const fsPath = require('path');
 
 type Position = {
   line: number,
@@ -105,7 +103,7 @@ function forEachMapping(
   let tailPos = {line: 1, column: 0};
   let tailName = null;
 
-  function advanceToPos(pos) {
+  function advanceToPos(pos: {column: number, line: number}) {
     if (tailPos && positionGreater(pos, tailPos)) {
       const name = nameStack[0].name; // We always have at least Program
       if (name !== tailName) {
@@ -142,7 +140,12 @@ function forEachMapping(
     : null;
 
   const visitor = {
-    enter(path) {
+    enter(
+      path:
+        | NodePath<BabelNodeProgram>
+        | NodePath<BabelNodeFunction>
+        | NodePath<BabelNodeClass>,
+    ) {
       let name = getNameForPath(path);
       if (basename) {
         name = removeNamePrefix(name, basename);
@@ -151,7 +154,12 @@ function forEachMapping(
       pushFrame(name, nullthrows(path.node.loc));
     },
 
-    exit(path): void {
+    exit(
+      path:
+        | NodePath<BabelNodeProgram>
+        | NodePath<BabelNodeFunction>
+        | NodePath<BabelNodeClass>,
+    ): void {
       popFrame();
     },
   };
@@ -164,7 +172,6 @@ function forEachMapping(
 }
 
 const ANONYMOUS_NAME = '<anonymous>';
-const CALLEES_TO_SKIP = ['Object.freeze'];
 
 /**
  * Derive a contextual name for the given AST node (Function, Program, Class or
@@ -236,13 +243,20 @@ 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) {
         const calleeName = getNameFromId(parent.callee);
         // var f = Object.freeze(function () {})
-        if (CALLEES_TO_SKIP.indexOf(calleeName) !== -1) {
+        if (argIndex === 0 && calleeName === 'Object.freeze') {
+          return getNameForPath(nullthrows(parentPath));
+        }
+        // var f = useCallback(function () {})
+        if (
+          argIndex === 0 &&
+          (calleeName === 'useCallback' || calleeName === 'React.useCallback')
+        ) {
           return getNameForPath(nullthrows(parentPath));
         }
         if (calleeName) {
@@ -276,7 +290,6 @@ function getNameForPath(path: NodePath<>): string {
         name = className + separator + name;
       }
     } else if (isObjectExpression(propertyPath.parent)) {
-      // $FlowFixMe[incompatible-use]
       const objectName = getNameForPath(nullthrows(propertyPath.parentPath));
       if (objectName !== ANONYMOUS_NAME) {
         name = objectName + '.' + name;
@@ -287,9 +300,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'
   );
 }
 
@@ -322,7 +345,7 @@ function getNamePartsFromId(id: Node): $ReadOnlyArray<string> {
     return [];
   }
 
-  if (isCallExpression(id) || isNewExpression(id)) {
+  if (isAnyCallExpression(id)) {
     return getNamePartsFromId(id.callee);
   }
 
@@ -488,7 +511,12 @@ class RelativeValue {
   }
 }
 
-function positionGreater(x, y) {
+function positionGreater(
+  x: {column: number, line: number},
+  y:
+    | {column: number, line: number}
+    | $TEMPORARY$object<{column: number, line: number}>,
+) {
   return x.line > y.line || (x.line === y.line && x.column > y.column);
 }
 

package/src/source-map.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,20 +9,19 @@
  */
 "use strict";
 
-const Consumer = require("./Consumer");
+const { BundleBuilder, createIndexMap } = require("./BundleBuilder");
 
-const Generator = require("./Generator");
+const composeSourceMaps = require("./composeSourceMaps");
 
-const SourceMap = require("source-map");
+const Consumer = require("./Consumer"); // We need to export this for `metro-symbolicate`
 
-// We need to export this for `metro-symbolicate`
 const normalizeSourcePath = require("./Consumer/normalizeSourcePath");
 
-const composeSourceMaps = require("./composeSourceMaps");
+const { generateFunctionMap } = require("./generateFunctionMap");
 
-const { createIndexMap, BundleBuilder } = require("./BundleBuilder");
+const Generator = require("./Generator");
 
-const { generateFunctionMap } = require("./generateFunctionMap");
+const SourceMap = require("source-map");
 
 function fromRawMappingsImpl(isBlocking, onDone, modules, offsetLines) {
   const modulesToProcess = modules.slice();
@@ -91,7 +90,7 @@ function fromRawMappings(modules, offsetLines = 0) {
   let generator;
   fromRawMappingsImpl(
     true,
-    g => {
+    (g) => {
       generator = g;
     },
     modules,
@@ -106,7 +105,7 @@ function fromRawMappings(modules, offsetLines = 0) {
 }
 
 async function fromRawMappingsNonBlocking(modules, offsetLines = 0) {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     fromRawMappingsImpl(false, resolve, modules, offsetLines);
   });
 }
@@ -117,18 +116,18 @@ async function fromRawMappingsNonBlocking(modules, offsetLines = 0) {
 
 function toBabelSegments(sourceMap) {
   const rawMappings = [];
-  new SourceMap.SourceMapConsumer(sourceMap).eachMapping(map => {
+  new SourceMap.SourceMapConsumer(sourceMap).eachMapping((map) => {
     rawMappings.push({
       generated: {
         line: map.generatedLine,
-        column: map.generatedColumn
+        column: map.generatedColumn,
       },
       original: {
         line: map.originalLine,
-        column: map.originalColumn
+        column: map.originalColumn,
       },
       source: map.source,
-      name: map.name
+      name: map.name,
     });
   });
   return rawMappings;
@@ -184,9 +183,9 @@ function addMapping(generator, mapping, carryOver) {
   }
 }
 
-function countLines(string) {
-  return string.split("\n").length;
-}
+const newline = /\r\n?|\n|\u2028|\u2029/g;
+
+const countLines = (string) => (string.match(newline) || []).length + 1;
 
 module.exports = {
   BundleBuilder,
@@ -198,5 +197,5 @@ module.exports = {
   fromRawMappingsNonBlocking,
   normalizeSourcePath,
   toBabelSegments,
-  toSegmentTuple
+  toSegmentTuple,
 };

package/src/source-map.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,21 +10,19 @@
 
 'use strict';
 
-const Consumer = require('./Consumer');
-const Generator = require('./Generator');
-const SourceMap = require('source-map');
-
 import type {IConsumer} from './Consumer/types.flow';
-export type {IConsumer};
+import type {BabelSourceMapSegment} from '@babel/generator';
 
+const {BundleBuilder, createIndexMap} = require('./BundleBuilder');
+const composeSourceMaps = require('./composeSourceMaps');
+const Consumer = require('./Consumer');
 // We need to export this for `metro-symbolicate`
 const normalizeSourcePath = require('./Consumer/normalizeSourcePath');
-
-const composeSourceMaps = require('./composeSourceMaps');
-const {createIndexMap, BundleBuilder} = require('./BundleBuilder');
 const {generateFunctionMap} = require('./generateFunctionMap');
+const Generator = require('./Generator');
+const SourceMap = require('source-map');
 
-import type {BabelSourceMapSegment} from '@babel/generator';
+export type {IConsumer};
 
 type GeneratedCodeMapping = [number, number];
 type SourceMapping = [number, number, number, number];
@@ -241,7 +239,19 @@ function toSegmentTuple(
   return [line, column, original.line, original.column, name];
 }
 
-function addMappingsForFile(generator, mappings, module, carryOver) {
+function addMappingsForFile(
+  generator: Generator,
+  mappings: Array<MetroSourceMapSegmentTuple>,
+  module: {
+    +code: string,
+    +functionMap: ?FBSourceFunctionMap,
+    +map: ?Array<MetroSourceMapSegmentTuple>,
+    +path: string,
+    +source: string,
+    ...
+  },
+  carryOver: number,
+) {
   generator.startFile(module.path, module.source, module.functionMap);
 
   for (let i = 0, n = mappings.length; i < n; ++i) {
@@ -251,7 +261,11 @@ function addMappingsForFile(generator, mappings, module, carryOver) {
   generator.endFile();
 }
 
-function addMapping(generator, mapping, carryOver) {
+function addMapping(
+  generator: Generator,
+  mapping: MetroSourceMapSegmentTuple,
+  carryOver: number,
+) {
   const n = mapping.length;
   const line = mapping[0] + carryOver;
   // lines start at 1, columns start at 0
@@ -277,9 +291,10 @@ function addMapping(generator, mapping, carryOver) {
   }
 }
 
-function countLines(string) {
-  return string.split('\n').length;
-}
+const newline = /\r\n?|\n|\u2028|\u2029/g;
+
+const countLines = (string: string): number =>
+  (string.match(newline) || []).length + 1;
 
 module.exports = {
   BundleBuilder,