cleanup and version update

Author: amwmedia

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-plop",
-  "version": "0.17.5",
+  "version": "0.18.0",
   "description": "programmatic plopping for fun and profit",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -84,7 +84,6 @@
     "require": [
       "@babel/register"
     ],
-    "failFast": true,
     "tap": true
   }
 }

src/generator-runner.js

@@ -115,25 +115,28 @@ export default function (plopfileApi, flags) {
 		// data can also be a function that returns a data object
 		if (typeof cfgData === 'function') { cfgData = yield cfgData(); }
 
-		// track data properties that can be applied to the main data scope
-		const cfgDataProps = Object.keys(cfgData).filter(k => typeof data[k] === 'undefined');
+		// track keys that can be applied to the main data scope
+		const cfgDataKeys = Object.keys(cfgData).filter(k => typeof data[k] === 'undefined');
 		// copy config data into main data scope so it's available for templates
-		cfgDataProps.forEach(k => {data[k] = cfgData[k];});
+		cfgDataKeys.forEach(k => {data[k] = cfgData[k];});
 
 		return yield (Promise.resolve(action(data, cfg, plopfileApi))
-			// show the resolved value in the console
-			.then(result => ({
-				type, path: (typeof result === 'string'
-					? result
-					: JSON.stringify(result)
-				)
-			}),
-			// a rejected promise is treated as a failure
-			err => {
-				throw { type, path: '', error: err.message || err.toString() };
-			})
+			.then(
+				// show the resolved value in the console
+				result => ({
+					type, path: (typeof result === 'string'
+						? result
+						: JSON.stringify(result)
+					)
+				}),
+
+				// a rejected promise is treated as a failure
+				err => {
+					throw { type, path: '', error: err.message || err.toString() };
+				}
+			)
 			// cleanup main data scope so config data doesn't leak
-			.finally(() => cfgDataProps.forEach(k => {delete data[k];}))
+			.finally(() => cfgDataKeys.forEach(k => {delete data[k];}))
 		);
 	});
 

tests/add-action-executable-file.ava.js

@@ -5,10 +5,6 @@ const {test, mockPath, testSrcPath, nodePlop} = (new AvaTest(__filename));
 
 const plop = nodePlop();
 
-/////
-//
-//
-
 test('Add action keeps the executable flag', co.wrap(function* (t) {
 	plop.setGenerator('addExecutable', {
 		actions: [{

tests/custom-data-in-actions.ava.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+// import fs from 'fs';
 import * as fspp from '../src/fs-promise-proxy';
 import co from 'co';
 import path from 'path';