apify-cli 0.21.5 → 0.21.6
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/CHANGELOG.md +6 -0
- package/README.md +63 -63
- package/dist/.tsbuildinfo +1 -1
- package/dist/lib/exec.d.ts.map +1 -1
- package/dist/lib/exec.js +2 -0
- package/dist/lib/exec.js.map +1 -1
- package/dist/lib/hooks/runtimes/javascript.d.ts.map +1 -1
- package/dist/lib/hooks/runtimes/javascript.js +4 -0
- package/dist/lib/hooks/runtimes/javascript.js.map +1 -1
- package/dist/lib/hooks/runtimes/python.d.ts.map +1 -1
- package/dist/lib/hooks/runtimes/python.js +7 -10
- package/dist/lib/hooks/runtimes/python.js.map +1 -1
- package/dist/lib/hooks/useActorConfig.d.ts.map +1 -1
- package/dist/lib/hooks/useActorConfig.js +3 -0
- package/dist/lib/hooks/useActorConfig.js.map +1 -1
- package/dist/lib/hooks/useCwdProject.d.ts.map +1 -1
- package/dist/lib/hooks/useCwdProject.js +4 -0
- package/dist/lib/hooks/useCwdProject.js.map +1 -1
- package/dist/lib/hooks/useModuleVersion.d.ts.map +1 -1
- package/dist/lib/hooks/useModuleVersion.js +8 -1
- package/dist/lib/hooks/useModuleVersion.js.map +1 -1
- package/dist/lib/utils/cliDebugPrint.d.ts +2 -0
- package/dist/lib/utils/cliDebugPrint.d.ts.map +1 -0
- package/dist/lib/utils/cliDebugPrint.js +7 -0
- package/dist/lib/utils/cliDebugPrint.js.map +1 -0
- package/dist/typechecking.tsbuildinfo +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
package/dist/lib/exec.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,wBAAwB,EAAS,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,wBAAwB,EAAS,MAAM,oBAAoB,CAAC;AA6C7F,MAAM,WAAW,kBAAkB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,wBAAwB,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAsB,WAAW,CAAC,EAAE,GAAG,EAAE,IAAS,EAAE,IAAS,EAAE,eAAe,EAAE,EAAE,kBAAkB,iBAGnG"}
|
package/dist/lib/exec.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { normalizeExecutablePath } from './hooks/runtimes/utils.js';
|
|
3
3
|
import { run } from './outputs.js';
|
|
4
|
+
import { cliDebugPrint } from './utils/cliDebugPrint.js';
|
|
4
5
|
const windowsOptions = {
|
|
5
6
|
shell: true,
|
|
6
7
|
windowsHide: true,
|
|
@@ -10,6 +11,7 @@ const windowsOptions = {
|
|
|
10
11
|
*/
|
|
11
12
|
const spawnPromised = async (cmd, args, opts) => {
|
|
12
13
|
const escapedCommand = normalizeExecutablePath(cmd);
|
|
14
|
+
cliDebugPrint('SpawnPromised', { escapedCommand, args, opts });
|
|
13
15
|
// NOTE: Pipes stderr, stdout to main process
|
|
14
16
|
const childProcess = spawn(escapedCommand, args, {
|
|
15
17
|
...opts,
|
package/dist/lib/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,MAAM,cAAc,GAAiB;IACpC,KAAK,EAAE,IAAI;IACX,WAAW,EAAE,IAAI;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,IAAc,EAAE,IAA8B,EAAE,EAAE;IAC3F,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAEpD,aAAa,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/D,6CAA6C;IAC7C,MAAM,YAAY,GAAG,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE;QAChD,GAAG,IAAI;QACP,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAChE,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;KACvD,CAAC,CAAC;IAEH,gDAAgD;IAChD,yDAAyD;IACzD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACzB,IAAI,CAAC;YACJ,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACR,iEAAiE;QAClE,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACjC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACjC,IAAI,IAAI,KAAK,CAAC;gBAAE,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AASF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,eAAe,EAAsB;IACnG,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,eAAe,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/javascript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/javascript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA4CnD,wBAAsB,oBAAoB,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAsDxF"}
|
|
@@ -3,6 +3,7 @@ import { none, some } from '@sapphire/result';
|
|
|
3
3
|
import { execa } from 'execa';
|
|
4
4
|
import which from 'which';
|
|
5
5
|
import { normalizeExecutablePath } from './utils.js';
|
|
6
|
+
import { cliDebugPrint } from '../../utils/cliDebugPrint.js';
|
|
6
7
|
const cwdCache = new Map();
|
|
7
8
|
// Runtimes, in order of preference
|
|
8
9
|
const runtimesToCheck = {
|
|
@@ -39,6 +40,7 @@ async function getNpmVersion(npmPath) {
|
|
|
39
40
|
export async function useJavaScriptRuntime(cwd = process.cwd()) {
|
|
40
41
|
const cached = cwdCache.get(cwd);
|
|
41
42
|
if (cached) {
|
|
43
|
+
cliDebugPrint('useJavaScriptRuntime', { cacheHit: true, cwd, runtime: cached.unwrapOr(null) });
|
|
42
44
|
return cached;
|
|
43
45
|
}
|
|
44
46
|
for (const [runtime, args] of Object.entries(runtimesToCheck)) {
|
|
@@ -67,6 +69,7 @@ export async function useJavaScriptRuntime(cwd = process.cwd()) {
|
|
|
67
69
|
res.pmName = runtime;
|
|
68
70
|
}
|
|
69
71
|
cwdCache.set(cwd, some(res));
|
|
72
|
+
cliDebugPrint('useJavaScriptRuntime', { cacheHit: false, cwd, runtime: cwdCache.get(cwd)?.unwrap() });
|
|
70
73
|
return some(res);
|
|
71
74
|
}
|
|
72
75
|
}
|
|
@@ -75,6 +78,7 @@ export async function useJavaScriptRuntime(cwd = process.cwd()) {
|
|
|
75
78
|
}
|
|
76
79
|
}
|
|
77
80
|
cwdCache.set(cwd, none);
|
|
81
|
+
cliDebugPrint('useJavaScriptRuntime', { cacheHit: false, cwd, runtime: null });
|
|
78
82
|
return none;
|
|
79
83
|
}
|
|
80
84
|
//# sourceMappingURL=javascript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/javascript.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAe,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/javascript.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python.d.ts","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"python.d.ts","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA0BnD,MAAM,WAAW,qBAAqB;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,gBAAgB,CAAC,EACtC,GAAmB,EACnB,KAAa,GACb,GAAE,qBAA0B,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAyEvD"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { access } from 'node:fs/promises';
|
|
2
1
|
import { platform } from 'node:os';
|
|
3
2
|
import { join } from 'node:path';
|
|
4
3
|
import process from 'node:process';
|
|
@@ -6,6 +5,7 @@ import { none, some } from '@sapphire/result';
|
|
|
6
5
|
import { execa } from 'execa';
|
|
7
6
|
import which from 'which';
|
|
8
7
|
import { normalizeExecutablePath } from './utils.js';
|
|
8
|
+
import { cliDebugPrint } from '../../utils/cliDebugPrint.js';
|
|
9
9
|
const cwdCache = new Map();
|
|
10
10
|
async function getPythonVersion(runtimePath) {
|
|
11
11
|
try {
|
|
@@ -27,6 +27,7 @@ async function getPythonVersion(runtimePath) {
|
|
|
27
27
|
export async function usePythonRuntime({ cwd = process.cwd(), force = false, } = {}) {
|
|
28
28
|
const cached = cwdCache.get(cwd);
|
|
29
29
|
if (cached && !force) {
|
|
30
|
+
cliDebugPrint('usePythonRuntime', { cacheHit: true, cwd, runtime: cached.unwrapOr(null) });
|
|
30
31
|
return cached;
|
|
31
32
|
}
|
|
32
33
|
const isWindows = platform() === 'win32';
|
|
@@ -40,17 +41,14 @@ export async function usePythonRuntime({ cwd = process.cwd(), force = false, } =
|
|
|
40
41
|
}
|
|
41
42
|
fullPythonVenvPath = normalizeExecutablePath(fullPythonVenvPath);
|
|
42
43
|
try {
|
|
43
|
-
await access(fullPythonVenvPath);
|
|
44
44
|
const version = await getPythonVersion(fullPythonVenvPath);
|
|
45
45
|
if (version) {
|
|
46
46
|
cwdCache.set(cwd, some({
|
|
47
47
|
executablePath: fullPythonVenvPath,
|
|
48
48
|
version,
|
|
49
49
|
}));
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
version,
|
|
53
|
-
});
|
|
50
|
+
cliDebugPrint('usePythonRuntime', { cacheHit: false, cwd, runtime: cwdCache.get(cwd)?.unwrap() });
|
|
51
|
+
return cwdCache.get(cwd);
|
|
54
52
|
}
|
|
55
53
|
}
|
|
56
54
|
catch {
|
|
@@ -66,10 +64,8 @@ export async function usePythonRuntime({ cwd = process.cwd(), force = false, } =
|
|
|
66
64
|
executablePath: fullPath,
|
|
67
65
|
version,
|
|
68
66
|
}));
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
version,
|
|
72
|
-
});
|
|
67
|
+
cliDebugPrint('usePythonRuntime', { cacheHit: false, cwd, runtime: cwdCache.get(cwd)?.unwrap() });
|
|
68
|
+
return cwdCache.get(cwd);
|
|
73
69
|
}
|
|
74
70
|
}
|
|
75
71
|
catch {
|
|
@@ -77,6 +73,7 @@ export async function usePythonRuntime({ cwd = process.cwd(), force = false, } =
|
|
|
77
73
|
}
|
|
78
74
|
}
|
|
79
75
|
cwdCache.set(cwd, none);
|
|
76
|
+
cliDebugPrint('usePythonRuntime', { cacheHit: false, cwd, runtime: null });
|
|
80
77
|
return none;
|
|
81
78
|
}
|
|
82
79
|
//# sourceMappingURL=python.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"python.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useActorConfig.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks/useActorConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"useActorConfig.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks/useActorConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAUxD,MAAM,MAAM,gBAAgB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,QAAQ,gCAAuC,CAAC;AAE7D,wBAAsB,cAAc,CACnC,EAAE,GAAmB,EAAE,aAAoB,EAAE,kBAAyB,EAAE,GAAE,gBAIzE,GACC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,CAiEtD"}
|
|
@@ -5,6 +5,7 @@ import { inspect } from 'node:util';
|
|
|
5
5
|
import { err, ok } from '@sapphire/result';
|
|
6
6
|
import { ACTOR_SPECIFICATION_VERSION, DEPRECATED_LOCAL_CONFIG_NAME } from '../consts.js';
|
|
7
7
|
import { error, info, warning } from '../outputs.js';
|
|
8
|
+
import { cliDebugPrint } from '../utils/cliDebugPrint.js';
|
|
8
9
|
import { confirmAction } from '../utils/confirm.js';
|
|
9
10
|
import { getJsonFileContent, getLocalConfigPath } from '../utils.js';
|
|
10
11
|
const getDeprecatedLocalConfigPath = (cwd) => join(cwd, DEPRECATED_LOCAL_CONFIG_NAME);
|
|
@@ -16,6 +17,7 @@ export async function useActorConfig({ cwd = process.cwd(), migrateConfig = true
|
|
|
16
17
|
}) {
|
|
17
18
|
const cached = cwdCache.get(cwd);
|
|
18
19
|
if (cached) {
|
|
20
|
+
cliDebugPrint('useActorConfig', { cacheHit: true, config: cached });
|
|
19
21
|
return ok(cached);
|
|
20
22
|
}
|
|
21
23
|
const newConfigPath = getLocalConfigPath(cwd);
|
|
@@ -62,6 +64,7 @@ export async function useActorConfig({ cwd = process.cwd(), migrateConfig = true
|
|
|
62
64
|
migrated = true;
|
|
63
65
|
}
|
|
64
66
|
cwdCache.set(cwd, { exists: true, migrated, config: config || deprecatedConfig || {} });
|
|
67
|
+
cliDebugPrint('useActorConfig', { cacheHit: false, config: cwdCache.get(cwd) });
|
|
65
68
|
return ok({ exists: true, migrated, config: config || deprecatedConfig || {} });
|
|
66
69
|
}
|
|
67
70
|
async function handleBothConfigVersionsFound(deprecatedConfigPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useActorConfig.js","sourceRoot":"","sources":["../../../src/lib/hooks/useActorConfig.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useActorConfig.js","sourceRoot":"","sources":["../../../src/lib/hooks/useActorConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCwdProject.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks/useCwdProject.ts"],"names":[],"mappings":"AAIA,OAAO,EAAM,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"useCwdProject.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks/useCwdProject.ts"],"names":[],"mappings":"AAIA,OAAO,EAAM,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAOnD,oBAAY,eAAe;IAC1B,UAAU,IAAI;IACd,MAAM,IAAI;IAEV,MAAM,IAAI;IACV,OAAO,IAAI;IAGX,gBAAgB,IAAI;CACpB;AAED,MAAM,WAAW,OAAO;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,eAAe,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC/B,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,yBAAgC,CAAC;AAEtD,wBAAsB,aAAa,CAAC,EACnC,GAAmB,GACnB,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAsFtE"}
|
|
@@ -5,6 +5,7 @@ import { ok } from '@sapphire/result';
|
|
|
5
5
|
import { useJavaScriptRuntime } from './runtimes/javascript.js';
|
|
6
6
|
import { usePythonRuntime } from './runtimes/python.js';
|
|
7
7
|
import { ScrapyProjectAnalyzer } from '../projects/scrapy/ScrapyProjectAnalyzer.js';
|
|
8
|
+
import { cliDebugPrint } from '../utils/cliDebugPrint.js';
|
|
8
9
|
export var ProjectLanguage;
|
|
9
10
|
(function (ProjectLanguage) {
|
|
10
11
|
ProjectLanguage[ProjectLanguage["JavaScript"] = 0] = "JavaScript";
|
|
@@ -20,6 +21,7 @@ export const cwdCache = new Map();
|
|
|
20
21
|
export async function useCwdProject({ cwd = process.cwd(), } = {}) {
|
|
21
22
|
const cached = cwdCache.get(cwd);
|
|
22
23
|
if (cached) {
|
|
24
|
+
cliDebugPrint('useCwdProject', { cacheHit: true, project: cached });
|
|
23
25
|
return ok(cached);
|
|
24
26
|
}
|
|
25
27
|
const project = {
|
|
@@ -71,8 +73,10 @@ export async function useCwdProject({ cwd = process.cwd(), } = {}) {
|
|
|
71
73
|
};
|
|
72
74
|
const maybeErr = await check();
|
|
73
75
|
if (maybeErr?.isErr()) {
|
|
76
|
+
cliDebugPrint('useCwdProject', { cacheHit: false, error: maybeErr });
|
|
74
77
|
return maybeErr;
|
|
75
78
|
}
|
|
79
|
+
cliDebugPrint('useCwdProject', { cacheHit: false, project });
|
|
76
80
|
cwdCache.set(cwd, project);
|
|
77
81
|
return ok(project);
|
|
78
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCwdProject.js","sourceRoot":"","sources":["../../../src/lib/hooks/useCwdProject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,EAAE,EAAe,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"useCwdProject.js","sourceRoot":"","sources":["../../../src/lib/hooks/useCwdProject.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useModuleVersion.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks/useModuleVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG3D,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"useModuleVersion.d.ts","sourceRoot":"","sources":["../../../src/lib/hooks/useModuleVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG3D,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGtE,MAAM,WAAW,qBAAqB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;CACpB;AAqED,wBAAsB,gBAAgB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CA0C9G"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { none, some } from '@sapphire/result';
|
|
2
2
|
import { execa } from 'execa';
|
|
3
3
|
import { ProjectLanguage } from './useCwdProject.js';
|
|
4
|
+
import { cliDebugPrint } from '../utils/cliDebugPrint.js';
|
|
4
5
|
const jsScript = (mod) => `
|
|
5
6
|
(async () => {
|
|
6
7
|
const [nodeModule, process, path, fs] = await Promise.all([
|
|
@@ -62,6 +63,7 @@ const moduleVersionScripts = {
|
|
|
62
63
|
};
|
|
63
64
|
export async function useModuleVersion({ moduleName, project }) {
|
|
64
65
|
if (!project.runtime) {
|
|
66
|
+
cliDebugPrint('useModuleVersion', { status: 'no_runtime_found', project, moduleName });
|
|
65
67
|
return none;
|
|
66
68
|
}
|
|
67
69
|
let moduleVersionScriptKey;
|
|
@@ -72,10 +74,12 @@ export async function useModuleVersion({ moduleName, project }) {
|
|
|
72
74
|
moduleVersionScriptKey = 'python';
|
|
73
75
|
}
|
|
74
76
|
else {
|
|
77
|
+
cliDebugPrint('useModuleVersion', { status: 'unsupported_project_type', project, moduleName });
|
|
75
78
|
return none;
|
|
76
79
|
}
|
|
77
80
|
const args = moduleVersionScripts[moduleVersionScriptKey]?.(moduleName);
|
|
78
81
|
if (!args) {
|
|
82
|
+
cliDebugPrint('useModuleVersion', { status: 'no_version_script_found', project, moduleName });
|
|
79
83
|
return none;
|
|
80
84
|
}
|
|
81
85
|
try {
|
|
@@ -84,11 +88,14 @@ export async function useModuleVersion({ moduleName, project }) {
|
|
|
84
88
|
windowsHide: true,
|
|
85
89
|
});
|
|
86
90
|
if (result.stdout.trim() === 'n/a') {
|
|
91
|
+
cliDebugPrint('useModuleVersion', { status: 'no_version_found', project, moduleName });
|
|
87
92
|
return none;
|
|
88
93
|
}
|
|
94
|
+
cliDebugPrint('useModuleVersion', { status: 'success', project, moduleName, version: result.stdout.trim() });
|
|
89
95
|
return some(result.stdout.trim());
|
|
90
96
|
}
|
|
91
|
-
catch {
|
|
97
|
+
catch (ex) {
|
|
98
|
+
cliDebugPrint('useModuleVersion', { status: 'failed_to_run_version_script', project, moduleName, error: ex });
|
|
92
99
|
return none;
|
|
93
100
|
}
|
|
94
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useModuleVersion.js","sourceRoot":"","sources":["../../../src/lib/hooks/useModuleVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAe,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAmB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"useModuleVersion.js","sourceRoot":"","sources":["../../../src/lib/hooks/useModuleVersion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliDebugPrint.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/cliDebugPrint.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,QAI5D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliDebugPrint.js","sourceRoot":"","sources":["../../../src/lib/utils/cliDebugPrint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,UAAU,aAAa,CAAC,GAAW,EAAE,GAAG,IAAe;IAC5D,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAChD,CAAC;AACF,CAAC"}
|