metro 0.84.1 → 0.84.3

package/src/node-haste/PackageCache.js.flow

@@ -9,117 +9,141 @@
  * @oncall react_native
  */
 
-import Package from './Package';
+import type {PackageJson} from 'metro-resolver/private/types';
+
+import {readFileSync} from 'fs';
+import {dirname, sep} from 'path';
 
 type GetClosestPackageFn = (absoluteFilePath: string) => ?{
   packageJsonPath: string,
   packageRelativePath: string,
 };
 
+type PackageForModule = Readonly<{
+  packageJson: PackageJson,
+  rootPath: string,
+  packageRelativePath: string,
+}>;
+
 export class PackageCache {
-  _getClosestPackage: GetClosestPackageFn;
-  _packageCache: {
-    [filePath: string]: Package,
-    __proto__: null,
-    ...
-  };
-  // Cache for "closest package.json" queries by module path.
-  _packagePathAndSubpathByModulePath: {
-    [filePath: string]: ?{
-      packageJsonPath: string,
-      packageRelativePath: string,
+  #getClosestPackage: GetClosestPackageFn;
+  #packageCache: Map<
+    string,
+    {
+      rootPath: string,
+      packageJson: PackageJson,
     },
-    __proto__: null,
-    ...
-  };
-  // The inverse of _packagePathByModulePath.
-  _modulePathsByPackagePath: {
-    [filePath: string]: Set<string>,
-    __proto__: null,
-    ...
-  };
+  >;
+  // Single cache: module path → pre-built result object, or null (no allocation on hit)
+  #resultByModulePath: Map<string, PackageForModule | null>;
+  // Reverse index for invalidation: package.json path → set of module paths
+  #modulePathsByPackagePath: Map<string, Set<string>>;
+  // Module paths that resolved to no package.json (null), for invalidation
+  #modulePathsWithNoPackage: Set<string>;
 
   constructor(options: {getClosestPackage: GetClosestPackageFn, ...}) {
-    this._getClosestPackage = options.getClosestPackage;
-    this._packageCache = Object.create(null);
-    this._packagePathAndSubpathByModulePath = Object.create(null);
-    this._modulePathsByPackagePath = Object.create(null);
+    this.#getClosestPackage = options.getClosestPackage;
+    this.#packageCache = new Map();
+    this.#resultByModulePath = new Map();
+    this.#modulePathsByPackagePath = new Map();
+    this.#modulePathsWithNoPackage = new Set();
   }
 
-  getPackage(filePath: string): Package {
-    if (!this._packageCache[filePath]) {
-      this._packageCache[filePath] = new Package({
-        file: filePath,
-      });
+  getPackage(filePath: string): Readonly<{
+    rootPath: string,
+    packageJson: PackageJson,
+  }> {
+    let cached = this.#packageCache.get(filePath);
+    if (cached == null) {
+      cached = {
+        rootPath: dirname(filePath),
+        packageJson: JSON.parse(readFileSync(filePath, 'utf8')),
+      };
+      this.#packageCache.set(filePath, cached);
     }
-    return this._packageCache[filePath];
+    return cached;
   }
 
-  getPackageOf(
-    absoluteModulePath: string,
-  ): ?{pkg: Package, packageRelativePath: string} {
-    let packagePathAndSubpath =
-      this._packagePathAndSubpathByModulePath[absoluteModulePath];
-    if (
-      packagePathAndSubpath &&
-      this._packageCache[packagePathAndSubpath.packageJsonPath]
-    ) {
-      return {
-        pkg: this._packageCache[packagePathAndSubpath.packageJsonPath],
-        packageRelativePath: packagePathAndSubpath.packageRelativePath,
-      };
+  getPackageForModule(absoluteModulePath: string): ?PackageForModule {
+    const cached = this.#resultByModulePath.get(absoluteModulePath);
+
+    // Distinguish between `null` (positively no closest package) and
+    // `undefined` (no cached result yet)
+    // eslint-disable-next-line lint/strictly-null
+    if (cached !== undefined) {
+      return cached;
     }
 
-    packagePathAndSubpath = this._getClosestPackage(absoluteModulePath);
-    if (!packagePathAndSubpath) {
+    const closest = this.#getClosestPackage(absoluteModulePath);
+    if (closest == null) {
+      this.#resultByModulePath.set(absoluteModulePath, null);
+      this.#modulePathsWithNoPackage.add(absoluteModulePath);
       return null;
     }
 
-    const packagePath = packagePathAndSubpath.packageJsonPath;
+    const packagePath = closest.packageJsonPath;
 
-    this._packagePathAndSubpathByModulePath[absoluteModulePath] =
-      packagePathAndSubpath;
-    const modulePaths =
-      this._modulePathsByPackagePath[packagePath] ?? new Set();
+    // Track module→package for invalidation
+    let modulePaths = this.#modulePathsByPackagePath.get(packagePath);
+    if (modulePaths == null) {
+      modulePaths = new Set();
+      this.#modulePathsByPackagePath.set(packagePath, modulePaths);
+    }
     modulePaths.add(absoluteModulePath);
-    this._modulePathsByPackagePath[packagePath] = modulePaths;
 
-    return {
-      pkg: this.getPackage(packagePath),
-      packageRelativePath: packagePathAndSubpath.packageRelativePath,
+    const pkg = this.getPackage(packagePath);
+    if (pkg == null) {
+      return null;
+    }
+
+    // Cache the pre-built result object — no allocation on future hits
+    const result: PackageForModule = {
+      packageJson: pkg.packageJson,
+      packageRelativePath: closest.packageRelativePath,
+      rootPath: pkg.rootPath,
     };
+    this.#resultByModulePath.set(absoluteModulePath, result);
+    return result;
   }
 
   invalidate(filePath: string) {
-    if (this._packageCache[filePath]) {
-      this._packageCache[filePath].invalidate();
-      delete this._packageCache[filePath];
-    }
-    const packagePathAndSubpath =
-      this._packagePathAndSubpathByModulePath[filePath];
-    if (packagePathAndSubpath) {
-      // filePath is a module inside a package.
-      const packagePath = packagePathAndSubpath.packageJsonPath;
-      delete this._packagePathAndSubpathByModulePath[filePath];
-      // This change doesn't invalidate any cached "closest package.json"
-      // queries for the package's other modules. Clean up only this module.
-      const modulePaths = this._modulePathsByPackagePath[packagePath];
-      if (modulePaths) {
-        modulePaths.delete(filePath);
-        if (modulePaths.size === 0) {
-          delete this._modulePathsByPackagePath[packagePath];
+    this.#packageCache.delete(filePath);
+
+    // Clean up any cached result for this module path (including null).
+    // Derive the package.json path from the cached result to clean up the
+    // reverse index.
+    const cachedResult = this.#resultByModulePath.get(filePath);
+    this.#resultByModulePath.delete(filePath);
+    this.#modulePathsWithNoPackage.delete(filePath);
+
+    if (cachedResult != null) {
+      const packagePath = cachedResult.rootPath + sep + 'package.json';
+      const modules = this.#modulePathsByPackagePath.get(packagePath);
+      if (modules != null) {
+        modules.delete(filePath);
+        if (modules.size === 0) {
+          this.#modulePathsByPackagePath.delete(packagePath);
         }
       }
     }
-    if (this._modulePathsByPackagePath[filePath]) {
-      // filePath is a package. This change invalidates all cached "closest
-      // package.json" queries for modules inside this package.
-      const modulePaths = this._modulePathsByPackagePath[filePath];
+
+    // If filePath is a package.json, invalidate all module lookups pointing to it
+    const modulePaths = this.#modulePathsByPackagePath.get(filePath);
+    if (modulePaths != null) {
       for (const modulePath of modulePaths) {
-        delete this._packagePathAndSubpathByModulePath[modulePath];
+        this.#resultByModulePath.delete(modulePath);
+      }
+      this.#modulePathsByPackagePath.delete(filePath);
+    }
+
+    // If a package.json was created, modified, or deleted, invalidate all
+    // null-cached module results, since modules that previously had no
+    // enclosing package.json may now resolve to this one.
+    if (filePath.endsWith(sep + 'package.json')) {
+      for (const modulePath of this.#modulePathsWithNoPackage) {
+        this.#resultByModulePath.delete(modulePath);
       }
-      modulePaths.clear();
-      delete this._modulePathsByPackagePath[filePath];
+      this.#modulePathsWithNoPackage.clear();
     }
   }
 }

package/src/node-haste/lib/AssetPaths.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<31b3384bffa191e4c3c9916d93df8571>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/node-haste/lib/AssetPaths.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+export type AssetPath = {
+  assetName: string;
+  name: string;
+  platform: null | undefined | string;
+  resolution: number;
+  type: string;
+};
+/**
+ * Return `null` if the `filePath` doesn't have a valid extension, required
+ * to describe the type of an asset.
+ */
+export declare function tryParse(
+  filePath: string,
+  platforms: ReadonlySet<string>,
+): null | undefined | AssetPath;
+export declare function parse(
+  filePath: string,
+  platforms: ReadonlySet<string>,
+): AssetPath;

package/src/node-haste/lib/parsePlatformFilePath.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<61c16b5ef31517dc44347558a4dd431a>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/node-haste/lib/parsePlatformFilePath.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+type PlatformFilePathParts = {
+  dirPath: string;
+  baseName: string;
+  platform: null | undefined | string;
+  extension: null | undefined | string;
+};
+/**
+ * Extract the components of a file path that can have a platform specifier: Ex.
+ * `index.ios.js` is specific to the `ios` platform and has the extension `js`.
+ */
+declare function parsePlatformFilePath(
+  filePath: string,
+  platforms: ReadonlySet<string>,
+): PlatformFilePathParts;
+export default parsePlatformFilePath;

package/src/shared/output/RamBundle/as-assets.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<02d7f6eec9c93d02612c9b2fdef18cef>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle/as-assets.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+import type {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
+import type {OutputOptions} from '../../types';
+/**
+ * Saves all JS modules of an app as single files
+ * The startup code (prelude, polyfills etc.) are written to the file
+ * designated by the `bundleOuput` option.
+ * All other modules go into a 'js-modules' folder that in the same parent
+ * directory as the startup file.
+ */
+declare function saveAsAssets(
+  bundle: RamBundleInfo,
+  options: OutputOptions,
+  log: (...args: Array<string>) => void,
+): Promise<unknown>;
+export default saveAsAssets;

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

@@ -0,0 +1,45 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<cf05d2127a356bae7e3789c2fefa25d3>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle/as-indexed-file.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+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/buildSourcemapWithMetadata.d.ts

@@ -0,0 +1,30 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<669a46ab2a802ea2b93d98edf337fff0>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle/buildSourcemapWithMetadata.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+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/magic-number.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<94cd41a2f04528e81f82e6c2feadaf52>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle/magic-number.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+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,48 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<cb3371e2f23da9cd30e08ed76ec4f7db>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle/util.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+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/write-sourcemap.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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<000f29900c01342de92d247507075575>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle/write-sourcemap.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+declare function writeSourcemap(
+  fileName: string,
+  contents: string,
+  log: (...args: Array<string>) => void,
+): Promise<unknown>;
+export default writeSourcemap;

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

@@ -0,0 +1,33 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<bef82861a3de459220bf62515fd5900c>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/RamBundle.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+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/bundle.d.ts

@@ -0,0 +1,34 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<d9877b2ba27e8e3f279901c80c7ad895>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/bundle.flow.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+import type {AssetData} from '../../Assets';
+import type {BuildOptions, OutputOptions, RequestOptions} from '../types';
+
+import Server from '../../Server';
+
+export declare function build(
+  packagerClient: Server,
+  requestOptions: RequestOptions,
+  buildOptions?: BuildOptions,
+): Promise<{code: string; map: string; assets?: ReadonlyArray<AssetData>}>;
+export declare function save(
+  bundle: {code: string; map: string},
+  options: OutputOptions,
+  log: ($$PARAM_0$$: string) => void,
+): Promise<unknown>;
+export declare const formatName: 'bundle';
+export declare type formatName = typeof formatName;

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

@@ -0,0 +1,22 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<17ae3fc242dc6b3915a72d04dad032b8>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/meta.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+declare function meta(
+  code: Buffer | string,
+  encoding?: 'ascii' | 'utf16le' | 'utf8',
+): Buffer;
+export default meta;

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

@@ -0,0 +1,18 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<12b27507f799c8170067738c227bb2f3>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/unbundle.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+export * from './RamBundle';

package/src/shared/output/writeFile.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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<37de849e415f8aa1e94b73289a573ee3>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/shared/output/writeFile.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+declare function writeFile(
+  filePath: string,
+  data: string | Buffer | Uint8Array,
+  encoding?: string,
+): Promise<void>;
+export default writeFile;