zcatalyst-cli 1.20.2 → 1.22.0

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

@@ -17,14 +17,14 @@ const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("../../archiver"));
 const endpoints_1 = require("../../endpoints");
-const catalyst_details_1 = __importDefault(require("../../endpoints/lib/catalyst-details"));
-const error_1 = __importDefault(require("../../error"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
 const execute_script_1 = __importDefault(require("../../execute-script"));
 const plugin_loader_1 = __importDefault(require("../../plugin-loader"));
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
+const functions_1 = require("../../util_modules/config/lib/functions");
 const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const fs_1 = require("../../util_modules/fs");
@@ -34,12 +34,12 @@ 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() {
+function validate(skipFnFilter = false) {
     return __awaiter(this, void 0, void 0, function* () {
-        const sourceDir = (0, project_1.resolveProjectPath)(config_1.functionsConfig.source());
+        const sourceDir = config_1.functionsConfig.source();
         const fnTargets = config_1.functionsConfig.targets();
         if (fnTargets === undefined || fnTargets.length === 0) {
-            throw new error_1.default('targets was found to be empty', {
+            throw new index_js_1.default('targets was found to be empty', {
                 exit: 1,
                 errorId: 'COMMON-1',
                 arg: [(0, ansi_colors_1.bold)('targets'), (0, ansi_colors_1.bold)(constants_1.FILENAME.config)]
@@ -47,7 +47,7 @@ function validate() {
         }
         const sourceExists = yield fs_1.ASYNC.dirExists(sourceDir);
         if (!sourceExists) {
-            throw new error_1.default(sourceDir + ' directory was not found', {
+            throw new index_js_1.default(sourceDir + ' directory was not found', {
                 exit: 1,
                 errorId: 'COMMON-2',
                 arg: [(0, ansi_colors_1.bold)((0, path_1.basename)(sourceDir)), (0, ansi_colors_1.bold)(constants_1.FILENAME.config)]
@@ -56,31 +56,36 @@ function validate() {
         const only = (0, option_1.getOptionValue)('only');
         let fnFilterGroups = [];
         if (only !== undefined) {
-            fnFilterGroups = only
-                .split(',')
-                .filter((filter) => {
+            fnFilterGroups = only.split(',').reduce((onlyGroup, filter) => {
                 const opts = filter.split(':');
-                return opts[0] === 'functions' && opts[1];
-            })
-                .map((filter) => filter.split(':')[1]);
+                if (opts.at(0) === 'functions' && opts.at(1)) {
+                    onlyGroup.push(opts[1]);
+                }
+                else if (skipFnFilter && opts.length === 1 && opts.at(0)) {
+                    onlyGroup.push(opts.at(0));
+                }
+                return onlyGroup;
+            }, []);
         }
         else {
             const except = (0, option_1.getOptionValue)('except', null);
             if (except !== null) {
                 const invalidFn = [];
-                const exceptFnGroup = js_1.JS.chain(except.split(','))
-                    .filter((filter) => {
-                    const opts = filter.split(':');
-                    if (opts[0] === 'functions' && opts[1]) {
-                        if (fnTargets.includes(opts[1])) {
-                            return true;
-                        }
-                        invalidFn.push(opts[1]);
+                const exceptFnGroup = except.split(',').reduce((exceptGroup, filter) => {
+                    const [_target, _fn] = filter.split(':');
+                    let target;
+                    if (_target === 'functions' && _fn) {
+                        target = _fn;
                     }
-                    return false;
-                })
-                    .map((filter) => filter.split(':')[1])
-                    .value();
+                    else if (skipFnFilter && _target && _fn === undefined) {
+                        target = _target;
+                    }
+                    target &&
+                        (fnTargets.includes(target)
+                            ? exceptGroup.push(target)
+                            : invalidFn.push(target));
+                    return exceptGroup;
+                }, []);
                 if (invalidFn.length > 0) {
                     (0, logger_1.message)(`The filters ${(0, ansi_colors_1.bold)(invalidFn.join(', '))} provided with --except option does not match with any functions in ${constants_1.FILENAME.config}, hence ignored.`);
                 }
@@ -101,7 +106,7 @@ function validate() {
             });
             if (unmatchedFilters.length > 0) {
                 const formattedTargets = fnTargets.map((fn) => '* ' + fn).join('\n');
-                throw new error_1.default('The filters ' +
+                throw new index_js_1.default('The filters ' +
                     (0, ansi_colors_1.bold)(unmatchedFilters.join(', ')) +
                     ' provided with --only option does not match with any functions in ' +
                     constants_1.FILENAME.config, {
@@ -123,20 +128,19 @@ function validate() {
     });
 }
 exports.validate = validate;
-function refineTargets(rawTargets, mapRemoteFn = true) {
+function refineTargets(rawTargets = (0, functions_1.targets)([]), mapRemoteFn = true) {
     return __awaiter(this, void 0, void 0, function* () {
         let remoteFnMap = {};
         let runtimeDetails = runtime_store_1.default.get('context.catalyst.runtime', { runtimes: [] });
+        const projectRoot = (0, project_1.getProjectRoot)();
+        if (runtimeDetails.runtimes.length === 0) {
+            runtimeDetails = yield (yield (0, endpoints_1.detailsAPI)()).getDetails('runtime');
+            runtime_store_1.default.set('context.catalyst.runtime', runtimeDetails);
+        }
         if (mapRemoteFn) {
             const fnAPI = yield (0, endpoints_1.functionsAPI)();
             let allRemoteFns = [];
-            [allRemoteFns, runtimeDetails] = yield Promise.all([
-                fnAPI.getAllFunctions(),
-                runtimeDetails
-                    ? Promise.resolve(runtimeDetails)
-                    : new catalyst_details_1.default().getDetails('runtime')
-            ]);
-            runtime_store_1.default.set('context.catalyst.runtime', runtimeDetails);
+            allRemoteFns = (yield fnAPI.getAllFunctions());
             if (!Array.isArray(allRemoteFns) || allRemoteFns.length === 0) {
                 allRemoteFns = [];
             }
@@ -148,15 +152,26 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
         return Promise.all(rawTargets.map((fnPath) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             fnPath = (0, project_1.resolveProjectPath)(fnPath);
+            if (!(yield fs_1.ASYNC.isPathExists(fnPath))) {
+                return {
+                    name: (0, path_1.basename)(fnPath),
+                    source: fnPath,
+                    valid: false,
+                    failure_reason: `the function directory(${fnPath}) does not exist`
+                };
+            }
             const catalystJsonPth = (0, path_1.join)(fnPath, constants_1.FILENAME.catalyst_config);
             const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth, {
                 checkpath: true,
                 throws: false
             });
+            const fnName = js_1.JS.get(catalystJson, 'deployment.name');
+            const buildPath = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, fnName);
             if (!catalystJson) {
                 return {
                     name: (0, path_1.basename)(fnPath),
                     source: fnPath,
+                    build: buildPath,
                     valid: false,
                     failure_reason: 'there is no valid ' + constants_1.FILENAME.catalyst_config + ' file present'
                 };
@@ -167,7 +182,7 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                     yield validatePlugin((0, option_1.getCurrentCommand)(), fnPath, runtime_store_1.default, catalystJson);
                 }
                 catch (e) {
-                    throw new error_1.default(e.message, {
+                    throw new index_js_1.default(e.message, {
                         exit: 1,
                         errorId: 'COMMON-4',
                         original: e,
@@ -175,7 +190,6 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                     });
                 }
             }
-            const fnName = js_1.JS.get(catalystJson, 'deployment.name');
             const userStack = js_1.JS.get(catalystJson, 'deployment.stack');
             const fnType = constants_1.REFERENCE.functions.type[js_1.JS.get(catalystJson, 'deployment.type')];
             if (!userStack ||
@@ -183,6 +197,7 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 return {
                     name: (0, path_1.basename)(fnPath),
                     source: fnPath,
+                    build: buildPath,
                     valid: false,
                     type: fnType,
                     failure_reason: 'deployment.stack is unknown in ' + constants_1.FILENAME.catalyst_config + ' file.'
@@ -196,6 +211,7 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                         return {
                             name: fnName,
                             source: fnPath,
+                            build: buildPath,
                             valid: false,
                             type: fnType,
                             failure_reason: `Stack ${userStack} is no longer supported for creation. Kindly change the stack in ${constants_1.FILENAME.catalyst_config} and try again.`
@@ -207,6 +223,7 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                     return {
                         name: fnName,
                         source: fnPath,
+                        build: buildPath,
                         valid: false,
                         type: fnType,
                         failure_reason: `Stack ${userStack} is no longer support. Kindly change the stack in ${constants_1.FILENAME.catalyst_config} and try again.`
@@ -229,9 +246,11 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 type: fnType,
                 index: js_1.JS.get(catalystJson, 'execution.main'),
                 source: fnPath,
+                build: buildPath,
                 valid: true,
                 integ_config: js_1.JS.get(catalystJson, 'deployment.integration_config'),
                 env_var: refineEnvVariables(js_1.JS.get(catalystJson, 'deployment.env_variables')),
+                inputs: js_1.JS.get(catalystJson, 'execution.test_inputs', {}),
                 memory: fnMemory
             };
             if (mapRemoteFn && remoteFnMap[fnTarget.name] !== undefined) {
@@ -252,15 +271,17 @@ function refineEnvVariables(vars) {
         }, {});
 }
 function executeHook({ prefix, command }) {
-    if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
-        (0, logger_1.debug)(`skipping ${prefix + command} hook`);
-        return;
-    }
-    const exeCommand = config_1.functionsConfig.script(prefix + command, null);
-    if (exeCommand === null) {
-        return;
-    }
-    (0, execute_script_1.default)('functions:' + prefix + command);
+    return __awaiter(this, void 0, void 0, function* () {
+        if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
+            (0, logger_1.debug)(`skipping ${prefix + command} hook`);
+            return;
+        }
+        const exeCommand = config_1.functionsConfig.script(prefix + command, null);
+        if (exeCommand === null) {
+            return;
+        }
+        return (0, execute_script_1.default)('functions:' + prefix + command);
+    });
 }
 exports.executeHook = executeHook;
 function pack(target) {
@@ -279,7 +300,7 @@ function pack(target) {
                     source = outputDir;
                 }
                 catch (e) {
-                    throw new error_1.default(e.message, {
+                    throw new index_js_1.default(e.message, {
                         exit: 1,
                         errorId: 'COMMON-4',
                         original: e,
@@ -364,42 +385,27 @@ function generateUrlForTarget(target) {
     return target.url;
 }
 exports.generateUrlForTarget = generateUrlForTarget;
-function findAndReplaceConfigProps(dir, { stack, type, integ_config }) {
+function findAndReplaceConfigProps(dir, { stack, type, integ_config, integ_handler }) {
     return __awaiter(this, void 0, void 0, function* () {
         return fs_1.ASYNC.findAndReplace(dir)([
             constants_1.PLACEHOLDER.catalyst_config.stack,
             constants_1.PLACEHOLDER.catalyst_config.type,
-            constants_1.PLACEHOLDER.catalyst_config.integ_config
-        ], [stack, constants_1.REMOTE_REF.functions.type[type], integ_config]);
+            constants_1.PLACEHOLDER.catalyst_config.integ_config,
+            constants_1.PLACEHOLDER.catalyst_config.integ_handlers
+        ], [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* () {
-        let isBioHttp = false;
-        let isBioDebug = false;
         const debugOpts = runtime_store_1.default.get('context.port.debug', false);
         yield Promise.all(targets.map((target) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (!target.valid) {
                 return;
             }
-            let curTargetType = target.type;
-            if (curTargetType === constants_1.FN_TYPE.basic &&
-                ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value))) {
-                curTargetType = constants_1.FN_TYPE.advanced;
-            }
+            const curTargetType = target.type;
             if (debugOpts) {
-                if (!isBioDebug && curTargetType === constants_1.FN_TYPE.basic) {
-                    isBioDebug = true;
-                    const debugPort = yield port_resolver_1.default.getPort(curTargetType, 'debug', {
-                        name: target.name,
-                        duplicateCheck: true,
-                        searchSpan: 0
-                    });
-                    runtime_store_1.default.set('context.port.debug.' + curTargetType, debugPort);
-                }
-                else if (typeof debugOpts[curTargetType] === 'object' &&
+                if (typeof debugOpts[curTargetType] === 'object' &&
                     target.name in debugOpts[curTargetType]) {
                     const debugPort = yield port_resolver_1.default.getPort(curTargetType, 'debug', {
                         name: target.name,
@@ -409,30 +415,13 @@ function resolveAllFnServePort(targets) {
                     runtime_store_1.default.set('context.port.debug.functions.' + target.name, debugPort);
                 }
             }
-            if (curTargetType === constants_1.FN_TYPE.basic && isBioHttp) {
-                return;
-            }
             const httpPort = yield port_resolver_1.default.getPort(curTargetType, 'http', {
                 name: target.name,
-                duplicateCheck: curTargetType === constants_1.FN_TYPE.advanced ||
-                    curTargetType === constants_1.FN_TYPE.browserLogic,
+                duplicateCheck: true,
                 searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
             });
-            if (curTargetType === constants_1.FN_TYPE.basic) {
-                runtime_store_1.default.set('context.port.http.' + constants_1.FN_TYPE.basic, httpPort);
-                isBioHttp = true;
-            }
-            else {
-                runtime_store_1.default.set('context.port.http.functions.' + target.name, httpPort);
-            }
+            runtime_store_1.default.set('context.port.http.functions.' + target.name, httpPort);
         })));
-        if (debugOpts && 'basicio' in debugOpts) {
-            const bioDebugPort = yield port_resolver_1.default.getPort('bio', 'debug', {
-                duplicateCheck: false,
-                searchSpan: 0
-            });
-            runtime_store_1.default.set('context.port.debug.basicio', bioDebugPort);
-        }
     });
 }
 function resolveAllFnPorts(targets) {
@@ -440,7 +429,7 @@ function resolveAllFnPorts(targets) {
         switch ((0, option_1.getCurrentCommand)()) {
             case 'serve': {
                 if (!targets) {
-                    throw new error_1.default('Invalid targets', { exit: 2 });
+                    throw new index_js_1.default('Invalid targets', { exit: 2 });
                 }
                 return resolveAllFnServePort(targets);
             }
@@ -455,7 +444,7 @@ function resolveAllFnPorts(targets) {
                 break;
             }
             default: {
-                throw new error_1.default('Invalid catalyst command', { exit: 2 });
+                throw new index_js_1.default('Invalid catalyst command', { exit: 2 });
             }
         }
     });
@@ -504,7 +493,7 @@ function getSDK(fnType, dest, stack, options = {}) {
                 break;
             }
             default: {
-                throw new error_1.default('Unable to determine the sdk stack', { exit: 2 });
+                throw new index_js_1.default('Unable to determine the sdk stack', { exit: 2 });
             }
         }
         yield new archiver_1.default()
@@ -518,7 +507,7 @@ function updateFnConfig(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const targetConfig = target.configuration;
         (0, logger_1.message)('Current memory configuration: ' + (0, ansi_colors_1.bold)(targetConfig.memory + ' MB'));
-        const memOption = (0, option_1.getOptionValue)('memory', false);
+        const memOption = (0, option_1.getOptionValue)('memory', undefined);
         const memoryPrompt = yield prompt_1.default.ask(prompt_1.default.question('memory', 'Please specify the memory in MB to configure: ', {
             defaultAns: 256,
             when: () => !memOption,
@@ -533,7 +522,7 @@ function updateFnConfig(target) {
             ? parseInt(memoryPrompt.memory)
             : parseInt(memOption);
         if (!memValue) {
-            throw new error_1.default('value not a number', {
+            throw new index_js_1.default('value not a number', {
                 exit: 1,
                 errorId: 'COMMON-5',
                 arg: [ansi_colors_1.bold.red(memOption + ''), (0, ansi_colors_1.bold)('--memory')]

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

@@ -0,0 +1,2 @@
+export declare function integHelper(services: Array<string>): Promise<void>;
+export declare function copyIntegHandlers(templatePath: string, targetPath: string, lang: string): Promise<void>;

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

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyIntegHandlers = exports.integHelper = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
-const error_1 = __importDefault(require("../../error"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
@@ -36,7 +36,7 @@ function integHelper(services) {
     return __awaiter(this, void 0, void 0, function* () {
         const serviceChoices = services.map((service) => serviceChoiceMap[service]);
         if (serviceChoices.length === 0) {
-            throw new error_1.default(`Invalid integration services: [${services.join(',')}]`, {
+            throw new index_js_1.default(`Invalid integration services: [${services.join(',')}]`, {
                 exit: 2
             });
         }
@@ -83,7 +83,7 @@ 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);
         if (!service) {
-            throw new error_1.default('Unable to get service from runtime', { exit: 2 });
+            throw new index_js_1.default('Unable to get service from runtime', { exit: 2 });
         }
         const integ_config = { service };
         switch (service) {
@@ -116,8 +116,14 @@ function copyIntegHandlers(templatePath, targetPath, lang) {
                 else if (lang === runtime_1.default.language.python.value) {
                     const filePaths = constants_1.CLIQ.python_template_contents_initial_copy.map((path) => (0, path_1.join)(templatePath, path));
                     yield fs_1.ASYNC.copyFiles(filePaths, targetPath);
-                    const handlerPaths = handlers.map((handler) => (0, path_1.join)(templatePath, constants_1.CLIQ.python_handlers_template_dir, constants_1.CLIQ.python_handler_file_mapping[handler]));
+                    const integHandlerConfig = {};
+                    const handlerPaths = handlers.map((handler) => {
+                        integHandlerConfig[handler] = (0, path_1.join)(constants_1.CLIQ.python_handlers_path + constants_1.CLIQ.python_handler_file_mapping[handler]);
+                        return (0, path_1.join)(templatePath, constants_1.CLIQ.python_handlers_template_dir, constants_1.CLIQ.python_handler_file_mapping[handler]);
+                    });
                     yield fs_1.ASYNC.copyFiles(handlerPaths, (0, path_1.join)(targetPath, constants_1.CLIQ.python_handlers_template_dir));
+                    const handlerString = JSON.stringify({ handlers: integHandlerConfig }, null, '\t').replace(new RegExp('\n', 'g'), '\n\t');
+                    runtime_store_1.default.set('context.functions.integration.handlers', handlerString);
                 }
                 break;
             case constants_1.INTEG.services.convokraft: {

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

@@ -0,0 +1,2 @@
+export declare function rewriteClasspath(pth: string, libPth: string): Promise<void>;
+export declare function normaliseClasspath(pth: string, libFolder: string): Promise<void>;

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

@@ -0,0 +1,107 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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;
+const path_1 = require("path");
+const error_1 = __importDefault(require("../../../error"));
+const fs_1 = require("../../../util_modules/fs");
+const xml2js_1 = __importDefault(require("xml2js"));
+const js_1 = require("../../../util_modules/js");
+const ansi_colors_1 = require("ansi-colors");
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+function rewriteClasspath(pth, libPth) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield fs_1.ASYNC.ensureDir(libPth);
+        const content = yield fs_1.ASYNC.readFile(pth);
+        if (content === undefined) {
+            throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
+        }
+        const files = yield fs_1.ASYNC.walk((0, path_1.dirname)(libPth), {
+            filter: { exclude: ['**/.output'], excludeDir: true }
+        });
+        const result = yield xml2js_1.default.parseStringPromise(content);
+        const classPathEntries = js_1.JS.chain(files)
+            .filter((jar) => (0, path_1.extname)(jar.path) === '.jar')
+            .map((jar) => {
+            return {
+                $: {
+                    kind: 'lib',
+                    path: (0, path_1.basename)((0, path_1.dirname)(jar.path)) === 'lib'
+                        ? 'lib/' + (0, path_1.basename)(jar.path)
+                        : (0, path_1.basename)(jar.path)
+                }
+            };
+        })
+            .concat(js_1.JS.get(result, 'classpath.classpathentry', []))
+            .uniq()
+            .value();
+        js_1.JS.set(result, 'classpath.classpathentry', classPathEntries);
+        const builder = new xml2js_1.default.Builder();
+        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);
+        if (content === undefined) {
+            throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
+        }
+        const result = yield xml2js_1.default.parseStringPromise(content);
+        const classPathEntries = js_1.JS.get(result, 'classpath.classpathentry', []);
+        const jarFilesList = [];
+        yield Promise.all(classPathEntries.map((entry) => __awaiter(this, void 0, void 0, function* () {
+            const row = entry.$;
+            if (row.kind && row.kind === 'lib' && row.path) {
+                const libPath = (0, path_1.resolve)((0, path_1.dirname)(pth), row.path);
+                const jarName = (0, path_1.basename)(libPath);
+                const jarExists = yield fs_1.ASYNC.fileExists((0, path_1.join)(libFolder, jarName));
+                if (!jarExists) {
+                    try {
+                        yield fs_1.ASYNC.copyFile(libPath, (0, path_1.join)(libFolder, jarName));
+                    }
+                    catch (err) {
+                        throw new error_1.default(libPath + ' mentioned in .classpath file missing', {
+                            exit: 1,
+                            errorId: 'JAVA_CLS_PATH-1',
+                            original: err,
+                            arg: [(0, ansi_colors_1.bold)(libPath), (0, ansi_colors_1.bold)('.classpath')]
+                        });
+                    }
+                }
+                row.path = (0, path_1.basename)(libFolder) + '/' + jarName;
+                if ((0, path_1.dirname)(libPath) === (0, path_1.dirname)(libFolder)) {
+                    try {
+                        yield fs_1.ASYNC.deleteFile(libPath);
+                    }
+                    catch (err) {
+                        throw new error_1.default(libPath +
+                            ' mentioned in .classpath file missing. The .classpath file in the target directory seems to be corrupted.', {
+                            exit: 1,
+                            errorId: 'JAVA_CLS_PATH-2',
+                            original: err,
+                            arg: [(0, ansi_colors_1.bold)('.classpath'), (0, ansi_colors_1.bold)((0, path_1.dirname)(pth))]
+                        });
+                    }
+                }
+                jarFilesList.push((0, path_1.join)(libFolder, jarName));
+            }
+        })));
+        js_1.JS.set(result, 'classpath.classpathentry', classPathEntries);
+        runtime_store_1.default.set('context.functions.java.libJarFiles', jarFilesList);
+        const builder = new xml2js_1.default.Builder();
+        return fs_1.ASYNC.writeFile(pth, builder.buildObject(result));
+    });
+}
+exports.normaliseClasspath = normaliseClasspath;

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

@@ -0,0 +1,4 @@
+import { IFnTarget, JavaFn } from '../common';
+export declare const warningMessages: Array<string>;
+export declare function compileTarget(target: IFnTarget<JavaFn>): Promise<void>;
+export declare function printCompilationLog(javaFns: Array<IFnTarget<JavaFn>>): void;