Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b38a8236da | |||
| f136fe2e40 | |||
| 5fa93923d2 | |||
| 856099b5ed | |||
| 7aec1548eb | |||
| c269039050 |
22
changelog.md
22
changelog.md
@@ -1,5 +1,27 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@git.zone/tsbuild",
|
"name": "@git.zone/tsbuild",
|
||||||
"version": "4.1.6",
|
"version": "4.1.9",
|
||||||
"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
24
pnpm-lock.yaml
generated
@@ -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
|
||||||
|
|||||||
@@ -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.9',
|
||||||
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.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -365,48 +365,17 @@ 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);
|
|
||||||
|
|
||||||
// DIAGNOSTIC: Log directory contents after unpack
|
|
||||||
if (!isQuiet && !isJson) {
|
|
||||||
try {
|
try {
|
||||||
const fs = await import('fs');
|
await performUnpack(pattern, destDir, this.cwd);
|
||||||
const dirEntries = fs.readdirSync(destDir, { withFileTypes: true });
|
} catch (unpackErr: any) {
|
||||||
const dirs = dirEntries.filter((e: any) => e.isDirectory()).map((e: any) => e.name).sort();
|
console.error(` ⚠️ Unpack error for ${destPath}: ${unpackErr.message}`);
|
||||||
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 +392,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);
|
||||||
|
|
||||||
|
|||||||
@@ -125,20 +125,45 @@ 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 });
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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> {
|
||||||
await fs.promises.rename(src, dest);
|
fs.renameSync(src, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove an empty directory
|
* Remove an empty directory
|
||||||
*/
|
*/
|
||||||
public static async removeEmptyDirectory(dirPath: string): Promise<void> {
|
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);
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,30 +87,16 @@ export class TsUnpacker {
|
|||||||
public async unpack(): Promise<boolean> {
|
public async unpack(): Promise<boolean> {
|
||||||
// Check if we should unpack based on config
|
// 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
|
// Check if nested structure exists
|
||||||
const hasNesting = await this.detectNesting();
|
if (!(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();
|
||||||
|
|
||||||
// DIAGNOSTIC: Log contents before unpack
|
|
||||||
try {
|
|
||||||
const destEntries = fs.readdirSync(this.destDir, { withFileTypes: true });
|
|
||||||
const destDirs = destEntries.filter(e => e.isDirectory()).map(e => e.name).sort();
|
|
||||||
console.log(` 📋 [DIAG-UNPACK] Before removeSibling: destDir dirs=[${destDirs.join(', ')}]`);
|
|
||||||
const nestedEntries = fs.readdirSync(nestedPath, { withFileTypes: true });
|
|
||||||
const nestedDirs = nestedEntries.filter(e => e.isDirectory()).map(e => e.name).sort();
|
|
||||||
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)
|
// Delete sibling folders (not the source folder)
|
||||||
await this.removeSiblingDirectories();
|
await this.removeSiblingDirectories();
|
||||||
|
|
||||||
@@ -142,6 +128,9 @@ export class TsUnpacker {
|
|||||||
private async moveNestedContentsUp(): Promise<void> {
|
private async moveNestedContentsUp(): Promise<void> {
|
||||||
const nestedPath = this.getNestedPath();
|
const nestedPath = this.getNestedPath();
|
||||||
const entries = await FsHelpers.listDirectory(nestedPath);
|
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) {
|
for (const entry of entries) {
|
||||||
const src = path.join(nestedPath, entry.name);
|
const src = path.join(nestedPath, entry.name);
|
||||||
const dest = path.join(this.destDir, entry.name);
|
const dest = path.join(this.destDir, entry.name);
|
||||||
|
|||||||
Reference in New Issue
Block a user