Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f5e4ad76e | |||
| 4feb074c03 | |||
| 95e4f1f036 | |||
| eaa66dff1d | |||
| 8bc4f173e5 | |||
| fba2cba8e8 | |||
| 1033996cb5 | |||
| 7e8b5c4467 | |||
| a738716d98 | |||
| d9c79ae4eb | |||
| a3255fd1fb | |||
| d6fb6e527e | |||
| 96bafec720 | |||
| 86f47ff743 | |||
| 38c134f084 | |||
| 25372bf97d | |||
| f521530eed | |||
| dd81d65958 | |||
| d1ef48560d | |||
| 49d62e20a4 | |||
| 4f8443d33f | |||
| 2fb838d1bd | |||
| b4a1ff5eab | |||
| d3e3905e7f | |||
| fe60a21c59 | |||
| 920095d008 | |||
| e1198c0a78 | |||
| 01b2cfe69c |
105
changelog.md
105
changelog.md
@@ -1,5 +1,110 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.23 - fix(mod_unpack)
|
||||||
|
handle partial readdirSync results when moving nested directory entries and add diagnostic log
|
||||||
|
|
||||||
|
- Loop over readdirSync results until the nested directory is empty to avoid missing entries from partial reads
|
||||||
|
- Count moved entries and print a diagnostic message with the final destination entry count
|
||||||
|
- Keep removal of the now-empty nested directory (fs.rmdirSync) after moving contents
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.22 - fix(mod_compiler)
|
||||||
|
improve logging of successful output directories to include a sorted list of entries and use a shortened relative path
|
||||||
|
|
||||||
|
- Adds shortDir variable to display relative path instead of repeating inline replace(this.cwd + '/')
|
||||||
|
- Appends a sorted, comma-separated list of directory entries to the log output for easier inspection
|
||||||
|
- Change located in ts/mod_compiler/classes.tscompiler.ts
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.21 - fix(compiler)
|
||||||
|
log emitted files written outside expected destination directory for diagnostics
|
||||||
|
|
||||||
|
- Adds diagnostic logging for emitted files that are not under the configured destDir, listing up to 20 example paths and reporting the remaining count.
|
||||||
|
- Logging is conditional: only when not in quiet mode and not emitting JSON.
|
||||||
|
- Diagnostic runs after compilation (post-compile) and before unpacking of outputs; paths are trimmed using the process cwd for readability.
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.20 - fix(mod_compiler)
|
||||||
|
add diagnostic snapshots for output directories around clear and compile steps
|
||||||
|
|
||||||
|
- Introduce diagSnap helper to log entry and directory counts for successful output directories when not in quiet or JSON mode
|
||||||
|
- Call diagSnap before clearing the destination directory, after clearing, and after compilation to aid debugging of missing or unexpected outputs
|
||||||
|
- Behavior for emitted files and unpacking is unchanged; this is observational/logging-only instrumentation
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.19 - fix(mod_fs)
|
||||||
|
use synchronous rm to avoid XFS metadata corruption when removing directories
|
||||||
|
|
||||||
|
- Replaced async fs.promises.rm with synchronous fs.rmSync in removeDirectory to avoid observed XFS metadata corruption affecting sibling entries under libuv thread-pool and signal pressure
|
||||||
|
- Retains previous options: recursive, force, maxRetries, retryDelay
|
||||||
|
- Adds inline comment documenting the rationale for using a synchronous removal
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.18 - fix(mod_compiler)
|
||||||
|
add diagnostic logging of output directory states after compilation and after import-path rewriting to aid debugging
|
||||||
|
|
||||||
|
- Imported fs to allow reading output directories for diagnostics
|
||||||
|
- Logs entries and directory counts for each successful output directory both pre- and post-import-path-rewrite
|
||||||
|
- Diagnostics are gated by !isQuiet && !isJson and are read-only (no behavior change)
|
||||||
|
- Tags used: 'diag' (post-compilation) and 'diag-post-rewrite' (after rewriting) to help identify missing or unexpected output folders
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.17 - fix(tsunpacker)
|
||||||
|
use synchronous fs operations in tsunpacker to avoid readdir race conditions
|
||||||
|
|
||||||
|
- Replaced async fs.promises.readdir/rename/rm/rmdir loops with fs.readdirSync/renameSync/rmSync/rmdirSync
|
||||||
|
- Removed readdir retry loops that attempted to handle partial/stale readdir results
|
||||||
|
- Updated comment to document rationale: avoid race conditions under signal pressure and XFS metadata lag
|
||||||
|
- Note: function remains async but now performs blocking sync filesystem calls which may block the event loop during unpack
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.16 - fix(mod_unpack)
|
||||||
|
handle partial readdir results from signal-interrupted getdents64 when unpacking to ensure sibling removal and nested moves complete
|
||||||
|
|
||||||
|
- Loop readdir calls for destination directory until only the source folder remains to avoid partial-listing leftovers
|
||||||
|
- Loop readdir calls for nested directory and repeatedly rename entries until the nested directory is empty
|
||||||
|
- Prevents leftover files and incomplete moves when readdir returns partial results under signals
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.15 - fix(mod_unpack)
|
||||||
|
flatten nested output directory without temporary rename steps to avoid race conditions
|
||||||
|
|
||||||
|
- Replace rename-rm-rename strategy with: remove sibling entries in destination, move nested source entries up into the destination, then remove the now-empty nested folder.
|
||||||
|
- Avoid creating temporary sibling directories and avoid removing the destination directory to reduce filesystem race conditions and metadata lag issues (XFS/NFS/etc.).
|
||||||
|
- Remove removed removeEmptyDirectory helper and stop using FsHelpers.move/removeDirectory in unpack; import and use fs.promises methods (readdir, rm, rename, rmdir) directly.
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
- 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)
|
## 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
|
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
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@git.zone/tsbuild",
|
"name": "@git.zone/tsbuild",
|
||||||
"version": "4.1.9",
|
"version": "4.1.23",
|
||||||
"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",
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@git.zone/tsbuild',
|
name: '@git.zone/tsbuild',
|
||||||
version: '4.1.9',
|
version: '4.1.23',
|
||||||
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.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
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 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';
|
||||||
@@ -337,13 +338,31 @@ export class TsCompiler {
|
|||||||
// Get destination directory as absolute path
|
// Get destination directory as absolute path
|
||||||
const destDir = smartpath.transform.toAbsolute(destPath, this.cwd) as string;
|
const destDir = smartpath.transform.toAbsolute(destPath, this.cwd) as string;
|
||||||
|
|
||||||
|
// Diagnostic helper
|
||||||
|
const diagSnap = (label: string) => {
|
||||||
|
if (!isQuiet && !isJson) {
|
||||||
|
for (const prevDir of successfulOutputDirs) {
|
||||||
|
try {
|
||||||
|
const entries = fs.readdirSync(prevDir);
|
||||||
|
const dirs = entries.filter(e => { try { return fs.statSync(prevDir + '/' + e).isDirectory(); } catch { return false; } });
|
||||||
|
const shortDir = prevDir.replace(this.cwd + '/', '');
|
||||||
|
console.log(` 📋 [${label}] ${shortDir}: ${entries.length} entries, ${dirs.length} dirs [${entries.sort().join(', ')}]`);
|
||||||
|
} catch {
|
||||||
|
console.log(` 📋 [${label}] ${prevDir.replace(this.cwd + '/', '')}: MISSING!`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Clear the destination directory before compilation if it exists
|
// Clear the destination directory before compilation if it exists
|
||||||
|
diagSnap('pre-clear');
|
||||||
if (await FsHelpers.directoryExists(destDir)) {
|
if (await FsHelpers.directoryExists(destDir)) {
|
||||||
if (!isQuiet && !isJson) {
|
if (!isQuiet && !isJson) {
|
||||||
console.log(`🧹 Clearing output directory: ${destPath}`);
|
console.log(`🧹 Clearing output directory: ${destPath}`);
|
||||||
}
|
}
|
||||||
await FsHelpers.removeDirectory(destDir);
|
await FsHelpers.removeDirectory(destDir);
|
||||||
}
|
}
|
||||||
|
diagSnap('post-clear');
|
||||||
|
|
||||||
// Update compiler options with the output directory
|
// Update compiler options with the output directory
|
||||||
const options: CompilerOptions = {
|
const options: CompilerOptions = {
|
||||||
@@ -364,18 +383,43 @@ export class TsCompiler {
|
|||||||
const result = await this.compileFiles(absoluteFiles, options, taskInfo);
|
const result = await this.compileFiles(absoluteFiles, options, taskInfo);
|
||||||
emittedFiles.push(...result.emittedFiles);
|
emittedFiles.push(...result.emittedFiles);
|
||||||
errorSummaries.push(result.errorSummary);
|
errorSummaries.push(result.errorSummary);
|
||||||
|
diagSnap('post-compile');
|
||||||
|
|
||||||
|
// Diagnostic: log emitted files that went to unexpected directories
|
||||||
|
if (!isQuiet && !isJson && result.emittedFiles.length > 0) {
|
||||||
|
const unexpectedFiles = result.emittedFiles.filter(f => !f.startsWith(destDir + '/') && !f.startsWith(destDir + '\\'));
|
||||||
|
if (unexpectedFiles.length > 0) {
|
||||||
|
console.log(` ⚠️ [diag] ${unexpectedFiles.length} files emitted OUTSIDE ${destPath}:`);
|
||||||
|
for (const f of unexpectedFiles.slice(0, 20)) {
|
||||||
|
console.log(` ${f.replace(this.cwd + '/', '')}`);
|
||||||
|
}
|
||||||
|
if (unexpectedFiles.length > 20) {
|
||||||
|
console.log(` ... and ${unexpectedFiles.length - 20} more`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Perform unpack if compilation succeeded
|
// Perform unpack if compilation succeeded
|
||||||
if (result.errorSummary.totalErrors === 0) {
|
if (result.errorSummary.totalErrors === 0) {
|
||||||
try {
|
await performUnpack(pattern, destDir, this.cwd);
|
||||||
await performUnpack(pattern, destDir, this.cwd);
|
|
||||||
} catch (unpackErr: any) {
|
|
||||||
console.error(` ⚠️ Unpack error for ${destPath}: ${unpackErr.message}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
successfulOutputDirs.push(destDir);
|
successfulOutputDirs.push(destDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Diagnostic: log all output directory states after each compilation
|
||||||
|
if (!isQuiet && !isJson) {
|
||||||
|
for (const prevDir of successfulOutputDirs) {
|
||||||
|
try {
|
||||||
|
const entries = fs.readdirSync(prevDir);
|
||||||
|
const dirs = entries.filter(e => {
|
||||||
|
try { return fs.statSync(prevDir + '/' + e).isDirectory(); } catch { return false; }
|
||||||
|
});
|
||||||
|
console.log(` 📋 [diag] ${prevDir.replace(this.cwd + '/', '')}: ${entries.length} entries, ${dirs.length} dirs`);
|
||||||
|
} catch {
|
||||||
|
console.log(` 📋 [diag] ${prevDir.replace(this.cwd + '/', '')}: MISSING!`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rewrite import paths in all output directories to handle cross-module references
|
// Rewrite import paths in all output directories to handle cross-module references
|
||||||
@@ -390,6 +434,21 @@ export class TsCompiler {
|
|||||||
if (totalRewritten > 0 && !isQuiet && !isJson) {
|
if (totalRewritten > 0 && !isQuiet && !isJson) {
|
||||||
console.log(` 🔄 Rewrote import paths in ${totalRewritten} file${totalRewritten !== 1 ? 's' : ''}`);
|
console.log(` 🔄 Rewrote import paths in ${totalRewritten} file${totalRewritten !== 1 ? 's' : ''}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Diagnostic: log output directory states after path rewriting
|
||||||
|
if (!isQuiet && !isJson) {
|
||||||
|
for (const dir of successfulOutputDirs) {
|
||||||
|
try {
|
||||||
|
const entries = fs.readdirSync(dir);
|
||||||
|
const dirs = entries.filter(e => {
|
||||||
|
try { return fs.statSync(dir + '/' + e).isDirectory(); } catch { return false; }
|
||||||
|
});
|
||||||
|
console.log(` 📋 [diag-post-rewrite] ${dir.replace(this.cwd + '/', '')}: ${entries.length} entries, ${dirs.length} dirs`);
|
||||||
|
} catch {
|
||||||
|
console.log(` 📋 [diag-post-rewrite] ${dir.replace(this.cwd + '/', '')}: MISSING!`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge all error summaries
|
// Merge all error summaries
|
||||||
|
|||||||
@@ -122,48 +122,19 @@ export class FsHelpers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove a directory recursively
|
* Remove a directory recursively.
|
||||||
|
* Uses synchronous rm to avoid XFS metadata corruption observed with
|
||||||
|
* async fs.promises.rm affecting sibling directory entries on the
|
||||||
|
* libuv thread pool under signal pressure.
|
||||||
*/
|
*/
|
||||||
public static async removeDirectory(dirPath: string): Promise<void> {
|
public static async removeDirectory(dirPath: string): Promise<void> {
|
||||||
await fs.promises.rm(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
fs.rmSync(dirPath, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Move/rename a file or directory
|
* Move/rename a file or directory
|
||||||
* Uses renameSync for reliability on XFS/mounted filesystems where async
|
|
||||||
* rename can be interrupted by signals from process managers
|
|
||||||
*/
|
*/
|
||||||
public static async move(src: string, dest: string): Promise<void> {
|
public static async move(src: string, dest: string): Promise<void> {
|
||||||
fs.renameSync(src, dest);
|
await fs.promises.rename(src, dest);
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove an empty directory
|
|
||||||
*/
|
|
||||||
public static async removeEmptyDirectory(dirPath: string): Promise<void> {
|
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,61 +81,63 @@ 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
|
*
|
||||||
|
* When TypeScript compiles files that import from sibling directories,
|
||||||
|
* it creates a nested structure like dist_ts/ts/ with siblings like
|
||||||
|
* dist_ts/ts_interfaces/. This method flattens by:
|
||||||
|
* 1. Removing sibling directories (non-source folders)
|
||||||
|
* 2. Moving contents of the nested source folder up to the dest dir
|
||||||
|
* 3. Removing the now-empty nested source folder
|
||||||
|
*
|
||||||
|
* Uses synchronous fs operations to avoid race conditions with
|
||||||
|
* async readdir returning partial/stale results under signal pressure
|
||||||
|
* or XFS metadata lag (observed in process-group environments like gitzone).
|
||||||
|
*
|
||||||
|
* 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())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if nested structure exists
|
|
||||||
if (!(await this.detectNesting())) {
|
if (!(await this.detectNesting())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const nestedPath = this.getNestedPath();
|
const nestedPath = this.getNestedPath();
|
||||||
|
|
||||||
// Delete sibling folders (not the source folder)
|
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
||||||
await this.removeSiblingDirectories();
|
const destEntries = fs.readdirSync(this.destDir);
|
||||||
|
for (const entry of destEntries) {
|
||||||
// Move contents from nested folder up
|
if (entry !== this.sourceFolderName) {
|
||||||
await this.moveNestedContentsUp();
|
fs.rmSync(path.join(this.destDir, entry), { recursive: true, force: true });
|
||||||
|
|
||||||
// Remove empty nested folder
|
|
||||||
await FsHelpers.removeEmptyDirectory(nestedPath);
|
|
||||||
|
|
||||||
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));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
// Step 2: Move all contents from nested dir up to dest dir
|
||||||
* Move contents from the nested folder up to the destination directory
|
// Use a loop to handle any partial readdirSync results
|
||||||
*/
|
let moved = 0;
|
||||||
private async moveNestedContentsUp(): Promise<void> {
|
while (true) {
|
||||||
const nestedPath = this.getNestedPath();
|
const entries = fs.readdirSync(nestedPath);
|
||||||
const entries = await FsHelpers.listDirectory(nestedPath);
|
if (entries.length === 0) break;
|
||||||
const dirCount = entries.filter(e => e.isDirectory).length;
|
for (const entry of entries) {
|
||||||
const fileCount = entries.filter(e => e.isFile).length;
|
fs.renameSync(
|
||||||
console.log(` 📦 Unpacking ${this.sourceFolderName}/: ${dirCount} directories, ${fileCount} files`);
|
path.join(nestedPath, entry),
|
||||||
for (const entry of entries) {
|
path.join(this.destDir, entry),
|
||||||
const src = path.join(nestedPath, entry.name);
|
);
|
||||||
const dest = path.join(this.destDir, entry.name);
|
moved++;
|
||||||
await FsHelpers.move(src, dest);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Step 3: Remove the now-empty nested directory
|
||||||
|
fs.rmdirSync(nestedPath);
|
||||||
|
|
||||||
|
// Diagnostic: verify final state
|
||||||
|
const finalEntries = fs.readdirSync(this.destDir);
|
||||||
|
console.log(` 📦 Unpacked ${this.sourceFolderName}: moved ${moved} entries, final: ${finalEntries.length} entries`);
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user