Back out "Process files before adding them to FileSystem"

Summary: Back out "[metro] Process files before adding them to `FileSystem`"

Reviewed By: yungsters

Differential Revision: D42909065

fbshipit-source-id: e4bfd6c7fc599b0fdfc1d95831f4cc20edcf8d94

Author: skinsshark

packages/metro-file-map/src/HasteFS.js

@@ -14,6 +14,7 @@ import type {
   Glob,
   MutableFileSystem,
   Path,
+  VisitMetadata,
 } from './flow-types';
 
 import H from './constants';
@@ -50,6 +51,33 @@ 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]) => [
@@ -69,6 +97,16 @@ 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) {

packages/metro-file-map/src/__tests__/index-test.js

@@ -1491,20 +1491,17 @@ describe('HasteMap', () => {
 
     hm_it('does not emit duplicate change events', async hm => {
       const e = mockEmitters[path.join('/', 'project', 'fruits')];
-      mockFs[path.join('/', 'project', 'fruits', 'Tomato.js')] = `
-        // Tomato!
-      `;
       e.emit(
         'all',
         'change',
-        'Tomato.js',
+        'tomato.js',
         path.join('/', 'project', 'fruits'),
         MOCK_CHANGE_FILE,
       );
       e.emit(
         'all',
         'change',
-        'Tomato.js',
+        'tomato.js',
         path.join('/', 'project', 'fruits'),
         MOCK_CHANGE_FILE,
       );
@@ -1724,11 +1721,8 @@ describe('HasteMap', () => {
         );
       });
 
-      hm_it('ignore directory events (even with file-ish names)', async hm => {
+      hm_it('ignore directories', async hm => {
         const e = mockEmitters[path.join('/', 'project', 'fruits')];
-        mockFs[path.join('/', 'project', 'fruits', 'tomato.js', 'index.js')] = `
-        // Tomato!
-      `;
         e.emit(
           'all',
           'change',
@@ -1739,8 +1733,8 @@ describe('HasteMap', () => {
         e.emit(
           'all',
           'change',
-          path.join('tomato.js', 'index.js'),
-          path.join('/', 'project', 'fruits'),
+          'tomato.js',
+          path.join('/', 'project', 'fruits', 'tomato.js', 'index.js'),
           MOCK_CHANGE_FILE,
         );
         const {eventsQueue} = await waitForItToChange(hm);

packages/metro-file-map/src/flow-types.js

@@ -161,6 +161,7 @@ export interface FileSystem {
   getModuleName(file: Path): ?string;
   getSerializableSnapshot(): FileData;
   getSha1(file: Path): ?string;
+  getSymlinkTarget(file: Path): ?string;
   getType(file: Path): ?('f' | 'l');
 
   matchFiles(pattern: RegExp | string): Array<Path>;
@@ -215,6 +216,7 @@ 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;
@@ -236,6 +238,13 @@ 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}>}>;