metro-transform-worker 0.80.7 → 0.80.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-transform-worker",
-  "version": "0.80.7",
+  "version": "0.80.8",
   "description": "🚇 Transform worker for Metro.",
   "main": "src/index.js",
   "repository": {
@@ -17,17 +17,17 @@
     "@babel/generator": "^7.20.0",
     "@babel/parser": "^7.20.0",
     "@babel/types": "^7.20.0",
-    "metro": "0.80.7",
-    "metro-babel-transformer": "0.80.7",
-    "metro-cache": "0.80.7",
-    "metro-cache-key": "0.80.7",
-    "metro-minify-terser": "0.80.7",
-    "metro-source-map": "0.80.7",
-    "metro-transform-plugins": "0.80.7",
+    "metro": "0.80.8",
+    "metro-babel-transformer": "0.80.8",
+    "metro-cache": "0.80.8",
+    "metro-cache-key": "0.80.8",
+    "metro-minify-terser": "0.80.8",
+    "metro-source-map": "0.80.8",
+    "metro-transform-plugins": "0.80.8",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {
-    "metro-memory-fs": "0.80.7",
+    "metro-memory-fs": "0.80.8",
     "@react-native/metro-babel-transformer": "0.73.11"
   },
   "engines": {

package/src/index.js

@@ -14,7 +14,6 @@ const {
   toSegmentTuple,
 } = require("metro-source-map");
 const metroTransformPlugins = require("metro-transform-plugins");
-const countLines = require("metro/src/lib/countLines");
 const collectDependencies = require("metro/src/ModuleGraph/worker/collectDependencies");
 const {
   InvalidRequireCallError: InternalInvalidRequireCallError,
@@ -247,11 +246,13 @@ async function transformJS(file, { config, options, projectRoot }) {
       reserved
     ));
   }
+  let lineCount;
+  ({ lineCount, map } = countLinesAndTerminateMap(code, map));
   const output = [
     {
       data: {
         code,
-        lineCount: countLines(code),
+        lineCount,
         map,
         functionMap: file.functionMap,
       },
@@ -323,11 +324,13 @@ async function transformJSON(file, { options, config, projectRoot }) {
   } else {
     jsType = "js/module";
   }
+  let lineCount;
+  ({ lineCount, map } = countLinesAndTerminateMap(code, map));
   const output = [
     {
       data: {
         code,
-        lineCount: countLines(code),
+        lineCount,
         map,
         functionMap: null,
       },
@@ -410,6 +413,7 @@ module.exports = {
   getCacheKey: (config) => {
     const { babelTransformerPath, minifierPath, ...remainingConfig } = config;
     const filesKey = getCacheKey([
+      __filename,
       require.resolve(babelTransformerPath),
       require.resolve(minifierPath),
       require.resolve("./utils/getMinifier"),
@@ -426,3 +430,31 @@ module.exports = {
     ].join("$");
   },
 };
+function countLinesAndTerminateMap(code, map) {
+  const NEWLINE = /\r\n?|\n|\u2028|\u2029/g;
+  let lineCount = 1;
+  let lastLineStart = 0;
+  for (const match of code.matchAll(NEWLINE)) {
+    lineCount++;
+    lastLineStart = match.index + match[0].length;
+  }
+  const lastLineLength = code.length - lastLineStart;
+  const lastLineIndex1Based = lineCount;
+  const lastLineNextColumn0Based = lastLineLength;
+  const lastMapping = map[map.length - 1];
+  const terminatingMapping = [lastLineIndex1Based, lastLineNextColumn0Based];
+  if (
+    !lastMapping ||
+    lastMapping[0] !== terminatingMapping[0] ||
+    lastMapping[1] !== terminatingMapping[1]
+  ) {
+    return {
+      lineCount,
+      map: map.concat([terminatingMapping]),
+    };
+  }
+  return {
+    lineCount,
+    map: [...map],
+  };
+}

package/src/index.js.flow

@@ -44,7 +44,6 @@ const {
   toSegmentTuple,
 } = require('metro-source-map');
 const metroTransformPlugins = require('metro-transform-plugins');
-const countLines = require('metro/src/lib/countLines');
 const collectDependencies = require('metro/src/ModuleGraph/worker/collectDependencies');
 const {
   InvalidRequireCallError: InternalInvalidRequireCallError,
@@ -441,11 +440,14 @@ async function transformJS(
     ));
   }
 
+  let lineCount;
+  ({lineCount, map} = countLinesAndTerminateMap(code, map));
+
   const output: Array<JsOutput> = [
     {
       data: {
         code,
-        lineCount: countLines(code),
+        lineCount,
         map,
         functionMap: file.functionMap,
       },
@@ -552,9 +554,11 @@ async function transformJSON(
     jsType = 'js/module';
   }
 
+  let lineCount;
+  ({lineCount, map} = countLinesAndTerminateMap(code, map));
   const output: Array<JsOutput> = [
     {
-      data: {code, lineCount: countLines(code), map, functionMap: null},
+      data: {code, lineCount, map, functionMap: null},
       type: jsType,
     },
   ];
@@ -652,6 +656,7 @@ module.exports = {
     const {babelTransformerPath, minifierPath, ...remainingConfig} = config;
 
     const filesKey = getCacheKey([
+      __filename,
       require.resolve(babelTransformerPath),
       require.resolve(minifierPath),
       require.resolve('./utils/getMinifier'),
@@ -670,3 +675,42 @@ module.exports = {
     ].join('$');
   },
 };
+
+function countLinesAndTerminateMap(
+  code: string,
+  map: $ReadOnlyArray<MetroSourceMapSegmentTuple>,
+): {
+  lineCount: number,
+  map: Array<MetroSourceMapSegmentTuple>,
+} {
+  const NEWLINE = /\r\n?|\n|\u2028|\u2029/g;
+  let lineCount = 1;
+  let lastLineStart = 0;
+
+  // Count lines and keep track of where the last line starts
+  for (const match of code.matchAll(NEWLINE)) {
+    lineCount++;
+    lastLineStart = match.index + match[0].length;
+  }
+  const lastLineLength = code.length - lastLineStart;
+  const lastLineIndex1Based = lineCount;
+  const lastLineNextColumn0Based = lastLineLength;
+
+  // If there isn't a mapping at one-past-the-last column of the last line,
+  // add one that maps to nothing. This ensures out-of-bounds lookups hit the
+  // null mapping rather than aliasing to whichever mapping happens to be last.
+  // ASSUMPTION: Mappings are generated in order of increasing line and column.
+  const lastMapping = map[map.length - 1];
+  const terminatingMapping = [lastLineIndex1Based, lastLineNextColumn0Based];
+  if (
+    !lastMapping ||
+    lastMapping[0] !== terminatingMapping[0] ||
+    lastMapping[1] !== terminatingMapping[1]
+  ) {
+    return {
+      lineCount,
+      map: map.concat([terminatingMapping]),
+    };
+  }
+  return {lineCount, map: [...map]};
+}