Update to faucet-pipeline 1.0.0-beta.0

Author: moonglum

lib/build-bundler.js

@@ -1,33 +1,72 @@
-let buildConfig = require("./build-config");
-let buildBundler = require("./build-bundler");
-let buildReporter = require("./build-reporter");
-let buildManifestWriter = require("./build-manifest-writer");
+let path = require("path");
+let { readFile } = require("./promisified-fs");
+let tree = require("./tree");
 
-module.exports = (rawConfig, configDir, { watcher, fingerprint }) => {
-	let config = buildConfig(rawConfig, configDir, fingerprint);
-	let bundleAll = buildBundleAll(config);
+module.exports = (pluginConfig, assetManager, { watcher }) => {
+	let copyAll = buildCopyAll(pluginConfig, assetManager);
 
 	// Run once for all files
-	bundleAll();
+	copyAll();
 
 	if(watcher) {
-		watcher.on("edit", bundleAll);
+		watcher.on("edit", copyAll);
 	}
 };
 
-function buildBundleAll(config) {
-	let bundlers = config.bundles.map(bundleConfig => buildBundler(bundleConfig));
-	let report = buildReporter();
-	let writeManifest = buildManifestWriter(config.manifest);
+function buildCopyAll(copyConfigs, assetManager) {
+	let copiers = copyConfigs.map(copyConfig =>
+		buildCopier(copyConfig, assetManager));
+
+	return files => copiers.forEach(copier => copier(files));
+}
+
+function buildCopier(copyConfig, assetManager) {
+	let source = assetManager.resolvePath(copyConfig.source, {
+		enforceRelative: true
+	});
+	let target = assetManager.resolvePath(copyConfig.target, {
+		enforceRelative: true
+	});
 
 	return files => {
-		Promise.all(bundlers.map(bundler => bundler(files))).
-			then(flatten).
-			then(writeManifest).
-			then(report);
+		return determineFilesToProcess(source, files).
+			then(filterInvisibleFiles).
+			then(fileNames => processFiles(fileNames, {
+				assetManager, source, target
+			}));
 	};
 }
 
-function flatten(arr) {
-	return arr.reduce((acc, cur) => acc.concat(cur));
+function processFiles(fileNames, config) {
+	return Promise.all(fileNames.map(fileName => processFile(fileName, config)));
+}
+
+function processFile(fileName, { source, target, assetManager }) {
+	let sourcePath = path.join(source, fileName);
+	let targetPath = path.join(target, fileName);
+
+	return readFile(sourcePath).
+		then(content => assetManager.writeFile(targetPath, content, {
+			targetDir: target
+		}));
+}
+
+function determineFilesToProcess(source, files) {
+	if(files) {
+		return filesWithinDirectory(source, files);
+	} else {
+		return tree(source);
+	}
+}
+
+function filterInvisibleFiles(files) {
+	return files.filter(file => !file.startsWith("."));
+}
+
+function filesWithinDirectory(directory, files) {
+	return new Promise(resolve => {
+		resolve(files.
+			map(file => path.relative(directory, file)).
+			filter(file => !file.startsWith("..")));
+	});
 }

lib/build-config.js

@@ -17,8 +17,7 @@
 	},
 	"homepage": "https://github.com/faucet-pipeline/faucet-pipeline-static#readme",
 	"dependencies": {
-		"faucet-pipeline": "^0.14.0",
-		"faucet-pipeline-util": "^0.10.3"
+		"faucet-pipeline": "1.0.0-beta.0"
 	},
 	"devDependencies": {
 		"eslint": "^4.4.1",

lib/build-manifest-writer.js

@@ -7,7 +7,7 @@ let path = require("path");
 let faucetStatic = path.resolve(__dirname, "..");
 
 hook.hook(".js", (src, name) => {
-	if(/\/faucet-pipeline\/index.js$/.test(name)) {
+	if(/\/faucet-pipeline\/lib\/index.js$/.test(name)) {
 		return src.replace("faucet-pipeline-static", faucetStatic);
 	}
 

lib/build-reporter.js

@@ -61,24 +61,28 @@ function fail {
 cd "$root/test"
 
 begin "./test_basic"
-	faucet --no-fingerprint
+	faucet
 	assert_identical "./dist/test.txt" "./src/test.txt"
 	assert_identical "./dist/inner/test2.txt" "./src/inner/test2.txt"
 end
 
 begin "./test_fingerprint"
-	faucet
+	faucet --fingerprint
 	assert_identical "./dist/test-e59ff97941044f85df5297e1c302d260.txt" "./src/test.txt"
 	assert_identical_json "./dist/manifest.json" "./expected.json"
 end
 
 begin "./test_manifest_base_uri"
-	faucet
+	faucet --fingerprint
 	assert_identical_json "./dist/manifest.json" "./expected.json"
 end
 
 begin "./test_single"
-	faucet --no-fingerprint
+	faucet
 	assert_identical "./dist/dist.txt" "./src.txt"
 end
 
+begin "./test_key_config"
+	faucet --fingerprint
+	assert_identical_json "./dist/manifest.json" "./expected.json"
+end

lib/index.js

@@ -1,11 +1,8 @@
 "use strict";
 
 module.exports = {
-	static: {
-		manifest: false,
-		bundles: [{
-			source: "src",
-			target: "dist"
-		}]
-	}
+	static: [{
+		source: "./src",
+		target: "./dist"
+	}]
 };

package.json

@@ -1 +1 @@
-{"dist/inner/test2.txt":"/assets/dist/inner/test2-e59ff97941044f85df5297e1c302d260.txt","dist/test.txt":"/assets/dist/test-e59ff97941044f85df5297e1c302d260.txt"}
+{"dist/inner/test2.txt":"/dist/inner/test2-e59ff97941044f85df5297e1c302d260.txt","dist/test.txt":"/dist/test-e59ff97941044f85df5297e1c302d260.txt"}