zcatalyst-cli 1.25.3 → 1.26.0

package/lib/fn-utils/index.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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fnUtils = void 0;
 const common = __importStar(require("./lib/common"));

package/lib/fn-utils/lib/browserLogic.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.downloadJavaDependencies = exports.getBrowserLogicFramework = void 0;
+exports.getBrowserLogicFramework = getBrowserLogicFramework;
+exports.downloadJavaDependencies = downloadJavaDependencies;
 const path_1 = require("path");
 const util_1 = require("util");
 const archiver_1 = __importDefault(require("../../archiver"));
@@ -40,9 +41,8 @@ function getBrowserLogicFramework(stack) {
         return framework.framework;
     });
 }
-exports.getBrowserLogicFramework = getBrowserLogicFramework;
-function downloadJavaDependencies(path, deps, isZip = true) {
-    return __awaiter(this, void 0, void 0, function* () {
+function downloadJavaDependencies(path_2, deps_1) {
+    return __awaiter(this, arguments, void 0, function* (path, deps, isZip = true) {
         const _commonAPI = yield (0, endpoints_1.commonAPI)();
         return Promise.all(deps.map((dep) => __awaiter(this, void 0, void 0, function* () {
             try {
@@ -65,4 +65,3 @@ function downloadJavaDependencies(path, deps, isZip = true) {
         })));
     });
 }
-exports.downloadJavaDependencies = downloadJavaDependencies;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FSWatcher } from 'chokidar';
 import { ReadStream } from 'fs-extra';
 import LocalFunction from '../../shell/dependencies/non-http-function';

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

@@ -12,7 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyModDirPerm = exports.updateFnConfig = exports.getSDK = exports.deleteFunctionLocal = exports.resolveAllFnPorts = exports.findAndReplaceConfigProps = exports.generateUrlForTarget = exports.pack = exports.executeHook = exports.refineTargets = exports.validate = void 0;
+exports.validate = validate;
+exports.refineTargets = refineTargets;
+exports.executeHook = executeHook;
+exports.pack = pack;
+exports.generateUrlForTarget = generateUrlForTarget;
+exports.findAndReplaceConfigProps = findAndReplaceConfigProps;
+exports.resolveAllFnPorts = resolveAllFnPorts;
+exports.deleteFunctionLocal = deleteFunctionLocal;
+exports.getSDK = getSDK;
+exports.updateFnConfig = updateFnConfig;
+exports.copyModDirPerm = copyModDirPerm;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("../../archiver"));
@@ -34,8 +44,8 @@ const option_1 = require("../../util_modules/option");
 const project_1 = require("../../util_modules/project");
 const os_1 = require("os");
 const pip_install_1 = require("../../init/dependencies/python/pip-install");
-function validate(skipFnFilter = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function validate() {
+    return __awaiter(this, arguments, void 0, function* (skipFnFilter = false) {
         const sourceDir = config_1.functionsConfig.source();
         const fnTargets = config_1.functionsConfig.targets();
         if (fnTargets === undefined || fnTargets.length === 0) {
@@ -127,9 +137,8 @@ function validate(skipFnFilter = false) {
         return filteredFnsPath;
     });
 }
-exports.validate = validate;
-function refineTargets(rawTargets = (0, functions_1.targets)([]), mapRemoteFn = true) {
-    return __awaiter(this, void 0, void 0, function* () {
+function refineTargets() {
+    return __awaiter(this, arguments, void 0, function* (rawTargets = (0, functions_1.targets)([]), mapRemoteFn = true) {
         let remoteFnMap = {};
         let runtimeDetails = runtime_store_1.default.get('context.catalyst.runtime', { runtimes: [] });
         const projectRoot = (0, project_1.getProjectRoot)();
@@ -260,7 +269,6 @@ function refineTargets(rawTargets = (0, functions_1.targets)([]), mapRemoteFn =
         })));
     });
 }
-exports.refineTargets = refineTargets;
 function refineEnvVariables(vars) {
     return !vars
         ? undefined
@@ -270,8 +278,8 @@ function refineEnvVariables(vars) {
             return envObj;
         }, {});
 }
-function executeHook({ prefix, command }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function executeHook(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ prefix, command }) {
         if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
             (0, logger_1.debug)(`skipping ${prefix + command} hook`);
             return;
@@ -283,10 +291,9 @@ function executeHook({ prefix, command }) {
         return (0, execute_script_1.default)('functions:' + prefix + command);
     });
 }
-exports.executeHook = executeHook;
 function pack(target) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
         try {
             let source = target.source;
             const buildPlugin = yield (0, plugin_loader_1.default)('functions', 'build', source).catch((err) => (0, logger_1.debug)(err));
@@ -338,7 +345,7 @@ function pack(target) {
                     const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', target.name + Date.now().toString());
                     yield fs_1.ASYNC.ensureDir(tmpDir);
                     yield fs_1.ASYNC.emptyDir(tmpDir);
-                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), true);
+                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_c = target.additionalInfo) === null || _c === void 0 ? void 0 : _c.binPath, true);
                     const files = yield fs_1.ASYNC.walk(tmpDir);
                     files.forEach((file) => {
                         zip.add(file.path.replace(tmpDir + path_1.sep, ''), file.stats.isSymbolicLink()
@@ -360,7 +367,6 @@ function pack(target) {
         }
     });
 }
-exports.pack = pack;
 function generateUrlForTarget(target) {
     const domainPrefix = (0, project_1.getDomainPrefix)(false);
     if (!domainPrefix) {
@@ -384,9 +390,8 @@ function generateUrlForTarget(target) {
     }
     return target.url;
 }
-exports.generateUrlForTarget = generateUrlForTarget;
-function findAndReplaceConfigProps(dir, { stack, type, integ_config, integ_handler }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function findAndReplaceConfigProps(dir_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (dir, { stack, type, integ_config, integ_handler }) {
         return fs_1.ASYNC.findAndReplace(dir)([
             constants_1.PLACEHOLDER.catalyst_config.stack,
             constants_1.PLACEHOLDER.catalyst_config.type,
@@ -395,7 +400,6 @@ function findAndReplaceConfigProps(dir, { stack, type, integ_config, integ_handl
         ], [stack, constants_1.REMOTE_REF.functions.type[type], integ_config, integ_handler]);
     });
 }
-exports.findAndReplaceConfigProps = findAndReplaceConfigProps;
 function resolveAllFnServePort(targets) {
     return __awaiter(this, void 0, void 0, function* () {
         const debugOpts = runtime_store_1.default.get('context.port.debug', false);
@@ -449,7 +453,6 @@ function resolveAllFnPorts(targets) {
         }
     });
 }
-exports.resolveAllFnPorts = resolveAllFnPorts;
 function fnDirDelete(conf) {
     return __awaiter(this, void 0, void 0, function* () {
         const fnSource = conf.get('functions.source', false);
@@ -482,9 +485,8 @@ function deleteFunctionLocal(path) {
         return conf.syncSave();
     });
 }
-exports.deleteFunctionLocal = deleteFunctionLocal;
-function getSDK(fnType, dest, stack, options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getSDK(fnType_1, dest_1, stack_1) {
+    return __awaiter(this, arguments, void 0, function* (fnType, dest, stack, options = {}) {
         const sdk = yield (0, endpoints_1.sdkAPI)();
         let sdkZip;
         switch (stack) {
@@ -502,7 +504,6 @@ function getSDK(fnType, dest, stack, options = {}) {
             .finalize();
     });
 }
-exports.getSDK = getSDK;
 function updateFnConfig(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const targetConfig = target.configuration;
@@ -558,9 +559,8 @@ function updateFnConfig(target) {
         (0, logger_1.success)(`Memory configuration for function ${(0, ansi_colors_1.bold)(target.name)}(${target.id}) has been updated to ${(0, ansi_colors_1.bold)(memValue + ' MB')}`);
     });
 }
-exports.updateFnConfig = updateFnConfig;
-function copyModDirPerm(src, dest, perm, { replace = true } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function copyModDirPerm(src_1, dest_1, perm_1) {
+    return __awaiter(this, arguments, void 0, function* (src, dest, perm, { replace = true } = {}) {
         const srcContents = yield fs_1.ASYNC.walk(src, { includeDirPaths: true, depth: 1 });
         srcContents.shift();
         yield Promise.all(srcContents.map((content) => {
@@ -591,4 +591,3 @@ function copyModDirPerm(src, dest, perm, { replace = true } = {}) {
         return fs_1.ASYNC.chmod(dest, perm);
     });
 }
-exports.copyModDirPerm = copyModDirPerm;

package/lib/fn-utils/lib/integ.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.copyIntegHandlers = exports.integHelper = void 0;
+exports.integHelper = integHelper;
+exports.copyIntegHandlers = copyIntegHandlers;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const index_js_1 = __importDefault(require("../../error/index.js"));
@@ -78,7 +79,6 @@ function integHelper(services) {
         }
     });
 }
-exports.integHelper = integHelper;
 function copyIntegHandlers(templatePath, targetPath, lang) {
     return __awaiter(this, void 0, void 0, function* () {
         const service = runtime_store_1.default.get('context.functions.integration.service', false);
@@ -137,4 +137,3 @@ function copyIntegHandlers(templatePath, targetPath, lang) {
         runtime_store_1.default.set('context.functions.integration.config', configString);
     });
 }
-exports.copyIntegHandlers = copyIntegHandlers;

package/lib/fn-utils/lib/java/classpath.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.normaliseClasspath = exports.rewriteClasspath = void 0;
+exports.rewriteClasspath = rewriteClasspath;
+exports.normaliseClasspath = normaliseClasspath;
 const path_1 = require("path");
 const error_1 = __importDefault(require("../../../error"));
 const fs_1 = require("../../../util_modules/fs");
@@ -51,7 +52,6 @@ function rewriteClasspath(pth, libPth) {
         return fs_1.ASYNC.writeFile(pth, builder.buildObject(result));
     });
 }
-exports.rewriteClasspath = rewriteClasspath;
 function normaliseClasspath(pth, libFolder) {
     return __awaiter(this, void 0, void 0, function* () {
         const content = yield fs_1.ASYNC.readFile(pth);
@@ -104,4 +104,3 @@ function normaliseClasspath(pth, libFolder) {
         return fs_1.ASYNC.writeFile(pth, builder.buildObject(result));
     });
 }
-exports.normaliseClasspath = normaliseClasspath;

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

@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printCompilationLog = exports.compileTarget = exports.warningMessages = void 0;
+exports.warningMessages = void 0;
+exports.compileTarget = compileTarget;
+exports.printCompilationLog = printCompilationLog;
 const path_1 = require("path");
 const constants_1 = require("../../../util_modules/constants");
 const ensure_java_userconfig_1 = require("./ensure-java-userconfig");
@@ -30,8 +32,8 @@ exports.warningMessages = [
     'warning: [options] system modules path not set in conjunction with -source 11'
 ];
 function compileTarget(target) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const targetSource = target.source;
         const outputFolder = (0, path_1.join)(targetSource, constants_1.FOLDERNAME.output);
         const integ = target.integ_config;
@@ -105,7 +107,6 @@ function compileTarget(target) {
         }
     });
 }
-exports.compileTarget = compileTarget;
 function compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outputFolder) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, index_1.message)('Compiling ' + file);
@@ -219,4 +220,3 @@ function printCompilationLog(javaFns) {
         });
     }
 }
-exports.printCompilationLog = printCompilationLog;

package/lib/fn-utils/lib/java/ensure-java-userconfig.d.ts

@@ -14,6 +14,16 @@ export declare const stackVsVersions: {
         target: string;
         label: string;
     };
+    java21: {
+        version: string;
+        target: string;
+        label: string;
+    };
+    java25: {
+        version: string;
+        target: string;
+        label: string;
+    };
 };
 type javaProcess = 'java' | 'javac';
 export declare function ensureJava(stack: string): Promise<string | void>;

package/lib/fn-utils/lib/java/ensure-java-userconfig.js

@@ -12,7 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetVersion = exports.getJavaSpawnCommand = exports.ensureJava = exports.stackVsVersions = void 0;
+exports.stackVsVersions = void 0;
+exports.ensureJava = ensureJava;
+exports.getJavaSpawnCommand = getJavaSpawnCommand;
+exports.getTargetVersion = getTargetVersion;
 const semver_1 = require("semver");
 const error_1 = __importDefault(require("../../../error"));
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
@@ -23,6 +26,7 @@ const ansi_colors_1 = require("ansi-colors");
 const index_1 = require("../../../util_modules/logger/index");
 const env_1 = require("../../../util_modules/env");
 const jdk_utils_1 = require("jdk-utils");
+const utils_1 = require("../../../util_modules/fs/utils");
 exports.stackVsVersions = {
     java8: {
         version: '1.8.x',
@@ -38,6 +42,16 @@ exports.stackVsVersions = {
         version: '17.x',
         target: '17',
         label: 'Java 17'
+    },
+    java21: {
+        version: '21.x',
+        target: '21',
+        label: 'Java 21'
+    },
+    java25: {
+        version: '25.x',
+        target: '25',
+        label: 'Java 25'
     }
 };
 class JavaRuntimes {
@@ -74,22 +88,27 @@ class JavaRuntimes {
         return (0, path_1.join)(home, 'bin');
     }
 }
+const runtimeBinPathCache = 'context.java.runtimeBinPathCache';
 function ensureJava(stack) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const runtimeCacheKey = `${runtimeBinPathCache}.${stack}`;
+        if (runtime_store_1.default.get(runtimeCacheKey)) {
+            return runtime_store_1.default.get(runtimeCacheKey);
+        }
         const configKey = `${stack}.bin`;
-        const binPath = env_1.isVsCode
+        const binPath = env_1.isExtension
             ? runtime_store_1.default.get(`executables.${configKey}`)
             : userConfig_1.default.get(configKey);
         if (!binPath) {
             const javaRuntimes = yield JavaRuntimes.init();
             const runtimeArr = javaRuntimes.get(stack);
             if (runtimeArr && runtimeArr.length > 1) {
-                if (env_1.isVsCode) {
+                if (env_1.isExtension) {
                     (0, index_1.info)();
                     (0, index_1.labeled)(stack, `Found more than one java runtime for java major version ${stack.replace('java', '')} in the below paths`).WARN();
                     runtimeArr === null || runtimeArr === void 0 ? void 0 : runtimeArr.forEach((rn) => {
-                        (0, index_1.labeled)(stack, '  * ' + rn.homedir).WARN();
+                        (0, index_1.labeled)(stack, '  * ' + (0, path_1.join)(rn.homedir, 'bin')).WARN();
                     });
                     (0, index_1.info)();
                     (0, index_1.labeled)(stack, `Please specify the required java runtime for stack ${stack} using the "zcatalyst.${configKey}" config`).WARN();
@@ -102,7 +121,7 @@ function ensureJava(stack) {
                     errorId: 'JAVA_CONFIG_MORE_RN',
                     arg: [
                         stack.replace('java', ''),
-                        runtimeArr.map((rn) => '* ' + rn.homedir).join('\n'),
+                        runtimeArr.map((rn) => '* ' + (0, path_1.join)(rn.homedir, 'bin')).join('\n'),
                         (0, ansi_colors_1.bold)('catalyst config:set'),
                         (0, ansi_colors_1.bold)(`catalyst config:set ${configKey}=${(rnWithJavac && (0, ansi_colors_1.underline)((0, path_1.join)(rnWithJavac.homedir, 'bin'))) ||
                             '<java_bin_folder_path>'}`)
@@ -111,7 +130,7 @@ function ensureJava(stack) {
             }
             const runtime = runtimeArr === null || runtimeArr === void 0 ? void 0 : runtimeArr.at(0);
             if (!runtime) {
-                if (env_1.isVsCode) {
+                if (env_1.isExtension) {
                     (0, index_1.labeled)(stack, 'Unable to detect the java version for stack: ' + stack).ERROR();
                     (0, index_1.labeled)(stack, `Please install the required JDK version and configure it using the "zcatalyst.${configKey}" settings`).ERROR();
                     (0, index_1.info)();
@@ -123,9 +142,10 @@ function ensureJava(stack) {
                 });
             }
             if (!runtime.hasJavac) {
-                if (env_1.isVsCode) {
+                if (env_1.isExtension) {
                     (0, index_1.labeled)(stack, 'Unable to detect the javac executable for stack: ' + stack).ERROR();
-                    (0, index_1.labeled)(stack, 'Please install the required JDK version and configure it using the ' + env_1.isVsCode
+                    (0, index_1.labeled)(stack, 'Please install the required JDK version and configure it using the ' +
+                        env_1.isExtension
                         ? ` "catalyst config:set ${configKey}=<java_bin_dir_path>" command`
                         : `zcatalyst.${configKey} settings`).ERROR();
                     (0, index_1.info)();
@@ -155,23 +175,24 @@ function ensureJava(stack) {
                 ]
             });
         }
+        const _binPath = (0, utils_1.untildify)(binPath);
         try {
-            const foundStack = yield findJavaVersion(binPath);
+            const foundStack = yield findJavaVersion(_binPath);
             if (!foundStack || !(foundStack in exports.stackVsVersions)) {
-                if (env_1.isVsCode) {
-                    (0, index_1.labeled)(stack, `The required Java runtime version for ${stack} was not found in the supplied setting zcatalyst.${configKey}=${(0, ansi_colors_1.underline)(binPath)}`).ERROR();
+                if (env_1.isExtension) {
+                    (0, index_1.labeled)(stack, `The required Java runtime version for ${stack} was not found in the supplied setting zcatalyst.${configKey}=${(0, ansi_colors_1.underline)(_binPath)}`).ERROR();
                     (0, index_1.labeled)(stack, `Please install the required java version and configure it using the zcatalyst.${configKey} settings`).ERROR();
                     (0, index_1.info)();
                     return;
                 }
-                throw new error_1.default('Unable to find the required java version from bin path: ' + binPath, {
+                throw new error_1.default('Unable to find the required java version from bin path: ' + _binPath, {
                     exit: 1,
                     errorId: 'JAVA_CONFIG-1A',
-                    arg: [(0, ansi_colors_1.bold)(configKey), (0, ansi_colors_1.underline)((0, path_1.join)(binPath, (0, ansi_colors_1.red)('java'))), stack, 'java']
+                    arg: [(0, ansi_colors_1.bold)(configKey), (0, ansi_colors_1.underline)((0, path_1.join)(_binPath, (0, ansi_colors_1.red)('java'))), stack, 'java']
                 });
             }
             if (foundStack !== stack) {
-                if (env_1.isVsCode) {
+                if (env_1.isExtension) {
                     (0, index_1.labeled)(stack, `The version of java executable found in the bin path from the config ${stack}.bin does not match with the required stack`).ERROR();
                     (0, index_1.labeled)(stack, `Please specify a valid bin path for the stack ${stack} in the settings "zcatalyst.${configKey}"`).ERROR();
                     (0, index_1.info)();
@@ -199,19 +220,19 @@ function ensureJava(stack) {
             throw error;
         }
         try {
-            yield findJavaCVersion(binPath);
+            yield findJavaCVersion(_binPath);
         }
         catch (er) {
             const error = error_1.default.getErrorInstance(er, { skipHelp: true });
             if (error.original instanceof Error &&
                 'code' in error.original &&
                 error.original.code === 'ENOENT') {
-                throw new error_1.default(`Unable to check the javac version using the given binary path: ${binPath}`, {
+                throw new error_1.default(`Unable to check the javac version using the given binary path: ${_binPath}`, {
                     exit: 1,
                     errorId: 'JAVA_CONFIG-1A',
                     arg: [
                         (0, ansi_colors_1.bold)(`${stack}.bin`),
-                        (0, ansi_colors_1.underline)((0, path_1.join)(binPath, (0, ansi_colors_1.red)('javac'))),
+                        (0, ansi_colors_1.underline)((0, path_1.join)(_binPath, (0, ansi_colors_1.red)('javac'))),
                         stack,
                         'javac'
                     ]
@@ -219,13 +240,16 @@ function ensureJava(stack) {
             }
             throw error;
         }
-        return binPath ? binPath : '';
+        if (_binPath) {
+            runtime_store_1.default.set(runtimeCacheKey, _binPath);
+            return _binPath;
+        }
+        return;
     });
 }
-exports.ensureJava = ensureJava;
 function findJavaVersion(bin) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const javaVersionOut = yield (0, shell_1.spawn)(getJavaSpawnCommand('java', bin), ['-version'], {
             stdio: 'pipe'
         }).ASYNC();
@@ -257,8 +281,6 @@ function findJavaCVersion(bin) {
 function getJavaSpawnCommand(process, binPath) {
     return binPath ? (0, path_1.join)(binPath, process) : process;
 }
-exports.getJavaSpawnCommand = getJavaSpawnCommand;
 function getTargetVersion(stack) {
     return exports.stackVsVersions[stack].target;
 }
-exports.getTargetVersion = getTargetVersion;

package/lib/fn-utils/lib/java/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import { TEMPLATE } from '../../../util_modules/constants/index.js';
 import { IFnTarget, JavaFn } from '../common.js';

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;