refactor: extract normalizePath and resolveBinary to shared tools.js

Move normalizePath from Base_java class and resolveGradleBinary from
java_gradle.js into tools.js as shared standalone functions. Update
traverseForWrapper to normalize paths consistently on Windows.

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

Author: Strum355

src/providers/base_java.js

@@ -144,7 +144,6 @@ export default class Base_Java {
 
 		const useWrapper = getWrapperPreference(this.globalBinary, opts)
 		if (useWrapper) {
-			const manifestDir = path.dirname(this.normalizePath(manifestPath))
 			const wrapper = traverseForWrapper(manifestDir, this.localWrapper)
 			if (wrapper !== undefined) {
 				try {
@@ -168,8 +167,4 @@ export default class Base_Java {
 		return toolPath
 	}
 
-	normalizePath(thePath) {
-		const normalized = path.resolve(thePath).normalize();
-		return process.platform === 'win32' ? normalized.toLowerCase() : normalized;
-	}
 }

src/providers/java_gradle.js

@@ -8,7 +8,7 @@ import TOML from 'fast-toml'
 
 import { readLicenseFile } from '../license/license_utils.js'
 import Sbom from '../sbom.js'
-import { getCustomPath, getWrapperPreference, invokeCommand, traverseForWrapper } from '../tools.js'
+import { invokeCommand, resolveBinary } from '../tools.js'
 import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js'
 
 import Base_java, { ecosystem_gradle } from "./base_java.js";
@@ -476,25 +476,6 @@ const DEFAULT_GRADLE_DISCOVERY_IGNORE = [
 	'**/.gradle/**',
 ]
 
-/**
- * Resolve the Gradle binary, respecting wrapper preference.
- *
- * @param {string} startDir - Directory from which to start the wrapper search
- * @param {import('../index.js').Options} [opts={}]
- * @returns {string} Path to the Gradle binary
- */
-function resolveGradleBinary(startDir, opts = {}) {
-	const localWrapper = 'gradlew' + (process.platform === 'win32' ? '.bat' : '')
-	const useWrapper = getWrapperPreference('gradle', opts)
-	if (useWrapper) {
-		const wrapper = traverseForWrapper(startDir, localWrapper)
-		if (wrapper !== undefined) {
-			return wrapper
-		}
-	}
-	return getCustomPath('gradle', opts)
-}
-
 /** Gradle init script that emits structured project listing. */
 const GRADLE_INIT_SCRIPT = `allprojects {
     task daListProjects {
@@ -522,7 +503,8 @@ export async function discoverGradleSubprojects(workspaceRoot, opts = {}) {
 		return []
 	}
 
-	const gradleBin = resolveGradleBinary(root, opts)
+	const localWrapper = 'gradlew' + (process.platform === 'win32' ? '.bat' : '')
+	const gradleBin = resolveBinary('gradle', localWrapper, root, opts)
 	const manifestPaths = []
 
 	const rootBuildKts = path.join(root, 'build.gradle.kts')

src/tools.js

@@ -139,6 +139,17 @@ export function getGitRootDir(cwd) {
 	}
 }
 
+/**
+ * Normalize a filesystem path, lowercasing on Windows for case-insensitive comparison.
+ *
+ * @param {string} thePath
+ * @returns {string}
+ */
+export function normalizePath(thePath) {
+	const normalized = path.resolve(thePath).normalize()
+	return process.platform === 'win32' ? normalized.toLowerCase() : normalized
+}
+
 /**
  * Walk up from `startDir` to `repoRoot` looking for an executable wrapper script.
  *
@@ -148,7 +159,7 @@ export function getGitRootDir(cwd) {
  * @returns {string | undefined}
  */
 export function traverseForWrapper(startDir, wrapperName, repoRoot = undefined) {
-	const currentDir = path.resolve(startDir)
+	const currentDir = normalizePath(startDir)
 	repoRoot = repoRoot || getGitRootDir(currentDir) || path.parse(currentDir).root
 	const wrapperPath = path.join(currentDir, wrapperName)
 	try {
@@ -167,6 +178,25 @@ export function traverseForWrapper(startDir, wrapperName, repoRoot = undefined)
 	}
 }
 
+/**
+ * Resolve a build-tool binary, preferring a wrapper when configured.
+ *
+ * @param {string} globalBinary - Global binary name (e.g. `mvn`, `gradle`)
+ * @param {string} localWrapper - Wrapper filename (e.g. `mvnw`, `gradlew.bat`)
+ * @param {string} startDir - Directory from which to start the wrapper search
+ * @param {import('./index.js').Options} [opts={}]
+ * @returns {string} Path to the resolved binary
+ */
+export function resolveBinary(globalBinary, localWrapper, startDir, opts = {}) {
+	if (getWrapperPreference(globalBinary, opts)) {
+		const wrapper = traverseForWrapper(startDir, localWrapper)
+		if (wrapper !== undefined) {
+			return wrapper
+		}
+	}
+	return getCustomPath(globalBinary, opts)
+}
+
 /** this method invokes command string in a process in a synchronous way.
  * @param {string} bin - the command to be invoked
  * @param {Array<string>} args - the args to pass to the binary

test/providers/workspace.test.js

@@ -206,10 +206,7 @@ suite('discoverGradleSubprojects', () => {
 
 		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				getCustom: () => null,
-				getCustomPath: () => 'gradle',
-				getGitRootDir: () => null,
-				getWrapperPreference: () => false,
+				resolveBinary: () => 'gradle',
 				invokeCommand: () => Buffer.from(initScriptOutput),
 			},
 		})
@@ -231,10 +228,7 @@ suite('discoverGradleSubprojects', () => {
 
 		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				getCustom: () => null,
-				getCustomPath: () => 'gradle',
-				getGitRootDir: () => null,
-				getWrapperPreference: () => false,
+				resolveBinary: () => 'gradle',
 				invokeCommand: () => Buffer.from(initScriptOutput),
 			},
 		})
@@ -256,10 +250,7 @@ suite('discoverGradleSubprojects', () => {
 
 		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				getCustom: () => null,
-				getCustomPath: () => 'gradle',
-				getGitRootDir: () => null,
-				getWrapperPreference: () => false,
+				resolveBinary: () => 'gradle',
 				invokeCommand: () => Buffer.from(initScriptOutput),
 			},
 		})
@@ -277,10 +268,7 @@ suite('discoverGradleSubprojects', () => {
 
 		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				getCustom: () => null,
-				getCustomPath: () => 'gradle',
-				getGitRootDir: () => null,
-				getWrapperPreference: () => false,
+				resolveBinary: () => 'gradle',
 				invokeCommand: () => Buffer.from(initScriptOutput),
 			},
 		})
@@ -294,10 +282,7 @@ suite('discoverGradleSubprojects', () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_multi_project')
 		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				getCustom: () => null,
-				getCustomPath: () => 'gradle',
-				getGitRootDir: () => null,
-				getWrapperPreference: () => false,
+				resolveBinary: () => 'gradle',
 				invokeCommand: () => { throw new Error('gradle not found') },
 			},
 		})
@@ -317,10 +302,7 @@ suite('discoverGradleSubprojects', () => {
 
 		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				getCustom: () => null,
-				getCustomPath: () => 'gradle',
-				getGitRootDir: () => null,
-				getWrapperPreference: () => false,
+				resolveBinary: () => 'gradle',
 				invokeCommand: () => Buffer.from(initScriptOutput),
 			},
 		})