Refactor utils file

src/cli.ts

@@ -5,7 +5,8 @@ import printMessage from 'print-message';
 import { devices } from 'playwright';
 import { fileURLToPath } from 'url';
 import path from 'path';
-import { setHeadlessMode, getVersion, getStoragePath, listenForCleanUp, cleanUpAndExit } from './utils.js';
+import { setHeadlessMode, listenForCleanUp, cleanUpAndExit } from './utils.js';
+import { getStoragePath, getVersion } from './utils/index.js';
 import {
   checkUrl,
   prepareData,

src/combine.ts

@@ -5,7 +5,8 @@ import crawlDomain from './crawlers/crawlDomain.js';
 import crawlLocalFile from './crawlers/crawlLocalFile.js';
 import crawlIntelligentSitemap from './crawlers/crawlIntelligentSitemap.js';
 import generateArtifacts from './mergeAxeResults.js';
-import { getHost, createAndUpdateResultsFolders, cleanUpAndExit, getStoragePath } from './utils.js';
+import { createAndUpdateResultsFolders, cleanUpAndExit } from './utils.js';
+import { getHost, getStoragePath } from './utils/index.js';
 import { ScannerTypes, UrlsCrawled } from './constants/constants.js';
 import { getBlackListedPatterns, submitForm } from './constants/common.js';
 import { consoleLogger, silentLogger } from './logs.js';
@@ -328,4 +329,4 @@ const combineRun = async (details: Data, deviceToScan: string) => {
   }
 };
 
-export default combineRun;
+export default combineRun;

src/crawlers/commonCrawlerFunc.ts

@@ -22,7 +22,7 @@ import { flagUnlabelledClickableElements } from './custom/flagUnlabelledClickabl
 import xPathToCss from './custom/xPathToCss.js';
 import type { Response as PlaywrightResponse } from 'playwright';
 import fs from 'fs';
-import { getStoragePath } from '../utils.js';
+import { getStoragePath } from '../utils/index.js';
 import path from 'path';
 
 // types

src/crawlers/crawlLocalFile.ts

@@ -19,7 +19,8 @@ import {
 import { runPdfScan, mapPdfScanResults, doPdfScreenshots } from './pdfScanFunc.js';
 import { guiInfoLog } from '../logs.js';
 import crawlSitemap from './crawlSitemap.js';
-import { getPdfStoragePath, getStoragePath, register } from '../utils.js';
+import { register } from '../utils.js';
+import { getPdfStoragePath } from '../utils/index.js';
 
 export const crawlLocalFile = async ({
   url,

src/crawlers/crawlSitemap.ts

@@ -23,7 +23,8 @@ import {
   waitForPageLoaded,
   isFilePath,
 } from '../constants/common.js';
-import { areLinksEqual, isWhitelistedContentType, register } from '../utils.js';
+import { areLinksEqual, register } from '../utils.js';
+import { isWhitelistedContentType } from '../utils/index.js';
 import {
   handlePdfDownload,
   runPdfScan,
@@ -447,4 +448,4 @@ const crawlSitemap = async ({
   return { urlsCrawled, durationExceeded };
 };
 
-export default crawlSitemap;
+export default crawlSitemap;

src/crawlers/pdfScanFunc.ts

@@ -15,7 +15,8 @@ import constants, {
   STATUS_CODE_METADATA,
   UrlsCrawled,
 } from '../constants/constants.js';
-import { cleanUpAndExit, getPdfStoragePath, getStoragePath } from '../utils.js';
+import { cleanUpAndExit } from '../utils.js';
+import { getPdfStoragePath, getStoragePath } from '../utils/index.js';
 import { error } from 'console';
 
 const require = createRequire(import.meta.url);

src/index.ts

@@ -3,12 +3,12 @@ import printMessage from 'print-message';
 import inquirer from 'inquirer';
 import { EnqueueStrategy } from 'crawlee';
 import {
-  getVersion,
   getUserDataTxt,
   writeToUserDataTxt,
   listenForCleanUp,
   cleanUpAndExit,
 } from './utils.js';
+import { getVersion } from './utils/index.js';
 import {
   prepareData,
   messageOptions,

src/mergeAxeResults.ts

@@ -27,8 +27,6 @@ import { getBrowserToRun, getPlaywrightLaunchOptions } from './constants/common.
 
 import {
   createScreenshotsFolder,
-  getStoragePath,
-  getVersion,
   getWcagPassPercentage,
   getProgressPercentage,
   retryFunction,
@@ -39,6 +37,7 @@ import {
   getUserDataTxt,
   register,
 } from './utils.js';
+import { getStoragePath, getVersion } from './utils/index.js';
 import { consoleLogger, silentLogger } from './logs.js';
 import itemTypeDescription from './constants/itemTypeDescription.js';
 import { oobeeAiHtmlETL, oobeeAiRules } from './constants/oobeeAi.js';
@@ -2311,4 +2310,4 @@ export {
   formatAboutStartTime,
 };
 
-export default generateArtifacts;
+export default generateArtifacts;

src/npmIndex.ts

@@ -13,7 +13,8 @@ import {
   submitForm,
 } from './constants/common.js';
 import { createCrawleeSubFolders, filterAxeResults } from './crawlers/commonCrawlerFunc.js';
-import { createAndUpdateResultsFolders, getVersion } from './utils.js';
+import { createAndUpdateResultsFolders } from './utils.js';
+import { getVersion } from './utils/index.js';
 import generateArtifacts, { createBasicFormHTMLSnippet, sendWcagBreakdownToSentry } from './mergeAxeResults.js';
 import { takeScreenshotForHTMLElements } from './screenshotFunc/htmlScreenshotFunc.js';
 import { consoleLogger, silentLogger } from './logs.js';
@@ -878,4 +879,3 @@ export const scanPage = async (
 };
 
 export { RuleFlags };
-