fix: file indexing issue in subfolders

Author: Theryston

packages/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @jsx-mail/core
 
+## 1.0.4
+
+### Patch Changes
+
+- fixing file indexing issue in subfolders
+
 ## 1.0.3
 
 ### Patch Changes

packages/core/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "MIT",
   "description": "All jsx mail core functions. 🚀✉️",
   "main": "dist/index.js",

packages/core/src/implementations/FileSystem/index.ts

@@ -3,10 +3,16 @@ import { IDirectoryTree, IFileSystem, IFileSystemOptions } from './IFileSystem';
 import path from 'path';
 
 export class FileSystem implements IFileSystem {
+  private getAllDirectoryTree_firstBase: string;
+
   async getAllDirectoryTree(
     basePath: string,
     options?: IFileSystemOptions
   ): Promise<IDirectoryTree[]> {
+    if (!this.getAllDirectoryTree_firstBase) {
+      this.getAllDirectoryTree_firstBase = basePath;
+    }
+
     const { justFilenameInFilePath = false, fileExtensions = [] } =
       options || {};
 
@@ -31,7 +37,10 @@ export class FileSystem implements IFileSystem {
           ) {
             directoryTree.push({
               children: [],
-              path: path.basename(entityPath),
+              path: path.relative(
+                this.getAllDirectoryTree_firstBase,
+                entityPath
+              ),
               type: 'file',
             });
           }

packages/core/src/implementations/JsxTransform/index.ts

@@ -3,6 +3,8 @@ import { IFileSystem } from '../FileSystem/IFileSystem';
 import { IJsxTransform, IJsxTransformOptions } from './IJsxTransform';
 import path from 'path';
 
+const DEFAULT_DELETE_FOLDERS = ['dist'];
+
 export class JsxTransform implements IJsxTransform {
   private firstAbsoluteSourcePath: string;
 
@@ -21,6 +23,16 @@ export class JsxTransform implements IJsxTransform {
       await this.fileSystem.rm(path.join(sourcePath, outputDir));
     }
 
+    for (const DEFAULT_DELETE_FOLDER of DEFAULT_DELETE_FOLDERS) {
+      if (
+        await this.fileSystem.exists(
+          path.join(sourcePath, DEFAULT_DELETE_FOLDER)
+        )
+      ) {
+        await this.fileSystem.rm(path.join(sourcePath, DEFAULT_DELETE_FOLDER));
+      }
+    }
+
     const entities = await this.fileSystem.getAllDirectoryTree(sourcePath, {
       justFilenameInFilePath: true,
       fileExtensions: ['ts', 'js', 'jsx', 'tsx'],
@@ -32,7 +44,7 @@ export class JsxTransform implements IJsxTransform {
             await this.directory(child.path, outputDir);
           } else {
             await this.file(
-              child.path,
+              path.join(sourcePath, child.path),
               path.join(this.firstAbsoluteSourcePath, outputDir),
               options
             );