apify-cli 0.21.8-beta.21 → 0.21.8-beta.22
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/.tsbuildinfo +1 -1
- package/dist/commands/help.js +2 -6
- package/dist/commands/help.js.map +1 -1
- package/dist/entrypoints/_shared.js +18 -5
- package/dist/entrypoints/_shared.js.map +1 -1
- package/dist/lib/hooks/useCLIMetadata.js +2 -2
- package/dist/lib/hooks/useCommandSuggestions.js +37 -0
- package/dist/lib/hooks/useCommandSuggestions.js.map +1 -0
- package/package.json +3 -1
package/dist/commands/help.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { jaroWinkler } from '@skyra/jaro-winkler';
|
|
2
1
|
import chalk from 'chalk';
|
|
3
2
|
import { ApifyCommand, commandRegistry } from '../lib/command-framework/apify-command.js';
|
|
4
3
|
import { Args } from '../lib/command-framework/args.js';
|
|
5
4
|
import { renderHelpForCommand, renderMainHelpMenu } from '../lib/command-framework/help.js';
|
|
5
|
+
import { useCommandSuggestions } from '../lib/hooks/useCommandSuggestions.js';
|
|
6
6
|
import { error } from '../lib/outputs.js';
|
|
7
7
|
export class HelpCommand extends ApifyCommand {
|
|
8
8
|
static name = 'help';
|
|
@@ -25,11 +25,7 @@ export class HelpCommand extends ApifyCommand {
|
|
|
25
25
|
const lowercasedCommandString = commandString.toLowerCase();
|
|
26
26
|
const command = commandRegistry.get(lowercasedCommandString);
|
|
27
27
|
if (!command) {
|
|
28
|
-
const
|
|
29
|
-
const closestMatches = allCommands.filter((cmd) => {
|
|
30
|
-
const lowercased = cmd.toLowerCase();
|
|
31
|
-
return jaroWinkler(lowercasedCommandString, lowercased) >= 0.95;
|
|
32
|
-
});
|
|
28
|
+
const closestMatches = useCommandSuggestions(lowercasedCommandString);
|
|
33
29
|
let message = chalk.gray(`Command ${chalk.whiteBright(commandString)} not found`);
|
|
34
30
|
if (closestMatches.length) {
|
|
35
31
|
message += '\n ';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,OAAO,WAAY,SAAQ,YAAgC;IAChE,MAAM,CAAU,IAAI,GAAG,MAAe,CAAC;IAEvC,MAAM,CAAU,WAAW,GAAG,6DAA6D,CAAC;IAE5F,MAAM,CAAU,MAAM,GAAG,IAAI,CAAC;IAE9B,MAAM,CAAU,IAAI,GAAG;QACtB,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC;YAC1B,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,8BAA8B;YAC3C,QAAQ,EAAE,IAAI;SACd,CAAC;KACF,CAAC;IAEF,KAAK,CAAC,GAAG;QACR,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEpC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACtE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAErD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEtB,OAAO;QACR,CAAC;QAED,MAAM,uBAAuB,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QAE5D,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAE7D,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,cAAc,GAAG,qBAAqB,CAAC,uBAAuB,CAAC,CAAC;YAEtE,IAAI,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAElF,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC3B,OAAO,IAAI,MAAM,CAAC;gBAClB,OAAO,IAAI,KAAK,CAAC,IAAI,CACpB,iBAAiB,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAClF,CAAC;YACH,CAAC;YAED,KAAK,CAAC;gBACL,OAAO;aACP,CAAC,CAAC;YAEH,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE/C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { renderMainHelpMenu, selectiveRenderHelpForCommand } from '../lib/comman
|
|
|
7
7
|
import { readStdin } from '../lib/commands/read-stdin.js';
|
|
8
8
|
import { useCLIMetadata } from '../lib/hooks/useCLIMetadata.js';
|
|
9
9
|
import { shouldSkipVersionCheck } from '../lib/hooks/useCLIVersionCheck.js';
|
|
10
|
+
import { useCommandSuggestions } from '../lib/hooks/useCommandSuggestions.js';
|
|
10
11
|
import { error } from '../lib/outputs.js';
|
|
11
12
|
import { cliDebugPrint } from '../lib/utils/cliDebugPrint.js';
|
|
12
13
|
export const cachedStdinInput = await readStdin();
|
|
@@ -94,9 +95,13 @@ export async function runCLI(entrypoint) {
|
|
|
94
95
|
];
|
|
95
96
|
const command = commandRegistry.get(possibleCommands.find((cmd) => commandRegistry.has(cmd)) ?? '');
|
|
96
97
|
if (!command) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
98
|
+
const closestMatches = useCommandSuggestions(String(parsed._[0]));
|
|
99
|
+
let message = chalk.gray(`Command ${chalk.whiteBright(parsed._[0])} not found`);
|
|
100
|
+
if (closestMatches.length) {
|
|
101
|
+
message += '\n ';
|
|
102
|
+
message += chalk.gray(`Did you mean: ${closestMatches.map((cmd) => chalk.whiteBright(cmd)).join(', ')}?`);
|
|
103
|
+
}
|
|
104
|
+
error({ message });
|
|
100
105
|
return;
|
|
101
106
|
}
|
|
102
107
|
const commandFlags = Object.entries(command.flags ?? {})
|
|
@@ -168,10 +173,18 @@ export async function runCLI(entrypoint) {
|
|
|
168
173
|
}
|
|
169
174
|
return errorMessageSplit[1];
|
|
170
175
|
})();
|
|
176
|
+
const closestMatches = nonexistentType === 'subcommand'
|
|
177
|
+
? useCommandSuggestions(`${parsed._[0]} ${errorMessageSplit[1]}`)
|
|
178
|
+
: [];
|
|
179
|
+
const messageParts = [
|
|
180
|
+
chalk.gray(`Nonexistent ${nonexistentType}: ${chalk.whiteBright(nonexistentRepresentation)}`),
|
|
181
|
+
];
|
|
182
|
+
if (closestMatches.length) {
|
|
183
|
+
messageParts.push(chalk.gray(` Did you mean: ${closestMatches.map((cmd) => chalk.whiteBright(cmd)).join(', ')}?`));
|
|
184
|
+
}
|
|
171
185
|
error({
|
|
172
186
|
message: [
|
|
173
|
-
|
|
174
|
-
` ${chalk.red('>')} See more help with --help`,
|
|
187
|
+
...messageParts,
|
|
175
188
|
'',
|
|
176
189
|
selectiveRenderHelpForCommand(command, {
|
|
177
190
|
showUsageString: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../src/entrypoints/_shared.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"_shared.js","sourceRoot":"","sources":["../../src/entrypoints/_shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { warning } from '../outputs.js';
|
|
|
4
4
|
export const DEVELOPMENT_VERSION_MARKER = '0.0.0';
|
|
5
5
|
export const DEVELOPMENT_HASH_MARKER = '0000000';
|
|
6
6
|
// These values are replaced with the actual values when building the CLI
|
|
7
|
-
const CLI_VERSION = "0.21.8-beta.
|
|
8
|
-
const CLI_HASH = "
|
|
7
|
+
const CLI_VERSION = "0.21.8-beta.22";
|
|
8
|
+
const CLI_HASH = "1f4f1bfd4de3152ebca3293460cab972583c031c";
|
|
9
9
|
function detectInstallMethod() {
|
|
10
10
|
// This if check is special, and gets replaced with an always-true branch when running from bun bundles
|
|
11
11
|
if (process.env.APIFY_CLI_BUNDLE) {
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { jaroWinkler } from '@skyra/jaro-winkler';
|
|
2
|
+
import levenshtein from 'js-levenshtein';
|
|
3
|
+
import { commandRegistry } from '../command-framework/apify-command.js';
|
|
4
|
+
import { cliDebugPrint } from '../utils/cliDebugPrint.js';
|
|
5
|
+
export function useCommandSuggestions(inputString) {
|
|
6
|
+
const allCommands = [...commandRegistry.entries()].sort(([a], [b]) => a.localeCompare(b));
|
|
7
|
+
const lowercasedCommandString = inputString.toLowerCase();
|
|
8
|
+
const closestMatches = allCommands
|
|
9
|
+
.map(([cmdString, cmdClass]) => {
|
|
10
|
+
const lowercased = cmdString.toLowerCase();
|
|
11
|
+
const cmdStringParts = cmdString.split(' ');
|
|
12
|
+
const lastPart = cmdStringParts[cmdStringParts.length - 1].toLowerCase();
|
|
13
|
+
const isAlias = cmdClass.aliases?.includes(lastPart) || cmdClass.hiddenAliases?.includes(lastPart) || false;
|
|
14
|
+
const levenshteinDistance = levenshtein(lowercasedCommandString, lowercased);
|
|
15
|
+
const jaroWinklerDistance = jaroWinkler(lowercasedCommandString, lowercased);
|
|
16
|
+
const matches = levenshteinDistance <= 2 || jaroWinklerDistance >= 0.975;
|
|
17
|
+
if (matches) {
|
|
18
|
+
cliDebugPrint('useCommandSuggestions', {
|
|
19
|
+
inputString: lowercasedCommandString,
|
|
20
|
+
lowercased,
|
|
21
|
+
matches,
|
|
22
|
+
levenshtein: levenshteinDistance,
|
|
23
|
+
jaroWinkler: jaroWinklerDistance,
|
|
24
|
+
});
|
|
25
|
+
if (!isAlias) {
|
|
26
|
+
return { string: `${lowercased}`, distance: jaroWinklerDistance };
|
|
27
|
+
}
|
|
28
|
+
return { string: `${lowercased} (alias for ${cmdClass.name})`, distance: jaroWinklerDistance };
|
|
29
|
+
}
|
|
30
|
+
return null;
|
|
31
|
+
})
|
|
32
|
+
.filter((item) => item !== null)
|
|
33
|
+
.sort((a, b) => b.distance - a.distance)
|
|
34
|
+
.map((item) => item.string);
|
|
35
|
+
return closestMatches;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=useCommandSuggestions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useCommandSuggestions.js","sourceRoot":"","sources":["../../../src/lib/hooks/useCommandSuggestions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,UAAU,qBAAqB,CAAC,WAAmB;IACxD,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1F,MAAM,uBAAuB,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAE1D,MAAM,cAAc,GAAG,WAAW;SAChC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAEzE,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;QAE5G,MAAM,mBAAmB,GAAG,WAAW,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAC;QAC7E,MAAM,mBAAmB,GAAG,WAAW,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAC;QAE7E,MAAM,OAAO,GAAG,mBAAmB,IAAI,CAAC,IAAI,mBAAmB,IAAI,KAAK,CAAC;QAEzE,IAAI,OAAO,EAAE,CAAC;YACb,aAAa,CAAC,uBAAuB,EAAE;gBACtC,WAAW,EAAE,uBAAuB;gBACpC,UAAU;gBACV,OAAO;gBACP,WAAW,EAAE,mBAAmB;gBAChC,WAAW,EAAE,mBAAmB;aAChC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;YACnE,CAAC;YAED,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,eAAe,QAAQ,CAAC,IAAI,GAAG,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;QAChG,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;SAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;SACvC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7B,OAAO,cAAc,CAAC;AACvB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apify-cli",
|
|
3
|
-
"version": "0.21.8-beta.
|
|
3
|
+
"version": "0.21.8-beta.22",
|
|
4
4
|
"description": "Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.",
|
|
5
5
|
"exports": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -95,6 +95,7 @@
|
|
|
95
95
|
"is-ci": "~4.1.0",
|
|
96
96
|
"istextorbinary": "~9.5.0",
|
|
97
97
|
"jju": "~1.4.0",
|
|
98
|
+
"js-levenshtein": "^1.1.6",
|
|
98
99
|
"lodash.clonedeep": "^4.5.0",
|
|
99
100
|
"mime": "~4.0.4",
|
|
100
101
|
"mixpanel": "~0.18.0",
|
|
@@ -127,6 +128,7 @@
|
|
|
127
128
|
"@types/inquirer": "^9.0.7",
|
|
128
129
|
"@types/is-ci": "^3.0.4",
|
|
129
130
|
"@types/jju": "^1.4.5",
|
|
131
|
+
"@types/js-levenshtein": "^1",
|
|
130
132
|
"@types/lodash.clonedeep": "^4",
|
|
131
133
|
"@types/mime": "^4.0.0",
|
|
132
134
|
"@types/node": "^22.0.0",
|