apify-cli 0.21.4-beta.3 → 0.21.5-beta.0

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/lib/exec.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { spawn } from 'node:child_process';
2
- import { isAbsolute } from 'node:path';
2
+ import { normalizeExecutablePath } from './hooks/runtimes/utils.js';
3
3
  import { run } from './outputs.js';
4
4
  const windowsOptions = {
5
5
  shell: true,
@@ -9,7 +9,7 @@ const windowsOptions = {
9
9
  * Run child process and returns stdout and stderr to user stout
10
10
  */
11
11
  const spawnPromised = async (cmd, args, opts) => {
12
- const escapedCommand = isAbsolute(cmd) && process.platform === 'win32' ? `"${cmd}"` : cmd;
12
+ const escapedCommand = normalizeExecutablePath(cmd);
13
13
  // NOTE: Pipes stderr, stdout to main process
14
14
  const childProcess = spawn(escapedCommand, args, {
15
15
  ...opts,
@@ -1 +1 @@
1
- {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/lib/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,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,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1F,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
+ {"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;AAEnC,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,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;AA0CnD,wBAAsB,oBAAoB,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAiDxF"}
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;AA2CnD,wBAAsB,oBAAoB,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAiDxF"}
@@ -2,6 +2,7 @@ import process from 'node:process';
2
2
  import { none, some } from '@sapphire/result';
3
3
  import { execa } from 'execa';
4
4
  import which from 'which';
5
+ import { normalizeExecutablePath } from './utils.js';
5
6
  const cwdCache = new Map();
6
7
  // Runtimes, in order of preference
7
8
  const runtimesToCheck = {
@@ -42,7 +43,7 @@ export async function useJavaScriptRuntime(cwd = process.cwd()) {
42
43
  }
43
44
  for (const [runtime, args] of Object.entries(runtimesToCheck)) {
44
45
  try {
45
- const runtimePath = await which(runtime);
46
+ const runtimePath = normalizeExecutablePath(await which(runtime));
46
47
  const version = await getRuntimeVersion(runtimePath, args);
47
48
  if (version) {
48
49
  const res = {
@@ -51,7 +52,7 @@ export async function useJavaScriptRuntime(cwd = process.cwd()) {
51
52
  };
52
53
  // For npm, we also fetch the npm version
53
54
  if (runtime === 'node') {
54
- const npmPath = await which('npm').catch(() => null);
55
+ const npmPath = normalizeExecutablePath(await which('npm').catch(() => null));
55
56
  if (npmPath) {
56
57
  res.pmPath = npmPath;
57
58
  res.pmVersion = await getNpmVersion(npmPath);
@@ -1 +1 @@
1
- {"version":3,"file":"javascript.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/javascript.ts"],"names":[],"mappings":"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"}
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":"AAKA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAwBnD,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,CAuEvD"}
1
+ {"version":3,"file":"python.d.ts","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAyBnD,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,CA0EvD"}
@@ -5,6 +5,7 @@ import process from 'node:process';
5
5
  import { none, some } from '@sapphire/result';
6
6
  import { execa } from 'execa';
7
7
  import which from 'which';
8
+ import { normalizeExecutablePath } from './utils.js';
8
9
  const cwdCache = new Map();
9
10
  async function getPythonVersion(runtimePath) {
10
11
  try {
@@ -37,6 +38,7 @@ export async function usePythonRuntime({ cwd = process.cwd(), force = false, } =
37
38
  else {
38
39
  fullPythonVenvPath = join(cwd, '.venv', ...pathParts);
39
40
  }
41
+ fullPythonVenvPath = normalizeExecutablePath(fullPythonVenvPath);
40
42
  try {
41
43
  await access(fullPythonVenvPath);
42
44
  const version = await getPythonVersion(fullPythonVenvPath);
@@ -57,7 +59,7 @@ export async function usePythonRuntime({ cwd = process.cwd(), force = false, } =
57
59
  const fallbacks = ['python3', 'python', ...(isWindows ? ['python3.exe', 'python.exe'] : [])];
58
60
  for (const fallback of fallbacks) {
59
61
  try {
60
- const fullPath = await which(fallback);
62
+ const fullPath = normalizeExecutablePath(await which(fallback));
61
63
  const version = await getPythonVersion(fullPath);
62
64
  if (version) {
63
65
  cwdCache.set(cwd, some({
@@ -1 +1 @@
1
- {"version":3,"file":"python.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"python.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/python.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ export declare function normalizeExecutablePath(path: string): string;
2
+ export declare function normalizeExecutablePath(path: string | null): string | null;
3
+ //# sourceMappingURL=utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;AAC9D,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC"}
@@ -0,0 +1,19 @@
1
+ import { isAbsolute } from 'node:path';
2
+ import process from 'node:process';
3
+ export function normalizeExecutablePath(path) {
4
+ if (!path) {
5
+ return null;
6
+ }
7
+ // Already escaped
8
+ if (path.startsWith('"')) {
9
+ return path;
10
+ }
11
+ if (process.platform === 'win32') {
12
+ if (isAbsolute(path)) {
13
+ return `"${path}"`;
14
+ }
15
+ return path;
16
+ }
17
+ return path;
18
+ }
19
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/lib/hooks/runtimes/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,OAAO,MAAM,cAAc,CAAC;AAInC,MAAM,UAAU,uBAAuB,CAAC,IAAmB;IAC1D,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACb,CAAC;IAED,kBAAkB;IAClB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAClC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,IAAI,IAAI,GAAG,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}