refactor: move uv discovery logic from workspace.js to python_uv.js

Move discoverUvWorkspaceMembers and hasProjectMetadata to their provider
file so workspace.js only retains generic scaffolding.

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

Author: Strum355

src/index.js

@@ -10,8 +10,8 @@ import { resolveBatchMetadata, resolveContinueOnError } from './batch_opts.js'
 import { discoverMavenModules } from './providers/java_maven.js'
 import { discoverGradleSubprojects } from './providers/java_gradle.js'
 import { discoverGoWorkspaceModules } from './providers/golang_gomodules.js'
+import { discoverUvWorkspaceMembers } from './providers/python_uv.js'
 import {
-	discoverUvWorkspaceMembers,
 	discoverWorkspaceCrates,
 	discoverWorkspacePackages,
 	filterManifestPathsByDiscoveryIgnore,

src/providers/python_uv.js

@@ -1,9 +1,11 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
+import fg from 'fast-glob'
 import { parse as parseToml } from 'smol-toml'
 
 import { environmentVariableIsPopulated, getCustomPath, invokeCommand } from '../tools.js'
+import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js'
 
 import Base_pyproject from './base_pyproject.js'
 import { evaluateMarker } from './marker_evaluator.js'
@@ -177,3 +179,98 @@ export default class Python_uv extends Base_pyproject {
 		return { directDeps, graph }
 	}
 }
+
+const DEFAULT_UV_DISCOVERY_IGNORE = [
+	'**/__pycache__/**',
+	'**/.venv/**',
+]
+
+/**
+ * Convert workspace glob patterns to manifest-file glob patterns,
+ * correctly handling negation prefixes.
+ *
+ * @param {string[]} patterns - Workspace glob patterns (may include negations)
+ * @param {string} manifestFileName - e.g. 'pyproject.toml'
+ * @returns {string[]}
+ */
+function toManifestGlobPatterns(patterns, manifestFileName) {
+	return patterns.map(p => {
+		if (p.startsWith('!')) {
+			return `!${p.slice(1)}/${manifestFileName}`
+		}
+		return `${p}/${manifestFileName}`
+	})
+}
+
+/**
+ * Discover all pyproject.toml manifest paths in a uv workspace.
+ * Parses `[tool.uv.workspace]` from root pyproject.toml and glob-expands member patterns.
+ *
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pyproject.toml and uv.lock)
+ * @param {{ workspaceDiscoveryIgnore?: string[], TRUSTIFY_DA_WORKSPACE_DISCOVERY_IGNORE?: string, [key: string]: unknown }} [opts={}]
+ * @returns {Promise<string[]>} Paths to pyproject.toml files (absolute)
+ */
+export async function discoverUvWorkspaceMembers(workspaceRoot, opts = {}) {
+	const root = path.resolve(workspaceRoot)
+	const rootPyproject = path.join(root, 'pyproject.toml')
+	const uvLock = path.join(root, 'uv.lock')
+
+	if (!fs.existsSync(rootPyproject) || !fs.existsSync(uvLock)) {
+		return []
+	}
+
+	let parsed
+	try {
+		parsed = parseToml(fs.readFileSync(rootPyproject, 'utf-8'))
+	} catch {
+		return []
+	}
+
+	const workspaceConfig = parsed?.tool?.uv?.workspace
+	if (!workspaceConfig) {
+		return []
+	}
+
+	const memberPatterns = workspaceConfig.members
+	if (!Array.isArray(memberPatterns) || memberPatterns.length === 0) {
+		return []
+	}
+
+	const excludePatterns = Array.isArray(workspaceConfig.exclude) ? workspaceConfig.exclude : []
+	const excludeGlobs = excludePatterns
+		.filter(p => typeof p === 'string' && p.trim())
+		.map(p => `${p.trim()}/pyproject.toml`)
+
+	const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_UV_DISCOVERY_IGNORE]
+	const globOpts = {
+		cwd: root,
+		absolute: true,
+		onlyFiles: true,
+		ignore: [...ignorePatterns, ...excludeGlobs],
+		followSymbolicLinks: false,
+	}
+
+	const patterns = toManifestGlobPatterns(
+		memberPatterns.filter(p => typeof p === 'string'),
+		'pyproject.toml',
+	)
+	const manifestPaths = await fg(patterns, globOpts)
+
+	if (!manifestPaths.includes(rootPyproject) && hasProjectMetadata(parsed)) {
+		manifestPaths.unshift(rootPyproject)
+	}
+
+	return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns)
+}
+
+/**
+ * @param {import('smol-toml').TomlTable} parsedPyProject
+ * @returns {boolean}
+ */
+function hasProjectMetadata(parsedPyProject) {
+	try {
+		return typeof parsedPyProject?.project?.name === 'string' && parsedPyProject.project.name.trim() !== ''
+	} catch {
+		return false
+	}
+}

src/workspace.js

@@ -4,16 +4,13 @@ import path from 'node:path'
 import fg from 'fast-glob'
 import { load as yamlLoad } from 'js-yaml'
 import micromatch from 'micromatch'
-import { parse as parseToml } from 'smol-toml'
 
 import { getCustom, getCustomPath, invokeCommand } from './tools.js'
 
 /** Default paths skipped during JS workspace discovery (merged with user patterns). */
 const DEFAULT_WORKSPACE_DISCOVERY_IGNORE = [
 	'**/node_modules/**',
 	'**/.git/**',
-	'**/__pycache__/**',
-	'**/.venv/**',
 ]
 
 /**
@@ -273,70 +270,3 @@ export async function discoverWorkspaceCrates(workspaceRoot, opts = {}) {
 	return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns)
 }
 
-/**
- * Discover all pyproject.toml manifest paths in a uv workspace.
- * Parses `[tool.uv.workspace]` from root pyproject.toml and glob-expands member patterns.
- *
- * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pyproject.toml and uv.lock)
- * @param {{ workspaceDiscoveryIgnore?: string[], TRUSTIFY_DA_WORKSPACE_DISCOVERY_IGNORE?: string, [key: string]: unknown }} [opts={}]
- * @returns {Promise<string[]>} Paths to pyproject.toml files (absolute)
- */
-export async function discoverUvWorkspaceMembers(workspaceRoot, opts = {}) {
-	const root = path.resolve(workspaceRoot)
-	const rootPyproject = path.join(root, 'pyproject.toml')
-	const uvLock = path.join(root, 'uv.lock')
-
-	if (!fs.existsSync(rootPyproject) || !fs.existsSync(uvLock)) {
-		return []
-	}
-
-	let parsed
-	try {
-		parsed = parseToml(fs.readFileSync(rootPyproject, 'utf-8'))
-	} catch {
-		return []
-	}
-
-	const workspaceConfig = parsed?.tool?.uv?.workspace
-	if (!workspaceConfig) {
-		return []
-	}
-
-	const memberPatterns = workspaceConfig.members
-	if (!Array.isArray(memberPatterns) || memberPatterns.length === 0) {
-		return []
-	}
-
-	const excludePatterns = Array.isArray(workspaceConfig.exclude) ? workspaceConfig.exclude : []
-	const excludeGlobs = excludePatterns
-		.filter(p => typeof p === 'string' && p.trim())
-		.map(p => `${p.trim()}/pyproject.toml`)
-
-	const ignorePatterns = resolveWorkspaceDiscoveryIgnore(opts)
-	const globOpts = buildWorkspaceDiscoveryGlobOptions(root, [...ignorePatterns, ...excludeGlobs])
-
-	const patterns = toManifestGlobPatterns(
-		memberPatterns.filter(p => typeof p === 'string'),
-		'pyproject.toml',
-	)
-	const manifestPaths = await fg(patterns, globOpts)
-
-	if (!manifestPaths.includes(rootPyproject) && hasProjectMetadata(rootPyproject)) {
-		manifestPaths.unshift(rootPyproject)
-	}
-
-	return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns)
-}
-
-/**
- * @param {string} pyprojectPath
- * @returns {boolean}
- */
-function hasProjectMetadata(pyprojectPath) {
-	try {
-		const content = parseToml(fs.readFileSync(pyprojectPath, 'utf-8'))
-		return typeof content?.project?.name === 'string' && content.project.name.trim() !== ''
-	} catch {
-		return false
-	}
-}

test/providers/workspace.test.js

@@ -7,8 +7,8 @@ import esmock from 'esmock'
 import { discoverGoWorkspaceModules } from '../../src/providers/golang_gomodules.js'
 import { discoverGradleSubprojects } from '../../src/providers/java_gradle.js'
 import { discoverMavenModules } from '../../src/providers/java_maven.js'
+import { discoverUvWorkspaceMembers } from '../../src/providers/python_uv.js'
 import {
-	discoverUvWorkspaceMembers,
 	discoverWorkspaceCrates,
 	discoverWorkspacePackages,
 	filterManifestPathsByDiscoveryIgnore,