Compare commits

..

4 Commits

5 changed files with 28 additions and 74 deletions

View File

@@ -1,5 +1,20 @@
# Changelog
## 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
- Removed child_process.execSync usage and shell mv/rm commands in mod_unpack and mod_compiler.
- Removed syncDirectoryTree and fsync-based workaround from the compiler module.
- Use FsHelpers.move and FsHelpers.removeDirectory (async rename/remove) for atomic filesystem operations during unpack.
- Await performUnpack directly and simplify unpack flow to improve portability and reliability on XFS and other filesystems.
## 2026-03-05 - 4.1.13 - fix(mod_unpack)
Use child_process.execSync (mv/rm) to perform unpack atomically, replacing async fs operations and logs to avoid ENOENT/partial directory listings on XFS
- Replaced async fs.promises.rename/rm and readdir/stat debugging with execSync rm -rf and mv operations for sequential, atomic moves
- Imported execSync from child_process and removed verbose console logging and extra fs checks
- Addresses race conditions observed on filesystems like XFS where libuv async operations can return partial results or ENOENT errors
## 2026-03-05 - 4.1.12 - fix(mod_compiler)
replace runtime require calls with top-level imports and use execSync/path.join for filesystem sync and traversal

View File

@@ -1,6 +1,6 @@
{
"name": "@git.zone/tsbuild",
"version": "4.1.12",
"version": "4.1.14",
"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",

View File

@@ -3,6 +3,6 @@
*/
export const commitinfo = {
name: '@git.zone/tsbuild',
version: '4.1.12',
version: '4.1.14',
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
}

View File

@@ -1,8 +1,5 @@
import type { CompilerOptions, Diagnostic, Program } from 'typescript';
import typescript from 'typescript';
import * as fs from 'fs';
import * as path from 'path';
import { execSync } from 'child_process';
import * as smartdelay from '@push.rocks/smartdelay';
import * as smartpromise from '@push.rocks/smartpromise';
import * as smartpath from '@push.rocks/smartpath';
@@ -370,18 +367,7 @@ export class TsCompiler {
// Perform unpack if compilation succeeded
if (result.errorSummary.totalErrors === 0) {
// Force XFS to commit all pending directory entries before unpacking.
// TypeScript's writeFileSync creates entries that may reside in XFS's
// delayed log. Without sync, readdir can return partial results.
execSync('sync');
this.syncDirectoryTree(destDir);
try {
await performUnpack(pattern, destDir, this.cwd);
} catch (unpackErr: any) {
console.error(` ⚠️ Unpack error for ${destPath}: ${unpackErr.message}`);
}
await performUnpack(pattern, destDir, this.cwd);
successfulOutputDirs.push(destDir);
}
@@ -504,27 +490,6 @@ export class TsCompiler {
return success;
}
/**
* Recursively fsync all directories in a tree.
* Forces XFS to commit pending directory entries from its log.
*/
private syncDirectoryTree(dirPath: string): void {
try {
const fd = fs.openSync(dirPath, 'r');
fs.fsyncSync(fd);
fs.closeSync(fd);
const entries = fs.readdirSync(dirPath, { withFileTypes: true });
for (const entry of entries) {
if (entry.isDirectory()) {
this.syncDirectoryTree(path.join(dirPath, entry.name));
}
}
} catch {
// Ignore errors (directory may not exist)
}
}
/**
* Merge multiple error summaries into one
*/

View File

@@ -1,4 +1,3 @@
import * as fs from 'fs';
import * as path from 'path';
import { TsPublishConfig } from '../mod_config/index.js';
import { FsHelpers } from '../mod_fs/index.js';
@@ -83,10 +82,8 @@ export class TsUnpacker {
/**
* Perform the unpack operation - flatten nested output directories.
*
* Strategy: instead of listing entries and moving them individually (which is
* vulnerable to async readdir returning partial results under signal pressure),
* we rename the entire nested directory out, remove the dest dir, then rename
* the nested directory back as the dest dir. This uses only rename operations
* 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.
*
* Returns true if unpacking was performed, false if skipped.
@@ -103,40 +100,17 @@ export class TsUnpacker {
const nestedPath = this.getNestedPath();
const tempPath = this.destDir + '.__unpack_temp__';
// Log what we're about to do
const nestedEntries = fs.readdirSync(nestedPath);
console.log(` 📦 Unpacking ${this.sourceFolderName}/: ${nestedEntries.length} entries in nested dir`);
console.log(` 📦 Entries: [${nestedEntries.join(', ')}]`);
// Also list the dest dir to see what TypeScript created
const destEntries = fs.readdirSync(this.destDir);
console.log(` 📦 destDir entries: [${destEntries.join(', ')}]`);
// Step 1: Clean up any leftover temp dir from a previous failed run
await FsHelpers.removeDirectory(tempPath);
// Clean up any leftover temp dir from a previous failed unpack
await fs.promises.rm(tempPath, { recursive: true, force: true });
// Step 2: Rename nested → temp
await FsHelpers.move(nestedPath, tempPath);
// Step 1: Rename the nested source folder out to a temp location.
// e.g. dist_ts/ts/ → dist_ts.__unpack_temp__/
await fs.promises.rename(nestedPath, tempPath);
// Step 3: Remove dest dir (now contains only sibling folders)
await FsHelpers.removeDirectory(this.destDir);
// Verify step 1
const tempEntries = fs.readdirSync(tempPath);
console.log(` 📦 Step 1 (rename to temp): ${tempEntries.length} entries in temp`);
// Step 2: Remove the dest dir (which now only contains sibling folders
// like ts_interfaces/). Use recursive rm to handle any contents.
await fs.promises.rm(this.destDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
console.log(` 📦 Step 2 (remove dest): done`);
// Step 3: Rename the temp dir to the dest dir.
// e.g. dist_ts.__unpack_temp__/ → dist_ts/
await fs.promises.rename(tempPath, this.destDir);
// Verify final state
const finalEntries = fs.readdirSync(this.destDir);
const finalDirs = finalEntries.filter((e: string) => {
return fs.statSync(path.join(this.destDir, e)).isDirectory();
});
console.log(` 📦 Step 3 (rename to dest): ${finalEntries.length} entries (${finalDirs.length} dirs)`);
// Step 4: Rename temp → dest
await FsHelpers.move(tempPath, this.destDir);
return true;
}