Refactor DI to use parameter defaults

Move default values for dependency injection from inside function bodies
to parameter destructuring. This makes it clearer which defaults are used
when callers don't provide specific dependencies.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: vdiez

src/file.ts

@@ -48,16 +48,15 @@ const defaultFileDeps: FileDeps = {
 export async function getCacheFileLocation(
   properties: ScannerProperties,
   { checksum, filename, alias }: CacheFileData,
-  deps: Partial<FileDeps> = {},
+  fsDeps: FileDeps = defaultFileDeps,
 ) {
-  const fsDeps = { ...defaultFileDeps, ...deps };
   const filePath = path.join(getParentCacheDirectory(properties), checksum, filename);
   if (fsDeps.existsSync(filePath)) {
     log(LogLevel.DEBUG, alias, 'version found in cache:', filename);
 
     // validate cache
     try {
-      await validateChecksum(filePath, checksum, deps);
+      await validateChecksum(filePath, checksum, fsDeps);
     } catch (error) {
       await fsDeps.remove(filePath);
       throw error;
@@ -73,9 +72,8 @@ export async function getCacheFileLocation(
 export async function extractArchive(
   fromPath: string,
   toPath: string,
-  deps: Partial<FileDeps> = {},
+  fsDeps: FileDeps = defaultFileDeps,
 ) {
-  const fsDeps = { ...defaultFileDeps, ...deps };
   log(LogLevel.DEBUG, `Extracting ${fromPath} to ${toPath}`);
   if (fromPath.endsWith('.tar.gz')) {
     const tarFilePath = fromPath;
@@ -116,8 +114,7 @@ export async function extractArchive(
   }
 }
 
-async function generateChecksum(filepath: string, deps: Partial<FileDeps> = {}) {
-  const fsDeps = { ...defaultFileDeps, ...deps };
+async function generateChecksum(filepath: string, fsDeps: FileDeps = defaultFileDeps) {
   return new Promise((resolve, reject) => {
     fsDeps.readFile(filepath, (err, data) => {
       if (err) {
@@ -132,11 +129,11 @@ async function generateChecksum(filepath: string, deps: Partial<FileDeps> = {})
 export async function validateChecksum(
   filePath: string,
   expectedChecksum: string,
-  deps: Partial<FileDeps> = {},
+  fsDeps: FileDeps = defaultFileDeps,
 ) {
   if (expectedChecksum) {
     log(LogLevel.DEBUG, `Verifying checksum ${expectedChecksum}`);
-    const checksum = await generateChecksum(filePath, deps);
+    const checksum = await generateChecksum(filePath, fsDeps);
 
     log(LogLevel.DEBUG, `Checksum Value: ${checksum}`);
     if (checksum !== expectedChecksum) {
@@ -152,9 +149,8 @@ export async function validateChecksum(
 export async function getCacheDirectories(
   properties: ScannerProperties,
   { checksum, filename }: CacheFileData,
-  deps: Partial<FileDeps> = {},
+  fsDeps: FileDeps = defaultFileDeps,
 ) {
-  const fsDeps = { ...defaultFileDeps, ...deps };
   const archivePath = path.join(getParentCacheDirectory(properties), checksum, filename);
   const unarchivePath = path.join(
     getParentCacheDirectory(properties),

src/java.ts

@@ -64,10 +64,8 @@ export interface JavaDeps {
 
 export async function fetchServerVersion(
   properties: ScannerProperties,
-  deps: JavaDeps = {},
+  { fetchFn = fetch }: JavaDeps = {},
 ): Promise<SemVer> {
-  const { fetchFn = fetch } = deps;
-
   let version: SemVer | null = null;
   try {
     // Try and fetch the new version endpoint first
@@ -110,7 +108,7 @@ export async function fetchServerVersion(
 
 export async function serverSupportsJREProvisioning(
   properties: ScannerProperties,
-  deps: JavaDeps = {},
+  { fetchFn = fetch }: JavaDeps = {},
 ): Promise<boolean> {
   if (properties[ScannerProperty.SonarScannerInternalIsSonarCloud] === 'true') {
     return true;
@@ -120,7 +118,7 @@ export async function serverSupportsJREProvisioning(
   log(LogLevel.DEBUG, 'Detecting SonarQube server version');
   const SQServerInfo =
     semver.coerce(properties[ScannerProperty.SonarScannerInternalSqVersion]) ??
-    (await fetchServerVersion(properties, deps));
+    (await fetchServerVersion(properties, { fetchFn }));
   log(LogLevel.INFO, 'SonarQube server version:', SQServerInfo.version);
 
   const supports = semver.satisfies(SQServerInfo, `>=${SONARQUBE_JRE_PROVISIONING_MIN_VERSION}`);
@@ -130,18 +128,16 @@ export async function serverSupportsJREProvisioning(
 
 export async function fetchJRE(
   properties: ScannerProperties,
-  deps: JavaDeps = {},
-): Promise<string> {
-  const {
+  {
     fsDeps = defaultFsDeps,
     fetchFn = fetch,
     downloadFn = download,
     getCacheFileLocationFn = getCacheFileLocation,
     getCacheDirectoriesFn = getCacheDirectories,
     validateChecksumFn = validateChecksum,
     extractArchiveFn = extractArchive,
-  } = deps;
-
+  }: JavaDeps = {},
+): Promise<string> {
   log(LogLevel.DEBUG, 'Detecting latest version of JRE');
   const jreMetaData = await fetchLatestSupportedJRE(properties, fetchFn);
   log(LogLevel.DEBUG, 'Latest Supported JRE: ', jreMetaData);

src/process.ts

@@ -55,9 +55,8 @@ export interface ProcessModuleDeps {
  */
 export async function locateExecutableFromPath(
   executable: string,
-  deps: ProcessModuleDeps = {},
+  { processDeps = defaultProcessDeps, execAsyncFn = execAsync }: ProcessModuleDeps = {},
 ): Promise<string | null> {
-  const { processDeps = defaultProcessDeps, execAsyncFn = execAsync } = deps;
   try {
     log(LogLevel.INFO, `Trying to find ${executable}`);
     const child = await execAsyncFn(

src/properties.ts

@@ -524,10 +524,8 @@ export function getProperties(
   scanOptions: ScanOptions,
   startTimestampMs: number,
   cliArgs?: CliArgs,
-  deps: PropertiesDeps = {},
+  { fsDeps = defaultFsDeps, processDeps = defaultProcessDeps }: PropertiesDeps = {},
 ): ScannerProperties {
-  const { fsDeps = defaultFsDeps, processDeps = defaultProcessDeps } = deps;
-
   const envProperties = getEnvironmentProperties(processDeps);
   const scanOptionsProperties = getScanOptionsProperties(scanOptions);
   const cliProperties = getCommandLineProperties(cliArgs);

src/scanner-cli.ts

@@ -119,15 +119,13 @@ function getScannerCliUrl(
 
 export async function downloadScannerCli(
   properties: ScannerProperties,
-  deps: ScannerCliDeps = {},
-): Promise<string> {
-  const {
+  {
     fsDeps = defaultFsDeps,
     processDeps = defaultProcessDeps,
     downloadFn = download,
     extractArchiveFn = extractArchive,
-  } = deps;
-
+  }: ScannerCliDeps = {},
+): Promise<string> {
   const versionStr = properties[ScannerProperty.SonarScannerCliVersion] ?? SCANNER_CLI_VERSION;
   const version = semver.coerce(versionStr);
   if (!version) {
@@ -181,10 +179,8 @@ export async function runScannerCli(
   scanOptions: ScanOptions,
   properties: ScannerProperties,
   binPath: string,
-  deps: ScannerCliDeps = {},
+  { processDeps = defaultProcessDeps, spawnFn = defaultSpawn }: ScannerCliDeps = {},
 ) {
-  const { processDeps = defaultProcessDeps, spawnFn = defaultSpawn } = deps;
-
   log(LogLevel.INFO, 'Starting analysis');
   // We filter out env properties that are passed to the scanner
   // otherwise, they would supersede the properties passed to the scanner through SONARQUBE_SCANNER_PARAMS

src/scanner-engine.ts

@@ -64,17 +64,15 @@ export interface ScannerEngineDeps {
 
 export async function fetchScannerEngine(
   properties: ScannerProperties,
-  deps: ScannerEngineDeps = {},
-) {
-  const {
+  {
     fsDeps = defaultFsDeps,
     fetchFn = fetch,
     downloadFn = download,
     getCacheFileLocationFn = getCacheFileLocation,
     getCacheDirectoriesFn = getCacheDirectories,
     validateChecksumFn = validateChecksum,
-  } = deps;
-
+  }: ScannerEngineDeps = {},
+) {
   log(LogLevel.DEBUG, `Detecting latest version of ${SONAR_SCANNER_ALIAS}`);
   const { data } = await fetchFn<AnalysisEngineResponseType>({
     url: API_V2_SCANNER_ENGINE_ENDPOINT,
@@ -136,10 +134,8 @@ export function runScannerEngine(
   scannerEnginePath: string,
   scanOptions: ScanOptions,
   properties: ScannerProperties,
-  deps: ScannerEngineDeps = {},
+  { fsDeps = defaultFsDeps, spawnFn = defaultSpawn }: ScannerEngineDeps = {},
 ) {
-  const { fsDeps = defaultFsDeps, spawnFn = defaultSpawn } = deps;
-
   log(LogLevel.DEBUG, `Running the ${SONAR_SCANNER_ALIAS}`);
 
   // The scanner engine expects a JSON object of properties attached to a key name "scannerProperties"