fix(compiler): defer unpacking until after all compilations and remove diagnostic filesystem syncs to avoid XFS metadata visibility issues
This commit is contained in:
@@ -1,5 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.2.3 - fix(compiler)
|
||||||
|
defer unpacking until after all compilations and remove diagnostic filesystem syncs to avoid XFS metadata visibility issues
|
||||||
|
|
||||||
|
- Queue pending unpack operations during compilation and run them after all compile tasks complete to avoid modifying output directories while other compilations are writing.
|
||||||
|
- Remove TypeScript sys interception, execSync('sync') calls, and per-unpack fs.fsyncSync usage that attempted to work around XFS delayed metadata commits; rely on performing all unpacks after compilation instead.
|
||||||
|
- Clean up noisy diagnostic code (external 'ls' comparisons, readdir snapshots) and simplify logging of unpack results.
|
||||||
|
- Remove unused imports (fs and child_process.execSync) from the compiler module.
|
||||||
|
|
||||||
## 2026-03-05 - 4.2.2 - fix(compiler)
|
## 2026-03-05 - 4.2.2 - fix(compiler)
|
||||||
force global filesystem sync to flush XFS delayed logging and add diagnostics comparing Node's readdirSync with system ls to detect directory entry inconsistencies
|
force global filesystem sync to flush XFS delayed logging and add diagnostics comparing Node's readdirSync with system ls to detect directory entry inconsistencies
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@git.zone/tsbuild',
|
name: '@git.zone/tsbuild',
|
||||||
version: '4.2.2',
|
version: '4.2.3',
|
||||||
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
|
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import type { CompilerOptions, Diagnostic, Program } from 'typescript';
|
import type { CompilerOptions, Diagnostic, Program } from 'typescript';
|
||||||
import typescript from 'typescript';
|
import typescript from 'typescript';
|
||||||
import * as fs from 'fs';
|
|
||||||
import { execSync } from 'child_process';
|
|
||||||
import * as smartdelay from '@push.rocks/smartdelay';
|
import * as smartdelay from '@push.rocks/smartdelay';
|
||||||
import * as smartpromise from '@push.rocks/smartpromise';
|
import * as smartpromise from '@push.rocks/smartpromise';
|
||||||
import * as smartpath from '@push.rocks/smartpath';
|
import * as smartpath from '@push.rocks/smartpath';
|
||||||
@@ -326,6 +324,12 @@ export class TsCompiler {
|
|||||||
console.log('');
|
console.log('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Collect unpack tasks to perform AFTER all compilations complete.
|
||||||
|
// This prevents filesystem metadata corruption on XFS where heavy write
|
||||||
|
// activity during subsequent compilations can make freshly-renamed entries
|
||||||
|
// in previously-unpacked directories invisible or lost.
|
||||||
|
const pendingUnpacks: Array<{ pattern: string; destDir: string }> = [];
|
||||||
|
|
||||||
for (const pattern of Object.keys(globPatterns)) {
|
for (const pattern of Object.keys(globPatterns)) {
|
||||||
const destPath = globPatterns[pattern];
|
const destPath = globPatterns[pattern];
|
||||||
if (!pattern || !destPath) continue;
|
if (!pattern || !destPath) continue;
|
||||||
@@ -339,31 +343,13 @@ export class TsCompiler {
|
|||||||
// Get destination directory as absolute path
|
// Get destination directory as absolute path
|
||||||
const destDir = smartpath.transform.toAbsolute(destPath, this.cwd) as string;
|
const destDir = smartpath.transform.toAbsolute(destPath, this.cwd) as string;
|
||||||
|
|
||||||
// Diagnostic helper
|
|
||||||
const diagSnap = (label: string) => {
|
|
||||||
if (!isQuiet && !isJson) {
|
|
||||||
for (const prevDir of successfulOutputDirs) {
|
|
||||||
try {
|
|
||||||
const entries = fs.readdirSync(prevDir);
|
|
||||||
const dirs = entries.filter(e => { try { return fs.statSync(prevDir + '/' + e).isDirectory(); } catch { return false; } });
|
|
||||||
const shortDir = prevDir.replace(this.cwd + '/', '');
|
|
||||||
console.log(` 📋 [${label}] ${shortDir}: ${entries.length} entries, ${dirs.length} dirs [${entries.sort().join(', ')}]`);
|
|
||||||
} catch {
|
|
||||||
console.log(` 📋 [${label}] ${prevDir.replace(this.cwd + '/', '')}: MISSING!`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Clear the destination directory before compilation if it exists
|
// Clear the destination directory before compilation if it exists
|
||||||
diagSnap('pre-clear');
|
|
||||||
if (await FsHelpers.directoryExists(destDir)) {
|
if (await FsHelpers.directoryExists(destDir)) {
|
||||||
if (!isQuiet && !isJson) {
|
if (!isQuiet && !isJson) {
|
||||||
console.log(`🧹 Clearing output directory: ${destPath}`);
|
console.log(`🧹 Clearing output directory: ${destPath}`);
|
||||||
}
|
}
|
||||||
await FsHelpers.removeDirectory(destDir);
|
await FsHelpers.removeDirectory(destDir);
|
||||||
}
|
}
|
||||||
diagSnap('post-clear');
|
|
||||||
|
|
||||||
// Update compiler options with the output directory
|
// Update compiler options with the output directory
|
||||||
const options: CompilerOptions = {
|
const options: CompilerOptions = {
|
||||||
@@ -381,107 +367,22 @@ export class TsCompiler {
|
|||||||
fileCount: absoluteFiles.length,
|
fileCount: absoluteFiles.length,
|
||||||
};
|
};
|
||||||
|
|
||||||
// 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);
|
|
||||||
let interceptedOps: string[] = [];
|
|
||||||
const origSysWriteFile = typescript.sys.writeFile;
|
|
||||||
const origSysDeleteFile = typescript.sys.deleteFile;
|
|
||||||
const origSysCreateDir = typescript.sys.createDirectory;
|
|
||||||
if (watchedDirs.length > 0 && !isQuiet && !isJson) {
|
|
||||||
typescript.sys.writeFile = (p: string, data: string, writeBom?: boolean) => {
|
|
||||||
if (watchedDirs.some(d => p.startsWith(d + '/'))) {
|
|
||||||
interceptedOps.push(`sys.writeFile: ${p}`);
|
|
||||||
}
|
|
||||||
return origSysWriteFile.call(typescript.sys, p, data, writeBom);
|
|
||||||
};
|
|
||||||
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 origSysCreateDir.call(typescript.sys, p);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await this.compileFiles(absoluteFiles, options, taskInfo);
|
const result = await this.compileFiles(absoluteFiles, options, taskInfo);
|
||||||
emittedFiles.push(...result.emittedFiles);
|
emittedFiles.push(...result.emittedFiles);
|
||||||
errorSummaries.push(result.errorSummary);
|
errorSummaries.push(result.errorSummary);
|
||||||
|
|
||||||
// Restore original sys methods and report any intercepted operations
|
// Queue unpack for after all compilations (don't modify output dirs between compilations)
|
||||||
if (watchedDirs.length > 0 && !isQuiet && !isJson) {
|
|
||||||
typescript.sys.writeFile = origSysWriteFile;
|
|
||||||
typescript.sys.deleteFile = origSysDeleteFile;
|
|
||||||
typescript.sys.createDirectory = origSysCreateDir;
|
|
||||||
if (interceptedOps.length > 0) {
|
|
||||||
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');
|
|
||||||
|
|
||||||
// Diagnostic: log emitted files that went to unexpected directories
|
|
||||||
if (!isQuiet && !isJson && result.emittedFiles.length > 0) {
|
|
||||||
const unexpectedFiles = result.emittedFiles.filter(f => !f.startsWith(destDir + '/') && !f.startsWith(destDir + '\\'));
|
|
||||||
if (unexpectedFiles.length > 0) {
|
|
||||||
console.log(` ⚠️ [diag] ${unexpectedFiles.length} files emitted OUTSIDE ${destPath}:`);
|
|
||||||
for (const f of unexpectedFiles.slice(0, 20)) {
|
|
||||||
console.log(` ${f.replace(this.cwd + '/', '')}`);
|
|
||||||
}
|
|
||||||
if (unexpectedFiles.length > 20) {
|
|
||||||
console.log(` ... and ${unexpectedFiles.length - 20} more`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Perform unpack if compilation succeeded
|
|
||||||
if (result.errorSummary.totalErrors === 0) {
|
if (result.errorSummary.totalErrors === 0) {
|
||||||
await performUnpack(pattern, destDir, this.cwd);
|
pendingUnpacks.push({ pattern, destDir });
|
||||||
successfulOutputDirs.push(destDir);
|
successfulOutputDirs.push(destDir);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Force global filesystem sync to flush XFS delayed logging (CIL)
|
// Perform all unpacks after all compilations are done.
|
||||||
// before the next compilation step. Per-directory fsync was insufficient;
|
// This ensures no output directory is modified while subsequent compilations
|
||||||
// XFS defers parent B+tree metadata commits which can make sibling
|
// are performing heavy filesystem writes to sibling directories.
|
||||||
// directory entries invisible to readdirSync after heavy write activity.
|
for (const { pattern, destDir } of pendingUnpacks) {
|
||||||
execSync('sync');
|
await performUnpack(pattern, destDir, this.cwd);
|
||||||
|
|
||||||
// Diagnostic: compare readdirSync vs external ls to detect Node.js caching
|
|
||||||
if (!isQuiet && !isJson) {
|
|
||||||
for (const prevDir of successfulOutputDirs) {
|
|
||||||
try {
|
|
||||||
const nodeEntries = fs.readdirSync(prevDir);
|
|
||||||
const nodeDirs = nodeEntries.filter(e => { try { return fs.statSync(prevDir + '/' + e).isDirectory(); } catch { return false; } });
|
|
||||||
const lsOutput = execSync(`ls -1 "${prevDir}"`, { encoding: 'utf8' }).trim();
|
|
||||||
const lsEntries = lsOutput ? lsOutput.split('\n') : [];
|
|
||||||
const shortDir = prevDir.replace(this.cwd + '/', '');
|
|
||||||
if (nodeEntries.length !== lsEntries.length) {
|
|
||||||
console.log(` ⚠️ [diag] ${shortDir}: readdirSync=${nodeEntries.length}, ls=${lsEntries.length} (MISMATCH!)`);
|
|
||||||
console.log(` readdirSync: [${nodeEntries.sort().join(', ')}]`);
|
|
||||||
console.log(` ls: [${lsEntries.sort().join(', ')}]`);
|
|
||||||
} else {
|
|
||||||
console.log(` 📋 [diag] ${shortDir}: ${nodeEntries.length} entries, ${nodeDirs.length} dirs ✓`);
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
console.log(` 📋 [diag] ${prevDir.replace(this.cwd + '/', '')}: MISSING!`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rewrite import paths in all output directories to handle cross-module references
|
// Rewrite import paths in all output directories to handle cross-module references
|
||||||
@@ -496,21 +397,6 @@ export class TsCompiler {
|
|||||||
if (totalRewritten > 0 && !isQuiet && !isJson) {
|
if (totalRewritten > 0 && !isQuiet && !isJson) {
|
||||||
console.log(` 🔄 Rewrote import paths in ${totalRewritten} file${totalRewritten !== 1 ? 's' : ''}`);
|
console.log(` 🔄 Rewrote import paths in ${totalRewritten} file${totalRewritten !== 1 ? 's' : ''}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Diagnostic: log output directory states after path rewriting
|
|
||||||
if (!isQuiet && !isJson) {
|
|
||||||
for (const dir of successfulOutputDirs) {
|
|
||||||
try {
|
|
||||||
const entries = fs.readdirSync(dir);
|
|
||||||
const dirs = entries.filter(e => {
|
|
||||||
try { return fs.statSync(dir + '/' + e).isDirectory(); } catch { return false; }
|
|
||||||
});
|
|
||||||
console.log(` 📋 [diag-post-rewrite] ${dir.replace(this.cwd + '/', '')}: ${entries.length} entries, ${dirs.length} dirs`);
|
|
||||||
} catch {
|
|
||||||
console.log(` 📋 [diag-post-rewrite] ${dir.replace(this.cwd + '/', '')}: MISSING!`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge all error summaries
|
// Merge all error summaries
|
||||||
|
|||||||
@@ -90,9 +90,9 @@ export class TsUnpacker {
|
|||||||
* 2. Moving contents of the nested source folder up to the dest dir
|
* 2. Moving contents of the nested source folder up to the dest dir
|
||||||
* 3. Removing the now-empty nested source folder
|
* 3. Removing the now-empty nested source folder
|
||||||
*
|
*
|
||||||
* Uses synchronous fs operations to avoid race conditions with
|
* Uses synchronous fs operations for reliability.
|
||||||
* async readdir returning partial/stale results under signal pressure
|
* Called after all compilations are complete (not between compilations)
|
||||||
* or XFS metadata lag (observed in process-group environments like gitzone).
|
* to avoid filesystem metadata issues on XFS.
|
||||||
*
|
*
|
||||||
* Returns true if unpacking was performed, false if skipped.
|
* Returns true if unpacking was performed, false if skipped.
|
||||||
*/
|
*/
|
||||||
@@ -107,17 +107,6 @@ export class TsUnpacker {
|
|||||||
|
|
||||||
const nestedPath = this.getNestedPath();
|
const nestedPath = this.getNestedPath();
|
||||||
|
|
||||||
// Force XFS to flush pending directory metadata before reading.
|
|
||||||
// XFS delayed logging (CIL) can defer metadata commits, causing
|
|
||||||
// readdirSync/opendirSync to return incomplete results immediately
|
|
||||||
// after TypeScript's emit() creates files via writeFileSync.
|
|
||||||
const destFd = fs.openSync(this.destDir, 'r');
|
|
||||||
fs.fsyncSync(destFd);
|
|
||||||
fs.closeSync(destFd);
|
|
||||||
const nestedFd = fs.openSync(nestedPath, 'r');
|
|
||||||
fs.fsyncSync(nestedFd);
|
|
||||||
fs.closeSync(nestedFd);
|
|
||||||
|
|
||||||
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
||||||
const destEntries = fs.readdirSync(this.destDir);
|
const destEntries = fs.readdirSync(this.destDir);
|
||||||
for (const entry of destEntries) {
|
for (const entry of destEntries) {
|
||||||
@@ -138,9 +127,7 @@ export class TsUnpacker {
|
|||||||
// Step 3: Remove the now-empty nested directory
|
// Step 3: Remove the now-empty nested directory
|
||||||
fs.rmdirSync(nestedPath);
|
fs.rmdirSync(nestedPath);
|
||||||
|
|
||||||
// Diagnostic: verify final state
|
console.log(` 📦 Unpacked ${this.sourceFolderName}: ${nestedEntries.length} entries`);
|
||||||
const finalEntries = fs.readdirSync(this.destDir);
|
|
||||||
console.log(` 📦 Unpacked ${this.sourceFolderName}: moved ${nestedEntries.length} entries, final: ${finalEntries.length} entries`);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user