metro-file-map 0.84.4 → 0.85.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-file-map",
-  "version": "0.84.4",
+  "version": "0.85.0",
   "description": "[Experimental] - 🚇 File crawling, watching and mapping for Metro",
   "main": "src/index.js",
   "exports": {
@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/facebook/metro.git",
+    "url": "git+https://github.com/react/metro.git",
     "directory": "packages/metro-file-map"
   },
   "scripts": {
@@ -33,6 +33,6 @@
     "slash": "^3.0.0"
   },
   "engines": {
-    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
+    "node": "^22.13.0 || ^24.3.0 || >= 26.0.0"
   }
 }

package/src/Watcher.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<25fee66c7d26ad53cdd5bbab454fe50b>>
+ * @generated SignedSource<<7e33ffd7eec05b9c9c072189d2ed3ec2>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/Watcher.js
@@ -30,7 +30,6 @@ type WatcherOptions = {
   console: Console;
   enableSymlinks: boolean;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI: boolean;
   healthCheckFilePrefix: string;
   ignoreForCrawl: (filePath: string) => boolean;
   ignorePatternForWatch: RegExp;

package/src/Watcher.js

@@ -103,7 +103,6 @@ class Watcher extends _events.default {
       console: options.console,
       includeSymlinks: options.enableSymlinks,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: options.forceNodeFilesystemAPI,
       ignore: ignoreForCrawl,
       onStatus: (status) => {
         this.emit("status", status);

package/src/Watcher.js.flow

@@ -49,7 +49,6 @@ type WatcherOptions = {
   console: Console,
   enableSymlinks: boolean,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI: boolean,
   healthCheckFilePrefix: string,
   ignoreForCrawl: (filePath: string) => boolean,
   ignorePatternForWatch: RegExp,
@@ -72,11 +71,13 @@ export type HealthCheckResult =
 export class Watcher extends EventEmitter {
   #activeWatcher: ?string;
   #backends: ReadonlyArray<WatcherBackend> = [];
-  +#instanceId: number;
+  readonly #instanceId: number;
   #nextHealthCheckId: number = 0;
-  +#options: WatcherOptions;
-  +#pendingHealthChecks: Map</* basename */ string, /* resolve */ () => void> =
-    new Map();
+  readonly #options: WatcherOptions;
+  readonly #pendingHealthChecks: Map<
+    /* basename */ string,
+    /* resolve */ () => void,
+  > = new Map();
 
   constructor(options: WatcherOptions) {
     super();
@@ -131,7 +132,6 @@ export class Watcher extends EventEmitter {
       console: options.console,
       includeSymlinks: options.enableSymlinks,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: options.forceNodeFilesystemAPI,
       ignore: ignoreForCrawl,
       onStatus: status => {
         this.emit('status', status);

package/src/cache/DiskCacheManager.js.flow

@@ -42,8 +42,8 @@ const DEFAULT_DIRECTORY = tmpdir();
 const DEFAULT_AUTO_SAVE_DEBOUNCE_MS = 5000;
 
 export class DiskCacheManager implements CacheManager {
-  +#autoSaveOpts: ?AutoSaveOptions;
-  +#cachePath: string;
+  readonly #autoSaveOpts: ?AutoSaveOptions;
+  readonly #cachePath: string;
   #debounceTimeout: ?Timeout = null;
   #writePromise: Promise<void> = Promise.resolve();
   #hasUnwrittenChanges: boolean = false;

package/src/crawlers/node/index.js

@@ -5,12 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = nodeCrawl;
 var _RootPathUtils = require("../../lib/RootPathUtils");
-var _hasNativeFindSupport = _interopRequireDefault(
-  require("./hasNativeFindSupport"),
-);
-var _child_process = require("child_process");
 var fs = _interopRequireWildcard(require("graceful-fs"));
-var _os = require("os");
 var path = _interopRequireWildcard(require("path"));
 function _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
@@ -39,10 +34,6 @@ function _interopRequireWildcard(e, t) {
     return f;
   })(e, t);
 }
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-const debug = require("debug")("Metro:NodeCrawler");
 function find(
   roots,
   extensions,
@@ -115,68 +106,11 @@ function find(
     callback(result);
   }
 }
-function findNative(
-  roots,
-  extensions,
-  ignore,
-  includeSymlinks,
-  rootDir,
-  console,
-  callback,
-) {
-  const extensionClause = extensions.length
-    ? `( ${extensions.map((ext) => `-iname *.${ext}`).join(" -o ")} )`
-    : "";
-  const expression = `( ( -type f ${extensionClause} ) ${includeSymlinks ? "-o -type l " : ""})`;
-  const pathUtils = new _RootPathUtils.RootPathUtils(rootDir);
-  const child = (0, _child_process.spawn)(
-    "find",
-    roots.concat(expression.split(" ")),
-  );
-  let stdout = "";
-  if (child.stdout == null) {
-    throw new Error(
-      "stdout is null - this should never happen. Please open up an issue at https://github.com/facebook/metro",
-    );
-  }
-  child.stdout.setEncoding("utf-8");
-  child.stdout.on("data", (data) => (stdout += data));
-  child.stdout.on("close", () => {
-    const lines = stdout
-      .trim()
-      .split("\n")
-      .filter((x) => !ignore(x));
-    const result = new Map();
-    let count = lines.length;
-    if (!count) {
-      callback(new Map());
-    } else {
-      lines.forEach((path) => {
-        fs.lstat(path, (err, stat) => {
-          if (!err && stat) {
-            result.set(pathUtils.absoluteToNormal(path), [
-              stat.mtime.getTime(),
-              stat.size,
-              0,
-              null,
-              stat.isSymbolicLink() ? 1 : 0,
-              null,
-            ]);
-          }
-          if (--count === 0) {
-            callback(result);
-          }
-        });
-      });
-    }
-  });
-}
 async function nodeCrawl(options) {
   const {
     console,
     previousState,
     extensions,
-    forceNodeFilesystemAPI,
     ignore,
     rootDir,
     includeSymlinks,
@@ -187,11 +121,6 @@ async function nodeCrawl(options) {
   } = options;
   abortSignal?.throwIfAborted();
   perfLogger?.point("nodeCrawl_start");
-  const useNativeFind =
-    !forceNodeFilesystemAPI &&
-    (0, _os.platform)() !== "win32" &&
-    (await (0, _hasNativeFindSupport.default)());
-  debug("Using system find: %s", useNativeFind);
   return new Promise((resolve, reject) => {
     const callback = (fileData) => {
       const difference = previousState.fileSystem.getDifference(fileData, {
@@ -205,26 +134,14 @@ async function nodeCrawl(options) {
       }
       resolve(difference);
     };
-    if (useNativeFind) {
-      findNative(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    } else {
-      find(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    }
+    find(
+      roots,
+      extensions,
+      ignore,
+      includeSymlinks,
+      rootDir,
+      console,
+      callback,
+    );
   });
 }

package/src/crawlers/node/index.js.flow

@@ -18,15 +18,9 @@ import type {
 } from '../../flow-types';
 
 import {RootPathUtils} from '../../lib/RootPathUtils';
-import hasNativeFindSupport from './hasNativeFindSupport';
-import {spawn} from 'child_process';
 import * as fs from 'graceful-fs';
-import {platform} from 'os';
 import * as path from 'path';
 
-// eslint-disable-next-line import/no-commonjs
-const debug = require('debug')('Metro:NodeCrawler');
-
 type Callback = (result: FileData) => void;
 
 function find(
@@ -106,70 +100,6 @@ function find(
   }
 }
 
-function findNative(
-  roots: ReadonlyArray<string>,
-  extensions: ReadonlyArray<string>,
-  ignore: IgnoreMatcher,
-  includeSymlinks: boolean,
-  rootDir: string,
-  console: Console,
-  callback: Callback,
-): void {
-  // Examples:
-  // ( ( -type f ( -iname *.js ) ) )
-  // ( ( -type f ( -iname *.js -o -iname *.ts ) ) )
-  // ( ( -type f ( -iname *.js ) ) -o -type l )
-  // ( ( -type f ) -o -type l )
-  const extensionClause = extensions.length
-    ? `( ${extensions.map(ext => `-iname *.${ext}`).join(' -o ')} )`
-    : ''; // Empty inner expressions eg "( )" are not allowed
-  const expression = `( ( -type f ${extensionClause} ) ${
-    includeSymlinks ? '-o -type l ' : ''
-  })`;
-
-  const pathUtils = new RootPathUtils(rootDir);
-
-  const child = spawn('find', roots.concat(expression.split(' ')));
-  let stdout = '';
-  if (child.stdout == null) {
-    throw new Error(
-      'stdout is null - this should never happen. Please open up an issue at https://github.com/facebook/metro',
-    );
-  }
-  child.stdout.setEncoding('utf-8');
-  child.stdout.on('data', data => (stdout += data));
-
-  child.stdout.on('close', () => {
-    const lines = stdout
-      .trim()
-      .split('\n')
-      .filter(x => !ignore(x));
-    const result: FileData = new Map();
-    let count = lines.length;
-    if (!count) {
-      callback(new Map());
-    } else {
-      lines.forEach(path => {
-        fs.lstat(path, (err, stat) => {
-          if (!err && stat) {
-            result.set(pathUtils.absoluteToNormal(path), [
-              stat.mtime.getTime(),
-              stat.size,
-              0,
-              null,
-              stat.isSymbolicLink() ? 1 : 0,
-              null,
-            ]);
-          }
-          if (--count === 0) {
-            callback(result);
-          }
-        });
-      });
-    }
-  });
-}
-
 export default async function nodeCrawl(
   options: CrawlerOptions,
 ): Promise<CrawlResult> {
@@ -177,7 +107,6 @@ export default async function nodeCrawl(
     console,
     previousState,
     extensions,
-    forceNodeFilesystemAPI,
     ignore,
     rootDir,
     includeSymlinks,
@@ -190,12 +119,6 @@ export default async function nodeCrawl(
   abortSignal?.throwIfAborted();
 
   perfLogger?.point('nodeCrawl_start');
-  const useNativeFind =
-    !forceNodeFilesystemAPI &&
-    platform() !== 'win32' &&
-    (await hasNativeFindSupport());
-
-  debug('Using system find: %s', useNativeFind);
 
   return new Promise((resolve, reject) => {
     const callback: Callback = fileData => {
@@ -214,26 +137,14 @@ export default async function nodeCrawl(
       resolve(difference);
     };
 
-    if (useNativeFind) {
-      findNative(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    } else {
-      find(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    }
+    find(
+      roots,
+      extensions,
+      ignore,
+      includeSymlinks,
+      rootDir,
+      console,
+      callback,
+    );
   });
 }

package/src/flow-types.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<b3646c81d37188726a1fc27777dcbede>>
+ * @generated SignedSource<<6ff16bb65883df0a1cb70e6ca94461eb>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/flow-types.js
@@ -22,7 +22,6 @@ export type BuildParameters = Readonly<{
   computeSha1: boolean;
   enableSymlinks: boolean;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI: boolean;
   ignorePattern: RegExp;
   plugins: ReadonlyArray<InputFileMapPlugin>;
   retainAllFiles: boolean;
@@ -95,7 +94,6 @@ export type CrawlerOptions = {
   computeSha1: boolean;
   console: Console;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI: boolean;
   ignore: IgnoreMatcher;
   includeSymlinks: boolean;
   perfLogger?: null | undefined | PerfLogger;
@@ -192,12 +190,12 @@ export interface FileMapPlugin<
 }
 export type InputFileMapPlugin = FileMapPlugin<
   /**
-   * > 235 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
+   * > 233 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
    *       |                                                ^^^^^ Unsupported feature: Translating "empty type" is currently not supported.
    **/
   any,
   /**
-   * > 235 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
+   * > 233 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
    *       |                                                       ^^^^^ Unsupported feature: Translating "empty type" is currently not supported.
    **/
   any

package/src/flow-types.js.flow

@@ -19,7 +19,6 @@ export type BuildParameters = Readonly<{
   computeSha1: boolean,
   enableSymlinks: boolean,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI: boolean,
   ignorePattern: RegExp,
   plugins: ReadonlyArray<InputFileMapPlugin>,
   retainAllFiles: boolean,
@@ -114,7 +113,6 @@ export type CrawlerOptions = {
   computeSha1: boolean,
   console: Console,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI: boolean,
   ignore: IgnoreMatcher,
   includeSymlinks: boolean,
   perfLogger?: ?PerfLogger,
@@ -171,8 +169,8 @@ export type DuplicatesSet = Map<string, /* type */ number>;
 export type DuplicatesIndex = Map<string, Map<string, DuplicatesSet>>;
 
 export type FileMapPluginInitOptions<
-  +SerializableState,
-  +PerFileData = void,
+  out SerializableState,
+  out PerFileData = void,
 > = Readonly<{
   files: Readonly<{
     fileIterator(
@@ -183,13 +181,13 @@ export type FileMapPluginInitOptions<
     ): Iterable<{
       baseName: string,
       canonicalPath: string,
-      +pluginData: ?PerFileData,
+      readonly pluginData: ?PerFileData,
     }>,
     lookup(
       mixedPath: string,
     ):
       | {exists: false}
-      | {exists: true, type: 'f', +pluginData: PerFileData}
+      | {exists: true, type: 'f', readonly pluginData: PerFileData}
       | {exists: true, type: 'd'},
   }>,
   pluginState: ?SerializableState,
@@ -214,10 +212,10 @@ export type V8Serializable =
   | Readonly<{[key: string]: V8Serializable}>;
 
 export interface FileMapPlugin<
-  -SerializableState extends void | V8Serializable = void | V8Serializable,
-  -PerFileData extends void | V8Serializable = void | V8Serializable,
+  in SerializableState extends void | V8Serializable = void | V8Serializable,
+  in PerFileData extends void | V8Serializable = void | V8Serializable,
 > {
-  +name: string;
+  readonly name: string;
   initialize(
     initOptions: FileMapPluginInitOptions<SerializableState, PerFileData>,
   ): Promise<void>;
@@ -461,13 +459,13 @@ export interface FileSystemListener {
   fileRemoved(canonicalPath: CanonicalPath, data: FileMetadata): void;
 }
 
-export interface ReadonlyFileSystemChanges<+T = FileMetadata> {
-  +addedDirectories: Iterable<CanonicalPath>;
-  +removedDirectories: Iterable<CanonicalPath>;
+export interface ReadonlyFileSystemChanges<out T = FileMetadata> {
+  readonly addedDirectories: Iterable<CanonicalPath>;
+  readonly removedDirectories: Iterable<CanonicalPath>;
 
-  +addedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
-  +modifiedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
-  +removedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
+  readonly addedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
+  readonly modifiedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
+  readonly removedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
 }
 
 export interface MutableFileSystem extends FileSystem {

package/src/index.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<806d228988308075b7a911c3dfb513d3>>
+ * @generated SignedSource<<220686ad19cc94bec3b8d89f49fa6304>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/index.js
@@ -49,7 +49,6 @@ export type InputOptions = Readonly<{
   computeSha1?: null | undefined | boolean;
   enableSymlinks?: null | undefined | boolean;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI?: null | undefined | boolean;
   ignorePattern?: null | undefined | RegExp;
   plugins?: ReadonlyArray<InputFileMapPlugin>;
   retainAllFiles: boolean;

package/src/index.js

@@ -164,7 +164,6 @@ class FileMap extends _events.default {
       computeSha1: options.computeSha1 || false,
       enableSymlinks: options.enableSymlinks || false,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: !!options.forceNodeFilesystemAPI,
       ignorePattern,
       plugins,
       retainAllFiles: options.retainAllFiles,
@@ -335,7 +334,6 @@ class FileMap extends _events.default {
       computeSha1,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       ignorePattern,
       retainAllFiles,
       roots,
@@ -349,7 +347,6 @@ class FileMap extends _events.default {
       console: this.#console,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       healthCheckFilePrefix: this.#options.healthCheck.filePrefix,
       ignoreForCrawl: (filePath) => {
         const ignoreMatched = ignorePattern.test(filePath);

package/src/index.js.flow

@@ -78,7 +78,6 @@ export type InputOptions = Readonly<{
   computeSha1?: ?boolean,
   enableSymlinks?: ?boolean,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI?: ?boolean,
   ignorePattern?: ?RegExp,
   plugins?: ReadonlyArray<InputFileMapPlugin>,
   retainAllFiles: boolean,
@@ -249,18 +248,18 @@ const WATCHMAN_REQUIRED_CAPABILITIES = [
  */
 export default class FileMap extends EventEmitter {
   #buildPromise: ?Promise<BuildResult>;
-  +#cacheManager: CacheManager;
+  readonly #cacheManager: CacheManager;
   #canUseWatchmanPromise: Promise<boolean>;
   #changeID: number;
   #changeInterval: ?IntervalID;
-  +#console: Console;
-  +#crawlerAbortController: AbortController;
-  +#fileProcessor: FileProcessor;
+  readonly #console: Console;
+  readonly #crawlerAbortController: AbortController;
+  readonly #fileProcessor: FileProcessor;
   #healthCheckInterval: ?IntervalID;
-  +#options: InternalOptions;
-  +#pathUtils: RootPathUtils;
-  +#plugins: ReadonlyArray<IndexedPlugin>;
-  +#startupPerfLogger: ?PerfLogger;
+  readonly #options: InternalOptions;
+  readonly #pathUtils: RootPathUtils;
+  readonly #plugins: ReadonlyArray<IndexedPlugin>;
+  readonly #startupPerfLogger: ?PerfLogger;
   #watcher: ?Watcher;
 
   static create(options: InputOptions): FileMap {
@@ -318,7 +317,6 @@ export default class FileMap extends EventEmitter {
       computeSha1: options.computeSha1 || false,
       enableSymlinks: options.enableSymlinks || false,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: !!options.forceNodeFilesystemAPI,
       ignorePattern,
       plugins,
       retainAllFiles: options.retainAllFiles,
@@ -515,7 +513,6 @@ export default class FileMap extends EventEmitter {
       computeSha1,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       ignorePattern,
       retainAllFiles,
       roots,
@@ -530,7 +527,6 @@ export default class FileMap extends EventEmitter {
       console: this.#console,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       healthCheckFilePrefix: this.#options.healthCheck.filePrefix,
       // TODO: Refactor out the two different ignore strategies here.
       ignoreForCrawl: filePath => {

package/src/lib/FileProcessor.js.flow

@@ -40,8 +40,8 @@ type ProcessFileRequest = Readonly<{
 }>;
 
 interface AsyncWorker {
-  +processFile: WorkerMessage => Promise<WorkerMetadata>;
-  +end: () => Promise<void>;
+  readonly processFile: WorkerMessage => Promise<WorkerMetadata>;
+  readonly end: () => Promise<void>;
 }
 
 interface MaybeCodedError extends Error {

package/src/lib/FileSystemChangeAggregator.js.flow

@@ -18,16 +18,16 @@ import type {
 
 export class FileSystemChangeAggregator implements FileSystemListener {
   // Mutually exclusive with removedDirectories
-  +#addedDirectories: Set<CanonicalPath> = new Set();
+  readonly #addedDirectories: Set<CanonicalPath> = new Set();
   // Mutually exclusive with addedDirectories
-  +#removedDirectories: Set<CanonicalPath> = new Set();
+  readonly #removedDirectories: Set<CanonicalPath> = new Set();
 
   // Mutually exclusive with modified and removed files
-  +#addedFiles: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #addedFiles: Map<CanonicalPath, FileMetadata> = new Map();
   // Mutually exclusive with added and removed files
-  +#modifiedFiles: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #modifiedFiles: Map<CanonicalPath, FileMetadata> = new Map();
   // Mutually exclusive with added and modified files
-  +#removedFiles: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #removedFiles: Map<CanonicalPath, FileMetadata> = new Map();
 
   // Removed files must be paired with the file's metadata the last time it was
   // observable by consumers - ie, immediately *before* this batch. To report
@@ -36,7 +36,7 @@ export class FileSystemChangeAggregator implements FileSystemListener {
   // re-added, modified and removed again, we still have the initial metadata.
   // This is particularly important if, say, a regular file is replaced by a
   // symlink, or vice-versa.
-  +#initialMetadata: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #initialMetadata: Map<CanonicalPath, FileMetadata> = new Map();
 
   directoryAdded(canonicalPath: CanonicalPath): void {
     // Only add to newDirectories if this directory wasn't previously removed

package/src/lib/RootPathUtils.js

@@ -40,6 +40,8 @@ const UP_FRAGMENT_SEP = ".." + path.sep;
 const SEP_UP_FRAGMENT = path.sep + "..";
 const UP_FRAGMENT_SEP_LENGTH = UP_FRAGMENT_SEP.length;
 const CURRENT_FRAGMENT = "." + path.sep;
+const IS_WIN32 = path.sep === "\\";
+const ROOT_BASE_IDX = IS_WIN32 ? 0 : 1;
 class RootPathUtils {
   #rootDir;
   #rootDirnames;
@@ -114,6 +116,8 @@ class RootPathUtils {
     const right = pos === 0 ? normalPath : normalPath.slice(pos);
     if (right.length === 0) {
       return left;
+    } else if (IS_WIN32 && pos > this.#rootDepth * UP_FRAGMENT_SEP_LENGTH) {
+      return right;
     }
     if (i === this.#rootDepth) {
       return left + right;
@@ -152,7 +156,9 @@ class RootPathUtils {
         normalPath,
       };
     }
-    const left = normalPath + path.sep;
+    const left = normalPath.endsWith(path.sep)
+      ? normalPath
+      : normalPath + path.sep;
     const rawPath = left + relativePath;
     if (normalPath === ".." || normalPath.endsWith(SEP_UP_FRAGMENT)) {
       const collapsed = this.#tryCollapseIndirectionsInSuffix(rawPath, 0, 0);
@@ -230,7 +236,7 @@ class RootPathUtils {
           collapsedSegments,
         };
       }
-      if (totalUpIndirections < this.#rootParts.length - 1) {
+      if (totalUpIndirections < this.#rootParts.length - ROOT_BASE_IDX) {
         totalUpIndirections++;
       }
       if (nextIndirection !== pos + 1 || fullPath[pos] !== ".") {

package/src/lib/RootPathUtils.js.flow

@@ -46,6 +46,9 @@ const SEP_UP_FRAGMENT = path.sep + '..';
 const UP_FRAGMENT_SEP_LENGTH = UP_FRAGMENT_SEP.length;
 const CURRENT_FRAGMENT = '.' + path.sep;
 
+const IS_WIN32 = path.sep === '\\';
+const ROOT_BASE_IDX = IS_WIN32 ? 0 : 1;
+
 export class RootPathUtils {
   #rootDir: string;
   #rootDirnames: ReadonlyArray<string>;
@@ -149,6 +152,12 @@ export class RootPathUtils {
     const right = pos === 0 ? normalPath : normalPath.slice(pos);
     if (right.length === 0) {
       return left;
+    } else if (IS_WIN32 && pos > this.#rootDepth * UP_FRAGMENT_SEP_LENGTH) {
+      // On a real file system, navigating to `..` at the top level (posix `/`
+      // or Windows drive) is a no-op, but we can't respect that on Windows
+      // because Metro uses e.g. `..\..\D:\foo` to represent cross-drive
+      // relative paths.
+      return right;
     }
     // left may already end in a path separator only if it is a filesystem root,
     // '/' or 'X:\'.
@@ -198,7 +207,9 @@ export class RootPathUtils {
     if (relativePath === '') {
       return {collapsedSegments: 0, normalPath};
     }
-    const left = normalPath + path.sep;
+    const left = normalPath.endsWith(path.sep)
+      ? normalPath
+      : normalPath + path.sep;
     const rawPath = left + relativePath;
     if (normalPath === '..' || normalPath.endsWith(SEP_UP_FRAGMENT)) {
       const collapsed = this.#tryCollapseIndirectionsInSuffix(rawPath, 0, 0);
@@ -299,9 +310,10 @@ export class RootPathUtils {
         };
       }
 
-      // Cap the number of indirections at the total number of root segments.
-      // File systems treat '..' at the root as '.'.
-      if (totalUpIndirections < this.#rootParts.length - 1) {
+      // Cap the number of indirections at the total number of root parts.
+      // File systems treat '..' at the root as '.'. For Windows, cross-device
+      // paths need to survive this.
+      if (totalUpIndirections < this.#rootParts.length - ROOT_BASE_IDX) {
         totalUpIndirections++;
       }
 

package/src/lib/TreeFS.js

@@ -341,6 +341,9 @@ class TreeFS {
   }
   remove(mixedPath, changeListener) {
     const normalPath = this.#normalizePath(mixedPath);
+    this.#removeNormalPath(normalPath, changeListener);
+  }
+  #removeNormalPath(normalPath, changeListener) {
     const result = this.#lookupByNormalPath(normalPath, {
       followLeaf: false,
     });
@@ -350,7 +353,7 @@ class TreeFS {
     const { parentNode, canonicalPath, node } = result;
     if (isDirectory(node) && node.size > 0) {
       for (const basename of node.keys()) {
-        this.remove(
+        this.#removeNormalPath(
           canonicalPath + _path.default.sep + basename,
           changeListener,
         );
@@ -367,7 +370,10 @@ class TreeFS {
       }
       parentNode.delete(_path.default.basename(canonicalPath));
       if (parentNode.size === 0 && parentNode !== this.#rootNode) {
-        this.remove(_path.default.dirname(canonicalPath), changeListener);
+        this.#removeNormalPath(
+          _path.default.dirname(canonicalPath),
+          changeListener,
+        );
       }
     }
   }
@@ -831,14 +837,16 @@ class TreeFS {
       typeof literalSymlinkTarget === "string",
       "Expected symlink target to be populated.",
     );
-    const absoluteSymlinkTarget = _path.default.resolve(
+    let absoluteSymlinkTarget = _path.default.resolve(
       this.#rootDir,
       canonicalPathOfSymlink,
       "..",
       literalSymlinkTarget,
     );
-    const normalSymlinkTarget = _path.default.relative(
-      this.#rootDir,
+    if (absoluteSymlinkTarget.endsWith(_path.default.sep)) {
+      absoluteSymlinkTarget = absoluteSymlinkTarget.slice(0, -1);
+    }
+    const normalSymlinkTarget = this.#pathUtils.absoluteToNormal(
       absoluteSymlinkTarget,
     );
     const result = {

package/src/lib/TreeFS.js.flow

@@ -124,11 +124,13 @@ type MetadataIteratorOptions = Readonly<{
  *   a trailing slash
  */
 export default class TreeFS implements MutableFileSystem {
-  +#cachedNormalSymlinkTargets: WeakMap<FileNode, NormalizedSymlinkTarget> =
-    new WeakMap();
-  +#pathUtils: RootPathUtils;
-  +#processFile: ProcessFileFunction;
-  +#rootDir: Path;
+  readonly #cachedNormalSymlinkTargets: WeakMap<
+    FileNode,
+    NormalizedSymlinkTarget,
+  > = new WeakMap();
+  readonly #pathUtils: RootPathUtils;
+  readonly #processFile: ProcessFileFunction;
+  readonly #rootDir: Path;
   #rootNode: DirectoryNode = new Map();
 
   constructor(opts: TreeFSOptions) {
@@ -493,6 +495,13 @@ export default class TreeFS implements MutableFileSystem {
 
   remove(mixedPath: Path, changeListener?: FileSystemListener): void {
     const normalPath = this.#normalizePath(mixedPath);
+    this.#removeNormalPath(normalPath, changeListener);
+  }
+
+  #removeNormalPath(
+    normalPath: string,
+    changeListener?: FileSystemListener,
+  ): void {
     const result = this.#lookupByNormalPath(normalPath, {followLeaf: false});
     if (!result.exists) {
       return;
@@ -501,7 +510,10 @@ export default class TreeFS implements MutableFileSystem {
 
     if (isDirectory(node) && node.size > 0) {
       for (const basename of node.keys()) {
-        this.remove(canonicalPath + path.sep + basename, changeListener);
+        this.#removeNormalPath(
+          canonicalPath + path.sep + basename,
+          changeListener,
+        );
       }
       // Removing the last file will delete this directory
       return;
@@ -521,7 +533,7 @@ export default class TreeFS implements MutableFileSystem {
         // that's not expected to be a case common enough to justify
         // implementation complexity, or slowing down more common uses of
         // _lookupByNormalPath.
-        this.remove(path.dirname(canonicalPath), changeListener);
+        this.#removeNormalPath(path.dirname(canonicalPath), changeListener);
       }
     }
   }
@@ -1224,16 +1236,19 @@ export default class TreeFS implements MutableFileSystem {
       typeof literalSymlinkTarget === 'string',
       'Expected symlink target to be populated.',
     );
-    const absoluteSymlinkTarget = path.resolve(
+    let absoluteSymlinkTarget = path.resolve(
       this.#rootDir,
       canonicalPathOfSymlink,
       '..', // Symlink target is relative to its containing directory.
       literalSymlinkTarget, // May be absolute, in which case the above are ignored
     );
-    const normalSymlinkTarget = path.relative(
-      this.#rootDir,
+    if (absoluteSymlinkTarget.endsWith(path.sep)) {
+      absoluteSymlinkTarget = absoluteSymlinkTarget.slice(0, -1);
+    }
+    const normalSymlinkTarget = this.#pathUtils.absoluteToNormal(
       absoluteSymlinkTarget,
     );
+
     const result = {
       ancestorOfRootIdx:
         this.#pathUtils.getAncestorOfRootIdx(normalSymlinkTarget),

package/src/lib/rootRelativeCacheKeys.js

@@ -32,7 +32,6 @@ function rootRelativeCacheKeys(buildParameters) {
         case "extensions":
         case "computeSha1":
         case "enableSymlinks":
-        case "forceNodeFilesystemAPI":
         case "retainAllFiles":
           return buildParameters[key] ?? null;
         case "ignorePattern":

package/src/lib/rootRelativeCacheKeys.js.flow

@@ -39,7 +39,6 @@ export default function rootRelativeCacheKeys(
         case 'extensions':
         case 'computeSha1':
         case 'enableSymlinks':
-        case 'forceNodeFilesystemAPI':
         case 'retainAllFiles':
           return buildParameters[key] ?? null;
         case 'ignorePattern':

package/src/plugins/DependencyPlugin.js

@@ -16,8 +16,12 @@ class DependencyPlugin extends _FileDataPlugin.default {
     const { dependencyExtractor, computeDependencies } = options;
     let cacheKey;
     if (dependencyExtractor != null) {
-      const extractor = require(dependencyExtractor);
-      cacheKey = extractor.getCacheKey?.() ?? dependencyExtractor;
+      const mod = require(dependencyExtractor);
+      let getCacheKey = mod?.getCacheKey;
+      if (getCacheKey == null && mod?.__esModule === true) {
+        getCacheKey = mod.default?.getCacheKey;
+      }
+      cacheKey = getCacheKey?.() ?? dependencyExtractor;
     } else {
       cacheKey = "default-dependency-extractor";
     }

package/src/plugins/DependencyPlugin.js.flow

@@ -28,8 +28,13 @@ export default class DependencyPlugin extends FileDataPlugin<ReadonlyArray<strin
     let cacheKey: string;
     if (dependencyExtractor != null) {
       // $FlowFixMe[unsupported-syntax] - dynamic require
-      const extractor = require(dependencyExtractor);
-      cacheKey = extractor.getCacheKey?.() ?? dependencyExtractor;
+      const mod = require(dependencyExtractor);
+      let getCacheKey = mod?.getCacheKey; // CJS export or ESM named export
+      // Allow for getCacheKey as a prop of an ESM default export
+      if (getCacheKey == null && mod?.__esModule === true) {
+        getCacheKey = mod.default?.getCacheKey;
+      }
+      cacheKey = getCacheKey?.() ?? dependencyExtractor;
     } else {
       cacheKey = 'default-dependency-extractor';
     }

package/src/plugins/FileDataPlugin.js.flow

@@ -29,10 +29,10 @@ export type FileDataPluginOptions = Readonly<{
  * of lifecycle methods that subclasses can override as needed.
  */
 export default class FileDataPlugin<
-  -PerFileData extends void | V8Serializable = void | V8Serializable,
+  in PerFileData extends void | V8Serializable = void | V8Serializable,
 > implements FileMapPlugin<null, PerFileData>
 {
-  +name: string;
+  readonly name: string;
 
   #worker: FileMapPluginWorker;
   #cacheKey: string;

package/src/plugins/HastePlugin.js.flow

@@ -55,19 +55,19 @@ export type HasteMapOptions = Readonly<{
 export default class HastePlugin
   implements HasteMap, FileMapPlugin<null, string | null>
 {
-  +name: 'haste' = 'haste';
+  readonly name: 'haste' = 'haste';
 
-  +#console: ?Console;
-  +#duplicates: DuplicatesIndex = new Map();
-  +#enableHastePackages: boolean;
-  +#failValidationOnConflicts: boolean;
+  readonly #console: ?Console;
+  readonly #duplicates: DuplicatesIndex = new Map();
+  readonly #enableHastePackages: boolean;
+  readonly #failValidationOnConflicts: boolean;
   #getModuleNameByPath: string => ?string;
-  +#hasteImplModulePath: ?string;
-  +#map: Map<string, HasteMapItem> = new Map();
-  +#pathUtils: RootPathUtils;
-  +#perfLogger: ?PerfLogger;
-  +#platforms: ReadonlySet<string>;
-  +#rootDir: Path;
+  readonly #hasteImplModulePath: ?string;
+  readonly #map: Map<string, HasteMapItem> = new Map();
+  readonly #pathUtils: RootPathUtils;
+  readonly #perfLogger: ?PerfLogger;
+  readonly #platforms: ReadonlySet<string>;
+  readonly #rootDir: Path;
 
   constructor(options: HasteMapOptions) {
     this.#console = options.console ?? global.console;

package/src/plugins/MockPlugin.js.flow

@@ -39,13 +39,13 @@ export type MockMapOptions = Readonly<{
 export default class MockPlugin
   implements FileMapPlugin<RawMockMap, void>, IMockMap
 {
-  +name: 'mocks' = 'mocks';
+  readonly name: 'mocks' = 'mocks';
 
-  +#mocksPattern: RegExp;
+  readonly #mocksPattern: RegExp;
   #raw: RawMockMap;
-  +#rootDir: Path;
-  +#pathUtils: RootPathUtils;
-  +#console: typeof console;
+  readonly #rootDir: Path;
+  readonly #pathUtils: RootPathUtils;
+  readonly #console: typeof console;
   #throwOnModuleCollision: boolean;
 
   constructor({

package/src/plugins/dependencies/worker.js

@@ -5,7 +5,12 @@ module.exports = class DependencyExtractorWorker {
   #dependencyExtractor;
   constructor({ dependencyExtractor }) {
     if (dependencyExtractor != null) {
-      this.#dependencyExtractor = require(dependencyExtractor);
+      const mod = require(dependencyExtractor);
+      let extract = mod?.extract;
+      if (extract == null && mod?.__esModule === true) {
+        extract = mod.default?.extract;
+      }
+      this.#dependencyExtractor = extract;
     }
   }
   processFile(data, utils) {
@@ -13,7 +18,7 @@ module.exports = class DependencyExtractorWorker {
     const { filePath } = data;
     const dependencies =
       this.#dependencyExtractor != null
-        ? this.#dependencyExtractor.extract(
+        ? this.#dependencyExtractor(
             content,
             filePath,
             defaultDependencyExtractor.extract,

package/src/plugins/dependencies/worker.js.flow

@@ -20,14 +20,19 @@ import type {MetadataWorker, WorkerMessage, V8Serializable, DependencyExtractor}
 */
 
 module.exports = class DependencyExtractorWorker /*:: implements MetadataWorker */ {
-  /*:: + */ #dependencyExtractor /*: ?DependencyExtractor */;
+  /*:: readonly  */ #dependencyExtractor /*: ?DependencyExtractor['extract'] */;
 
   constructor(
     {dependencyExtractor} /*: Readonly<{dependencyExtractor: ?string}> */,
   ) {
     if (dependencyExtractor != null) {
       // $FlowFixMe[unsupported-syntax] - dynamic require
-      this.#dependencyExtractor = require(dependencyExtractor);
+      const mod = require(dependencyExtractor);
+      let extract = mod?.extract; // CJS export or ESM named export
+      if (extract == null && mod?.__esModule === true) {
+        extract = mod.default?.extract;
+      }
+      this.#dependencyExtractor = extract;
     }
   }
 
@@ -40,7 +45,7 @@ module.exports = class DependencyExtractorWorker /*:: implements MetadataWorker
 
     const dependencies =
       this.#dependencyExtractor != null
-        ? this.#dependencyExtractor.extract(
+        ? this.#dependencyExtractor(
             content,
             filePath,
             defaultDependencyExtractor.extract,

package/src/plugins/haste/worker.js

@@ -7,7 +7,9 @@ module.exports = class Worker {
   #hasteImpl = null;
   constructor({ hasteImplModulePath }) {
     if (hasteImplModulePath != null) {
-      this.#hasteImpl = require(hasteImplModulePath);
+      const mod = require(hasteImplModulePath);
+      this.#hasteImpl =
+        mod.__esModule === true && "default" in mod ? mod.default : mod;
     }
   }
   processFile(data, utils) {

package/src/plugins/haste/worker.js.flow

@@ -22,7 +22,7 @@ import type {MetadataWorker, WorkerMessage, V8Serializable} from '../../flow-typ
 const PACKAGE_JSON = path.sep + 'package.json';
 
 module.exports = class Worker /*:: implements MetadataWorker */ {
-  /*:: + */ #hasteImpl /*: ?Readonly<{getHasteName: string => ?string}>  */ =
+  /*:: readonly  */ #hasteImpl /*: ?Readonly<{getHasteName: string => ?string}>  */ =
     null;
 
   constructor(
@@ -30,7 +30,9 @@ module.exports = class Worker /*:: implements MetadataWorker */ {
   ) {
     if (hasteImplModulePath != null) {
       // $FlowFixMe[unsupported-syntax] - dynamic require
-      this.#hasteImpl = require(hasteImplModulePath);
+      const mod = require(hasteImplModulePath);
+      this.#hasteImpl =
+        mod.__esModule === true && 'default' in mod ? mod.default : mod;
     }
   }
 

package/src/watchers/AbstractWatcher.js.flow

@@ -24,11 +24,11 @@ export type Listeners = Readonly<{
 }>;
 
 export class AbstractWatcher implements WatcherBackend {
-  +root: string;
-  +ignored: ?RegExp;
-  +globs: ReadonlyArray<string>;
-  +dot: boolean;
-  +doIgnore: (path: string) => boolean;
+  readonly root: string;
+  readonly ignored: ?RegExp;
+  readonly globs: ReadonlyArray<string>;
+  readonly dot: boolean;
+  readonly doIgnore: (path: string) => boolean;
 
   #emitter: EventEmitter = new EventEmitter();
 

package/src/watchers/FallbackWatcher.js.flow

@@ -42,12 +42,13 @@ const DELETE_EVENT = common.DELETE_EVENT;
 const DEBOUNCE_MS = 100;
 
 export default class FallbackWatcher extends AbstractWatcher {
-  +#changeTimers: Map<string, TimeoutID> = new Map();
-  +#dirRegistry: {
+  readonly #changeTimers: Map<string, TimeoutID> = new Map();
+  readonly #dirRegistry: {
     [directory: string]: {[file: string]: true, __proto__: null},
     __proto__: null,
   } = Object.create(null);
-  +#watched: {[key: string]: FSWatcher, __proto__: null} = Object.create(null);
+  readonly #watched: {[key: string]: FSWatcher, __proto__: null} =
+    Object.create(null);
 
   async startWatching(): Promise<void> {
     this.#watchdir(this.root);

package/src/watchers/NativeWatcher.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<b68c5620efd3f5bec83279059d0d1b4e>>
+ * @generated SignedSource<<6297e6ebfbeb2920f00b15cba9acbce2>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/watchers/NativeWatcher.js
@@ -50,6 +50,5 @@ declare class NativeWatcher extends AbstractWatcher {
    * End watching.
    */
   stopWatching(): Promise<void>;
-  _handleEvent(event: string, relativePath: string): void;
 }
 export default NativeWatcher;

package/src/watchers/WatchmanWatcher.js.flow

@@ -41,12 +41,12 @@ const SUB_PREFIX = 'metro-file-map';
  */
 export default class WatchmanWatcher extends AbstractWatcher {
   #client: Client;
-  +subscriptionName: string;
+  readonly subscriptionName: string;
   #watchProjectInfo: ?Readonly<{
     relativePath: string,
     root: string,
   }>;
-  +#watchmanDeferStates: ReadonlyArray<string>;
+  readonly #watchmanDeferStates: ReadonlyArray<string>;
   #deferringStates: ?Set<string> = null;
 
   constructor(dir: string, opts: WatcherOptions) {

package/src/worker.js

@@ -9,7 +9,9 @@ class Worker {
   #plugins;
   constructor({ plugins = [] }) {
     this.#plugins = plugins.map(({ modulePath, setupArgs }) => {
-      const PluginWorker = require(modulePath);
+      const mod = require(modulePath);
+      const PluginWorker =
+        mod.__esModule === true && "default" in mod ? mod.default : mod;
       return new PluginWorker(setupArgs);
     });
   }

package/src/worker.js.flow

@@ -36,7 +36,9 @@ class Worker {
   constructor({plugins = []} /*: WorkerSetupArgs */) {
     this.#plugins = plugins.map(({modulePath, setupArgs}) => {
       // $FlowFixMe[unsupported-syntax] - dynamic require
-      const PluginWorker = require(modulePath);
+      const mod = require(modulePath);
+      const PluginWorker =
+        mod.__esModule === true && 'default' in mod ? mod.default : mod;
       return new PluginWorker(setupArgs);
     });
   }

package/src/crawlers/node/hasNativeFindSupport.d.ts

@@ -1,19 +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.
- *
- * @noformat
- * @oncall react_native
- * @generated SignedSource<<8b6ff8a24f9156cd7991006c72edd296>>
- *
- * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
- * Original file: packages/metro-file-map/src/crawlers/node/hasNativeFindSupport.js
- * To regenerate, run:
- *   js1 build metro-ts-defs (internal) OR
- *   yarn run build-ts-defs (OSS) 
- */
-
-declare function hasNativeFindSupport(): Promise<boolean>;
-export default hasNativeFindSupport;

package/src/crawlers/node/hasNativeFindSupport.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true,
-});
-exports.default = hasNativeFindSupport;
-var _child_process = require("child_process");
-async function hasNativeFindSupport() {
-  try {
-    return await new Promise((resolve) => {
-      const args = [
-        ".",
-        "-type",
-        "f",
-        "(",
-        "-iname",
-        "*.ts",
-        "-o",
-        "-iname",
-        "*.js",
-        ")",
-      ];
-      const child = (0, _child_process.spawn)("find", args, {
-        cwd: __dirname,
-      });
-      child.on("error", () => {
-        resolve(false);
-      });
-      child.on("exit", (code) => {
-        resolve(code === 0);
-      });
-    });
-  } catch {
-    return false;
-  }
-}

package/src/crawlers/node/hasNativeFindSupport.js.flow

@@ -1,41 +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.
- *
- * @flow strict-local
- * @format
- * @oncall react_native
- */
-
-import {spawn} from 'child_process';
-
-export default async function hasNativeFindSupport(): Promise<boolean> {
-  try {
-    return await new Promise(resolve => {
-      // Check the find binary supports the non-POSIX -iname parameter wrapped in parens.
-      const args = [
-        '.',
-        '-type',
-        'f',
-        '(',
-        '-iname',
-        '*.ts',
-        '-o',
-        '-iname',
-        '*.js',
-        ')',
-      ];
-      const child = spawn('find', args, {cwd: __dirname});
-      child.on('error', () => {
-        resolve(false);
-      });
-      child.on('exit', code => {
-        resolve(code === 0);
-      });
-    });
-  } catch {
-    return false;
-  }
-}