Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions packages/metro-source-map/src/source-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ export type MetroSourceMapSegmentTuple =
| SourceMapping
| GeneratedCodeMapping;

// A single segment of a standard "decoded" source map (as produced by
// `@babel/generator`'s `result.decodedMap` / `@jridgewell/gen-mapping`),
// grouped by generated line. All fields are 0-based, including the source line
// (unlike Metro's `MetroSourceMapSegmentTuple`, whose source line is 1-based):
// [generatedColumn]
// [generatedColumn, sourceIndex, sourceLine, sourceColumn]
// [generatedColumn, sourceIndex, sourceLine, sourceColumn, nameIndex]
type BabelDecodedMapSegment =
| [number]
| [number, number, number, number]
| [number, number, number, number, number];

export type BabelDecodedMap = {
readonly mappings: ReadonlyArray<ReadonlyArray<BabelDecodedMapSegment>>,
readonly names: ReadonlyArray<string>,
...
};

export type HermesFunctionOffsets = {[number]: ReadonlyArray<number>, ...};

export type FBSourcesArray = ReadonlyArray<?FBSourceMetadata>;
Expand Down Expand Up @@ -279,6 +297,51 @@ function toSegmentTuple(
return [line, column, original.line, original.column, name];
}

/**
* Converts a Babel/gen-mapping "decoded" source map (`result.decodedMap` from
* `@babel/generator`) into raw mapping tuples, byte-identical to
* `result.rawMappings.map(toSegmentTuple)`.
*
* Preferred over `result.rawMappings` because `decodedMap` is computed eagerly
* during generation, whereas accessing `rawMappings` triggers a second decode
* (`allMappings`) that allocates ~4-5 objects per segment. No terminating
* mapping is appended (callers that need one use `countLinesAndTerminateMap`).
*/
function tuplesFromBabelDecodedMap(
decodedMap: BabelDecodedMap,
): Array<MetroSourceMapSegmentTuple> {
const {mappings, names} = decodedMap;
const tuples: Array<MetroSourceMapSegmentTuple> = [];
for (let line = 0, n = mappings.length; line < n; ++line) {
// Decoded mappings are grouped by generated line (0-based); tuples use
// 1-based generated lines.
const generatedLine = line + 1;
const segments = mappings[line];
for (let i = 0, m = segments.length; i < m; ++i) {
const segment = segments[i];
switch (segment.length) {
case 1:
tuples.push([generatedLine, segment[0]]);
break;
case 4:
// Decoded source lines are 0-based; tuples use 1-based source lines.
tuples.push([generatedLine, segment[0], segment[2] + 1, segment[3]]);
break;
case 5:
tuples.push([
generatedLine,
segment[0],
segment[2] + 1,
segment[3],
names[segment[4]],
]);
break;
}
}
}
return tuples;
}

function addMappingsForFile(
generator: Generator,
mappings: Array<MetroSourceMapSegmentTuple>,
Expand Down Expand Up @@ -349,6 +412,7 @@ export {
normalizeSourcePath,
toBabelSegments,
toSegmentTuple,
tuplesFromBabelDecodedMap,
};

/**
Expand Down
24 changes: 23 additions & 1 deletion packages/metro-source-map/types/source-map.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @noformat
* @oncall react_native
* @generated SignedSource<<7303fe7149cb12d764c6106cdf4f49ee>>
* @generated SignedSource<<c2fb54d8a5eb6212af899a87f3fa4852>>
*
* This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
* Original file: packages/metro-source-map/src/source-map.js
Expand Down Expand Up @@ -35,6 +35,14 @@ export type MetroSourceMapSegmentTuple =
| SourceMappingWithName
| SourceMapping
| GeneratedCodeMapping;
type BabelDecodedMapSegment =
| [number]
| [number, number, number, number]
| [number, number, number, number, number];
export type BabelDecodedMap = {
readonly mappings: ReadonlyArray<ReadonlyArray<BabelDecodedMapSegment>>;
readonly names: ReadonlyArray<string>;
};
export type HermesFunctionOffsets = {
[$$Key$$: number]: ReadonlyArray<number>;
};
Expand Down Expand Up @@ -125,6 +133,19 @@ declare function toBabelSegments(
declare function toSegmentTuple(
mapping: BabelSourceMapSegment,
): MetroSourceMapSegmentTuple;
/**
* Converts a Babel/gen-mapping "decoded" source map (`result.decodedMap` from
* `@babel/generator`) into raw mapping tuples, byte-identical to
* `result.rawMappings.map(toSegmentTuple)`.
*
* Preferred over `result.rawMappings` because `decodedMap` is computed eagerly
* during generation, whereas accessing `rawMappings` triggers a second decode
* (`allMappings`) that allocates ~4-5 objects per segment. No terminating
* mapping is appended (callers that need one use `countLinesAndTerminateMap`).
*/
declare function tuplesFromBabelDecodedMap(
decodedMap: BabelDecodedMap,
): Array<MetroSourceMapSegmentTuple>;
export {
BundleBuilder,
composeSourceMaps,
Expand All @@ -137,6 +158,7 @@ export {
normalizeSourcePath,
toBabelSegments,
toSegmentTuple,
tuplesFromBabelDecodedMap,
};
/**
* Backwards-compatibility with CommonJS consumers using interopRequireDefault.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow strict-local
* @format
* @oncall react_native
*/

'use strict';

import generate from '@babel/generator';
import * as babylon from '@babel/parser';
import {toSegmentTuple, tuplesFromBabelDecodedMap} from 'metro-source-map';

// The transform worker derives source-map tuples from Babel's eagerly-computed
// `result.decodedMap` instead of triggering the more expensive `rawMappings`
// (`allMappings`) decode. This must be byte-identical to the previous
// `result.rawMappings.map(toSegmentTuple)`.
const SAMPLES = [
`function foo(aaa, bbb) {
const ccc = aaa + bbb;
return ccc * 2;
}
class Bar extends Foo {
method(xxx) {
return this.value + xxx;
}
}
export default function entry(items) {
const obj = {a: 1, b: 2, c: [1, 2, 3]};
return items.map(x => x.value).filter(Boolean);
}
`,
`const x = require('foo');\nmodule.exports = (a, b) => { let s = 0; for (let i = 0; i < a.length; i++) { s += a[i] * b; } return s; };\n`,
`// header\nconst y = 1;\n\n\nfunction z() { return y; }\n`,
`const w = 42; const v = w + 1; export {w, v};`,
`1 + 1;\n`,
];

describe('tuplesFromBabelDecodedMap', () => {
test.each(SAMPLES.map((code, i) => [i, code]))(
'is byte-identical to rawMappings.map(toSegmentTuple) [sample %i]',
(_i, code) => {
const ast = babylon.parse(code, {sourceType: 'unambiguous'});
const result = generate(
ast,
{sourceMaps: true, sourceFileName: 'file.js'},
code,
);
const fromRaw = (result.rawMappings ?? []).map(toSegmentTuple);
const fromDecoded = tuplesFromBabelDecodedMap(
nullthrowsLocal(result.decodedMap),
);
expect(fromDecoded).toEqual(fromRaw);
expect(fromDecoded.length).toBeGreaterThan(0);
},
);
});

function nullthrowsLocal<T>(x: ?T): T {
if (x == null) {
throw new Error('Expected decodedMap to be present');
}
return x;
}
8 changes: 7 additions & 1 deletion packages/metro-transform-worker/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
functionMapBabelPlugin,
toBabelSegments,
toSegmentTuple,
tuplesFromBabelDecodedMap,
} from 'metro-source-map';
import metroTransformPlugins from 'metro-transform-plugins';
import collectDependencies from 'metro/private/ModuleGraph/worker/collectDependencies';
Expand Down Expand Up @@ -471,7 +472,12 @@ async function transformJS(
file.code,
);

let map = result.rawMappings ? result.rawMappings.map(toSegmentTuple) : [];
// Derive tuples from Babel's eagerly-computed decoded map rather than
// `result.rawMappings`, which would trigger a second, more expensive decode
// (`allMappings`). Byte-identical to `result.rawMappings.map(toSegmentTuple)`.
let map = result.decodedMap
? tuplesFromBabelDecodedMap(result.decodedMap)
: [];
let code = result.code;

if (minify) {
Expand Down
Loading
Loading