Inquirer function params

src/prompt-bypass.js

@@ -133,11 +133,11 @@ export default function (prompts, bypassArr, plop) {
 			const value = (bypassIsFunc ? bypass.call(null, val, p) : val);
 
 			// if inquirer prompt has a filter function - call it
-			const answer = p.filter ? p.filter(value) : value;
+			const answer = p.filter ? p.filter(value, answers) : value;
 
 			// if inquirer prompt has a validate function - call it
 			if (p.validate) {
-				const validation = p.validate(value);
+				const validation = p.validate(value, answers);
 				if (validation !== true) {
 					// if validation failed return validation error
 					bypassFailures.push(validation);

tests/prompt-bypass-mixed.ava.js

@@ -8,28 +8,45 @@ const prompts = [
 	{ type:'list', name:'list', message:'listMsg', choices: ['a','B','c'] },
 	{ type:'input', name:'input', message:'inputMsg' },
 	{ type:'input', name:'filter', message:'filterMsg', filter: () => 'filter applied' },
+	{ type:'input', name:'filter2', message:'filterMsg2', filter: () => 't needed' },
 	{ type:'input', name:'conditional', message:'conditionalMsg', when: () => false }
 ];
 
 test('verify good bypass input', function (t) {
 	const [promptsAfterBypassOne, bypassOne] = promptBypass(prompts, ['0'], plop);
 	t.is(bypassOne.list, 'a');
-	t.is(promptsAfterBypassOne.length, 4);
+	t.is(promptsAfterBypassOne.length, 5);
 	t.is(promptsAfterBypassOne[0].type, undefined);
 
 	const [promptsAfterBypassTwo, bypassTwo] = promptBypass(prompts, ['b', 'something'], plop);
 	t.is(bypassTwo.list, 'B');
 	t.is(bypassTwo.input, 'something');
-	t.is(promptsAfterBypassTwo.length, 3);
+	t.is(promptsAfterBypassTwo.length, 4);
 
 	const [promptsAfterBypassThree, bypassThree] = promptBypass(prompts, ['b', 'something', 'something filtered'], plop);
 	t.is(bypassThree.list, 'B');
 	t.is(bypassThree.input, 'something');
 	t.is(bypassThree.filter, 'filter applied');
-	t.is(promptsAfterBypassThree.length, 2);
+	t.is(promptsAfterBypassThree.length, 3);
+
+	//check correct parameters passed to inquirer function
+	prompts[3].filter = (input, answers) => {
+		t.is(input, 'unimportant');
+		t.is(answers.list, 'B');
+		t.is(answers.input, 'something');
+		t.is(answers.filter, 'filter applied');
+		return answers.list;
+	};
+	const [promptsAfterBypassFour, bypassFour] =
+		promptBypass(prompts, ['b', 'something', 'something filtered', 'unimportant'], plop);
+	t.is(bypassFour.list, 'B');
+	t.is(bypassFour.input, 'something');
+	t.is(bypassFour.filter, 'filter applied');
+	t.is(bypassFour.filter2, 'B');
+	t.is(promptsAfterBypassFour.length, 2);
 });
 
 test('verify bad bypass input', function (t) {
 	// can't bypass conditional prompts
-	t.throws(() => promptBypass(prompts, ['a', 'something', 'something filtered', 'something else'], plop));
+	t.throws(() => promptBypass(prompts, ['a', 'something', 'something filtered', 'unimportant', 'something else'], plop));
 });

tests/prompt-bypass-validate.ava.js

@@ -7,13 +7,25 @@ const plop = nodePlop();
 const prompts = [{
 	type:'input', name:'input', message:'inputMsg',
 	validate: (value) => value === 'invalid' ? 'Is invalid' : true
+}, {
+	type:'input', name:'dependent-input', message:'dependent-inputMsg'
 }];
 
 test('verify valid bypass input', function (t) {
 	const [, isValid] = promptBypass(prompts, ['valid'], plop);
 	t.is(isValid.input, 'valid');
 });
 
+test('verify valid bypass input with access to answers', function (t) {
+	prompts[1].validate = (value, answers) => {
+		t.is(answers.input, 'valid');
+		return !!value;
+	};
+	const [, isValid] = promptBypass(prompts, ['valid', 'also valid'], plop);
+	t.is(isValid.input, 'valid');
+	t.is(isValid['dependent-input'], 'also valid');
+});
+
 test('verify bad bypass input', function (t) {
 	t.throws(() => promptBypass(prompts, ['invalid'], plop));
 });