WEBDIENSTE/ECC
1
0
Fork 0
mirror of https://github.com/affaan-m/ECC.git synced 2026-10-18 14:07:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): report nested TypeScript errors on Windows

Browse Source
This commit is contained in:
agammann
2026-10-06 23:10:48 -07:00
parent ef648e0189
commit a3f00af6d2
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/hooks/stop-format-typecheck.js
+10 -2
View File
@@ -111,6 +111,14 @@ function findTsConfigDir(filePath) {
return null;
}
function diagnosticMatchesFile(line, paths) {
const normalizedLine = line.replace(/\\/g, '/');
for (const candidate of paths) {
if (normalizedLine.includes(candidate.replace(/\\/g, '/'))) return true;
}
return false;
}
function typecheckBatch(tsConfigDir, editedFiles, timeoutMs) {
const isWin = process.platform === 'win32';
const npxBin = isWin ? 'npx.cmd' : 'npx';
@@ -147,7 +155,7 @@ function typecheckBatch(tsConfigDir, editedFiles, timeoutMs) {
const relPath = path.relative(tsConfigDir, filePath);
const candidates = new Set([filePath, relPath]);
const relevantLines = lines
.filter(line => { for (const c of candidates) { if (line.includes(c)) return true; } return false; })
.filter(line => diagnosticMatchesFile(line, candidates))
.slice(0, 10);
if (relevantLines.length > 0) {
process.stderr.write(`[Hook] TypeScript errors in ${path.basename(filePath)}:\n`);
@@ -248,4 +256,4 @@ if (require.main === module) {
});
}
module.exports = { run, parseAccumulator, isPluginClonePath };
module.exports = { run, parseAccumulator, isPluginClonePath, diagnosticMatchesFile };
tests/hooks/stop-format-typecheck.test.js
+7 -1
View File
@@ -13,7 +13,7 @@ const os = require('os');
const path = require('path');
const accumulator = require('../../scripts/hooks/post-edit-accumulator');
const { parseAccumulator, isPluginClonePath } = require('../../scripts/hooks/stop-format-typecheck');
const { parseAccumulator, isPluginClonePath, diagnosticMatchesFile } = require('../../scripts/hooks/stop-format-typecheck');
function test(name, fn) {
try {
@@ -203,6 +203,12 @@ if (test('parseAccumulator ignores blank lines and trims whitespace', () => {
assert.deepStrictEqual(result, ['/tmp/a.ts', '/tmp/b.ts']);
})) passed++; else failed++;
if (test('matches forward-slash TypeScript paths against Windows edited paths', () => {
const candidates = new Set(['C:\\project\\src\\broken.ts', 'src\\broken.ts']);
assert.strictEqual(diagnosticMatchesFile('src/broken.ts(1,14): error TS2322', candidates), true);
assert.strictEqual(diagnosticMatchesFile('src/other.ts(1,14): error TS2322', candidates), false);
})) passed++; else failed++;
if (test('stop hook clears accumulator after processing duplicates', () => {
cleanAccumFile();
fs.writeFileSync(getAccumFile(), '/nonexistent/x.ts\n/nonexistent/x.ts\n/nonexistent/y.ts\n', 'utf8');