refactor(render): dedup a bit

sverweij · Jan 6, 2025 · 2507860 · 2507860
1 parent 4c5b276
commit 2507860
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 54 deletions.
diff --git a/src/enrich/derive/circular.mjs b/src/enrich/derive/circular.mjs
@@ -1,24 +1,22 @@
 /* eslint-disable security/detect-object-injection */
 
 /** @import { IFlattenedRuleSet } from "../../../types/rule-set.mjs" */
+
+function isCycleRule(pRule) {
+  return (
+    /* c8 ignore start */
+    Object.hasOwn(pRule?.to ?? {}, "circular")
+    /* c8 ignore stop */
+  );
+}
 /**
  * @param {IFlattenedRuleSet} pRuleSet
  * @returns {boolean}
  */
 export function hasCycleRule(pRuleSet) {
   return (
-    (pRuleSet?.forbidden ?? []).some(
-      (pRule) =>
-        /* c8 ignore start */
-        Object.hasOwn(pRule?.to ?? {}, "circular"),
-      /* c8 ignore stop */
-    ) ||
-    (pRuleSet?.allowed ?? []).some(
-      (pRule) =>
-        /* c8 ignore start */
-        Object.hasOwn(pRule?.to ?? {}, "circular"),
-      /* c8 ignore stop */
-    )
+    (pRuleSet?.forbidden ?? []).some(isCycleRule) ||
+    (pRuleSet?.allowed ?? []).some(isCycleRule)
   );
 }
 

diff --git a/src/enrich/derive/dependents/index.mjs b/src/enrich/derive/dependents/index.mjs
@@ -2,31 +2,28 @@ import getDependents from "./get-dependents.mjs";
 
 /** @import { IFlattenedRuleSet } from "../../../../types/rule-set.mjs" */
 
+function isDependentsRule(pRule) {
+  // used in folder rules and when moreUnstable is in the 'to' => governed by
+  // the 'metrics' flag in options, sot not going to repeat that here
+
+  // dependents are used in the orphans analsys. hHwever, there is a fall back
+  // where it does its own analysis, so not going to repeat that check here.
+  return (
+    /* c8 ignore start */
+    Object.hasOwn(pRule?.module ?? {}, "numberOfDependentsLessThan") ||
+    Object.hasOwn(pRule?.module ?? {}, "numberOfDependentsMoreThan")
+    /* c8 ignore stop */
+  );
+}
+
 /**
  * @param {IFlattenedRuleSet} pRuleSet
  * @returns {boolean}
  */
 export function hasDependentsRule(pRuleSet) {
-  // used in folder rules and when moreUnstable is in the 'to' => governed by
-  // the 'metrics' flag in options, sot not going to repeat that here
-
-  // dependents are used in the orphans analsys, however, there is a fall back
-  // where it does its own analysis, so not going to repeat that check here.
   return (
-    (pRuleSet?.forbidden ?? []).some(
-      (pRule) =>
-        /* c8 ignore start */
-        Object.hasOwn(pRule?.module ?? {}, "numberOfDependentsLessThan") ||
-        Object.hasOwn(pRule?.module ?? {}, "numberOfDependentsMoreThan"),
-      /* c8 ignore stop */
-    ) ||
-    (pRuleSet?.allowed ?? []).some(
-      (pRule) =>
-        /* c8 ignore start */
-        Object.hasOwn(pRule?.module ?? {}, "numberOfDependentsLessThan") ||
-        Object.hasOwn(pRule?.module ?? {}, "numberOfDependentsMoreThan"),
-      /* c8 ignore stop */
-    )
+    (pRuleSet?.forbidden ?? []).some(isDependentsRule) ||
+    (pRuleSet?.allowed ?? []).some(isDependentsRule)
   );
 }
 

diff --git a/src/enrich/derive/orphan/index.mjs b/src/enrich/derive/orphan/index.mjs
@@ -1,24 +1,22 @@
 import isOrphan from "./is-orphan.mjs";
 
 /** @import { IFlattenedRuleSet } from "../../../../types/rule-set.mjs" */
+
+function isOrphanRule(pRule) {
+  return (
+    /* c8 ignore start */
+    Object.hasOwn(pRule?.from ?? {}, "orphan")
+    /* c8 ignore stop */
+  );
+}
 /**
  * @param {IFlattenedRuleSet} pRuleSet
  * @returns {boolean}
  */
 export function hasOrphanRule(pRuleSet) {
   return (
-    (pRuleSet?.forbidden ?? []).some(
-      (pRule) =>
-        /* c8 ignore start */
-        Object.hasOwn(pRule?.from ?? {}, "orphan"),
-      /* c8 ignore stop */
-    ) ||
-    (pRuleSet?.allowed ?? []).some(
-      (pRule) =>
-        /* c8 ignore start */
-        Object.hasOwn(pRule?.from ?? {}, "orphan"),
-      /* c8 ignore stop */
-    )
+    (pRuleSet?.forbidden ?? []).some(isOrphanRule) ||
+    (pRuleSet?.allowed ?? []).some(isOrphanRule)
   );
 }
 

diff --git a/src/enrich/derive/reachable.mjs b/src/enrich/derive/reachable.mjs
@@ -6,19 +6,15 @@ import {
 import IndexedModuleGraph from "#graph-utl/indexed-module-graph.mjs";
 import { extractGroups } from "#utl/regex-util.mjs";
 
+function isReachableRule(pRule) {
+  return Object.hasOwn(pRule?.to ?? {}, "reachable");
+}
+
 function getReachableRules(pRuleSet) {
   return (pRuleSet?.forbidden ?? [])
-    .filter((pRule) => Object.hasOwn(pRule?.to ?? {}, "reachable"))
-    .concat(
-      (pRuleSet?.allowed ?? []).filter((pRule) =>
-        Object.hasOwn(pRule?.to ?? {}, "reachable"),
-      ),
-    )
-    .concat(
-      (pRuleSet?.required ?? []).filter((pRule) =>
-        Object.hasOwn(pRule?.to ?? {}, "reachable"),
-      ),
-    );
+    .filter(isReachableRule)
+    .concat((pRuleSet?.allowed ?? []).filter(isReachableRule))
+    .concat((pRuleSet?.required ?? []).filter(isReachableRule));
 }
 
 function isModuleInRuleFrom(pRule) {