metro-file-map 0.75.0 → 0.75.1

package/package.json

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

package/src/HasteFS.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _constants = _interopRequireDefault(require("./constants"));
 var fastPath = _interopRequireWildcard(require("./lib/fast_path"));
+var _invariant = _interopRequireDefault(require("invariant"));
 var path = _interopRequireWildcard(require("path"));
 var _jestUtil = require("jest-util");
 function _getRequireWildcardCache(nodeInterop) {
@@ -84,25 +85,6 @@ class HasteFS {
   addOrModify(filePath, metadata) {
     this.#files.set(this._normalizePath(filePath), metadata);
   }
-  setVisitMetadata(filePath, visitResult) {
-    const metadata = this._getFileData(filePath);
-    if (!metadata) {
-      throw new Error("Visited file not found in file map: " + filePath);
-    }
-    metadata[_constants.default.VISITED] = 1;
-    if (visitResult.hasteId != null) {
-      metadata[_constants.default.ID] = visitResult.hasteId;
-    }
-    if ("sha1" in visitResult) {
-      metadata[_constants.default.SHA1] = visitResult.sha1;
-    }
-    if (visitResult.dependencies != null) {
-      metadata[_constants.default.DEPENDENCIES] = visitResult.dependencies;
-    }
-    if (visitResult.symlinkTarget != null) {
-      metadata[_constants.default.SYMLINK] = visitResult.symlinkTarget;
-    }
-  }
   getSerializableSnapshot() {
     return new Map(Array.from(this.#files.entries(), ([k, v]) => [k, [...v]]));
   }
@@ -122,22 +104,6 @@ class HasteFS {
       ? _ref2
       : null;
   }
-  getSymlinkTarget(file) {
-    const fileMetadata = this._getFileData(file);
-    if (fileMetadata == null) {
-      return null;
-    }
-    return typeof fileMetadata[_constants.default.SYMLINK] === "string"
-      ? fileMetadata[_constants.default.SYMLINK]
-      : null;
-  }
-  getType(file) {
-    const fileMetadata = this._getFileData(file);
-    if (fileMetadata == null) {
-      return null;
-    }
-    return fileMetadata[_constants.default.SYMLINK] === 0 ? "f" : "l";
-  }
   getDependencies(file) {
     const fileMetadata = this._getFileData(file);
     if (fileMetadata) {
@@ -158,14 +124,6 @@ class HasteFS {
       ? _ref3
       : null;
   }
-  getModifiedTime(file) {
-    var _ref4;
-    const fileMetadata = this._getFileData(file);
-    return (_ref4 = fileMetadata && fileMetadata[_constants.default.MTIME]) !==
-      null && _ref4 !== void 0
-      ? _ref4
-      : null;
-  }
   exists(file) {
     return this._getFileData(file) != null;
   }
@@ -180,6 +138,22 @@ class HasteFS {
       yield fastPath.resolve(this.#rootDir, file);
     }
   }
+  linkStats(file) {
+    const fileMetadata = this._getFileData(file);
+    if (fileMetadata == null) {
+      return null;
+    }
+    const fileType = fileMetadata[_constants.default.SYMLINK] === 0 ? "f" : "l";
+    const modifiedTime = fileMetadata[_constants.default.MTIME];
+    (0, _invariant.default)(
+      typeof modifiedTime === "number",
+      "File in HasteFS missing modified time"
+    );
+    return {
+      fileType,
+      modifiedTime,
+    };
+  }
   matchFiles(pattern) {
     const regexpPattern =
       pattern instanceof RegExp ? pattern : new RegExp(pattern);
@@ -245,5 +219,8 @@ class HasteFS {
     }
     return this.#files.get(this._normalizePath(filePath));
   }
+  getRealPath(filePath) {
+    throw new Error("HasteFS.getRealPath() is not implemented.");
+  }
 }
 exports.default = HasteFS;

package/src/HasteFS.js.flow

@@ -11,14 +11,15 @@
 import type {
   FileData,
   FileMetaData,
+  FileStats,
   Glob,
   MutableFileSystem,
   Path,
-  VisitMetadata,
 } from './flow-types';
 
 import H from './constants';
 import * as fastPath from './lib/fast_path';
+import invariant from 'invariant';
 import * as path from 'path';
 import {globsToMatcher, replacePathSepForGlob} from 'jest-util';
 
@@ -51,33 +52,6 @@ export default class HasteFS implements MutableFileSystem {
     this.#files.set(this._normalizePath(filePath), metadata);
   }
 
-  setVisitMetadata(
-    filePath: Path,
-    visitResult: $ReadOnly<VisitMetadata>,
-  ): void {
-    const metadata = this._getFileData(filePath);
-    if (!metadata) {
-      throw new Error('Visited file not found in file map: ' + filePath);
-    }
-    metadata[H.VISITED] = 1;
-
-    if (visitResult.hasteId != null) {
-      metadata[H.ID] = visitResult.hasteId;
-    }
-
-    if ('sha1' in visitResult) {
-      metadata[H.SHA1] = visitResult.sha1;
-    }
-
-    if (visitResult.dependencies != null) {
-      metadata[H.DEPENDENCIES] = visitResult.dependencies;
-    }
-
-    if (visitResult.symlinkTarget != null) {
-      metadata[H.SYMLINK] = visitResult.symlinkTarget;
-    }
-  }
-
   getSerializableSnapshot(): FileData {
     return new Map(
       Array.from(this.#files.entries(), ([k, v]: [Path, FileMetaData]) => [
@@ -97,24 +71,6 @@ export default class HasteFS implements MutableFileSystem {
     return (fileMetadata && fileMetadata[H.SIZE]) ?? null;
   }
 
-  getSymlinkTarget(file: Path): ?string {
-    const fileMetadata = this._getFileData(file);
-    if (fileMetadata == null) {
-      return null;
-    }
-    return typeof fileMetadata[H.SYMLINK] === 'string'
-      ? fileMetadata[H.SYMLINK]
-      : null;
-  }
-
-  getType(file: Path): ?('f' | 'l') {
-    const fileMetadata = this._getFileData(file);
-    if (fileMetadata == null) {
-      return null;
-    }
-    return fileMetadata[H.SYMLINK] === 0 ? 'f' : 'l';
-  }
-
   getDependencies(file: Path): ?Array<string> {
     const fileMetadata = this._getFileData(file);
 
@@ -132,11 +88,6 @@ export default class HasteFS implements MutableFileSystem {
     return (fileMetadata && fileMetadata[H.SHA1]) ?? null;
   }
 
-  getModifiedTime(file: Path): ?number {
-    const fileMetadata = this._getFileData(file);
-    return (fileMetadata && fileMetadata[H.MTIME]) ?? null;
-  }
-
   exists(file: Path): boolean {
     return this._getFileData(file) != null;
   }
@@ -155,6 +106,23 @@ export default class HasteFS implements MutableFileSystem {
     }
   }
 
+  linkStats(file: Path): ?FileStats {
+    const fileMetadata = this._getFileData(file);
+    if (fileMetadata == null) {
+      return null;
+    }
+    const fileType = fileMetadata[H.SYMLINK] === 0 ? 'f' : 'l';
+    const modifiedTime = fileMetadata[H.MTIME];
+    invariant(
+      typeof modifiedTime === 'number',
+      'File in HasteFS missing modified time',
+    );
+    return {
+      fileType,
+      modifiedTime,
+    };
+  }
+
   matchFiles(pattern: RegExp | string): Array<Path> {
     const regexpPattern =
       pattern instanceof RegExp ? pattern : new RegExp(pattern);
@@ -235,4 +203,8 @@ export default class HasteFS implements MutableFileSystem {
     }
     return this.#files.get(this._normalizePath(filePath));
   }
+
+  getRealPath(filePath: Path): Path {
+    throw new Error('HasteFS.getRealPath() is not implemented.');
+  }
 }

package/src/flow-types.js.flow

@@ -153,16 +153,25 @@ export type FileMetaData = [
   /* symlink */ 0 | 1 | string, // string specifies target, if known
 ];
 
+export type FileStats = $ReadOnly<{
+  fileType: 'f' | 'l',
+  modifiedTime: number,
+}>;
+
 export interface FileSystem {
   exists(file: Path): boolean;
   getAllFiles(): Array<Path>;
   getDependencies(file: Path): ?Array<string>;
-  getModifiedTime(file: Path): ?number;
   getModuleName(file: Path): ?string;
+  getRealPath(file: Path): ?string;
   getSerializableSnapshot(): FileData;
   getSha1(file: Path): ?string;
-  getSymlinkTarget(file: Path): ?string;
-  getType(file: Path): ?('f' | 'l');
+
+  /**
+   * Analogous to posix lstat. If the file at `file` is a symlink, return
+   * information about the symlink without following it.
+   */
+  linkStats(file: Path): ?FileStats;
 
   matchFiles(pattern: RegExp | string): Array<Path>;
 
@@ -216,7 +225,6 @@ export interface MutableFileSystem extends FileSystem {
   remove(filePath: Path): void;
   addOrModify(filePath: Path, fileMetadata: FileMetaData): void;
   bulkAddOrModify(addedOrModifiedFiles: FileData): void;
-  setVisitMetadata(filePath: Path, metadata: $ReadOnly<VisitMetadata>): void;
 }
 
 export type Path = string;
@@ -238,13 +246,6 @@ export type ReadOnlyRawModuleMap = $ReadOnly<{
   mocks: $ReadOnlyMap<string, Path>,
 }>;
 
-export type VisitMetadata = {
-  hasteId?: string,
-  sha1?: ?string,
-  dependencies?: string,
-  symlinkTarget?: string,
-};
-
 export type WatchmanClockSpec =
   | string
   | $ReadOnly<{scm: $ReadOnly<{'mergebase-with': string}>}>;