Merge branch 'release/1.4.4'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Toolbox Utils - CHANGELOG
 
+*1.4.4* (2018-07-19)
+  - 🔨 simplify docs tree preparation (6b2b4ec)
+
 *1.4.3* (2018-07-19)
   - ✨ add documentation custom structure (6e0ef93)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolbox-utils",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Resources for generator-toolbox",
   "license": "MIT",
   "engines": {

tasks/helpers.js

@@ -24,24 +24,22 @@ module.exports.projectPath = config.project;
 
 const treeMaker = (dir) => {
   return new Promise((resolve, reject) => {
-    const children = {};
+    const children = [];
 
     fs.readdir(dir, async (err, list) => {
       if (err) reject();
-      children.f = [];
 
       for (let child of list) {
         const childPath = `${dir}/${child}`;
         const isDir = fs.lstatSync(childPath).isDirectory();
 
-
         if (isDir) {
           const subtree = await treeMaker(childPath);
-          children[child] = subtree;
+          children.push({ [child]: subtree });
         } else {
           const valideExts = ['.md', '.html'];
           const fileExt = path.extname(child);
-          if (valideExts.includes(fileExt)) children.f.push(child);
+          if (valideExts.includes(fileExt)) children.push(child);
         }
       };
 

tasks/prepare.js

@@ -53,24 +53,7 @@ const prepare = async (done) => {
   let docFiles = {};
   const summaryPath = `${config.project}/docs/summary.yml`;
   if (fs.pathExistsSync(summaryPath)) {
-    // const summary = fs.readFileSync(summaryPath, 'utf8');
-    const summary = yaml.load(summaryPath);
-    const formatSummary = array => {
-      const output = {};
-      output.f = [];
-
-      array.forEach(item => {
-        if (typeof item === 'string') output.f.push(item);
-        if (typeof item === 'object') {
-          const key = Object.keys(item)[0];
-          output[key] = formatSummary(item[key]);
-        }
-      });
-
-      return output;
-    };
-
-    docFiles = formatSummary(summary);
+    docFiles = yaml.load(summaryPath);
   } else {
     docFiles = await dirTree(`${config.project}/docs`);
   }