@eudiplo/cli 7.5.0-main.9807e41 → 7.5.0-main.cc08b13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/completion/action.d.ts +1 -1
- package/dist/commands/completion/action.d.ts.map +1 -1
- package/dist/commands/completion/action.js +32 -12
- package/dist/commands/completion/action.js.map +1 -1
- package/dist/commands/completion/index.d.ts.map +1 -1
- package/dist/commands/completion/index.js +2 -2
- package/dist/commands/completion/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,5 +2,5 @@ import type { Command } from "commander";
|
|
|
2
2
|
import type { CommandContext } from "../../types.js";
|
|
3
3
|
export type CompletionShell = "bash" | "zsh" | "fish" | "powershell";
|
|
4
4
|
export declare function runCompletion(shell: CompletionShell, context: CommandContext): number;
|
|
5
|
-
export declare function runCompletionCandidates(root: Command, words: string[], context: CommandContext): number
|
|
5
|
+
export declare function runCompletionCandidates(root: Command, words: string[], context: CommandContext): Promise<number>;
|
|
6
6
|
//# sourceMappingURL=action.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/commands/completion/action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/commands/completion/action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,YAAY,CAAC;AAErE,wBAAgB,aAAa,CACzB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,cAAc,GACxB,MAAM,CAGR;AAED,wBAAsB,uBAAuB,CACzC,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,cAAc,GACxB,OAAO,CAAC,MAAM,CAAC,CAKjB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { loadCliState } from "../shared.js";
|
|
1
2
|
export function runCompletion(shell, context) {
|
|
2
3
|
context.stdout.write(`${completionScript(shell)}\n`);
|
|
3
4
|
return 0;
|
|
4
5
|
}
|
|
5
|
-
export function runCompletionCandidates(root, words, context) {
|
|
6
|
-
for (const candidate of completionCandidates(root, words)) {
|
|
6
|
+
export async function runCompletionCandidates(root, words, context) {
|
|
7
|
+
for (const candidate of await completionCandidates(root, words, context)) {
|
|
7
8
|
context.stdout.write(`${candidate}\n`);
|
|
8
9
|
}
|
|
9
10
|
return 0;
|
|
@@ -20,7 +21,21 @@ function completionScript(shell) {
|
|
|
20
21
|
return powershellCompletion();
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
|
-
function completionCandidates(root, words) {
|
|
24
|
+
async function completionCandidates(root, words, context) {
|
|
25
|
+
const current = resolveCommand(root, words);
|
|
26
|
+
const lastOption = findOption(current, words.at(-1));
|
|
27
|
+
if (lastOption) {
|
|
28
|
+
if (lastOption.long === "--instance") {
|
|
29
|
+
return instanceCandidates(context);
|
|
30
|
+
}
|
|
31
|
+
const choices = optionChoices(lastOption);
|
|
32
|
+
if (choices.length > 0) {
|
|
33
|
+
return choices;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return staticCandidates(current, words.at(-1));
|
|
37
|
+
}
|
|
38
|
+
function resolveCommand(root, words) {
|
|
24
39
|
let current = root;
|
|
25
40
|
let skipOptionValue = false;
|
|
26
41
|
for (const word of words) {
|
|
@@ -41,13 +56,9 @@ function completionCandidates(root, words) {
|
|
|
41
56
|
current = child;
|
|
42
57
|
}
|
|
43
58
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
if (choices.length > 0) {
|
|
48
|
-
return choices;
|
|
49
|
-
}
|
|
50
|
-
}
|
|
59
|
+
return current;
|
|
60
|
+
}
|
|
61
|
+
function staticCandidates(current, lastWord) {
|
|
51
62
|
const candidates = ["-h", "--help"];
|
|
52
63
|
for (const command of current.commands) {
|
|
53
64
|
if (command.name() !== "_complete") {
|
|
@@ -62,11 +73,20 @@ function completionCandidates(root, words) {
|
|
|
62
73
|
candidates.push(option.long);
|
|
63
74
|
}
|
|
64
75
|
}
|
|
65
|
-
if (current.commands.length === 0 &&
|
|
76
|
+
if (current.commands.length === 0 && lastWord === current.name()) {
|
|
66
77
|
candidates.push(...(current.registeredArguments[0]?.argChoices ?? []));
|
|
67
78
|
}
|
|
68
79
|
return [...new Set(candidates)];
|
|
69
80
|
}
|
|
81
|
+
async function instanceCandidates(context) {
|
|
82
|
+
try {
|
|
83
|
+
const { config } = await loadCliState(context);
|
|
84
|
+
return Object.keys(config.instances);
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
return [];
|
|
88
|
+
}
|
|
89
|
+
}
|
|
70
90
|
function findOption(command, word) {
|
|
71
91
|
if (!word) {
|
|
72
92
|
return undefined;
|
|
@@ -78,7 +98,7 @@ function optionChoices(option) {
|
|
|
78
98
|
if (option.argChoices) {
|
|
79
99
|
return option.argChoices;
|
|
80
100
|
}
|
|
81
|
-
const placeholder =
|
|
101
|
+
const placeholder = /[<[]([^>\]]+)[>\]]/u.exec(option.flags)?.[1];
|
|
82
102
|
return placeholder?.includes("|") ? placeholder.split("|") : [];
|
|
83
103
|
}
|
|
84
104
|
function bashCompletion() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/completion/action.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/completion/action.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,MAAM,UAAU,aAAa,CACzB,KAAsB,EACtB,OAAuB;IAEvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,IAAa,EACb,KAAe,EACf,OAAuB;IAEvB,KAAK,MAAM,SAAS,IAAI,MAAM,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;QACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAsB;IAC5C,QAAQ,KAAK,EAAE,CAAC;QACZ,KAAK,MAAM;YACP,OAAO,cAAc,EAAE,CAAC;QAC5B,KAAK,KAAK;YACN,OAAO,aAAa,EAAE,CAAC;QAC3B,KAAK,MAAM;YACP,OAAO,cAAc,EAAE,CAAC;QAC5B,KAAK,YAAY;YACb,OAAO,oBAAoB,EAAE,CAAC;IACtC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,oBAAoB,CAC/B,IAAa,EACb,KAAe,EACf,OAAuB;IAEvB,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,IAAI,UAAU,EAAE,CAAC;QACb,IAAI,UAAU,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACnC,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,OAAO,CAAC;QACnB,CAAC;IACL,CAAC;IAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,cAAc,CAAC,IAAa,EAAE,KAAe;IAClD,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,eAAe,EAAE,CAAC;YAClB,eAAe,GAAG,KAAK,CAAC;YACxB,SAAS;QACb,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,MAAM,EAAE,CAAC;YACT,eAAe,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;YACrD,SAAS;QACb,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,SAAS;QACb,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAC/B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC3E,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACR,OAAO,GAAG,KAAK,CAAC;QACpB,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB,EAAE,QAA4B;IACpE,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpC,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,OAAO,CAAC,IAAI,EAAE,KAAK,WAAW,EAAE,CAAC;YACjC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YACd,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,KAAK,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/D,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,OAAuB;IACrD,IAAI,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,OAAgB,EAAE,IAAwB;IAC1D,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1E,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CACvB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAC5D,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACjC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,MAAM,WAAW,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClE,OAAO,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACpE,CAAC;AAED,SAAS,cAAc;IACnB,OAAO;QACH,yBAAyB;QACzB,8BAA8B;QAC9B,mBAAmB;QACnB,yCAAyC;QACzC,qDAAqD;QACrD,gEAAgE;QAChE,2DAA2D;QAC3D,GAAG;QACH,yCAAyC;KAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC;AAED,SAAS,aAAa;IAClB,OAAO;QACH,kBAAkB;QAClB,cAAc;QACd,8BAA8B;QAC9B,6CAA6C;QAC7C,yEAAyE;QACzE,4BAA4B;QAC5B,GAAG;QACH,0BAA0B;KAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC;AAED,SAAS,cAAc;IACnB,OAAO;QACH,+BAA+B;QAC/B,sCAAsC;QACtC,sBAAsB;QACtB,2CAA2C;QAC3C,KAAK;QACL,oDAAoD;KACvD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB;IACzB,OAAO;QACH,wEAAwE;QACxE,0DAA0D;QAC1D,4GAA4G;QAC5G,wDAAwD;QACxD,kFAAkF;QAClF,OAAO;QACP,8GAA8G;QAC9G,4FAA4F;QAC5F,OAAO;QACP,GAAG;KACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAqB,MAAM,WAAW,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAShD,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,WAAW,GACzB,OAAO,CAWT;AAED,wBAAgB,iCAAiC,CAC7C,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,WAAW,GACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAqB,MAAM,WAAW,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAShD,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,WAAW,GACzB,OAAO,CAWT;AAED,wBAAgB,iCAAiC,CAC7C,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,WAAW,GACzB,OAAO,CAYT"}
|
|
@@ -13,11 +13,11 @@ export function createCompletionCandidatesCommand(context, setExitCode) {
|
|
|
13
13
|
return new Command("_complete")
|
|
14
14
|
.argument("[words...]")
|
|
15
15
|
.allowUnknownOption(true)
|
|
16
|
-
.action((words, _options, command) => {
|
|
16
|
+
.action(async (words, _options, command) => {
|
|
17
17
|
if (!command.parent) {
|
|
18
18
|
throw new Error("Completion command is not attached to the CLI root.");
|
|
19
19
|
}
|
|
20
|
-
setExitCode(runCompletionCandidates(command.parent, words, context));
|
|
20
|
+
setExitCode(await runCompletionCandidates(command.parent, words, context));
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAqB,MAAM,WAAW,CAAC;AAGjE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAqB,MAAM,WAAW,CAAC;AAGjE,OAAO,EAEH,aAAa,EACb,uBAAuB,GAC1B,MAAM,aAAa,CAAC;AAErB,MAAM,eAAe,GAAsB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjF,MAAM,UAAU,uBAAuB,CACnC,OAAuB,EACvB,WAAwB;IAExB,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;SAC3B,WAAW,CAAC,mCAAmC,CAAC;SAChD,WAAW,CACR,IAAI,QAAQ,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,OAAO,CAC/D,eAAe,CAClB,CACJ;SACA,MAAM,CAAC,CAAC,KAAsB,EAAE,EAAE;QAC/B,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,OAAuB,EACvB,WAAwB;IAExB,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;SAC1B,QAAQ,CAAC,YAAY,CAAC;SACtB,kBAAkB,CAAC,IAAI,CAAC;SACxB,MAAM,CAAC,KAAK,EAAE,KAAe,EAAE,QAAsB,EAAE,OAAgB,EAAE,EAAE;QACxE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC3E,CAAC;QACD,WAAW,CACP,MAAM,uBAAuB,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAChE,CAAC;IACN,CAAC,CAAC,CAAC;AACX,CAAC"}
|