chore: refactor package dependency filter, makePackagePolicy

Author: boneskull

packages/compartment-mapper/src/hooks.md

@@ -1,16 +1,12 @@
 # Review of compartment-mapper hooks
 
-
-
-| Hook Name                 | Description                                                                           |
-|-------------------------- | --- |
-| `packageDataHook`         | Receives all found package descriptors data before graph translation.                                   |
-| `packageDependenciesHook` | Allows dynamic mutation of dependencies during node_modules graph translation.              |
-| `unknownCanonicalNameHook`| Called when the policy references unknown canonical names, can suggest typos/similar names. |
-| `moduleSourceHook`        | Invoked when a module source is created.                                             |
-| `packageConnectionsHook`  | Surfaces connections during digest. (ignored in archiving)                                               |
-
-
+| Hook Name                  | Description                                                                                 |
+| -------------------------- | ------------------------------------------------------------------------------------------- |
+| `packageDataHook`          | Receives all found package descriptors data before graph translation.                       |
+| `packageDependenciesHook`  | Allows dynamic mutation of dependencies during node_modules graph translation.              |
+| `unknownCanonicalNameHook` | Called when the policy references unknown canonical names, can suggest typos/similar names. |
+| `moduleSourceHook`         | Invoked when a module source is created.                                                    |
+| `packageConnectionsHook`   | Surfaces connections during digest. (ignored in archiving)                                  |
 
 [Type declarations for the hooks](./types/external.ts)
 
@@ -83,8 +79,6 @@ class note0,note1,note2,note3,note4,note5 note
 
 ```
 
-
-
 <details>
 <summary>Bundle and Archive bits of the diagram that don't use hooks</summary>
 
@@ -119,6 +113,3 @@ end
 ```
 
 </details>
-
-
-

packages/compartment-mapper/src/node-modules.js

@@ -111,7 +111,7 @@ const defaultUnknownCanonicalNameHandler = ({
  * @param {SomePolicy} policy - The policy to check against
  * @returns {Partial<{ dependencies: Set<CanonicalName> }> | void}
  */
-const defaultPackageDependenciesFilter = (
+const prePackageDependenciesFilter = (
   { canonicalName, dependencies, log },
   policy,
 ) => {
@@ -880,7 +880,7 @@ const translateGraph = (
     // Call default filter first if policy exists
     let packageDependenciesHookResult;
     if (policy) {
-      packageDependenciesHookResult = defaultPackageDependenciesFilter(
+      packageDependenciesHookResult = prePackageDependenciesFilter(
         packageDependenciesHookInput,
         policy,
       );

packages/compartment-mapper/src/policy.js

@@ -153,16 +153,11 @@ export const dependencyAllowedByPolicy = (canonicalName, packagePolicy) => {
  * @param {CanonicalName | typeof ATTENUATORS_COMPARTMENT} label
  * @param {object} [options] Options
  * @param {SomePolicy} [options.policy] User-supplied policy
- * @param {SomePackagePolicy} [options.packagePolicy] Package policy, if already known
  * @returns {SomePackagePolicy|undefined} Package policy from `policy` or empty object; returns `params.packagePolicy` if provided
  */
-export const makePackagePolicy = (
-  label,
-  { policy, packagePolicy = undefined } = {},
-) => {
-  if (packagePolicy !== undefined) {
-    return packagePolicy;
-  }
+export const makePackagePolicy = (label, { policy } = {}) => {
+  /** @type {SomePackagePolicy|undefined} */
+  let packagePolicy;
   if (policy) {
     if (label === ATTENUATORS_COMPARTMENT) {
       packagePolicy = {