ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-04 09:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address code review feedback for node-finder

Browse Source 
- Fix PATH collision detection using proper path segment matching
  instead of substring includes() which could cause false positives
- Reorder fnm Windows paths to prioritize canonical installation path
  over shell shims (fnm_multishells)
- Make Windows path test platform-aware since path.dirname handles
  backslash paths differently on non-Windows systems

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Kacper
2025-12-21 14:49:19 +01:00
parent 49f04cf403
commit d3005393df
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/platform/src/node-finder.ts
View File

@@ -180,13 +180,14 @@ function findNodeWindows(homeDir: string): NodeFinderResult | null {
return { nodePath: nvmNode, source: 'nvm-windows' }; return { nodePath: nvmNode, source: 'nvm-windows' };
} }
// fnm on Windows // fnm on Windows (prioritize canonical installation path over shell shims)
const fnmWindowsPaths = [ const fnmWindowsPaths = [
path.join(homeDir, '.fnm', 'node-versions'),
path.join( path.join(
process.env.LOCALAPPDATA || path.join(homeDir, 'AppData', 'Local'), process.env.LOCALAPPDATA || path.join(homeDir, 'AppData', 'Local'),
'fnm_multishells' 'fnm',
'node-versions'
), ),
path.join(homeDir, '.fnm', 'node-versions'),
]; ];
for (const fnmBasePath of fnmWindowsPaths) { for (const fnmBasePath of fnmWindowsPaths) {
@@ -332,7 +333,9 @@ export function buildEnhancedPath(nodePath: string, currentPath: string = ''): s
const nodeDir = path.dirname(nodePath); const nodeDir = path.dirname(nodePath);
// Don't add if already present or if it's just '.' // Don't add if already present or if it's just '.'
if (nodeDir === '.' || currentPath.includes(nodeDir)) { // Use path segment matching to avoid false positives (e.g., /opt/node vs /opt/node-v18)
const pathSegments = currentPath.split(path.delimiter);
if (nodeDir === '.' || pathSegments.includes(nodeDir)) {
return currentPath; return currentPath;
} }

9
libs/platform/tests/node-finder.test.ts
View File

@@ -96,12 +96,21 @@ describe('node-finder', () => {
}); });
it('should handle Windows-style paths', () => { it('should handle Windows-style paths', () => {
// On Windows, path.dirname recognizes backslash paths
// On other platforms, backslash is not a path separator
const nodePath = 'C:\\Program Files\\nodejs\\node.exe'; const nodePath = 'C:\\Program Files\\nodejs\\node.exe';
const currentPath = 'C:\\Windows\\System32'; const currentPath = 'C:\\Windows\\System32';
const result = buildEnhancedPath(nodePath, currentPath); const result = buildEnhancedPath(nodePath, currentPath);
if (process.platform === 'win32') {
// On Windows, should prepend the node directory
expect(result).toBe(`C:\\Program Files\\nodejs${delimiter}${currentPath}`); expect(result).toBe(`C:\\Program Files\\nodejs${delimiter}${currentPath}`);
} else {
// On non-Windows, backslash paths are treated as relative paths
// path.dirname returns '.' so the function returns currentPath unchanged
expect(result).toBe(currentPath);
}
}); });
it('should use default empty string for currentPath', () => { it('should use default empty string for currentPath', () => {