chore(resolver): Minor improvements in resolver code and tests (#4644)

* chore(resolver): Minor improvements in resolver code and tests **Summary** This is a follow up to #4484 and #4478 which improves the code around those areas a bit and removes a now-unnecessary `while` loop. **Test plan** Existing tests should pass. * Fix logic
yarnpkg · Oct 6, 2017 · 9c2bbca · 9c2bbca
1 parent 633b281
commit 9c2bbca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/__tests__/package-request.js b/__tests__/package-request.js
@@ -19,8 +19,8 @@ async function prepareRequest(pattern: string, version: string, resolved: string
   };
   if (parentRequest) {
     depRequestPattern.parentRequest = parentRequest;
-    depRequestPattern.parentNames = parentRequest.parentNames.slice(0);
-    depRequestPattern.parentNames.push(parentRequest.pattern);
+    depRequestPattern.parentNames = [...parentRequest.parentNames, parentRequest.pattern];
+
     const lock = parentRequest.getLocked();
     privateDepCache[parentRequest.pattern] = {version: lock.version, resolved: lock._remote.resolved};
   }

diff --git a/src/package-reference.js b/src/package-reference.js
@@ -66,13 +66,7 @@ export default class PackageReference {
   addRequest(request: PackageRequest) {
     this.requests.push(request);
 
-    let requestLevel = -1;
-    let currentRequest = request;
-    while (currentRequest && requestLevel < this.level) {
-      requestLevel += 1;
-      currentRequest = currentRequest.parentRequest;
-    }
-    this.level = requestLevel;
+    this.level = Math.min(this.level, request.parentNames.length);
   }
 
   prune() {