Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e1198c0a78 | |||
| 01b2cfe69c | |||
| b38a8236da | |||
| f136fe2e40 | |||
| 5fa93923d2 | |||
| 856099b5ed | |||
| 7aec1548eb | |||
| c269039050 | |||
| 75cb613d5e | |||
| cf05229b86 | |||
| 10b8d47a55 | |||
| 52e1a25948 | |||
| 3b8ebd41f4 | |||
| 9e839b3047 | |||
| 7ce22b0c4d | |||
| b2ce02a4fb | |||
| ca27db1d75 | |||
| c8a1582ec4 |
60
changelog.md
60
changelog.md
@@ -1,5 +1,65 @@
|
||||
# Changelog
|
||||
|
||||
## 2026-03-05 - 4.1.10 - fix(unpack)
|
||||
use atomic renames to flatten nested output and make unpacking more reliable
|
||||
|
||||
- Replace per-entry moves with an atomic 3-step strategy: rename nested dir to a temp location, remove the destination dir, then rename temp back to the destination to avoid partial readdir/move under signal pressure.
|
||||
- FsHelpers.move switched from sync rename to fs.promises.rename to work with async flows.
|
||||
- Use fs.promises.rm with retries and explicit temp-dir cleanup to handle previous failed runs.
|
||||
- Add diagnostic logging and verification of intermediate states.
|
||||
- Removed the older removeSiblingDirectories and moveNestedContentsUp methods in favor of the new rename-based approach.
|
||||
|
||||
## 2026-03-05 - 4.1.9 - fix(fs)
|
||||
improve filesystem helpers: use sync rename for reliability on certain filesystems; retry rmdir with delays and avoid recursive rm; bump @push.rocks/smartfs to ^1.3.2
|
||||
|
||||
- move(): use fs.renameSync to improve reliability on XFS/mounted filesystems where async rename can be interrupted by process managers
|
||||
- removeEmptyDirectory(): retry fs.promises.rmdir up to 5 attempts with incremental delays; return on ENOENT; avoid recursive rm on ENOTEMPTY to prevent removing still-valid references
|
||||
- Dependency bump: @push.rocks/smartfs from ^1.3.1 to ^1.3.2
|
||||
|
||||
## 2026-03-05 - 4.1.8 - fix(unpack)
|
||||
catch unpack errors and add verbose unpack logging
|
||||
|
||||
- Wrap performUnpack call in the compiler to catch and log exceptions so unpack failures don't crash the process
|
||||
- Log the number of directories and files being unpacked when moving nested contents to aid debugging
|
||||
|
||||
## 2026-03-05 - 4.1.7 - fix(fs/compiler/unpack)
|
||||
robustify directory removal and remove noisy diagnostic logging
|
||||
|
||||
- Use fs.promises.rm with force, maxRetries and retryDelay in removeDirectory to reduce intermittent failures during removals.
|
||||
- Handle ENOTEMPTY in removeEmptyDirectory by falling back to a recursive rm and ignore ENOENT to avoid errors from transient filesystem metadata lag.
|
||||
- Remove several diagnostic/verbose console logs in the compiler and unpacker paths to reduce noisy output and simplify flow.
|
||||
- Short-circuit unpack logic when no nesting is detected to avoid unnecessary work and logs.
|
||||
- No public API or behavior-breaking changes; suitable for a patch release.
|
||||
|
||||
## 2026-03-05 - 4.1.6 - fix(mod_compiler)
|
||||
add diagnostic logging to report dist_ts and output directory contents after each compilation task and after import-path rewriting
|
||||
|
||||
- Adds DIAG-CROSSTASK logs to inspect dist_ts subdirectories after each task when not in quiet or JSON mode
|
||||
- Adds DIAG-FINAL logs to report directory names and file counts for each successful output dir after import-path rewriting
|
||||
- Diagnostics use dynamic fs import and are non-intrusive: gated by isQuiet/isJson and errors are ignored
|
||||
|
||||
## 2026-03-05 - 4.1.5 - fix(diagnostics)
|
||||
add diagnostic logging around compilation and unpack to aid troubleshooting
|
||||
|
||||
- Enable TypeScript CompilerOptions.listEmittedFiles to surface emitted file info
|
||||
- Log destination directory contents and emitted file/error counts after compile and after unpack (only when not quiet and not json)
|
||||
- Add unpack-specific diagnostic logs: shouldUnpack skip, detectNesting result and nestedPath, and nested/destination directory listings before removing sibling directories
|
||||
- All logs use console.log and are wrapped in try/catch to avoid throwing; changes are informational and non-breaking
|
||||
|
||||
## 2026-03-05 - 4.1.4 - fix(deps)
|
||||
bump @git.zone/tspublish dependency to ^1.11.2
|
||||
|
||||
- Updated @git.zone/tspublish from ^1.11.0 to ^1.11.2 in package.json
|
||||
|
||||
## 2026-03-04 - 4.1.3 - fix(deps)
|
||||
bump dependencies: @push.rocks/smartcli, @push.rocks/smartlog, @git.zone/tstest, and @types/node to their newer versions
|
||||
|
||||
- @push.rocks/smartcli: ^4.0.19 -> ^4.0.20
|
||||
- @push.rocks/smartlog: ^3.1.10 -> ^3.2.1
|
||||
- @git.zone/tstest: ^3.1.4 -> ^3.2.0
|
||||
- @types/node: ^25.0.3 -> ^25.3.3
|
||||
- Non-breaking dependency version bumps
|
||||
|
||||
## 2026-01-04 - 4.1.0 - feat(docs)
|
||||
update README with improved docs and monorepo/tspublish guidance; namespace and extend npmextra.json with release registries; bump several dependencies
|
||||
|
||||
|
||||
14
package.json
14
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@git.zone/tsbuild",
|
||||
"version": "4.1.1",
|
||||
"version": "4.1.10",
|
||||
"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",
|
||||
@@ -36,21 +36,21 @@
|
||||
},
|
||||
"homepage": "https://code.foss.global/git.zone/tsbuild#README",
|
||||
"dependencies": {
|
||||
"@git.zone/tspublish": "^1.11.0",
|
||||
"@git.zone/tspublish": "^1.11.2",
|
||||
"@push.rocks/early": "^4.0.4",
|
||||
"@push.rocks/smartcli": "^4.0.19",
|
||||
"@push.rocks/smartcli": "^4.0.20",
|
||||
"@push.rocks/smartdelay": "^3.0.5",
|
||||
"@push.rocks/smartfile": "^13.1.2",
|
||||
"@push.rocks/smartfs": "^1.3.1",
|
||||
"@push.rocks/smartlog": "^3.1.10",
|
||||
"@push.rocks/smartfs": "^1.3.2",
|
||||
"@push.rocks/smartlog": "^3.2.1",
|
||||
"@push.rocks/smartpath": "^6.0.0",
|
||||
"@push.rocks/smartpromise": "^4.2.3",
|
||||
"typescript": "5.9.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@git.zone/tsrun": "^2.0.1",
|
||||
"@git.zone/tstest": "^3.1.4",
|
||||
"@types/node": "^25.0.3"
|
||||
"@git.zone/tstest": "^3.2.0",
|
||||
"@types/node": "^25.3.3"
|
||||
},
|
||||
"files": [
|
||||
"ts/**/*",
|
||||
|
||||
2799
pnpm-lock.yaml
generated
2799
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@git.zone/tsbuild',
|
||||
version: '4.1.0',
|
||||
version: '4.1.10',
|
||||
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
|
||||
}
|
||||
|
||||
@@ -349,6 +349,7 @@ export class TsCompiler {
|
||||
const options: CompilerOptions = {
|
||||
...customOptions,
|
||||
outDir: destDir,
|
||||
listEmittedFiles: true,
|
||||
};
|
||||
|
||||
currentTask++;
|
||||
@@ -366,15 +367,22 @@ export class TsCompiler {
|
||||
|
||||
// Perform unpack if compilation succeeded
|
||||
if (result.errorSummary.totalErrors === 0) {
|
||||
await performUnpack(pattern, destDir, this.cwd);
|
||||
try {
|
||||
await performUnpack(pattern, destDir, this.cwd);
|
||||
} catch (unpackErr: any) {
|
||||
console.error(` ⚠️ Unpack error for ${destPath}: ${unpackErr.message}`);
|
||||
}
|
||||
|
||||
successfulOutputDirs.push(destDir);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Rewrite import paths in all output directories to handle cross-module references
|
||||
// This must happen after ALL compilations so all destination folders exist
|
||||
// Use fromProjectDirectory to detect ALL ts_* folders, not just the ones being compiled
|
||||
if (successfulOutputDirs.length > 0) {
|
||||
const rewriter = TsPathRewriter.fromGlobPatterns(globPatterns);
|
||||
const rewriter = await TsPathRewriter.fromProjectDirectory(this.cwd);
|
||||
let totalRewritten = 0;
|
||||
for (const outputDir of successfulOutputDirs) {
|
||||
totalRewritten += await rewriter.rewriteDirectory(outputDir);
|
||||
|
||||
@@ -125,7 +125,7 @@ export class FsHelpers {
|
||||
* Remove a directory recursively
|
||||
*/
|
||||
public static async removeDirectory(dirPath: string): Promise<void> {
|
||||
await fs.promises.rm(dirPath, { recursive: true });
|
||||
await fs.promises.rm(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -139,6 +139,29 @@ export class FsHelpers {
|
||||
* Remove an empty directory
|
||||
*/
|
||||
public static async removeEmptyDirectory(dirPath: string): Promise<void> {
|
||||
await fs.promises.rmdir(dirPath);
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,6 +51,39 @@ export class TsPathRewriter {
|
||||
return new TsPathRewriter(mappings);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a TsPathRewriter by auto-detecting all ts_* folders in the project directory.
|
||||
* This ensures that cross-module imports are rewritten even when compiling a single module.
|
||||
*
|
||||
* For example, if the project has ts/, ts_shared/, ts_web/ folders:
|
||||
* - ts → dist_ts
|
||||
* - ts_shared → dist_ts_shared
|
||||
* - ts_web → dist_ts_web
|
||||
*
|
||||
* @param cwd - The project root directory
|
||||
* @returns TsPathRewriter instance with all detected folder mappings
|
||||
*/
|
||||
public static async fromProjectDirectory(cwd: string): Promise<TsPathRewriter> {
|
||||
const mappings: IFolderMapping[] = [];
|
||||
|
||||
try {
|
||||
const entries = await FsHelpers.listDirectory(cwd);
|
||||
|
||||
for (const entry of entries) {
|
||||
// Match folders starting with 'ts' (ts, ts_shared, ts_web, ts_core, etc.)
|
||||
if (entry.isDirectory && /^ts(_|$)/.test(entry.name)) {
|
||||
const sourceFolder = entry.name;
|
||||
const destFolder = `dist_${sourceFolder}`;
|
||||
mappings.push({ sourceFolder, destFolder });
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// Directory listing failed, return empty mappings
|
||||
}
|
||||
|
||||
return new TsPathRewriter(mappings);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current folder mappings
|
||||
*/
|
||||
|
||||
@@ -81,59 +81,65 @@ export class TsUnpacker {
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform the unpack operation - flatten nested output directories
|
||||
* Returns true if unpacking was performed, false if skipped
|
||||
* 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
|
||||
* which are atomic at the kernel level.
|
||||
*
|
||||
* Returns true if unpacking was performed, false if skipped.
|
||||
*/
|
||||
public async unpack(): Promise<boolean> {
|
||||
// Check if we should unpack based on config
|
||||
if (!(await this.shouldUnpack())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if nested structure exists
|
||||
if (!(await this.detectNesting())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const nestedPath = this.getNestedPath();
|
||||
const tempPath = this.destDir + '.__unpack_temp__';
|
||||
|
||||
// Delete sibling folders (not the source folder)
|
||||
await this.removeSiblingDirectories();
|
||||
// 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(', ')}]`);
|
||||
|
||||
// Move contents from nested folder up
|
||||
await this.moveNestedContentsUp();
|
||||
// Clean up any leftover temp dir from a previous failed unpack
|
||||
await fs.promises.rm(tempPath, { recursive: true, force: true });
|
||||
|
||||
// Remove empty nested folder
|
||||
await FsHelpers.removeEmptyDirectory(nestedPath);
|
||||
// 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);
|
||||
|
||||
// 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)`);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove sibling directories in the destination folder
|
||||
* (directories other than the source folder being unpacked)
|
||||
*/
|
||||
private async removeSiblingDirectories(): Promise<void> {
|
||||
const entries = await FsHelpers.listDirectory(this.destDir);
|
||||
for (const entry of entries) {
|
||||
if (entry.isDirectory && entry.name !== this.sourceFolderName) {
|
||||
await FsHelpers.removeDirectory(path.join(this.destDir, entry.name));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Move contents from the nested folder up to the destination directory
|
||||
*/
|
||||
private async moveNestedContentsUp(): Promise<void> {
|
||||
const nestedPath = this.getNestedPath();
|
||||
const entries = await FsHelpers.listDirectory(nestedPath);
|
||||
for (const entry of entries) {
|
||||
const src = path.join(nestedPath, entry.name);
|
||||
const dest = path.join(this.destDir, entry.name);
|
||||
await FsHelpers.move(src, dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user