metro-file-map 0.73.4 → 0.73.6

package/package.json

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

package/src/HasteFS.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.default = void 0;
-
 var _constants = _interopRequireDefault(require("./constants"));
-
 var fastPath = _interopRequireWildcard(require("./lib/fast_path"));
-
 var path = _interopRequireWildcard(require("path"));
-
 var _jestUtil = require("jest-util");
-
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();
@@ -21,7 +16,6 @@ function _getRequireWildcardCache(nodeInterop) {
     return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
   })(nodeInterop);
 }
-
 function _interopRequireWildcard(obj, nodeInterop) {
   if (!nodeInterop && obj && obj.__esModule) {
     return obj;
@@ -54,11 +48,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
   }
   return newObj;
 }
-
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
-
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -68,27 +60,26 @@ function _interopRequireDefault(obj) {
  * @format
  *
  */
+
 class HasteFS {
+  #rootDir;
+  #files;
   constructor({ rootDir, files }) {
-    this._rootDir = rootDir;
-    this._files = files;
+    // $FlowIssue[cannot-write] - should be fixed in Flow 0.193 (D41130671)
+    this.#rootDir = rootDir;
+    // $FlowIssue[cannot-write] - should be fixed in Flow 0.193 (D41130671)
+    this.#files = files;
   }
-
   getModuleName(file) {
     const fileMetadata = this._getFileData(file);
-
     return (fileMetadata && fileMetadata[_constants.default.ID]) || null;
   }
-
   getSize(file) {
     const fileMetadata = this._getFileData(file);
-
     return (fileMetadata && fileMetadata[_constants.default.SIZE]) || null;
   }
-
   getDependencies(file) {
     const fileMetadata = this._getFileData(file);
-
     if (fileMetadata) {
       return fileMetadata[_constants.default.DEPENDENCIES]
         ? fileMetadata[_constants.default.DEPENDENCIES].split(
@@ -99,71 +90,60 @@ class HasteFS {
       return null;
     }
   }
-
   getSha1(file) {
     var _ref;
-
     const fileMetadata = this._getFileData(file);
-
     return (_ref = fileMetadata && fileMetadata[_constants.default.SHA1]) !==
       null && _ref !== void 0
       ? _ref
       : null;
   }
-
   exists(file) {
     return this._getFileData(file) != null;
   }
-
   getAllFiles() {
     return Array.from(this.getAbsoluteFileIterator());
   }
-
   getFileIterator() {
-    return this._files.keys();
+    return this.#files.keys();
   }
-
   *getAbsoluteFileIterator() {
     for (const file of this.getFileIterator()) {
-      yield fastPath.resolve(this._rootDir, file);
+      yield fastPath.resolve(this.#rootDir, file);
     }
   }
-
   matchFiles(pattern) {
     const regexpPattern =
       pattern instanceof RegExp ? pattern : new RegExp(pattern);
     const files = [];
-
     for (const file of this.getAbsoluteFileIterator()) {
       if (regexpPattern.test(file)) {
         files.push(file);
       }
     }
-
     return files;
   }
+
   /**
    * Given a search context, return a list of file paths matching the query.
    * The query matches against normalized paths which start with `./`,
    * for example: `a/b.js` -> `./a/b.js`
    */
-
   matchFilesWithContext(root, context) {
     const files = [];
     const prefix = "./";
-
     for (const file of this.getAbsoluteFileIterator()) {
       const filePath = fastPath.relative(root, file);
-      const isUnderRoot = filePath && !filePath.startsWith(".."); // Ignore everything outside of the provided `root`.
-
+      const isUnderRoot = filePath && !filePath.startsWith("..");
+      // Ignore everything outside of the provided `root`.
       if (!isUnderRoot) {
         continue;
-      } // Prevent searching in child directories during a non-recursive search.
+      }
 
+      // Prevent searching in child directories during a non-recursive search.
       if (!context.recursive && filePath.includes(path.sep)) {
         continue;
       }
-
       if (
         context.filter.test(
           // NOTE(EvanBacon): Ensure files start with `./` for matching purposes
@@ -175,29 +155,22 @@ class HasteFS {
         files.push(file);
       }
     }
-
     return files;
   }
-
   matchFilesWithGlob(globs, root) {
     const files = new Set();
     const matcher = (0, _jestUtil.globsToMatcher)(globs);
-
     for (const file of this.getAbsoluteFileIterator()) {
       const filePath = root != null ? fastPath.relative(root, file) : file;
-
       if (matcher((0, _jestUtil.replacePathSepForGlob)(filePath))) {
         files.add(file);
       }
     }
-
     return files;
   }
-
   _getFileData(file) {
-    const relativePath = fastPath.relative(this._rootDir, file);
-    return this._files.get(relativePath);
+    const relativePath = fastPath.relative(this.#rootDir, file);
+    return this.#files.get(relativePath);
   }
 }
-
 exports.default = HasteFS;

package/src/HasteFS.js.flow

@@ -22,12 +22,14 @@ import * as path from 'path';
 import {globsToMatcher, replacePathSepForGlob} from 'jest-util';
 
 export default class HasteFS implements FileSystem {
-  +_rootDir: Path;
-  +_files: FileData;
+  +#rootDir: Path;
+  +#files: FileData;
 
   constructor({rootDir, files}: {rootDir: Path, files: FileData}) {
-    this._rootDir = rootDir;
-    this._files = files;
+    // $FlowIssue[cannot-write] - should be fixed in Flow 0.193 (D41130671)
+    this.#rootDir = rootDir;
+    // $FlowIssue[cannot-write] - should be fixed in Flow 0.193 (D41130671)
+    this.#files = files;
   }
 
   getModuleName(file: Path): ?string {
@@ -66,12 +68,12 @@ export default class HasteFS implements FileSystem {
   }
 
   getFileIterator(): Iterable<Path> {
-    return this._files.keys();
+    return this.#files.keys();
   }
 
   *getAbsoluteFileIterator(): Iterable<Path> {
     for (const file of this.getFileIterator()) {
-      yield fastPath.resolve(this._rootDir, file);
+      yield fastPath.resolve(this.#rootDir, file);
     }
   }
 
@@ -147,7 +149,7 @@ export default class HasteFS implements FileSystem {
   }
 
   _getFileData(file: Path): void | FileMetaData {
-    const relativePath = fastPath.relative(this._rootDir, file);
-    return this._files.get(relativePath);
+    const relativePath = fastPath.relative(this.#rootDir, file);
+    return this.#files.get(relativePath);
   }
 }

package/src/ModuleMap.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.default = void 0;
-
 var _constants = _interopRequireDefault(require("./constants"));
-
 var _DuplicateHasteCandidatesError = require("./lib/DuplicateHasteCandidatesError");
-
 var fastPath = _interopRequireWildcard(require("./lib/fast_path"));
-
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();
@@ -19,7 +15,6 @@ function _getRequireWildcardCache(nodeInterop) {
     return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
   })(nodeInterop);
 }
-
 function _interopRequireWildcard(obj, nodeInterop) {
   if (!nodeInterop && obj && obj.__esModule) {
     return obj;
@@ -52,11 +47,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
   }
   return newObj;
 }
-
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
-
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -67,55 +60,53 @@ function _interopRequireDefault(obj) {
  * @format
  * @oncall react_native
  */
+
 const EMPTY_OBJ = {};
 const EMPTY_MAP = new Map();
-
 class ModuleMap {
+  #raw;
   constructor(raw) {
-    this._raw = raw;
+    // $FlowIssue[cannot-write] - should be fixed in Flow 0.193 (D41130671)
+    this.#raw = raw;
   }
-
   getModule(name, platform, supportsNativePlatform, type) {
     const module = this._getModuleMetadata(
       name,
       platform,
       !!supportsNativePlatform
     );
-
     if (
       module &&
       module[_constants.default.TYPE] ===
         (type !== null && type !== void 0 ? type : _constants.default.MODULE)
     ) {
       const modulePath = module[_constants.default.PATH];
-      return modulePath && fastPath.resolve(this._raw.rootDir, modulePath);
+      return modulePath && fastPath.resolve(this.#raw.rootDir, modulePath);
     }
-
     return null;
   }
-
   getPackage(name, platform, _supportsNativePlatform) {
     return this.getModule(name, platform, null, _constants.default.PACKAGE);
   }
-
   getMockModule(name) {
     const mockPath =
-      this._raw.mocks.get(name) || this._raw.mocks.get(name + "/index");
-
+      this.#raw.mocks.get(name) || this.#raw.mocks.get(name + "/index");
     return mockPath != null
-      ? fastPath.resolve(this._raw.rootDir, mockPath)
+      ? fastPath.resolve(this.#raw.rootDir, mockPath)
       : null;
-  } // FIXME: This is only used by Meta-internal validation and should be
-  // removed or replaced with a less leaky API.
+  }
 
+  // FIXME: This is only used by Meta-internal validation and should be
+  // removed or replaced with a less leaky API.
   getRawModuleMap() {
     return {
-      duplicates: this._raw.duplicates,
-      map: this._raw.map,
-      mocks: this._raw.mocks,
-      rootDir: this._raw.rootDir,
+      duplicates: this.#raw.duplicates,
+      map: this.#raw.map,
+      mocks: this.#raw.mocks,
+      rootDir: this.#raw.rootDir,
     };
   }
+
   /**
    * When looking up a module's data, we walk through each eligible platform for
    * the query. For each platform, we want to check if there are known
@@ -124,11 +115,9 @@ class ModuleMap {
    * extra sure. If metadata exists both in the `duplicates` object and the
    * `map`, this would be a bug.
    */
-
   _getModuleMetadata(name, platform, supportsNativePlatform) {
-    const map = this._raw.map.get(name) || EMPTY_OBJ;
-    const dupMap = this._raw.duplicates.get(name) || EMPTY_MAP;
-
+    const map = this.#raw.map.get(name) || EMPTY_OBJ;
+    const dupMap = this.#raw.duplicates.get(name) || EMPTY_MAP;
     if (platform != null) {
       this._assertNoDuplicates(
         name,
@@ -136,12 +125,10 @@ class ModuleMap {
         supportsNativePlatform,
         dupMap.get(platform)
       );
-
       if (map[platform] != null) {
         return map[platform];
       }
     }
-
     if (supportsNativePlatform) {
       this._assertNoDuplicates(
         name,
@@ -149,39 +136,30 @@ class ModuleMap {
         supportsNativePlatform,
         dupMap.get(_constants.default.NATIVE_PLATFORM)
       );
-
       if (map[_constants.default.NATIVE_PLATFORM]) {
         return map[_constants.default.NATIVE_PLATFORM];
       }
     }
-
     this._assertNoDuplicates(
       name,
       _constants.default.GENERIC_PLATFORM,
       supportsNativePlatform,
       dupMap.get(_constants.default.GENERIC_PLATFORM)
     );
-
     if (map[_constants.default.GENERIC_PLATFORM]) {
       return map[_constants.default.GENERIC_PLATFORM];
     }
-
     return null;
   }
-
   _assertNoDuplicates(name, platform, supportsNativePlatform, relativePathSet) {
     if (relativePathSet == null) {
       return;
-    } // Force flow refinement
-
-    const previousSet = relativePathSet;
+    }
     const duplicates = new Map();
-
-    for (const [relativePath, type] of previousSet) {
-      const duplicatePath = fastPath.resolve(this._raw.rootDir, relativePath);
+    for (const [relativePath, type] of relativePathSet) {
+      const duplicatePath = fastPath.resolve(this.#raw.rootDir, relativePath);
       duplicates.set(duplicatePath, type);
     }
-
     throw new _DuplicateHasteCandidatesError.DuplicateHasteCandidatesError(
       name,
       platform,
@@ -189,7 +167,6 @@ class ModuleMap {
       duplicates
     );
   }
-
   static create(rootDir) {
     return new ModuleMap({
       duplicates: new Map(),
@@ -199,5 +176,4 @@ class ModuleMap {
     });
   }
 }
-
 exports.default = ModuleMap;

package/src/ModuleMap.js.flow

@@ -16,6 +16,7 @@ import type {
   ModuleMetaData,
   Path,
   RawModuleMap,
+  ReadOnlyRawModuleMap,
 } from './flow-types';
 
 import H from './constants';
@@ -26,10 +27,11 @@ const EMPTY_OBJ: {[string]: ModuleMetaData} = {};
 const EMPTY_MAP = new Map<'g' | 'native' | string, ?DuplicatesSet>();
 
 export default class ModuleMap implements IModuleMap {
-  +_raw: RawModuleMap;
+  +#raw: RawModuleMap;
 
   constructor(raw: RawModuleMap) {
-    this._raw = raw;
+    // $FlowIssue[cannot-write] - should be fixed in Flow 0.193 (D41130671)
+    this.#raw = raw;
   }
 
   getModule(
@@ -45,7 +47,7 @@ export default class ModuleMap implements IModuleMap {
     );
     if (module && module[H.TYPE] === (type ?? H.MODULE)) {
       const modulePath = module[H.PATH];
-      return modulePath && fastPath.resolve(this._raw.rootDir, modulePath);
+      return modulePath && fastPath.resolve(this.#raw.rootDir, modulePath);
     }
     return null;
   }
@@ -60,20 +62,20 @@ export default class ModuleMap implements IModuleMap {
 
   getMockModule(name: string): ?Path {
     const mockPath =
-      this._raw.mocks.get(name) || this._raw.mocks.get(name + '/index');
+      this.#raw.mocks.get(name) || this.#raw.mocks.get(name + '/index');
     return mockPath != null
-      ? fastPath.resolve(this._raw.rootDir, mockPath)
+      ? fastPath.resolve(this.#raw.rootDir, mockPath)
       : null;
   }
 
   // FIXME: This is only used by Meta-internal validation and should be
   // removed or replaced with a less leaky API.
-  getRawModuleMap(): RawModuleMap {
+  getRawModuleMap(): ReadOnlyRawModuleMap {
     return {
-      duplicates: this._raw.duplicates,
-      map: this._raw.map,
-      mocks: this._raw.mocks,
-      rootDir: this._raw.rootDir,
+      duplicates: this.#raw.duplicates,
+      map: this.#raw.map,
+      mocks: this.#raw.mocks,
+      rootDir: this.#raw.rootDir,
     };
   }
 
@@ -90,8 +92,8 @@ export default class ModuleMap implements IModuleMap {
     platform: ?string,
     supportsNativePlatform: boolean,
   ): ModuleMetaData | null {
-    const map = this._raw.map.get(name) || EMPTY_OBJ;
-    const dupMap = this._raw.duplicates.get(name) || EMPTY_MAP;
+    const map = this.#raw.map.get(name) || EMPTY_OBJ;
+    const dupMap = this.#raw.duplicates.get(name) || EMPTY_MAP;
     if (platform != null) {
       this._assertNoDuplicates(
         name,
@@ -135,12 +137,10 @@ export default class ModuleMap implements IModuleMap {
     if (relativePathSet == null) {
       return;
     }
-    // Force flow refinement
-    const previousSet = relativePathSet;
     const duplicates = new Map<string, number>();
 
-    for (const [relativePath, type] of previousSet) {
-      const duplicatePath = fastPath.resolve(this._raw.rootDir, relativePath);
+    for (const [relativePath, type] of relativePathSet) {
+      const duplicatePath = fastPath.resolve(this.#raw.rootDir, relativePath);
       duplicates.set(duplicatePath, type);
     }