metro-source-map 0.75.0 → 0.76.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-source-map",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "description": "🚇 Source map generator for Metro.",
   "main": "src/source-map.js",
   "repository": {
@@ -15,9 +15,9 @@
     "@babel/traverse": "^7.20.0",
     "@babel/types": "^7.20.0",
     "invariant": "^2.2.4",
-    "metro-symbolicate": "0.75.0",
+    "metro-symbolicate": "0.76.0",
     "nullthrows": "^1.1.1",
-    "ob1": "0.75.0",
+    "ob1": "0.76.0",
     "source-map": "^0.5.6",
     "vlq": "^1.0.0"
   },
@@ -25,9 +25,9 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/parser": "^7.20.0",
-    "uglify-es": "^3.1.9"
+    "terser": "^5.15.0"
   },
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16"
   }
 }

package/src/Consumer/MappingsConsumer.js

@@ -182,7 +182,6 @@ class MappingsConsumer extends AbstractConsumer {
     return add0(idx);
   }
   sourceContentFor(source, nullOnMissing) {
-    var _sourcesContent$get;
     const { sourcesContent } = this._sourceMap;
     if (!sourcesContent) {
       return null;
@@ -191,10 +190,7 @@ class MappingsConsumer extends AbstractConsumer {
     if (idx == null) {
       return null;
     }
-    return (_sourcesContent$get = sourcesContent[get0(idx)]) !== null &&
-      _sourcesContent$get !== void 0
-      ? _sourcesContent$get
-      : null;
+    return sourcesContent[get0(idx)] ?? null;
   }
 }
 module.exports = MappingsConsumer;

package/src/Generator.js

@@ -147,9 +147,6 @@ class Generator {
       sources: this.sources.slice(),
       // $FlowFixMe[exponential-spread]
       ...content,
-      /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.111 was deployed. To see the error, delete
-       * this comment and run Flow. */
       ...sourcesMetadata,
       names: this.names.items(),
       mappings: this.builder.toString(),

package/src/Generator.js.flow

@@ -181,9 +181,6 @@ class Generator {
       sources: this.sources.slice(),
       // $FlowFixMe[exponential-spread]
       ...content,
-      /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.111 was deployed. To see the error, delete
-       * this comment and run Flow. */
       ...sourcesMetadata,
       names: this.names.items(),
       mappings: this.builder.toString(),

package/src/generateFunctionMap.js

@@ -171,14 +171,7 @@ function getNameForPath(path) {
     // foo = function () {};
     id = parent.left;
   } 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;
+    const grandParentNode = parentPath?.parentPath?.node;
     if ((0, _types.isJSXElement)(grandParentNode)) {
       // <foo>{function () {}}</foo>
       const openingElement = grandParentNode.openingElement;
@@ -188,18 +181,8 @@ function getNameForPath(path) {
         t.jsxIdentifier("children")
       );
     } 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 openingElement = parentPath?.parentPath?.parentPath?.node;
       const prop = grandParentNode;
       id = t.jsxMemberExpression(
         // $FlowFixMe Flow error uncovered by typing Babel more strictly
@@ -322,10 +305,7 @@ function getNamePartsFromId(id) {
   } else if ((0, _types.isNullLiteral)(id)) {
     name = "null";
   } else if ((0, _types.isRegExpLiteral)(id)) {
-    var _id$flags;
-    name = `_${id.pattern}_${
-      (_id$flags = id.flags) !== null && _id$flags !== void 0 ? _id$flags : ""
-    }`;
+    name = `_${id.pattern}_${id.flags ?? ""}`;
   } else if ((0, _types.isTemplateLiteral)(id)) {
     name = id.quasis.map((quasi) => quasi.value.raw).join("");
   } else if ((0, _types.isLiteral)(id) && id.value != null) {

package/src/source-map.js

@@ -18,6 +18,7 @@ const Consumer = require("./Consumer");
 const normalizeSourcePath = require("./Consumer/normalizeSourcePath");
 const { generateFunctionMap } = require("./generateFunctionMap");
 const Generator = require("./Generator");
+// $FlowFixMe[untyped-import] - source-map
 const SourceMap = require("source-map");
 function fromRawMappingsImpl(isBlocking, onDone, modules, offsetLines) {
   const modulesToProcess = modules.slice();
@@ -100,18 +101,29 @@ async function fromRawMappingsNonBlocking(modules, offsetLines = 0) {
 function toBabelSegments(sourceMap) {
   const rawMappings = [];
   new SourceMap.SourceMapConsumer(sourceMap).eachMapping((map) => {
-    rawMappings.push({
-      generated: {
-        line: map.generatedLine,
-        column: map.generatedColumn,
-      },
-      original: {
-        line: map.originalLine,
-        column: map.originalColumn,
-      },
-      source: map.source,
-      name: map.name,
-    });
+    rawMappings.push(
+      map.originalLine == null || map.originalColumn == null
+        ? {
+            generated: {
+              line: map.generatedLine,
+              column: map.generatedColumn,
+            },
+            source: map.source,
+            name: map.name,
+          }
+        : {
+            generated: {
+              line: map.generatedLine,
+              column: map.generatedColumn,
+            },
+            original: {
+              line: map.originalLine,
+              column: map.originalColumn,
+            },
+            source: map.source,
+            name: map.name,
+          }
+    );
   });
   return rawMappings;
 }
@@ -141,9 +153,11 @@ function addMapping(generator, mapping, carryOver) {
   if (n === 2) {
     generator.addSimpleMapping(line, column);
   } else if (n === 4) {
+    // $FlowIssue[invalid-tuple-arity] Arity is ensured by conidition on length
     const sourceMap = mapping;
     generator.addSourceMapping(line, column, sourceMap[2], sourceMap[3]);
   } else if (n === 5) {
+    // $FlowIssue[invalid-tuple-arity] Arity is ensured by conidition on length
     const sourceMap = mapping;
     generator.addNamedSourceMapping(
       line,

package/src/source-map.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
@@ -21,6 +21,7 @@ const Consumer = require('./Consumer');
 const normalizeSourcePath = require('./Consumer/normalizeSourcePath');
 const {generateFunctionMap} = require('./generateFunctionMap');
 const Generator = require('./Generator');
+// $FlowFixMe[untyped-import] - source-map
 const SourceMap = require('source-map');
 
 export type {IConsumer};
@@ -85,6 +86,15 @@ export type IndexMap = {
 
 export type MixedSourceMap = IndexMap | BasicSourceMap;
 
+type SourceMapConsumerMapping = {
+  generatedLine: number,
+  generatedColumn: number,
+  originalLine: ?number,
+  originalColumn: ?number,
+  source: ?string,
+  name: ?string,
+};
+
 function fromRawMappingsImpl(
   isBlocking: boolean,
   onDone: Generator => void,
@@ -205,20 +215,33 @@ function toBabelSegments(
 ): Array<BabelSourceMapSegment> {
   const rawMappings: Array<BabelSourceMapSegment> = [];
 
-  new SourceMap.SourceMapConsumer(sourceMap).eachMapping(map => {
-    rawMappings.push({
-      generated: {
-        line: map.generatedLine,
-        column: map.generatedColumn,
-      },
-      original: {
-        line: map.originalLine,
-        column: map.originalColumn,
-      },
-      source: map.source,
-      name: map.name,
-    });
-  });
+  new SourceMap.SourceMapConsumer(sourceMap).eachMapping(
+    (map: SourceMapConsumerMapping) => {
+      rawMappings.push(
+        map.originalLine == null || map.originalColumn == null
+          ? {
+              generated: {
+                line: map.generatedLine,
+                column: map.generatedColumn,
+              },
+              source: map.source,
+              name: map.name,
+            }
+          : {
+              generated: {
+                line: map.generatedLine,
+                column: map.generatedColumn,
+              },
+              original: {
+                line: map.originalLine,
+                column: map.originalColumn,
+              },
+              source: map.source,
+              name: map.name,
+            },
+      );
+    },
+  );
 
   return rawMappings;
 }
@@ -274,11 +297,13 @@ function addMapping(
   if (n === 2) {
     generator.addSimpleMapping(line, column);
   } else if (n === 4) {
-    const sourceMap: SourceMapping = (mapping: any);
+    // $FlowIssue[invalid-tuple-arity] Arity is ensured by conidition on length
+    const sourceMap: SourceMapping = mapping;
 
     generator.addSourceMapping(line, column, sourceMap[2], sourceMap[3]);
   } else if (n === 5) {
-    const sourceMap: SourceMappingWithName = (mapping: any);
+    // $FlowIssue[invalid-tuple-arity] Arity is ensured by conidition on length
+    const sourceMap: SourceMappingWithName = mapping;
 
     generator.addNamedSourceMapping(
       line,