zcatalyst-cli 1.25.3 → 1.26.1

package/lib/fn-utils/lib/java/index.js

@@ -26,7 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTemplatePath = exports.validate = exports.extractAllData = exports.projectFileValidation = exports.ensureJavaInvoker = exports.isValidClassName = exports.classPathSep = exports.FN_TYPE = void 0;
+exports.classPathSep = exports.FN_TYPE = void 0;
+exports.isValidClassName = isValidClassName;
+exports.ensureJavaInvoker = ensureJavaInvoker;
+exports.projectFileValidation = projectFileValidation;
+exports.extractAllData = extractAllData;
+exports.validate = validate;
+exports.getTemplatePath = getTemplatePath;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const xml2js_1 = __importDefault(require("xml2js"));
@@ -57,7 +63,6 @@ function isValidClassName(name) {
     }
     return true;
 }
-exports.isValidClassName = isValidClassName;
 function ensureJavaInvoker(pth, invoker, target) {
     var _a, _b, _c;
     const spawnCommand = (0, ensure_java_userconfig_js_1.getJavaSpawnCommand)('javac', (_a = target.additionalInfo) === null || _a === void 0 ? void 0 : _a.binPath);
@@ -94,10 +99,9 @@ function ensureJavaInvoker(pth, invoker, target) {
     index_js_3.SYNC.copyDir((0, path_1.join)((0, path_1.dirname)(invoker), 'lib'), (0, path_1.join)((0, path_1.dirname)(classPth), 'lib'));
     return true;
 }
-exports.ensureJavaInvoker = ensureJavaInvoker;
 function projectFileValidation(pth, target) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const fileExists = yield index_js_3.ASYNC.fileExists(pth);
         if (!fileExists) {
             const templatePath = getTemplatePath(target.type, (_b = (_a = target.integ_config) === null || _a === void 0 ? void 0 : _a.at(0)) === null || _b === void 0 ? void 0 : _b.service);
@@ -119,7 +123,6 @@ function projectFileValidation(pth, target) {
         }
     });
 }
-exports.projectFileValidation = projectFileValidation;
 function extractAllData(child, name) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((res, rej) => {
@@ -137,16 +140,14 @@ function extractAllData(child, name) {
         });
     });
 }
-exports.extractAllData = extractAllData;
 function validate(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         return _validate(targets);
     });
 }
-exports.validate = validate;
-function _validate(targets, ensured = {}, idx = 0) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
+function _validate(targets_1) {
+    return __awaiter(this, arguments, void 0, function* (targets, ensured = {}, idx = 0) {
+        var _a;
         if (targets.length < idx + 1) {
             return;
         }
@@ -247,7 +248,6 @@ function getTemplatePath(fnType, add) {
         }
     }
 }
-exports.getTemplatePath = getTemplatePath;
 __exportStar(require("./classpath"), exports);
 __exportStar(require("./compile"), exports);
 __exportStar(require("./ensure-java-userconfig.js"), exports);

package/lib/fn-utils/lib/java/keywords.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containsKeyWord = exports.keywords = void 0;
+exports.keywords = void 0;
+exports.containsKeyWord = containsKeyWord;
 const js_1 = require("../../../util_modules/js");
 exports.keywords = Object.freeze([
     'abstract',
@@ -68,4 +69,3 @@ function containsKeyWord(name) {
         return false;
     });
 }
-exports.containsKeyWord = containsKeyWord;

package/lib/fn-utils/lib/node.d.ts

@@ -1,5 +1,5 @@
 import { TEMPLATE } from '../../util_modules/constants';
 import { IFnTarget, NodeFn } from './common';
 export declare function validate(targets: Array<IFnTarget<NodeFn>>): Promise<void>;
-export declare function checkNodePresence(): Promise<void>;
+export declare function ensureNodeVersion(stack: string, onlyDirPath?: boolean): Promise<string>;
 export declare function getTemplatePath(fnType: keyof typeof TEMPLATE.functions.node, add?: string): string;

package/lib/fn-utils/lib/node.js

@@ -12,29 +12,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTemplatePath = exports.checkNodePresence = exports.validate = void 0;
+exports.validate = validate;
+exports.ensureNodeVersion = ensureNodeVersion;
+exports.getTemplatePath = getTemplatePath;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const index_js_1 = __importDefault(require("../../error/index.js"));
 const npm_install_1 = __importDefault(require("../../init/dependencies/npm-install"));
-const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
 const env_js_1 = require("../../util_modules/env.js");
 const constants_1 = require("../../util_modules/constants");
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const shell_js_1 = require("../../util_modules/shell.js");
+const userConfig_js_1 = __importDefault(require("../../userConfig.js"));
+const utils_js_1 = require("../../util_modules/fs/utils.js");
+const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
 function validate(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         return _validate(targets);
     });
 }
-exports.validate = validate;
-function _validate(targets, idx = 0) {
-    return __awaiter(this, void 0, void 0, function* () {
+function _validate(targets_1) {
+    return __awaiter(this, arguments, void 0, function* (targets, idx = 0) {
         if (targets.length < idx + 1) {
             return;
         }
         const currentTarget = targets[idx];
+        if (currentTarget.valid === false) {
+            return _validate(targets, ++idx);
+        }
         try {
             const catalystFile = (0, path_1.join)(currentTarget.source, constants_1.FILENAME.catalyst_config);
             const data = yield fs_1.ASYNC.readJSONFile(catalystFile, { checkpath: true });
@@ -72,18 +78,65 @@ function _validate(targets, idx = 0) {
         }
     });
 }
-function checkNodePresence() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nodeChild = yield (0, shell_js_1.spawn)(env_js_1.isWindows ? 'where' : 'which', ['node'], {
-            cwd: runtime_store_js_1.default.get('cwd'),
-            stdio: 'pipe'
-        }).ASYNC();
-        if (nodeChild.status !== 0) {
-            throw new index_js_1.default('NodeJS not installed. Please install NodeJS to continue');
+function ensureNodeVersion(stack_1) {
+    return __awaiter(this, arguments, void 0, function* (stack, onlyDirPath = false) {
+        if (!stack.startsWith('node')) {
+            throw new index_js_1.default('Invalid stack passed for node: ' + stack, { exit: 2 });
+        }
+        const configKey = `${stack}.bin`;
+        let binPath = env_js_1.isExtension
+            ? runtime_store_js_1.default.get(`executables.${configKey}`)
+            : userConfig_js_1.default.get(configKey);
+        const bin = env_js_1.isWindows ? 'node.exe' : 'node';
+        if (binPath) {
+            binPath = (0, utils_js_1.untildify)(binPath);
+            if (!binPath.endsWith(bin))
+                binPath = (0, path_1.join)(binPath, bin);
+            const fileExists = yield fs_1.ASYNC.fileExists(binPath);
+            if (!fileExists) {
+                throw new index_js_1.default(`Invalid NodeJS binary path set for stack ${stack}`, {
+                    exit: 1,
+                    errorId: '',
+                    arg: [stack.replace('node', ''), (0, ansi_colors_1.bold)(binPath), (0, ansi_colors_1.bold)(configKey)]
+                });
+            }
+        }
+        else {
+            binPath = checkNodePresence(stack);
+        }
+        if (onlyDirPath) {
+            return (0, path_1.dirname)(binPath);
         }
+        return binPath;
     });
 }
-exports.checkNodePresence = checkNodePresence;
+function checkNodePresence(stack) {
+    const nodeVersion = `v${stack.replace('node', '')}`;
+    if (process.version.includes(nodeVersion)) {
+        return process.execPath;
+    }
+    const nodeVChild = (0, shell_js_1.spawn)('node', ['-v'], { stdio: 'pipe' }).SYNC();
+    if (!nodeVChild.stdout.toString().includes(nodeVersion)) {
+        throw new index_js_1.default(`Required NodeJS version ${nodeVersion} is not present in the system path`, {
+            exit: 1,
+            errorId: 'NODE-2',
+            arg: [
+                (0, ansi_colors_1.bold)(nodeVersion),
+                env_js_1.isExtension
+                    ? `settings ${(0, ansi_colors_1.italic)(`zcatalyst.${stack}`)}`
+                    : `${(0, ansi_colors_1.italic)('`catalyst config`')} command.\n\n${(0, ansi_colors_1.bold)('Example:')} ${(0, ansi_colors_1.italic)(`catalyst config:set ${stack}.bin=<path-to-node-${nodeVersion}-binary>`)}`
+            ]
+        });
+    }
+    const whichChild = (0, shell_js_1.spawn)('node', ['-p', 'process.execPath'], {
+        stdio: 'pipe'
+    }).SYNC();
+    const nodePath = whichChild.stdout.toString().trim();
+    if (!nodePath) {
+        throw new index_js_1.default(`Unable to find the file path for node ${nodeVersion} binary in system path`, { exit: 1 });
+    }
+    return nodePath;
+}
 function getTemplatePath(fnType, add) {
     switch (fnType) {
         case constants_1.FN_TYPE.browserLogic:
@@ -99,4 +152,3 @@ function getTemplatePath(fnType, add) {
         }
     }
 }
-exports.getTemplatePath = getTemplatePath;

package/lib/fn-utils/lib/python.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,7 +45,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeRequirements = exports.validate = void 0;
+exports.validate = validate;
+exports.removeRequirements = removeRequirements;
 const ansi_colors_1 = require("ansi-colors");
 const os_1 = require("os");
 const path_1 = __importStar(require("path"));
@@ -45,15 +56,13 @@ const pip_install_1 = require("../../init/dependencies/python/pip-install");
 const constants_1 = require("../../util_modules/constants");
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
-const validationResults = {};
 function validate(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         return _validate(targets);
     });
 }
-exports.validate = validate;
-function _validate(targets, idx = 0) {
-    return __awaiter(this, void 0, void 0, function* () {
+function _validate(targets_1) {
+    return __awaiter(this, arguments, void 0, function* (targets, idx = 0, validationResults = {}) {
         if (targets.length < idx + 1) {
             return;
         }
@@ -87,8 +96,9 @@ function _validate(targets, idx = 0) {
                 });
             }
             if (!(stack in validationResults)) {
-                yield (0, ensure_python_1.ensurePythonWithPip)(stack.replace('python_', '').replace('_', '.'));
-                validationResults[stack] = { valid: true };
+                const _bin = yield (0, ensure_python_1.ensurePythonWithPip)(stack.replace('python_', '').replace('_', '.'));
+                validationResults[stack] = { valid: true, bin: _bin };
+                currentTarget.additionalInfo = { binPath: _bin };
             }
             if (!validationResults[stack]['valid']) {
                 currentTarget.valid = validationResults[stack]['valid'];
@@ -96,8 +106,9 @@ function _validate(targets, idx = 0) {
             }
             else {
                 currentTarget.valid = true;
+                currentTarget.additionalInfo = { binPath: validationResults[stack]['bin'] };
             }
-            return _validate(targets, ++idx);
+            return _validate(targets, ++idx, validationResults);
         }
         catch (e) {
             const err = error_1.default.getErrorInstance(e);
@@ -106,21 +117,20 @@ function _validate(targets, idx = 0) {
             if (stack) {
                 validationResults[stack] = { valid: false, message: err.message };
             }
-            return _validate(targets, ++idx);
+            return _validate(targets, ++idx, validationResults);
         }
     });
 }
 function removeRequirements(reqFile, target) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', Date.now().toString());
         yield fs_1.ASYNC.ensureDir(tmpDir);
         yield fs_1.ASYNC.emptyDir(tmpDir);
-        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), true);
+        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.additionalInfo) === null || _a === void 0 ? void 0 : _a.binPath, true);
         const files = yield fs_1.ASYNC.walk(tmpDir, { depth: 1, includeDirPaths: true });
         yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
             yield fs_1.ASYNC.deleteFile((0, path_1.join)(target.source, path_1.default.basename(file.path)));
         })));
     });
 }
-exports.removeRequirements = removeRequirements;

package/lib/iac/status/util/index.d.ts

@@ -1,2 +1,2 @@
 import { IIacResponse } from '../../../endpoints/lib/iac';
-export declare const getSpinnerTxt: (type: 'bundle' | 'deploy' | 'codedeck') => (deployDetails: IIacResponse, status?: string) => string;
+export declare const getSpinnerTxt: (type: "bundle" | "deploy" | "codedeck") => (deployDetails: IIacResponse, status?: string) => string;

package/lib/init/dependencies/npm-install.js

@@ -16,14 +16,14 @@ const index_js_1 = __importDefault(require("../../error/index.js"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const env_js_1 = require("../../util_modules/env.js");
 const shell_1 = require("../../util_modules/shell");
-exports.default = (pth, skipPrompt = false) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (pth_1, ...args_1) => __awaiter(void 0, [pth_1, ...args_1], void 0, function* (pth, skipPrompt = false) {
     const ans = yield prompt_1.default.ask(prompt_1.default.question('NPMinstall', 'Do you wish to install all dependencies now ? ', {
         type: 'confirm',
         defaultAns: true,
         when: () => !skipPrompt
     }));
     if (ans.NPMinstall === undefined || ans.NPMinstall) {
-        return (0, shell_1.spawn)('npm', ['install'], { cwd: pth, detached: env_js_1.isVsCode })
+        return (0, shell_1.spawn)('npm', ['install'], { cwd: pth, detached: env_js_1.isExtension })
             .ASYNC()
             .catch((err) => {
             throw index_js_1.default.getErrorInstance(err, {

package/lib/init/dependencies/python/ensure-python.d.ts

@@ -1,2 +1,2 @@
-export declare function ensurePython(version: string, fallBackNeeded: boolean, skipHelp: boolean): Promise<void>;
-export declare function ensurePythonWithPip(version: string, fallBackNeeded?: boolean, skipHelp?: boolean): Promise<void>;
+export declare function ensurePython(version: string, fallBackNeeded: boolean, skipHelp: boolean): Promise<string>;
+export declare function ensurePythonWithPip(version: string, fallBackNeeded?: boolean, skipHelp?: boolean): Promise<string>;

package/lib/init/dependencies/python/ensure-python.js

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensurePythonWithPip = exports.ensurePython = void 0;
+exports.ensurePython = ensurePython;
+exports.ensurePythonWithPip = ensurePythonWithPip;
 const error_1 = __importDefault(require("../../../error"));
 const prompt_1 = __importDefault(require("../../../prompt"));
 const env_1 = require("../../../util_modules/env");
@@ -20,71 +21,68 @@ const shell_1 = require("../../../util_modules/shell");
 const userConfig_1 = __importDefault(require("../../../userConfig"));
 const ansi_colors_1 = require("ansi-colors");
 const console_1 = require("console");
+const utils_1 = require("../../../util_modules/fs/utils");
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const logger_1 = require("../../../util_modules/logger");
 function ensurePython(version, fallBackNeeded, skipHelp) {
     return __awaiter(this, void 0, void 0, function* () {
         const configKey = `python${version.replace('.', '_')}.bin`;
-        const spawnCommand = userConfig_1.default.get(configKey);
-        try {
-            if (spawnCommand) {
+        const spawnCommand = env_1.isExtension
+            ? runtime_store_1.default.get(`executables.${configKey}`)
+            : userConfig_1.default.get(configKey);
+        if (spawnCommand) {
+            try {
                 yield validateCommand(version, spawnCommand, true);
-                return;
+                return getPythonExecPath(spawnCommand);
+            }
+            catch (er) {
+                throw er;
             }
         }
-        catch (_a) { }
-        return new Promise((resolve, reject) => {
-            const child = (0, shell_1.spawn)('python' + version, ['--version'], {
-                stdio: 'ignore'
-            }).RAW();
-            child.on('error', (error) => __awaiter(this, void 0, void 0, function* () {
-                if (env_1.isWindows) {
-                    try {
-                        yield (0, shell_1.spawn)('py -' + version, ['--version'], {
-                            stdio: 'ignore'
-                        }).ASYNC();
-                        userConfig_1.default.set(configKey, 'py -' + version);
-                        return resolve();
-                    }
-                    catch (_a) { }
-                }
-                if (fallBackNeeded) {
-                    (0, console_1.info)(`unable to locate python${version} in your system`);
-                    const ans = yield prompt_1.default.ask(prompt_1.default.question('binPath', `Please provide the binary path for python${version}:`, {
-                        type: 'input'
-                    }));
-                    yield validateCommand(version, ans.binPath, skipHelp)
-                        .then(() => {
-                        userConfig_1.default.set(`python${version.replace('.', '_')}.bin`, ans.binPath);
-                        resolve();
-                    })
-                        .catch((err) => {
-                        reject(err);
-                    });
-                }
-                else {
-                    reject(new error_1.default(`unable to locate python${version} in your system`, {
-                        original: error,
-                        exit: 1,
-                        errorId: 'PY-2',
-                        arg: [
-                            version,
-                            (0, ansi_colors_1.italic)((0, ansi_colors_1.bold)(`catalyst config:set ${configKey}=<binary_path>`))
-                        ],
-                        skipHelp
-                    }));
+        try {
+            const fallBackSpawnCommand = 'python' + version;
+            yield validateCommand(version, fallBackSpawnCommand, true);
+            return getPythonExecPath(fallBackSpawnCommand);
+        }
+        catch (err) {
+            if (env_1.isWindows) {
+                try {
+                    const winPyLauncher = 'py -' + version;
+                    yield (0, shell_1.spawn)(winPyLauncher, ['--version'], {
+                        stdio: 'ignore'
+                    }).ASYNC();
+                    userConfig_1.default.set(configKey, winPyLauncher);
+                    yield validateCommand(version, winPyLauncher, true);
+                    return getPythonExecPath(winPyLauncher);
                 }
-            }));
-            child.on('exit', (code) => {
-                if (code === 0) {
-                    userConfig_1.default.set(configKey, 'python' + version);
+                catch (er) {
+                    (0, logger_1.debug)('Unable to locate PyLauncher in win: ' + er);
                 }
-                resolve();
+            }
+            if (fallBackNeeded) {
+                (0, console_1.info)(`unable to locate python${version} in your system`);
+                const ans = yield prompt_1.default.ask(prompt_1.default.question('binPath', `Please provide the binary path for python${version}:`, {
+                    type: 'input'
+                }));
+                yield validateCommand(version, ans.binPath, skipHelp);
+                userConfig_1.default.set(`python${version.replace('.', '_')}.bin`, ans.binPath);
+                return getPythonExecPath(ans.binPath);
+            }
+            const { errorId, config } = env_1.isExtension
+                ? { errorId: 'PY-2-EXT', config: 'zcatalyst.python_3_9' }
+                : { errorId: 'PY-2', config: `catalyst config:set ${configKey}=<binary_path>` };
+            throw new error_1.default(`unable to locate python${version} in your system`, {
+                exit: 1,
+                errorId: errorId,
+                arg: [version, (0, ansi_colors_1.italic)((0, ansi_colors_1.bold)(config))],
+                skipHelp
             });
-        });
+        }
     });
 }
-exports.ensurePython = ensurePython;
 function validateCommand(version, spawnCommand, skipHelp) {
     return __awaiter(this, void 0, void 0, function* () {
+        spawnCommand = (0, utils_1.untildify)(spawnCommand);
         const versionResponse = yield new Promise((resolve, reject) => {
             var _a;
             const child = (0, shell_1.spawn)(spawnCommand, ['--version'], {
@@ -126,11 +124,20 @@ function validateCommand(version, spawnCommand, skipHelp) {
         }
     });
 }
-function ensurePythonWithPip(version, fallBackNeeded = false, skipHelp = false) {
+function getPythonExecPath(spawnCommand) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield ensurePython(version, fallBackNeeded, skipHelp);
-        return new Promise((resolve, reject) => {
-            const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${version.replace('.', '_')}.bin`), ['-m', 'pip', '--version'], {
+        spawnCommand = (0, utils_1.untildify)(spawnCommand);
+        const pyVChild = (0, shell_1.spawn)(spawnCommand, ['-c', 'import sys;print(sys.executable)'], {
+            stdio: 'pipe'
+        }).SYNC();
+        return pyVChild.stdout.toString().trim();
+    });
+}
+function ensurePythonWithPip(version_1) {
+    return __awaiter(this, arguments, void 0, function* (version, fallBackNeeded = false, skipHelp = false) {
+        const pyBin = yield ensurePython(version, fallBackNeeded, skipHelp);
+        yield new Promise((resolve, reject) => {
+            const child = (0, shell_1.spawn)(pyBin, ['-m', 'pip', '--version'], {
                 stdio: 'ignore'
             }).RAW();
             child.on('error', (err) => {
@@ -144,6 +151,6 @@ function ensurePythonWithPip(version, fallBackNeeded = false, skipHelp = false)
             });
             child.on('exit', resolve);
         });
+        return pyBin;
     });
 }
-exports.ensurePythonWithPip = ensurePythonWithPip;

package/lib/init/dependencies/python/pip-install.d.ts

@@ -1,7 +1,5 @@
 import { asyncSpawnResposne } from '../../../util_modules/shell';
-declare const _default: (pth: string, stack: string, isIntegFn?: boolean, integService?: string | boolean) => Promise<asyncSpawnResposne | Array<asyncSpawnResposne> | void>;
-export default _default;
-export declare function ensurePyRuntime(pth: string, stack: string): Promise<void>;
+export declare function ensurePyRuntime(pth: string, stack: string, spawnCommand?: string): Promise<void>;
 export declare const pypiRes: (pkg: string) => Promise<Record<string, unknown>>;
-export declare function installRequirements(reqFile: string, pth: string, stackVersion: string, linuxMode?: boolean): Promise<void>;
-export declare function installPkgs(pkgs: Array<string>, stackVersion: string, pth?: string | undefined): Promise<asyncSpawnResposne>;
+export declare function installRequirements(reqFile: string, pth: string, spawnCommand?: string, linuxMode?: boolean): Promise<void>;
+export declare function installPkgs(pkgs: Array<string>, spawnCommand?: string, pth?: string | undefined): Promise<asyncSpawnResposne>;