WIP

Author: Kaylie Kwon

__tests__/commands/install/resolutions.js

@@ -17,13 +17,10 @@ test.concurrent('install with simple exact resolutions should override all versi
 
 test.concurrent('install with subtree exact resolutions should override subtree versions', (): Promise<void> => {
   return runInstall({}, {source: 'resolutions', cwd: 'subtree-exact'}, async config => {
-    expect(await getPackageVersion(config, 'a')).toEqual('1.0.0');
-    expect(await getPackageVersion(config, 'b')).toEqual('1.0.0');
-    expect(await getPackageVersion(config, 'd1')).toEqual('3.0.0');
-    expect(await getPackageVersion(config, 'b/d1')).toEqual('2.0.0');
+    expect(await getPackageVersion(config, 'left-pad')).toEqual('1.0.0');
     expect(await getPackageVersion(config, 'd2')).toEqual('1.0.0');
-    expect(await isPackagePresent(config, 'a/d1')).toEqual(false);
-    expect(await isPackagePresent(config, 'a/d2')).toEqual(false);
-    expect(await isPackagePresent(config, 'b/d2')).toEqual(false);
+    expect(await getPackageVersion(config, 'd2/left-pad')).toEqual('1.1.1');
+    expect(await getPackageVersion(config, 'c')).toEqual('1.0.0');
+    expect(await getPackageVersion(config, 'c/left-pad')).toEqual('1.1.2');
   });
 });

__tests__/fixtures/install/resolutions/c-1/package.json

@@ -2,6 +2,6 @@
   "name": "c",
   "version": "1.0.0",
   "dependencies": {
-    "a": "file:../a-2"
+    "left-pad": "~1.1.1"
   }
 }

__tests__/fixtures/install/resolutions/d2-1/package.json

@@ -1,4 +1,7 @@
 {
   "name": "d2",
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "dependencies": {
+    "left-pad": "^1.0.0"
+  }
 }

__tests__/fixtures/install/resolutions/subtree-exact/package.json

@@ -2,10 +2,12 @@
   "name": "project",
   "version": "1.0.0",
   "dependencies": {
-    "a": "file:../a-1",
-    "b": "file:../b-1"
+    "left-pad": "1.0.0",
+    "c": "file:../c-1",
+    "d2": "file:../d2-1"
   },
   "resolutions": {
-    "a/d1": "file:../d1-3"
+    "d2/left-pad": "1.1.1",
+    "c/**/left-pad": "1.1.2"
   }
 }

package.json

@@ -76,6 +76,7 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "jest": "20.0.4",
+    "minimatch": "^3.0.4",
     "mock-stdin": "^0.3.0",
     "prettier": "^1.5.2",
     "temp": "^0.8.3",

src/cli/commands/import.js

@@ -177,7 +177,7 @@ class ImportPackageRequest extends PackageRequest {
   }
 
   getParentHumanName(): string {
-    return [this.getRootName()].concat(this.getParentNames()).join(' > ');
+    return [this.getRootName()].concat(this.parentNames).join(' > ');
   }
 
   reportResolvedRangeMatch(info: Manifest, resolved: Manifest) {

src/cli/commands/install.js

@@ -26,6 +26,7 @@ import * as fs from '../../util/fs.js';
 import map from '../../util/map.js';
 import {version as YARN_VERSION, getInstallationMethod} from '../../util/yarn-version.js';
 import WorkspaceLayout from '../../workspace-layout.js';
+import Resolutions from '../../resolutions.js';
 
 const emoji = require('node-emoji');
 const invariant = require('invariant');
@@ -165,13 +166,13 @@ export class Install {
   constructor(flags: Object, config: Config, reporter: Reporter, lockfile: Lockfile) {
     this.rootManifestRegistries = [];
     this.rootPatternsToOrigin = map();
-    this.resolutions = map();
     this.lockfile = lockfile;
     this.reporter = reporter;
     this.config = config;
     this.flags = normalizeFlags(config, flags);
-
-    this.resolver = new PackageResolver(config, lockfile);
+    this.resolutions = map(); // Legacy resolutions field used for flat install mode
+    this._resolutions = new Resolutions(config); // Selective resolutions for nested dependencies
+    this.resolver = new PackageResolver(config, lockfile, this._resolutions);
     this.integrityChecker = new InstallationIntegrityChecker(config);
     this.linker = new PackageLinker(config, this.resolver);
     this.scripts = new PackageInstallScripts(config, this.resolver, this.flags.force);
@@ -189,6 +190,7 @@ export class Install {
   linker: PackageLinker;
   rootPatternsToOrigin: {[pattern: string]: string};
   integrityChecker: InstallationIntegrityChecker;
+  _resolutions: Resolutions;
 
   /**
    * Create a list of dependency requests from the current directories manifests.
@@ -200,6 +202,7 @@ export class Install {
   ): Promise<InstallCwdRequest> {
     const patterns = [];
     const deps: DependencyRequestPatterns = [];
+    let resolutionDeps: DependencyRequestPatterns = [];
     const manifest = {};
 
     const ignorePatterns = [];
@@ -234,6 +237,13 @@ export class Install {
       Object.assign(this.resolutions, projectManifestJson.resolutions);
       Object.assign(manifest, projectManifestJson);
 
+      this._resolutions.init(this.resolutions);
+      for (const packageName of Object.keys(this._resolutions.resolutionsByPackage)) {
+        for (const {pattern} of this._resolutions.resolutionsByPackage[packageName]) {
+          resolutionDeps = [...resolutionDeps, {registry, pattern, optional: false, hint: 'resolution'}];
+        }
+      }
+
       const pushDeps = (depType, manifest: Object, {hint, optional}, isUsed) => {
         if (ignoreUnusedPatterns && !isUsed) {
           return;
@@ -308,7 +318,7 @@ export class Install {
     }
 
     return {
-      requests: deps,
+      requests: [...resolutionDeps, ...deps],
       patterns,
       manifest,
       usedPatterns,

src/package-request.js

@@ -25,6 +25,7 @@ type ResolverRegistryNames = $Keys<typeof registryResolvers>;
 export default class PackageRequest {
   constructor(req: DependencyRequestPattern, resolver: PackageResolver) {
     this.parentRequest = req.parentRequest;
+    this.parentNames = [];
     this.lockfile = resolver.lockfile;
     this.registry = req.registry;
     this.reporter = resolver.reporter;
@@ -38,6 +39,7 @@ export default class PackageRequest {
   }
 
   parentRequest: ?PackageRequest;
+  parentNames: Array<string>;
   lockfile: Lockfile;
   reporter: Reporter;
   resolver: PackageResolver;
@@ -47,20 +49,6 @@ export default class PackageRequest {
   optional: boolean;
   foundInfo: ?Manifest;
 
-  getParentNames(): Array<string> {
-    const chain = [];
-
-    let request = this.parentRequest;
-    while (request) {
-      const info = this.resolver.getStrictResolvedPattern(request.pattern);
-      chain.unshift(info.name);
-
-      request = request.parentRequest;
-    }
-
-    return chain;
-  }
-
   getLocked(remoteType: string): ?Object {
     // always prioritise root lockfile
     const shrunk = this.lockfile.getLocked(this.pattern);
@@ -110,7 +98,6 @@ export default class PackageRequest {
       //   "foo": "http://foo.com/bar.tar.gz"
       // then we use the foo name
       data.name = name;
-
       return data;
     }
 
@@ -267,6 +254,7 @@ export default class PackageRequest {
       !info.fresh || frozen
         ? this.resolver.getExactVersionMatch(name, solvedRange, info)
         : this.resolver.getHighestRangeVersionMatch(name, solvedRange, info);
+
     if (resolved) {
       this.resolver.reportPackageWithExistingVersion(this, info);
       return;
@@ -290,11 +278,10 @@ export default class PackageRequest {
     ref.setFresh(fresh);
     info._reference = ref;
     info._remote = remote;
-
     // start installation of dependencies
     const promises = [];
     const deps = [];
-
+    const parentNames = [...this.parentNames, name];
     // normal deps
     for (const depName in info.dependencies) {
       const depPattern = depName + '@' + info.dependencies[depName];
@@ -306,6 +293,7 @@ export default class PackageRequest {
           // dependencies of optional dependencies should themselves be optional
           optional: this.optional,
           parentRequest: this,
+          parentNames,
         }),
       );
     }
@@ -320,6 +308,7 @@ export default class PackageRequest {
           registry: remote.registry,
           optional: true,
           parentRequest: this,
+          parentNames,
         }),
       );
     }
@@ -334,6 +323,7 @@ export default class PackageRequest {
             registry: remote.registry,
             optional: false,
             parentRequest: this,
+            parentNames,
           }),
         );
       }

src/package-resolver.js

@@ -12,6 +12,7 @@ import BlockingQueue from './util/blocking-queue.js';
 import Lockfile from './lockfile/wrapper.js';
 import map from './util/map.js';
 import WorkspaceLayout from './workspace-layout.js';
+import Resolutions from './resolutions';
 
 const invariant = require('invariant');
 const semver = require('semver');
@@ -23,11 +24,12 @@ export type ResolverOptions = {|
 |};
 
 export default class PackageResolver {
-  constructor(config: Config, lockfile: Lockfile) {
+  constructor(config: Config, lockfile: Lockfile, resolutions: ?Resolutions) {
     this.patternsByPackage = map();
     this.fetchingPatterns = map();
     this.fetchingQueue = new BlockingQueue('resolver fetching');
     this.patterns = map();
+    this.resolutions = resolutions || new Resolutions(config);
     this.usedRegistries = new Set();
     this.flat = false;
 
@@ -44,6 +46,8 @@ export default class PackageResolver {
 
   workspaceLayout: ?WorkspaceLayout;
 
+  resolutions: Resolutions;
+
   // list of registries that have been used in this resolution
   usedRegistries: Set<RegistryNames>;
 
@@ -401,6 +405,7 @@ export default class PackageResolver {
 
   getHighestRangeVersionMatch(name: string, range: string, manifest: ?Manifest): ?Manifest {
     const patterns = this.patternsByPackage[name];
+
     if (!patterns) {
       return null;
     }
@@ -446,12 +451,33 @@ export default class PackageResolver {
     return matchedPkg;
   }
 
+  /**
+   * Determine if LockfileEntry is incorrect, remove it from lockfile cache and consider the pattern as new
+   */
+  isLockfileEntryOutdated(version: string, range: string, hasVersion: boolean): boolean {
+    return !!(
+      semver.validRange(range) &&
+      semver.valid(version) &&
+      !getExoticResolver(range) &&
+      hasVersion &&
+      !semver.satisfies(version, range)
+    );
+  }
+
   /**
    * TODO description
    */
 
-  async find(req: DependencyRequestPattern): Promise<void> {
+  async find(initialReq: DependencyRequestPattern): Promise<void> {
+    const req = this.resolveToResolution(initialReq);
+
+    // we've already resolved it with a resolution
+    if (!req) {
+      return;
+    }
+
     const fetchKey = `${req.registry}:${req.pattern}`;
+
     if (this.fetchingPatterns[fetchKey]) {
       return;
     } else {
@@ -464,16 +490,11 @@ export default class PackageResolver {
 
     const lockfileEntry = this.lockfile.getLocked(req.pattern);
     let fresh = false;
+
     if (lockfileEntry) {
       const {range, hasVersion} = PackageRequest.normalizePattern(req.pattern);
-      // lockfileEntry is incorrect, remove it from lockfile cache and consider the pattern as new
-      if (
-        semver.validRange(range) &&
-        semver.valid(lockfileEntry.version) &&
-        !semver.satisfies(lockfileEntry.version, range) &&
-        !getExoticResolver(range) &&
-        hasVersion
-      ) {
+
+      if (this.isLockfileEntryOutdated(lockfileEntry.version, range, hasVersion)) {
         this.reporter.warn(this.reporter.lang('incorrectLockfileEntry', req.pattern));
         this.removePattern(req.pattern);
         this.lockfile.removePattern(req.pattern);
@@ -532,4 +553,26 @@ export default class PackageResolver {
       req.resolveToExistingVersion(info);
     }
   }
+
+  resolveToResolution(req: DependencyRequestPattern): ?DependencyRequestPattern {
+    const {parentNames, pattern} = req;
+
+    if (!parentNames) {
+      return req;
+    }
+
+    const resolution = this.resolutions.find(pattern, parentNames);
+
+    if (resolution) {
+      const resolutionManifest = this.getStrictResolvedPattern(resolution);
+      invariant(resolutionManifest._reference, 'resolutions should have a resolved reference');
+
+      resolutionManifest._reference.patterns.push(pattern);
+      this.lockfile.removePattern(pattern);
+
+      return null;
+    }
+
+    return req;
+  }
 }

src/reporters/lang/en.js

@@ -117,6 +117,10 @@ const messages = {
     'Pattern $0 is trying to unpack in the same destination $1 as pattern $2. This could result in a non deterministic behavior, skipping.',
   incorrectLockfileEntry: 'Lockfile has incorrect entry for $0. Ignoring it.',
 
+  invalidResolutionName: 'Resolution field $0 does not end with a valid package name and will be ignored',
+  invalidResolutionVersion: 'Resolution field $0 has an invalid version entry and may be ignored',
+  incompatibleResolutionVersion: 'Resolution field $0 is incompatible with requested version $1',
+
   yarnOutdated: "Your current version of Yarn is out of date. The latest version is $0 while you're on $1.",
   yarnOutdatedInstaller: 'To upgrade, download the latest installer at $0.',
   yarnOutdatedCommand: 'To upgrade, run the following command:',