Refactoring

Author: moonglum

lib/build-bundler.js

@@ -0,0 +1,23 @@
+let fs = require("fs");
+let path = require("path");
+let { createFile } = require("faucet-pipeline-util");
+// TODO: Not available on all supported Node versions
+let { promisify } = require("util");
+let readFile = promisify(fs.readFile);
+let readdir = promisify(fs.readdir);
+
+module.exports = ({ source, target }) => {
+	// TODO: Only copy changed files
+	return _ => {
+		readdir(source).then(sources => {
+			return Promise.all(sources.map(filePath => {
+				let sourcePath = path.join(source, filePath);
+				let targetPath = path.join(target, filePath);
+
+				return readFile(sourcePath).then(content => {
+					return createFile(targetPath, content);
+				});
+			}));
+		});
+	};
+};

lib/index.js

@@ -1,7 +1,5 @@
 let buildConfig = require("./build-config");
-let fs = require("fs");
-let path = require("path");
-let { createFile } = require("faucet-pipeline-util");
+let buildBundler = require("./build-bundler");
 
 module.exports = (rawConfig, configDir, { watcher, fingerprint }) => {
 	let config = buildConfig(rawConfig, configDir, fingerprint);
@@ -16,31 +14,11 @@ module.exports = (rawConfig, configDir, { watcher, fingerprint }) => {
 };
 
 function buildBundleAll(config) {
-	// TODO: Only copy changed files
-	return _ => {
-		config.bundles.forEach(bundle => {
-			fs.readdir(bundle.source, (err, sources) => {
-				// TODO: Error Handling
-				if(err) {
-					console.error(err);
-					return;
-				}
+	let bundlers = config.bundles.map(bundleConfig => buildBundler(bundleConfig));
 
-				sources.forEach(filePath => {
-					fs.readFile(path.join(bundle.source, filePath), (err, content) => {
-						// TODO: Error Handling
-						if(err) {
-							console.error(err);
-							return;
-						}
-
-						// TODO: Fingerprint
-						createFile(path.join(bundle.target, filePath), content);
-					});
-				});
-			});
-			// TODO: Manifest
-			// TODO: Reporter
-		});
+	return files => {
+		Promise.all(bundlers.map(bundler => bundler(files)));
 	};
+	// TODO: Manifest
+	// TODO: Reporter
 }