metro-source-map 0.54.0 → 0.54.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.54.0",
+  "version": "0.54.1",
   "name": "metro-source-map",
   "description": "🚇 Source map generator for Metro.",
   "main": "src/source-map.js",
@@ -19,6 +19,6 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/parser": "^7.0.0",
-    "metro-symbolicate": "0.54.0"
+    "metro-symbolicate": "0.54.1"
   }
 }

package/src/Generator.js

@@ -226,6 +226,9 @@ class IndexedSet {
   }
 
   items() {
+    /* $FlowFixMe(>=0.98.0 site=react_native_fb) This comment suppresses an
+     * error found when Flow v0.98 was deployed. To see the error delete this
+     * comment and run Flow. */
     return Array.from(this.map.keys());
   }
 }

package/src/Generator.js.flow

@@ -212,6 +212,9 @@ class IndexedSet {
   }
 
   items() {
+    /* $FlowFixMe(>=0.98.0 site=react_native_fb) This comment suppresses an
+     * error found when Flow v0.98 was deployed. To see the error delete this
+     * comment and run Flow. */
     return Array.from(this.map.keys());
   }
 }

package/src/generateFunctionMap.js

@@ -16,8 +16,77 @@ function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
 
+function _slicedToArray(arr, i) {
+  return (
+    _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest()
+  );
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance");
+}
+
+function _iterableToArrayLimit(arr, i) {
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _e = undefined;
+  try {
+    for (
+      var _i = arr[Symbol.iterator](), _s;
+      !(_n = (_s = _i.next()).done);
+      _n = true
+    ) {
+      _arr.push(_s.value);
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+  return _arr;
+}
+
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _toConsumableArray(arr) {
+  return (
+    _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread()
+  );
+}
+
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance");
+}
+
+function _iterableToArray(iter) {
+  if (
+    Symbol.iterator in Object(iter) ||
+    Object.prototype.toString.call(iter) === "[object Arguments]"
+  )
+    return Array.from(iter);
+}
+
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) {
+    for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++)
+      arr2[i] = arr[i];
+    return arr2;
+  }
+}
+
 const B64Builder = require("./B64Builder");
 
+const fsPath = require("path");
+
 const t = require("@babel/types");
 
 /**
@@ -28,9 +97,9 @@ const t = require("@babel/types");
  * The output is encoded for use in a source map. For details about the format,
  * see MappingEncoder below.
  */
-function generateFunctionMap(ast) {
+function generateFunctionMap(ast, context) {
   const encoder = new MappingEncoder();
-  forEachMapping(ast, mapping => encoder.push(mapping));
+  forEachMapping(ast, context, mapping => encoder.push(mapping));
   return encoder.getResult();
 }
 /**
@@ -40,9 +109,9 @@ function generateFunctionMap(ast) {
  * Lines are 1-based and columns are 0-based.
  */
 
-function generateFunctionMappingsArray(ast) {
+function generateFunctionMappingsArray(ast, context) {
   const mappings = [];
-  forEachMapping(ast, mapping => {
+  forEachMapping(ast, context, mapping => {
     mappings.push(mapping);
   });
   return mappings;
@@ -52,7 +121,7 @@ function generateFunctionMappingsArray(ast) {
  * mappings, one at a time.
  */
 
-function forEachMapping(ast, pushMapping) {
+function forEachMapping(ast, context, pushMapping) {
   const nameStack = [];
   let tailPos = {
     line: 1,
@@ -97,10 +166,23 @@ function forEachMapping(ast, pushMapping) {
     }
   }
 
+  if (!context) {
+    context = {};
+  }
+
+  const basename = context.filename
+    ? fsPath.basename(context.filename).replace(/\..+$/, "")
+    : null;
   (0, _traverse.default)(ast, {
     "Function|Program": {
       enter(path) {
-        pushFrame(getNameForPath(path), path.node.loc);
+        let name = getNameForPath(path);
+
+        if (basename) {
+          name = removeNamePrefix(name, basename);
+        }
+
+        pushFrame(name, path.node.loc);
       },
 
       exit(path) {
@@ -111,6 +193,7 @@ function forEachMapping(ast, pushMapping) {
 }
 
 const ANONYMOUS_NAME = "<anonymous>";
+const CALLEES_TO_SKIP = ["Object.freeze"];
 /**
  * Derive a contextual name for the given AST node (Function, Program, Class or
  * ObjectExpression).
@@ -137,7 +220,7 @@ function getNameForPath(path) {
   if (t.isObjectMethod(node) || t.isClassMethod(node)) {
     id = node.key;
 
-    if (node.kind !== "method") {
+    if (node.kind !== "method" && node.kind !== "constructor") {
       kind = node.kind;
     }
 
@@ -174,12 +257,16 @@ function getNameForPath(path) {
   let name = getNameFromId(id);
 
   if (name == null) {
-    if (t.isCallExpression(parent)) {
+    if (t.isCallExpression(parent) || t.isNewExpression(parent)) {
       // foo(function () {})
       const argIndex = parent.arguments.indexOf(node);
 
       if (argIndex !== -1) {
-        const calleeName = getNameFromId(parent.callee);
+        const calleeName = getNameFromId(parent.callee); // var f = Object.freeze(function () {})
+
+        if (CALLEES_TO_SKIP.indexOf(calleeName) !== -1) {
+          return getNameForPath(parentPath);
+        }
 
         if (calleeName) {
           return `${calleeName}$argument_${argIndex}`;
@@ -223,12 +310,38 @@ function isAnyIdentifier(node) {
 }
 
 function getNameFromId(id) {
-  if (!id) {
+  const parts = getNamePartsFromId(id);
+
+  if (!parts.length) {
     return null;
   }
 
-  if (t.isCallExpression(id)) {
-    return getNameFromId(id.callee);
+  if (parts.length > 5) {
+    return (
+      parts[0] +
+      "." +
+      parts[1] +
+      "..." +
+      parts[parts.length - 2] +
+      "." +
+      parts[parts.length - 1]
+    );
+  }
+
+  return parts.join(".");
+}
+
+function getNamePartsFromId(id) {
+  if (!id) {
+    return [];
+  }
+
+  if (t.isCallExpression(id) || t.isNewExpression(id)) {
+    return getNamePartsFromId(id.callee);
+  }
+
+  if (t.isTypeCastExpression(id)) {
+    return getNamePartsFromId(id.expression);
   }
 
   let name;
@@ -246,7 +359,7 @@ function getNameFromId(id) {
   }
 
   if (name != null) {
-    return t.toBindingIdentifierName(name);
+    return [t.toBindingIdentifierName(name)];
   }
 
   if (t.isImport(id)) {
@@ -254,7 +367,7 @@ function getNameFromId(id) {
   }
 
   if (name != null) {
-    return name;
+    return [name];
   }
 
   if (isAnyMemberExpression(id)) {
@@ -269,20 +382,47 @@ function getNameFromId(id) {
         name = "@@" + propertyName;
       }
     } else {
-      const propertyName = getNameFromId(id.property);
+      const propertyName = getNamePartsFromId(id.property);
 
-      if (propertyName) {
-        const objectName = getNameFromId(id.object);
+      if (propertyName.length) {
+        const objectName = getNamePartsFromId(id.object);
 
-        if (objectName) {
-          name = `${objectName}.${propertyName}`;
+        if (objectName.length) {
+          return _toConsumableArray(objectName).concat(
+            _toConsumableArray(propertyName)
+          );
         } else {
-          name = propertyName;
+          return propertyName;
         }
       }
     }
   }
 
+  return name ? [name] : [];
+}
+
+const DELIMITER_START_RE = /^[^A-Za-z0-9_$@]+/;
+/**
+ * Strip the given prefix from `name`, if it occurs there, plus any delimiter
+ * characters that follow (of which at least one is required). If an empty
+ * string would be returned, return the original name instead.
+ */
+
+function removeNamePrefix(name, namePrefix) {
+  if (!namePrefix.length || !name.startsWith(namePrefix)) {
+    return name;
+  }
+
+  const shortenedName = name.substr(namePrefix.length);
+
+  const _ref = shortenedName.match(DELIMITER_START_RE) || [],
+    _ref2 = _slicedToArray(_ref, 1),
+    delimiterMatch = _ref2[0];
+
+  if (delimiterMatch) {
+    return shortenedName.substr(delimiterMatch.length) || name;
+  }
+
   return name;
 }
 /**
@@ -327,9 +467,9 @@ class MappingEncoder {
     };
   }
 
-  push(_ref) {
-    let name = _ref.name,
-      start = _ref.start;
+  push(_ref3) {
+    let name = _ref3.name,
+      start = _ref3.start;
 
     let nameIndex = this._namesMap.get(name);
 

package/src/generateFunctionMap.js.flow

@@ -12,6 +12,7 @@
 
 const B64Builder = require('./B64Builder');
 
+const fsPath = require('path');
 const t = require('@babel/types');
 
 import type {FBSourceFunctionMap} from './source-map';
@@ -20,6 +21,7 @@ import traverse from '@babel/traverse';
 import type {Path} from '@babel/traverse';
 type Position = {line: number, column: number};
 type RangeMapping = {name: string, start: Position};
+type Context = {filename?: string};
 
 /**
  * Generate a map of source positions to function names. The names are meant to
@@ -29,9 +31,9 @@ type RangeMapping = {name: string, start: Position};
  * The output is encoded for use in a source map. For details about the format,
  * see MappingEncoder below.
  */
-function generateFunctionMap(ast: Ast): FBSourceFunctionMap {
+function generateFunctionMap(ast: Ast, context?: Context): FBSourceFunctionMap {
   const encoder = new MappingEncoder();
-  forEachMapping(ast, mapping => encoder.push(mapping));
+  forEachMapping(ast, context, mapping => encoder.push(mapping));
   return encoder.getResult();
 }
 
@@ -41,9 +43,12 @@ function generateFunctionMap(ast: Ast): FBSourceFunctionMap {
  *
  * Lines are 1-based and columns are 0-based.
  */
-function generateFunctionMappingsArray(ast: Ast): $ReadOnlyArray<RangeMapping> {
+function generateFunctionMappingsArray(
+  ast: Ast,
+  context?: Context,
+): $ReadOnlyArray<RangeMapping> {
   const mappings = [];
-  forEachMapping(ast, mapping => {
+  forEachMapping(ast, context, mapping => {
     mappings.push(mapping);
   });
   return mappings;
@@ -53,7 +58,11 @@ function generateFunctionMappingsArray(ast: Ast): $ReadOnlyArray<RangeMapping> {
  * Traverses a Babel AST and calls the supplied callback with function name
  * mappings, one at a time.
  */
-function forEachMapping(ast: Ast, pushMapping: RangeMapping => void) {
+function forEachMapping(
+  ast: Ast,
+  context: ?Context,
+  pushMapping: RangeMapping => void,
+) {
   const nameStack = [];
   let tailPos = {line: 1, column: 0};
   let tailName = null;
@@ -86,10 +95,22 @@ function forEachMapping(ast: Ast, pushMapping: RangeMapping => void) {
     }
   }
 
+  if (!context) {
+    context = {};
+  }
+
+  const basename = context.filename
+    ? fsPath.basename(context.filename).replace(/\..+$/, '')
+    : null;
+
   traverse(ast, {
     'Function|Program': {
       enter(path) {
-        pushFrame(getNameForPath(path), path.node.loc);
+        let name = getNameForPath(path);
+        if (basename) {
+          name = removeNamePrefix(name, basename);
+        }
+        pushFrame(name, path.node.loc);
       },
       exit(path) {
         popFrame();
@@ -99,6 +120,7 @@ function forEachMapping(ast: Ast, pushMapping: RangeMapping => void) {
 }
 
 const ANONYMOUS_NAME = '<anonymous>';
+const CALLEES_TO_SKIP = ['Object.freeze'];
 
 /**
  * Derive a contextual name for the given AST node (Function, Program, Class or
@@ -118,7 +140,7 @@ function getNameForPath(path: Path): string {
   let kind = '';
   if (t.isObjectMethod(node) || t.isClassMethod(node)) {
     id = node.key;
-    if (node.kind !== 'method') {
+    if (node.kind !== 'method' && node.kind !== 'constructor') {
       kind = node.kind;
     }
     propertyPath = path;
@@ -154,11 +176,15 @@ function getNameForPath(path: Path): string {
   let name = getNameFromId(id);
 
   if (name == null) {
-    if (t.isCallExpression(parent)) {
+    if (t.isCallExpression(parent) || t.isNewExpression(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) {
+          return getNameForPath(parentPath);
+        }
         if (calleeName) {
           return `${calleeName}$argument_${argIndex}`;
         }
@@ -198,12 +224,36 @@ function isAnyIdentifier(node: Ast): boolean {
 }
 
 function getNameFromId(id: Ast): ?string {
-  if (!id) {
+  const parts = getNamePartsFromId(id);
+
+  if (!parts.length) {
     return null;
   }
+  if (parts.length > 5) {
+    return (
+      parts[0] +
+      '.' +
+      parts[1] +
+      '...' +
+      parts[parts.length - 2] +
+      '.' +
+      parts[parts.length - 1]
+    );
+  }
+  return parts.join('.');
+}
+
+function getNamePartsFromId(id: Ast): $ReadOnlyArray<string> {
+  if (!id) {
+    return [];
+  }
+
+  if (t.isCallExpression(id) || t.isNewExpression(id)) {
+    return getNamePartsFromId(id.callee);
+  }
 
-  if (t.isCallExpression(id)) {
-    return getNameFromId(id.callee);
+  if (t.isTypeCastExpression(id)) {
+    return getNamePartsFromId(id.expression);
   }
 
   let name;
@@ -221,7 +271,7 @@ function getNameFromId(id: Ast): ?string {
   }
 
   if (name != null) {
-    return t.toBindingIdentifierName(name);
+    return [t.toBindingIdentifierName(name)];
   }
 
   if (t.isImport(id)) {
@@ -229,7 +279,7 @@ function getNameFromId(id: Ast): ?string {
   }
 
   if (name != null) {
-    return name;
+    return [name];
   }
 
   if (isAnyMemberExpression(id)) {
@@ -243,18 +293,39 @@ function getNameFromId(id: Ast): ?string {
         name = '@@' + propertyName;
       }
     } else {
-      const propertyName = getNameFromId(id.property);
-      if (propertyName) {
-        const objectName = getNameFromId(id.object);
-        if (objectName) {
-          name = `${objectName}.${propertyName}`;
+      const propertyName = getNamePartsFromId(id.property);
+      if (propertyName.length) {
+        const objectName = getNamePartsFromId(id.object);
+        if (objectName.length) {
+          return [...objectName, ...propertyName];
         } else {
-          name = propertyName;
+          return propertyName;
         }
       }
     }
   }
 
+  return name ? [name] : [];
+}
+
+const DELIMITER_START_RE = /^[^A-Za-z0-9_$@]+/;
+
+/**
+ * Strip the given prefix from `name`, if it occurs there, plus any delimiter
+ * characters that follow (of which at least one is required). If an empty
+ * string would be returned, return the original name instead.
+ */
+function removeNamePrefix(name: string, namePrefix: string): string {
+  if (!namePrefix.length || !name.startsWith(namePrefix)) {
+    return name;
+  }
+
+  const shortenedName = name.substr(namePrefix.length);
+  const [delimiterMatch] = shortenedName.match(DELIMITER_START_RE) || [];
+  if (delimiterMatch) {
+    return shortenedName.substr(delimiterMatch.length) || name;
+  }
+
   return name;
 }
 

package/src/source-map.js

@@ -17,6 +17,9 @@ const _require = require("./BundleBuilder"),
   createIndexMap = _require.createIndexMap,
   BundleBuilder = _require.BundleBuilder;
 
+const _require2 = require("./generateFunctionMap"),
+  generateFunctionMap = _require2.generateFunctionMap;
+
 /**
  * Creates a source map from modules with "raw mappings", i.e. an array of
  * tuples with either 2, 4, or 5 elements:
@@ -132,6 +135,7 @@ function countLines(string) {
 module.exports = {
   BundleBuilder,
   createIndexMap,
+  generateFunctionMap,
   fromRawMappings,
   toBabelSegments,
   toSegmentTuple

package/src/source-map.js.flow

@@ -14,6 +14,7 @@ const Generator = require('./Generator');
 const SourceMap = require('source-map');
 
 const {createIndexMap, BundleBuilder} = require('./BundleBuilder');
+const {generateFunctionMap} = require('./generateFunctionMap');
 
 import type {BabelSourceMap} from '@babel/core';
 import type {BabelSourceMapSegment} from '@babel/generator';
@@ -33,7 +34,7 @@ type FBExtensions = {
   x_facebook_sources?: FBSourcesArray,
 };
 
-export type FBSourcesArray = $ReadOnlyArray<FBSourceMetadata>;
+export type FBSourcesArray = $ReadOnlyArray<?FBSourceMetadata>;
 export type FBSourceMetadata = [?FBSourceFunctionMap];
 export type FBSourceFunctionMap = {|
   +names: $ReadOnlyArray<string>,
@@ -181,6 +182,7 @@ function countLines(string) {
 module.exports = {
   BundleBuilder,
   createIndexMap,
+  generateFunctionMap,
   fromRawMappings,
   toBabelSegments,
   toSegmentTuple,