v4.1.10

Previously only mapped folders from the current compilation glob patterns.
Now scans project directory for all ts_* folders to ensure imports like
'../ts_shared/' are rewritten to '../dist_ts_shared/' even when compiling
only the main ts/ folder.

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
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tsbuild",
-  "version": "4.1.0",
+  "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/smartfs": "^1.3.2",
-    "@push.rocks/smartlog": "^3.1.10",
+    "@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",
+    "@git.zone/tstest": "^3.2.0",
-    "@types/node": "^25.0.3"
+    "@types/node": "^25.3.3"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -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.'
 }

ts/index.ts

@@ -5,6 +5,7 @@ early.start('tsbuild');
 export * from './mod_fs/index.js';
 export * from './mod_config/index.js';
 export * from './mod_unpack/index.js';
+export * from './mod_pathrewrite/index.js';
 export * from './mod_compiler/index.js';
 export * from './mod_cli/index.js';
 

ts/mod_compiler/classes.tscompiler.ts

@@ -7,6 +7,7 @@ import * as smartpath from '@push.rocks/smartpath';
 import { TsConfig } from '../mod_config/index.js';
 import { FsHelpers } from '../mod_fs/index.js';
 import { performUnpack } from '../mod_unpack/index.js';
+import { TsPathRewriter } from '../mod_pathrewrite/index.js';
 
 /**
  * Interface for error summary data
@@ -307,6 +308,7 @@ export class TsCompiler {
   ): Promise<ICompileResult> {
     const emittedFiles: string[] = [];
     const errorSummaries: IErrorSummary[] = [];
+    const successfulOutputDirs: string[] = [];
 
     const totalTasks = Object.keys(globPatterns).length;
     let currentTask = 0;
@@ -347,6 +349,7 @@ export class TsCompiler {
       const options: CompilerOptions = {
         ...customOptions,
         outDir: destDir,
+        listEmittedFiles: true,
       };
 
       currentTask++;
@@ -364,7 +367,28 @@ 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 = await TsPathRewriter.fromProjectDirectory(this.cwd);
+      let totalRewritten = 0;
+      for (const outputDir of successfulOutputDirs) {
+        totalRewritten += await rewriter.rewriteDirectory(outputDir);
+      }
+      if (totalRewritten > 0 && !isQuiet && !isJson) {
+        console.log(`   🔄 Rewrote import paths in ${totalRewritten} file${totalRewritten !== 1 ? 's' : ''}`);
       }
     }
 

ts/mod_fs/classes.fshelpers.ts

@@ -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;
+      }
+    }
   }
 }

ts/mod_pathrewrite/classes.tspathrewriter.ts

@@ -0,0 +1,233 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { FsHelpers } from '../mod_fs/index.js';
+
+/**
+ * Interface for folder mapping between source and destination
+ */
+export interface IFolderMapping {
+  sourceFolder: string;  // e.g., 'ts_shared'
+  destFolder: string;    // e.g., 'dist_ts_shared'
+}
+
+/**
+ * TsPathRewriter handles rewriting import paths in compiled JavaScript files.
+ *
+ * When TypeScript compiles files that import from sibling directories like:
+ *   import { helper } from '../ts_shared/helper.js';
+ *
+ * This class rewrites them to point to the compiled output directories:
+ *   import { helper } from '../dist_ts_shared/helper.js';
+ *
+ * This is necessary because the unpack feature flattens nested output structures,
+ * changing the relative paths between modules.
+ */
+export class TsPathRewriter {
+  private mappings: IFolderMapping[];
+
+  constructor(mappings: IFolderMapping[]) {
+    this.mappings = mappings;
+  }
+
+  /**
+   * Create a TsPathRewriter from glob patterns used in compilation
+   *
+   * @param globPatterns - Map of source patterns to destination directories
+   *   e.g., { './ts_core/**\/*.ts': './dist_ts_core', './ts_shared/**\/*.ts': './dist_ts_shared' }
+   * @returns TsPathRewriter instance with extracted folder mappings
+   */
+  public static fromGlobPatterns(globPatterns: Record<string, string>): TsPathRewriter {
+    const mappings: IFolderMapping[] = [];
+
+    for (const [sourcePattern, destDir] of Object.entries(globPatterns)) {
+      const sourceFolder = FsHelpers.extractSourceFolder(sourcePattern);
+      const destFolder = FsHelpers.extractSourceFolder(destDir);
+
+      if (sourceFolder && destFolder) {
+        mappings.push({ sourceFolder, destFolder });
+      }
+    }
+
+    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
+   */
+  public getMappings(): IFolderMapping[] {
+    return [...this.mappings];
+  }
+
+  /**
+   * Rewrite import paths in a single file
+   *
+   * @param filePath - Absolute path to the file to rewrite
+   * @returns true if file was modified, false otherwise
+   */
+  public async rewriteFile(filePath: string): Promise<boolean> {
+    // Only process .js and .d.ts files
+    if (!filePath.endsWith('.js') && !filePath.endsWith('.d.ts')) {
+      return false;
+    }
+
+    try {
+      const content = await fs.promises.readFile(filePath, 'utf8');
+      const rewritten = this.rewriteContent(content);
+
+      if (rewritten !== content) {
+        await fs.promises.writeFile(filePath, rewritten, 'utf8');
+        return true;
+      }
+
+      return false;
+    } catch (error) {
+      // File doesn't exist or other error
+      return false;
+    }
+  }
+
+  /**
+   * Rewrite import paths in all .js and .d.ts files in a directory (recursively)
+   *
+   * @param dirPath - Absolute path to the directory
+   * @returns Number of files modified
+   */
+  public async rewriteDirectory(dirPath: string): Promise<number> {
+    let modifiedCount = 0;
+
+    const processDir = async (currentDir: string): Promise<void> => {
+      const entries = await FsHelpers.listDirectory(currentDir);
+
+      for (const entry of entries) {
+        const fullPath = path.join(currentDir, entry.name);
+
+        if (entry.isDirectory) {
+          await processDir(fullPath);
+        } else if (entry.isFile && (entry.name.endsWith('.js') || entry.name.endsWith('.d.ts'))) {
+          const wasModified = await this.rewriteFile(fullPath);
+          if (wasModified) {
+            modifiedCount++;
+          }
+        }
+      }
+    };
+
+    if (await FsHelpers.directoryExists(dirPath)) {
+      await processDir(dirPath);
+    }
+
+    return modifiedCount;
+  }
+
+  /**
+   * Rewrite import paths in content string
+   *
+   * This method only modifies actual import/export/require statements,
+   * not arbitrary strings or comments that might contain similar patterns.
+   *
+   * @param content - File content to process
+   * @returns Rewritten content
+   */
+  public rewriteContent(content: string): string {
+    if (this.mappings.length === 0) {
+      return content;
+    }
+
+    let result = content;
+
+    for (const { sourceFolder, destFolder } of this.mappings) {
+      // Skip if source and dest are the same
+      if (sourceFolder === destFolder) {
+        continue;
+      }
+
+      // Pattern 1: ES Module imports/exports with 'from'
+      // Matches: from '../ts_shared/...' or from '../../ts_shared/...'
+      // Also handles: export { x } from '../ts_shared/...'
+      const fromPattern = new RegExp(
+        `(from\\s*['"])((?:\\.\\.\\/)+)${this.escapeRegex(sourceFolder)}(\\/[^'"]*['"])`,
+        'g'
+      );
+      result = result.replace(fromPattern, `$1$2${destFolder}$3`);
+
+      // Pattern 2: Dynamic imports
+      // Matches: import('../ts_shared/...')
+      const dynamicImportPattern = new RegExp(
+        `(import\\s*\\(\\s*['"])((?:\\.\\.\\/)+)${this.escapeRegex(sourceFolder)}(\\/[^'"]*['"]\\s*\\))`,
+        'g'
+      );
+      result = result.replace(dynamicImportPattern, `$1$2${destFolder}$3`);
+
+      // Pattern 3: CommonJS require
+      // Matches: require('../ts_shared/...')
+      const requirePattern = new RegExp(
+        `(require\\s*\\(\\s*['"])((?:\\.\\.\\/)+)${this.escapeRegex(sourceFolder)}(\\/[^'"]*['"]\\s*\\))`,
+        'g'
+      );
+      result = result.replace(requirePattern, `$1$2${destFolder}$3`);
+    }
+
+    return result;
+  }
+
+  /**
+   * Escape special regex characters in a string
+   */
+  private escapeRegex(str: string): string {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  }
+}
+
+/**
+ * Convenience function to rewrite import paths in output directories
+ *
+ * @param globPatterns - Map of source patterns to destination directories
+ * @param outputDirs - List of output directories to process
+ * @returns Total number of files modified
+ */
+export async function rewriteImportPaths(
+  globPatterns: Record<string, string>,
+  outputDirs: string[]
+): Promise<number> {
+  const rewriter = TsPathRewriter.fromGlobPatterns(globPatterns);
+  let totalModified = 0;
+
+  for (const dir of outputDirs) {
+    totalModified += await rewriter.rewriteDirectory(dir);
+  }
+
+  return totalModified;
+}

ts/mod_pathrewrite/index.ts

@@ -0,0 +1 @@
+export * from './classes.tspathrewriter.js';

ts/mod_unpack/classes.tsunpacker.ts

@@ -81,59 +81,65 @@ export class TsUnpacker {
   }
 
   /**
-   * Perform the unpack operation - flatten nested output directories
+   * Perform the unpack operation - flatten nested output directories.
-   * Returns true if unpacking was performed, false if skipped
+   *
+   * 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)
+    // Log what we're about to do
-    await this.removeSiblingDirectories();
+    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
+    // Clean up any leftover temp dir from a previous failed unpack
-    await this.moveNestedContentsUp();
+    await fs.promises.rm(tempPath, { recursive: true, force: true });
 
-    // Remove empty nested folder
+    // Step 1: Rename the nested source folder out to a temp location.
-    await FsHelpers.removeEmptyDirectory(nestedPath);
+    //         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);
-    }
-  }
 }
 
 /**