From fc30f3547bbb07c90421b2ca03a00d657ee2c4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Jarz=C4=99bowski-Bownik?=
 <85575391+matt-jb@users.noreply.github.com>
Date: Tue, 3 Dec 2024 09:57:59 +0100
Subject: [PATCH] fix: formatting, error-handling (#119)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(cli+core): case study bugfixes

* fix(core): expand string detection

* fix(cli): conflicts+biome fixes

* docs(core): add comment explaining silencing a common error

* style(core): missing comma

---------

Co-authored-by: Mateusz Jarzębowski-Bownik <mateuszjarzebowskibownik@Mateuszs-MacBook-Pro.local>
---
 .../cli/src/components/audit-licenses/failure-result.tsx    | 2 +-
 .../components/audit-licenses/including-unknown-result.tsx  | 2 +-
 .../cli/src/components/audit-licenses/not-found-result.tsx  | 2 +-
 packages/core/src/dependency-finder/exec-command.ts         | 2 +-
 .../src/license-finder/parse-license-logical-expression.ts  | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/components/audit-licenses/failure-result.tsx b/packages/cli/src/components/audit-licenses/failure-result.tsx
index 5c886197..4b230e76 100644
--- a/packages/cli/src/components/audit-licenses/failure-result.tsx
+++ b/packages/cli/src/components/audit-licenses/failure-result.tsx
@@ -28,7 +28,7 @@ export default function FailureResult({
           <CompliantMessage count={groupedByStatus.whitelist.length} />
         </Box>
       )}
-      <Box>
+      <Box marginTop={verbose && hasWhitelisted ? 1 : 0}>
         <BlacklistedMessage count={groupedByStatus.blacklist.length} />
       </Box>
       <LicenseList
diff --git a/packages/cli/src/components/audit-licenses/including-unknown-result.tsx b/packages/cli/src/components/audit-licenses/including-unknown-result.tsx
index acf3881e..9dfc9dd2 100644
--- a/packages/cli/src/components/audit-licenses/including-unknown-result.tsx
+++ b/packages/cli/src/components/audit-licenses/including-unknown-result.tsx
@@ -33,7 +33,7 @@ export default function IncludingUnknownResult({
       )}
       {hasBlacklisted && (
         <>
-          <Box>
+          <Box marginTop={verbose && hasWhitelisted ? 1 : 0}>
             <BlacklistedMessage count={groupedByStatus.blacklist.length} />
           </Box>
           <LicenseList
diff --git a/packages/cli/src/components/audit-licenses/not-found-result.tsx b/packages/cli/src/components/audit-licenses/not-found-result.tsx
index 1a771ea0..a23dbb13 100644
--- a/packages/cli/src/components/audit-licenses/not-found-result.tsx
+++ b/packages/cli/src/components/audit-licenses/not-found-result.tsx
@@ -30,7 +30,7 @@ export default function NotFoundResult({
               {verbose ? (
                 <Text>
                   {" "}
-                  {packageName}: {packagePath} Error: {errorMessage}
+                  {packageName}: {errorMessage}
                 </Text>
               ) : (
                 <Text> {packageName} </Text>
diff --git a/packages/core/src/dependency-finder/exec-command.ts b/packages/core/src/dependency-finder/exec-command.ts
index e490876e..18a23ec7 100644
--- a/packages/core/src/dependency-finder/exec-command.ts
+++ b/packages/core/src/dependency-finder/exec-command.ts
@@ -10,7 +10,7 @@ export async function execCommand(
     exec(command, { cwd }, (error, stdout, stderr) => {
       if (stderr && !stderr.includes("Debugger attached")) {
         reject(
-          new ExecCommandException(`Command "${command}" returned error.`, {
+          new ExecCommandException(`Command "${command}" returned an error.`, {
             originalError: error,
             stdout,
             stderr,
diff --git a/packages/core/src/license-finder/parse-license-logical-expression.ts b/packages/core/src/license-finder/parse-license-logical-expression.ts
index f957c7a1..cd59caa5 100644
--- a/packages/core/src/license-finder/parse-license-logical-expression.ts
+++ b/packages/core/src/license-finder/parse-license-logical-expression.ts
@@ -7,7 +7,11 @@ export function parseLicenseLogicalExpression(
     try {
       return parse(licenseExpression);
     } catch (error) {
-      console.error(error);
+      // Most common error when spdx-expression-parse fails to parse the license expression.
+      // The error message thrown is not very useful, hence we silence it.
+      if (!(error instanceof Error && error.message.startsWith("Unexpected"))) {
+        console.error(error);
+      }
       return undefined;
     }
   }