packager: Package.js: make read()-based API sync

Reviewed By: davidaurelio

Differential Revision: D4745885

fbshipit-source-id: 3d327e5ca91fcbe7ec1d30ff8e6135b415074aa4

packages/metro-bundler/src/node-haste/DependencyGraph/ResolutionRequest.js

@@ -232,7 +232,7 @@ class ResolutionRequest {
 
     let p = fromModule.getPackage();
     if (p) {
-      p = p.redirectRequire(toModuleName);
+      p = Promise.resolve(p.redirectRequire(toModuleName));
     } else {
       p = Promise.resolve(toModuleName);
     }
@@ -470,12 +470,10 @@ class ResolutionRequest {
 
       const packageJsonPath = path.join(potentialDirPath, 'package.json');
       if (this._hasteFS.exists(packageJsonPath)) {
-        return this._moduleCache.getPackage(packageJsonPath)
+        const main = this._moduleCache.getPackage(packageJsonPath).getMain();
-          .getMain().then(
+        return this._tryResolve(
-            main => this._tryResolve(
           () => this._loadAsFile(main, fromModule, toModule),
-              () => this._loadAsDir(main, fromModule, toModule)
+          () => this._loadAsDir(main, fromModule, toModule),
-            )
         );
       }
 

packages/metro-bundler/src/node-haste/Package.js

@@ -17,6 +17,13 @@ const path = require('path');
 
 import type Cache from './Cache';
 
+type PackageContent = {
+  name: string,
+  'react-native': mixed,
+  browser: mixed,
+  main: ?string,
+};
+
 class Package {
 
   path: string;
@@ -24,12 +31,7 @@ class Package {
   type: string;
   _cache: Cache;
 
-  _reading: Promise<{
+  _content: ?PackageContent;
-    name: string,
-    'react-native': mixed,
-    browser: mixed,
-    main: ?string,
-  }>;
 
   constructor({file, cache}: {
     file: string,
@@ -39,10 +41,11 @@ class Package {
     this.root = path.dirname(this.path);
     this.type = 'Package';
     this._cache = cache;
+    this._content = null;
   }
 
   getMain() {
-    return this.read().then(json => {
+    const json = this.read();
     var replacements = getReplacements(json);
     if (typeof replacements === 'string') {
       return path.join(this.root, replacements);
@@ -60,18 +63,17 @@ class Package {
 
     /* $FlowFixMe: `getReplacements` doesn't validate the return value. */
     return path.join(this.root, main);
-    });
   }
 
   isHaste() {
     return this._cache.get(this.path, 'package-haste', () =>
-      this.read().then(json => !!json.name)
+      Promise.resolve(!!this.read().name)
     );
   }
 
   getName(): Promise<string> {
     return this._cache.get(this.path, 'package-name', () =>
-      this.read().then(json => json.name)
+      Promise.resolve(this.read().name)
     );
   }
 
@@ -79,9 +81,9 @@ class Package {
     this._cache.invalidate(this.path);
   }
 
-  redirectRequire(name: string) {
+  redirectRequire(name: string): string | false {
-    return this.read().then(json => {
+    const json = this.read();
-      var replacements = getReplacements(json);
+    const replacements = getReplacements(json);
 
     if (!replacements || typeof replacements !== 'object') {
       return name;
@@ -92,6 +94,7 @@ class Package {
       // support exclude with "someDependency": false
       return replacement === false
         ? false
+        /* $FlowFixMe: type of replacements is not being validated */
         : replacement || name;
     }
 
@@ -124,21 +127,17 @@ class Package {
     }
 
     return name;
-    });
   }
 
-  read() {
+  read(): PackageContent {
-    if (!this._reading) {
+    if (this._content == null) {
-      this._reading = new Promise(
+      this._content = JSON.parse(fs.readFileSync(this.path, 'utf8'));
-        resolve => resolve(JSON.parse(fs.readFileSync(this.path, 'utf8')))
-      );
     }
-
+    return this._content;
-    return this._reading;
   }
 }
 
-function getReplacements(pkg) {
+function getReplacements(pkg: PackageContent): mixed {
   let rn = pkg['react-native'];
   let browser = pkg.browser;
   if (rn == null) {