metro-source-map 0.60.0 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.60.0",
   "name": "metro-source-map",
+  "version": "0.64.0",
   "description": "🚇 Source map generator for Metro.",
   "main": "src/source-map.js",
   "repository": {
@@ -15,8 +15,9 @@
     "@babel/traverse": "^7.0.0",
     "@babel/types": "^7.0.0",
     "invariant": "^2.2.4",
-    "metro-symbolicate": "0.60.0",
-    "ob1": "0.60.0",
+    "metro-symbolicate": "0.64.0",
+    "nullthrows": "^1.1.1",
+    "ob1": "0.64.0",
     "source-map": "^0.5.6",
     "vlq": "^1.0.0"
   },

package/src/Consumer/types.flow.js

@@ -7,7 +7,4 @@
  *
  * @format
  */
-// NOTE: The linter and formatter are fighting over the following lint rule.
-
-/* eslint-disable flowtype/object-type-delimiter */
 "use strict";

package/src/Consumer/types.flow.js.flow

@@ -8,9 +8,6 @@
  * @format
  */
 
-// NOTE: The linter and formatter are fighting over the following lint rule.
-/* eslint-disable flowtype/object-type-delimiter */
-
 'use strict';
 
 import type {IterationOrder, LookupBias} from './constants';

package/src/generateFunctionMap.js

@@ -11,6 +11,8 @@
 
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
 
+var _types = require("@babel/types");
+
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule
     ? obj
@@ -116,6 +118,8 @@ const B64Builder = require("./B64Builder");
 
 const fsPath = require("path");
 
+const nullthrows = require("nullthrows");
+
 const t = require("@babel/types");
 /**
  * Generate a map of source positions to function names. The names are meant to
@@ -202,22 +206,25 @@ function forEachMapping(ast, context, pushMapping) {
   const basename = context.filename
     ? fsPath.basename(context.filename).replace(/\..+$/, "")
     : null;
-  (0, _traverse.default)(ast, {
-    "Function|Program|Class": {
-      enter(path) {
-        let name = getNameForPath(path);
+  const visitor = {
+    enter(path) {
+      let name = getNameForPath(path);
 
-        if (basename) {
-          name = removeNamePrefix(name, basename);
-        }
+      if (basename) {
+        name = removeNamePrefix(name, basename);
+      }
 
-        pushFrame(name, path.node.loc);
-      },
+      pushFrame(name, nullthrows(path.node.loc));
+    },
 
-      exit(path) {
-        popFrame();
-      }
+    exit(path) {
+      popFrame();
     }
+  };
+  (0, _traverse.default)(ast, {
+    Function: visitor,
+    Program: visitor,
+    Class: visitor
   });
 }
 
@@ -233,20 +240,22 @@ function getNameForPath(path) {
     parent = path.parent,
     parentPath = path.parentPath;
 
-  if (t.isProgram(node)) {
+  if ((0, _types.isProgram)(node)) {
     return "<global>";
   }
 
-  let id = path.id; // has an `id` so we don't need to infer one
+  let _ref = path,
+    id = _ref.id; // has an `id` so we don't need to infer one
 
   if (node.id) {
+    // $FlowFixMe Flow error uncovered by typing Babel more strictly
     return node.id.name;
   }
 
   let propertyPath;
   let kind = "";
 
-  if (t.isObjectMethod(node) || t.isClassMethod(node)) {
+  if ((0, _types.isObjectMethod)(node) || (0, _types.isClassMethod)(node)) {
     id = node.key;
 
     if (node.kind !== "method" && node.kind !== "constructor") {
@@ -254,30 +263,55 @@ function getNameForPath(path) {
     }
 
     propertyPath = path;
-  } else if (t.isObjectProperty(parent) || t.isClassProperty(parent)) {
+  } else if (
+    (0, _types.isObjectProperty)(parent) ||
+    (0, _types.isClassProperty)(parent)
+  ) {
     // { foo() {} };
     id = parent.key;
     propertyPath = parentPath;
-  } else if (t.isVariableDeclarator(parent)) {
+  } else if ((0, _types.isVariableDeclarator)(parent)) {
     // let foo = function () {};
     id = parent.id;
-  } else if (t.isAssignmentExpression(parent)) {
+  } else if ((0, _types.isAssignmentExpression)(parent)) {
     // foo = function () {};
     id = parent.left;
-  } else if (t.isJSXExpressionContainer(parent)) {
-    if (t.isJSXElement(parentPath.parentPath.node)) {
+  } else if ((0, _types.isJSXExpressionContainer)(parent)) {
+    var _parentPath$parentPat;
+
+    const grandParentNode =
+      parentPath === null || parentPath === void 0
+        ? void 0
+        : (_parentPath$parentPat = parentPath.parentPath) === null ||
+          _parentPath$parentPat === void 0
+        ? void 0
+        : _parentPath$parentPat.node;
+
+    if ((0, _types.isJSXElement)(grandParentNode)) {
       // <foo>{function () {}}</foo>
-      const openingElement = parentPath.parentPath.node.openingElement;
-      id = t.JSXMemberExpression(
-        t.JSXMemberExpression(openingElement.name, t.JSXIdentifier("props")),
-        t.JSXIdentifier("children")
+      const openingElement = grandParentNode.openingElement;
+      id = t.jsxMemberExpression(
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
+        t.jsxMemberExpression(openingElement.name, t.jsxIdentifier("props")),
+        t.jsxIdentifier("children")
       );
-    } else if (t.isJSXAttribute(parentPath.parentPath.node)) {
-      // <foo bar={function () {}} />
-      const openingElement = parentPath.parentPath.parentPath.node;
-      const prop = parentPath.parentPath.node;
-      id = t.JSXMemberExpression(
-        t.JSXMemberExpression(openingElement.name, t.JSXIdentifier("props")),
+    } else if ((0, _types.isJSXAttribute)(grandParentNode)) {
+      var _parentPath$parentPat2, _parentPath$parentPat3; // <foo bar={function () {}} />
+
+      const openingElement =
+        parentPath === null || parentPath === void 0
+          ? void 0
+          : (_parentPath$parentPat2 = parentPath.parentPath) === null ||
+            _parentPath$parentPat2 === void 0
+          ? void 0
+          : (_parentPath$parentPat3 = _parentPath$parentPat2.parentPath) ===
+              null || _parentPath$parentPat3 === void 0
+          ? void 0
+          : _parentPath$parentPat3.node;
+      const prop = grandParentNode;
+      id = t.jsxMemberExpression(
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
+        t.jsxMemberExpression(openingElement.name, t.jsxIdentifier("props")), // $FlowFixMe Flow error uncovered by typing Babel more strictly
         prop.name
       );
     }
@@ -286,7 +320,10 @@ function getNameForPath(path) {
   let name = getNameFromId(id);
 
   if (name == null) {
-    if (t.isCallExpression(parent) || t.isNewExpression(parent)) {
+    if (
+      (0, _types.isCallExpression)(parent) ||
+      (0, _types.isNewExpression)(parent)
+    ) {
       // foo(function () {})
       const argIndex = parent.arguments.indexOf(node);
 
@@ -294,7 +331,7 @@ function getNameForPath(path) {
         const calleeName = getNameFromId(parent.callee); // var f = Object.freeze(function () {})
 
         if (CALLEES_TO_SKIP.indexOf(calleeName) !== -1) {
-          return getNameForPath(parentPath);
+          return getNameForPath(nullthrows(parentPath));
         }
 
         if (calleeName) {
@@ -303,6 +340,13 @@ function getNameForPath(path) {
       }
     }
 
+    if (
+      (0, _types.isTypeCastExpression)(parent) &&
+      parent.expression === node
+    ) {
+      return getNameForPath(nullthrows(parentPath));
+    }
+
     return ANONYMOUS_NAME;
   }
 
@@ -311,15 +355,17 @@ function getNameForPath(path) {
   }
 
   if (propertyPath) {
-    if (t.isClassBody(propertyPath.parent)) {
+    if ((0, _types.isClassBody)(propertyPath.parent)) {
+      // $FlowFixMe Disvoered when typing babel-traverse
       const className = getNameForPath(propertyPath.parentPath.parentPath);
 
       if (className !== ANONYMOUS_NAME) {
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
         const separator = propertyPath.node.static ? "." : "#";
         name = className + separator + name;
       }
-    } else if (t.isObjectExpression(propertyPath.parent)) {
-      const objectName = getNameForPath(propertyPath.parentPath);
+    } else if ((0, _types.isObjectExpression)(propertyPath.parent)) {
+      const objectName = getNameForPath(nullthrows(propertyPath.parentPath));
 
       if (objectName !== ANONYMOUS_NAME) {
         name = objectName + "." + name;
@@ -331,11 +377,13 @@ function getNameForPath(path) {
 }
 
 function isAnyMemberExpression(node) {
-  return t.isMemberExpression(node) || t.isJSXMemberExpression(node);
+  return (
+    node.type === "MemberExpression" || node.type === "JSXMemberExpression"
+  );
 }
 
 function isAnyIdentifier(node) {
-  return t.isIdentifier(node) || t.isJSXIdentifier(node);
+  return (0, _types.isIdentifier)(node) || (0, _types.isJSXIdentifier)(node);
 }
 
 function getNameFromId(id) {
@@ -365,11 +413,11 @@ function getNamePartsFromId(id) {
     return [];
   }
 
-  if (t.isCallExpression(id) || t.isNewExpression(id)) {
+  if ((0, _types.isCallExpression)(id) || (0, _types.isNewExpression)(id)) {
     return getNamePartsFromId(id.callee);
   }
 
-  if (t.isTypeCastExpression(id)) {
+  if ((0, _types.isTypeCastExpression)(id)) {
     return getNamePartsFromId(id.expression);
   }
 
@@ -377,21 +425,25 @@ function getNamePartsFromId(id) {
 
   if (isAnyIdentifier(id)) {
     name = id.name;
-  } else if (t.isNullLiteral(id)) {
+  } else if ((0, _types.isNullLiteral)(id)) {
     name = "null";
-  } else if (t.isRegExpLiteral(id)) {
-    name = `_${id.pattern}_${id.flags}`;
-  } else if (t.isTemplateLiteral(id)) {
+  } else if ((0, _types.isRegExpLiteral)(id)) {
+    var _id$flags;
+
+    name = `_${id.pattern}_${
+      (_id$flags = id.flags) !== null && _id$flags !== void 0 ? _id$flags : ""
+    }`;
+  } else if ((0, _types.isTemplateLiteral)(id)) {
     name = id.quasis.map(quasi => quasi.value.raw).join("");
-  } else if (t.isLiteral(id) && id.value != null) {
-    name = id.value + "";
+  } else if ((0, _types.isLiteral)(id) && id.value != null) {
+    name = String(id.value);
   }
 
   if (name != null) {
     return [t.toBindingIdentifierName(name)];
   }
 
-  if (t.isImport(id)) {
+  if ((0, _types.isImport)(id)) {
     name = "import";
   }
 
@@ -403,7 +455,7 @@ function getNamePartsFromId(id) {
     if (
       isAnyIdentifier(id.object) &&
       id.object.name === "Symbol" &&
-      (isAnyIdentifier(id.property) || t.isLiteral(id.property))
+      (isAnyIdentifier(id.property) || (0, _types.isLiteral)(id.property))
     ) {
       const propertyName = getNameFromId(id.property);
 
@@ -445,9 +497,9 @@ function removeNamePrefix(name, namePrefix) {
 
   const shortenedName = name.substr(namePrefix.length);
 
-  const _ref = shortenedName.match(DELIMITER_START_RE) || [],
-    _ref2 = _slicedToArray(_ref, 1),
-    delimiterMatch = _ref2[0];
+  const _ref2 = shortenedName.match(DELIMITER_START_RE) || [],
+    _ref3 = _slicedToArray(_ref2, 1),
+    delimiterMatch = _ref3[0];
 
   if (delimiterMatch) {
     return shortenedName.substr(delimiterMatch.length) || name;
@@ -497,9 +549,9 @@ class MappingEncoder {
     };
   }
 
-  push(_ref3) {
-    let name = _ref3.name,
-      start = _ref3.start;
+  push(_ref4) {
+    let name = _ref4.name,
+      start = _ref4.start;
 
     let nameIndex = this._namesMap.get(name);
 

package/src/generateFunctionMap.js.flow

@@ -13,12 +13,38 @@
 const B64Builder = require('./B64Builder');
 
 const fsPath = require('path');
+const nullthrows = require('nullthrows');
 const t = require('@babel/types');
 
 import type {FBSourceFunctionMap} from './source-map';
-import type {Ast} from '@babel/core';
 import traverse from '@babel/traverse';
-import type {Path} from '@babel/traverse';
+import type {NodePath} from '@babel/traverse';
+import {
+  isProgram,
+  isIdentifier,
+  isJSXIdentifier,
+  isCallExpression,
+  isNewExpression,
+  isTypeCastExpression,
+  isRegExpLiteral,
+  isTemplateLiteral,
+  isLiteral,
+  isObjectMethod,
+  isClassMethod,
+  isObjectProperty,
+  isClassProperty,
+  isVariableDeclarator,
+  isAssignmentExpression,
+  isJSXExpressionContainer,
+  isJSXElement,
+  isJSXAttribute,
+  isNullLiteral,
+  isImport,
+  isClassBody,
+  isObjectExpression,
+} from '@babel/types';
+import type {Node} from '@babel/types';
+
 type Position = {
   line: number,
   column: number,
@@ -39,7 +65,10 @@ type Context = {filename?: string, ...};
  * The output is encoded for use in a source map. For details about the format,
  * see MappingEncoder below.
  */
-function generateFunctionMap(ast: Ast, context?: Context): FBSourceFunctionMap {
+function generateFunctionMap(
+  ast: BabelNode,
+  context?: Context,
+): FBSourceFunctionMap {
   const encoder = new MappingEncoder();
   forEachMapping(ast, context, mapping => encoder.push(mapping));
   return encoder.getResult();
@@ -52,7 +81,7 @@ function generateFunctionMap(ast: Ast, context?: Context): FBSourceFunctionMap {
  * Lines are 1-based and columns are 0-based.
  */
 function generateFunctionMappingsArray(
-  ast: Ast,
+  ast: BabelNode,
   context?: Context,
 ): $ReadOnlyArray<RangeMapping> {
   const mappings = [];
@@ -67,7 +96,7 @@ function generateFunctionMappingsArray(
  * mappings, one at a time.
  */
 function forEachMapping(
-  ast: Ast,
+  ast: BabelNode,
   context: ?Context,
   pushMapping: RangeMapping => void,
 ) {
@@ -89,7 +118,7 @@ function forEachMapping(
     tailPos = pos;
   }
 
-  function pushFrame(name, loc) {
+  function pushFrame(name: string, loc: BabelNodeSourceLocation) {
     advanceToPos(loc.start);
     nameStack.unshift({name, loc});
   }
@@ -111,19 +140,25 @@ function forEachMapping(
     ? fsPath.basename(context.filename).replace(/\..+$/, '')
     : null;
 
-  traverse(ast, {
-    'Function|Program|Class': {
-      enter(path) {
-        let name = getNameForPath(path);
-        if (basename) {
-          name = removeNamePrefix(name, basename);
-        }
-        pushFrame(name, path.node.loc);
-      },
-      exit(path) {
-        popFrame();
-      },
+  const visitor = {
+    enter(path) {
+      let name = getNameForPath(path);
+      if (basename) {
+        name = removeNamePrefix(name, basename);
+      }
+
+      pushFrame(name, nullthrows(path.node.loc));
     },
+
+    exit(path): void {
+      popFrame();
+    },
+  };
+
+  traverse(ast, {
+    Function: visitor,
+    Program: visitor,
+    Class: visitor,
   });
 }
 
@@ -134,48 +169,54 @@ const CALLEES_TO_SKIP = ['Object.freeze'];
  * Derive a contextual name for the given AST node (Function, Program, Class or
  * ObjectExpression).
  */
-function getNameForPath(path: Path): string {
+function getNameForPath(path: NodePath<>): string {
   const {node, parent, parentPath} = path;
-  if (t.isProgram(node)) {
+  if (isProgram(node)) {
     return '<global>';
   }
-  let {id} = path;
+
+  let {id} = (path: any);
   // has an `id` so we don't need to infer one
   if (node.id) {
+    // $FlowFixMe Flow error uncovered by typing Babel more strictly
     return node.id.name;
   }
   let propertyPath;
   let kind = '';
-  if (t.isObjectMethod(node) || t.isClassMethod(node)) {
+  if (isObjectMethod(node) || isClassMethod(node)) {
     id = node.key;
     if (node.kind !== 'method' && node.kind !== 'constructor') {
       kind = node.kind;
     }
     propertyPath = path;
-  } else if (t.isObjectProperty(parent) || t.isClassProperty(parent)) {
+  } else if (isObjectProperty(parent) || isClassProperty(parent)) {
     // { foo() {} };
     id = parent.key;
     propertyPath = parentPath;
-  } else if (t.isVariableDeclarator(parent)) {
+  } else if (isVariableDeclarator(parent)) {
     // let foo = function () {};
     id = parent.id;
-  } else if (t.isAssignmentExpression(parent)) {
+  } else if (isAssignmentExpression(parent)) {
     // foo = function () {};
     id = parent.left;
-  } else if (t.isJSXExpressionContainer(parent)) {
-    if (t.isJSXElement(parentPath.parentPath.node)) {
+  } else if (isJSXExpressionContainer(parent)) {
+    const grandParentNode = parentPath?.parentPath?.node;
+    if (isJSXElement(grandParentNode)) {
       // <foo>{function () {}}</foo>
-      const openingElement = parentPath.parentPath.node.openingElement;
-      id = t.JSXMemberExpression(
-        t.JSXMemberExpression(openingElement.name, t.JSXIdentifier('props')),
-        t.JSXIdentifier('children'),
+      const openingElement = grandParentNode.openingElement;
+      id = t.jsxMemberExpression(
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
+        t.jsxMemberExpression(openingElement.name, t.jsxIdentifier('props')),
+        t.jsxIdentifier('children'),
       );
-    } else if (t.isJSXAttribute(parentPath.parentPath.node)) {
+    } else if (isJSXAttribute(grandParentNode)) {
       // <foo bar={function () {}} />
-      const openingElement = parentPath.parentPath.parentPath.node;
-      const prop = parentPath.parentPath.node;
-      id = t.JSXMemberExpression(
-        t.JSXMemberExpression(openingElement.name, t.JSXIdentifier('props')),
+      const openingElement = parentPath?.parentPath?.parentPath?.node;
+      const prop = grandParentNode;
+      id = t.jsxMemberExpression(
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
+        t.jsxMemberExpression(openingElement.name, t.jsxIdentifier('props')),
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
         prop.name,
       );
     }
@@ -184,20 +225,23 @@ function getNameForPath(path: Path): string {
   let name = getNameFromId(id);
 
   if (name == null) {
-    if (t.isCallExpression(parent) || t.isNewExpression(parent)) {
+    if (isCallExpression(parent) || 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);
+          return getNameForPath(nullthrows(parentPath));
         }
         if (calleeName) {
           return `${calleeName}$argument_${argIndex}`;
         }
       }
     }
+    if (isTypeCastExpression(parent) && parent.expression === node) {
+      return getNameForPath(nullthrows(parentPath));
+    }
     return ANONYMOUS_NAME;
   }
 
@@ -206,14 +250,16 @@ function getNameForPath(path: Path): string {
   }
 
   if (propertyPath) {
-    if (t.isClassBody(propertyPath.parent)) {
+    if (isClassBody(propertyPath.parent)) {
+      // $FlowFixMe Disvoered when typing babel-traverse
       const className = getNameForPath(propertyPath.parentPath.parentPath);
       if (className !== ANONYMOUS_NAME) {
+        // $FlowFixMe Flow error uncovered by typing Babel more strictly
         const separator = propertyPath.node.static ? '.' : '#';
         name = className + separator + name;
       }
-    } else if (t.isObjectExpression(propertyPath.parent)) {
-      const objectName = getNameForPath(propertyPath.parentPath);
+    } else if (isObjectExpression(propertyPath.parent)) {
+      const objectName = getNameForPath(nullthrows(propertyPath.parentPath));
       if (objectName !== ANONYMOUS_NAME) {
         name = objectName + '.' + name;
       }
@@ -223,15 +269,17 @@ function getNameForPath(path: Path): string {
   return name;
 }
 
-function isAnyMemberExpression(node: Ast): boolean {
-  return t.isMemberExpression(node) || t.isJSXMemberExpression(node);
+function isAnyMemberExpression(node: Node): boolean %checks {
+  return (
+    node.type === 'MemberExpression' || node.type === 'JSXMemberExpression'
+  );
 }
 
-function isAnyIdentifier(node: Ast): boolean {
-  return t.isIdentifier(node) || t.isJSXIdentifier(node);
+function isAnyIdentifier(node: Node): boolean %checks {
+  return isIdentifier(node) || isJSXIdentifier(node);
 }
 
-function getNameFromId(id: Ast): ?string {
+function getNameFromId(id: Node): ?string {
   const parts = getNamePartsFromId(id);
 
   if (!parts.length) {
@@ -251,16 +299,16 @@ function getNameFromId(id: Ast): ?string {
   return parts.join('.');
 }
 
-function getNamePartsFromId(id: Ast): $ReadOnlyArray<string> {
+function getNamePartsFromId(id: Node): $ReadOnlyArray<string> {
   if (!id) {
     return [];
   }
 
-  if (t.isCallExpression(id) || t.isNewExpression(id)) {
+  if (isCallExpression(id) || isNewExpression(id)) {
     return getNamePartsFromId(id.callee);
   }
 
-  if (t.isTypeCastExpression(id)) {
+  if (isTypeCastExpression(id)) {
     return getNamePartsFromId(id.expression);
   }
 
@@ -268,21 +316,21 @@ function getNamePartsFromId(id: Ast): $ReadOnlyArray<string> {
 
   if (isAnyIdentifier(id)) {
     name = id.name;
-  } else if (t.isNullLiteral(id)) {
+  } else if (isNullLiteral(id)) {
     name = 'null';
-  } else if (t.isRegExpLiteral(id)) {
-    name = `_${id.pattern}_${id.flags}`;
-  } else if (t.isTemplateLiteral(id)) {
+  } else if (isRegExpLiteral(id)) {
+    name = `_${id.pattern}_${id.flags ?? ''}`;
+  } else if (isTemplateLiteral(id)) {
     name = id.quasis.map(quasi => quasi.value.raw).join('');
-  } else if (t.isLiteral(id) && id.value != null) {
-    name = id.value + '';
+  } else if (isLiteral(id) && id.value != null) {
+    name = String(id.value);
   }
 
   if (name != null) {
     return [t.toBindingIdentifierName(name)];
   }
 
-  if (t.isImport(id)) {
+  if (isImport(id)) {
     name = 'import';
   }
 
@@ -294,7 +342,7 @@ function getNamePartsFromId(id: Ast): $ReadOnlyArray<string> {
     if (
       isAnyIdentifier(id.object) &&
       id.object.name === 'Symbol' &&
-      (isAnyIdentifier(id.property) || t.isLiteral(id.property))
+      (isAnyIdentifier(id.property) || isLiteral(id.property))
     ) {
       const propertyName = getNameFromId(id.property);
       if (propertyName) {