v4.1.10

changelog.md

@@ -1,5 +1,21 @@
 # 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
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tsbuild",
-  "version": "4.1.8",
+  "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",
@@ -41,7 +41,7 @@
     "@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.2.1",
     "@push.rocks/smartpath": "^6.0.0",
     "@push.rocks/smartpromise": "^4.2.3",

pnpm-lock.yaml

@@ -24,8 +24,8 @@ importers:
         specifier: ^13.1.2
         version: 13.1.2
       '@push.rocks/smartfs':
-        specifier: ^1.3.1
+        specifier: ^1.3.2
-        version: 1.3.1
+        version: 1.3.2
       '@push.rocks/smartlog':
         specifier: ^3.2.1
         version: 3.2.1
@@ -973,8 +973,8 @@ packages:
   '@push.rocks/smartfile@13.1.2':
     resolution: {integrity: sha512-DaEhwmnGEpX4coeeToaw4cZe3pNBhH7CY1iGr+d3pIXihozREvzzAR9/0i2r7bUXXL5+Lgy8YYIk5ZS+fwxMKA==}
 
-  '@push.rocks/smartfs@1.3.1':
+  '@push.rocks/smartfs@1.3.2':
-    resolution: {integrity: sha512-ZSduVS8tM+/erbyCTvRRvc9gLWwbpqN5xdIIkMr+gub7fowSeJb7tR2rnGwySa63DyimU0q2KTp79VV9YqGLeg==}
+    resolution: {integrity: sha512-Fpr4O4xb5DUMBjmgUr3TCimmt6tAjCAPefUU2isV5xexbZS0vhBNiB2GehhuvAXmXDrbQcsTgd8hs6ags6SDog==}
 
   '@push.rocks/smartguard@3.1.0':
     resolution: {integrity: sha512-J23q84f1O+TwFGmd4lrO9XLHUh2DaLXo9PN/9VmTWYzTkQDv5JehmifXVI0esophXcCIfbdIu6hbt7/aHlDF4A==}
@@ -3991,7 +3991,7 @@ snapshots:
       '@push.rocks/smartenv': 6.0.0
       '@push.rocks/smartfeed': 1.4.0
       '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
       '@push.rocks/smartjson': 5.2.0
       '@push.rocks/smartlog': 3.2.1
       '@push.rocks/smartlog-destination-devtools': 1.0.12
@@ -4870,7 +4870,7 @@ snapshots:
       '@push.rocks/npmextra': 5.3.3
       '@push.rocks/smartcli': 4.0.20
       '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
       '@push.rocks/smartinteract': 2.0.16
       '@push.rocks/smartlog': 3.2.1
       '@push.rocks/smartlog-destination-local': 9.0.2
@@ -4897,7 +4897,7 @@ snapshots:
       '@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.2.1
       '@push.rocks/smartnpm': 2.0.6
       '@push.rocks/smartpath': 6.0.0
@@ -4931,7 +4931,7 @@ snapshots:
       '@push.rocks/smartenv': 6.0.0
       '@push.rocks/smartexpect': 2.5.0
       '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
       '@push.rocks/smartjson': 6.0.0
       '@push.rocks/smartlog': 3.2.1
       '@push.rocks/smartmongo': 5.1.0(socks@2.8.7)
@@ -5610,7 +5610,7 @@ snapshots:
       '@push.rocks/lik': 6.2.2
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartfile-interfaces': 1.0.7
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
       '@push.rocks/smarthash': 3.2.6
       '@push.rocks/smartjson': 5.2.0
       '@push.rocks/smartmime': 2.0.4
@@ -5622,7 +5622,7 @@ snapshots:
       glob: 11.1.0
       js-yaml: 4.1.1
 
-  '@push.rocks/smartfs@1.3.1':
+  '@push.rocks/smartfs@1.3.2':
     dependencies:
       '@push.rocks/smartpath': 6.0.0
 
@@ -5721,7 +5721,7 @@ snapshots:
     dependencies:
       '@push.rocks/mongodump': 1.1.0(socks@2.8.7)
       '@push.rocks/smartdata': 5.16.7(socks@2.8.7)
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
       '@push.rocks/smartpath': 5.1.0
       '@push.rocks/smartpromise': 4.2.3
       '@push.rocks/smartrx': 3.0.10
@@ -5748,7 +5748,7 @@ snapshots:
     dependencies:
       '@push.rocks/mongodump': 1.1.0(socks@2.8.7)
       '@push.rocks/smartdata': 5.16.7(socks@2.8.7)
-      '@push.rocks/smartfs': 1.3.1
+      '@push.rocks/smartfs': 1.3.2
       '@push.rocks/smartpath': 5.1.0
       '@push.rocks/smartpromise': 4.2.3
       '@push.rocks/smartrx': 3.0.10

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tsbuild',
-  version: '4.1.8',
+  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/mod_fs/classes.fshelpers.ts

@@ -139,13 +139,27 @@ export class FsHelpers {
    * Remove an empty directory
    */
   public static async removeEmptyDirectory(dirPath: string): Promise<void> {
-    try {
+    // Retry rmdir with delays to handle filesystem metadata lag (XFS, NFS, etc.)
-      await fs.promises.rmdir(dirPath);
+    // NEVER use recursive rm here — if rmdir fails with ENOTEMPTY, entries may
-    } catch (err: any) {
+    // still be valid references to renamed files/dirs that haven't fully detached
-      if (err.code === 'ENOTEMPTY') {
+    for (let attempt = 0; attempt < 5; attempt++) {
-        // Filesystem metadata lag — use recursive rm as fallback
+      try {
-        await fs.promises.rm(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+        await fs.promises.rmdir(dirPath);
-      } else if (err.code !== 'ENOENT') {
+        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_unpack/classes.tsunpacker.ts

@@ -81,62 +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);
-    const dirCount = entries.filter(e => e.isDirectory).length;
-    const fileCount = entries.filter(e => e.isFile).length;
-    console.log(`   📦 Unpacking ${this.sourceFolderName}/: ${dirCount} directories, ${fileCount} files`);
-    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);
-    }
-  }
 }
 
 /**