fix(require-returns-check): allow for missing catch or finalizer and missing case contents; fixes #924

Author: brettz9

README.md

@@ -18094,6 +18094,42 @@ function foo() {
             return "baz";
     }
 };
+
+/**
+ * Return a V1 style query identifier.
+ *
+ * @param {string} id - The query identifier.
+ * @returns {string} V1 style query identifier.
+ */
+function v1QueryId(id) {
+    switch (id) {
+        case 'addq':
+        case 'aliq':
+        case 'locq':
+            return id.substring(3);
+        case 'lost':
+            return id.substring(4);
+        default:
+            return id;
+    }
+}
+
+/**
+ * Parses the required header fields for the given SIP message.
+ *
+ * @param {string} logPrefix - The log prefix.
+ * @param {string} sipMessage - The SIP message.
+ * @param {string[]} headers - The header fields to be parsed.
+ * @returns {object} Object with parsed header fields.
+ */
+function parseSipHeaders(logPrefix, sipMessage, headers) {
+    try {
+        return esappSip.parseHeaders(sipMessage, headers);
+    } catch (err) {
+        logger.error(logPrefix, 'Failed to parse');
+        return {};
+    }
+}
 ````
 
 

src/utils/hasReturnValue.js

@@ -163,15 +163,17 @@ const allBrancheshaveReturnValues = (node, promFilter) => {
 
   case 'TryStatement': {
     return allBrancheshaveReturnValues(node.block, promFilter) &&
-      allBrancheshaveReturnValues(node.handler && node.handler.body, promFilter) &&
-      allBrancheshaveReturnValues(node.finalizer, promFilter);
+      (!node.handler ||
+        allBrancheshaveReturnValues(node.handler && node.handler.body, promFilter)) &&
+      (!node.finalizer ||
+        allBrancheshaveReturnValues(node.finalizer, promFilter));
   }
 
   case 'SwitchStatement': {
     return node.cases.every(
       (someCase) => {
         const nde = someCase.consequent.slice(-1)[0];
-        return allBrancheshaveReturnValues(nde, promFilter);
+        return !nde || allBrancheshaveReturnValues(nde, promFilter);
       },
     );
   }

test/rules/assertions/requireReturnsCheck.js

@@ -1375,5 +1375,47 @@ export default {
       };
       `,
     },
+    {
+      code: `
+      /**
+       * Return a V1 style query identifier.
+       *
+       * @param {string} id - The query identifier.
+       * @returns {string} V1 style query identifier.
+       */
+      function v1QueryId(id) {
+          switch (id) {
+              case 'addq':
+              case 'aliq':
+              case 'locq':
+                  return id.substring(3);
+              case 'lost':
+                  return id.substring(4);
+              default:
+                  return id;
+          }
+      }
+      `,
+    },
+    {
+      code: `
+      /**
+       * Parses the required header fields for the given SIP message.
+       *
+       * @param {string} logPrefix - The log prefix.
+       * @param {string} sipMessage - The SIP message.
+       * @param {string[]} headers - The header fields to be parsed.
+       * @returns {object} Object with parsed header fields.
+       */
+      function parseSipHeaders(logPrefix, sipMessage, headers) {
+          try {
+              return esappSip.parseHeaders(sipMessage, headers);
+          } catch (err) {
+              logger.error(logPrefix, 'Failed to parse');
+              return {};
+          }
+      }
+      `,
+    },
   ],
 };