Permalink
Browse files

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

Reviewed By: davidaurelio

Differential Revision: D4745885

fbshipit-source-id: 3d327e5ca91fcbe7ec1d30ff8e6135b415074aa4
  • Loading branch information...
jeanlauliac authored and facebook-github-bot committed Mar 22, 2017
1 parent d5288e7 commit ebd8b2ab43045ec97b00aa1c9e640ab1f8a36b65
Showing with 73 additions and 76 deletions.
  1. +6 −8 packager/src/node-haste/DependencyGraph/ResolutionRequest.js
  2. +67 −68 packager/src/node-haste/Package.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,13 +470,11 @@ class ResolutionRequest {
const packageJsonPath = path.join(potentialDirPath, 'package.json');
if (this._hasteFS.exists(packageJsonPath)) {
return this._moduleCache.getPackage(packageJsonPath)
.getMain().then(
main => this._tryResolve(
() => this._loadAsFile(main, fromModule, toModule),
() => this._loadAsDir(main, fromModule, toModule)
)
);
const main = this._moduleCache.getPackage(packageJsonPath).getMain();
return this._tryResolve(
() => this._loadAsFile(main, fromModule, toModule),
() => this._loadAsDir(main, fromModule, toModule),
);
}
return this._loadAsFile(
@@ -17,19 +17,21 @@ const path = require('path');
import type Cache from './Cache';
type PackageContent = {
name: string,
'react-native': mixed,
browser: mixed,
main: ?string,
};
class Package {
path: string;
root: string;
type: string;
_cache: Cache;
_reading: Promise<{
name: string,
'react-native': mixed,
browser: mixed,
main: ?string,
}>;
_content: ?PackageContent;
constructor({file, cache}: {
file: string,
@@ -39,106 +41,103 @@ class Package {
this.root = path.dirname(this.path);
this.type = 'Package';
this._cache = cache;
this._content = null;
}
getMain() {
return this.read().then(json => {
var replacements = getReplacements(json);
if (typeof replacements === 'string') {
return path.join(this.root, replacements);
}
const json = this.read();
var replacements = getReplacements(json);
if (typeof replacements === 'string') {
return path.join(this.root, replacements);
}
let main = json.main || 'index';
let main = json.main || 'index';
if (replacements && typeof replacements === 'object') {
main = replacements[main] ||
replacements[main + '.js'] ||
replacements[main + '.json'] ||
replacements[main.replace(/(\.js|\.json)$/, '')] ||
main;
}
if (replacements && typeof replacements === 'object') {
main = replacements[main] ||
replacements[main + '.js'] ||
replacements[main + '.json'] ||
replacements[main.replace(/(\.js|\.json)$/, '')] ||
main;
}
/* $FlowFixMe: `getReplacements` doesn't validate the return value. */
return path.join(this.root, main);
});
/* $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)
);
}
invalidate() {
this._cache.invalidate(this.path);
}
redirectRequire(name: string) {
return this.read().then(json => {
var replacements = getReplacements(json);
redirectRequire(name: string): string | false {
const json = this.read();
const replacements = getReplacements(json);
if (!replacements || typeof replacements !== 'object') {
return name;
}
if (!replacements || typeof replacements !== 'object') {
return name;
}
if (!isAbsolutePath(name)) {
const replacement = replacements[name];
// support exclude with "someDependency": false
return replacement === false
? false
: replacement || name;
}
if (!isAbsolutePath(name)) {
const replacement = replacements[name];
// support exclude with "someDependency": false
return replacement === false
? false
/* $FlowFixMe: type of replacements is not being validated */
: replacement || name;
}
let relPath = './' + path.relative(this.root, name);
if (path.sep !== '/') {
relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
}
let relPath = './' + path.relative(this.root, name);
if (path.sep !== '/') {
relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
}
let redirect = replacements[relPath];
let redirect = replacements[relPath];
// false is a valid value
// false is a valid value
if (redirect == null) {
redirect = replacements[relPath + '.js'];
if (redirect == null) {
redirect = replacements[relPath + '.js'];
if (redirect == null) {
redirect = replacements[relPath + '.json'];
}
redirect = replacements[relPath + '.json'];
}
}
// support exclude with "./someFile": false
if (redirect === false) {
return false;
}
// support exclude with "./someFile": false
if (redirect === false) {
return false;
}
if (redirect) {
return path.join(
this.root,
/* $FlowFixMe: `getReplacements` doesn't validate the return value. */
redirect
);
}
if (redirect) {
return path.join(
this.root,
/* $FlowFixMe: `getReplacements` doesn't validate the return value. */
redirect
);
}
return name;
});
return name;
}
read() {
if (!this._reading) {
this._reading = new Promise(
resolve => resolve(JSON.parse(fs.readFileSync(this.path, 'utf8')))
);
read(): PackageContent {
if (this._content == null) {
this._content = JSON.parse(fs.readFileSync(this.path, 'utf8'));
}
return this._reading;
return this._content;
}
}
function getReplacements(pkg) {
function getReplacements(pkg: PackageContent): mixed {
let rn = pkg['react-native'];
let browser = pkg.browser;
if (rn == null) {

0 comments on commit ebd8b2a

Please sign in to comment.