From 351539680bcf0eb1406591a0e81590cd89eb8114 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 22 Nov 2020 20:37:06 +0100
Subject: [PATCH] cli: review feedback on versions:* commands

---
 packages/cli/src/commands/versions/bump.ts       |  2 +-
 packages/cli/src/commands/versions/lint.ts       |  2 +-
 packages/cli/src/lib/versioning/Lockfile.ts      | 10 +++++-----
 packages/cli/src/lib/versioning/packages.test.ts |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts
index 1d8b9cecf3..526ab9d4cf 100644
--- a/packages/cli/src/commands/versions/bump.ts
+++ b/packages/cli/src/commands/versions/bump.ts
@@ -145,7 +145,7 @@ async function workerThreads<T>(
   const queue = Array.from(items);
 
   async function pop() {
-    const item = queue.pop()!;
+    const item = queue.pop();
     if (!item) {
       return;
     }
diff --git a/packages/cli/src/commands/versions/lint.ts b/packages/cli/src/commands/versions/lint.ts
index f91d2b74eb..e2c36ba094 100644
--- a/packages/cli/src/commands/versions/lint.ts
+++ b/packages/cli/src/commands/versions/lint.ts
@@ -97,7 +97,7 @@ export default async (cmd: Command) => {
   }
 };
 
-function logArray<T>(arr: T[], header: string, each: (item: T) => void) {
+function logArray<T>(arr: T[], header: string, each: (item: T) => string) {
   if (arr.length === 0) {
     return;
   }
diff --git a/packages/cli/src/lib/versioning/Lockfile.ts b/packages/cli/src/lib/versioning/Lockfile.ts
index 59a734c314..893beca6e2 100644
--- a/packages/cli/src/lib/versioning/Lockfile.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.ts
@@ -51,7 +51,7 @@ type AnalyzeResultNewVersion = {
   newVersion: string;
 };
 
-/** Entries that {would need a dependency update in package.json to be deduplicated */
+/** Entries that would need a dependency update in package.json to be deduplicated */
 type AnalyzeResultNewRange = {
   name: string;
   oldRange: string;
@@ -118,13 +118,13 @@ export class Lockfile {
         continue;
       }
 
-      // Get rid of an signal any invalid ranges upfront
+      // Get rid of and signal any invalid ranges upfront
       const invalid = allEntries.filter(e => !semver.validRange(e.range));
       result.invalidRanges.push(
         ...invalid.map(({ range }) => ({ name, range })),
       );
 
-      // Grab all valid entries, if there isn't at least 2 different valid ones we're done
+      // Grab all valid entries, if there aren't at least 2 different valid ones we're done
       const entries = allEntries.filter(e => semver.validRange(e.range));
       if (entries.length < 2) {
         continue;
@@ -163,7 +163,7 @@ export class Lockfile {
         acceptedVersions.add(acceptedVersion);
       }
 
-      // If all ranges where able to accept the same version, we're done
+      // If all ranges were able to accept the same version, we're done
       if (acceptedVersions.size === 1) {
         continue;
       }
@@ -229,7 +229,7 @@ export class Lockfile {
       }
       this.data[query] = matchingEntry[1];
 
-      // Update out internal data structure
+      // Update our internal data structure
       const entry = this.packages.get(name)?.find(e => e.range === range);
       if (!entry) {
         throw new Error(`No entry data for ${query}`);
diff --git a/packages/cli/src/lib/versioning/packages.test.ts b/packages/cli/src/lib/versioning/packages.test.ts
index ba328fa356..fd37d7af95 100644
--- a/packages/cli/src/lib/versioning/packages.test.ts
+++ b/packages/cli/src/lib/versioning/packages.test.ts
@@ -47,7 +47,7 @@ describe('mapDependencies', () => {
     jest.resetAllMocks();
   });
 
-  it('should derp', async () => {
+  it('should read dependencies', async () => {
     // Make sure all modules involved in package discovery are in the module cache before we mock fs
     const LernaProject = require('@lerna/project');
     const project = new LernaProject(paths.targetDir);