refactor: simplifies a few boolean expressions

sverweij · Dec 7, 2024 · 7bcabe7 · 7bcabe7
1 parent 8595b73
commit 7bcabe7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/src/enrich/derive/reachable.mjs b/src/enrich/derive/reachable.mjs
@@ -81,11 +81,11 @@ function shouldAddReaches(pRule, pModule) {
 }
 
 function hasCapturingGroups(pRule) {
-  const lCapturingGroupPlaceholderRe = "\\$[0-9]+";
+  const lCapturingGroupPlaceholderRe = /\$[0-9]+/;
 
-  return Boolean(
-    (pRule?.to?.path ?? "").match(lCapturingGroupPlaceholderRe) ||
-      (pRule?.to?.pathNot ?? "").match(lCapturingGroupPlaceholderRe),
+  return (
+    lCapturingGroupPlaceholderRe.test(pRule?.to?.path ?? "") ||
+    lCapturingGroupPlaceholderRe.test(pRule?.to?.pathNot ?? "")
   );
 }
 function shouldAddReachable(pRule, pModuleTo, pGraph) {

diff --git a/src/extract/acorn/estree-helpers.mjs b/src/extract/acorn/estree-helpers.mjs
@@ -4,9 +4,7 @@ function isStringLiteral(pArgument) {
 
 function firstArgumentIsAString(pArgumentsNode) {
   return (
-    Boolean(pArgumentsNode) &&
-    pArgumentsNode[0] &&
-    isStringLiteral(pArgumentsNode[0])
+    pArgumentsNode && pArgumentsNode[0] && isStringLiteral(pArgumentsNode[0])
   );
 }
 
@@ -20,7 +18,7 @@ function isPlaceholderLessTemplateLiteral(pArgument) {
 
 function firstArgumentIsATemplateLiteral(pArgumentsNode) {
   return (
-    Boolean(pArgumentsNode) &&
+    pArgumentsNode &&
     pArgumentsNode[0] &&
     isPlaceholderLessTemplateLiteral(pArgumentsNode[0])
   );

diff --git a/src/extract/acorn/extract-amd-deps.mjs b/src/extract/acorn/extract-amd-deps.mjs
@@ -8,7 +8,7 @@ function extractRegularAMDDependencies(pNode, pDependencies) {
       .filter((pArgument) => pArgument.type === "ArrayExpression")
       .forEach((pArgument) =>
         pArgument.elements.forEach((pElement) => {
-          if (Boolean(pElement.value) && typeof pElement.value === "string") {
+          if (pElement.value && typeof pElement.value === "string") {
             pDependencies.push({
               module: pElement.value,
               moduleSystem: "amd",

diff --git a/src/graph-utl/consolidate-modules.mjs b/src/graph-utl/consolidate-modules.mjs
@@ -13,8 +13,7 @@ function mergeModule(pLeftModule, pRightModule) {
       .concat(pRightModule?.rules ?? [])
       .sort(compareRules),
     valid: pLeftModule.valid && pRightModule.valid,
-    consolidated:
-      Boolean(pLeftModule.consolidated) || Boolean(pRightModule.consolidated),
+    consolidated: pLeftModule.consolidated || pRightModule.consolidated,
   };
 }
 

diff --git a/src/report/dot/theming.mjs b/src/report/dot/theming.mjs
@@ -5,7 +5,7 @@ import { has, get } from "#utl/object-util.mjs";
 function matchesRE(pValue, pRE) {
   const lMatchResult = pValue.match && pValue.match(pRE);
 
-  return Boolean(lMatchResult) && lMatchResult.length > 0;
+  return lMatchResult && lMatchResult.length > 0;
 }
 
 function matchesCriterion(pModuleKey, pCriterion) {

diff --git a/src/report/text.mjs b/src/report/text.mjs
@@ -16,7 +16,7 @@ function toFlatModuleDependencies(pModule, pModulesInFocus, pHighlightFocused) {
   return pModule.dependencies.map((pDependency) => ({
     from: {
       name: pModule.source,
-      highlight: pHighlightFocused && Boolean(pModule.matchesFocus),
+      highlight: pHighlightFocused && pModule.matchesFocus,
     },
     to: {
       name: pDependency.resolved,