flow

Author: Kaylie Kwon

src/package-resolver.js

@@ -24,7 +24,7 @@ export type ResolverOptions = {|
 |};
 
 export default class PackageResolver {
-  constructor(config: Config, lockfile: Lockfile, resolutions: Resolutions) {
+  constructor(config: Config, lockfile: Lockfile, resolutions: ?Resolutions) {
     this.patternsByPackage = map();
     this.fetchingPatterns = map();
     this.fetchingQueue = new BlockingQueue('resolver fetching');
@@ -540,7 +540,7 @@ export default class PackageResolver {
     }
   }
 
-  resolveToResolution(req: DependencyRequestPattern): ?string {
+  resolveToResolution(req: DependencyRequestPattern): DependencyRequestPattern {
     const {parentNames, pattern} = req;
 
     if (!parentNames) {

src/resolutions.js

@@ -16,11 +16,15 @@ export type Resolution = {
 };
 
 export type ResolutionMap = {
-  [string]: Array<Resolution>,
+  [packageName: string]: Array<Resolution>,
 };
 
 export type ResolvedPatternsMap = {
-  [string]: string,
+  [reqPattern: string]: string,
+};
+
+export type ResolutionEntry = {
+  [packageName: string]: string,
 };
 
 export default class Resolutions {
@@ -32,13 +36,13 @@ export default class Resolutions {
     this.reporter = config.reporter;
   }
 
-  _resolutions: {[packageName: string]: string};
+  _resolutions: ResolutionEntry;
   resolutionsByPackage: ResolutionMap;
   resolvedPatterns: ResolvedPatternsMap;
   config: Config;
   reporter: Reporter;
 
-  init(resolutions) {
+  init(resolutions: ResolutionEntry) {
     this._resolutions = {...this._resolutions, ...resolutions};
     this.resolvedPatterns = map();
 
@@ -73,23 +77,24 @@ export default class Resolutions {
   }
 
   find(reqPattern: string, parentNames: Array<string>): ?string {
-    const {name, version} = PackageRequest.normalizePattern(reqPattern);
+    const {name, range} = PackageRequest.normalizePattern(reqPattern);
     const resolutions = this.resolutionsByPackage[name];
+    let resolvedPattern = null;
 
     if (!resolutions) {
-      return null;
+      return resolvedPattern;
     }
 
-    const resolvedPath = path.join(...parentNames, name);
-    const resolution = resolutions.find(({pattern}) => minimatch(resolvedPath, pattern));
-    const resolvedPattern = resolution && `${name}@${resolution.version}`;
+    const {version} = resolutions.find(({pattern}) => minimatch(path.join(...parentNames, name), pattern)) || {};
+
+    if (version) {
+      resolvedPattern = `${name}@${version}`;
 
-    if (resolvedPattern) {
-      if (!semver.valid(resolvedPattern)) {
+      if (!semver.valid(version)) {
         this.reporter.warn(this.reporter.lang('invalidResolutionVersion', resolvedPattern));
       }
 
-      if (!semver.satisfies(resolution.version, version)) {
+      if (!semver.satisfies(version, range)) {
         this.reporter.warn(this.reporter.lang('incompatibleResolutionVersion', resolvedPattern, reqPattern));
       }