metro-file-map 0.84.3 → 0.85.0

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;
-  }
-}