metro-source-map 0.74.1 → 0.75.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-source-map",
-  "version": "0.74.1",
+  "version": "0.75.1",
   "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.74.1",
+    "metro-symbolicate": "0.75.1",
     "nullthrows": "^1.1.1",
-    "ob1": "0.74.1",
+    "ob1": "0.75.1",
     "source-map": "^0.5.6",
     "vlq": "^1.0.0"
   },
@@ -26,5 +26,8 @@
     "@babel/core": "^7.20.0",
     "@babel/parser": "^7.20.0",
     "uglify-es": "^3.1.9"
+  },
+  "engines": {
+    "node": ">=14.17.0"
   }
 }

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,