From e8e64a4ef3a451392b64f85cb24f09efa37ec495 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Thu, 5 Mar 2026 15:28:18 +0000 Subject: [PATCH] fix(compiler): use TypeScript sys hooks instead of fs monkeypatching to detect writes/deletes in previous output directories --- changelog.md | 8 ++++ ts/00_commitinfo_data.ts | 2 +- ts/mod_compiler/classes.tscompiler.ts | 68 +++++++++++---------------- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/changelog.md b/changelog.md index 03ffb3a..c129163 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,13 @@ # Changelog +## 2026-03-05 - 4.2.1 - fix(compiler) +use TypeScript sys hooks instead of fs monkeypatching to detect writes/deletes in previous output directories + +- Replace direct fs.* monkeypatching with interception of typescript.sys.writeFile, typescript.sys.deleteFile and typescript.sys.createDirectory +- Add guards for optional sys.deleteFile before overriding it and preserve original sys methods to restore after compilation +- Update diagnostic messages to reference TypeScript sys ops and add an informational message when no ops are observed +- Reduce surface area of changes by avoiding global fs changes and focusing on TypeScript's sys API for safer interception + ## 2026-03-05 - 4.2.0 - feat(mod_compiler) add diagnostic interception of fs operations to detect and report unexpected file system changes in previously compiled output directories during compilation diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 621ee5f..f164013 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@git.zone/tsbuild', - version: '4.2.0', + version: '4.2.1', description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.' } diff --git a/ts/mod_compiler/classes.tscompiler.ts b/ts/mod_compiler/classes.tscompiler.ts index ff35196..2eb5238 100644 --- a/ts/mod_compiler/classes.tscompiler.ts +++ b/ts/mod_compiler/classes.tscompiler.ts @@ -380,45 +380,33 @@ export class TsCompiler { fileCount: absoluteFiles.length, }; - // Diagnostic: intercept fs operations during compilation to detect - // any unexpected deletions in previously compiled output directories + // Diagnostic: intercept TypeScript sys operations during compilation to detect + // any unexpected writes/deletes in previously compiled output directories const watchedDirs = successfulOutputDirs.filter(d => d !== destDir); - const origUnlink = fs.unlinkSync; - const origRm = fs.rmSync; - const origRmdir = fs.rmdirSync; - const origRename = fs.renameSync; - const origWriteFile = fs.writeFileSync; let interceptedOps: string[] = []; + const origSysWriteFile = typescript.sys.writeFile; + const origSysDeleteFile = typescript.sys.deleteFile; + const origSysCreateDir = typescript.sys.createDirectory; if (watchedDirs.length > 0 && !isQuiet && !isJson) { - (fs as any).unlinkSync = (p: string, ...args: any[]) => { - if (watchedDirs.some(d => String(p).startsWith(d + '/'))) { - interceptedOps.push(`unlink: ${p}`); + typescript.sys.writeFile = (p: string, data: string, writeBom?: boolean) => { + if (watchedDirs.some(d => p.startsWith(d + '/'))) { + interceptedOps.push(`sys.writeFile: ${p}`); } - return origUnlink.call(fs, p, ...args); + return origSysWriteFile.call(typescript.sys, p, data, writeBom); }; - (fs as any).rmSync = (p: string, ...args: any[]) => { - if (watchedDirs.some(d => String(p).startsWith(d + '/'))) { - interceptedOps.push(`rm: ${p}`); + if (origSysDeleteFile) { + typescript.sys.deleteFile = (p: string) => { + if (watchedDirs.some(d => p.startsWith(d + '/'))) { + interceptedOps.push(`sys.deleteFile: ${p}`); + } + return origSysDeleteFile!.call(typescript.sys, p); + }; + } + typescript.sys.createDirectory = (p: string) => { + if (watchedDirs.some(d => p.startsWith(d + '/'))) { + interceptedOps.push(`sys.createDirectory: ${p}`); } - return origRm.call(fs, p, ...args); - }; - (fs as any).rmdirSync = (p: string, ...args: any[]) => { - if (watchedDirs.some(d => String(p).startsWith(d + '/'))) { - interceptedOps.push(`rmdir: ${p}`); - } - return origRmdir.call(fs, p, ...args); - }; - (fs as any).renameSync = (src: string, dest: string, ...args: any[]) => { - if (watchedDirs.some(d => String(src).startsWith(d + '/') || String(dest).startsWith(d + '/'))) { - interceptedOps.push(`rename: ${src} → ${dest}`); - } - return origRename.call(fs, src, dest, ...args); - }; - (fs as any).writeFileSync = (p: string, ...args: any[]) => { - if (watchedDirs.some(d => String(p).startsWith(d + '/'))) { - interceptedOps.push(`write: ${p}`); - } - return origWriteFile.call(fs, p, ...args); + return origSysCreateDir.call(typescript.sys, p); }; } @@ -426,21 +414,21 @@ export class TsCompiler { emittedFiles.push(...result.emittedFiles); errorSummaries.push(result.errorSummary); - // Restore original fs methods and report any intercepted operations + // Restore original sys methods and report any intercepted operations if (watchedDirs.length > 0 && !isQuiet && !isJson) { - (fs as any).unlinkSync = origUnlink; - (fs as any).rmSync = origRm; - (fs as any).rmdirSync = origRmdir; - (fs as any).renameSync = origRename; - (fs as any).writeFileSync = origWriteFile; + typescript.sys.writeFile = origSysWriteFile; + typescript.sys.deleteFile = origSysDeleteFile; + typescript.sys.createDirectory = origSysCreateDir; if (interceptedOps.length > 0) { - console.log(` ⚠️ [diag] ${interceptedOps.length} ops on previous output dirs during compilation:`); + console.log(` ⚠️ [diag] ${interceptedOps.length} TypeScript sys ops on previous output dirs:`); for (const op of interceptedOps.slice(0, 30)) { console.log(` ${op.replace(this.cwd + '/', '')}`); } if (interceptedOps.length > 30) { console.log(` ... and ${interceptedOps.length - 30} more`); } + } else { + console.log(` ℹ️ [diag] No TypeScript sys ops on previous output dirs during this compilation`); } } diagSnap('post-compile');