metro 0.84.4 → 0.86.0

package/src/DeltaBundler/Transformer.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<15f603afc860c64c7acc5a6cfe2a6717>>
+ * @generated SignedSource<<74d76149d62fc6d50282472fa1e271fe>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/Transformer.js
@@ -15,22 +15,14 @@
  *   yarn run build-ts-defs (OSS) 
  */
 
-import type {TransformResult, TransformResultWithSource} from '../DeltaBundler';
+import type {TransformResultWithSource} from '../DeltaBundler';
 import type {TransformOptions} from './Worker';
 import type {ConfigT} from 'metro-config';
 
-import WorkerFarm from './WorkerFarm';
-import {Cache} from 'metro-cache';
-
 type GetOrComputeSha1Fn = (
   $$PARAM_0$$: string,
 ) => Promise<Readonly<{content?: Buffer; sha1: string}>>;
 declare class Transformer {
-  _config: ConfigT;
-  _cache: Cache<TransformResult>;
-  _baseHash: string;
-  _getSha1: GetOrComputeSha1Fn;
-  _workerFarm: WorkerFarm;
   constructor(
     config: ConfigT,
     opts: Readonly<{getOrComputeSha1: GetOrComputeSha1Fn}>,

package/src/DeltaBundler/Worker.flow.js.flow

@@ -91,7 +91,7 @@ export const transform = (
 };
 
 export type Worker = {
-  +transform: typeof transform,
+  readonly transform: typeof transform,
 };
 
 async function transformFile(

package/src/DeltaBundler/WorkerFarm.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<bbd52f1dc5e4a9253455034b585115ac>>
+ * @generated SignedSource<<d9d13bcad23924cbcf706b93e621e91c>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/WorkerFarm.js
@@ -16,29 +16,11 @@
  */
 
 import type {TransformResult} from '../DeltaBundler';
-import type {TransformerConfig, TransformOptions, Worker} from './Worker';
+import type {TransformerConfig, TransformOptions} from './Worker';
 import type {ConfigT} from 'metro-config';
-import type {Readable} from 'stream';
 
-type WorkerInterface = Readonly<
-  Omit<
-    Worker,
-    keyof {
-      end(): void | Promise<void>;
-      getStdout(): Readable;
-      getStderr(): Readable;
-    }
-  > & {
-    end(): void | Promise<void>;
-    getStdout(): Readable;
-    getStderr(): Readable;
-  }
->;
 type TransformerResult = Readonly<{result: TransformResult; sha1: string}>;
 declare class WorkerFarm {
-  _config: ConfigT;
-  _transformerConfig: TransformerConfig;
-  _worker: WorkerInterface | Worker;
   constructor(config: ConfigT, transformerConfig: TransformerConfig);
   kill(): Promise<void>;
   transform(
@@ -46,32 +28,5 @@ declare class WorkerFarm {
     options: TransformOptions,
     fileBuffer?: Buffer,
   ): Promise<TransformerResult>;
-  _makeFarm(
-    absoluteWorkerPath: string,
-    exposedMethods: ReadonlyArray<string>,
-    numWorkers: number,
-  ): WorkerInterface;
-  _computeWorkerKey(
-    method: string,
-    filename: string,
-  ): null | undefined | string;
-  _formatGenericError(
-    err: Readonly<{message: string; stack?: string}>,
-    filename: string,
-  ): TransformError;
-  _formatBabelError(
-    err: Readonly<{
-      message: string;
-      stack?: string;
-      type?: string;
-      codeFrame?: unknown;
-      loc: {line?: number; column?: number};
-    }>,
-    filename: string,
-  ): TransformError;
 }
 export default WorkerFarm;
-declare class TransformError extends SyntaxError {
-  type: string;
-  constructor(message: string);
-}

package/src/DeltaBundler/getTransformCacheKey.js.flow

@@ -26,9 +26,9 @@ type CacheKeyProvider = {
 };
 
 export default function getTransformCacheKey(opts: {
-  +cacheVersion: string,
-  +projectRoot: string,
-  +transformerConfig: TransformerConfig,
+  readonly cacheVersion: string,
+  readonly projectRoot: string,
+  readonly transformerConfig: TransformerConfig,
 }): string {
   const {transformerPath, transformerConfig} = opts.transformerConfig;
 

package/src/DeltaBundler/types.js.flow

@@ -18,8 +18,8 @@ import type {JsTransformOptions} from 'metro-transform-worker';
 import CountingSet from '../lib/CountingSet';
 
 export type MixedOutput = {
-  +data: unknown,
-  +type: string,
+  readonly data: unknown,
+  readonly type: string,
 };
 
 export type AsyncDependencyType = 'async' | 'maybeSync' | 'prefetch' | 'weak';
@@ -106,10 +106,10 @@ export type GraphInputOptions = Readonly<{
 }>;
 
 export interface ReadOnlyGraph<T = MixedOutput> {
-  +entryPoints: ReadonlySet<string>;
+  readonly entryPoints: ReadonlySet<string>;
   // Unused in core but useful for custom serializers / experimentalSerializerHook
-  +transformOptions: Readonly<TransformInputOptions>;
-  +dependencies: ReadOnlyDependencies<T>;
+  readonly transformOptions: Readonly<TransformInputOptions>;
+  readonly dependencies: ReadOnlyDependencies<T>;
 }
 
 export type {Graph};
@@ -136,7 +136,7 @@ export type ResolveFn = (
 ) => BundlerResolution;
 
 export type AllowOptionalDependenciesWithOptions = {
-  +exclude: Array<string>,
+  readonly exclude: Array<string>,
 };
 export type AllowOptionalDependencies =
   | boolean
@@ -160,10 +160,10 @@ export type Options<T = MixedOutput> = Readonly<{
 }>;
 
 export type DeltaResult<T = MixedOutput> = {
-  +added: Map<string, Module<T>>,
-  +modified: Map<string, Module<T>>,
-  +deleted: Set<string>,
-  +reset: boolean,
+  readonly added: Map<string, Module<T>>,
+  readonly modified: Map<string, Module<T>>,
+  readonly deleted: Set<string>,
+  readonly reset: boolean,
 };
 
 export type SerializerOptions = Readonly<{

package/src/DeltaBundler.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<db564db653a99b07f3ad7585b2bed707>>
+ * @generated SignedSource<<4392a52adb92ee60889197cf5c38516d>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler.js
@@ -24,8 +24,6 @@ import type {
 } from './DeltaBundler/types';
 import type EventEmitter from 'events';
 
-import DeltaCalculator from './DeltaBundler/DeltaCalculator';
-
 export type {
   DeltaResult,
   Graph,
@@ -45,8 +43,6 @@ export type {
  * `clientId` param (which maps a client to a specific delta transformer).
  */
 declare class DeltaBundler<T = MixedOutput> {
-  _changeEventSource: EventEmitter;
-  _deltaCalculators: Map<Graph<T>, DeltaCalculator<T>>;
   constructor(changeEventSource: EventEmitter);
   end(): void;
   getDependencies(

package/src/HmrServer.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<ab4c245134631e14db114a9d49da79d1>>
+ * @generated SignedSource<<48bfe42125bd22a8329f95a30fa90b64>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/HmrServer.js
@@ -18,25 +18,13 @@ import type {
   RevisionId,
   default as IncrementalBundler,
 } from './IncrementalBundler';
-import type {GraphOptions} from './shared/types';
-import type {ConfigT, RootPerfLogger} from 'metro-config';
-import type {
-  HmrErrorMessage,
-  HmrUpdateMessage,
-} from 'metro-runtime/src/modules/types';
+import type {ConfigT} from 'metro-config';
 
 export type Client = {
   optedIntoHMR: boolean;
   revisionIds: Array<RevisionId>;
   readonly sendFn: ($$PARAM_0$$: string) => void;
 };
-type ClientGroup = {
-  readonly clients: Set<Client>;
-  clientUrl: URL;
-  revisionId: RevisionId;
-  readonly unlisten: () => void;
-  readonly graphOptions: GraphOptions;
-};
 /**
  * The HmrServer (Hot Module Reloading) implements a lightweight interface
  * to communicate easily to the logic in the React Native repository (which
@@ -47,10 +35,6 @@ type ClientGroup = {
  * `onClientConnect`, `onClientDisconnect` and `onClientError` methods).
  */
 declare class HmrServer<TClient extends Client> {
-  _config: ConfigT;
-  _bundler: IncrementalBundler;
-  _createModuleId: (path: string) => number;
-  _clientGroups: Map<RevisionId, ClientGroup>;
   constructor(
     bundler: IncrementalBundler,
     createModuleId: (path: string) => number,
@@ -60,11 +44,6 @@ declare class HmrServer<TClient extends Client> {
     requestUrl: string,
     sendFn: (data: string) => void,
   ) => Promise<Client>;
-  _registerEntryPoint(
-    client: Client,
-    originalRequestUrl: string,
-    sendFn: (data: string) => void,
-  ): Promise<void>;
   onClientMessage: (
     client: TClient,
     message: string | Buffer | ArrayBuffer | Array<Buffer>,
@@ -72,27 +51,5 @@ declare class HmrServer<TClient extends Client> {
   ) => Promise<void>;
   onClientError: (client: TClient, e: Error) => void;
   onClientDisconnect: (client: TClient) => void;
-  _handleFileChange(
-    group: ClientGroup,
-    options: {isInitialUpdate: boolean},
-    changeEvent:
-      | null
-      | undefined
-      | {
-          readonly logger: null | undefined | RootPerfLogger;
-          readonly changeId?: string;
-        },
-  ): Promise<void>;
-  _prepareMessage(
-    group: ClientGroup,
-    options: {isInitialUpdate: boolean},
-    changeEvent:
-      | null
-      | undefined
-      | {
-          readonly logger: null | undefined | RootPerfLogger;
-          readonly changeId?: string;
-        },
-  ): Promise<HmrUpdateMessage | HmrErrorMessage>;
 }
 export default HmrServer;

package/src/HmrServer.js.flow

@@ -41,15 +41,15 @@ const {createActionStartEntry, createActionEndEntry, log} = Logger;
 export type Client = {
   optedIntoHMR: boolean,
   revisionIds: Array<RevisionId>,
-  +sendFn: string => void,
+  readonly sendFn: string => void,
 };
 
 type ClientGroup = {
-  +clients: Set<Client>,
+  readonly clients: Set<Client>,
   clientUrl: URL,
   revisionId: RevisionId,
-  +unlisten: () => void,
-  +graphOptions: GraphOptions,
+  readonly unlisten: () => void,
+  readonly graphOptions: GraphOptions,
 };
 
 function send(sendFns: Array<(string) => void>, message: HmrMessage): void {
@@ -181,8 +181,8 @@ export default class HmrServer<TClient extends Client> {
       this._clientGroups.set(id, clientGroup);
 
       let latestChangeEvent: ?{
-        +logger: ?RootPerfLogger,
-        +changeId: string,
+        readonly logger: ?RootPerfLogger,
+        readonly changeId: string,
       } = null;
 
       const debounceCallHandleFileChange = debounceAsyncQueue(async () => {
@@ -278,8 +278,8 @@ export default class HmrServer<TClient extends Client> {
     group: ClientGroup,
     options: {isInitialUpdate: boolean},
     changeEvent: ?{
-      +logger: ?RootPerfLogger,
-      +changeId?: string,
+      readonly logger: ?RootPerfLogger,
+      readonly changeId?: string,
     },
   ): Promise<void> {
     const logger = !options.isInitialUpdate ? changeEvent?.logger : null;
@@ -337,8 +337,8 @@ export default class HmrServer<TClient extends Client> {
     group: ClientGroup,
     options: {isInitialUpdate: boolean},
     changeEvent: ?{
-      +logger: ?RootPerfLogger,
-      +changeId?: string,
+      readonly logger: ?RootPerfLogger,
+      readonly changeId?: string,
     },
   ): Promise<HmrUpdateMessage | HmrErrorMessage> {
     const logger = !options.isInitialUpdate ? changeEvent?.logger : null;

package/src/IncrementalBundler.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<0ec72971869a882d97b381e3f1baa922>>
+ * @generated SignedSource<<7ce634e158aa8f2ac74e32940e9e97c1>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/IncrementalBundler.js
@@ -47,11 +47,6 @@ export type IncrementalBundlerOptions = Readonly<{
   watch?: boolean;
 }>;
 declare class IncrementalBundler {
-  _config: ConfigT;
-  _bundler: Bundler;
-  _deltaBundler: DeltaBundler;
-  _revisionsById: Map<RevisionId, Promise<GraphRevision>>;
-  _revisionsByGraphId: Map<GraphId, Promise<GraphRevision>>;
   static revisionIdFromString: (str: string) => RevisionId;
   constructor(config: ConfigT, options?: IncrementalBundlerOptions);
   end(): Promise<void>;
@@ -95,9 +90,6 @@ declare class IncrementalBundler {
     reset: boolean,
   ): Promise<{delta: DeltaResult; revision: GraphRevision}>;
   endGraph(graphId: GraphId): Promise<void>;
-  _getAbsoluteEntryFiles(
-    entryFiles: ReadonlyArray<string>,
-  ): Promise<ReadonlyArray<string>>;
   ready(): Promise<void>;
 }
 export default IncrementalBundler;

package/src/IncrementalBundler.js.flow

@@ -41,11 +41,11 @@ type OtherOptions = Readonly<{
 
 export type GraphRevision = {
   // Identifies the last computed revision.
-  +id: RevisionId,
-  +date: Date,
-  +graphId: GraphId,
-  +graph: OutputGraph,
-  +prepend: ReadonlyArray<Module<>>,
+  readonly id: RevisionId,
+  readonly date: Date,
+  readonly graphId: GraphId,
+  readonly graph: OutputGraph,
+  readonly prepend: ReadonlyArray<Module<>>,
 };
 
 export type IncrementalBundlerOptions = Readonly<{
@@ -199,7 +199,10 @@ export default class IncrementalBundler {
       shallow: false,
       lazy: false,
     },
-  ): Promise<{+graph: OutputGraph, +prepend: ReadonlyArray<Module<>>}> {
+  ): Promise<{
+    readonly graph: OutputGraph,
+    readonly prepend: ReadonlyArray<Module<>>,
+  }> {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,

package/src/ModuleGraph/worker/collectDependencies.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<ab2d1203f736c3032c6b9d15cc74680b>>
+ * @generated SignedSource<<f072a86187014259ece27c02d9abfd6a>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/ModuleGraph/worker/collectDependencies.js
@@ -132,7 +132,6 @@ export type ImportQualifier = Readonly<{
   contextParams?: RequireContextParams;
 }>;
 declare class DependencyRegistry {
-  _dependencies: Map<string, InternalDependency>;
   registerDependency(qualifier: ImportQualifier): InternalDependency;
   getDependencies(): Array<InternalDependency>;
 }

package/src/Server/symbolicate.js

@@ -5,7 +5,67 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = symbolicate;
 var _search = require("metro-source-map/private/Consumer/search");
+var _LineIndexedMappings = _interopRequireDefault(
+  require("metro-source-map/private/LineIndexedMappings"),
+);
 var _Symbolication = require("metro-symbolicate/private/Symbolication");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
+const lineIndexCache = new WeakMap();
+function originalPositionInModule(
+  map,
+  generatedLine1Based,
+  generatedColumn0Based,
+) {
+  if (Array.isArray(map)) {
+    return originalPositionInTuples(
+      map,
+      generatedLine1Based,
+      generatedColumn0Based,
+    );
+  }
+  let decoded = lineIndexCache.get(map);
+  if (decoded == null) {
+    decoded = new _LineIndexedMappings.default(map.mappings);
+    lineIndexCache.set(map, decoded);
+  }
+  return decoded.originalPositionFor(
+    generatedLine1Based,
+    generatedColumn0Based,
+  );
+}
+function originalPositionInTuples(
+  mappings,
+  generatedLine1Based,
+  generatedColumn0Based,
+) {
+  const target = {
+    line1Based: generatedLine1Based,
+    column0Based: generatedColumn0Based,
+  };
+  const mappingIndex = (0, _search.greatestLowerBound)(
+    mappings,
+    target,
+    (t, candidate) => {
+      if (t.line1Based === candidate[0]) {
+        return t.column0Based - candidate[1];
+      }
+      return t.line1Based - candidate[0];
+    },
+  );
+  if (mappingIndex == null) {
+    return null;
+  }
+  const mapping = mappings[mappingIndex];
+  if (mapping[0] !== target.line1Based || mapping.length < 4) {
+    return null;
+  }
+  return {
+    line1Based: mapping[2],
+    column0Based: mapping[3],
+  };
+}
 function createFunctionNameGetter(module) {
   const consumer = new _Symbolication.SourceMetadataMapConsumer(
     {
@@ -46,38 +106,16 @@ async function symbolicate(stack, maps, config, extraData) {
     return map[moduleIndex];
   }
   function findOriginalPos(frame, module) {
-    if (
-      module.map == null ||
-      frame.lineNumber == null ||
-      frame.column == null
-    ) {
+    const lineNumber = frame.lineNumber;
+    const column = frame.column;
+    if (module.map == null || lineNumber == null || column == null) {
       return null;
     }
-    const generatedPosInModule = {
-      line1Based: frame.lineNumber - module.firstLine1Based + 1,
-      column0Based: frame.column,
-    };
-    const mappingIndex = (0, _search.greatestLowerBound)(
+    return originalPositionInModule(
       module.map,
-      generatedPosInModule,
-      (target, candidate) => {
-        if (target.line1Based === candidate[0]) {
-          return target.column0Based - candidate[1];
-        }
-        return target.line1Based - candidate[0];
-      },
+      lineNumber - module.firstLine1Based + 1,
+      column,
     );
-    if (mappingIndex == null) {
-      return null;
-    }
-    const mapping = module.map[mappingIndex];
-    if (mapping[0] !== generatedPosInModule.line1Based || mapping.length < 4) {
-      return null;
-    }
-    return {
-      line1Based: mapping[2],
-      column0Based: mapping[3],
-    };
   }
   function findFunctionName(originalPos, module) {
     if (module.functionMap) {
@@ -97,11 +135,6 @@ async function symbolicate(stack, maps, config, extraData) {
         ...frame,
       };
     }
-    if (!Array.isArray(module.map)) {
-      throw new Error(
-        `Unexpected module with serialized source map found: ${module.path}`,
-      );
-    }
     const originalPos = findOriginalPos(frame, module);
     if (!originalPos) {
       return {