metro 0.83.3 → 0.83.5

package/src/shared/output/RamBundle/as-indexed-file.d.ts

@@ -0,0 +1,38 @@
+/**
+ * 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 {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
+import type {
+  ModuleGroups,
+  ModuleTransportLike,
+  OutputOptions,
+} from '../../types';
+/**
+ * Saves all JS modules of an app as a single file, separated with null bytes.
+ * The file begins with an offset table that contains module ids and their
+ * lengths/offsets.
+ * The module id for the startup code (prelude, polyfills etc.) is the
+ * empty string.
+ */
+export declare function save(
+  bundle: RamBundleInfo,
+  options: OutputOptions,
+  log: (...args: Array<string>) => void,
+): Promise<unknown>;
+export declare function buildTableAndContents(
+  startupCode: string,
+  modules: ReadonlyArray<ModuleTransportLike>,
+  moduleGroups: ModuleGroups,
+  encoding?: 'utf8' | 'utf16le' | 'ascii',
+): Array<Buffer>;
+export declare function createModuleGroups(
+  groups: Map<number, Set<number>>,
+  modules: ReadonlyArray<ModuleTransportLike>,
+): ModuleGroups;

package/src/shared/output/RamBundle/as-indexed-file.js.flow

@@ -37,7 +37,7 @@ export function save(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (...args: Array<string>) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -96,7 +96,7 @@ function writeBuffers(
   buffers: Array<Buffer>,
 ): Promise<void> {
   buffers.forEach((buffer: Buffer) => stream.write(buffer));
-  return new Promise((resolve: () => void, reject: mixed => mixed) => {
+  return new Promise((resolve: () => void, reject: unknown => unknown) => {
     stream.on('error', reject);
     stream.on('finish', () => resolve());
     stream.end();
@@ -196,7 +196,7 @@ function groupCode(
 }
 
 function buildModuleBuffers(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups: ModuleGroups,
   encoding: void | 'ascii' | 'utf16le' | 'utf8',
 ): Array<{
@@ -217,7 +217,7 @@ function buildModuleBuffers(
 
 export function buildTableAndContents(
   startupCode: string,
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups: ModuleGroups,
   encoding?: 'utf8' | 'utf16le' | 'ascii',
 ): Array<Buffer> {
@@ -242,7 +242,7 @@ export function buildTableAndContents(
 
 export function createModuleGroups(
   groups: Map<number, Set<number>>,
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
 ): ModuleGroups {
   return {
     groups,

package/src/shared/output/RamBundle/buildSourcemapWithMetadata.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 {ModuleGroups, ModuleTransportLike} from '../../types';
+import type {IndexMap} from 'metro-source-map';
+
+type Params = {
+  fixWrapperOffset: boolean;
+  lazyModules: ReadonlyArray<ModuleTransportLike>;
+  moduleGroups: null | undefined | ModuleGroups;
+  startupModules: ReadonlyArray<ModuleTransportLike>;
+};
+declare const $$EXPORT_DEFAULT_DECLARATION$$: ($$PARAM_0$$: Params) => IndexMap;
+declare type $$EXPORT_DEFAULT_DECLARATION$$ =
+  typeof $$EXPORT_DEFAULT_DECLARATION$$;
+export default $$EXPORT_DEFAULT_DECLARATION$$;

package/src/shared/output/RamBundle/buildSourcemapWithMetadata.js.flow

@@ -20,17 +20,17 @@ import {
 
 type Params = {
   fixWrapperOffset: boolean,
-  lazyModules: $ReadOnlyArray<ModuleTransportLike>,
+  lazyModules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups: ?ModuleGroups,
-  startupModules: $ReadOnlyArray<ModuleTransportLike>,
+  startupModules: ReadonlyArray<ModuleTransportLike>,
 };
 
-export default (({
+export default ({
   fixWrapperOffset,
   lazyModules,
   moduleGroups,
   startupModules,
-}: Params) => {
+}: Params): IndexMap => {
   const options = fixWrapperOffset ? {fixWrapperOffset: true} : undefined;
   const startupModule: ModuleTransportLike = {
     code: joinModules(startupModules),
@@ -59,4 +59,4 @@ export default (({
   }
 
   return map;
-}: Params => IndexMap);
+};

package/src/shared/output/RamBundle/magic-number.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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
+ */
+
+declare const $$EXPORT_DEFAULT_DECLARATION$$: 0xfb0bd1e5;
+declare type $$EXPORT_DEFAULT_DECLARATION$$ =
+  typeof $$EXPORT_DEFAULT_DECLARATION$$;
+export default $$EXPORT_DEFAULT_DECLARATION$$;

package/src/shared/output/RamBundle/util.d.ts

@@ -0,0 +1,41 @@
+/**
+ * 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 {ModuleGroups, ModuleTransportLike} from '../../types';
+import type {BasicSourceMap, IndexMap} from 'metro-source-map';
+
+import countLines from '../../../lib/countLines';
+
+declare function lineToLineSourceMap(
+  source: string,
+  filename?: string,
+): BasicSourceMap;
+type CombineOptions = {fixWrapperOffset: boolean};
+declare function combineSourceMaps(
+  modules: ReadonlyArray<ModuleTransportLike>,
+  moduleGroups?: ModuleGroups,
+  options?: null | undefined | CombineOptions,
+): IndexMap;
+declare function combineSourceMapsAddingOffsets(
+  modules: ReadonlyArray<ModuleTransportLike>,
+  x_metro_module_paths: Array<string>,
+  moduleGroups?: null | undefined | ModuleGroups,
+  options?: null | undefined | CombineOptions,
+): IndexMap;
+declare const joinModules: (
+  modules: ReadonlyArray<{readonly code: string}>,
+) => string;
+export {
+  combineSourceMaps,
+  combineSourceMapsAddingOffsets,
+  countLines,
+  joinModules,
+  lineToLineSourceMap,
+};

package/src/shared/output/RamBundle/util.js.flow

@@ -50,7 +50,7 @@ const Section = (line: number, column: number, map: MixedSourceMap) => ({
 type CombineOptions = {fixWrapperOffset: boolean, ...};
 
 function combineSourceMaps(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups?: ModuleGroups,
   options?: ?CombineOptions,
 ): IndexMap {
@@ -59,7 +59,7 @@ function combineSourceMaps(
 }
 
 function combineSourceMapsAddingOffsets(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   x_metro_module_paths: Array<string>,
   moduleGroups?: ?ModuleGroups,
   options?: ?CombineOptions,
@@ -75,7 +75,7 @@ function combineSourceMapsAddingOffsets(
 }
 
 function combineMaps(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   offsets: ?Array<number>,
   moduleGroups: ?ModuleGroups,
   options: ?CombineOptions,
@@ -99,7 +99,7 @@ function combineMaps(
       group = moduleGroups && moduleGroups.groups.get(id);
       if (group && moduleGroups) {
         const {modulesById} = moduleGroups;
-        const otherModules: $ReadOnlyArray<ModuleTransportLike> = Array.from(
+        const otherModules: ReadonlyArray<ModuleTransportLike> = Array.from(
           group || [],
         )
           .map((moduleId: number) => modulesById.get(moduleId))
@@ -135,7 +135,7 @@ function combineMaps(
   return sections;
 }
 
-const joinModules = (modules: $ReadOnlyArray<{+code: string, ...}>): string =>
+const joinModules = (modules: ReadonlyArray<{+code: string, ...}>): string =>
   modules.map((m: {+code: string, ...}) => m.code).join('\n');
 
 export {

package/src/shared/output/RamBundle/write-sourcemap.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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
+ */
+
+declare function writeSourcemap(
+  fileName: string,
+  contents: string,
+  log: (...args: Array<string>) => void,
+): Promise<unknown>;
+export default writeSourcemap;

package/src/shared/output/RamBundle/write-sourcemap.js.flow

@@ -15,7 +15,7 @@ export default function writeSourcemap(
   fileName: string,
   contents: string,
   log: (...args: Array<string>) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   if (!fileName) {
     return Promise.resolve();
   }

package/src/shared/output/RamBundle.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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 {RamBundleInfo} from '../../DeltaBundler/Serializers/getRamBundleInfo';
+import type {OutputOptions, RequestOptions} from '../types';
+
+import Server from '../../Server';
+
+export declare function build(
+  packagerClient: Server,
+  requestOptions: RequestOptions,
+): Promise<RamBundleInfo>;
+export declare function save(
+  bundle: RamBundleInfo,
+  options: OutputOptions,
+  log: (x: string) => void,
+): Promise<unknown>;
+export declare const formatName: 'bundle';
+export declare type formatName = typeof formatName;

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

@@ -33,7 +33,7 @@ export function save(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (x: string) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   // We fork here depending on the platform: while Android is pretty good at
   // loading individual assets, iOS has a large overhead when reading hundreds
   // of assets from disk.

package/src/shared/output/bundle.d.ts

@@ -8,28 +8,20 @@
  * @oncall react_native
  */
 
-import type {AssetData} from '../../Asset';
+import type {AssetData} from '../../Assets';
+import type {BuildOptions, OutputOptions, RequestOptions} from '../types';
 
 import Server from '../../Server';
-import {BuildOptions, OutputOptions, RequestOptions} from '../../shared/types';
 
-export function build(
+export declare function build(
   packagerClient: Server,
   requestOptions: RequestOptions,
   buildOptions?: BuildOptions,
-): Promise<{
-  code: string;
-  map: string;
-  assets?: ReadonlyArray<AssetData>;
-}>;
-
-export function save(
-  bundle: {
-    code: string;
-    map: string;
-  },
+): Promise<{code: string; map: string; assets?: ReadonlyArray<AssetData>}>;
+export declare function save(
+  bundle: {code: string; map: string},
   options: OutputOptions,
-  log: (...args: string[]) => void,
+  log: ($$PARAM_0$$: string) => void,
 ): Promise<unknown>;
-
-export const formatName: string;
+export declare const formatName: 'bundle';
+export declare type formatName = typeof formatName;

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

@@ -26,7 +26,7 @@ export function build(
 ): Promise<{
   code: string,
   map: string,
-  assets?: $ReadOnlyArray<AssetData>,
+  assets?: ReadonlyArray<AssetData>,
   ...
 }> {
   return packagerClient.build(
@@ -69,7 +69,7 @@ export async function save(
   },
   options: OutputOptions,
   log: string => void,
-): Promise<mixed> {
+): Promise<unknown> {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -101,7 +101,7 @@ export async function save(
   }
 
   // Wait until everything is written to disk.
-  await Promise.all(writeFns.map((cb: void => mixed) => cb()));
+  await Promise.all(writeFns.map((cb: void => unknown) => cb()));
 }
 
 export const formatName = 'bundle';

package/src/shared/output/meta.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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
+ */
+
+declare function meta(
+  code: Buffer | string,
+  encoding?: 'ascii' | 'utf16le' | 'utf8',
+): Buffer;
+export default meta;

package/src/shared/output/meta.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true,
 });
-exports.default = _default;
+exports.default = meta;
 var _crypto = _interopRequireDefault(require("crypto"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
@@ -17,7 +17,7 @@ const constantFor = (encoding) =>
       : /^(?:utf-?16(?:le)?|ucs-?2)$/.test(encoding)
         ? 3
         : 0;
-function _default(code, encoding = "utf8") {
+function meta(code, encoding = "utf8") {
   const buffer = asBuffer(code, encoding);
   const hash = _crypto.default.createHash("sha1");
   hash.update(buffer);

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

@@ -23,7 +23,7 @@ const constantFor = (encoding: 'ascii' | 'utf16le' | 'utf8') =>
         ? 3
         : 0;
 
-export default function (
+export default function meta(
   code: Buffer | string,
   encoding: 'ascii' | 'utf16le' | 'utf8' = 'utf8',
 ): Buffer {

package/src/shared/output/unbundle.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 * from './RamBundle';

package/src/shared/output/writeFile.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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
+ */
+
+declare function writeFile(
+  filePath: string,
+  data: string | Buffer | Uint8Array,
+  encoding?: string,
+): Promise<void>;
+export default writeFile;

package/src/shared/output/writeFile.js

@@ -3,11 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true,
 });
-exports.default = void 0;
+exports.default = writeFile;
 var _fs = _interopRequireDefault(require("fs"));
 var _throat = _interopRequireDefault(require("throat"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-const writeFile = (0, _throat.default)(128, _fs.default.promises.writeFile);
-var _default = (exports.default = writeFile);
+const writeFileWithThroat = (0, _throat.default)(
+  128,
+  _fs.default.promises.writeFile,
+);
+function writeFile(filePath, data, encoding) {
+  return writeFileWithThroat(filePath, data, encoding);
+}

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.d.ts

@@ -23,9 +23,26 @@ import type {
   MinifierOptions,
 } from 'metro-transform-worker';
 
-type MetroSourceMapOrMappings = MixedSourceMap | MetroSourceMapSegmentTuple[];
-
-export interface BundleOptions {
+type MetroSourceMapOrMappings =
+  | MixedSourceMap
+  | Array<MetroSourceMapSegmentTuple>;
+export declare enum SourcePathsMode {
+  Absolute = 'absolute',
+  ServerUrl = 'url-server',
+}
+export declare namespace SourcePathsMode {
+  export function cast(value: string | null | undefined): SourcePathsMode;
+  export function isValid(
+    value: string | null | undefined,
+  ): value is SourcePathsMode;
+  export function members(): IterableIterator<SourcePathsMode>;
+  export function getName(value: SourcePathsMode): string;
+}
+export type ReadonlySourceLocation = Readonly<{
+  start: Readonly<{line: number; column: number}>;
+  end: Readonly<{line: number; column: number}>;
+}>;
+export type BundleOptions = {
   readonly customResolverOptions: CustomResolverOptions;
   customTransformOptions: CustomTransformOptions;
   dev: boolean;
@@ -35,77 +52,69 @@ export interface BundleOptions {
   readonly lazy: boolean;
   minify: boolean;
   readonly modulesOnly: boolean;
-  onProgress?: (doneCont: number, totalCount: number) => unknown;
-  readonly platform?: string;
+  onProgress:
+    | null
+    | undefined
+    | ((doneCont: number, totalCount: number) => unknown);
+  readonly platform: null | undefined | string;
   readonly runModule: boolean;
-  runtimeBytecodeVersion?: number;
   readonly shallow: boolean;
-  sourceMapUrl?: string;
-  sourceUrl?: string;
+  sourceMapUrl: null | undefined | string;
+  sourceUrl: null | undefined | string;
   createModuleIdFactory?: () => (path: string) => number;
   readonly unstable_transformProfile: TransformProfile;
-}
-
-export interface BuildOptions {
-  readonly withAssets?: boolean;
-}
-
-export interface ResolverInputOptions {
-  readonly customResolverOptions?: CustomResolverOptions;
-}
-
-export interface SerializerOptions {
-  readonly sourceMapUrl: string | null;
-  readonly sourceUrl: string | null;
+  readonly sourcePaths: SourcePathsMode;
+};
+export type BuildOptions = Readonly<{withAssets?: boolean}>;
+export type ResolverInputOptions = Readonly<{
+  customResolverOptions?: CustomResolverOptions;
+  dev: boolean;
+}>;
+export type SerializerOptions = {
+  readonly sourceMapUrl: null | undefined | string;
+  readonly sourceUrl: null | undefined | string;
   readonly runModule: boolean;
   readonly excludeSource: boolean;
   readonly inlineSourceMap: boolean;
   readonly modulesOnly: boolean;
-}
-
-export interface GraphOptions {
+  readonly sourcePaths: SourcePathsMode;
+};
+export type GraphOptions = {
   readonly lazy: boolean;
   readonly shallow: boolean;
-}
-
-// Stricter representation of BundleOptions.
-export interface SplitBundleOptions {
-  readonly entryFile: string;
-  readonly resolverOptions: ResolverInputOptions;
-  readonly transformOptions: TransformInputOptions;
-  readonly serializerOptions: SerializerOptions;
-  readonly graphOptions: GraphOptions;
-  readonly onProgress: DeltaBundlerOptions['onProgress'];
-}
-
-export interface ModuleGroups {
+};
+export type SplitBundleOptions = Readonly<{
+  entryFile: string;
+  resolverOptions: ResolverInputOptions;
+  transformOptions: TransformInputOptions;
+  serializerOptions: SerializerOptions;
+  graphOptions: GraphOptions;
+  onProgress: DeltaBundlerOptions['onProgress'];
+}>;
+export type ModuleGroups = {
   groups: Map<number, Set<number>>;
   modulesById: Map<number, ModuleTransportLike>;
   modulesInGroups: Set<number>;
-}
-
-export interface ModuleTransportLike {
+};
+export type ModuleTransportLike = {
   readonly code: string;
   readonly id: number;
-  readonly map: MetroSourceMapOrMappings | null;
+  readonly map: null | undefined | MetroSourceMapOrMappings;
   readonly name?: string;
   readonly sourcePath: string;
-}
-
-export interface ModuleTransportLikeStrict {
+};
+export type ModuleTransportLikeStrict = {
   readonly code: string;
   readonly id: number;
-  readonly map: MetroSourceMapOrMappings | null;
+  readonly map: null | undefined | MetroSourceMapOrMappings;
   readonly name?: string;
   readonly sourcePath: string;
-}
-
-export interface RamModuleTransport extends ModuleTransportLikeStrict {
-  readonly source: string;
-  readonly type: string;
-}
-
-export interface OutputOptions {
+};
+export type RamModuleTransport = Omit<
+  ModuleTransportLikeStrict,
+  keyof {readonly source: string; readonly type: string}
+> & {readonly source: string; readonly type: string};
+export type OutputOptions = {
   bundleOutput: string;
   bundleEncoding?: 'utf8' | 'utf16le' | 'ascii';
   dev?: boolean;
@@ -114,17 +123,23 @@ export interface OutputOptions {
   sourcemapOutput?: string;
   sourcemapSourcesRoot?: string;
   sourcemapUseAbsolutePath?: boolean;
-}
-
-export interface RequestOptions {
-  entryFile: string;
-  inlineSourceMap?: boolean;
-  sourceMapUrl?: string;
-  dev?: boolean;
-  minify: boolean;
-  platform: string;
-  createModuleIdFactory?: () => (path: string) => number;
-  onProgress?: (transformedFileCount: number, totalFileCount: number) => void;
-}
-
+};
+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;
+    sourceMapUrl?: string;
+    dev?: boolean;
+    minify: boolean;
+    platform: string;
+    createModuleIdFactory?: () => (path: string) => number;
+    onProgress?: (transformedFileCount: number, totalFileCount: number) => void;
+    customResolverOptions?: CustomResolverOptions;
+    customTransformOptions?: CustomTransformOptions;
+    unstable_transformProfile?: TransformProfile;
+  }>
+>;
 export type {MinifierOptions};