Skip to content

Commit 4ddd7df

Browse files
author
kinfuy
committed
fix: gnrm test options -r
1 parent 4e4c132 commit 4ddd7df

File tree

7 files changed

+20
-22
lines changed

7 files changed

+20
-22
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
node_modules
1+
node_modules
2+
dist

dist/gacm.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ var dependencies = {
225225
cac: "^6.7.14",
226226
execa: "5.1.1",
227227
kolorist: "^1.5.1",
228-
prompts: "^2.4.2",
229-
"node-fetch": "2.6.6"
228+
"node-fetch": "2.6.6",
229+
prompts: "^2.4.2"
230230
};
231231
var pkg = {
232232
name: name,

dist/gnrm.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ var dependencies$1 = {
3939
cac: "^6.7.14",
4040
execa: "5.1.1",
4141
kolorist: "^1.5.1",
42-
prompts: "^2.4.2",
43-
"node-fetch": "2.6.6"
42+
"node-fetch": "2.6.6",
43+
prompts: "^2.4.2"
4444
};
4545
var pkg$1 = {
4646
name: name$1,
@@ -487,7 +487,6 @@ const testRegistry = async (registry) => {
487487
});
488488
status = response.ok;
489489
} catch (error) {
490-
console.log(error);
491490
isTimeout = error.type === "request-timeout";
492491
}
493492
return {
@@ -518,8 +517,8 @@ const useTest = async (cmd) => {
518517
await iterator;
519518
return;
520519
}
521-
if (cmd.packageManager) {
522-
const registry2 = registryList.find((x) => x.alias === cmd.packageManager);
520+
if (cmd.registry) {
521+
const registry2 = registryList.find((x) => x.alias === cmd.registry || x.name === cmd.registry);
523522
if (registry2)
524523
await test(registry2);
525524
return;
@@ -537,14 +536,14 @@ const useTest = async (cmd) => {
537536
})
538537
}
539538
]);
540-
await test(registry.registry);
539+
await test(registry);
541540
};
542541

543542
const program = cac__default["default"]("gnrm");
544543
program.version(useVersion());
545544
program.command("ls", "\u5F53\u524D\u7528\u6237\u5217\u8868").option("-p, --packageManager <packageManager>", "\u67E5\u770B\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").action(useLs);
546-
program.command("use [name]", "\u5207\u6362\u955C\u50CF\u6E90").option("-p, --packageManager <packageManager>", "\u8BBE\u7F6E\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").action(useUse);
547-
program.command("test", "\u5207\u6362\u955C\u50CF\u6E90").option("-p, --packageManager <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);
545+
program.command("use [name]", "\u5207\u6362\u955C\u50CF\u6E90").option("-p, --registry <packageManager>", "\u8BBE\u7F6E\u5BF9\u5E94\u5305\u7BA1\u7406\u5668\uFF1A\u9ED8\u8BA4npm").action(useUse);
546+
program.command("test", "\u5207\u6362\u955C\u50CF\u6E90").option("-r, --registry <registry>", "\u6D4B\u8BD5\u6E90\u540D\u79F0\u6216\u8005\u522B\u540D").option("-a, --all", "\u6D4B\u8BD5\u5B58\u5728\u7684\u955C\u50CF\u6E90").action(useTest);
548547
program.command("add", "\u6DFB\u52A0\u955C\u50CF").option("-n, --name <name>", "\u955C\u50CF\u540D\u79F0").option("-r, --registry <registry>", "\u955C\u50CF\u5730\u5740").option("-a, --alias <alias>", "\u955C\u50CF\u522B\u540D").action(useAdd);
549548
program.command("alias <origin> <target>", "\u955C\u50CF\u6DFB\u52A0\u522B\u540D").action(useAlias);
550549
program.command("delete <name>", "\u5220\u9664\u955C\u50CF").action(useDelete);

dist/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"cac": "^6.7.14",
2222
"execa": "5.1.1",
2323
"kolorist": "^1.5.1",
24-
"prompts": "^2.4.2",
25-
"node-fetch": "2.6.6"
24+
"node-fetch": "2.6.6",
25+
"prompts": "^2.4.2"
2626
}
27-
}
27+
}

package/commands/gnrm/useTest.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ const testRegistry = async (registry: string) => {
1919
status = response.ok;
2020
}
2121
catch (error: any) {
22-
// eslint-disable-next-line no-console
23-
console.log(error);
2422
isTimeout = error.type === 'request-timeout';
2523
}
2624
return {
@@ -55,8 +53,8 @@ export const useTest = async (cmd: TestCmd) => {
5553
return;
5654
}
5755

58-
if (cmd.packageManager) {
59-
const registry = registryList.find(x => x.alias === cmd.packageManager);
56+
if (cmd.registry) {
57+
const registry = registryList.find(x => x.alias === cmd.registry || x.name === cmd.registry);
6058
if (registry)
6159
await test(registry);
6260

@@ -79,5 +77,5 @@ export const useTest = async (cmd: TestCmd) => {
7977
}
8078
]);
8179

82-
await test(registry.registry);
80+
await test(registry);
8381
};

package/gnrm.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ program
1212

1313
program
1414
.command('use [name]', '切换镜像源')
15-
.option('-p, --packageManager <packageManager>', '设置对应包管理器:默认npm')
15+
.option('-p, --registry <packageManager>', '设置对应包管理器:默认npm')
1616
.action(useUse);
1717

1818
program
1919
.command('test', '切换镜像源')
20-
.option('-p, --packageManager <packageManager>', '测试对应包管理器:默认npm')
20+
.option('-r, --registry <registry>', '测试源名称或者别名')
2121
.option('-a, --all', '测试存在的镜像源')
2222
.action(useTest);
2323

package/type/shell.type.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface UserOldInfoJson extends Record<string, any> {
2121

2222
export type PackageManagertype = 'pnpm' | 'npm' | 'cnpm' | 'yarn';
2323
export interface NrmCmd {
24-
packageManager: PackageManagertype
24+
registry: string
2525
}
2626

2727
export interface TestCmd extends NrmCmd {

0 commit comments

Comments
 (0)