dependency-cruiser 16.4.1 → 16.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "16.4.1",
+  "version": "16.4.2",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -143,16 +143,16 @@
     "acorn-jsx": "^5.3.2",
     "acorn-jsx-walk": "^2.0.0",
     "acorn-loose": "^8.4.0",
-    "acorn-walk": "^8.3.3",
+    "acorn-walk": "^8.3.4",
     "ajv": "^8.17.1",
     "commander": "^12.1.0",
     "enhanced-resolve": "^5.17.1",
-    "ignore": "^5.3.2",
+    "ignore": "^6.0.2",
     "interpret": "^3.1.1",
     "is-installed-globally": "^1.0.0",
     "json5": "^2.2.3",
     "memoize": "^10.0.0",
-    "picocolors": "^1.0.1",
+    "picocolors": "^1.1.0",
     "picomatch": "^4.0.2",
     "prompts": "^2.4.2",
     "rechoir": "^0.8.0",

package/src/enrich/add-validations.mjs

@@ -1,10 +1,10 @@
-import validate from "#validate/index.mjs";
+import { validateDependency, validateModule } from "#validate/index.mjs";
 
 function addDependencyViolations(pModule, pDependency, pRuleSet, pValidate) {
   return {
     ...pDependency,
     ...(pValidate
-      ? validate.dependency(pRuleSet, pModule, pDependency)
+      ? validateDependency(pRuleSet, pModule, pDependency)
       : { valid: true }),
   };
 }
@@ -24,7 +24,7 @@ function addDependencyViolations(pModule, pDependency, pRuleSet, pValidate) {
 export default function addValidations(pModules, pRuleSet, pValidate) {
   return pModules.map((pModule) => ({
     ...pModule,
-    ...(pValidate ? validate.module(pRuleSet, pModule) : { valid: true }),
+    ...(pValidate ? validateModule(pRuleSet, pModule) : { valid: true }),
     dependencies: pModule.dependencies.map((pDependency) =>
       addDependencyViolations(pModule, pDependency, pRuleSet, pValidate),
     ),

package/src/enrich/derive/folders/index.mjs

@@ -1,5 +1,5 @@
 import aggregateToFolders from "./aggregate-to-folders.mjs";
-import validate from "#validate/index.mjs";
+import { validateFolder } from "#validate/index.mjs";
 
 /**
  * @param {import("../../../../types/dependency-cruiser.js").IFolder} pFolder
@@ -9,7 +9,7 @@ import validate from "#validate/index.mjs";
 function validateFolderDependency(pFolder, pOptions) {
   return (pDependency) => ({
     ...pDependency,
-    ...validate.folder(pOptions.ruleSet || {}, pFolder, pDependency),
+    ...validateFolder(pOptions.ruleSet || {}, pFolder, pDependency),
   });
 }
 

package/src/enrich/derive/reachable.mjs

@@ -1,5 +1,8 @@
 /* eslint-disable security/detect-object-injection, no-inline-comments */
-import matchers from "#validate/matchers.mjs";
+import {
+  matchToModulePath,
+  matchToModulePathNot,
+} from "#validate/matchers.mjs";
 import IndexedModuleGraph from "#graph-utl/indexed-module-graph.mjs";
 import { extractGroups } from "#utl/regex-util.mjs";
 
@@ -25,8 +28,8 @@ function isModuleInRuleTo(pRule, pModuleTo, pModuleFrom) {
     : [];
 
   return (
-    matchers.toModulePath(pRule, pModuleTo, lGroups) &&
-    matchers.toModulePathNot(pRule, pModuleTo, lGroups)
+    matchToModulePath(pRule, pModuleTo, lGroups) &&
+    matchToModulePathNot(pRule, pModuleTo, lGroups)
   );
 }
 

package/src/enrich/summarize/index.mjs

@@ -7,7 +7,7 @@ import {
   getModulesCruised,
   getDependenciesCruised,
 } from "./get-stats.mjs";
-import compare from "#graph-utl/compare.mjs";
+import { compareViolations } from "#graph-utl/compare.mjs";
 
 /**
  *
@@ -31,7 +31,7 @@ export default function summarize(
 ) {
   const lViolations = summarizeModules(pModules, pOptions.ruleSet)
     .concat(summarizeFolders(pFolders || [], pOptions.ruleSet))
-    .sort(compare.violations);
+    .sort(compareViolations);
 
   return {
     violations: lViolations,

package/src/enrich/summarize/summarize-modules.mjs

@@ -1,6 +1,6 @@
 import isSameViolation from "./is-same-violation.mjs";
 import { findRuleByName } from "#graph-utl/rule-set.mjs";
-import compare from "#graph-utl/compare.mjs";
+import { compareViolations } from "#graph-utl/compare.mjs";
 import { uniqWith } from "#utl/array-util.mjs";
 
 function cutNonTransgressions(pModule) {
@@ -135,7 +135,7 @@ export default function summarizeModules(pModules, pRuleSet) {
   return uniqWith(
     extractDependencyViolations(pModules, pRuleSet)
       .concat(extractModuleViolations(pModules, pRuleSet))
-      .sort(compare.violations),
+      .sort(compareViolations),
     isSameViolation,
   );
 }

package/src/extract/acorn/extract.mjs

@@ -2,7 +2,7 @@ import { join } from "node:path";
 import extractES6Deps from "./extract-es6-deps.mjs";
 import extractCommonJSDeps from "./extract-cjs-deps.mjs";
 import extractAMDDeps from "./extract-amd-deps.mjs";
-import parse from "./parse.mjs";
+import { getASTCached } from "./parse.mjs";
 import extractStats from "./extract-stats.mjs";
 
 export function extract(
@@ -11,7 +11,7 @@ export function extract(
   pTranspileOptions,
 ) {
   let lDependencies = [];
-  const lAST = parse.getASTCached(join(baseDir, pFileName), pTranspileOptions);
+  const lAST = getASTCached(join(baseDir, pFileName), pTranspileOptions);
 
   if (moduleSystems.includes("cjs")) {
     extractCommonJSDeps(lAST, lDependencies, "cjs", exoticRequireStrings);
@@ -27,6 +27,6 @@ export function extract(
 }
 
 export function getStats({ baseDir }, pFileName, pTranspileOptions) {
-  const lAST = parse.getASTCached(join(baseDir, pFileName), pTranspileOptions);
+  const lAST = getASTCached(join(baseDir, pFileName), pTranspileOptions);
   return extractStats(lAST);
 }

package/src/extract/acorn/parse.mjs

@@ -92,9 +92,3 @@ export const getASTCached = memoize(getAST);
 export function clearCache() {
   memoizeClear(getASTCached);
 }
-
-export default {
-  getASTFromSource,
-  getASTCached,
-  clearCache,
-};

package/src/extract/clear-caches.mjs

@@ -1,15 +1,15 @@
-import tscParse from "./tsc/parse.mjs";
-import acornParse from "./acorn/parse.mjs";
-import swcParse from "./swc/parse.mjs";
+import { clearCache as tscClearCache } from "./tsc/parse.mjs";
+import { clearCache as acornClearCache } from "./acorn/parse.mjs";
+import { clearCache as swcClearCache } from "./swc/parse.mjs";
 import { clearCache as externalModuleHelpers_clearCache } from "./resolve/external-module-helpers.mjs";
 import { clearCache as getManifest_clearCache } from "./resolve/get-manifest.mjs";
 import { clearCache as resolveAMD_clearCache } from "./resolve/resolve-amd.mjs";
 import { clearCache as resolve_clearCache } from "./resolve/resolve.mjs";
 
 export default function clearCaches() {
-  tscParse.clearCache();
-  acornParse.clearCache();
-  swcParse.clearCache();
+  tscClearCache();
+  acornClearCache();
+  swcClearCache();
   externalModuleHelpers_clearCache();
   getManifest_clearCache();
   resolveAMD_clearCache();

package/src/extract/swc/extract.mjs

@@ -1,12 +1,10 @@
 import { join } from "node:path/posix";
 import { isTypeScriptCompatible } from "../helpers.mjs";
 import extractSwcDeps from "./extract-swc-deps.mjs";
-import parse from "./parse.mjs";
+import { getASTCached, isAvailable } from "./parse.mjs";
 
 export function shouldUse({ parser }, pFileName) {
-  return (
-    parser === "swc" && parse.isAvailable() && isTypeScriptCompatible(pFileName)
-  );
+  return parser === "swc" && isAvailable() && isTypeScriptCompatible(pFileName);
 }
 
 export function extract(
@@ -14,7 +12,7 @@ export function extract(
   pFileName,
 ) {
   return extractSwcDeps(
-    parse.getASTCached(join(baseDir, pFileName)),
+    getASTCached(join(baseDir, pFileName)),
     exoticRequireStrings,
   ).filter(({ moduleSystem }) => moduleSystems.includes(moduleSystem));
 }

package/src/extract/swc/parse.mjs

@@ -26,31 +26,23 @@ function getAST(pFileName) {
   return swc.parseFileSync(pFileName, SWC_PARSE_OPTIONS);
 }
 
+/**
+ * Compiles the file identified by pFileName into an (swc)
+ * AST and returns it. Subsequent calls for the same file name will
+ * return the result from a cache
+ *
+ * @param {string} pFileName - the name of the file to compile
+ * @return {import('@swc/core').ModuleItem[]} - an (swc) AST
+ */
 export const getASTCached = memoize(getAST);
 
 export function clearCache() {
   memoizeClear(getASTCached);
 }
 
-export default {
-  getASTFromSource,
-
-  /**
-   * @return {boolean} - true if the swc compiler is available,
-   *                     false in all other cases
-   */
-  // @ts-expect-error dfdfd
-  isAvailable: () => swc !== false,
-
-  /**
-   * Compiles the file identified by pFileName into an (swc)
-   * AST and returns it. Subsequent calls for the same file name will
-   * return the result from a cache
-   *
-   * @param {string} pFileName - the name of the file to compile
-   * @return {import('@swc/core').ModuleItem[]} - an (swc) AST
-   */
-  getASTCached,
-
-  clearCache,
-};
+/**
+ * @return {boolean} - true if the swc compiler is available,
+ *                     false in all other cases
+ */
+// @ts-expect-error dfdfd
+export const isAvailable = () => swc !== false;

package/src/extract/tsc/extract.mjs

@@ -1,13 +1,13 @@
 import { join } from "node:path";
 import { isTypeScriptCompatible } from "../helpers.mjs";
 import extractTypeScriptDeps from "./extract-typescript-deps.mjs";
-import parse from "./parse.mjs";
+import { getASTCached, isAvailable } from "./parse.mjs";
 import extractStats from "./extract-stats.mjs";
 
 export function shouldUse({ tsPreCompilationDeps, parser }, pFileName) {
   return (
     (tsPreCompilationDeps || parser === "tsc") &&
-    parse.isAvailable() &&
+    isAvailable() &&
     isTypeScriptCompatible(pFileName)
   );
 }
@@ -18,12 +18,12 @@ export function extract(
   pTranspileOptions,
 ) {
   return extractTypeScriptDeps(
-    parse.getASTCached(join(baseDir, pFileName), pTranspileOptions),
+    getASTCached(join(baseDir, pFileName), pTranspileOptions),
     exoticRequireStrings,
   ).filter(({ moduleSystem }) => moduleSystems.includes(moduleSystem));
 }
 
 export function getStats({ baseDir }, pFileName, pTranspileOptions) {
-  const lAST = parse.getASTCached(join(baseDir, pFileName), pTranspileOptions);
+  const lAST = getASTCached(join(baseDir, pFileName), pTranspileOptions);
   return extractStats(lAST);
 }

package/src/extract/tsc/parse.mjs

@@ -53,30 +53,22 @@ function getAST(pFileName, pTranspileOptions) {
   );
 }
 
+/**
+ * Compiles the file identified by pFileName into a (typescript)
+ * AST and returns it. Subsequent calls for the same file name will
+ * return the result from a cache
+ *
+ * @param {string} pFileName - the name of the file to compile
+ * @return {object} - a (typescript) AST
+ */
 export const getASTCached = memoize(getAST);
 
+/**
+ * @return {boolean} - true if the typescript compiler is available,
+ *                     false in all other cases
+ */
+export const isAvailable = () => typescript !== false;
+
 export function clearCache() {
   memoizeClear(getASTCached);
 }
-
-export default {
-  getASTFromSource,
-
-  /**
-   * @return {boolean} - true if the typescript compiler is available,
-   *                     false in all other cases
-   */
-  isAvailable: () => typescript !== false,
-
-  /**
-   * Compiles the file identified by pFileName into a (typescript)
-   * AST and returns it. Subsequent calls for the same file name will
-   * return the result from a cache
-   *
-   * @param {string} pFileName - the name of the file to compile
-   * @return {object} - a (typescript) AST
-   */
-  getASTCached,
-
-  clearCache,
-};

package/src/graph-utl/compare.mjs

@@ -10,35 +10,31 @@ function severity2number(pSeverity) {
   return lSeverity2Number.get(pSeverity) || -1;
 }
 
-export function severities(pFirstSeverity, pSecondSeverity) {
+export function compareSeverities(pFirstSeverity, pSecondSeverity) {
   return Math.sign(
-    severity2number(pFirstSeverity) - severity2number(pSecondSeverity)
+    severity2number(pFirstSeverity) - severity2number(pSecondSeverity),
   );
 }
 
-export function violations(pFirstViolation, pSecondViolation) {
+export function compareViolations(pFirstViolation, pSecondViolation) {
   return (
-    severities(pFirstViolation.rule.severity, pSecondViolation.rule.severity) ||
+    compareSeverities(
+      pFirstViolation.rule.severity,
+      pSecondViolation.rule.severity,
+    ) ||
     pFirstViolation.rule.name.localeCompare(pSecondViolation.rule.name) ||
     pFirstViolation.from.localeCompare(pSecondViolation.from) ||
     pFirstViolation.to.localeCompare(pSecondViolation.to)
   );
 }
 
-export function rules(pLeftRule, pRightRule) {
+export function compareRules(pLeftRule, pRightRule) {
   return (
-    severities(pLeftRule.severity, pRightRule.severity) ||
+    compareSeverities(pLeftRule.severity, pRightRule.severity) ||
     pLeftRule.name.localeCompare(pRightRule.name)
   );
 }
 
-export function modules(pLeftModule, pRightModule) {
+export function compareModules(pLeftModule, pRightModule) {
   return pLeftModule.source > pRightModule.source ? 1 : -1;
 }
-
-export default {
-  modules,
-  rules,
-  severities,
-  violations,
-};

package/src/graph-utl/consolidate-module-dependencies.mjs

@@ -1,4 +1,4 @@
-import compare from "./compare.mjs";
+import { compareRules } from "./compare.mjs";
 import { uniq } from "#utl/array-util.mjs";
 
 function mergeDependency(pLeftDependency, pRightDependency) {
@@ -10,7 +10,7 @@ function mergeDependency(pLeftDependency, pRightDependency) {
     ),
     rules: pLeftDependency.rules
       .concat(pRightDependency?.rules ?? [])
-      .sort(compare.rules),
+      .sort(compareRules),
     valid: pLeftDependency.valid && pRightDependency.valid,
   };
 }

package/src/graph-utl/consolidate-modules.mjs

@@ -1,4 +1,4 @@
-import compare from "./compare.mjs";
+import { compareRules } from "./compare.mjs";
 import { uniqBy } from "#utl/array-util.mjs";
 
 function mergeModule(pLeftModule, pRightModule) {
@@ -11,7 +11,7 @@ function mergeModule(pLeftModule, pRightModule) {
     ),
     rules: pLeftModule.rules
       .concat(pRightModule?.rules ?? [])
-      .sort(compare.rules),
+      .sort(compareRules),
     valid: pLeftModule.valid && pRightModule.valid,
     consolidated:
       Boolean(pLeftModule.consolidated) || Boolean(pRightModule.consolidated),

package/src/main/options/assert-validity.mjs

@@ -1,6 +1,6 @@
 /* eslint-disable security/detect-object-injection */
 import safeRegex from "safe-regex";
-import report from "#report/index.mjs";
+import { getAvailableReporters } from "#report/index.mjs";
 
 const MODULE_SYSTEM_LIST_RE = /^(?:(?:cjs|amd|es6|tsd)(?:,|$)){1,4}/gi;
 const VALID_DEPTH_RE = /^\d{1,2}$/g;
@@ -53,7 +53,7 @@ function assertRegExpSafety(pPattern) {
 function assertOutputTypeValid(pOutputType) {
   if (
     Boolean(pOutputType) &&
-    !report.getAvailableReporters().includes(pOutputType) &&
+    !getAvailableReporters().includes(pOutputType) &&
     !pOutputType.startsWith("plugin:")
   ) {
     throw new Error(`'${pOutputType}' is not a valid output type.\n`);

package/src/main/report-wrap.mjs

@@ -1,8 +1,8 @@
-import report from "#report/index.mjs";
+import { getReporter } from "#report/index.mjs";
 import summarize from "#enrich/summarize/index.mjs";
 import { applyFilters } from "#graph-utl/filter-bank.mjs";
 import consolidateToPattern from "#graph-utl/consolidate-to-pattern.mjs";
-import compare from "#graph-utl/compare.mjs";
+import { compareModules } from "#graph-utl/compare.mjs";
 import stripSelfTransitions from "#graph-utl/strip-self-transitions.mjs";
 
 /**
@@ -16,7 +16,7 @@ function reSummarizeResults(pResult, pFormatOptions) {
 
   if (Object.hasOwn(pFormatOptions, "collapse")) {
     lModules = consolidateToPattern(lModules, pFormatOptions.collapse)
-      .sort(compare.modules)
+      .sort(compareModules)
       .map(stripSelfTransitions);
   }
   return {
@@ -49,7 +49,7 @@ function getReporterSection(pOutputType) {
  * @returns {import("../../types/dependency-cruiser.js").IReporterOutput}
  */
 export default async function reportWrap(pResult, pFormatOptions) {
-  const lReportFunction = await report.getReporter(pFormatOptions.outputType);
+  const lReportFunction = await getReporter(pFormatOptions.outputType);
   const lReportOptions =
     pResult.summary.optionsUsed?.reporterOptions?.[
       getReporterSection(pFormatOptions.outputType)

package/src/meta.cjs

@@ -1,7 +1,7 @@
 /* generated - don't edit */
 
 module.exports = {
-  version: "16.4.1",
+  version: "16.4.2",
   engines: {
     node: "^18.17||>=20",
   },

package/src/report/dot/index.mjs

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-template */
-import theming from "./theming.mjs";
-import moduleUtl from "./module-utl.mjs";
+import { normalizeTheme } from "./theming.mjs";
+import { attributizeObject } from "./module-utl.mjs";
 import prepareFolderLevel from "./prepare-folder-level.mjs";
 import prepareCustomLevel from "./prepare-custom-level.mjs";
 import prepareFlatLevel from "./prepare-flat-level.mjs";
@@ -25,21 +25,15 @@ const GRANULARITY2REPORTER_OPTIONS = new Map([
 ]);
 
 function buildGraphAttributes(pGraph) {
-  return Boolean(pGraph)
-    ? `    ${moduleUtl.attributizeObject(pGraph || {})}`
-    : "";
+  return Boolean(pGraph) ? `    ${attributizeObject(pGraph || {})}` : "";
 }
 
 function buildNodeAttributes(pNode) {
-  return Boolean(pNode)
-    ? `    node [${moduleUtl.attributizeObject(pNode || {})}]`
-    : "";
+  return Boolean(pNode) ? `    node [${attributizeObject(pNode || {})}]` : "";
 }
 
 function buildEdgeAttributes(pEdge) {
-  return Boolean(pEdge)
-    ? `    edge [${moduleUtl.attributizeObject(pEdge || {})}]`
-    : "";
+  return Boolean(pEdge) ? `    edge [${attributizeObject(pEdge || {})}]` : "";
 }
 
 function buildGeneralAttributes(pTheme) {
@@ -120,7 +114,7 @@ function report(
   pGranularity,
   { theme, collapsePattern, filters, showMetrics },
 ) {
-  const lTheme = theming.normalizeTheme(theme);
+  const lTheme = normalizeTheme(theme);
   const lResults = filters
     ? {
         ...pResults,

package/src/report/dot/module-utl.mjs

@@ -1,8 +1,7 @@
 import { basename, sep, dirname } from "node:path/posix";
 import { formatPercentage, getURLForModule } from "../utl/index.mjs";
-import theming from "./theming.mjs";
 
-function attributizeObject(pObject) {
+export function attributizeObject(pObject) {
   return (
     Object.keys(pObject)
       // eslint-disable-next-line security/detect-object-injection
@@ -11,7 +10,7 @@ function attributizeObject(pObject) {
   );
 }
 
-function extractFirstTransgression(pModule) {
+export function extractFirstTransgression(pModule) {
   return {
     ...(pModule?.rules?.[0]
       ? { ...pModule, tooltip: pModule.rules[0].name }
@@ -27,26 +26,6 @@ function extractFirstTransgression(pModule) {
   };
 }
 
-function applyTheme(pTheme) {
-  return (pModule) => ({
-    ...pModule,
-    dependencies: pModule.dependencies
-      .map((pDependency) => ({
-        ...pDependency,
-        themeAttrs: attributizeObject(
-          theming.determineAttributes(pDependency, pTheme.dependencies),
-        ),
-      }))
-      .map((pDependency) => ({
-        ...pDependency,
-        hasExtraAttributes: Boolean(pDependency.rule || pDependency.themeAttrs),
-      })),
-    themeAttrs: attributizeObject(
-      theming.determineAttributes(pModule, pTheme.modules),
-    ),
-  });
-}
-
 function toFullPath(pAll, pCurrent) {
   return `${pAll}${pCurrent}${sep}`;
 }
@@ -75,7 +54,7 @@ function makeInstabilityString(pModule, pShowMetrics = false) {
   return lInstabilityString;
 }
 
-function folderify(pShowMetrics) {
+export function folderify(pShowMetrics) {
   /** @param {import("../../../types/cruise-result").IModule} pModule*/
   return (pModule) => {
     let lAdditions = {};
@@ -103,7 +82,7 @@ function folderify(pShowMetrics) {
  * @param {string} pPrefix
  * @returns {URL?: string}
  */
-function addURL(pPrefix) {
+export function addURL(pPrefix) {
   return (pModule) => {
     if (pModule.couldNotResolve) {
       return pModule;
@@ -122,19 +101,10 @@ function makeLabel(pModule, pShowMetrics) {
   )}</B>${makeInstabilityString(pModule, pShowMetrics)}>`;
 }
 
-function flatLabel(pShowMetrics) {
+export function flatLabel(pShowMetrics) {
   return (pModule) => ({
     ...pModule,
     label: makeLabel(pModule, pShowMetrics),
     tooltip: basename(pModule.source),
   });
 }
-
-export default {
-  folderify,
-  applyTheme,
-  extractFirstTransgression,
-  attributizeObject,
-  addURL,
-  flatLabel,
-};

package/src/report/dot/prepare-custom-level.mjs

@@ -1,6 +1,7 @@
-import moduleUtl from "./module-utl.mjs";
+import { folderify, addURL, extractFirstTransgression } from "./module-utl.mjs";
+import { applyTheme } from "./theming.mjs";
 import consolidateToPattern from "#graph-utl/consolidate-to-pattern.mjs";
-import compare from "#graph-utl/compare.mjs";
+import { compareModules } from "#graph-utl/compare.mjs";
 import stripSelfTransitions from "#graph-utl/strip-self-transitions.mjs";
 
 export default function prepareCustomLevel(
@@ -14,10 +15,10 @@ export default function prepareCustomLevel(
       ? consolidateToPattern(pResults.modules, pCollapsePattern)
       : pResults.modules
   )
-    .sort(compare.modules)
-    .map(moduleUtl.folderify(pShowMetrics))
-    .map(moduleUtl.extractFirstTransgression)
+    .sort(compareModules)
+    .map(folderify(pShowMetrics))
+    .map(extractFirstTransgression)
     .map(stripSelfTransitions)
-    .map(moduleUtl.applyTheme(pTheme))
-    .map(moduleUtl.addURL(pResults.summary.optionsUsed?.prefix ?? ""));
+    .map(applyTheme(pTheme))
+    .map(addURL(pResults.summary.optionsUsed?.prefix ?? ""));
 }

package/src/report/dot/prepare-flat-level.mjs

@@ -1,11 +1,12 @@
-import moduleUtl from "./module-utl.mjs";
-import compare from "#graph-utl/compare.mjs";
+import { flatLabel, extractFirstTransgression, addURL } from "./module-utl.mjs";
+import { applyTheme } from "./theming.mjs";
+import { compareModules } from "#graph-utl/compare.mjs";
 
 export default function prepareFlatLevel(pResults, pTheme, _, pShowMetrics) {
   return pResults.modules
-    .sort(compare.modules)
-    .map(moduleUtl.flatLabel(pShowMetrics))
-    .map(moduleUtl.extractFirstTransgression)
-    .map(moduleUtl.applyTheme(pTheme))
-    .map(moduleUtl.addURL(pResults.summary.optionsUsed?.prefix ?? ""));
+    .sort(compareModules)
+    .map(flatLabel(pShowMetrics))
+    .map(extractFirstTransgression)
+    .map(applyTheme(pTheme))
+    .map(addURL(pResults.summary.optionsUsed?.prefix ?? ""));
 }