@magic/fs 0.0.28 → 0.0.29

package/README.md

@@ -296,7 +296,12 @@ update dependencies
 
 update dependencies
 
-##### 0.0.29 - unreleased
+##### 0.0.29
+
+- update dependencies
+- getFiles and getDirectories now accept maxDepth and minDepth config args
+
+##### 0.0.30 - unreleased
 
 ...
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic/fs",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "author": "Wizards & Witches",
   "description": "nodejs fs promises + goodies",
   "license": "AGPL-3.0",
@@ -33,13 +33,13 @@
   },
   "devDependencies": {
     "@magic-modules/git-badges": "0.0.12",
-    "@magic-modules/light-switch": "0.0.11",
-    "@magic-modules/no-spy": "0.0.8",
-    "@magic-modules/pre": "0.0.11",
-    "@magic-themes/docs": "0.0.14",
-    "@magic/core": "0.0.149",
-    "@magic/format": "0.0.50",
-    "@magic/test": "0.2.15"
+    "@magic-modules/light-switch": "0.0.12",
+    "@magic-modules/no-spy": "0.0.9",
+    "@magic-modules/pre": "0.0.12",
+    "@magic-themes/docs": "0.0.15",
+    "@magic/core": "0.0.155",
+    "@magic/format": "0.0.52",
+    "@magic/test": "0.2.18"
   },
   "dependencies": {
     "@magic/deep": "0.1.16",

package/src/getDirectories.mjs

@@ -20,17 +20,31 @@ export const getDirectories = async (dir, depth = {}, root = 'deprecated') => {
     root = false
   }
 
+  let minDepth = 0
+  let maxDepth = 200
+
   let noRoot = false
-  if (!is.empty(depth) && is.objectNative(depth)) {
+  if (depth === false) {
+    maxDepth = 1
+  } else if (is.number(depth)) {
+    maxDepth = depth
+  } else if (!is.empty(depth) && is.objectNative(depth)) {
     root = root || depth?.root
     noRoot = depth?.noRoot
-    depth = depth?.depth
-  }
 
-  if (depth === false) {
-    depth = 1
+    if (depth.hasOwnProperty('depth')) {
+      maxDepth = depth.depth
+    } else if (depth.hasOwnProperty('maxDepth')) {
+      maxDepth = depth.maxDepth
+    }
+
+    if (depth.hasOwnProperty('minDepth')) {
+      minDepth = depth.minDepth
+    }
   }
 
+  maxDepth = parseInt(maxDepth)
+
   if (!is.array(dir) && !is.string(dir)) {
     throw error(`${libName}: need an array or a string as first argument`, 'E_ARG_TYPE')
   }
@@ -50,17 +64,15 @@ export const getDirectories = async (dir, depth = {}, root = 'deprecated') => {
   try {
     if (is.array(dir)) {
       const dirs = await Promise.all(
-        dir.map(async f => await getDirectories(f, { depth, root, noRoot })),
+        dir.map(async f => await getDirectories(f, { maxDepth, minDepth, root, noRoot })),
       )
 
       return deep.flatten(...dirs).filter(a => a)
     }
 
-    if (is.number(depth)) {
-      const currentDepth = dir.replace(root, '').split(path.sep).length
-      if (currentDepth - 1 > depth) {
-        return []
-      }
+    const currentDepth = dir.replace(root, '').split(path.sep).length
+    if (is.number(maxDepth) && currentDepth - 1 > maxDepth) {
+      return []
     }
 
     const dirContent = await fs.readdir(dir)
@@ -71,7 +83,7 @@ export const getDirectories = async (dir, depth = {}, root = 'deprecated') => {
           throw error(`${libName}: path was not a string: ${file}`, 'E_ARG_TYPE')
         }
 
-        let filePath = await getFilePath(getDirectories, dir, file, { depth, root })
+        let filePath = await getFilePath(getDirectories, dir, file, { maxDepth, minDepth, root })
 
         if (filePath) {
           if (!is.array(filePath)) {
@@ -103,9 +115,23 @@ export const getDirectories = async (dir, depth = {}, root = 'deprecated') => {
       finalDirs = [dir, ...finalDirs]
     }
 
-    const finalized = deep.flatten(finalDirs).filter(a => a)
+    const finalized = deep.flatten(finalDirs).filter(dir => {
+      if (!dir) {
+        return false
+      }
+
+      if (is.number(minDepth)) {
+        const currentDepth = dir.replace(root, '').split(path.sep).length
+
+        return currentDepth > minDepth
+      }
+
+      return true
+    })
+
+    const unique = Array.from(new Set(finalized))
 
-    return Array.from(new Set(finalized))
+    return unique
   } catch (e) {
     if (e.code === 'ENOENT') {
       return []

package/src/getFilePath.mjs

@@ -17,9 +17,13 @@ export const getFilePath = async (fn, dir, file, depth = true, root = 'deprecate
     root = false
   }
 
+  let minDepth = 0
+  let maxDepth = 200
+
   if (!is.empty(depth) && is.objectNative(depth)) {
     root = depth.root
-    depth = depth.depth
+    maxDepth = depth?.depth || depth?.maxDepth
+    minDepth = depth?.minDepth
   }
 
   if (is.empty(fn)) {
@@ -52,8 +56,8 @@ export const getFilePath = async (fn, dir, file, depth = true, root = 'deprecate
       .split(path.sep)
       .filter(a => a).length
 
-    if (depth || currentDepth === 1) {
-      return await fn(filePath, { depth, root })
+    if (maxDepth || currentDepth === 1) {
+      return await fn(filePath, { maxDepth, minDepth, root })
     }
   } else if (stat.isFile()) {
     return filePath

package/src/getFiles.mjs

@@ -14,25 +14,35 @@ export const getFiles = async (dir, depth = true, root = 'deprecated') => {
   if (root !== 'deprecated') {
     log.warn('E_DEPRECATED', 'you have used fs.getFiles with a third argument.')
     log.info('Please use the new syntax instead:')
-    log.info("fs.getFiles(dir, { depth: true, root: false, extension: 'md' })")
+    log.info("fs.getFiles(dir, { maxDepth: 200, root: false, extension: 'md', minDepth: 0 })")
   } else {
     root = false
   }
 
+  let minDepth = 0
+  let maxDepth = 200
+
   let extension
 
+  if (depth === false) {
+    maxDepth = 1
+  } else if (is.number(depth)) {
+    maxDepth = depth
+  }
   if (!is.empty(depth) && is.objectNative(depth)) {
     root = root || depth?.root
     extension = depth?.extension
 
-    /* make sure this is the last action in this if  */
-    depth = depth?.depth
+    maxDepth = depth?.depth || depth?.maxDepth
+    minDepth = depth.minDepth
   }
 
-  if (depth === false) {
-    depth = 1
+  if (maxDepth === false) {
+    maxDepth = 1
   }
 
+  maxDepth = parseInt(maxDepth)
+
   if (is.empty(dir)) {
     throw error(`${libName}: dir: first argument can not be empty.`, 'E_ARG_EMPTY')
   }
@@ -41,31 +51,53 @@ export const getFiles = async (dir, depth = true, root = 'deprecated') => {
     throw error(`${libName}: dir: first argument must be a string.`, 'E_ARG_TYPE')
   }
 
-  if (is.empty(root) && is.number(depth)) {
+  if (is.empty(root) && is.number(maxDepth)) {
     root = dir
   }
 
-  if (is.number(depth)) {
-    const currentDepth = dir.replace(root, '').split(path.sep).length
-    if (currentDepth - 1 > depth) {
-      return []
-    }
+  const currentDepth = dir.replace(root, '').split(path.sep).length
+
+  if (is.number(maxDepth) && currentDepth - 1 > maxDepth) {
+    return []
   }
 
   try {
     const dirContent = await fs.readdir(dir)
     const files = await Promise.all(
-      dirContent.map(file => getFilePath(getFiles, dir, file, { depth, root })),
+      dirContent.map(file => getFilePath(getFiles, dir, file, { maxDepth, minDepth, root })),
     )
 
     return await Promise.all(
       deep
         .flatten(files)
         .filter(a => a)
+        /*
+         * if an extension parameter has been passed,
+         * remove the file if it does not end with extension
+         */
         .filter(a => !extension || a.endsWith(extension))
+        /*
+         * filter nonfiles
+         */
         .filter(async f => {
           const stat = await fs.stat(f)
           return stat.isFile()
+        })
+        /*
+         * filter files if depth is smaller than minDepth
+         */
+        .filter(file => {
+          if (!file) {
+            return false
+          }
+
+          if (is.number(minDepth)) {
+            const currentDepth = file.replace(root, '').split(path.sep).length
+
+            return currentDepth > minDepth
+          }
+
+          return true
         }),
     )
   } catch (e) {