fix: add more error handling per commit

if we fail to process a commit title, log it and the error that caused it.
snyk · Aug 2, 2020 · 1334fa3 · 1334fa3
1 parent 17551ce
commit 1334fa3
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 59 deletions.
diff --git a/dist/commit.js.map b/dist/commit.js.map
diff --git a/dist/index.js b/dist/index.js
@@ -9576,33 +9576,38 @@ function processCommits(commitHeaders) {
         others: [],
     };
     for (const commitHeader of commitHeaders) {
-        const line = commitHeader.trim();
-        console.log('processing line:', line);
-        const words = line.split(' ');
-        if (words.length <= 1) {
-            console.log('missing commit message, not processing it');
-            continue;
-        }
-        if (words[1] === 'Merge') { // hack
-            console.log('treating line as a merge commit, not processing it');
-            continue;
-        }
-        if (!words[1].endsWith(':')) {
-            console.log('unknown prefix', words[1], 'treating it as misc');
-            processedCommits['others'].push(line);
-            continue;
-        }
-        const hash = words[0];
-        const prefix = words[1].split(':')[0];
-        const rest = words.slice(2).join(' ');
-        const lineDescription = `${rest} (${hash})`;
-        if (prefix in processedCommits) {
-            console.log(`adding "${lineDescription}" to ${prefix}`);
-            processedCommits[prefix].push(lineDescription);
+        try {
+            const line = commitHeader.trim();
+            console.log('processing line:', line);
+            const words = line.split(' ');
+            if (words.length <= 1) {
+                console.log('missing commit message, not processing it');
+                continue;
+            }
+            if (words[1] === 'Merge') { // hack
+                console.log('treating line as a merge commit, not processing it');
+                continue;
+            }
+            if (!words[1].endsWith(':')) {
+                console.log('unknown prefix', words[1], 'treating it as misc');
+                processedCommits['others'].push(line);
+                continue;
+            }
+            const hash = words[0];
+            const prefix = words[1].split(':')[0];
+            const rest = words.slice(2).join(' ');
+            const lineDescription = `${rest} (${hash})`;
+            if (prefix in processedCommits) {
+                console.log(`adding "${lineDescription}" to ${prefix}`);
+                processedCommits[prefix].push(lineDescription);
+            }
+            else {
+                console.log(`adding "${lineDescription}" to others`);
+                processedCommits['others'].push(lineDescription);
+            }
         }
-        else {
-            console.log(`adding "${lineDescription}" to others`);
-            processedCommits['others'].push(lineDescription);
+        catch (err) {
+            console.log(`couldn't handle commit title ${commitHeader}: ${err}`);
         }
     }
     return processedCommits;

diff --git a/dist/tsconfig.tsbuildinfo b/dist/tsconfig.tsbuildinfo
@@ -334,7 +334,7 @@
         "signature": "2d70434304a480b8f4936755cf835ac95e4230d0db854d5bc3d7c543eabfdaa4"
       },
       "../src/commit.ts": {
-        "version": "2077c5eb145eca91ea0b5c1829022aa8527370c1159047aa36a376dfcea91766",
+        "version": "228daee483f6216b64f467db3296cfe1cb03a34732309d6b2e676efc09fecace",
         "signature": "dfa1b07ec47e1bbdb8b80f4eac4320a04330d2cce41cc13c028c87cbe6ab8a3d"
       },
       "../src/compose.ts": {

diff --git a/src/commit.ts b/src/commit.ts
@@ -36,37 +36,41 @@ function processCommits(commitHeaders: string[]): ICommitData {
   };
 
   for (const commitHeader of commitHeaders) {
-    const line = commitHeader.trim();
-    console.log('processing line:', line);
-    const words = line.split(' ');
-
-    if (words.length <= 1) {
-      console.log('missing commit message, not processing it');
-      continue;
-    }
-
-    if (words[1] === 'Merge') { // hack
-      console.log('treating line as a merge commit, not processing it');
-      continue;
-    }
-
-    if (!words[1].endsWith(':')) {
-      console.log('unknown prefix', words[1], 'treating it as misc');
-      processedCommits['others'].push(line);
-      continue;
-    }
-
-    const hash = words[0];
-    const prefix = words[1].split(':')[0];
-    const rest = words.slice(2).join(' ');
-
-    const lineDescription = `${rest} (${hash})`;
-    if (prefix in processedCommits) {
-      console.log(`adding "${lineDescription}" to ${prefix}`);
-      processedCommits[prefix].push(lineDescription);
-    } else {
-      console.log(`adding "${lineDescription}" to others`);
-      processedCommits['others'].push(lineDescription);
+    try {
+      const line = commitHeader.trim();
+      console.log('processing line:', line);
+      const words = line.split(' ');
+
+      if (words.length <= 1) {
+        console.log('missing commit message, not processing it');
+        continue;
+      }
+
+      if (words[1] === 'Merge') { // hack
+        console.log('treating line as a merge commit, not processing it');
+        continue;
+      }
+
+      if (!words[1].endsWith(':')) {
+        console.log('unknown prefix', words[1], 'treating it as misc');
+        processedCommits['others'].push(line);
+        continue;
+      }
+
+      const hash = words[0];
+      const prefix = words[1].split(':')[0];
+      const rest = words.slice(2).join(' ');
+
+      const lineDescription = `${rest} (${hash})`;
+      if (prefix in processedCommits) {
+        console.log(`adding "${lineDescription}" to ${prefix}`);
+        processedCommits[prefix].push(lineDescription);
+      } else {
+        console.log(`adding "${lineDescription}" to others`);
+        processedCommits['others'].push(lineDescription);
+      }
+    } catch (err) {
+      console.log(`couldn't handle commit title ${commitHeader}: ${err}`);
     }
   }