From 4ddd7df75503fed679e775dc15b1c6be9841207e Mon Sep 17 00:00:00 2001 From: kinfuy Date: Wed, 22 Mar 2023 22:43:16 +0800 Subject: [PATCH] fix: gnrm test options -r --- .gitignore | 3 ++- dist/gacm.js | 4 ++-- dist/gnrm.js | 15 +++++++-------- dist/package.json | 6 +++--- package/commands/gnrm/useTest.ts | 8 +++----- package/gnrm.ts | 4 ++-- package/type/shell.type.ts | 2 +- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index b512c09..76add87 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules \ No newline at end of file +node_modules +dist \ No newline at end of file diff --git a/dist/gacm.js b/dist/gacm.js index 7f1c2dc..d478b6b 100755 --- a/dist/gacm.js +++ b/dist/gacm.js @@ -225,8 +225,8 @@ var dependencies = { cac: "^6.7.14", execa: "5.1.1", kolorist: "^1.5.1", - prompts: "^2.4.2", - "node-fetch": "2.6.6" + "node-fetch": "2.6.6", + prompts: "^2.4.2" }; var pkg = { name: name, diff --git a/dist/gnrm.js b/dist/gnrm.js index 755952b..ddf8057 100755 --- a/dist/gnrm.js +++ b/dist/gnrm.js @@ -39,8 +39,8 @@ var dependencies$1 = { cac: "^6.7.14", execa: "5.1.1", kolorist: "^1.5.1", - prompts: "^2.4.2", - "node-fetch": "2.6.6" + "node-fetch": "2.6.6", + prompts: "^2.4.2" }; var pkg$1 = { name: name$1, @@ -487,7 +487,6 @@ const testRegistry = async (registry) => { }); status = response.ok; } catch (error) { - console.log(error); isTimeout = error.type === "request-timeout"; } return { @@ -518,8 +517,8 @@ const useTest = async (cmd) => { await iterator; return; } - if (cmd.packageManager) { - const registry2 = registryList.find((x) => x.alias === cmd.packageManager); + if (cmd.registry) { + const registry2 = registryList.find((x) => x.alias === cmd.registry || x.name === cmd.registry); if (registry2) await test(registry2); return; @@ -537,14 +536,14 @@ const useTest = async (cmd) => { }) } ]); - await test(registry.registry); + await test(registry); }; const program = cac__default["default"]("gnrm"); program.version(useVersion()); program.command("ls", "\u5F53\u524D\u7528\u6237\u5217\u8868").option("-p, --packageManager ", "\u67E5\u770B\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").action(useLs); -program.command("use [name]", "\u5207\u6362\u955C\u50CF\u6E90").option("-p, --packageManager ", "\u8BBE\u7F6E\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").action(useUse); -program.command("test", "\u5207\u6362\u955C\u50CF\u6E90").option("-p, --packageManager ", "\u6D4B\u8BD5\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").option("-a, --all", "\u6D4B\u8BD5\u5B58\u5728\u7684\u955C\u50CF\u6E90").action(useTest); +program.command("use [name]", "\u5207\u6362\u955C\u50CF\u6E90").option("-p, --registry ", "\u8BBE\u7F6E\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").action(useUse); +program.command("test", "\u5207\u6362\u955C\u50CF\u6E90").option("-r, --registry ", "\u6D4B\u8BD5\u6E90\u540D\u79F0\u6216\u8005\u522B\u540D").option("-a, --all", "\u6D4B\u8BD5\u5B58\u5728\u7684\u955C\u50CF\u6E90").action(useTest); program.command("add", "\u6DFB\u52A0\u955C\u50CF").option("-n, --name ", "\u955C\u50CF\u540D\u79F0").option("-r, --registry ", "\u955C\u50CF\u5730\u5740").option("-a, --alias ", "\u955C\u50CF\u522B\u540D").action(useAdd); program.command("alias ", "\u955C\u50CF\u6DFB\u52A0\u522B\u540D").action(useAlias); program.command("delete ", "\u5220\u9664\u955C\u50CF").action(useDelete); diff --git a/dist/package.json b/dist/package.json index bab4ac9..c2b6746 100644 --- a/dist/package.json +++ b/dist/package.json @@ -21,7 +21,7 @@ "cac": "^6.7.14", "execa": "5.1.1", "kolorist": "^1.5.1", - "prompts": "^2.4.2", - "node-fetch": "2.6.6" + "node-fetch": "2.6.6", + "prompts": "^2.4.2" } -} \ No newline at end of file +} diff --git a/package/commands/gnrm/useTest.ts b/package/commands/gnrm/useTest.ts index 2b66738..0f7ff99 100644 --- a/package/commands/gnrm/useTest.ts +++ b/package/commands/gnrm/useTest.ts @@ -19,8 +19,6 @@ const testRegistry = async (registry: string) => { status = response.ok; } catch (error: any) { - // eslint-disable-next-line no-console - console.log(error); isTimeout = error.type === 'request-timeout'; } return { @@ -55,8 +53,8 @@ export const useTest = async (cmd: TestCmd) => { return; } - if (cmd.packageManager) { - const registry = registryList.find(x => x.alias === cmd.packageManager); + if (cmd.registry) { + const registry = registryList.find(x => x.alias === cmd.registry || x.name === cmd.registry); if (registry) await test(registry); @@ -79,5 +77,5 @@ export const useTest = async (cmd: TestCmd) => { } ]); - await test(registry.registry); + await test(registry); }; diff --git a/package/gnrm.ts b/package/gnrm.ts index e776454..c65e6b8 100644 --- a/package/gnrm.ts +++ b/package/gnrm.ts @@ -12,12 +12,12 @@ program program .command('use [name]', '切换镜像源') - .option('-p, --packageManager ', '设置对应包管理器：默认npm') + .option('-p, --registry ', '设置对应包管理器：默认npm') .action(useUse); program .command('test', '切换镜像源') - .option('-p, --packageManager ', '测试对应包管理器：默认npm') + .option('-r, --registry ', '测试源名称或者别名') .option('-a, --all', '测试存在的镜像源') .action(useTest); diff --git a/package/type/shell.type.ts b/package/type/shell.type.ts index 8918ef8..46feb57 100644 --- a/package/type/shell.type.ts +++ b/package/type/shell.type.ts @@ -21,7 +21,7 @@ export interface UserOldInfoJson extends Record { export type PackageManagertype = 'pnpm' | 'npm' | 'cnpm' | 'yarn'; export interface NrmCmd { - packageManager: PackageManagertype + registry: string } export interface TestCmd extends NrmCmd {