metro-file-map 0.80.0 → 0.80.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-file-map",
-  "version": "0.80.0",
+  "version": "0.80.2",
   "description": "[Experimental] - 🚇 File crawling, watching and mapping for Metro",
   "main": "src/index.js",
   "repository": {

package/src/Watcher.js

@@ -4,21 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.Watcher = void 0;
-var _watchman = _interopRequireDefault(require("./crawlers/watchman"));
 var _node = _interopRequireDefault(require("./crawlers/node"));
-var _WatchmanWatcher = _interopRequireDefault(
-  require("./watchers/WatchmanWatcher")
-);
+var _watchman = _interopRequireDefault(require("./crawlers/watchman"));
+var _common = require("./watchers/common");
 var _FSEventsWatcher = _interopRequireDefault(
   require("./watchers/FSEventsWatcher")
 );
 var _NodeWatcher = _interopRequireDefault(require("./watchers/NodeWatcher"));
-var path = _interopRequireWildcard(require("path"));
-var fs = _interopRequireWildcard(require("fs"));
-var _common = require("./watchers/common");
+var _WatchmanWatcher = _interopRequireDefault(
+  require("./watchers/WatchmanWatcher")
+);
 var _events = _interopRequireDefault(require("events"));
-var _perf_hooks = require("perf_hooks");
+var fs = _interopRequireWildcard(require("fs"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
+var path = _interopRequireWildcard(require("path"));
+var _perf_hooks = require("perf_hooks");
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();

package/src/Watcher.js.flow

@@ -20,17 +20,17 @@ import type {
 import type {WatcherOptions as WatcherBackendOptions} from './watchers/common';
 import type {AbortSignal} from 'node-abort-controller';
 
-import watchmanCrawl from './crawlers/watchman';
 import nodeCrawl from './crawlers/node';
-import WatchmanWatcher from './watchers/WatchmanWatcher';
+import watchmanCrawl from './crawlers/watchman';
+import {ADD_EVENT, CHANGE_EVENT} from './watchers/common';
 import FSEventsWatcher from './watchers/FSEventsWatcher';
 import NodeWatcher from './watchers/NodeWatcher';
-import * as path from 'path';
-import * as fs from 'fs';
-import {ADD_EVENT, CHANGE_EVENT} from './watchers/common';
+import WatchmanWatcher from './watchers/WatchmanWatcher';
 import EventEmitter from 'events';
-import {performance} from 'perf_hooks';
+import * as fs from 'fs';
 import nullthrows from 'nullthrows';
+import * as path from 'path';
+import {performance} from 'perf_hooks';
 
 const debug = require('debug')('Metro:Watcher');
 

package/src/crawlers/node/index.js

@@ -1,13 +1,16 @@
 "use strict";
 
+var fastPath = _interopRequireWildcard(require("../../lib/fast_path"));
 var _hasNativeFindSupport = _interopRequireDefault(
   require("./hasNativeFindSupport")
 );
-var fastPath = _interopRequireWildcard(require("../../lib/fast_path"));
 var _child_process = require("child_process");
 var fs = _interopRequireWildcard(require("graceful-fs"));
 var _os = require("os");
 var path = _interopRequireWildcard(require("path"));
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();
@@ -48,9 +51,6 @@ function _interopRequireWildcard(obj, nodeInterop) {
   }
   return newObj;
 }
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
-}
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

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

@@ -16,8 +16,8 @@ import type {
   IgnoreMatcher,
 } from '../../flow-types';
 
-import hasNativeFindSupport from './hasNativeFindSupport';
 import * as fastPath from '../../lib/fast_path';
+import hasNativeFindSupport from './hasNativeFindSupport';
 import {spawn} from 'child_process';
 import * as fs from 'graceful-fs';
 import {platform} from 'os';

package/src/flow-types.js.flow

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import type {PerfLoggerFactory, RootPerfLogger, PerfLogger} from 'metro-config';
+import type {PerfLogger, PerfLoggerFactory, RootPerfLogger} from 'metro-config';
 import type {AbortSignal} from 'node-abort-controller';
 
 export type {PerfLoggerFactory, PerfLogger};

package/src/index.js

@@ -30,21 +30,21 @@ var _checkWatchmanCapabilities = _interopRequireDefault(
 );
 var _DuplicateError = require("./lib/DuplicateError");
 var fastPath = _interopRequireWildcard(require("./lib/fast_path"));
+var _MockMap = _interopRequireDefault(require("./lib/MockMap"));
+var _MutableHasteMap = _interopRequireDefault(require("./lib/MutableHasteMap"));
 var _normalizePathSeparatorsToSystem = _interopRequireDefault(
   require("./lib/normalizePathSeparatorsToSystem")
 );
 var _TreeFS = _interopRequireDefault(require("./lib/TreeFS"));
-var _MutableHasteMap = _interopRequireDefault(require("./lib/MutableHasteMap"));
 var _Watcher = require("./Watcher");
 var _worker = require("./worker");
 var _events = _interopRequireDefault(require("events"));
 var _invariant = _interopRequireDefault(require("invariant"));
 var _jestWorker = require("jest-worker");
-var path = _interopRequireWildcard(require("path"));
 var _nodeAbortController = require("node-abort-controller");
-var _perf_hooks = require("perf_hooks");
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
-var _MockMap = _interopRequireDefault(require("./lib/MockMap"));
+var path = _interopRequireWildcard(require("path"));
+var _perf_hooks = require("perf_hooks");
 var _DuplicateHasteCandidatesError = require("./lib/DuplicateHasteCandidatesError");
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
@@ -205,7 +205,7 @@ class FileMap extends _events.default {
     super();
     if (options.perfLoggerFactory) {
       this._startupPerfLogger =
-        options.perfLoggerFactory?.("START_UP").subSpan("hasteMap") ?? null;
+        options.perfLoggerFactory?.("START_UP").subSpan("fileMap") ?? null;
       this._startupPerfLogger?.point("constructor_start");
     }
 
@@ -252,6 +252,7 @@ class FileMap extends _events.default {
     };
     this._options = {
       ...buildParameters,
+      enableWorkerThreads: options.enableWorkerThreads ?? false,
       healthCheck: options.healthCheck,
       maxWorkers: options.maxWorkers,
       perfLoggerFactory: options.perfLoggerFactory,
@@ -722,6 +723,7 @@ class FileMap extends _events.default {
           exposedMethods: ["worker"],
           maxRetries: 3,
           numWorkers: this._options.maxWorkers,
+          enableWorkerThreads: this._options.enableWorkerThreads,
           forkOptions: {
             // Don't pass Node arguments down to workers. In particular, avoid
             // unnecessarily registering Babel when we're running Metro from

package/src/index.js.flow

@@ -9,7 +9,6 @@
  * @oncall react_native
  */
 
-import type {IJestWorker} from 'jest-worker';
 import type {
   BuildParameters,
   BuildResult,
@@ -19,24 +18,25 @@ import type {
   CanonicalPath,
   ChangeEvent,
   ChangeEventMetadata,
-  CrawlerOptions,
   Console,
+  CrawlerOptions,
   EventsQueue,
   FileData,
   FileMetaData,
   FileSystem,
-  HType,
   HasteMapData,
   HasteMapItem,
+  HType,
   MutableFileSystem,
   Path,
-  PerfLoggerFactory,
   PerfLogger,
+  PerfLoggerFactory,
   RawMockMap,
   ReadOnlyRawMockMap,
-  WorkerMetadata,
   WatchmanClocks,
+  WorkerMetadata,
 } from './flow-types';
+import type {IJestWorker} from 'jest-worker';
 
 import {DiskCacheManager} from './cache/DiskCacheManager';
 import H from './constants';
@@ -44,19 +44,19 @@ import getMockName from './getMockName';
 import checkWatchmanCapabilities from './lib/checkWatchmanCapabilities';
 import {DuplicateError} from './lib/DuplicateError';
 import * as fastPath from './lib/fast_path';
+import MockMapImpl from './lib/MockMap';
+import MutableHasteMap from './lib/MutableHasteMap';
 import normalizePathSeparatorsToSystem from './lib/normalizePathSeparatorsToSystem';
 import TreeFS from './lib/TreeFS';
-import MutableHasteMap from './lib/MutableHasteMap';
 import {Watcher} from './Watcher';
 import {worker} from './worker';
 import EventEmitter from 'events';
 import invariant from 'invariant';
 import {Worker} from 'jest-worker';
-import * as path from 'path';
 import {AbortController} from 'node-abort-controller';
-import {performance} from 'perf_hooks';
 import nullthrows from 'nullthrows';
-import MockMapImpl from './lib/MockMap';
+import * as path from 'path';
+import {performance} from 'perf_hooks';
 
 const debug = require('debug')('Metro:FileMap');
 
@@ -77,6 +77,7 @@ export type InputOptions = $ReadOnly<{
   computeSha1?: ?boolean,
   enableHastePackages?: boolean,
   enableSymlinks?: ?boolean,
+  enableWorkerThreads?: ?boolean,
   extensions: $ReadOnlyArray<string>,
   forceNodeFilesystemAPI?: ?boolean,
   ignorePattern?: ?RegExp,
@@ -112,6 +113,7 @@ type HealthCheckOptions = $ReadOnly<{
 
 type InternalOptions = {
   ...BuildParameters,
+  enableWorkerThreads: boolean,
   healthCheck: HealthCheckOptions,
   perfLoggerFactory: ?PerfLoggerFactory,
   resetCache: ?boolean,
@@ -260,7 +262,7 @@ export default class FileMap extends EventEmitter {
 
     if (options.perfLoggerFactory) {
       this._startupPerfLogger =
-        options.perfLoggerFactory?.('START_UP').subSpan('hasteMap') ?? null;
+        options.perfLoggerFactory?.('START_UP').subSpan('fileMap') ?? null;
       this._startupPerfLogger?.point('constructor_start');
     }
 
@@ -309,6 +311,7 @@ export default class FileMap extends EventEmitter {
 
     this._options = {
       ...buildParameters,
+      enableWorkerThreads: options.enableWorkerThreads ?? false,
       healthCheck: options.healthCheck,
       maxWorkers: options.maxWorkers,
       perfLoggerFactory: options.perfLoggerFactory,
@@ -808,6 +811,7 @@ export default class FileMap extends EventEmitter {
           exposedMethods: ['worker'],
           maxRetries: 3,
           numWorkers: this._options.maxWorkers,
+          enableWorkerThreads: this._options.enableWorkerThreads,
           forkOptions: {
             // Don't pass Node arguments down to workers. In particular, avoid
             // unnecessarily registering Babel when we're running Metro from

package/src/lib/MockMap.js.flow

@@ -10,6 +10,7 @@
  */
 
 import type {MockMap as IMockMap, Path, RawMockMap} from '../flow-types';
+
 import {resolve} from './fast_path';
 
 export default class MockMap implements IMockMap {

package/src/lib/MutableHasteMap.js.flow

@@ -13,10 +13,10 @@ import type {
   Console,
   DuplicatesIndex,
   DuplicatesSet,
-  HTypeValue,
   HasteMap,
   HasteMapItem,
   HasteMapItemMetaData,
+  HTypeValue,
   Path,
   RawHasteMap,
   ReadOnlyRawHasteMap,

package/src/watchers/FSEventsWatcher.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.default = void 0;
+var _common = require("./common");
 var _anymatch = _interopRequireDefault(require("anymatch"));
 var _events = _interopRequireDefault(require("events"));
 var _fs = require("fs");
 var path = _interopRequireWildcard(require("path"));
 var _walker = _interopRequireDefault(require("walker"));
-var _common = require("./common");
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();

package/src/watchers/FSEventsWatcher.js.flow

@@ -13,6 +13,7 @@ import type {Stats} from 'fs';
 // $FlowFixMe[cannot-resolve-module] - Optional, Darwin only
 import type {FSEvents} from 'fsevents';
 
+import {isIncluded, typeFromStat} from './common';
 // $FlowFixMe[untyped-import] - anymatch
 import anymatch from 'anymatch';
 import EventEmitter from 'events';
@@ -20,7 +21,6 @@ import {promises as fsPromises} from 'fs';
 import * as path from 'path';
 // $FlowFixMe[untyped-import] - walker
 import walker from 'walker';
-import {isIncluded, typeFromStat} from './common';
 
 const debug = require('debug')('Metro:FSEventsWatcher');
 

package/src/watchers/NodeWatcher.js.flow

@@ -15,8 +15,8 @@
 
 'use strict';
 
-import type {WatcherOptions} from './common';
 import type {ChangeEventMetadata} from '../flow-types';
+import type {WatcherOptions} from './common';
 import type {FSWatcher, Stats} from 'fs';
 
 const common = require('./common');

package/src/watchers/WatchmanWatcher.js.flow

@@ -9,15 +9,15 @@
  * @oncall react_native
  */
 
-import type {WatcherOptions} from './common';
 import type {ChangeEventMetadata} from '../flow-types';
+import type {WatcherOptions} from './common';
 import type {
   Client,
   WatchmanClockResponse,
   WatchmanFileChange,
   WatchmanQuery,
-  WatchmanSubscriptionEvent,
   WatchmanSubscribeResponse,
+  WatchmanSubscriptionEvent,
   WatchmanWatchResponse,
 } from 'fb-watchman';
 

package/src/worker.js

@@ -18,8 +18,8 @@ const H = require("./constants");
 const dependencyExtractor = require("./lib/dependencyExtractor");
 const excludedExtensions = require("./workerExclusionList");
 const { createHash } = require("crypto");
-const fs = require("graceful-fs");
 const { promises: fsPromises } = require("fs");
+const fs = require("graceful-fs");
 const path = require("path");
 const PACKAGE_JSON = path.sep + "package.json";
 let hasteImpl /*: ?{getHasteName: string => ?string} */ = null;

package/src/worker.js.flow

@@ -18,8 +18,8 @@ const H = require('./constants');
 const dependencyExtractor = require('./lib/dependencyExtractor');
 const excludedExtensions = require('./workerExclusionList');
 const {createHash} = require('crypto');
-const fs = require('graceful-fs');
 const {promises: fsPromises} = require('fs');
+const fs = require('graceful-fs');
 const path = require('path');
 
 const PACKAGE_JSON = path.sep + 'package.json';