Skip to content

feat: pass answers to validator function #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DesignByOnyx wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −6
Open

feat: pass answers to validator function #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/elements/date.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class DatePrompt extends Prompt {
}

async validate() {
let valid = await this.validator(this.value);
let valid = await this.validator(this.value, this.answers);
if (typeof valid === 'string') {
this.errorMsg = valid;
valid = false;
Expand Down
2 changes: 1 addition & 1 deletion lib/elements/number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class NumberPrompt extends Prompt {
}

async validate() {
let valid = await this.validator(this.value);
let valid = await this.validator(this.value, this.answers);
if (typeof valid === `string`) {
this.errorMsg = valid;
valid = false;
Expand Down
1 change: 1 addition & 0 deletions lib/elements/prompt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class Prompt extends EventEmitter {
constructor(opts={}) {
super();

this.answers = opts.answers || {};
this.firstRender = true;
this.in = opts.stdin || process.stdin;
this.out = opts.stdout || process.stdout;
Expand Down
4 changes: 2 additions & 2 deletions lib/elements/text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class TextPrompt extends Prompt {
}

async validate() {
let valid = await this.validator(this.value);
let valid = await this.validator(this.value, this.answers);
if (typeof valid === `string`) {
this.errorMsg = valid;
valid = false;
Expand Down Expand Up @@ -205,4 +205,4 @@ class TextPrompt extends Prompt {
}
}

module.exports = TextPrompt;
module.exports = TextPrompt;
4 changes: 2 additions & 2 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ async function prompt(questions=[], { onSubmit=noop, onCancel=noop }={}) {
let answer, question, quit, name, type, lastPrompt;

const getFormattedAnswer = async (question, answer, skipValidation = false) => {
if (!skipValidation && question.validate && question.validate(answer) !== true) {
if (!skipValidation && question.validate && question.validate(answer, answers) !== true) {
return;
}
return question.format ? await question.format(answer, answers) : answer
Expand Down Expand Up @@ -65,7 +65,7 @@ async function prompt(questions=[], { onSubmit=noop, onCancel=noop }={}) {

try {
// Get the injected answer if there is one or prompt the user
answer = prompt._injected ? getInjectedAnswer(prompt._injected, question.initial) : await prompts[type](question);
answer = prompt._injected ? getInjectedAnswer(prompt._injected, question.initial) : await prompts[type]({ ...question, answers });
answers[name] = answer = await getFormattedAnswer(question, answer, true);
quit = await onSubmit(question, answer, answers);
} catch (err) {
Expand Down