metro-transform-worker 0.85.0 → 0.86.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-transform-worker",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "description": "🚇 Transform worker for Metro.",
   "main": "src/index.js",
   "exports": {
@@ -24,13 +24,13 @@
     "@babel/parser": "^7.29.0",
     "@babel/types": "^7.29.0",
     "flow-enums-runtime": "^0.0.6",
-    "metro": "0.85.0",
-    "metro-babel-transformer": "0.85.0",
-    "metro-cache": "0.85.0",
-    "metro-cache-key": "0.85.0",
-    "metro-minify-terser": "0.85.0",
-    "metro-source-map": "0.85.0",
-    "metro-transform-plugins": "0.85.0",
+    "metro": "0.86.0",
+    "metro-babel-transformer": "0.86.0",
+    "metro-cache": "0.86.0",
+    "metro-cache-key": "0.86.0",
+    "metro-minify-terser": "0.86.0",
+    "metro-source-map": "0.86.0",
+    "metro-transform-plugins": "0.86.0",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {

package/src/index.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<165882da0b131608da36b1cbd00ecf28>>
+ * @generated SignedSource<<28342f12ccdb6543eff2ef94ebd19bbc>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-transform-worker/src/index.js
@@ -22,7 +22,7 @@ import type {
 import type {
   BasicSourceMap,
   FBSourceFunctionMap,
-  MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 import type {TransformResultDependency} from 'metro/private/DeltaBundler';
 import type {AllowOptionalDependencies} from 'metro/private/DeltaBundler/types';
@@ -90,7 +90,7 @@ export type JsOutput = Readonly<{
   data: Readonly<{
     code: string;
     lineCount: number;
-    map: Array<MetroSourceMapSegmentTuple>;
+    map: VlqMap;
     functionMap: null | undefined | FBSourceFunctionMap;
   }>;
   type: JSFileType;
@@ -112,16 +112,3 @@ export declare const getCacheKey: (
   opts?: Readonly<{projectRoot: string}>,
 ) => string;
 export declare type getCacheKey = typeof getCacheKey;
-/**
- * Backwards-compatibility with CommonJS consumers using interopRequireDefault.
- * Do not add to this list.
- *
- * @deprecated Default import from 'metro-transform-worker' is deprecated, use named exports.
- */
-declare const $$EXPORT_DEFAULT_DECLARATION$$: {
-  getCacheKey: typeof getCacheKey;
-  transform: typeof transform;
-};
-declare type $$EXPORT_DEFAULT_DECLARATION$$ =
-  typeof $$EXPORT_DEFAULT_DECLARATION$$;
-export default $$EXPORT_DEFAULT_DECLARATION$$;

package/src/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true,
 });
-exports.transform = exports.getCacheKey = exports.default = void 0;
+exports.transform = exports.getCacheKey = void 0;
 var assetTransformer = _interopRequireWildcard(
   require("./utils/assetTransformer"),
 );
@@ -300,23 +300,35 @@ async function transformJS(file, { config, options, projectRoot }) {
     },
     file.code,
   );
-  let map = result.rawMappings
-    ? result.rawMappings.map(_metroSourceMap.toSegmentTuple)
-    : [];
   let code = result.code;
+  let map;
+  let lineCount;
   if (minify) {
-    ({ map, code } = await minifyCode(
+    let tuples = result.decodedMap
+      ? (0, _metroSourceMap.tuplesFromBabelDecodedMap)(result.decodedMap)
+      : [];
+    ({ map: tuples, code } = await minifyCode(
       config,
       projectRoot,
       file.filename,
       result.code,
       file.code,
-      map,
+      tuples,
       reserved,
     ));
+    ({ lineCount, map: tuples } = countLinesAndTerminateMap(code, tuples));
+    map = (0, _metroSourceMap.vlqMapFromTuples)(tuples);
+  } else {
+    const { lineCount: lines, lastLineColumn } = countLines(code);
+    lineCount = lines;
+    map = (0, _metroSourceMap.vlqMapFromBabelDecodedMap)(
+      result.decodedMap ?? {
+        mappings: [],
+        names: [],
+      },
+      [lines, lastLineColumn],
+    );
   }
-  let lineCount;
-  ({ lineCount, map } = countLinesAndTerminateMap(code, map));
   const output = [
     {
       data: {
@@ -408,13 +420,14 @@ async function transformJSON(file, { options, config, projectRoot }) {
   }
   let lineCount;
   ({ lineCount, map } = countLinesAndTerminateMap(code, map));
+  const outputMap = (0, _metroSourceMap.vlqMapFromTuples)(map);
   const output = [
     {
       data: {
         code,
         functionMap: null,
         lineCount,
-        map,
+        map: outputMap,
       },
       type: jsType,
     },
@@ -527,7 +540,7 @@ const getCacheKey = (config, opts) => {
   ].join("$");
 };
 exports.getCacheKey = getCacheKey;
-function countLinesAndTerminateMap(code, map) {
+function countLines(code) {
   const NEWLINE = /\r\n?|\n|\u2028|\u2029/g;
   let lineCount = 1;
   let lastLineStart = 0;
@@ -535,9 +548,15 @@ function countLinesAndTerminateMap(code, map) {
     lineCount++;
     lastLineStart = match.index + match[0].length;
   }
-  const lastLineLength = code.length - lastLineStart;
+  return {
+    lineCount,
+    lastLineColumn: code.length - lastLineStart,
+  };
+}
+function countLinesAndTerminateMap(code, map) {
+  const { lineCount, lastLineColumn } = countLines(code);
   const lastLineIndex1Based = lineCount;
-  const lastLineNextColumn0Based = lastLineLength;
+  const lastLineNextColumn0Based = lastLineColumn;
   const lastMapping = map[map.length - 1];
   const terminatingMapping = [lastLineIndex1Based, lastLineNextColumn0Based];
   if (
@@ -555,7 +574,3 @@ function countLinesAndTerminateMap(code, map) {
     map: [...map],
   };
 }
-var _default = (exports.default = {
-  getCacheKey,
-  transform,
-});

package/src/index.js.flow

@@ -20,6 +20,7 @@ import type {
   BasicSourceMap,
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 import type {
   ImportExportPluginOptions,
@@ -46,6 +47,9 @@ import {
   functionMapBabelPlugin,
   toBabelSegments,
   toSegmentTuple,
+  tuplesFromBabelDecodedMap,
+  vlqMapFromBabelDecodedMap,
+  vlqMapFromTuples,
 } from 'metro-source-map';
 import metroTransformPlugins from 'metro-transform-plugins';
 import collectDependencies from 'metro/private/ModuleGraph/worker/collectDependencies';
@@ -168,7 +172,7 @@ export type JsOutput = Readonly<{
   data: Readonly<{
     code: string,
     lineCount: number,
-    map: Array<MetroSourceMapSegmentTuple>,
+    map: VlqMap,
     functionMap: ?FBSourceFunctionMap,
   }>,
   type: JSFileType,
@@ -471,23 +475,41 @@ async function transformJS(
     file.code,
   );
 
-  let map = result.rawMappings ? result.rawMappings.map(toSegmentTuple) : [];
   let code = result.code;
+  let map: VlqMap;
+  let lineCount: number;
 
   if (minify) {
-    ({map, code} = await minifyCode(
+    // The minifier returns its own map (not Babel's `decodedMap`), so we derive
+    // tuples from Babel's eagerly-computed decoded map, hand them to the
+    // minifier, then re-encode the resulting tuples to a compact VLQ map.
+    let tuples = result.decodedMap
+      ? tuplesFromBabelDecodedMap(result.decodedMap)
+      : [];
+
+    ({map: tuples, code} = await minifyCode(
       config,
       projectRoot,
       file.filename,
       result.code,
       file.code,
-      map,
+      tuples,
       reserved,
     ));
-  }
 
-  let lineCount;
-  ({lineCount, map} = countLinesAndTerminateMap(code, map));
+    ({lineCount, map: tuples} = countLinesAndTerminateMap(code, tuples));
+    map = vlqMapFromTuples(tuples);
+  } else {
+    // Dominant path (e.g. Hermes, which doesn't minify): encode the compact VLQ
+    // map straight from Babel's eagerly-computed decoded map, never
+    // materialising tuples.
+    const {lineCount: lines, lastLineColumn} = countLines(code);
+    lineCount = lines;
+    map = vlqMapFromBabelDecodedMap(
+      result.decodedMap ?? {mappings: [], names: []},
+      [lines, lastLineColumn],
+    );
+  }
 
   const output: Array<JsOutput> = [
     {
@@ -616,9 +638,12 @@ async function transformJSON(
 
   let lineCount;
   ({lineCount, map} = countLinesAndTerminateMap(code, map));
+  // The JSON path builds tuples directly (no Babel `decodedMap`), so re-encode
+  // the finished tuples to a compact VLQ map.
+  const outputMap = vlqMapFromTuples(map);
   const output: Array<JsOutput> = [
     {
-      data: {code, functionMap: null, lineCount, map},
+      data: {code, functionMap: null, lineCount, map: outputMap},
       type: jsType,
     },
   ];
@@ -755,12 +780,9 @@ export const getCacheKey = (
   ].join('$');
 };
 
-function countLinesAndTerminateMap(
-  code: string,
-  map: ReadonlyArray<MetroSourceMapSegmentTuple>,
-): {
+function countLines(code: string): {
   lineCount: number,
-  map: Array<MetroSourceMapSegmentTuple>,
+  lastLineColumn: number,
 } {
   const NEWLINE = /\r\n?|\n|\u2028|\u2029/g;
   let lineCount = 1;
@@ -771,9 +793,19 @@ function countLinesAndTerminateMap(
     lineCount++;
     lastLineStart = match.index + match[0].length;
   }
-  const lastLineLength = code.length - lastLineStart;
+  return {lineCount, lastLineColumn: code.length - lastLineStart};
+}
+
+function countLinesAndTerminateMap(
+  code: string,
+  map: ReadonlyArray<MetroSourceMapSegmentTuple>,
+): {
+  lineCount: number,
+  map: Array<MetroSourceMapSegmentTuple>,
+} {
+  const {lineCount, lastLineColumn} = countLines(code);
   const lastLineIndex1Based = lineCount;
-  const lastLineNextColumn0Based = lastLineLength;
+  const lastLineNextColumn0Based = lastLineColumn;
 
   // 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
@@ -793,14 +825,3 @@ function countLinesAndTerminateMap(
   }
   return {lineCount, map: [...map]};
 }
-
-/**
- * Backwards-compatibility with CommonJS consumers using interopRequireDefault.
- * Do not add to this list.
- *
- * @deprecated Default import from 'metro-transform-worker' is deprecated, use named exports.
- */
-export default {
-  getCacheKey,
-  transform,
-};