metro 0.83.2 → 0.83.4

package/src/shared/output/writeFile.js.flow

@@ -12,9 +12,15 @@
 import fs from 'fs';
 import throat from 'throat';
 
-const writeFile: typeof fs.promises.writeFile = throat(
+const writeFileWithThroat: typeof fs.promises.writeFile = throat(
   128,
   fs.promises.writeFile,
 );
 
-export default writeFile;
+export default function writeFile(
+  filePath: string,
+  data: string | Buffer | Uint8Array,
+  encoding?: string,
+): Promise<void> {
+  return writeFileWithThroat(filePath, data, encoding);
+}

package/src/shared/types.js.flow

@@ -35,6 +35,17 @@ export enum SourcePathsMode {
   ServerUrl = 'url-server',
 }
 
+export type ReadonlySourceLocation = Readonly<{
+  start: Readonly<{
+    line: number,
+    column: number,
+  }>,
+  end: Readonly<{
+    line: number,
+    column: number,
+  }>,
+}>;
+
 export type BundleOptions = {
   +customResolverOptions: CustomResolverOptions,
   customTransformOptions: CustomTransformOptions,
@@ -45,7 +56,7 @@ export type BundleOptions = {
   +lazy: boolean,
   minify: boolean,
   +modulesOnly: boolean,
-  onProgress: ?(doneCont: number, totalCount: number) => mixed,
+  onProgress: ?(doneCont: number, totalCount: number) => unknown,
   +platform: ?string,
   +runModule: boolean,
   +shallow: boolean,
@@ -56,11 +67,11 @@ export type BundleOptions = {
   +sourcePaths: SourcePathsMode,
 };
 
-export type BuildOptions = $ReadOnly<{
+export type BuildOptions = Readonly<{
   withAssets?: boolean,
 }>;
 
-export type ResolverInputOptions = $ReadOnly<{
+export type ResolverInputOptions = Readonly<{
   customResolverOptions?: CustomResolverOptions,
   dev: boolean,
 }>;
@@ -81,7 +92,7 @@ export type GraphOptions = {
 };
 
 // Stricter representation of BundleOptions.
-export type SplitBundleOptions = $ReadOnly<{
+export type SplitBundleOptions = Readonly<{
   entryFile: string,
   resolverOptions: ResolverInputOptions,
   transformOptions: TransformInputOptions,
@@ -129,7 +140,11 @@ export type OutputOptions = {
   ...
 };
 
-export type RequestOptions = $ReadOnly<
+type SafeOptionalProps<T> = {
+  [K in keyof T]: T[K] extends void ? void | T[K] : T[K],
+};
+
+export type RequestOptions = Readonly<
   SafeOptionalProps<{
     entryFile: string,
     inlineSourceMap?: boolean,

package/src/Asset.d.ts

@@ -1,25 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-export interface AssetDataWithoutFiles {
-  readonly __packager_asset: boolean;
-  readonly fileSystemLocation: string;
-  readonly hash: string;
-  readonly height?: number;
-  readonly httpServerLocation: string;
-  readonly name: string;
-  readonly scales: number[];
-  readonly type: string;
-  readonly width?: number;
-}
-
-export interface AssetData extends AssetDataWithoutFiles {
-  readonly files: string[];
-}

package/src/Bundler.d.ts

@@ -1,39 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type {TransformResultWithSource} from './DeltaBundler';
-import type {TransformOptions} from './DeltaBundler/Worker';
-import type DependencyGraph from './node-haste/DependencyGraph';
-import type {EventEmitter} from 'events';
-import type {ConfigT} from 'metro-config';
-
-export interface BundlerOptions {
-  readonly hasReducedPerformance?: boolean;
-  readonly watch?: boolean;
-}
-
-export default class Bundler {
-  constructor(config: ConfigT, options?: BundlerOptions);
-
-  getWatcher(): EventEmitter;
-
-  end(): Promise<void>;
-
-  getDependencyGraph(): Promise<DependencyGraph>;
-
-  transformFile(
-    filePath: string,
-    transformOptions: TransformOptions,
-    /** Optionally provide the file contents, this can be used to provide virtual contents for a file. */
-    fileBuffer?: Buffer,
-  ): Promise<TransformResultWithSource<void>>;
-
-  ready(): Promise<void>;
-}

package/src/DeltaBundler/Graph.d.ts

@@ -1,40 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type {
-  Dependencies,
-  GraphInputOptions,
-  MixedOutput,
-  Module,
-  Options,
-  TransformInputOptions,
-} from './types';
-
-export interface Result<T> {
-  added: Map<string, Module<T>>;
-  modified: Map<string, Module<T>>;
-  deleted: Set<string>;
-}
-
-export class Graph<T = MixedOutput> {
-  entryPoints: ReadonlySet<string>;
-  transformOptions: TransformInputOptions;
-  dependencies: Dependencies<T>;
-  constructor(options: GraphInputOptions);
-  traverseDependencies(
-    paths: ReadonlyArray<string>,
-    options: Options<T>,
-  ): Promise<Result<T>>;
-  initialTraverseDependencies(options: Options<T>): Promise<Result<T>>;
-  markModifiedContextModules(
-    filePath: string,
-    modifiedPaths: Set<string>,
-  ): void;
-}

package/src/DeltaBundler/Serializers/getExplodedSourceMap.d.ts

@@ -1,26 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type {Module} from '../types';
-import type {
-  FBSourceFunctionMap,
-  MetroSourceMapSegmentTuple,
-} from 'metro-source-map';
-
-export type ExplodedSourceMap = ReadonlyArray<{
-  readonly map: Array<MetroSourceMapSegmentTuple>;
-  readonly firstLine1Based: number;
-  readonly functionMap: null | undefined | FBSourceFunctionMap;
-  readonly path: string;
-}>;
-export declare function getExplodedSourceMap(
-  modules: ReadonlyArray<Module>,
-  options: {readonly processModuleFilter: (module: Module) => boolean},
-): ExplodedSourceMap;

package/src/DeltaBundler/Serializers/getRamBundleInfo.d.ts

@@ -1,18 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import {ModuleTransportLike} from '../../shared/types';
-
-export interface RamBundleInfo {
-  getDependencies: (filePath: string) => Set<string>;
-  startupModules: Readonly<ModuleTransportLike>;
-  lazyModules: Readonly<ModuleTransportLike>;
-  groups: Map<number, Set<number>>;
-}

package/src/DeltaBundler/Worker.d.ts

@@ -1,45 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type {TransformResult} from './types';
-import type {
-  JsTransformerConfig,
-  JsTransformOptions,
-} from 'metro-transform-worker';
-
-type LogEntry = unknown;
-
-export type TransformOptions = JsTransformOptions;
-
-export interface Worker {
-  readonly transform: (
-    filename: string,
-    transformOptions: JsTransformOptions,
-    projectRoot: string,
-    transformerConfig: TransformerConfig,
-    fileBuffer?: Buffer,
-  ) => Promise<Data>;
-}
-
-export interface TransformerConfig {
-  transformerPath: string;
-  transformerConfig: JsTransformerConfig;
-}
-
-interface Data {
-  readonly result: TransformResult<void>;
-  readonly sha1: string;
-  readonly transformFileStartLogEntry: LogEntry;
-  readonly transformFileEndLogEntry: LogEntry;
-}
-
-declare const worker: Worker;
-
-export default worker;

package/src/DeltaBundler/types.d.ts

@@ -1,166 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type {RequireContext} from '../lib/contextModule';
-import type CountingSet from '../lib/CountingSet';
-import type {RequireContextParams} from '../ModuleGraph/worker/collectDependencies';
-import type {Graph} from './Graph';
-import type {JsTransformOptions} from 'metro-transform-worker';
-
-export interface MixedOutput {
-  readonly data: {code: string};
-  readonly type: string;
-}
-
-export type AsyncDependencyType = 'async' | 'prefetch' | 'weak';
-
-export interface TransformResultDependency {
-  /**
-   * The literal name provided to a require or import call. For example 'foo' in
-   * case of `require('foo')`.
-   */
-  readonly name: string;
-
-  /**
-   * Extra data returned by the dependency extractor.
-   */
-  readonly data: {
-    /**
-     * A locally unique key for this dependency within the current module.
-     */
-    readonly key: string;
-
-    /**
-     * If not null, this dependency is due to a dynamic `import()` or `__prefetchImport()` call.
-     */
-    readonly asyncType: AsyncDependencyType | null;
-
-    /**
-     * The dependency is enclosed in a try/catch block.
-     */
-    readonly isOptional?: boolean;
-
-    readonly locs: ReadonlyArray<{
-      readonly start: {readonly line: number; readonly column: number};
-      readonly end: {readonly line: number; readonly column: number};
-    }>;
-
-    /** Context for requiring a collection of modules. */
-    readonly contextParams?: RequireContextParams;
-  };
-}
-
-export interface Dependency {
-  readonly absolutePath: string;
-  readonly data: TransformResultDependency;
-  [key: string]: unknown;
-}
-
-export interface Module<T = MixedOutput> {
-  readonly dependencies: Map<string, Dependency>;
-  readonly inverseDependencies: CountingSet<string>;
-  readonly output: ReadonlyArray<T>;
-  readonly path: string;
-  readonly getSource: () => Buffer;
-}
-
-export type Dependencies<T = MixedOutput> = Map<string, Module<T>>;
-export type ReadOnlyDependencies<T = MixedOutput> = ReadonlyMap<
-  string,
-  Module<T>
->;
-
-export type TransformInputOptions = Omit<
-  JsTransformOptions,
-  'inlinePlatform' | 'inlineRequires'
->;
-
-export type GraphInputOptions = Readonly<{
-  entryPoints: ReadonlySet<string>;
-  // Unused in core but useful for custom serializers / experimentalSerializerHook
-  transformOptions: TransformInputOptions;
-}>;
-
-export interface ReadOnlyGraph<T = MixedOutput> {
-  readonly entryPoints: ReadonlySet<string>;
-  // Unused in core but useful for custom serializers / experimentalSerializerHook
-  readonly transformOptions: Readonly<TransformInputOptions>;
-  readonly dependencies: ReadOnlyDependencies<T>;
-}
-
-export type {Graph};
-
-export interface TransformResult<T = MixedOutput> {
-  dependencies: ReadonlyArray<TransformResultDependency>;
-  output: ReadonlyArray<T>;
-}
-
-export interface TransformResultWithSource<T = MixedOutput>
-  extends TransformResult<T> {
-  getSource: () => Buffer;
-}
-
-export type TransformFn<T = MixedOutput> = (
-  modulePath: string,
-  requireContext: RequireContext | null,
-) => Promise<TransformResultWithSource<T>>;
-
-export interface AllowOptionalDependenciesWithOptions {
-  readonly exclude: string[];
-}
-
-export type AllowOptionalDependencies =
-  | boolean
-  | AllowOptionalDependenciesWithOptions;
-
-export interface BundlerResolution {
-  readonly type: 'sourceFile';
-  readonly filePath: string;
-}
-
-export interface Options<T = MixedOutput> {
-  readonly resolve: (from: string, to: TransformResultDependency) => string;
-  readonly transform: TransformFn<T>;
-  readonly transformOptions: TransformInputOptions;
-  readonly onProgress:
-    | ((numProcessed: number, total: number) => unknown)
-    | null;
-  readonly lazy: boolean;
-  readonly unstable_allowRequireContext: boolean;
-  readonly shallow: boolean;
-}
-
-export interface DeltaResult<T = MixedOutput> {
-  readonly added: Map<string, Module<T>>;
-  readonly modified: Map<string, Module<T>>;
-  readonly deleted: Set<string>;
-  readonly reset: boolean;
-}
-
-export interface SerializerOptions<T = MixedOutput> {
-  readonly asyncRequireModulePath: string;
-  readonly createModuleId: (filePath: string) => number;
-  readonly dev: boolean;
-  readonly getRunModuleStatement: (
-    moduleId: number | string,
-    globalPrefix: string,
-  ) => string;
-  readonly includeAsyncPaths: boolean;
-  readonly inlineSourceMap?: boolean;
-  readonly modulesOnly: boolean;
-  readonly processModuleFilter: (module: Module<T>) => boolean;
-  readonly projectRoot: string;
-  readonly runBeforeMainModule: ReadonlyArray<string>;
-  readonly runModule: boolean;
-  readonly serverRoot: string;
-  readonly shouldAddToIgnoreList: (module: Module<T>) => boolean;
-  readonly sourceMapUrl?: string;
-  readonly sourceUrl?: string;
-}

package/src/DeltaBundler.d.ts

@@ -1,58 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type {
-  DeltaResult,
-  Graph,
-  MixedOutput,
-  Options,
-  ReadOnlyGraph,
-} from './DeltaBundler/types';
-import type {EventEmitter} from 'events';
-
-export type {
-  DeltaResult,
-  Graph,
-  Dependencies,
-  MixedOutput,
-  Module,
-  ReadOnlyGraph,
-  TransformFn,
-  TransformResult,
-  TransformResultDependency,
-  TransformResultWithSource,
-} from './DeltaBundler/types';
-
-export default class DeltaBundler<T = MixedOutput> {
-  constructor(changeEventSource: EventEmitter);
-  end(): void;
-  getDependencies(
-    entryPoints: ReadonlyArray<string>,
-    options: Options<T>,
-  ): Promise<ReadOnlyGraph<T>['dependencies']>;
-  buildGraph(
-    entryPoints: ReadonlyArray<string>,
-    options: Options<T>,
-  ): Promise<Graph<T>>;
-
-  getDelta(
-    graph: Graph<T>,
-    {
-      reset,
-      shallow,
-    }: {
-      reset: boolean;
-      shallow: boolean;
-    },
-  ): Promise<DeltaResult<T>>;
-
-  listen(graph: Graph<T>, callback: () => Promise<void>): () => void;
-  endGraph(graph: Graph<T>): void;
-}

package/src/IncrementalBundler.d.ts

@@ -1,98 +0,0 @@
-/**
- * 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.
- *
- * @format
- * @oncall react_native
- */
-
-import type Bundler from './Bundler';
-import type {
-  Options as DeltaBundlerOptions,
-  ReadOnlyDependencies,
-  TransformInputOptions,
-} from './DeltaBundler/types';
-import type {GraphId} from './lib/getGraphId';
-import type {ConfigT} from 'metro-config';
-
-import DeltaBundler, {DeltaResult, Graph, Module} from './DeltaBundler';
-import {ResolverInputOptions} from './shared/types';
-
-export type RevisionId = string;
-
-export type OutputGraph = Graph<void>;
-
-export interface OtherOptions {
-  readonly onProgress: DeltaBundlerOptions<void>['onProgress'];
-  readonly shallow: boolean;
-}
-
-export interface GraphRevision {
-  readonly id: RevisionId;
-  readonly date: Date;
-  readonly graphId: GraphId;
-  readonly graph: OutputGraph;
-  readonly prepend: ReadonlyArray<Module<void>>;
-}
-
-export interface IncrementalBundlerOptions {
-  readonly hasReducedPerformance?: boolean;
-  readonly watch?: boolean;
-}
-
-export default class IncrementalBundler {
-  static revisionIdFromString: (str: string) => RevisionId;
-  constructor(config: ConfigT, options?: IncrementalBundlerOptions);
-
-  end(): void;
-  getBundler(): Bundler;
-  getDeltaBundler(): DeltaBundler<void>;
-  getRevision(revisionId: RevisionId): Promise<GraphRevision> | null;
-  getRevisionByGraphId(graphId: GraphId): Promise<GraphRevision> | null;
-
-  buildGraphForEntries(
-    entryFiles: ReadonlyArray<string>,
-    transformOptions: TransformInputOptions,
-    resolverOptions: ResolverInputOptions,
-    otherOptions?: OtherOptions,
-  ): Promise<OutputGraph>;
-
-  getDependencies(
-    entryFiles: ReadonlyArray<string>,
-    transformOptions: TransformInputOptions,
-    resolverOptions: ResolverInputOptions,
-    otherOptions?: OtherOptions,
-  ): Promise<ReadOnlyDependencies<void>>;
-
-  buildGraph(
-    entryFile: string,
-    transformOptions: TransformInputOptions,
-    resolverOptions: ResolverInputOptions,
-    otherOptions?: OtherOptions,
-  ): Promise<
-    Readonly<{graph: OutputGraph; prepend: ReadonlyArray<Module<void>>}>
-  >;
-
-  initializeGraph(
-    entryFile: string,
-    transformOptions: TransformInputOptions,
-    resolverOptions: ResolverInputOptions,
-    otherOptions?: OtherOptions,
-  ): Promise<{
-    delta: DeltaResult<void>;
-    revision: GraphRevision;
-  }>;
-
-  updateGraph(
-    revision: GraphRevision,
-    reset: boolean,
-  ): Promise<{
-    delta: DeltaResult<void>;
-    revision: GraphRevision;
-  }>;
-
-  endGraph(graphId: GraphId): Promise<void>;
-  ready(): Promise<void>;
-}

package/src/ModuleGraph/test-helpers.js

@@ -1,75 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true,
-});
-exports.comparableCode = exports.codeFromAst = void 0;
-exports.toEqualComparableCode = toEqualComparableCode;
-exports.toMatchCodeFrameSnapshot = toMatchCodeFrameSnapshot;
-var _generator = _interopRequireDefault(require("@babel/generator"));
-var _jestSnapshot = require("jest-snapshot");
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-const generateOptions = {
-  concise: true,
-  sourceType: "module",
-};
-const codeFromAst = (ast) => (0, _generator.default)(ast, generateOptions).code;
-exports.codeFromAst = codeFromAst;
-const comparableCode = (code) => code.trim().replace(/\s+/g, " ");
-exports.comparableCode = comparableCode;
-function toEqualComparableCode(received, expected) {
-  const comparableExpected = comparableCode(expected);
-  const pass = received === comparableExpected;
-  const options = {
-    isNot: this.isNot,
-    promise: this.promise,
-  };
-  const message = pass
-    ? () =>
-        this.utils.matcherHint(
-          "toEqualComparableCode",
-          undefined,
-          undefined,
-          options,
-        ) +
-        "\n\n" +
-        `Expected: not ${this.utils.printExpected(comparableExpected)}\n` +
-        `Received: ${this.utils.printReceived(received)}`
-    : () => {
-        const diffString = this.utils.printDiffOrStringify(
-          comparableExpected,
-          received,
-          "expected",
-          "received",
-          this.expand,
-        );
-        return (
-          this.utils.matcherHint(
-            "toEqualComparableCode",
-            undefined,
-            undefined,
-            options,
-          ) +
-          "\n\n" +
-          diffString
-        );
-      };
-  return {
-    actual: received,
-    message,
-    pass,
-  };
-}
-const ANSI_PATTERN = /\x1b\[[0-9;]*m/g;
-function trimANSICodes(input) {
-  return input.replace(ANSI_PATTERN, "");
-}
-function toMatchCodeFrameSnapshot(received) {
-  return _jestSnapshot.toMatchSnapshot.call(
-    this,
-    trimANSICodes(received),
-    "toMatchCodeFrameSnapshot",
-  );
-}