zcatalyst-cli 1.21.0 → 1.22.0

package/lib/init/features/functions/languages/node.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (stack: string) => () => Promise<string | undefined>;
+export default _default;

package/lib/init/features/functions/languages/node.js

@@ -21,7 +21,7 @@ const fn_utils_1 = require("../../../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
 const fs_1 = require("../../../../util_modules/fs");
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
 const integ_1 = require("../../../../fn-utils/lib/integ");
 const runtime_1 = __importDefault(require("../../../../util_modules/constants/lib/runtime"));
 const functions_1 = require("../../../util/functions");
@@ -47,7 +47,7 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {
-        (0, logger_1.warning)('Skipping functions node setup...');
+        (0, index_1.warning)('Skipping functions node setup...');
         return;
     }
     dirExists && (yield fs_1.ASYNC.deleteDir(targetPath).catch());
@@ -73,10 +73,12 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     yield fn_utils_1.fnUtils.common.findAndReplaceConfigProps(targetPath, {
         stack,
         type: fnType,
-        integ_config
+        integ_config,
+        integ_handler: ''
     });
     fnType === constants_1.FN_TYPE.integration
         ? yield (0, npm_install_1.default)(targetPath, true)
         : yield (0, npm_install_1.default)(targetPath);
-    return (0, functions_1.fillFunctionsInitPayload)(targetPath, finalJson.name, stack, fnType);
+    (0, functions_1.fillFunctionsInitPayload)(targetPath, finalJson.name, stack, fnType);
+    return targetPath;
 });

package/lib/init/features/functions/languages/python.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (stack: string) => () => Promise<string | undefined>;
+export default _default;

package/lib/init/features/functions/languages/python.js

@@ -19,7 +19,7 @@ const fn_utils_1 = require("../../../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
 const fs_1 = require("../../../../util_modules/fs");
-const logger_1 = require("../../../../util_modules/logger");
+const index_1 = require("../../../../util_modules/logger/index");
 const js_1 = require("../../../../util_modules/js");
 const integ_1 = require("../../../../fn-utils/lib/integ");
 const runtime_1 = __importDefault(require("../../../../util_modules/constants/lib/runtime"));
@@ -29,7 +29,7 @@ const ensure_python_1 = require("../../../dependencies/python/ensure-python");
 const error_1 = __importDefault(require("../../../../error"));
 const pip_install_1 = require("../../../dependencies/python/pip-install");
 const cli_table_1 = require("../../../../cli_table");
-const char_1 = require("../../../../util_modules/char");
+const logger_1 = require("../../../../util_modules/logger");
 exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const fnDirPath = runtime_store_1.default.get('context.functions.dir_path');
@@ -66,7 +66,7 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {
-        (0, logger_1.warning)('Skipping functions python setup...');
+        (0, index_1.warning)('Skipping functions python setup...');
         return;
     }
     yield fs_1.ASYNC.deleteDir(targetPath).catch();
@@ -109,7 +109,8 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     yield fn_utils_1.fnUtils.common.findAndReplaceConfigProps(targetPath, {
         stack,
         type: fnType,
-        integ_config
+        integ_config,
+        integ_handler: runtime_store_1.default.get('context.functions.integration.handlers', '')
     });
     const stackVersion = stack.replace('python_', '');
     try {
@@ -119,13 +120,14 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
         const error = error_1.default.getErrorInstance(err);
         const table = (0, cli_table_1.getCustomColourTable)(ansi_colors_1.yellow);
         table.push([
-            (0, ansi_colors_1.yellow)(char_1.CHAR.warning + ' ') +
+            (0, ansi_colors_1.yellow)(logger_1.CHAR.warning + ' ') +
                 error.message +
                 '\n' +
                 `you can set it later with the command ` +
                 `"${(0, ansi_colors_1.italic)((0, ansi_colors_1.bold)(`catalyst config:set python${stackVersion}.bin=<binary_path>`))}"`
         ]);
-        (0, logger_1.info)(table.toString());
+        (0, index_1.info)(table.toString());
     }
-    return (0, functions_1.fillFunctionsInitPayload)(targetPath, functionAns.name, stack, fnType);
+    (0, functions_1.fillFunctionsInitPayload)(targetPath, functionAns.name, stack, fnType);
+    return targetPath;
 });

package/lib/init/features/index.d.ts

@@ -0,0 +1,14 @@
+export declare function setCatalystConfig(featureName: 'functions' | 'client' | 'apig' | 'appsail' | 'slate', add?: boolean): void;
+export declare function functions(add?: boolean): Promise<void>;
+export declare function client(): Promise<void>;
+export declare function slate(add?: boolean): Promise<void>;
+export declare function project(): Promise<void>;
+export declare function appsail(): Promise<void>;
+declare const _default: {
+    functions: typeof functions;
+    client: typeof client;
+    project: typeof project;
+    appsail: typeof appsail;
+    slate: typeof slate;
+};
+export default _default;

package/lib/init/features/index.js

@@ -38,12 +38,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appsail = exports.project = exports.slate = exports.client = exports.functions = exports.setCatalystConfig = 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 runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const js_1 = require("../../util_modules/js");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const project_1 = require("../../util_modules/project");
 function upsertEnvArr(envArr, idx = 0) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -63,8 +63,8 @@ function upsertEnvArr(envArr, idx = 0) {
     });
 }
 function setCatalystConfig(featureName, add) {
-    const featureContext = runtime_store_1.default.get('payload.' + featureName, null);
-    let featureContextArr = runtime_store_1.default.get('payload.' + featureName + '.targets', null);
+    const featureContext = runtime_store_1.default.get('context.payload.' + featureName, null);
+    let featureContextArr = runtime_store_1.default.get('context.payload.' + featureName + '.targets', null);
     if (featureContext === null && featureContextArr === null) {
         return;
     }
@@ -72,7 +72,7 @@ function setCatalystConfig(featureName, add) {
         featureContextArr = [featureContext];
     }
     if (featureContextArr === null) {
-        throw new error_1.default('No context given to populate catalyst.json', {
+        throw new index_js_1.default('No context given to populate catalyst.json', {
             exit: 2
         });
     }
@@ -99,7 +99,7 @@ function setCatalystConfig(featureName, add) {
                     ? js_1.JS.uniq(ignoreArr.concat([constants_1.FOLDERNAME.output]))
                     : ignoreArr);
                 if (config.get(featureName + '.source') !== targetSource) {
-                    (0, logger_1.debug)(featureName + ' source has been modified');
+                    (0, index_1.debug)(featureName + ' source has been modified');
                     config.set(featureName + '.source', targetSource);
                 }
                 break;
@@ -110,7 +110,7 @@ function setCatalystConfig(featureName, add) {
             }
             case 'client':
                 config.set('client.source', targetSource);
-                const plugin = runtime_store_1.default.get('payload.client.plugin', false);
+                const plugin = runtime_store_1.default.get('context.payload.client.plugin', false);
                 if (plugin) {
                     config.set('client.plugin', plugin);
                 }
@@ -155,7 +155,7 @@ exports.slate = slate;
 function project() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (yield Promise.resolve().then(() => __importStar(require('./project.js')))).default();
-        const projectPayload = runtime_store_1.default.get('payload.project', null);
+        const projectPayload = runtime_store_1.default.get('context.payload.project', null);
         if (!projectPayload) {
             return;
         }
@@ -163,12 +163,12 @@ function project() {
             base: true,
             active: true
         });
-        yield upsertEnvArr(runtime_store_1.default.get('payload.env', null));
-        if (runtime_store_1.default.get('payload.project.new', false)) {
-            (0, logger_1.message)('New Project has been successfully created and associated with this directory.');
+        yield upsertEnvArr(runtime_store_1.default.get('context.payload.env', null));
+        if (runtime_store_1.default.get('context.payload.project.new', false)) {
+            (0, index_1.message)('New Project has been successfully created and associated with this directory.');
         }
-        (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.rc) + ' file has be successfully created with project details.');
-        const isImport = runtime_store_1.default.get('payload.project.import', false);
+        (0, index_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.rc) + ' file has be successfully created with project details.');
+        const isImport = runtime_store_1.default.get('context.payload.project.import', false);
         if (isImport) {
             setCatalystConfig('functions', true);
             setCatalystConfig('client', false);

package/lib/init/features/project.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Promise<void>;
+export default _default;

package/lib/init/features/project.js

@@ -20,7 +20,7 @@ const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const js_1 = require("../../util_modules/js");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
 const yaml_1 = require("yaml");
 const project_1 = require("../../util_modules/project");
@@ -44,7 +44,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !(0, option_1.getOptionValue)('force', false)) {
-        (0, logger_1.message)(constants_1.FILENAME.rc +
+        (0, index_1.message)(constants_1.FILENAME.rc +
             ' already has ' +
             (0, ansi_colors_1.bold)(defaultRCProjectName) +
             ' as a default project. To overwrite use --force option');
@@ -57,6 +57,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             ' for creation of your first project before you continue.', { exit: 1 });
     }
     const orgChoice = orgList.map((org) => prompt_1.default.choice(org.name + ' (' + org.id + ')', {
+        id: org.id,
         value: org,
         short: org.name
     }));
@@ -67,7 +68,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }));
     const selectedOrg = orgAns.org || orgList[0];
     runtime_store_1.default.set('project.env.id', selectedOrg.id);
-    (0, logger_1.message)('Setting up a new default project for this folder\n');
+    (0, index_1.message)('Setting up a new default project for this folder\n');
     const projectAPI = yield (0, endpoints_1.projectAPI)({ auth: true, org: selectedOrg.id });
     const allProjects = (yield projectAPI.getAllProjects());
     if (allProjects.length === 0) {
@@ -87,6 +88,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     ];
     allProjects.forEach((project) => {
         projectChoices.push(prompt_1.default.choice(project.project_name + ' (' + project.id + ')', {
+            id: project.project_name,
             value: project,
             short: project.project_name
         }));
@@ -118,22 +120,22 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     resp.writeHead(200);
                     resp.end(htmlFile, () => __awaiter(void 0, void 0, void 0, function* () {
                         req.socket.destroy();
-                        yield destroyer.destroy().catch((err) => (0, logger_1.debug)(err));
+                        yield destroyer.destroy().catch((err) => (0, index_1.debug)(err));
                         res();
                     }));
                 }
                 catch (e) {
-                    yield destroyer.destroy().catch((err) => (0, logger_1.debug)(err));
+                    yield destroyer.destroy().catch((err) => (0, index_1.debug)(err));
                     res(e);
                 }
             }));
             const destroyer = new server_1.ConnectionDestroyer(server);
             server.listen(callbackPort, '127.0.0.1', () => {
                 const urlString = accessUrl.toString();
-                (0, logger_1.info)();
-                (0, logger_1.info)('Visit this URL on this device to proceed:');
-                (0, logger_1.info)(ansi_colors_1.bold.underline(urlString));
-                (0, logger_1.info)();
+                (0, index_1.info)();
+                (0, index_1.info)('Visit this URL on this device to proceed:');
+                (0, index_1.info)(ansi_colors_1.bold.underline(urlString));
+                (0, index_1.info)();
                 (0, open_1.default)(urlString).catch();
             });
             server.on('error', (err) => {
@@ -163,25 +165,20 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     yield Promise.all(functions.map(({ properties }) => __awaiter(void 0, void 0, void 0, function* () {
         const source = properties.code.path.replace('/', path_1.sep).replace('.zip', '');
         const stack = properties.stack.toLowerCase();
-        const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([source], false);
-        const fnUtil = stack.startsWith(runtime_1.default.language.node.value)
-            ? fn_utils_1.fnUtils.node
+        const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([(0, project_1.resolveProjectPath)(source)], false);
+        stack.startsWith(runtime_1.default.language.node.value)
+            ? fn_utils_1.fnUtils.node.validate(refinedTargets)
             : stack.startsWith(runtime_1.default.language.java.value)
-                ? fn_utils_1.fnUtils.java
+                ? fn_utils_1.fnUtils.java.validate(refinedTargets)
                 : stack.startsWith(runtime_1.default.language.python.value)
-                    ? fn_utils_1.fnUtils.python
+                    ? fn_utils_1.fnUtils.python.validate(refinedTargets)
                     : null;
-        if (fnUtil === null) {
-            (0, logger_1.warning)(`skipping setup of function(${refinedTargets[0].name}) since provided stack ${stack} is not supported.`);
-            return;
-        }
-        yield fnUtil.validate(refinedTargets, 0);
         if (!refinedTargets[0].valid) {
-            (0, logger_1.debug)('Invalid target : ' +
+            (0, index_1.debug)('Invalid target : ' +
                 refinedTargets[0].name +
                 ' reason : ' +
                 refinedTargets[0].failure_reason);
-            (0, logger_1.warning)(`skipping setup of function(${refinedTargets[0].name}) since the package is invalid. \nContact catalyst support with debug log.`);
+            (0, index_1.warning)(`skipping setup of function(${refinedTargets[0].name}) since the package is invalid. \nContact catalyst support with debug log.`);
             return;
         }
         (0, functions_1.fillFunctionsInitPayload)(source, properties.name, properties.stack, properties.type);
@@ -189,7 +186,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (client.length > 0) {
         const { properties } = client[0];
         const source = properties.code.path.replace('/', path_1.sep).replace('.zip', '');
-        yield client_utils_1.clientUtils.validate(source);
+        yield client_utils_1.clientUtils.validate({ source });
         (0, client_1.fillClientInitPayload)(source, properties.app_name);
     }
     const projectDetails = yield projectAPI.getProject(importRes.project_details.id);

package/lib/init/features/slate/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (add?: boolean) => Promise<void>;
+export default _default;

package/lib/init/features/slate/index.js

@@ -49,7 +49,7 @@ const console_1 = require("console");
 const error_1 = __importDefault(require("../../../error"));
 const constants_1 = require("../../../util_modules/constants");
 const project_1 = require("../../../util_modules/project");
-const toml_1 = require("../../../util_modules/parser/toml");
+const toml_1 = require("../../../util_modules/toml");
 const async_1 = require("../../../util_modules/fs/lib/async");
 function getFrameworkOption(frameworks, source) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -382,5 +382,5 @@ exports.default = (add) => __awaiter(void 0, void 0, void 0, function* () {
 		\n# ⚠️  Please do not modify this file, as it is fully managed by the CLI.\n';
     yield (0, async_1.ensureFile)(pth, true);
     yield fs_1.ASYNC.writeFile(pth, warnContent + '\n' + (0, toml_1.convertTOML)(slateConfigDetails));
-    runtime_store_1.default.set('payload.slate.targets', [payload]);
+    runtime_store_1.default.set('context.payload.slate.targets', [payload]);
 });

package/lib/init/index.d.ts

@@ -0,0 +1,2 @@
+declare function init(): Promise<void>;
+export default init;

package/lib/init/index.js

@@ -13,10 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
-const error_1 = __importDefault(require("../error"));
+const index_js_1 = __importDefault(require("../error/index.js"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const js_1 = require("../util_modules/js");
-const logger_1 = require("../util_modules/logger");
+const index_1 = require("../util_modules/logger/index");
 const features_1 = __importDefault(require("./features"));
 function init() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -26,7 +26,7 @@ function init() {
         }
         const feature = featureList.shift();
         if (!Object.keys(features_1.default).includes(feature)) {
-            throw new error_1.default('invalid feature for init', {
+            throw new index_js_1.default('invalid feature for init', {
                 exit: 1,
                 errorId: 'INIT-IDX-1',
                 arg: [
@@ -38,9 +38,9 @@ function init() {
             });
         }
         const MODULE = features_1.default[feature];
-        (0, logger_1.info)((0, ansi_colors_1.bold)('\n' + (0, ansi_colors_1.white)('===> ') + js_1.JS.camelToTitleCase(feature) + ' Setup'));
+        (0, index_1.info)((0, ansi_colors_1.bold)('\n' + (0, ansi_colors_1.white)('===> ') + js_1.JS.camelToTitleCase(feature) + ' Setup'));
         yield MODULE();
-        runtime_store_1.default.set('payload.features', runtime_store_1.default.get('payload.features', []).concat(feature));
+        runtime_store_1.default.set('context.payload.features', runtime_store_1.default.get('context.payload.features', []).concat(feature));
         return init();
     });
 }

package/lib/init/util/client.d.ts

@@ -0,0 +1,8 @@
+export declare const fillClientInitPayload: (source: string, name: string) => void;
+export declare function directoryOverridePrompt(dir: string): Promise<void>;
+export declare function clientNamePrompt(question: string, defaultAns: string): Promise<string>;
+export declare function addDependency(filePath: string, dep: Record<string, string>): Promise<void>;
+export declare function addDependency(filePath: string, dep: Record<string, string>, { dev, depPath }: {
+    dev?: boolean;
+    depPath?: Array<string>;
+}): Promise<void>;

package/lib/init/util/client.js

@@ -38,27 +38,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependency = exports.clientNamePrompt = exports.directoryOverridePrompt = exports.fillClientInitPayload = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
-const error_js_1 = __importDefault(require("../../error.js"));
-const index_js_1 = __importDefault(require("../../prompt/index.js"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
+const index_js_2 = __importDefault(require("../../prompt/index.js"));
 const regex_js_1 = __importDefault(require("../../util_modules/constants/lib/regex.js"));
 const ASYNC = __importStar(require("../../util_modules/fs/lib/async.js"));
-const logger_js_1 = require("../../util_modules/logger.js");
+const index_1 = require("../../util_modules/logger/index");
 const js_js_1 = require("../../util_modules/js.js");
 const fillClientInitPayload = (source, name) => {
-    runtime_store_js_1.default.set('payload.client.source', source);
-    runtime_store_js_1.default.set('payload.client.name', name);
+    runtime_store_js_1.default.set('context.payload.client.source', source);
+    runtime_store_js_1.default.set('context.payload.client.name', name);
 };
 exports.fillClientInitPayload = fillClientInitPayload;
 function directoryOverridePrompt(dir) {
     return __awaiter(this, void 0, void 0, function* () {
         const foldeExists = yield ASYNC.dirExists(dir);
         if (foldeExists) {
-            const overwriteAns = yield index_js_1.default.ask(index_js_1.default.question('overwrite', 'Directory ' + (0, ansi_colors_1.underline)(dir) + ' already exists. Overwrite ?', {
+            const overwriteAns = yield index_js_2.default.ask(index_js_2.default.question('overwrite', 'Directory ' + (0, ansi_colors_1.underline)(dir) + ' already exists. Overwrite ?', {
                 type: 'confirm',
                 defaultAns: false
             }));
             if (!overwriteAns.overwrite) {
-                throw new error_js_1.default('Skipping client setup since unable to override the already existing client', { exit: 0, errorId: 'CLIENT-UTILS-6', arg: [ansi_colors_1.italic.red(dir)] });
+                throw new index_js_1.default('Skipping client setup since unable to override the already existing client', { exit: 0, errorId: 'CLIENT-UTILS-6', arg: [ansi_colors_1.italic.red(dir)] });
             }
             yield ASYNC.deleteDir(dir);
         }
@@ -67,7 +67,7 @@ function directoryOverridePrompt(dir) {
 exports.directoryOverridePrompt = directoryOverridePrompt;
 function clientNamePrompt(question, defaultAns) {
     return __awaiter(this, void 0, void 0, function* () {
-        const namePrompt = yield index_js_1.default.ask(index_js_1.default.question('name', question, {
+        const namePrompt = yield index_js_2.default.ask(index_js_2.default.question('name', question, {
             type: 'input',
             defaultAns,
             validate: (ans) => {
@@ -93,8 +93,8 @@ function addDependency(filePath, dep, { dev = false, depPath = [] } = {}) {
             }
         }
         catch (e) {
-            const err = error_js_1.default.getErrorInstance(e, { skipHelp: true });
-            (0, logger_js_1.debug)(`unable to write to ${filePath}: ${err.message}`);
+            const err = index_js_1.default.getErrorInstance(e, { skipHelp: true });
+            (0, index_1.debug)(`unable to write to ${filePath}: ${err.message}`);
         }
     });
 }

package/lib/init/util/common.d.ts

@@ -0,0 +1,12 @@
+import { IRuntime } from '../../fn-utils/lib/common.js';
+import { IChoice, TSeparator } from '../../prompt/index.js';
+import { REMOTE_REF } from '../../util_modules/constants/index.js';
+export declare function getRuntimeDetails(fnType?: keyof typeof REMOTE_REF.functions.type): Promise<IRuntime>;
+export declare function getRuntimeChoices({ fnType, runtimeDetails }: {
+    fnType?: keyof typeof REMOTE_REF.functions.type;
+    runtimeDetails?: IRuntime;
+}): Promise<Array<IChoice | TSeparator>>;
+export declare function getRuntimePromptAnswer(question: string, fnType?: keyof typeof REMOTE_REF.functions.type): Promise<{
+    runtime: string;
+    lang: 'node' | 'java';
+}>;

package/lib/init/util/common.js

@@ -14,14 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuntimePromptAnswer = exports.getRuntimeChoices = exports.getRuntimeDetails = void 0;
 const catalyst_details_js_1 = __importDefault(require("../../endpoints/lib/catalyst-details.js"));
-const error_js_1 = __importDefault(require("../../error.js"));
-const index_js_1 = __importDefault(require("../../prompt/index.js"));
-const char_1 = require("../../util_modules/char");
-const index_js_2 = require("../../util_modules/constants/index.js");
-const logger_js_1 = require("../../util_modules/logger.js");
+const index_js_1 = __importDefault(require("../../error/index.js"));
+const index_js_2 = __importDefault(require("../../prompt/index.js"));
+const index_js_3 = require("../../util_modules/constants/index.js");
+const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 function getRuntimeDetails(fnType) {
     const catalystDetailsAPI = new catalyst_details_js_1.default();
-    return catalystDetailsAPI.getDetails('runtime', fnType ? index_js_2.REMOTE_REF.functions.type[fnType] : undefined);
+    return catalystDetailsAPI.getDetails('runtime', fnType ? index_js_3.REMOTE_REF.functions.type[fnType] : undefined);
 }
 exports.getRuntimeDetails = getRuntimeDetails;
 function getRuntimeChoices({ fnType, runtimeDetails }) {
@@ -32,10 +32,10 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
         const runtimeChoices = runtimeDetails.runtimes.reduce((acc, value) => {
             const langArr = value.match(/^([a-zA-Z]+)([0-9_]+)$/);
             const runtimeLang = langArr !== null
-                ? index_js_2.RUNTIME.language[langArr[1]]
+                ? index_js_3.RUNTIME.language[langArr[1]]
                 : undefined;
             if (!langArr || !runtimeLang) {
-                (0, logger_js_1.debug)('Language cannot be identified hence skipping');
+                (0, index_1.debug)('Language cannot be identified hence skipping');
                 return acc;
             }
             const langV = langArr[2].split('_');
@@ -46,18 +46,18 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
             if ((runtimeDetails === null || runtimeDetails === void 0 ? void 0 : runtimeDetails.eol_runtimes) && runtimeDetails.eol_runtimes[value]) {
                 switch (runtimeDetails.eol_runtimes[value]) {
                     case 1:
-                        displayValue += ` (${char_1.CHAR.info} This runtime has reached its EOL)`;
+                        displayValue += ` (${logger_1.CHAR.info} This runtime has reached its EOL)`;
                         break;
                     case 2:
-                        displayValue += ` (${char_1.CHAR.warning} Only updates are allowed in this runtime)`;
+                        displayValue += ` (${logger_1.CHAR.warning} Only updates are allowed in this runtime)`;
                         disabled = true;
                         break;
                     case 3:
-                        displayValue += ` (${char_1.CHAR.error} This runtime is no longer supported)`;
+                        displayValue += ` (${logger_1.CHAR.error} This runtime is no longer supported)`;
                         disabled = true;
                         break;
                     default:
-                        (0, logger_js_1.debug)('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
+                        (0, index_1.debug)('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
                         return acc;
                 }
             }
@@ -67,9 +67,10 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
                     java: '----Java----',
                     python: '---Python---'
                 };
-                acc[runtimeLang.value].push(index_js_1.default.separator(sep[runtimeLang.value]));
+                acc[runtimeLang.value].push(index_js_2.default.separator(sep[runtimeLang.value]));
             }
-            acc[runtimeLang.value].push(index_js_1.default.choice(displayValue, {
+            acc[runtimeLang.value].push(index_js_2.default.choice(displayValue, {
+                id: value,
                 value: { runtime: value, lang: runtimeLang.value },
                 short: displayValue,
                 disabled
@@ -87,7 +88,7 @@ exports.getRuntimeChoices = getRuntimeChoices;
 function getRuntimePromptAnswer(question, fnType) {
     return __awaiter(this, void 0, void 0, function* () {
         const runtimeChoices = yield getRuntimeChoices({ fnType });
-        const runtimeAns = yield index_js_1.default.ask(index_js_1.default.question('runtime', question, {
+        const runtimeAns = yield index_js_2.default.ask(index_js_2.default.question('runtime', question, {
             type: 'list',
             choices: runtimeChoices,
             when: () => {
@@ -95,7 +96,7 @@ function getRuntimePromptAnswer(question, fnType) {
             }
         }));
         if (runtimeAns === undefined || runtimeAns.runtime === undefined) {
-            throw new error_js_1.default('Selected runtime is invalid.', { exit: 2 });
+            throw new index_js_1.default('Selected runtime is invalid.', { exit: 2 });
         }
         return runtimeAns.runtime;
     });

package/lib/init/util/functions.d.ts

@@ -0,0 +1,7 @@
+export interface IFnInitDetails {
+    source: string;
+    name: string;
+    stack: string;
+    type: string;
+}
+export declare const fillFunctionsInitPayload: (source: string, name: string, stack: string, type: string) => void;

package/lib/init/util/functions.js

@@ -7,14 +7,14 @@ exports.fillFunctionsInitPayload = void 0;
 const path_1 = require("path");
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const fillFunctionsInitPayload = (source, name, stack, type) => {
-    const existingFns = runtime_store_1.default.get('payload.functions.targets', []);
+    const existingFns = runtime_store_1.default.get('context.payload.functions.targets', []);
     existingFns.push({
         source,
         name,
         stack,
         type
     });
-    runtime_store_1.default.set('payload.functions.targets', existingFns);
-    runtime_store_1.default.set('payload.functions.source', (0, path_1.dirname)(source));
+    runtime_store_1.default.set('context.payload.functions.targets', existingFns);
+    runtime_store_1.default.set('context.payload.functions.source', (0, path_1.dirname)(source));
 };
 exports.fillFunctionsInitPayload = fillFunctionsInitPayload;

package/lib/init/util/project.d.ts

@@ -0,0 +1,3 @@
+import { ICatalystOrgObj } from '../../endpoints/lib/org';
+import { IProjectServerObj } from '../../util_modules/project';
+export declare const fillProjectPayload: (selectedOrg: ICatalystOrgObj, selectedProject: IProjectServerObj, isNew?: boolean, isImport?: boolean) => Promise<void>;

package/lib/init/util/project.js

@@ -19,7 +19,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const project_1 = require("../../util_modules/project");
 const fillProjectPayload = (selectedOrg, selectedProject, isNew = false, isImport = false) => __awaiter(void 0, void 0, void 0, function* () {
-    runtime_store_1.default.set('payload.project', selectedProject);
+    runtime_store_1.default.set('context.payload.project', selectedProject);
     runtime_store_1.default.set('project', (0, project_1.transformProject)(selectedProject));
     const envAPI = yield (0, endpoints_1.envAPI)({ auth: true, org: selectedOrg.id });
     const envArr = (yield envAPI.getEnvs((0, project_1.getProjectId)()));
@@ -27,9 +27,9 @@ const fillProjectPayload = (selectedOrg, selectedProject, isNew = false, isImpor
     if (envObj === undefined) {
         throw new error_1.default('There is no development environment found for this project. Kindly contact support.', { exit: 2 });
     }
-    runtime_store_1.default.set('payload.env', envArr);
+    runtime_store_1.default.set('context.payload.env', envArr);
     runtime_store_1.default.set('project.env', (0, project_1.transformEnv)(envObj));
-    runtime_store_1.default.set('payload.project.new', isNew);
-    runtime_store_1.default.set('payload.project.import', isImport);
+    runtime_store_1.default.set('context.payload.project.new', isNew);
+    runtime_store_1.default.set('context.payload.project.import', isImport);
 });
 exports.fillProjectPayload = fillProjectPayload;