fix(output): edit log output and colours

JamieMason · Jun 25, 2022 · 3623c41 · 3623c41
1 parent 7e61f5c
commit 3623c41
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/bin-list-mismatches/list-mismatches.spec.ts b/src/bin-list-mismatches/list-mismatches.spec.ts
@@ -23,7 +23,7 @@ describe('listMismatches', () => {
           );
           expect(scenario.log.mock.calls).toEqual(
             [
-              [`- c 0.0.1 is developed in this repo at ${normalize(c)}`],
+              [`- c: 0.0.1 is developed in this repo at ${normalize(c)}`],
               [`  0.1.0 in dependencies of ${normalize(a)}`],
               [`  0.2.0 in devDependencies of ${normalize(b)}`],
               [`  0.0.1 in version of ${normalize(c)}`],
@@ -46,7 +46,7 @@ describe('listMismatches', () => {
           );
           expect(scenario.log.mock.calls).toEqual(
             [
-              [`- c 0.0.1 is developed in this repo at ${normalize(bc)}`],
+              [`- c: 0.0.1 is developed in this repo at ${normalize(bc)}`],
               [`  0.1.0 in dependencies of ${normalize(aa)}`],
               [`  0.2.0 in devDependencies of ${normalize(bb)}`],
               [`  0.0.1 in version of ${normalize(bc)}`],
@@ -65,7 +65,7 @@ describe('listMismatches', () => {
       const d = 'packages/d/package.json';
       listMismatches(getInput(scenario.disk, scenario.config), scenario.disk);
       expect(scenario.log.mock.calls).toEqual([
-        ['- foo 0.3.0 is the highest valid semver version in use'],
+        ['- foo: 0.3.0 is the highest valid semver version in use'],
         [`  link:vendor/foo-0.1.0 in dependencies of ${normalize(a)}`],
         [`  link:vendor/foo-0.2.0 in dependencies of ${normalize(b)}`],
         [`  0.3.0 in dependencies of ${normalize(c)}`],

diff --git a/src/bin-list-mismatches/list-mismatches.ts b/src/bin-list-mismatches/list-mismatches.ts
@@ -47,13 +47,11 @@ export function listMismatches(input: ProgramInput, disk: Disk): void {
         );
       } else if (workspaceMatch) {
         const shortPath = relative(CWD, workspaceMatch.wrapper.filePath);
-        console.log(
-          chalk`{dim -} ${name} {green.dim ${expected} is developed in this repo at ${shortPath}}`,
-        );
+        const reason = chalk`{dim : ${expected} is developed in this repo at ${shortPath}}`;
+        console.log(chalk`{dim -} ${name}${reason}`);
       } else {
-        console.log(
-          chalk`{dim -} ${name} {green.dim ${expected} is the highest valid semver version in use}`,
-        );
+        const reason = chalk`{dim : ${expected} is the highest valid semver version in use}`;
+        console.log(chalk`{dim -} ${name}${reason}`);
       }
 
       instances.forEach(({ dependencyType, version, wrapper }) => {
@@ -62,13 +60,9 @@ export function listMismatches(input: ProgramInput, disk: Disk): void {
         const shortPath = relative(CWD, wrapper.filePath);
         const loc = isLocal ? 'version' : dependencyType;
         if (isMatch) {
-          console.log(
-            chalk`{green   ${version} {dim in ${loc} of ${shortPath}}}`,
-          );
+          console.log(chalk`{green   ${version} in ${loc} of ${shortPath}}`);
         } else {
-          console.log(
-            chalk`{red   ${version} {dim in ${loc} of ${shortPath}}}`,
-          );
+          console.log(chalk`{red   ${version} in ${loc} of ${shortPath}}`);
         }
       });
     });

diff --git a/src/bin-list/list.ts b/src/bin-list/list.ts
@@ -32,7 +32,7 @@ export function list(input: ProgramInput, disk: Disk): void {
               .map((version) =>
                 version === expected
                   ? chalk.green(version)
-                  : chalk.dim.red(version),
+                  : chalk.red(version),
               )
               .join(chalk.dim(', '))}`
           : chalk`{dim -} {white ${name}} {dim ${versionList}}`,