Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 431c82a186 | |||
| 05184179a4 | |||
| f15ab3a6f9 | |||
| 67d29a8e77 | |||
| 0e1db4bb85 | |||
| 7a1c2d82b9 | |||
| 9f5e4ad76e | |||
| 4feb074c03 | |||
| 95e4f1f036 | |||
| eaa66dff1d | |||
| 8bc4f173e5 | |||
| fba2cba8e8 | |||
| 1033996cb5 | |||
| 7e8b5c4467 | |||
| a738716d98 | |||
| d9c79ae4eb | |||
| a3255fd1fb | |||
| d6fb6e527e | |||
| 96bafec720 | |||
| 86f47ff743 | |||
| 38c134f084 | |||
| 25372bf97d | |||
| f521530eed | |||
| dd81d65958 |
87
changelog.md
87
changelog.md
@@ -1,5 +1,92 @@
|
||||
# Changelog
|
||||
|
||||
## 2026-03-05 - 4.1.26 - fix(compiler)
|
||||
fsync output directories after unpack to avoid XFS delayed logging causing corrupt or invisible directory entries during subsequent TypeScript emits
|
||||
|
||||
- Force fsync on each successful output directory (open, fsync, close) before the next compilation step.
|
||||
- Prevents XFS delayed logging from making directory entries invisible or corrupted during TypeScript emit operations.
|
||||
- Operation swallows errors if a directory doesn't exist yet; non-breaking fix with small additional IO.
|
||||
|
||||
## 2026-03-05 - 4.1.25 - fix(mod_unpack)
|
||||
flush directory metadata on XFS before reading and use readdirSync-based iteration to avoid missing entries when unpacking
|
||||
|
||||
- Call fs.fsyncSync on destination and nested directory file descriptors to force XFS to commit delayed directory metadata (addresses XFS CIL delayed logging causing incomplete readdir/opendir results).
|
||||
- Replace opendirSync/readSync loops with readdirSync-based iteration for simpler, deterministic directory listing.
|
||||
- Remove unused moved counter and update diagnostic log to report nestedEntries.length for moved entry count.
|
||||
|
||||
## 2026-03-05 - 4.1.24 - fix(mod_unpack)
|
||||
iterate directories with opendirSync/readSync to avoid missing entries on XFS and ensure directory handles are closed
|
||||
|
||||
- Replaced readdirSync loops with opendirSync + readSync for destination and nested directories to provide a single stable directory handle during iteration
|
||||
- Added explicit closeSync() calls to close directory handles and avoid resource leaks
|
||||
- Avoids partial results/missed entries that can occur when repeatedly calling readdirSync (observed on XFS with delayed metadata)
|
||||
- Preserves existing renameSync move logic and increments moved counter while cleaning up the now-empty nested directory
|
||||
|
||||
## 2026-03-05 - 4.1.23 - fix(mod_unpack)
|
||||
handle partial readdirSync results when moving nested directory entries and add diagnostic log
|
||||
|
||||
- Loop over readdirSync results until the nested directory is empty to avoid missing entries from partial reads
|
||||
- Count moved entries and print a diagnostic message with the final destination entry count
|
||||
- Keep removal of the now-empty nested directory (fs.rmdirSync) after moving contents
|
||||
|
||||
## 2026-03-05 - 4.1.22 - fix(mod_compiler)
|
||||
improve logging of successful output directories to include a sorted list of entries and use a shortened relative path
|
||||
|
||||
- Adds shortDir variable to display relative path instead of repeating inline replace(this.cwd + '/')
|
||||
- Appends a sorted, comma-separated list of directory entries to the log output for easier inspection
|
||||
- Change located in ts/mod_compiler/classes.tscompiler.ts
|
||||
|
||||
## 2026-03-05 - 4.1.21 - fix(compiler)
|
||||
log emitted files written outside expected destination directory for diagnostics
|
||||
|
||||
- Adds diagnostic logging for emitted files that are not under the configured destDir, listing up to 20 example paths and reporting the remaining count.
|
||||
- Logging is conditional: only when not in quiet mode and not emitting JSON.
|
||||
- Diagnostic runs after compilation (post-compile) and before unpacking of outputs; paths are trimmed using the process cwd for readability.
|
||||
|
||||
## 2026-03-05 - 4.1.20 - fix(mod_compiler)
|
||||
add diagnostic snapshots for output directories around clear and compile steps
|
||||
|
||||
- Introduce diagSnap helper to log entry and directory counts for successful output directories when not in quiet or JSON mode
|
||||
- Call diagSnap before clearing the destination directory, after clearing, and after compilation to aid debugging of missing or unexpected outputs
|
||||
- Behavior for emitted files and unpacking is unchanged; this is observational/logging-only instrumentation
|
||||
|
||||
## 2026-03-05 - 4.1.19 - fix(mod_fs)
|
||||
use synchronous rm to avoid XFS metadata corruption when removing directories
|
||||
|
||||
- Replaced async fs.promises.rm with synchronous fs.rmSync in removeDirectory to avoid observed XFS metadata corruption affecting sibling entries under libuv thread-pool and signal pressure
|
||||
- Retains previous options: recursive, force, maxRetries, retryDelay
|
||||
- Adds inline comment documenting the rationale for using a synchronous removal
|
||||
|
||||
## 2026-03-05 - 4.1.18 - fix(mod_compiler)
|
||||
add diagnostic logging of output directory states after compilation and after import-path rewriting to aid debugging
|
||||
|
||||
- Imported fs to allow reading output directories for diagnostics
|
||||
- Logs entries and directory counts for each successful output directory both pre- and post-import-path-rewrite
|
||||
- Diagnostics are gated by !isQuiet && !isJson and are read-only (no behavior change)
|
||||
- Tags used: 'diag' (post-compilation) and 'diag-post-rewrite' (after rewriting) to help identify missing or unexpected output folders
|
||||
|
||||
## 2026-03-05 - 4.1.17 - fix(tsunpacker)
|
||||
use synchronous fs operations in tsunpacker to avoid readdir race conditions
|
||||
|
||||
- Replaced async fs.promises.readdir/rename/rm/rmdir loops with fs.readdirSync/renameSync/rmSync/rmdirSync
|
||||
- Removed readdir retry loops that attempted to handle partial/stale readdir results
|
||||
- Updated comment to document rationale: avoid race conditions under signal pressure and XFS metadata lag
|
||||
- Note: function remains async but now performs blocking sync filesystem calls which may block the event loop during unpack
|
||||
|
||||
## 2026-03-05 - 4.1.16 - fix(mod_unpack)
|
||||
handle partial readdir results from signal-interrupted getdents64 when unpacking to ensure sibling removal and nested moves complete
|
||||
|
||||
- Loop readdir calls for destination directory until only the source folder remains to avoid partial-listing leftovers
|
||||
- Loop readdir calls for nested directory and repeatedly rename entries until the nested directory is empty
|
||||
- Prevents leftover files and incomplete moves when readdir returns partial results under signals
|
||||
|
||||
## 2026-03-05 - 4.1.15 - fix(mod_unpack)
|
||||
flatten nested output directory without temporary rename steps to avoid race conditions
|
||||
|
||||
- Replace rename-rm-rename strategy with: remove sibling entries in destination, move nested source entries up into the destination, then remove the now-empty nested folder.
|
||||
- Avoid creating temporary sibling directories and avoid removing the destination directory to reduce filesystem race conditions and metadata lag issues (XFS/NFS/etc.).
|
||||
- Remove removed removeEmptyDirectory helper and stop using FsHelpers.move/removeDirectory in unpack; import and use fs.promises methods (readdir, rm, rename, rmdir) directly.
|
||||
|
||||
## 2026-03-05 - 4.1.14 - fix(fs)
|
||||
replace execSync and fsync workarounds with atomic async FsHelpers operations to avoid XFS races and shell dependencies
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@git.zone/tsbuild",
|
||||
"version": "4.1.14",
|
||||
"version": "4.1.26",
|
||||
"private": false,
|
||||
"description": "A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.",
|
||||
"main": "dist_ts/index.js",
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@git.zone/tsbuild',
|
||||
version: '4.1.14',
|
||||
version: '4.1.26',
|
||||
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import type { CompilerOptions, Diagnostic, Program } from 'typescript';
|
||||
import typescript from 'typescript';
|
||||
import * as fs from 'fs';
|
||||
import * as smartdelay from '@push.rocks/smartdelay';
|
||||
import * as smartpromise from '@push.rocks/smartpromise';
|
||||
import * as smartpath from '@push.rocks/smartpath';
|
||||
@@ -337,13 +338,31 @@ export class TsCompiler {
|
||||
// Get destination directory as absolute path
|
||||
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
|
||||
diagSnap('pre-clear');
|
||||
if (await FsHelpers.directoryExists(destDir)) {
|
||||
if (!isQuiet && !isJson) {
|
||||
console.log(`🧹 Clearing output directory: ${destPath}`);
|
||||
}
|
||||
await FsHelpers.removeDirectory(destDir);
|
||||
}
|
||||
diagSnap('post-clear');
|
||||
|
||||
// Update compiler options with the output directory
|
||||
const options: CompilerOptions = {
|
||||
@@ -364,6 +383,21 @@ export class TsCompiler {
|
||||
const result = await this.compileFiles(absoluteFiles, options, taskInfo);
|
||||
emittedFiles.push(...result.emittedFiles);
|
||||
errorSummaries.push(result.errorSummary);
|
||||
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) {
|
||||
@@ -371,6 +405,35 @@ export class TsCompiler {
|
||||
successfulOutputDirs.push(destDir);
|
||||
}
|
||||
|
||||
// Fsync all output directories to force XFS metadata commit
|
||||
// before the next compilation step. Without this, XFS delayed logging
|
||||
// can cause directory entries from previous compilations to become
|
||||
// invisible or corrupted during subsequent TypeScript emit operations.
|
||||
for (const dir of successfulOutputDirs) {
|
||||
try {
|
||||
const fd = fs.openSync(dir, 'r');
|
||||
fs.fsyncSync(fd);
|
||||
fs.closeSync(fd);
|
||||
} catch {
|
||||
// Directory might not exist yet
|
||||
}
|
||||
}
|
||||
|
||||
// Diagnostic: log all output directory states after each compilation
|
||||
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; }
|
||||
});
|
||||
console.log(` 📋 [diag] ${prevDir.replace(this.cwd + '/', '')}: ${entries.length} entries, ${dirs.length} dirs`);
|
||||
} catch {
|
||||
console.log(` 📋 [diag] ${prevDir.replace(this.cwd + '/', '')}: MISSING!`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Rewrite import paths in all output directories to handle cross-module references
|
||||
@@ -385,6 +448,21 @@ export class TsCompiler {
|
||||
if (totalRewritten > 0 && !isQuiet && !isJson) {
|
||||
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
|
||||
|
||||
@@ -122,10 +122,13 @@ export class FsHelpers {
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a directory recursively
|
||||
* Remove a directory recursively.
|
||||
* Uses synchronous rm to avoid XFS metadata corruption observed with
|
||||
* async fs.promises.rm affecting sibling directory entries on the
|
||||
* libuv thread pool under signal pressure.
|
||||
*/
|
||||
public static async removeDirectory(dirPath: string): Promise<void> {
|
||||
await fs.promises.rm(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
||||
fs.rmSync(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -134,34 +137,4 @@ export class FsHelpers {
|
||||
public static async move(src: string, dest: string): Promise<void> {
|
||||
await fs.promises.rename(src, dest);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove an empty directory
|
||||
*/
|
||||
public static async removeEmptyDirectory(dirPath: string): Promise<void> {
|
||||
// Retry rmdir with delays to handle filesystem metadata lag (XFS, NFS, etc.)
|
||||
// NEVER use recursive rm here — if rmdir fails with ENOTEMPTY, entries may
|
||||
// still be valid references to renamed files/dirs that haven't fully detached
|
||||
for (let attempt = 0; attempt < 5; attempt++) {
|
||||
try {
|
||||
await fs.promises.rmdir(dirPath);
|
||||
return;
|
||||
} catch (err: any) {
|
||||
if (err.code === 'ENOENT') {
|
||||
return; // Already gone
|
||||
}
|
||||
if (err.code === 'ENOTEMPTY' && attempt < 4) {
|
||||
// Wait for filesystem metadata to catch up
|
||||
await new Promise(resolve => setTimeout(resolve, 100 * (attempt + 1)));
|
||||
continue;
|
||||
}
|
||||
// Final attempt failed or non-retryable error — leave directory in place
|
||||
// It will be cleaned up by the next build's "clear output directory" step
|
||||
if (err.code === 'ENOTEMPTY') {
|
||||
return;
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import { TsPublishConfig } from '../mod_config/index.js';
|
||||
import { FsHelpers } from '../mod_fs/index.js';
|
||||
@@ -82,9 +83,16 @@ export class TsUnpacker {
|
||||
/**
|
||||
* Perform the unpack operation - flatten nested output directories.
|
||||
*
|
||||
* Renames the nested directory to a temp location, removes the dest dir,
|
||||
* then renames the temp dir back as dest. Uses only rename operations
|
||||
* which are atomic at the kernel level.
|
||||
* When TypeScript compiles files that import from sibling directories,
|
||||
* it creates a nested structure like dist_ts/ts/ with siblings like
|
||||
* dist_ts/ts_interfaces/. This method flattens by:
|
||||
* 1. Removing sibling directories (non-source folders)
|
||||
* 2. Moving contents of the nested source folder up to the dest dir
|
||||
* 3. Removing the now-empty nested source folder
|
||||
*
|
||||
* Uses synchronous fs operations to avoid race conditions with
|
||||
* async readdir returning partial/stale results under signal pressure
|
||||
* or XFS metadata lag (observed in process-group environments like gitzone).
|
||||
*
|
||||
* Returns true if unpacking was performed, false if skipped.
|
||||
*/
|
||||
@@ -98,19 +106,41 @@ export class TsUnpacker {
|
||||
}
|
||||
|
||||
const nestedPath = this.getNestedPath();
|
||||
const tempPath = this.destDir + '.__unpack_temp__';
|
||||
|
||||
// Step 1: Clean up any leftover temp dir from a previous failed run
|
||||
await FsHelpers.removeDirectory(tempPath);
|
||||
// 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 2: Rename nested → temp
|
||||
await FsHelpers.move(nestedPath, tempPath);
|
||||
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
||||
const destEntries = fs.readdirSync(this.destDir);
|
||||
for (const entry of destEntries) {
|
||||
if (entry !== this.sourceFolderName) {
|
||||
fs.rmSync(path.join(this.destDir, entry), { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
// Step 3: Remove dest dir (now contains only sibling folders)
|
||||
await FsHelpers.removeDirectory(this.destDir);
|
||||
// Step 2: Move all contents from nested dir up to dest dir
|
||||
const nestedEntries = fs.readdirSync(nestedPath);
|
||||
for (const entry of nestedEntries) {
|
||||
fs.renameSync(
|
||||
path.join(nestedPath, entry),
|
||||
path.join(this.destDir, entry),
|
||||
);
|
||||
}
|
||||
|
||||
// Step 4: Rename temp → dest
|
||||
await FsHelpers.move(tempPath, this.destDir);
|
||||
// Step 3: Remove the now-empty nested directory
|
||||
fs.rmdirSync(nestedPath);
|
||||
|
||||
// Diagnostic: verify final state
|
||||
const finalEntries = fs.readdirSync(this.destDir);
|
||||
console.log(` 📦 Unpacked ${this.sourceFolderName}: moved ${nestedEntries.length} entries, final: ${finalEntries.length} entries`);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user