metro-source-map 0.83.3 → 0.83.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-source-map",
-  "version": "0.83.3",
+  "version": "0.83.5",
   "description": "🚇 Source map generator for Metro.",
   "main": "src/source-map.js",
   "exports": {
@@ -10,28 +10,28 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/metro.git"
+    "url": "git+https://github.com/facebook/metro.git",
+    "directory": "packages/metro-source-map"
   },
   "scripts": {
     "prepare-release": "test -d build && rm -rf src.real && mv src src.real && mv build src",
     "cleanup-release": "test ! -e build && mv src build && mv src.real src"
   },
   "dependencies": {
-    "@babel/traverse": "^7.25.3",
-    "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
-    "@babel/types": "^7.25.2",
+    "@babel/traverse": "^7.29.0",
+    "@babel/types": "^7.29.0",
     "flow-enums-runtime": "^0.0.6",
     "invariant": "^2.2.4",
-    "metro-symbolicate": "0.83.3",
+    "metro-symbolicate": "0.83.5",
     "nullthrows": "^1.1.1",
-    "ob1": "0.83.3",
+    "ob1": "0.83.5",
     "source-map": "^0.5.6",
     "vlq": "^1.0.0"
   },
   "license": "MIT",
   "devDependencies": {
     "@babel/core": "^7.25.2",
-    "@babel/parser": "^7.25.3",
+    "@babel/parser": "^7.29.0",
     "terser": "^5.15.0"
   },
   "engines": {

package/src/BundleBuilder.js.flow

@@ -13,8 +13,8 @@ import type {IndexMap, IndexMapSection, MixedSourceMap} from './source-map';
 
 const EMPTY_MAP = {
   version: 3,
-  sources: ([]: Array<string>),
-  names: ([]: Array<string>),
+  sources: [] as Array<string>,
+  names: [] as Array<string>,
   mappings: 'A',
 };
 

package/src/Consumer/AbstractConsumer.js.flow

@@ -39,8 +39,8 @@ export default class AbstractConsumer implements IConsumer {
   }
 
   eachMapping(
-    callback: (mapping: Mapping) => mixed,
-    context?: mixed = null,
+    callback: (mapping: Mapping) => unknown,
+    context?: unknown = null,
     order?: IterationOrder = GENERATED_ORDER,
   ): void {
     invariant(

package/src/Consumer/DelegatingConsumer.js.flow

@@ -57,8 +57,8 @@ export default class DelegatingConsumer implements IConsumer {
   }
 
   eachMapping(
-    callback: (mapping: Mapping) => mixed,
-    context?: mixed,
+    callback: (mapping: Mapping) => unknown,
+    context?: unknown,
     order?: IterationOrder,
   ): void {
     return this._rootConsumer.eachMapping(callback, context, order);

package/src/Consumer/MappingsConsumer.js.flow

@@ -41,8 +41,8 @@ export default class MappingsConsumer
   implements IConsumer
 {
   _sourceMap: BasicSourceMap;
-  _decodedMappings: ?$ReadOnlyArray<Mapping>;
-  _normalizedSources: ?$ReadOnlyArray<string>;
+  _decodedMappings: ?ReadonlyArray<Mapping>;
+  _normalizedSources: ?ReadonlyArray<string>;
 
   constructor(sourceMap: BasicSourceMap) {
     super(sourceMap);
@@ -175,7 +175,7 @@ export default class MappingsConsumer
     }
   }
 
-  _normalizeAndCacheSources(): $ReadOnlyArray<string> {
+  _normalizeAndCacheSources(): ReadonlyArray<string> {
     if (!this._normalizedSources) {
       this._normalizedSources = this._sourceMap.sources.map(source =>
         normalizeSourcePath(source, this._sourceMap),
@@ -184,7 +184,7 @@ export default class MappingsConsumer
     return this._normalizedSources;
   }
 
-  _decodeAndCacheMappings(): $ReadOnlyArray<Mapping> {
+  _decodeAndCacheMappings(): ReadonlyArray<Mapping> {
     if (!this._decodedMappings) {
       this._decodedMappings = [...this._decodeMappings()];
     }

package/src/Consumer/SectionsConsumer.js.flow

@@ -33,7 +33,7 @@ export default class SectionsConsumer
   extends AbstractConsumer
   implements IConsumer
 {
-  _consumers: $ReadOnlyArray<[GeneratedOffset, IConsumer]>;
+  _consumers: ReadonlyArray<[GeneratedOffset, IConsumer]>;
 
   constructor(sourceMap: IndexMap) {
     super(sourceMap);

package/src/Consumer/constants.js.flow

@@ -24,7 +24,7 @@ export opaque type LookupBias = 'GREATEST_LOWER_BOUND' | 'LEAST_UPPER_BOUND';
 const GREATEST_LOWER_BOUND: LookupBias = 'GREATEST_LOWER_BOUND';
 const LEAST_UPPER_BOUND: LookupBias = 'LEAST_UPPER_BOUND';
 
-const EMPTY_POSITION: $ReadOnly<{
+const EMPTY_POSITION: Readonly<{
   source: null,
   name: null,
   line: null,

package/src/Consumer/createConsumer.js.flow

@@ -18,7 +18,7 @@ import invariant from 'invariant';
 
 export default function createConsumer(sourceMap: MixedSourceMap): IConsumer {
   invariant(
-    (sourceMap.version: mixed) === '3' || sourceMap.version === 3,
+    (sourceMap.version as unknown) === '3' || sourceMap.version === 3,
     `Unrecognized source map format version: ${sourceMap.version}`,
   );
 

package/src/Consumer/search.js.flow

@@ -10,7 +10,7 @@
  */
 
 export function greatestLowerBound<T, U>(
-  elements: $ReadOnlyArray<T>,
+  elements: ReadonlyArray<T>,
   target: U,
   comparator: (U, T) => number,
 ): ?number {

package/src/Consumer/types.js.flow

@@ -33,7 +33,7 @@ export type GeneratedPositionLookup = {
   ...
 };
 
-export type Mapping = $ReadOnly<{
+export type Mapping = Readonly<{
   source: ?string,
   generatedLine: Number1,
   generatedColumn: Number0,
@@ -51,8 +51,8 @@ export interface IConsumer {
   generatedMappings(): Iterable<Mapping>;
 
   eachMapping(
-    callback: (mapping: Mapping) => mixed,
-    context?: mixed,
+    callback: (mapping: Mapping) => unknown,
+    context?: unknown,
     order?: IterationOrder,
   ): void;
 

package/src/Generator.js.flow

@@ -17,7 +17,7 @@ import type {
 
 import B64Builder from './B64Builder';
 
-type FileFlags = $ReadOnly<{
+type FileFlags = Readonly<{
   addToIgnoreList?: boolean,
 }>;
 
@@ -199,7 +199,7 @@ export default class Generator {
         }
       : {};
 
-    return ({
+    return {
       version: 3,
       file,
       sources: this.sources.slice(),
@@ -208,7 +208,7 @@ export default class Generator {
       ...ignoreList,
       names: this.names.items(),
       mappings: this.builder.toString(),
-    }: BasicSourceMap);
+    } as BasicSourceMap;
   }
 
   /**

package/src/composeSourceMaps.js.flow

@@ -21,7 +21,7 @@ Consumer;
 
 // Originally based on https://github.com/jakobwesthoff/source-map-merger
 export default function composeSourceMaps(
-  maps: $ReadOnlyArray<MixedSourceMap>,
+  maps: ReadonlyArray<MixedSourceMap>,
 ): MixedSourceMap {
   // NOTE: require() here to break dependency cycle
   const SourceMetadataMapConsumer =
@@ -93,7 +93,7 @@ export default function composeSourceMaps(
 }
 
 function findOriginalPosition(
-  consumers: $ReadOnlyArray<IConsumer>,
+  consumers: ReadonlyArray<IConsumer>,
   generatedLine: Number1,
   generatedColumn: Number0,
 ): {

package/src/encode.js.flow

@@ -49,7 +49,7 @@
  * Associate this with the THIRD_PARTY_LICENCE type to ensure it isn't
  * stripped by flow-api-translator.
  */
-export type THIRD_PARTY_LICENSE = mixed;
+export type THIRD_PARTY_LICENSE = unknown;
 
 /* eslint-disable no-bitwise */
 

package/src/generateFunctionMap.js

@@ -7,36 +7,38 @@ exports.functionMapBabelPlugin = functionMapBabelPlugin;
 exports.generateFunctionMap = generateFunctionMap;
 exports.generateFunctionMappingsArray = generateFunctionMappingsArray;
 var _B64Builder = _interopRequireDefault(require("./B64Builder"));
-var _traverseForGenerateFunctionMap = _interopRequireDefault(
-  require("@babel/traverse--for-generate-function-map"),
-);
+var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var _types = _interopRequireWildcard(require("@babel/types"));
 var t = _types;
 var _invariant = _interopRequireDefault(require("invariant"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 var _path = _interopRequireDefault(require("path"));
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
-    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e)
-    if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-      var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-      i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = { __proto__: null, default: e };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
@@ -147,7 +149,7 @@ function getFunctionMapVisitor(context, pushMapping) {
 }
 function forEachMapping(ast, context, pushMapping) {
   const visitor = getFunctionMapVisitor(context, pushMapping);
-  (0, _traverseForGenerateFunctionMap.default)(ast, {
+  (0, _traverse.default)(ast, {
     noScope: true,
     Function: visitor,
     Program: visitor,

package/src/generateFunctionMap.js.flow

@@ -16,8 +16,7 @@ import type {Node as BabelNode} from '@babel/types';
 import type {MetroBabelFileMetadata} from 'metro-babel-transformer';
 
 import B64Builder from './B64Builder';
-// $FlowFixMe[cannot-resolve-module] - resolves to @babel/traverse
-import traverseForGenerateFunctionMap from '@babel/traverse--for-generate-function-map';
+import traverse from '@babel/traverse';
 import * as t from '@babel/types';
 import {
   isAssignmentExpression,
@@ -98,7 +97,7 @@ function generateFunctionMap(
 function generateFunctionMappingsArray(
   ast: BabelNode,
   context?: Context,
-): $ReadOnlyArray<RangeMapping> {
+): ReadonlyArray<RangeMapping> {
   const mappings = [];
   forEachMapping(ast, context, mapping => {
     mappings.push(mapping);
@@ -218,11 +217,7 @@ function forEachMapping(
 ) {
   const visitor = getFunctionMapVisitor(context, pushMapping);
 
-  // Traversing populates/pollutes the path cache (`traverse.cache.path`) with
-  // values missing the `hub` property needed by Babel transformation, so we
-  // use a separate copy of traverse to populate a separate cache to not pollute
-  // the main @babel/traverse cache. See: https://github.com/facebook/metro/pull/1340
-  traverseForGenerateFunctionMap(ast, {
+  traverse(ast, {
     // Our visitor doesn't care about scope
     noScope: true,
 
@@ -416,7 +411,7 @@ function getNameFromId(id: BabelNode): ?string {
   return parts.join('.');
 }
 
-function getNamePartsFromId(id: BabelNode): $ReadOnlyArray<string> {
+function getNamePartsFromId(id: BabelNode): ReadonlyArray<string> {
   if (!id) {
     return [];
   }

package/src/source-map.js.flow

@@ -35,18 +35,18 @@ export type MetroSourceMapSegmentTuple =
   | SourceMapping
   | GeneratedCodeMapping;
 
-export type HermesFunctionOffsets = {[number]: $ReadOnlyArray<number>, ...};
+export type HermesFunctionOffsets = {[number]: ReadonlyArray<number>, ...};
 
-export type FBSourcesArray = $ReadOnlyArray<?FBSourceMetadata>;
+export type FBSourcesArray = ReadonlyArray<?FBSourceMetadata>;
 export type FBSourceMetadata = [?FBSourceFunctionMap];
 export type FBSourceFunctionMap = {
-  +names: $ReadOnlyArray<string>,
+  +names: ReadonlyArray<string>,
   +mappings: string,
 };
 
-export type BabelSourceMapSegment = $ReadOnly<{
-  generated: $ReadOnly<{column: number, line: number, ...}>,
-  original?: $ReadOnly<{column: number, line: number, ...}>,
+export type BabelSourceMapSegment = Readonly<{
+  generated: Readonly<{column: number, line: number, ...}>,
+  original?: Readonly<{column: number, line: number, ...}>,
   source?: ?string,
   name?: ?string,
   ...
@@ -108,8 +108,8 @@ type SourceMapConsumerMapping = {
 function fromRawMappingsImpl(
   isBlocking: boolean,
   onDone: Generator => void,
-  modules: $ReadOnlyArray<{
-    +map: ?$ReadOnlyArray<MetroSourceMapSegmentTuple>,
+  modules: ReadonlyArray<{
+    +map: ?ReadonlyArray<MetroSourceMapSegmentTuple>,
     +functionMap: ?FBSourceFunctionMap,
     +path: string,
     +source: string,
@@ -179,8 +179,8 @@ function fromRawMappingsImpl(
  * the resulting bundle, e.g. by some prefix code.
  */
 function fromRawMappings(
-  modules: $ReadOnlyArray<{
-    +map: ?$ReadOnlyArray<MetroSourceMapSegmentTuple>,
+  modules: ReadonlyArray<{
+    +map: ?ReadonlyArray<MetroSourceMapSegmentTuple>,
     +functionMap: ?FBSourceFunctionMap,
     +path: string,
     +source: string,
@@ -206,8 +206,8 @@ function fromRawMappings(
 }
 
 async function fromRawMappingsNonBlocking(
-  modules: $ReadOnlyArray<{
-    +map: ?$ReadOnlyArray<MetroSourceMapSegmentTuple>,
+  modules: ReadonlyArray<{
+    +map: ?ReadonlyArray<MetroSourceMapSegmentTuple>,
     +functionMap: ?FBSourceFunctionMap,
     +path: string,
     +source: string,