Merge pull request #32 from SecJS/fix/len-adjust-globs-path

fix: Adjust Folder globs and Path environment for build

Author: jlenon7

README.md

@@ -134,10 +134,10 @@ console.log(existentFolder.moveSync('path/to/move'))
 // you can use getFilesByPattern method to get all files in the folder that match some pattern
 // if recursive is true, will go inside subFolders too
 const recursive = true
-console.log(existentFolder.getFilesByPattern('path/to/**/*.ts', recursive)) // [...files instance]
+console.log(existentFolder.getFilesByPattern('**/*.ts', recursive)) // [...files instance]
 
 // you can use getFoldersByPattern method to get all folders in the folder that match some pattern
-console.log(existentFolder.getFoldersByPattern('path/to/**/folder', recursive)) // [...folders instance]
+console.log(existentFolder.getFoldersByPattern('**', recursive)) // [...folders instance]
 
 // Folder uses readable streams in async methods to not block the event loop when handling huge files content
 await existentFolder.load()
@@ -156,22 +156,31 @@ await existentFolder.create()
 ```ts
 import { Path } from '@secjs/utils'
 
-// pwd method will depend if you NODE_ENV environment variable is set.
-// if you are using ci, testing or ts-development, pwd will return like this:
+// If NODE_TS is set to true, Path.pwd will always return without the build folder in the end of the path
 Path.pwd() // '/home/your/computer/path/your-project-name'
 
-// if your NODE_ENV is not set, or you are using a diffrent value from ci, testing or ts-development,
-// your pwd will return like this:
+// If NODE_TS is set to false, Path.pwd will always return with the build folder in the end of the path
 Path.pwd() // '/home/your/computer/path/your-project-name/dist'
 
-// you can change your buildFolder name using forBuildFolder method
-Path.forBuild('build').pwd()
+// You can use the method switchEnvVerify to turn off the NODE_TS environment variable verification
+Path.switchEnvVerify()
+
+// You can change the default build folder name using changeBuild method
+Path.changeBuild('build') 
 // '/home/your/computer/path/your-project-name/build'
 
-Path.pwd('/src/') // '/home/your/computer/path/your-project-name/src'
+// you can change your build folder name using forBuild method too
+Path.forBuild('buildd').pwd()
+// '/home/your/computer/path/your-project-name/buildd'
+
+Path.pwd('/src/') // '/home/your/computer/path/your-project-name/build/src'
+
+// You can use switchBuild to turn on or turn off the forceBuild parameter
+// forceBuild on
+Path.switchBuild().public() // '/home/your/computer/path/your-project-name/build/public'
 
-Path.public() // '/home/your/computer/path/your-project-name/public'
-Path.assets() // '/home/your/computer/path/your-project-name/public/assets'
+// forceBuild off
+Path.switchBuild().assets() // '/home/your/computer/path/your-project-name/public/assets'
 ```
 
 ---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@secjs/utils",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "",
   "license": "MIT",
   "author": "João Lenon",

src/Classes/Folder.ts

@@ -504,12 +504,14 @@ export class Folder {
     const files = []
 
     this._files.forEach(file => {
-      if (minimatch(file.path, Path.pwd(pattern))) {
+      if (minimatch(file.path, `${this.path}/${pattern}`)) {
         files.push(file)
       }
 
       if (recursive) {
-        files.push(...Folder.getSubFiles(this._folders, pattern))
+        files.push(
+          ...Folder.getSubFiles(this._folders, `${this.path}/${pattern}`),
+        )
       }
     })
 
@@ -526,24 +528,28 @@ export class Folder {
     const folders = []
 
     this._folders.forEach(folder => {
-      if (minimatch(folder.path, Path.pwd(pattern))) {
+      if (minimatch(folder.path, `${this.path}/${pattern}`)) {
         folders.push(folder)
       }
 
       if (recursive && folder.folders.length) {
-        folders.push(...Folder.getSubFolders(folder, recursive))
+        folders.push(
+          ...Folder.getSubFolders(folder, recursive, `${this.path}/${pattern}`),
+        )
       }
     })
 
     return folders
   }
 
   private static getSubFiles(folders: Folder[], pattern = null): File[] {
+    if (pattern) pattern = isAbsolute(pattern) ? pattern : Path.pwd(pattern)
+
     const files = []
 
     folders.forEach(folder => {
       folder.files.forEach(file => {
-        if (pattern && minimatch(file.path, Path.pwd(pattern))) {
+        if (pattern && minimatch(file.path, pattern)) {
           files.push(file)
         }
 
@@ -563,10 +569,12 @@ export class Folder {
     recursive: boolean,
     pattern = null,
   ): Folder[] {
+    if (pattern) pattern = isAbsolute(pattern) ? pattern : Path.pwd(pattern)
+
     const subFolders = []
 
     folder.folders.forEach(folder => {
-      if (pattern && minimatch(folder.path, Path.pwd(pattern))) {
+      if (pattern && minimatch(folder.path, pattern)) {
         subFolders.push(folder)
       }
 

src/Classes/Path.ts

@@ -19,20 +19,20 @@ export class Path {
     return this
   }
 
-  static switchEnvVerify() {
-    this._verifyNodeEnv = !this._verifyNodeEnv
+  static switchBuild() {
+    this._forceBuild = !this._forceBuild
 
     return this
   }
 
-  static changeBuild(name: string) {
-    this._defaultBuild = name
+  static switchEnvVerify() {
+    this._verifyNodeEnv = !this._verifyNodeEnv
 
     return this
   }
 
-  static forceBuild() {
-    this._forceBuild = true
+  static changeBuild(name: string) {
+    this._defaultBuild = name
 
     return this
   }
@@ -51,13 +51,17 @@ export class Path {
     if (this._forceBuild) {
       cwdNodePath += this.adjustSlashes(this._defaultBuild)
 
-      this._forceBuild = false
+      return cwdNodePath
     }
 
-    if (!this._forceBuild && this._verifyNodeEnv) {
-      if (['ci', 'testing', 'ts-development'].includes(process.env.NODE_ENV)) {
-        cwdNodePath += this.adjustSlashes(this._defaultBuild)
-      }
+    if (
+      !this._forceBuild &&
+      this._verifyNodeEnv &&
+      process.env.NODE_TS === 'true'
+    ) {
+      cwdNodePath += this.adjustSlashes(this._defaultBuild)
+
+      return cwdNodePath
     }
 
     return this.adjustSlashes(cwdNodePath)

src/utils/global.ts

@@ -31,24 +31,24 @@ declare global {
 
   class Path {
     static nodeCwdPath(): string
-    static forceBuild(): typeof Path
+    static switchBuild(): typeof Path
+    static switchEnvVerify(): typeof Path
+    static forBuild(name: string): typeof Path
+    static changeBuild(name: string): typeof Path
     static pwd(subPath?: string): string
     static app(subPath?: string): string
-    static switchEnvVerify(): typeof Path
     static logs(subPath?: string): string
     static start(subPath?: string): string
     static views(subPath?: string): string
-    static tests(subPath?: string): string
     static config(subPath?: string): string
+    static tests(subPath?: string): string
     static public(subPath?: string): string
     static assets(subPath?: string): string
     static storage(subPath?: string): string
-    static locales(subPath?: string): string
     static database(subPath?: string): string
+    static locales(subPath?: string): string
     static resources(subPath?: string): string
     static providers(subPath?: string): string
-    static forBuild(name: string): typeof Path
-    static changeBuild(name: string): typeof Path
   }
 
   class File {
@@ -209,7 +209,7 @@ declare global {
      * @param options.withSub Default is true
      * @param options.withFileContent Default is false
      */
-    loadSync(options?: { withSub?: boolean; withFileContent?: boolean })
+    loadSync(options?: { withSub?: boolean; withFileContent?: boolean }): Folder
     /**
      * load
      *

tests/Classes/folder.spec.ts

@@ -135,22 +135,22 @@ describe('\n Folder Class', () => {
   })
 
   it('should get all files and folders that match the pattern', async () => {
-    const files = bigFolder
-      .loadSync()
-      .getFilesByPattern('tests/folder-class-test/**/*.txt', true)
+    const files = bigFolder.loadSync().getFilesByPattern('**/*.txt', true)
 
     expect(files.length).toBe(3)
 
     files.forEach(file => expect(file.extension).toBe('.txt'))
 
-    const folders = bigFolder.getFoldersByPattern(
-      'tests/folder-class-test/big/*',
-      true,
-    )
+    const folders = bigFolder.getFoldersByPattern('*', true)
 
-    expect(folders.length).toBe(2)
+    expect(folders.length).toBe(1)
     expect(folders[0].name).toBe('hello')
-    expect(folders[1].name).toBe('nice')
+
+    const folderSubFolder = bigFolder.getFoldersByPattern('**', true)
+
+    expect(folderSubFolder.length).toBe(2)
+    expect(folderSubFolder[0].name).toBe('hello')
+    expect(folderSubFolder[1].name).toBe('nice')
   })
 
   it('should load all the files and subFolders with the files content', async () => {

tests/Classes/path.spec.ts

@@ -44,22 +44,20 @@ describe('\n Path Class', () => {
     const myMainPath = process.cwd()
     const myMainDistPath = process.cwd() + '/dist'
 
-    expect(Path.forceBuild().nodeCwdPath()).toBe(myMainDistPath)
+    Path.switchBuild()
+
+    expect(Path.nodeCwdPath()).toBe(myMainDistPath)
     expect(Path.forBuild('build').nodeCwdPath()).toBe(myMainPath + '/build')
-    expect(Path.forceBuild().nodeCwdPath()).toBe(myMainDistPath)
-    expect(Path.forceBuild().changeBuild('/test').nodeCwdPath()).toBe(
-      myMainPath + '/test',
-    )
+    expect(Path.nodeCwdPath()).toBe(myMainDistPath)
+    expect(Path.changeBuild('/test').nodeCwdPath()).toBe(myMainPath + '/test')
 
-    Path.changeBuild('/dist')
+    Path.changeBuild('/dist').switchBuild()
 
-    process.env.NODE_ENV = 'testing'
+    process.env.NODE_TS = 'true'
     expect(Path.nodeCwdPath()).toBe(myMainDistPath)
 
-    process.env.NODE_ENV = 'ts-development'
-    expect(Path.nodeCwdPath()).toBe(myMainDistPath)
+    Path.switchEnvVerify()
 
-    process.env.NODE_ENV = 'production'
     expect(Path.nodeCwdPath()).toBe(myMainPath)
   })
 })

tests/global/folder.spec.ts

@@ -138,22 +138,22 @@ describe('\n Folder Class Global', () => {
   })
 
   it('should get all files and folders that match the pattern', async () => {
-    const files = bigFolder
-      .loadSync()
-      .getFilesByPattern('tests/folder-class-global-test/**/*.txt', true)
+    const files = bigFolder.loadSync().getFilesByPattern('**/*.txt', true)
 
     expect(files.length).toBe(3)
 
     files.forEach(file => expect(file.extension).toBe('.txt'))
 
-    const folders = bigFolder.getFoldersByPattern(
-      'tests/folder-class-global-test/big/*',
-      true,
-    )
+    const folders = bigFolder.getFoldersByPattern('*', true)
 
-    expect(folders.length).toBe(2)
+    expect(folders.length).toBe(1)
     expect(folders[0].name).toBe('hello')
-    expect(folders[1].name).toBe('nice')
+
+    const folderSubFolder = bigFolder.getFoldersByPattern('**', true)
+
+    expect(folderSubFolder.length).toBe(2)
+    expect(folderSubFolder[0].name).toBe('hello')
+    expect(folderSubFolder[1].name).toBe('nice')
   })
 
   it('should load all the files and subFolders with the files content', async () => {

tests/global/path.spec.ts

@@ -44,22 +44,20 @@ describe('\n Path Class Global', () => {
     const myMainPath = process.cwd()
     const myMainDistPath = process.cwd() + '/dist'
 
-    expect(Path.forceBuild().nodeCwdPath()).toBe(myMainDistPath)
+    Path.switchBuild()
+
+    expect(Path.nodeCwdPath()).toBe(myMainDistPath)
     expect(Path.forBuild('build').nodeCwdPath()).toBe(myMainPath + '/build')
-    expect(Path.forceBuild().nodeCwdPath()).toBe(myMainDistPath)
-    expect(Path.forceBuild().changeBuild('/test').nodeCwdPath()).toBe(
-      myMainPath + '/test',
-    )
+    expect(Path.nodeCwdPath()).toBe(myMainDistPath)
+    expect(Path.changeBuild('/test').nodeCwdPath()).toBe(myMainPath + '/test')
 
-    Path.changeBuild('/dist')
+    Path.changeBuild('/dist').switchBuild()
 
-    process.env.NODE_ENV = 'testing'
+    process.env.NODE_TS = 'true'
     expect(Path.nodeCwdPath()).toBe(myMainDistPath)
 
-    process.env.NODE_ENV = 'ts-development'
-    expect(Path.nodeCwdPath()).toBe(myMainDistPath)
+    Path.switchEnvVerify()
 
-    process.env.NODE_ENV = 'production'
     expect(Path.nodeCwdPath()).toBe(myMainPath)
   })
 })