status-im/metro
2
0
Fork 0
mirror of https://github.com/status-im/metro.git synced 2025-01-21 00:19:31 +00:00
Code Issues Projects Releases Wiki Activity

metro: ModuleResolution: move tryResolveSync 1 level up

Browse Source 
Reviewed By: davidaurelio

Differential Revision: D6610856

fbshipit-source-id: cc9c0e0d09785882e3b977dea5e8bc072099be71
This commit is contained in:
Jean Lauliac 2017-12-24 03:06:08 -08:00 committed by Facebook Github Bot
parent 78802d7a42
commit 9ff46c13e3
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/metro/src/node-haste/DependencyGraph/ModuleResolution.js
View File

@ -121,22 +121,6 @@ type FileResolution =
| {|+type: 'sourceFile', +filePath: string|}
| {|+type: 'assetFiles', +filePaths: AssetFileResolution|};
/**
* It may not be a great pattern to leverage exception just for "trying" things
* out, notably for performance. We should consider replacing these functions
* to be nullable-returning, or being better stucture to the algorithm.
*/
function tryResolveSync<T>(action: () => T, secondaryAction: () => T): T {
try {
return action();
} catch (error) {
if (!(error instanceof UnableToResolveError)) {
throw error;
}
return secondaryAction();
}
}
class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
_options: Options<TModule, TPackage>;
@ -742,5 +726,4 @@ module.exports = {
UnableToResolveError,
ModuleResolver,
isRelativeImport,
tryResolveSync,
};

18
packages/metro/src/node-haste/DependencyGraph/ResolutionRequest.js
View File

@ -100,7 +100,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
}
return cacheResult(
ModuleResolution.tryResolveSync(
tryResolveSync(
() => this._resolveHasteDependency(fromModule, toModuleName, platform),
() =>
resolver.resolveNodeDependency(fromModule, toModuleName, platform),
@ -137,6 +137,22 @@ function getResolutionCacheKey(modulePath, depName) {
return `${path.resolve(modulePath)}:${depName}`;
}
/**
* It may not be a great pattern to leverage exception just for "trying" things
* out, notably for performance. We should consider replacing these functions
* to be nullable-returning, or being better stucture to the algorithm.
*/
function tryResolveSync<T>(action: () => T, secondaryAction: () => T): T {
try {
return action();
} catch (error) {
if (!(error instanceof ModuleResolution.UnableToResolveError)) {
throw error;
}
return secondaryAction();
}
}
class AmbiguousModuleResolutionError extends Error {
fromModulePath: string;
hasteError: DuplicateHasteCandidatesError;