com.wallstop-studios.dxmessaging 2.1.4 → 2.1.6

package/scripts/check-eol.ps1

@@ -10,6 +10,54 @@ function Write-VerboseLine {
     if ($VerboseOutput) { Write-Host $Message }
 }
 
+function Get-GitIndexEolIssues {
+    param([string[]]$Extensions)
+
+    $issues = New-Object System.Collections.Generic.List[string]
+    try {
+        $gitRoot = git rev-parse --show-toplevel 2>$null
+    }
+    catch {
+        return $issues
+    }
+
+    if (-not $gitRoot) {
+        return $issues
+    }
+
+    $gitRoot = $gitRoot.Trim()
+    try {
+        $lines = git -C $gitRoot ls-files --eol 2>$null
+    }
+    catch {
+        return $issues
+    }
+
+    foreach ($line in $lines) {
+        if ([string]::IsNullOrWhiteSpace($line)) { continue }
+        $parts = $line -split "`t", 2
+        if ($parts.Count -lt 2) { continue }
+
+        $meta = $parts[0].Trim()
+        $relPath = $parts[1].Trim()
+        $ext = [System.IO.Path]::GetExtension($relPath).ToLowerInvariant()
+        if ($Extensions -notcontains $ext) { continue }
+
+        # git ls-files --eol output format: i/[eol] w/[eol] attr/[attrs] [path]
+        $tokens = $meta -split '\s+'
+        $attrToken = $tokens | Where-Object { $_ -like 'attr/*' } | Select-Object -First 1
+        if ($attrToken -eq 'attr/-text') { continue }
+        
+        $indexToken = $tokens | Where-Object { $_ -like 'i/*' } | Select-Object -First 1
+        if (-not $indexToken) { continue }
+        if ($indexToken -ne 'i/lf' -and $indexToken -ne 'i/none') {
+            $issues.Add("$relPath ($indexToken)")
+        }
+    }
+
+    return $issues
+}
+
 # Directories to exclude from scanning
 $excludePatterns = @(
     "[\\/]\.git[\\/]",
@@ -18,12 +66,16 @@ $excludePatterns = @(
     "[\\/]Obj[\\/]|[\\/]obj[\\/]",
     "[\\/]Temp[\\/]",
     "[\\/]Samples~[\\/]",
-    "[\\/]\.vs[\\/]"
+    "[\\/]\.vs[\\/]",
+    "[\\/]\.venv[\\/]",
+    "[\\/]\.artifacts[\\/]",
+    "[\\/]site[\\/]"
 )
 
-# File extensions we treat as text and validate
+# File extensions we treat as text and validate (CRLF expected)
 $extensions = @(
     '.cs', '.csproj', '.sln',
+    '.js', '.cjs', '.mjs',
     '.json', '.jsonc', '.toml',
     '.yaml', '.yml',
     '.md', '.markdown',
@@ -33,11 +85,25 @@ $extensions = @(
     '.ps1'
 )
 
+# Shell scripts must use LF for Unix compatibility
+$lfExtensions = @(
+    '.sh',
+    '.bash',
+    '.zsh',
+    '.ksh',
+    '.fish'
+)
+
+# All extensions to scan (CRLF + LF types)
+$allExtensions = $extensions + $lfExtensions
+
 $rootPath = Resolve-Path -LiteralPath $Root
 Write-VerboseLine "Scanning for EOL/BOM issues under: $rootPath"
 
 $bomFiles = New-Object System.Collections.Generic.List[string]
-$badEolFiles = New-Object System.Collections.Generic.List[string]
+$crlfViolations = New-Object System.Collections.Generic.List[string]
+$lfViolations = New-Object System.Collections.Generic.List[string]
+$indexIssues = Get-GitIndexEolIssues -Extensions $allExtensions
 
 Get-ChildItem -LiteralPath $rootPath -Recurse -File -Force |
     ForEach-Object {
@@ -46,7 +112,7 @@ Get-ChildItem -LiteralPath $rootPath -Recurse -File -Force |
         foreach ($pat in $excludePatterns) { if ($path -match $pat) { return } }
 
         $ext = [System.IO.Path]::GetExtension($path).ToLowerInvariant()
-        if ($extensions -notcontains $ext) { return }
+        if ($allExtensions -notcontains $ext) { return }
 
         try {
             $bytes = [System.IO.File]::ReadAllBytes($path)
@@ -61,18 +127,29 @@ Get-ChildItem -LiteralPath $rootPath -Recurse -File -Force |
             $bomFiles.Add($path)
         }
 
-        # Check for line endings
+        # Check for line endings based on file type
         $text = [System.Text.Encoding]::UTF8.GetString($bytes)
-        $lfOnly = [regex]::Matches($text, '(?<!\r)\n').Count
-        $crOnly = [regex]::Matches($text, '\r(?!\n)').Count
-
-        if ($lfOnly -gt 0 -or $crOnly -gt 0) {
-            $badEolFiles.Add($path)
+        
+        if ($lfExtensions -contains $ext) {
+            # Shell scripts should have LF only (no CRLF or bare CR)
+            $crlfCount = [regex]::Matches($text, '\r\n').Count
+            $crOnly = [regex]::Matches($text, '\r(?!\n)').Count
+            if ($crlfCount -gt 0 -or $crOnly -gt 0) {
+                $lfViolations.Add($path)
+            }
+        }
+        else {
+            # All other text files should have CRLF (no bare LF or bare CR)
+            $lfOnly = [regex]::Matches($text, '(?<!\r)\n').Count
+            $crOnly = [regex]::Matches($text, '\r(?!\n)').Count
+            if ($lfOnly -gt 0 -or $crOnly -gt 0) {
+                $crlfViolations.Add($path)
+            }
         }
     }
 
-if ($bomFiles.Count -eq 0 -and $badEolFiles.Count -eq 0) {
-    Write-Host "EOL check passed: CRLF only and no BOMs detected."
+if ($bomFiles.Count -eq 0 -and $crlfViolations.Count -eq 0 -and $lfViolations.Count -eq 0 -and $indexIssues.Count -eq 0) {
+    Write-Host "EOL check passed: line endings correct and no BOMs detected."
     exit 0
 }
 
@@ -81,9 +158,20 @@ if ($bomFiles.Count -gt 0) {
     $bomFiles | ForEach-Object { Write-Host "  $_" }
 }
 
-if ($badEolFiles.Count -gt 0) {
-    Write-Host "Files contain non-CRLF line endings (found LF or bare CR):"
-    $badEolFiles | ForEach-Object { Write-Host "  $_" }
+if ($lfViolations.Count -gt 0) {
+    Write-Host "Shell scripts require LF line endings but contain CRLF or bare CR:"
+    $lfViolations | ForEach-Object { Write-Host "  $_" }
+}
+
+if ($crlfViolations.Count -gt 0) {
+    Write-Host "Files require CRLF line endings but contain LF or bare CR:"
+    $crlfViolations | ForEach-Object { Write-Host "  $_" }
+}
+
+if ($indexIssues.Count -gt 0) {
+    Write-Host "Git index contains non-normalized line endings (expected LF in repo for text files):"
+    $indexIssues | ForEach-Object { Write-Host "  $_" }
+    Write-Host "Fix: Run 'node scripts/fix-eol.js' then re-stage affected files."
 }
 
 Write-Error "EOL/BOM policy violations detected. See lists above."

package/scripts/fix-eol.js

@@ -20,12 +20,16 @@ const excludeRegexes = [
   /(^|[\/\\])(Obj|obj)([\/\\]|$)/,
   /(^|[\/\\])Temp([\/\\]|$)/,
   /(^|[\/\\])Samples~([\/\\]|$)/,
-  /(^|[\/\\])\.vs([\/\\]|$)/
+  /(^|[\/\\])\.vs([\/\\]|$)/,
+  /(^|[\/\\])\.venv([\/\\]|$)/,
+  /(^|[\/\\])\.artifacts([\/\\]|$)/,
+  /(^|[\/\\])site([\/\\]|$)/
 ];
 
-// Text file extensions to fix (must match check-eol.js)
-const exts = new Set([
+// Text file extensions that require CRLF line endings (must match check-eol.js)
+const crlfExts = new Set([
   '.cs', '.csproj', '.sln',
+  '.js', '.cjs', '.mjs',
   '.json', '.jsonc', '.toml',
   '.yaml', '.yml',
   '.md', '.markdown',
@@ -35,6 +39,21 @@ const exts = new Set([
   '.ps1'
 ]);
 
+// Shell scripts require LF line endings for Unix compatibility
+const lfExts = new Set(['.sh', '.bash', '.zsh', '.ksh', '.fish']);
+
+// Git hooks directory - files here need LF regardless of extension
+const hooksDir = path.join('scripts', 'hooks');
+
+// All text file extensions we fix
+const exts = new Set([...crlfExts, ...lfExts]);
+
+// Check if a file is a git hook (no extension, in hooks directory)
+function isGitHook(filePath) {
+  const rel = path.relative(repoRoot, filePath);
+  return rel.startsWith(hooksDir + path.sep) && path.extname(filePath) === '';
+}
+
 function walk(dir, files = []) {
   const entries = fs.readdirSync(dir, { withFileTypes: true });
   for (const ent of entries) {
@@ -66,6 +85,13 @@ function toCrlf(txt) {
   return normalized.replace(/\n/g, '\r\n');
 }
 
+function toLf(txt) {
+  // Normalize all newlines to LF (for shell scripts)
+  let normalized = txt.replace(/\r\n/g, '\n');
+  normalized = normalized.replace(/\r/g, '\n');
+  return normalized;
+}
+
 function resolveTargets(targets) {
   if (targets.length === 0) {
     return walk(repoRoot);
@@ -105,7 +131,10 @@ let scanned = 0;
 
 for (const file of allFiles) {
   const ext = path.extname(file).toLowerCase();
-  if (!exts.has(ext)) continue;
+  const isHook = isGitHook(file);
+  
+  // Process if it has a known extension OR if it's a git hook
+  if (!exts.has(ext) && !isHook) continue;
   let buf;
   try {
     buf = fs.readFileSync(file);
@@ -117,10 +146,13 @@ for (const file of allFiles) {
   buf = stripBom(buf);
   const origTxt = origBuf.toString('utf8');
   const noBomTxt = buf.toString('utf8');
-  const crlfTxt = toCrlf(noBomTxt);
+  
+  // Shell scripts and git hooks use LF, all other text files use CRLF
+  const needsLf = lfExts.has(ext) || isHook;
+  const fixedTxt = needsLf ? toLf(noBomTxt) : toCrlf(noBomTxt);
 
-  if (crlfTxt !== origTxt) {
-    fs.writeFileSync(file, crlfTxt, { encoding: 'utf8' });
+  if (fixedTxt !== origTxt) {
+    fs.writeFileSync(file, fixedTxt, { encoding: 'utf8' });
     changed++;
     if (verbose) console.log(`Fixed: ${path.relative(repoRoot, file)}`);
   }
@@ -128,5 +160,5 @@ for (const file of allFiles) {
 
 console.log(`Scanned ${scanned} text files. Updated ${changed}.`);
 if (changed > 0) {
-  console.log('All changes written with CRLF and no BOM.');
+  console.log('All changes written with correct line endings (CRLF for most files, LF for shell scripts) and no BOM.');
 }