zcatalyst-cli 1.9.0 → 1.11.0

package/lib/commands/logout.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../internal/command"));
 exports.default = new command_1.default('logout')
-    .description('Log the CLI out of your Zoho Catalyst account')
+    .description('Log the CLI out of your Catalyst account')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication')));
     return auth.logout();

package/lib/commands/project/list.js

@@ -35,10 +35,11 @@ const ansi_colors_1 = require("ansi-colors");
 const endpoints_1 = require("../../endpoints");
 const command_1 = __importDefault(require("../../internal/command"));
 const constants_1 = require("../../util_modules/constants");
+const project_1 = __importDefault(require("../../util_modules/constants/project"));
 const logger_1 = require("../../util_modules/logger");
-const project_1 = require("../../util_modules/project");
+const project_2 = require("../../util_modules/project");
 exports.default = new command_1.default('project:list')
-    .description('List the Catalyst projects you have access to')
+    .description('List all the Catalyst projects you have access to')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
     .needs('rc', { optional: true })
@@ -55,19 +56,22 @@ exports.default = new command_1.default('project:list')
         { hAlign: 'center', content: ansi_colors_1.red.bold('Project Name') },
         { hAlign: 'center', content: ansi_colors_1.red.bold('Project ID') }
     ]);
-    const activeProjectId = project_1.getProjectId(null);
-    const defaultProjectId = project_1.getDefaultProjectId(null);
+    const activeProjectId = project_2.getProjectId(null);
+    const defaultProjectId = project_2.getDefaultProjectId(null);
     projects.forEach((project) => {
         let displayId = project.id + '';
         let displayName = project.project_name;
-        let enhance = null;
+        let enhance = '';
         if (activeProjectId === displayId) {
             enhance = ' (active)';
         }
         if (defaultProjectId === displayId) {
-            enhance = enhance === null ? ' (base)' : enhance + ' (base)';
+            enhance += ' (base)';
         }
-        if (enhance !== null) {
+        if (project.project_type && !project_1.default.accepted_types.includes(project.project_type)) {
+            enhance += `(${project.project_type})`;
+        }
+        if (enhance !== '') {
             displayName = ansi_colors_1.cyan(displayName + enhance);
             displayId = ansi_colors_1.cyan(displayId + '');
         }

package/lib/commands/project/reset.js

@@ -17,7 +17,7 @@ const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 const project_1 = require("../../util_modules/project");
 exports.default = new command_1.default('project:reset')
-    .description('Clear an active selection of project and reset to base project')
+    .description('Clear an active project selection and reset to the base project')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
     .needs('rc')

package/lib/commands/project/use.js

@@ -18,23 +18,24 @@ const error_1 = __importDefault(require("../../error"));
 const command_1 = __importDefault(require("../../internal/command"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const constants_1 = require("../../util_modules/constants");
+const project_1 = __importDefault(require("../../util_modules/constants/project"));
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
-const project_1 = require("../../util_modules/project");
+const project_2 = require("../../util_modules/project");
+const makeActive = (currentProjectId, optedProject) => __awaiter(void 0, void 0, void 0, function* () {
+    yield project_2.upsertProject(optedProject, {
+        active: true,
+        base: js_1.JS.isNull(currentProjectId)
+    });
+    logger_1.success('Successfully made project active');
+});
 exports.default = new command_1.default('project:use [name_or_project_id]')
     .description('Set an active Catalyst project for your working directory')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
     .needs('rc', { optional: true, resolveOnNotFound: true })
     .action((newActive) => __awaiter(void 0, void 0, void 0, function* () {
-    const currentProjectId = project_1.getProjectId(null);
-    const makeActive = (optedProject) => __awaiter(void 0, void 0, void 0, function* () {
-        yield project_1.upsertProject(optedProject, {
-            active: true,
-            base: js_1.JS.isNull(currentProjectId)
-        });
-        logger_1.success('Successfully made project active');
-    });
+    const currentProjectId = project_2.getProjectId(null);
     const allProjects = (yield (yield endpoints_1.projectAPI()).getAllProjects().catch(() => {
         throw new error_1.default('Unable to get projects', {
             exit: 2
@@ -48,13 +49,27 @@ exports.default = new command_1.default('project:use [name_or_project_id]')
     }
     if (allProjects.length === 1) {
         logger_1.message('only one project found in remote, ignoring user input and making it as active');
-        return makeActive(allProjects[0]);
+        return makeActive(currentProjectId, allProjects[0]);
     }
-    const transformedProjects = allProjects.map((project) => project_1.transformProject(project));
+    const transformedProjects = allProjects.map(project_2.transformProject);
     if (newActive !== undefined) {
         const optedProject = parseInt(newActive, 10)
             ? transformedProjects.find((proj) => proj.id + '' === newActive)
             : transformedProjects.find((proj) => proj.name === newActive);
+        if ((optedProject === null || optedProject === void 0 ? void 0 : optedProject.type) && !project_1.default.accepted_types.includes(optedProject.type)) {
+            throw new error_1.default('provided project cannot be used since its not live', {
+                exit: 1,
+                errorId: 'PROJ-USE-3',
+                arg: [
+                    ansi_colors_1.bold(newActive),
+                    ansi_colors_1.bold(allProjects
+                        .filter((proj) => proj.project_type &&
+                        project_1.default.accepted_types.includes(proj.project_type))
+                        .map((project) => '* ' + project.project_name)
+                        .join('\n'))
+                ]
+            });
+        }
         if (optedProject === undefined) {
             throw new error_1.default('provided project does not match any project in remote', {
                 exit: 1,
@@ -65,20 +80,22 @@ exports.default = new command_1.default('project:use [name_or_project_id]')
                 ]
             });
         }
-        return makeActive(optedProject);
+        return makeActive(currentProjectId, optedProject);
     }
-    else {
-        const choices = transformedProjects.map((project) => {
-            return prompt_1.default.choice(project.name, {
-                value: project,
-                short: project.name,
-                disabled: currentProjectId === project.id + '' ? 'currently active project' : false
-            });
+    const choices = transformedProjects.map((project) => {
+        return prompt_1.default.choice(project.name, {
+            value: project,
+            short: project.name,
+            disabled: currentProjectId === project.id + ''
+                ? 'currently active project'
+                : project.type && !project_1.default.accepted_types.includes(project.type)
+                    ? project.type
+                    : false
         });
-        const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Which project do you wish to make active ? ', {
-            type: 'list',
-            choices
-        }));
-        return makeActive(projectAns.project);
-    }
+    });
+    const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Which project do you wish to make active ? ', {
+        type: 'list',
+        choices
+    }));
+    return makeActive(currentProjectId, projectAns.project);
 }));

package/lib/commands/pull.js

@@ -42,7 +42,7 @@ const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
 exports.default = new command_1.default('pull [feature]')
-    .description('Pull an existing project from Catalyst')
+    .description('Pull resources of your project from the remote console to the local directory')
     .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.webapp])
     .needs('config', { optional: true })
     .needs('rc')
@@ -72,7 +72,7 @@ exports.default = new command_1.default('pull [feature]')
         ansi_colors_1.bold(runtime_store_1.default.get('project.root')) +
         '\n' +
         warningText);
-    const ans = env_1.isWindows()
+    const ans = env_1.isWindows
         ? yield prompt_1.default.ask(prompt_1.default.question('confirmation', 'Are you ready to proceed?', {
             type: 'confirm'
         }))

package/lib/commands/run.js

@@ -38,7 +38,7 @@ const constants_1 = require("../util_modules/constants");
 const logger_1 = require("../util_modules/logger");
 exports.default = new command_1.default('run-script [command]')
     .alias('run')
-    .description('run a particular command script')
+    .description('Run a particular command script defined in catalyst.json')
     .needs('auth')
     .needs('config')
     .needs('rc', { optional: true, resolveOnNotFound: true })

package/lib/commands/serve.js

@@ -34,16 +34,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../internal/command"));
 const constants_1 = require("../util_modules/constants");
 exports.default = new command_1.default('serve')
-    .description('Serve your code for local testing without affecting the production')
+    .description('Serve Basic I/O and Advanced I/O functions, and the client, to test them locally')
     .option('--http <port>', 'start the server at specified port ')
     .option('--debug <type:port>', 'the functions are invoked from local environment enabling debugging options on provided ports ' +
     `(example: advancedio:<name>:${constants_1.DEFAULT.serve_port.debug.advancedio},basicio:${constants_1.DEFAULT.serve_port.debug.basicio})`)
     .option('--proxy <url>', 'proxy url to proxy any unknown request to the given url ' +
     '(e.g. "http://localhost:8080")')
     .option('--only <targets>', 'only serve specified, comma-separated targets (e.g. "client,functions:f1")')
-    .option('--watch', 'watch for file and directory changes and enable hot reload')
+    .option('--no-watch', 'disable watching the files for changes')
     .option('--except <targets>', 'serve all targets except specified (e.g. "client")')
     .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
+    .option('--no-open', 'disable opening the client automatically when served')
     .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.webapp])
     .needs('config')
     .needs('rc')

package/lib/commands/token/generate.js

@@ -34,7 +34,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../../internal/command"));
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('token:generate')
-    .description('Create a CLI token in order to use in CI systems')
+    .description('Generate a token to authenticate accessing the CLI from a remote system')
     .option('--current', 'prints out the existing token used by this CLI')
     .needs('auth')
     .ignore(['token'])

package/lib/commands/token/list.js

@@ -35,7 +35,7 @@ const ansi_colors_1 = require("ansi-colors");
 const command_1 = __importDefault(require("../../internal/command"));
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('token:list')
-    .description('List all the available tokens created from this cli')
+    .description('List all the available tokens generated in this CLI')
     .ignore(['token'])
     .needs('auth')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/token/revoke.js

@@ -34,7 +34,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../../internal/command"));
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('token:revoke <id>')
-    .description('Revoke the token created from this CLI')
+    .description('Revoke a token generated in this CLI')
     .needs('auth')
     .ignore(['token'])
     .action((input) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/whoami.js

@@ -18,7 +18,7 @@ const dc_1 = require("../dc");
 const command_1 = __importDefault(require("../internal/command"));
 const logger_1 = require("../util_modules/logger");
 exports.default = new command_1.default('whoami')
-    .description('prints out the current logged in user email id')
+    .description('Print the email address of the user currently logged in')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const activeDC = dc_1.getActiveDC();
     const user = config_store_1.default.get(`${activeDC}.user`);

package/lib/deploy/features/functions/index.js

@@ -70,7 +70,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 target.id = resp.id + '';
                 fn_utils_1.fnUtils.common.generateUrlForTarget(target);
             }
-            catch (err) {
+            catch (e) {
+                const err = error_1.default.getErrorInstance(e);
                 logger_1.debug(err.stack);
                 target.valid = false;
                 target.failure_reason = err.message;

package/lib/deploy/index.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const error_1 = __importDefault(require("../error"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const logger_1 = require("../util_modules/logger");
 const features_1 = __importDefault(require("./features"));
@@ -31,7 +32,8 @@ function deploy() {
             runtime_store_1.default.set('payload.targets', runtime_store_1.default.get('payload.targets', []).concat(currentTarget));
             yield featureModule();
         }
-        catch (error) {
+        catch (e) {
+            const error = error_1.default.getErrorInstance(e);
             logger_1.debug(`${currentTarget} deploy unsuccessful, reason : ${error.stack}`);
             logger_1.labeled(currentTarget, error.message).WARN();
         }

package/lib/endpoints/lib/iac.js

@@ -0,0 +1,134 @@
+'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 });
+const error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+const project_1 = require("../../util_modules/project");
+class IacAPI {
+    constructor(projectId, opts) {
+        this.opts = opts || { env: project_1.getEnvName() };
+        this.projectId = projectId || project_1.getProjectId('');
+    }
+    deploy(projectName, format, file, schedule = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post('/baas/v1/project/import', {
+                formData: {
+                    project_name: projectName,
+                    template_format: format,
+                    code: file,
+                    schedule: schedule.toString()
+                },
+                json: false
+            });
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            logger_1.debug('deploy response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    bundle(format) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post(`/baas/v1/project/${this.projectId}/export`, {
+                body: {
+                    template_format: format
+                },
+                json: true
+            });
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            logger_1.debug('bundle response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    bundleStatus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/export/status`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            logger_1.debug('bundle status response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    bundleDownload() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/export/download`, {
+                json: false,
+                encoding: null,
+                log: {
+                    progress: {
+                        title: 'Project ZIP'
+                    }
+                }
+            });
+            if (res.body) {
+                return res.body;
+            }
+            logger_1.debug('bundle status response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    allDeploys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/import`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            logger_1.debug('export response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    deployStatus(importId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/import/${importId}`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            logger_1.debug('export response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    deployDelete(importId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).delete(`/baas/v1/project/import/${importId}`);
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            logger_1.debug('export response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+    deployDownload(importId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/import/${importId}/download`, {
+                json: false,
+                encoding: null,
+                log: {
+                    progress: {
+                        title: 'Staged project archive'
+                    }
+                }
+            });
+            if (res.body) {
+                return res.body;
+            }
+            logger_1.debug('export response from server : ' + JSON.stringify(res.body));
+            throw new error_1.default('Server Error: Unexpected Response from server.', { exit: 2 });
+        });
+    }
+}
+exports.default = IacAPI;

package/lib/error.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("util");
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const default_1 = __importDefault(require("./util_modules/constants/lib/default"));
 class CatalystError extends Error {
     constructor(message, options = {}) {
-        var _a;
+        var _a, _b;
         super(message);
         this.name = default_1.default.catalystError;
         this.status = options.status || 500;
@@ -23,13 +24,42 @@ class CatalystError extends Error {
                 this.fileName =
                     options.fileName === undefined && stackArr[1] !== undefined
                         ? stackArr[1].replace(/\.[^.]+$/, '').replace(/^[^(]+\(/, '')
-                        : options.fileName;
-                runtime_store_1.default.set('log.' + this.fileName, runtime_store_1.default.get('log.' + this.fileName, []).concat(this));
+                        : (_b = options.fileName) === null || _b === void 0 ? void 0 : _b.replace(/\.[^.]+$/, '');
+                runtime_store_1.default.set(`[log]["${this.fileName}"]`, runtime_store_1.default.get(`[log]["${this.fileName}"]`, []).concat(this));
             }
         }
         catch (e) {
             runtime_store_1.default.set('log.faultyError', runtime_store_1.default.get('log.faultyError', []).concat(this));
         }
     }
+    static getErrorInstance(unknownError, { message, skipHelp, fileName } = {}) {
+        if (unknownError instanceof CatalystError) {
+            if (message) {
+                unknownError.message = message;
+            }
+            return unknownError;
+        }
+        if (unknownError instanceof Error) {
+            return new CatalystError(message || unknownError.message, {
+                original: unknownError,
+                skipHelp: skipHelp === undefined ? true : skipHelp,
+                fileName
+            });
+        }
+        const newError = new CatalystError(message || 'Malformed error', {
+            original: util_1.inspect(unknownError),
+            skipHelp: skipHelp === undefined ? true : skipHelp
+        });
+        if ('message' in unknownError) {
+            newError.message = unknownError.message;
+        }
+        if ('stack' in unknownError) {
+            newError.stack = unknownError.stack;
+        }
+        if ('name' in unknownError) {
+            newError.name = unknownError.name;
+        }
+        return newError;
+    }
 }
 exports.default = CatalystError;

package/lib/errorOut.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("./util_modules/logger");
 const error_1 = __importDefault(require("./error"));
 const constants_1 = require("./util_modules/constants");
-const contextHelp_1 = __importDefault(require("./util_modules/contextHelp"));
+const context_help_1 = __importDefault(require("./util_modules/context-help"));
 exports.default = (error, status) => {
     if (typeof error === 'string') {
         error = new error_1.default('An unexpected error has occurred.', {
@@ -23,10 +23,11 @@ exports.default = (error, status) => {
         });
     }
     try {
-        contextHelp_1.default();
+        const exitCode = context_help_1.default();
+        process.exitCode = typeof exitCode === 'number' ? exitCode : 2;
     }
     catch (err) {
         logger_1.debug('HELP ERROR: ' + err.stack);
+        process.exitCode = 2;
     }
-    process.exitCode = error ? error.exit : 2;
 };

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

@@ -124,10 +124,9 @@ exports.validate = validate;
 function refineTargets(rawTargets, mapRemoteFn = true) {
     return __awaiter(this, void 0, void 0, function* () {
         let remoteFnIdMap = {};
-        let runtimeDetails = { runtimes: [] };
+        let runtimeDetails = runtime_store_1.default.get('context.catalyst.runtime', { runtimes: [] });
         if (mapRemoteFn) {
             const fnAPI = yield endpoints_1.functionsAPI();
-            runtimeDetails = runtime_store_1.default.get('context.catalyst.runtime');
             let allRemoteFns = [];
             [allRemoteFns, runtimeDetails] = yield Promise.all([
                 fnAPI.getAllFunctions(),
@@ -145,6 +144,7 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
             }, remoteFnIdMap);
         }
         return Promise.all(rawTargets.map((fnPath) => __awaiter(this, void 0, void 0, function* () {
+            fnPath = project_1.resolveProjectPath(fnPath);
             const catalystJsonPth = path_1.join(fnPath, constants_1.FILENAME.catalyst_config);
             const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth, {
                 checkpath: true,
@@ -158,23 +158,24 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                     failure_reason: 'there is no valid ' + constants_1.FILENAME.catalyst_config + ' file present'
                 };
             }
-            const validatePlugin = yield plugin_loader_1.default('functions', 'validate', fnPath);
-            if (validatePlugin !== undefined) {
+            const validatePlugin = yield plugin_loader_1.default('functions', 'validate', fnPath).catch((err) => logger_1.debug(err));
+            if (typeof validatePlugin === 'function') {
                 try {
                     yield validatePlugin(option_1.getCurrentCommand(), fnPath, runtime_store_1.default, catalystJson);
                 }
                 catch (e) {
-                    throw new error_1.default(e, {
+                    throw new error_1.default(e.message, {
                         exit: 1,
                         errorId: 'COMMON-4',
                         original: e,
-                        arg: ['validating', e]
+                        arg: ['validating', e.toString()]
                     });
                 }
             }
             const fnName = js_1.JS.get(catalystJson, 'deployment.name');
             const userStack = js_1.JS.get(catalystJson, 'deployment.stack');
-            if (!userStack || !runtimeDetails.runtimes.includes(userStack)) {
+            if (!userStack ||
+                (runtimeDetails.runtimes.length > 0 && !runtimeDetails.runtimes.includes(userStack))) {
                 return {
                     name: path_1.basename(fnPath),
                     source: fnPath,
@@ -248,8 +249,8 @@ function pack(target) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let source = target.source;
-            const buildPlugin = yield plugin_loader_1.default('functions', 'build', source);
-            if (buildPlugin !== undefined) {
+            const buildPlugin = yield plugin_loader_1.default('functions', 'build', source).catch((err) => logger_1.debug(err));
+            if (typeof buildPlugin === 'function') {
                 try {
                     logger_1.message(`Plugin : "${runtime_store_1.default.get(`context.functions.plugins.build.${source}`)}" is used for functions deploy`);
                     const outputDir = yield buildPlugin(source, runtime_store_1.default);
@@ -259,11 +260,11 @@ function pack(target) {
                     source = outputDir;
                 }
                 catch (e) {
-                    throw new error_1.default(e, {
+                    throw new error_1.default(e.message, {
                         exit: 1,
                         errorId: 'COMMON-4',
                         original: e,
-                        arg: ['building', e]
+                        arg: ['building', e.toString()]
                     });
                 }
             }
@@ -276,8 +277,8 @@ function pack(target) {
                 });
             }
             else {
-                const ignore = config_1.functionsConfig.ignore(source);
-                const files = yield fs_1.ASYNC.walk(source, ignore);
+                const exclude = config_1.functionsConfig.ignore(source);
+                const files = yield fs_1.ASYNC.walk(source, { exclude });
                 files.forEach((file) => {
                     zip.add(file.replace(source + path_1.sep, ''), fs_1.SYNC.getReadStream(file));
                 });
@@ -289,7 +290,7 @@ function pack(target) {
         }
         catch (err) {
             target.valid = false;
-            target.failure_reason = err;
+            target.failure_reason = err.message;
         }
     });
 }
@@ -368,6 +369,26 @@ function resolveAllFnPorts(targets, idx = 0) {
     });
 }
 exports.resolveAllFnPorts = resolveAllFnPorts;
+function fnDirDelete(conf) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const fnSource = conf.get('functions.source', false);
+        if (!fnSource) {
+            logger_1.debug('Unable to get the functions source directory');
+            return;
+        }
+        const fnDir = project_1.resolveProjectPath(fnSource);
+        const dirContents = yield fs_1.ASYNC.walk(fnDir);
+        const delFnDir = yield prompt_1.default.ask(prompt_1.default.question('delDir', `All the Catalyst functions configured in the ${constants_1.FILENAME.config} file has been deleted.\n Would you like to delete the ${fnSource} directory too ?`, {
+            type: 'confirm',
+            when: () => dirContents.length > 0
+        }));
+        if (delFnDir.delDir === undefined ||
+            (typeof delFnDir.delDir === 'boolean' && delFnDir.delDir)) {
+            yield fs_1.ASYNC.deleteDir(fnDir);
+        }
+        return conf.unset('functions');
+    });
+}
 function deleteFunctionLocal(path) {
     return __awaiter(this, void 0, void 0, function* () {
         const isDirectory = yield fs_1.ASYNC.dirExists(path);
@@ -376,7 +397,7 @@ function deleteFunctionLocal(path) {
             yield fs_1.ASYNC.deleteDir(path);
         }
         const fnTargets = conf.get('functions.targets').filter((fn) => (typeof fn === 'string' ? !path.endsWith(fn) : !path.endsWith(fn.source)));
-        conf.set('functions.targets', fnTargets);
+        fnTargets.length === 0 ? yield fnDirDelete(conf) : conf.set('functions.targets', fnTargets);
         return conf.syncSave();
     });
 }
@@ -396,7 +417,7 @@ function getSDK(fnType, dest, stack, options = {}) {
         }
         yield new archiver_1.default()
             .load(sdkZip)
-            .extract(new RegExp(`catalyst-${stack}`), dest, { isFolder: true })
+            .extract(dest, new RegExp(`catalyst-${stack}`), { ignoreInitial: true })
             .finalize();
     });
 }