@ansonlai/docx-redline-js 0.4.0 → 0.5.1

package/scripts/run-tests.mjs

@@ -1,43 +1,115 @@
-import { readdirSync } from 'fs';
-import { join, dirname } from 'path';
-import { execSync } from 'child_process';
-import { fileURLToPath } from 'url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const testDir = join(__dirname, '..', 'tests');
-const testFiles = readdirSync(testDir)
-  .filter(f => f.endsWith('.mjs') && f !== 'setup-xml-provider.mjs')
-  .sort();
-
-let passed = 0;
-let failed = 0;
-const failures = [];
+import { readdirSync } from 'node:fs';
+import * as os from 'node:os';
+import { join, dirname, resolve } from 'node:path';
+import { execFile } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+
+const scriptPath = fileURLToPath(import.meta.url);
+const scriptDir = dirname(scriptPath);
+const defaultTestDir = join(scriptDir, '..', 'tests');
 const failOutputPattern = /(?:❌\s*(?:FAIL|FAILED|FAILURE|TEST FAILED)|\bTEST FAILED\b)/i;
 
-for (const file of testFiles) {
+export function discoverTestFiles(testDir = defaultTestDir) {
+  return readdirSync(testDir)
+    .filter(file => file.endsWith('.mjs') && file !== 'setup-xml-provider.mjs')
+    .sort();
+}
+
+export function resolveTestConcurrency(value = process.env.DOCX_TEST_CONCURRENCY) {
+  if (value == null || value === '') {
+    const available = os.availableParallelism?.() ?? os.cpus().length;
+    return Math.max(1, Math.min(4, available));
+  }
+  if (!/^\d+$/.test(String(value)) || Number(value) < 1) {
+    throw new Error('DOCX_TEST_CONCURRENCY must be a positive integer.');
+  }
+  return Number(value);
+}
+
+export function runTestFile(file, options = {}) {
+  const testDir = options.testDir || defaultTestDir;
+  const timeout = options.timeout ?? 30000;
   const filePath = join(testDir, file);
-  process.stdout.write(`  ${file} ... `);
-  try {
-    const output = execSync(`node "${filePath}"`, { stdio: 'pipe', timeout: 30000 });
-    const outputText = output.toString();
-    if (failOutputPattern.test(outputText)) {
-      throw new Error(`Test printed a failure marker while exiting successfully:\n${outputText}`);
+
+  return new Promise(resolveResult => {
+    execFile(process.execPath, [filePath], {
+      cwd: options.cwd || join(scriptDir, '..'),
+      env: options.env || process.env,
+      timeout,
+      maxBuffer: options.maxBuffer ?? 1024 * 1024,
+      encoding: 'utf8',
+      windowsHide: true
+    }, (error, stdout = '', stderr = '') => {
+      let executionError = error;
+      if (!executionError && failOutputPattern.test(stdout)) {
+        executionError = new Error(`Test printed a failure marker while exiting successfully:\n${stdout}`);
+      }
+      resolveResult({
+        file,
+        passed: !executionError,
+        stdout: String(stdout),
+        stderr: String(stderr),
+        error: executionError || null
+      });
+    });
+  });
+}
+
+export async function runTestFiles(files, options = {}) {
+  const orderedFiles = [...files].sort();
+  const concurrency = Math.min(resolveTestConcurrency(options.concurrency), Math.max(orderedFiles.length, 1));
+  const execute = options.runFile || runTestFile;
+  const results = new Array(orderedFiles.length);
+  let nextIndex = 0;
+
+  async function worker() {
+    while (true) {
+      const index = nextIndex++;
+      if (index >= orderedFiles.length) return;
+      results[index] = await execute(orderedFiles[index], options);
     }
-    console.log('PASS');
-    passed++;
-  } catch (err) {
-    console.log('FAIL');
-    const stdout = err.stdout?.toString() || '';
-    const stderr = err.stderr?.toString() || '';
-    failures.push({ file, stderr: [stdout, stderr, err.message].filter(Boolean).join('\n') });
-    failed++;
   }
+
+  await Promise.all(Array.from({ length: concurrency }, () => worker()));
+  return results;
+}
+
+export function formatTestRun(results) {
+  const lines = results.map(result => `  ${result.file} ... ${result.passed ? 'PASS' : 'FAIL'}`);
+  const failures = results.filter(result => !result.passed);
+  const passed = results.length - failures.length;
+  lines.push('', `${passed} passed, ${failures.length} failed out of ${results.length} tests`);
+  const failureLines = [];
+  for (const failure of failures) {
+    const detail = [failure.stdout, failure.stderr, failure.error?.message].filter(Boolean).join('\n');
+    failureLines.push('', `--- ${failure.file} ---`, detail);
+  }
+  return {
+    output: `${lines.join('\n')}\n`,
+    errorOutput: failureLines.length > 0 ? `${failureLines.join('\n')}\n` : '',
+    passed,
+    failed: failures.length
+  };
+}
+
+export async function main(options = {}) {
+  const testDir = options.testDir || defaultTestDir;
+  const files = options.files || discoverTestFiles(testDir);
+  const results = await runTestFiles(files, { ...options, testDir });
+  const summary = formatTestRun(results);
+  const write = options.write || (text => process.stdout.write(text));
+  const writeError = options.writeError || (text => process.stderr.write(text));
+  write(summary.output);
+  if (summary.errorOutput) writeError(summary.errorOutput);
+  return summary;
 }
 
-console.log(`\n${passed} passed, ${failed} failed out of ${passed + failed} tests`);
-if (failures.length > 0) {
-  for (const f of failures) {
-    console.error(`\n--- ${f.file} ---\n${f.stderr}`);
+if (process.argv[1] && resolve(process.argv[1]) === resolve(scriptPath)) {
+  try {
+    const summary = await main();
+    if (summary.failed > 0) process.exitCode = 1;
+  } catch (error) {
+    console.error(error?.stack || error?.message || String(error));
+    process.exitCode = 1;
   }
-  process.exit(1);
-}
+}

package/scripts/word-com-corpus-suite.ps1

@@ -37,6 +37,9 @@ if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
     -SourcesDir $sourcesPath
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
+# Clean up any orphaned background Word processes from prior aborted runs
+Get-Process WINWORD -ErrorAction SilentlyContinue | Where-Object { $_.MainWindowHandle -eq 0 } | Stop-Process -Force -ErrorAction SilentlyContinue
+
 & (Join-Path $repoRoot 'scripts\word-com-differential.ps1') `
     -FixturesDir $fixturesPath `
     -SourcesDir $sourcesPath

package/scripts/word-com-differential.ps1

@@ -141,6 +141,62 @@ function Get-ScopeRevisionCount($document, [string]$scope) {
     return $count
 }
 
+function Close-WordDocumentSafely($doc) {
+    if ($null -eq $doc) { return }
+    for ($attempt = 1; $attempt -le 5; $attempt++) {
+        try {
+            $doc.Close(0) | Out-Null
+            break
+        }
+        catch [System.Runtime.InteropServices.COMException] {
+            $hr = $_.Exception.HResult
+            # 0x80010001 = RPC_E_CALL_REJECTED (-2147418111)
+            if ($hr -eq -2147418111 -and $attempt -lt 5) {
+                Start-Sleep -Milliseconds 200
+                continue
+            }
+            break
+        }
+        catch {
+            break
+        }
+    }
+    try {
+        [System.Runtime.InteropServices.Marshal]::ReleaseComObject($doc) | Out-Null
+    } catch {}
+}
+
+function Stop-WordSafely($application) {
+    if ($null -eq $application) { return }
+    for ($attempt = 1; $attempt -le 5; $attempt++) {
+        try {
+            $application.Quit(0) | Out-Null
+            break
+        }
+        catch [System.Runtime.InteropServices.COMException] {
+            $hr = $_.Exception.HResult
+            # 0x80010001 = RPC_E_CALL_REJECTED (-2147418111)
+            # 0x80010108 = RPC_E_DISCONNECTED (-2147417848)
+            if ($hr -eq -2147417848) {
+                break
+            }
+            if ($hr -eq -2147418111 -and $attempt -lt 5) {
+                Start-Sleep -Milliseconds 300
+                continue
+            }
+            break
+        }
+        catch {
+            break
+        }
+    }
+    try {
+        [System.Runtime.InteropServices.Marshal]::ReleaseComObject($application) | Out-Null
+    } catch {}
+    [System.GC]::Collect()
+    [System.GC]::WaitForPendingFinalizers()
+}
+
 try {
     $word = New-Object -ComObject Word.Application
     $word.Visible = $false
@@ -173,7 +229,8 @@ try {
                 $expectedRejected = Get-ScopeText $sourceDocument $assertionScope $fidelity
             }
             finally {
-                if ($null -ne $sourceDocument) { $sourceDocument.Close(0) | Out-Null }
+                Close-WordDocumentSafely $sourceDocument
+                $sourceDocument = $null
             }
             $replacements = if ($expected.replacements) { @($expected.replacements) } else { @(@{
                 originalTarget = $expected.originalTarget
@@ -226,7 +283,8 @@ try {
             $caseFailed = $true
         }
         finally {
-            if ($null -ne $document) { $document.Close(0) | Out-Null; $document = $null }
+            Close-WordDocumentSafely $document
+            $document = $null
         }
 
         # Phase 2: fresh open, reject-all restores the original text.
@@ -252,7 +310,8 @@ try {
                 $caseFailed = $true
             }
             finally {
-                if ($null -ne $document) { $document.Close(0) | Out-Null; $document = $null }
+                Close-WordDocumentSafely $document
+                $document = $null
             }
         }
 
@@ -267,7 +326,8 @@ try {
     }
 }
 finally {
-    if ($null -ne $word) { $word.Quit() | Out-Null }
+    Stop-WordSafely $word
+    $word = $null
 }
 
 Write-Output ""

package/scripts/word-com-suite.ps1

@@ -8,6 +8,9 @@ $exportScript = Join-Path $PSScriptRoot 'export-validation-fixtures.mjs'
 $differentialScript = Join-Path $PSScriptRoot 'word-com-differential.ps1'
 Push-Location $repoRoot
 try {
+    # Clean up any orphaned background Word processes from prior aborted runs
+    Get-Process WINWORD -ErrorAction SilentlyContinue | Where-Object { $_.MainWindowHandle -eq 0 } | Stop-Process -Force -ErrorAction SilentlyContinue
+
     & node $exportScript --output-dir $OutputDir
     if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }