Compare commits

...

12 Commits

7 changed files with 162 additions and 115 deletions

View File

@@ -1,5 +1,52 @@
# Changelog # Changelog
## 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
- Added top-level imports: path and execSync from child_process
- Replaced require('child_process').execSync('sync') with execSync('sync') to force fs sync
- Replaced require('path').join(...) with path.join(...) when recursing directories
- Refactor is purely local/maintenance-focused (consistency and slight performance/readability improvement); no functional change expected
## 2026-03-05 - 4.1.11 - fix(mod_compiler)
flush directory entries before unpack to avoid XFS delayed-log causing partial readdir results
- Add fs import and call child_process.execSync('sync') before unpacking compiled output to force kernel-level sync
- Add syncDirectoryTree(dir) to recursively open and fsync directory file descriptors and traverse subdirectories
- Call syncDirectoryTree on the destination directory before performing unpack to ensure TypeScript writeFileSync entries are committed (prevents partial readdir results on XFS)
- Errors during directory sync are ignored to avoid breaking normal flow
## 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) ## 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 add diagnostic logging to report dist_ts and output directory contents after each compilation task and after import-path rewriting

View File

@@ -1,6 +1,6 @@
{ {
"name": "@git.zone/tsbuild", "name": "@git.zone/tsbuild",
"version": "4.1.6", "version": "4.1.12",
"private": false, "private": false,
"description": "A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.", "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", "main": "dist_ts/index.js",
@@ -41,7 +41,7 @@
"@push.rocks/smartcli": "^4.0.20", "@push.rocks/smartcli": "^4.0.20",
"@push.rocks/smartdelay": "^3.0.5", "@push.rocks/smartdelay": "^3.0.5",
"@push.rocks/smartfile": "^13.1.2", "@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/smartlog": "^3.2.1",
"@push.rocks/smartpath": "^6.0.0", "@push.rocks/smartpath": "^6.0.0",
"@push.rocks/smartpromise": "^4.2.3", "@push.rocks/smartpromise": "^4.2.3",

24
pnpm-lock.yaml generated
View File

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

View File

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

View File

@@ -1,5 +1,8 @@
import type { CompilerOptions, Diagnostic, Program } from 'typescript'; import type { CompilerOptions, Diagnostic, Program } from 'typescript';
import typescript 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 smartdelay from '@push.rocks/smartdelay';
import * as smartpromise from '@push.rocks/smartpromise'; import * as smartpromise from '@push.rocks/smartpromise';
import * as smartpath from '@push.rocks/smartpath'; import * as smartpath from '@push.rocks/smartpath';
@@ -365,48 +368,23 @@ export class TsCompiler {
emittedFiles.push(...result.emittedFiles); emittedFiles.push(...result.emittedFiles);
errorSummaries.push(result.errorSummary); errorSummaries.push(result.errorSummary);
// DIAGNOSTIC: Log directory contents after compilation
if (!isQuiet && !isJson) {
try {
const fs = await import('fs');
const dirEntries = fs.readdirSync(destDir, { withFileTypes: true });
const dirs = dirEntries.filter((e: any) => e.isDirectory()).map((e: any) => e.name).sort();
const fileCount = dirEntries.filter((e: any) => e.isFile()).length;
console.log(` 📋 [DIAG] After emit: ${dirs.length} dirs [${dirs.join(', ')}], ${fileCount} top-level files`);
console.log(` 📋 [DIAG] emittedFiles.length=${result.emittedFiles.length}, totalErrors=${result.errorSummary.totalErrors}`);
} catch (e: any) { console.log(` 📋 [DIAG] Error reading destDir: ${e.message}`); }
}
// Perform unpack if compilation succeeded // Perform unpack if compilation succeeded
if (result.errorSummary.totalErrors === 0) { if (result.errorSummary.totalErrors === 0) {
await performUnpack(pattern, destDir, this.cwd); // 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);
// DIAGNOSTIC: Log directory contents after unpack try {
if (!isQuiet && !isJson) { await performUnpack(pattern, destDir, this.cwd);
try { } catch (unpackErr: any) {
const fs = await import('fs'); console.error(` ⚠️ Unpack error for ${destPath}: ${unpackErr.message}`);
const dirEntries = fs.readdirSync(destDir, { withFileTypes: true });
const dirs = dirEntries.filter((e: any) => e.isDirectory()).map((e: any) => e.name).sort();
const fileCount = dirEntries.filter((e: any) => e.isFile()).length;
console.log(` 📋 [DIAG] After unpack: ${dirs.length} dirs [${dirs.join(', ')}], ${fileCount} top-level files`);
} catch (e: any) { console.log(` 📋 [DIAG] Error reading destDir after unpack: ${e.message}`); }
} }
successfulOutputDirs.push(destDir); successfulOutputDirs.push(destDir);
} }
// DIAGNOSTIC: Check dist_ts after each task (not just current destDir)
if (!isQuiet && !isJson) {
try {
const fs = await import('fs');
const distTsPath = require('path').join(this.cwd, 'dist_ts');
if (fs.existsSync(distTsPath)) {
const dirEntries = fs.readdirSync(distTsPath, { withFileTypes: true });
const dirs = dirEntries.filter((e: any) => e.isDirectory()).map((e: any) => e.name).sort();
console.log(` 📋 [DIAG-CROSSTASK] dist_ts after task ${currentTask}: ${dirs.length} dirs [${dirs.join(', ')}]`);
}
} catch (e: any) { /* ignore */ }
}
} }
// Rewrite import paths in all output directories to handle cross-module references // Rewrite import paths in all output directories to handle cross-module references
@@ -423,20 +401,6 @@ export class TsCompiler {
} }
} }
// DIAGNOSTIC: Check dist_ts after path rewriting
if (!isQuiet && !isJson) {
for (const outputDir of successfulOutputDirs) {
try {
const fs = await import('fs');
const dirEntries = fs.readdirSync(outputDir, { withFileTypes: true });
const dirs = dirEntries.filter((e: any) => e.isDirectory()).map((e: any) => e.name).sort();
const fileCount = dirEntries.filter((e: any) => e.isFile()).length;
const relDir = outputDir.replace(this.cwd, '').replace(/^\//, '');
console.log(` 📋 [DIAG-FINAL] ${relDir}: ${dirs.length} dirs [${dirs.join(', ')}], ${fileCount} files`);
} catch (e: any) { console.log(` 📋 [DIAG-FINAL] Error: ${e.message}`); }
}
}
// Merge all error summaries // Merge all error summaries
const finalErrorSummary = this.mergeErrorSummaries(errorSummaries); const finalErrorSummary = this.mergeErrorSummaries(errorSummaries);
@@ -540,6 +504,27 @@ export class TsCompiler {
return success; 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 * Merge multiple error summaries into one
*/ */

View File

@@ -125,7 +125,7 @@ export class FsHelpers {
* Remove a directory recursively * Remove a directory recursively
*/ */
public static async removeDirectory(dirPath: string): Promise<void> { 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 * Remove an empty directory
*/ */
public static async removeEmptyDirectory(dirPath: string): Promise<void> { 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;
}
}
} }
} }

View File

@@ -81,73 +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> { public async unpack(): Promise<boolean> {
// Check if we should unpack based on config
if (!(await this.shouldUnpack())) { if (!(await this.shouldUnpack())) {
console.log(` 📋 [DIAG-UNPACK] Skipping unpack: shouldUnpack=false`);
return false; return false;
} }
// Check if nested structure exists if (!(await this.detectNesting())) {
const hasNesting = await this.detectNesting();
console.log(` 📋 [DIAG-UNPACK] detectNesting=${hasNesting}, nestedPath=${this.getNestedPath()}`);
if (!hasNesting) {
return false; return false;
} }
const nestedPath = this.getNestedPath(); const nestedPath = this.getNestedPath();
const tempPath = this.destDir + '.__unpack_temp__';
// DIAGNOSTIC: Log contents before unpack // Log what we're about to do
try { const nestedEntries = fs.readdirSync(nestedPath);
const destEntries = fs.readdirSync(this.destDir, { withFileTypes: true }); console.log(` 📦 Unpacking ${this.sourceFolderName}/: ${nestedEntries.length} entries in nested dir`);
const destDirs = destEntries.filter(e => e.isDirectory()).map(e => e.name).sort(); console.log(` 📦 Entries: [${nestedEntries.join(', ')}]`);
console.log(` 📋 [DIAG-UNPACK] Before removeSibling: destDir dirs=[${destDirs.join(', ')}]`); // Also list the dest dir to see what TypeScript created
const nestedEntries = fs.readdirSync(nestedPath, { withFileTypes: true }); const destEntries = fs.readdirSync(this.destDir);
const nestedDirs = nestedEntries.filter(e => e.isDirectory()).map(e => e.name).sort(); console.log(` 📦 destDir entries: [${destEntries.join(', ')}]`);
const nestedFiles = nestedEntries.filter(e => e.isFile()).length;
console.log(` 📋 [DIAG-UNPACK] Nested dir (${this.sourceFolderName}/): ${nestedDirs.length} dirs [${nestedDirs.join(', ')}], ${nestedFiles} files`);
} catch (e: any) { console.log(` 📋 [DIAG-UNPACK] Error reading: ${e.message}`); }
// Delete sibling folders (not the source folder) // Clean up any leftover temp dir from a previous failed unpack
await this.removeSiblingDirectories(); await fs.promises.rm(tempPath, { recursive: true, force: true });
// Move contents from nested folder up // Step 1: Rename the nested source folder out to a temp location.
await this.moveNestedContentsUp(); // e.g. dist_ts/ts/ → dist_ts.__unpack_temp__/
await fs.promises.rename(nestedPath, tempPath);
// Remove empty nested folder // Verify step 1
await FsHelpers.removeEmptyDirectory(nestedPath); 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; 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);
}
}
} }
/** /**