Add path normalization function for PSModulePath and update file processing

Author: MariusStorhaug

scripts/Helpers.psm1

@@ -77,3 +77,41 @@ function Normalize-IndentationExceptFirst {
     # Reconstruct the final code: first line + adjusted subsequent lines
     return ($firstLine + $newLine + ($subsequentLines -join $newLine))
 }
+
+
+# Improve path normalization by using PSModulePath
+function ConvertTo-NormalizedModulePath {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory, ValueFromPipeline)]
+        [string] $Path
+    )
+
+    process {
+        # Split PSModulePath into individual paths and normalize them
+        $modulePaths = $env:PSModulePath -split [IO.Path]::PathSeparator |
+            Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
+            ForEach-Object { $_.TrimEnd('\', '/') }
+
+        # Try to match the start of the path with any module path
+        foreach ($modulePath in $modulePaths) {
+            if ($Path -match [regex]::Escape($modulePath)) {
+                $normalizedPath = $Path -replace [regex]::Escape($modulePath), ''
+                # Remove any leading path separators
+                $normalizedPath = $normalizedPath.TrimStart('\', '/')
+
+                # If path was successfully normalized, return it
+                if ($normalizedPath -ne $Path) {
+                    return "Modules/$normalizedPath"
+                }
+            } elseif ($Path -match '(runner|runneradmin)[/\\].*[/\\]Modules[/\\]') {
+                # Handle common GitHub runner paths that might not be in PSModulePath
+                $normalizedPath = $Path -replace '.*?(Modules[/\\])', 'Modules/'
+                return $normalizedPath
+            }
+        }
+
+        # If no module path matched, use the existing relative path function
+        return ConvertTo-RelativePath $Path
+    }
+}

scripts/main.ps1

@@ -23,6 +23,11 @@ LogGroup 'List files' {
     $files.Name | Out-String
 }
 
+LogGroup 'Module paths' {
+    Write-Output "PSModulePath entries:"
+    $env:PSModulePath -split [IO.Path]::PathSeparator | ForEach-Object { "  $_" }
+}
+
 # Accumulators for coverage items across all files
 $allMissed = @()
 $allExecuted = @()
@@ -39,21 +44,21 @@ foreach ($file in $files) {
     # 1. Normalize every "File" property in CommandsMissed
     foreach ($missed in $jsonContent.CommandsMissed) {
         if ($missed.File) {
-            $missed.File = ConvertTo-RelativePath $missed.File
+            $missed.File = ConvertTo-NormalizedModulePath $missed.File
         }
     }
 
     # 2. Normalize every "File" property in CommandsExecuted
     foreach ($exec in $jsonContent.CommandsExecuted) {
         if ($exec.File) {
-            $exec.File = ConvertTo-RelativePath $exec.File
+            $exec.File = ConvertTo-NormalizedModulePath $exec.File
         }
     }
 
     # 3. Normalize the file paths in FilesAnalyzed
     $normalizedFiles = @()
     foreach ($fa in $jsonContent.FilesAnalyzed) {
-        $normalizedFiles += ConvertTo-RelativePath $fa
+        $normalizedFiles += ConvertTo-NormalizedModulePath $fa
     }
     $jsonContent.FilesAnalyzed = $normalizedFiles