Merge pull request #61 from pwa-builder/flatten_directory

functions to flatten the directory structure

Author: JudahGabriel

lib/fileTools.js

@@ -154,6 +154,58 @@ function searchFile (dir, fileName, callback) {
   });
 }
 
+// uses the folderScanSync to grab absolute paths of all files and folders, deleting folders (deepest first) and moving files to the target
+// requires an absolute path for sourcePath and targetFolderPath.
+function flattenFolderStructureSync(sourcePath, targetFolderPath, callback) {
+  return Q.resolve().then(function () {
+    var output = folderScanSync(sourcePath);
+
+    // move/copy files
+    output.files.forEach(file => {
+      fs.renameSync(file, path.resolve(targetFolderPath, path.parse(file).base), (err) => {
+        return callback(err);
+      });
+    });
+
+    // remove directories
+    output.folders.forEach(folder => {
+      fs.rmdirSync(folder, (err) => {
+        callback(err);
+      });
+    });
+
+    return Q.resolve();
+  }).nodeify(callback);
+}
+
+// queues new entries into the unexplored paths, and iterates through it, execution stops when all reaches end.
+// output is an object: { files: [], folders: [] }, the order of the files and object is reversed of traversal order
+function folderScanSync(directory) {
+  const unexplored = [directory];
+  const folders = [];
+  const files = [];
+
+  for (let i = 0; i < unexplored.length; i++) {
+    const currentPath = unexplored[i];
+    fs.readdirSync(currentPath)
+      .forEach(function (fileEntry) {
+        var fileEntryPath = path.join(currentPath, fileEntry);
+
+        if (fs.statSync(fileEntryPath).isDirectory()) {
+          unexplored.push(fileEntryPath);
+          folders.push(fileEntryPath);
+        } else {
+          files.push(fileEntryPath);
+        }
+    });
+  }
+
+  return {
+    folders: folders.reverse(),
+    files: files.reverse()
+  };
+}
+
 // Copies the 'source' file to 'target' if it's missing after creating the
 // required directory structure.
 function syncFile (source, target, callback) {
@@ -301,5 +353,7 @@ module.exports = {
   createShortcut: createShortcut,
   replaceFileContent: replaceFileContent,
   searchFile: searchFile,
-  syncFiles: syncFiles
+  syncFiles: syncFiles,
+  flattenFolderStructure: flattenFolderStructureSync,
+  folderScanSync: folderScanSync
 };

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pwabuilder-lib",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "PWA Builder Core Library",
   "repository": {
     "type": "git",