@coderich/util 1.1.2 → 1.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/util",
   "main": "src/index.js",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "publishConfig": {
     "access": "public"
   },

package/src/index.js

@@ -51,19 +51,20 @@ exports.shellCommand = (cmd, ...args) => {
 
 exports.flatten = (mixed, options = {}) => {
   const maxDepth = options.depth ?? Infinity;
+  const ignorePaths = options.ignorePaths || [];
   const typeFn = options.safe ? exports.isPlainObject : exports.isPlainObjectOrArray;
 
-  return exports.map(mixed, el => (function flatten(data, obj = {}, path = [], depth = 0) {
-    if (depth <= maxDepth && typeFn(data) && Object.keys(data).length) {
+  return exports.map(mixed, el => (function flatten(data, obj = {}, path = '', depth = 0) {
+    if (depth <= maxDepth && typeFn(data) && Object.keys(data).length && !ignorePaths.some(ip => path.startsWith(ip))) {
       return Object.entries(data).reduce((o, [key, value]) => {
         const $key = options.strict && key.split('.').length > 1 ? `['${key}']` : key; // Use for lodash
         // const $key = options.strict ? key.replaceAll('.', '\\.') : key; // Use for dot-prop
-        return flatten(value, o, path.concat($key), depth + 1);
+        return flatten(value, o, path.concat($key, '.'), depth + 1);
       }, obj);
     }
 
     if (path.length) {
-      obj[path.join('.')] = data;
+      obj[path.slice(0, -1)] = data;
       return obj;
     }
 
@@ -110,19 +111,19 @@ exports.map = (mixed, fn) => {
   return isArray ? results : results[0];
 };
 
-exports.dirmap = (dir, fn = v => v) => {
+exports.dirmap = (dir, fn) => {
   const data = {};
   dir = Path.resolve(dir);
 
   FS.readdirSync(dir).forEach((filename) => {
     const { name } = Path.parse(filename);
     const path = `${dir}/${filename}`;
-    const stat = FS.statSync(path);
+    const stats = FS.statSync(path);
 
-    if (stat && stat.isDirectory()) {
-      data[name] = exports.dirmap(path, fn);
-    } else {
-      data[name] = fn(path);
+    if (stats?.isDirectory()) {
+      data[name] = { ...fn?.({ stats, path }), ...exports.dirmap(path, fn) };
+    } else if (fn) {
+      data[name] = fn({ stats, path });
     }
   });