Skip to content

Commit ad9e9cf

Browse files
author
Juhyung Park
committed
Bump the version of enquirer
1 parent 5709012 commit ad9e9cf

File tree

4 files changed

+46
-651
lines changed

4 files changed

+46
-651
lines changed

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@
3737
"codechain-keystore": "^0.6.2",
3838
"codechain-primitives": "~0.3.0",
3939
"commander": "^2.17.1",
40-
"enquirer": "^1.0.3",
41-
"lodash": "^4.17.14",
42-
"prompt-confirm": "^2.0.4",
43-
"prompt-list": "^3.2.0",
44-
"prompt-password": "^1.2.0"
40+
"enquirer": "^2.3.1",
41+
"lodash": "^4.17.14"
4542
}
4643
}

src/command/delete.ts

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { prompt } from "enquirer";
2+
13
import { CLIError, CLIErrorType } from "../error";
24
import { Context } from "../types";
35
import { findMatchingKey } from "../util";
@@ -8,23 +10,20 @@ export async function deleteKey(
810
): Promise<void> {
911
const keys = await cckey[accountType].getKeys();
1012
const key = findMatchingKey(accountType, keys, address, networkId);
11-
const Enquirer = require("enquirer");
12-
const enquirer = new Enquirer();
13-
enquirer.register("confirm", require("prompt-confirm"));
14-
enquirer.question("delete", "Do you really want to delete the key?", {
13+
14+
const question = {
1515
type: "confirm",
16-
default: false
17-
});
18-
return enquirer
19-
.prompt(["delete"])
20-
.then(async (answers: { delete: boolean }) => {
21-
if (answers.delete) {
22-
const result = await cckey[accountType].deleteKey({ key });
23-
if (!result) {
24-
throw new CLIError(CLIErrorType.Unknown, {
25-
message: "Delete failed"
26-
});
27-
}
28-
}
29-
});
16+
name: "delete",
17+
message: "Do you really want to delete the key?"
18+
};
19+
20+
const answer: any = await prompt(question);
21+
if (answer.delete) {
22+
const result = await cckey[accountType].deleteKey({ key });
23+
if (!result) {
24+
throw new CLIError(CLIErrorType.Unknown, {
25+
message: "Delete failed"
26+
});
27+
}
28+
}
3029
}

src/index.ts

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { CCKey } from "codechain-keystore";
44
import { AssetTransferAddress, PlatformAddress } from "codechain-primitives";
55
import * as program from "commander";
6+
import { prompt } from "enquirer";
67
import * as fs from "fs";
78
import * as _ from "lodash";
89
import * as process from "process";
@@ -267,38 +268,32 @@ async function parsePassphrase(passphrase: string): Promise<string> {
267268
return passphrase;
268269
}
269270

270-
const Enquirer = require("enquirer");
271-
const enquirer = new Enquirer();
272-
enquirer.register("password", require("prompt-password"));
273-
const questions = {
271+
const question = {
274272
type: "password",
275273
message: "Enter your passphrase please",
276274
name: "passphrase"
277275
};
278-
const answers = await enquirer.ask(questions);
279-
if (_.isUndefined(answers.passphrase)) {
276+
277+
const answer: any = await prompt(question);
278+
if (_.isUndefined(answer.passphrase)) {
280279
return "";
281280
}
282-
return answers.passphrase;
281+
return answer.passphrase;
283282
}
284283

285284
async function selectAddress(
286285
cckey: CCKey,
287286
networkId: string,
288287
accountType: AccountType
289288
): Promise<string> {
290-
const Enquirer = require("enquirer");
291-
const enquirer = new Enquirer();
292-
enquirer.register("list", require("prompt-list"));
293-
294289
let keys = await cckey[accountType].getKeys();
295290
keys = _.map(keys, key => getAddressFromKey(accountType, key, networkId));
296-
const questions = {
297-
type: "list",
291+
const question = {
292+
type: "select",
298293
name: "address",
299294
message: "Select your address please",
300295
choices: keys
301296
};
302-
const answers = await enquirer.ask(questions);
303-
return answers.address;
297+
const answer: any = await prompt(question);
298+
return answer.address;
304299
}

0 commit comments

Comments
 (0)