zcatalyst-cli 1.9.1 → 1.10.0

package/README.md

@@ -86,12 +86,12 @@ Command | Description
 **ds:import** | Bulk write records to a table in the Catalyst Data Store.
 **ds:export** | Bulk read records from a table in the Catalyst Data Store.
 **ds:status** | Display the job status of a Data Store import or export operation.
-**client:setup** | Set up the client directory in your project directory.
+**client:setup** | Set up and configure the client directory in your project directory.
 **client:delete** | Delete a version of the client from the remote console or the local directory.
-**functions:setup** | Set up the function directory in your project directory.
+**functions:setup** | Set up and configure the function directory in your project directory.
 **functions:add** | Add a function of the required stack to the function directory.
 **functions:shell** | Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions.
-**functions:config** | Configure the memory allocation of a function in your project.
+**functions:config** | Perform advanced configurations such as memory allocation on a function in your project.
 **functions:delete** | Delete a function from the remote console or the local directory.
 **event:generate \| generate:event** | Generate sample payloads from different components or custom event sources to test Event functions.
 **event:generate:integ** | Generate sample payloads for the required integration service to test Integration functions.

package/docs/command_needs/auth.toml

@@ -2,3 +2,8 @@
 context = '''Oops! It looks like you haven't logged in yet'''
 aid = '''Please use the ${arg[0]} command to log in, or provide auth token via ${arg[1]} param'''
 link = 'https://www.zoho.com/catalyst/help/cli-login.html'
+
+[AUTH-2]
+context = '''Oops! It looks like there is a scope missing for running this command'''
+aid = '''Please use the ${arg[0]} command to re-login, or provide different auth token via ${arg[1]} param'''
+link = 'https://www.zoho.com/catalyst/help/cli-login.html'

package/docs/commands/iac/export.toml

@@ -0,0 +1,4 @@
+[PROJ-USE-1]
+context = '''Oops! It looks like you haven't created your first Catalyst project yet'''
+aid = '''Please visit the below link to get started with your first catalyst project'''
+link = 'https://www.zoho.com/catalyst/help/catalyst-console.html#Projects'

package/docs/commands/iac/import.toml

@@ -0,0 +1,4 @@
+[I-1]
+context = '''No project template found in the zip provided.'''
+aid = '''Project template should be placed at the root level of the zip.'''
+link = 'https://www.zoho.com/catalyst/help/cli-import-export.html'

package/docs/commands/iac/status.toml

@@ -0,0 +1,4 @@
+[S-1]
+context = '''The operation "${arg[0]}" provided by you is not supported.'''
+aid = '''Supported operations are "import" and "export". Usage Example: "catalyst iac:status import"'''
+link = 'https://www.zoho.com/catalyst/help/cli-import-export.html'

package/docs/commands/project/use.toml

@@ -7,3 +7,9 @@ link = 'https://www.zoho.com/catalyst/help/catalyst-console.html#Projects'
 context = '''The project ${arg[0]} does not exist in the Catalyst remote console.'''
 aid = '''Please specify only the projects from this list : \n${arg[1]}'''
 link = 'https://www.zoho.com/catalyst/help/cli-projects.html#Use'
+
+[PROJ-USE-3]
+context = '''The project ${arg[0]} is not live and is possibily still in import phase.'''
+aid = '''Please specify only the projects from this list : \n${arg[1]}'''
+link = 'https://www.zoho.com/catalyst/help/cli-projects.html#Use'
+

package/docs/iac/status/bundle.toml

@@ -0,0 +1,4 @@
+[B-1]
+context = '''No export project available in server.'''
+aid = '''To start exporting a project use "catalyst iac:export"'''
+link = 'https://www.zoho.com/catalyst/help/cli-import-export.html'

package/lib/api-timer.js

@@ -0,0 +1,81 @@
+"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 events_1 = __importDefault(require("events"));
+const error_1 = __importDefault(require("./error"));
+class APITimer extends events_1.default {
+    constructor(apiFn, frequency, errorTolerance) {
+        super();
+        this.apiFn = apiFn;
+        this.frequency = frequency || 5000;
+        this.interval = null;
+        this.execCount = 0;
+        this.maxErrors = errorTolerance || 10;
+        this.errorCount = 0;
+        this.ended = false;
+    }
+    emit(eventName, ...args) {
+        if (this.ended || this.listenerCount(eventName) <= 0) {
+            return false;
+        }
+        return super.emit(eventName, ...args);
+    }
+    waitForEnd() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((res, rej) => {
+                this.on('end', (e, data) => {
+                    if (e) {
+                        rej(e);
+                        return;
+                    }
+                    res(data);
+                });
+            });
+        });
+    }
+    fire() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.ended) {
+                this.end();
+            }
+            try {
+                const data = yield this.apiFn();
+                this.emit('data', data, ++this.execCount);
+            }
+            catch (e) {
+                this.emit('error', e, ++this.errorCount);
+                const err = error_1.default.getErrorInstance(e);
+                if (this.errorCount >= this.maxErrors) {
+                    this.end(err);
+                }
+            }
+        });
+    }
+    start() {
+        this.fire();
+        this.interval = setInterval(this.fire.bind(this), this.frequency);
+        return this;
+    }
+    end(e, data) {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.execCount = 0;
+            this.errorCount = 0;
+            this.interval = null;
+        }
+        this.emit('end', e, data);
+        this.ended = true;
+    }
+}
+exports.default = APITimer;

package/lib/apig-utils.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apigUtils = void 0;
 const ansi_colors_1 = require("ansi-colors");
+const util_1 = require("util");
 const client_utils_1 = require("./client-utils");
 const error_1 = __importDefault(require("./error"));
 const execute_script_1 = __importDefault(require("./execute-script"));
@@ -64,14 +65,14 @@ exports.apigUtils = {
             yield client_utils_1.clientUtils.validate();
             const homepage = runtime_store_1.default.get('context.client.homepage', 'index.html');
             const loginRedirect = runtime_store_1.default.get('context.client.login_redirect', homepage);
-            if (loginRedirect) {
+            if (typeof loginRedirect === 'string') {
                 redirectPath = loginRedirect.startsWith('/')
                     ? loginRedirect
                     : '/app/' + loginRedirect;
             }
         }
         catch (e) {
-            logger_1.debug(e.message);
+            logger_1.debug(error_1.default.getErrorInstance(e).message);
         }
         let redirectIdx = -1;
         const namesArr = [];
@@ -197,19 +198,20 @@ exports.apigUtils = {
                         rule.name, new RegExp(regexParts[1]);
                     }
                     catch (regexError) {
-                        throw new error_1.default('source_endpoint provided for apig rule "' +
-                            rule.name +
-                            '" is not valid', {
-                            exit: 1,
-                            original: regexError,
-                            errorId: 'APIG-UTILS-9',
-                            arg: [
-                                ansi_colors_1.bold('source_endpoint'),
-                                ansi_colors_1.bold(rule.name),
-                                ansi_colors_1.italic(source_endpoint.replace(part, ansi_colors_1.red(part))),
-                                ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(regexError)
-                            ]
+                        const err = error_1.default.getErrorInstance(regexError, {
+                            message: 'source_endpoint provided for apig rule "' +
+                                rule.name +
+                                '" is not valid',
+                            skipHelp: false
                         });
+                        err.errorId = 'APIG-UTILS-9';
+                        err.arg = [
+                            ansi_colors_1.bold('source_endpoint'),
+                            ansi_colors_1.bold(rule.name),
+                            ansi_colors_1.italic(source_endpoint.replace(part, ansi_colors_1.red(part))),
+                            ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(util_1.inspect(regexError))
+                        ];
+                        throw err;
                     }
                     if (regexParts[1].includes('^') || regexParts[1].includes('$')) {
                         throw new error_1.default('source_endpoint provided for apig rule "' +

package/lib/archiver.js

@@ -43,27 +43,38 @@ class Archiver {
         this.promiseArr = [];
     }
     load(content, { createFolders = true } = {}) {
-        if (Buffer.isBuffer(content) || js_1.JS.isString(content)) {
-            this.content = content;
-        }
-        else {
+        if (!Buffer.isBuffer(content) && !js_1.JS.isString(content)) {
             throw new error_1.default('Unable to parse zip content, content should be either a string or buffer', { exit: 2 });
         }
+        this.content = content;
         this.jszip = jszip_1.loadAsync(content, { createFolders });
         return this;
     }
-    _writeFolder(folder, to) {
+    _writeFolder(folder, to, recursive = false, ignoreInitial = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            const allFilePromise = [];
-            folder.forEach((relPath, file) => {
-                if (!file.dir) {
-                    const relDir = path_1.dirname(relPath);
-                    allFilePromise.push(fs_1.ASYNC.ensureDir(path_1.join(to, relDir)).then(() => {
-                        return this._writeFile(file, path_1.join(to, relDir));
-                    }));
-                }
-            });
-            return Promise.all(allFilePromise);
+            return this._writeAllFile(folder.filter((_relPath, file) => !file.dir), to, recursive, ignoreInitial);
+        });
+    }
+    _writeAllFile(files, to, recursive = false, ignoreInitial = true) {
+        return __awaiter(this, void 0, void 0, function* () {
+            while (files.length > 0) {
+                const limit = files.length < Archiver.maxWriteLimit ? files.length : Archiver.maxWriteLimit;
+                yield Promise.all(files.splice(0, limit).map((file) => __awaiter(this, void 0, void 0, function* () {
+                    const filePath = path_1.join(to, path_1.dirname(ignoreInitial ? file.name.substr(file.name.indexOf('/') + 1) : file.name));
+                    yield fs_1.ASYNC.ensureDir(filePath);
+                    if (file.name.endsWith('.zip') && recursive) {
+                        const zipContent = yield file.async('nodebuffer');
+                        return new Archiver()
+                            .load(zipContent)
+                            .extract(path_1.join(filePath, path_1.basename(file.name).replace('.zip', '')), '/', {
+                            recursive,
+                            ignoreInitial
+                        })
+                            .finalize();
+                    }
+                    return this._writeFile(file, filePath);
+                })));
+            }
         });
     }
     _writeFile(file, to) {
@@ -76,35 +87,51 @@ class Archiver {
             });
         });
     }
-    extract(from, to, { isFolder = false }) {
-        this.promiseArr.push(this.jszip.then((zip) => __awaiter(this, void 0, void 0, function* () {
+    readFile(relPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const actualZip = yield this.jszip;
+            const fileObjArr = [];
+            if (typeof relPath === 'string') {
+                const fileObj = actualZip.file(relPath);
+                if (fileObj) {
+                    fileObjArr.push(fileObj);
+                }
+            }
+            else {
+                fileObjArr.push(...actualZip.file(relPath));
+            }
+            if (fileObjArr.length === 0) {
+                return;
+            }
+            return fileObjArr[0].async('string');
+        });
+    }
+    extract(to, from = '/', { isFolder = true, recursive = false, ignoreInitial = true } = {}) {
+        const extractPromise = this.jszip.then((zip) => __awaiter(this, void 0, void 0, function* () {
             if (isFolder) {
-                const fromFolderObj = [];
+                let folder = null;
                 if (typeof from === 'string') {
-                    if (from === '/') {
-                        fromFolderObj.push(zip);
-                    }
-                    else {
-                        const folder = zip.folder(from);
-                        if (folder) {
-                            fromFolderObj.push(folder);
-                        }
-                    }
+                    folder = from === '/' ? zip : zip.folder(from);
                 }
                 else {
                     const folderObjects = zip.folder(from);
-                    folderObjects.forEach((folder) => {
-                        if (folder) {
-                            fromFolderObj.push(zip.folder(folder.name));
+                    if (folderObjects.length > 0) {
+                        folder = zip.folder(folderObjects[0].name);
+                        if (folderObjects.length > 1) {
+                            folderObjects.forEach((folderObj) => {
+                                if (folder !== null && folderObj.name.length > folder.name.length) {
+                                    folder = zip.folder(folderObj.name);
+                                }
+                            });
                         }
-                    });
+                    }
                 }
-                if (fromFolderObj.length === 0) {
+                if (!folder) {
                     throw new error_1.default('Unable to extract zip, FolderObj is null', {
                         exit: 2
                     });
                 }
-                yield Promise.all(fromFolderObj.map((obj) => this._writeFolder(obj, to)));
+                yield this._writeFolder(folder, to, recursive, ignoreInitial);
                 return true;
             }
             const fromFileObj = [];
@@ -115,28 +142,21 @@ class Archiver {
                 }
             }
             else {
-                fromFileObj.push(...zip.file(from).filter((fileObj) => {
-                    if (fileObj) {
-                        return true;
-                    }
-                    return false;
-                }));
+                fromFileObj.concat(zip.file(from));
             }
             if (fromFileObj.length === 0) {
                 throw new error_1.default('Unable to extract zip, FileObj is null', {
                     exit: 2
                 });
             }
-            while (fromFileObj.length > 0) {
-                const limit = fromFileObj.length < 20 ? fromFileObj.length : 20;
-                yield Promise.all(fromFileObj.splice(0, limit).map((obj) => this._writeFile(obj, to)));
-            }
+            yield this._writeAllFile(fromFileObj, to, recursive, ignoreInitial);
             return true;
-        })));
+        }));
+        this.promiseArr.push(extractPromise);
         return this;
     }
     getUnixPath(pth) {
-        return js_1.JS.join(js_1.JS.split(pth, path_1.sep), '/');
+        return pth.split(path_1.sep).join('/');
     }
     add(pth, content, { createFolders = true } = {}) {
         this.promiseArr.push(this.jszip.then((zip) => {
@@ -189,6 +209,23 @@ class Archiver {
                 });
                 yield fs_1.ASYNC.writeFile(tempFilePath, content);
                 return fs_1.SYNC.getReadStream(tempFilePath);
+            }),
+            writeZip: (pth) => __awaiter(this, void 0, void 0, function* () {
+                const zip = yield this.jszip;
+                const content = yield zip.generateAsync({
+                    type: 'nodebuffer',
+                    compression: 'DEFLATE',
+                    compressionOptions: {
+                        level: 9
+                    }
+                });
+                if (pth.endsWith('.zip')) {
+                    pth = path_1.join(path_1.dirname(pth), this.name + '.zip');
+                }
+                if (path_1.parse(pth).ext === '') {
+                    pth = path_1.join(pth, this.name + '.zip');
+                }
+                yield fs_1.ASYNC.writeFile(pth, content);
             })
         };
     }
@@ -199,4 +236,5 @@ class Archiver {
         });
     }
 }
+Archiver.maxWriteLimit = 50;
 exports.default = Archiver;

package/lib/authentication/login.js

@@ -287,9 +287,11 @@ class Login {
                             processReq = false;
                             res.writeHead(404);
                             res.end();
+                            return;
                         }
                         reqCount += 1;
-                        const queryParamsObj = new url_1.URL(req.url, `http://${req.headers.host}`).searchParams;
+                        const queryParamsObj = new url_1.URL(req.url, `http://${req.headers.host}`)
+                            .searchParams;
                         const code = queryParamsObj !== undefined && queryParamsObj.get('code');
                         const location = queryParamsObj !== undefined && queryParamsObj.get('location');
                         if (processReq && typeof code === 'string') {
@@ -335,7 +337,7 @@ class Login {
                         server.close();
                         reject(new error_1.default('Server crashed with error.\n', {
                             exit: 2,
-                            original: e
+                            original: error_1.default.getErrorInstance(e)
                         }));
                     }
                 }));

package/lib/bin/catalyst.js

@@ -82,7 +82,6 @@ process.on('exit', (code) => {
         pkg,
         updateCheckInterval: 1000 * 60 * 15
     }).notify({ defer: false, isGlobal: true });
-    errorOut_1.default();
 });
 process.on('uncaughtException', (err) => {
     errorOut_1.default(err);

package/lib/client-utils.js

@@ -28,8 +28,8 @@ const logger_1 = require("./util_modules/logger");
 const option_1 = require("./util_modules/option");
 const project_1 = require("./util_modules/project");
 exports.clientUtils = {
-    validate: () => __awaiter(void 0, void 0, void 0, function* () {
-        const sourceDir = project_1.resolveProjectPath(config_1.clientConfig.source());
+    validate: (source) => __awaiter(void 0, void 0, void 0, function* () {
+        const sourceDir = source || project_1.resolveProjectPath(config_1.clientConfig.source());
         const packageJsonFile = path_1.join(sourceDir, constants_1.FILENAME.client.package_json);
         const sourceDirExists = yield fs_1.ASYNC.dirExists(sourceDir);
         if (!sourceDirExists) {
@@ -80,16 +80,16 @@ exports.clientUtils = {
             yield validatePlugin(option_1.getCurrentCommand(), sourceDir, runtime_store_1.default, packageJson);
         }
         catch (e) {
-            throw new error_1.default(e, {
-                exit: 1,
-                errorId: 'CLIENT-UTILS-5',
-                original: e,
-                arg: [
-                    'validating',
-                    ansi_colors_1.bold(config_1.clientConfig.plugin('validate') || 'unknown'),
-                    ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(e.message)
-                ]
+            const err = error_1.default.getErrorInstance(e, {
+                skipHelp: false
             });
+            err.errorId = 'CLIENT-UTILS-5';
+            err.arg = [
+                'validating',
+                ansi_colors_1.bold(config_1.clientConfig.plugin('validate') || 'unknown'),
+                ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(err.message)
+            ];
+            throw err;
         }
         runtime_store_1.default.set('context.client.valid', true);
         return packageJson;
@@ -118,20 +118,20 @@ exports.clientUtils = {
                 source = outputDir;
             }
             catch (e) {
-                throw new error_1.default(e, {
-                    exit: 1,
-                    errorId: 'CLIENT-UTILS-5',
-                    original: e,
-                    arg: [
-                        'building',
-                        ansi_colors_1.bold(config_1.clientConfig.plugin('build') || 'unknown'),
-                        ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(e.message)
-                    ]
+                const err = error_1.default.getErrorInstance(e, {
+                    skipHelp: false
                 });
+                err.errorId = 'CLIENT-UTILS-5';
+                err.arg = [
+                    'building',
+                    ansi_colors_1.bold(config_1.clientConfig.plugin('build') || 'unknown'),
+                    ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(err.message)
+                ];
+                throw err;
             }
         }
-        const ignore = config_1.clientConfig.ignore(source);
-        const files = yield fs_1.ASYNC.walk(source, ignore);
+        const exclude = config_1.clientConfig.ignore(source);
+        const files = yield fs_1.ASYNC.walk(source, { exclude });
         const zip = new archiver_1.default();
         files.forEach((file) => {
             zip.add(file.replace(source + path_1.sep, ''), fs_1.SYNC.getReadStream(file));

package/lib/client.js

@@ -46,8 +46,5 @@ class Client {
             return cmd.name();
         });
     }
-    onUnknownCommand(actionFn) {
-        this.cli.action(actionFn);
-    }
 }
 exports.Client = Client;

package/lib/command_needs/auth.js

@@ -41,9 +41,18 @@ exports.default = (inScopes = []) => {
         });
     }
     logger_1.debug(`> authorizing via ${tokenObj.option} option`);
-    const commandScopes = [constants_1.SCOPE.projects, ...inScopes].filter((value, index, self) => self.indexOf(value) === index);
-    logger_1.debug('> command requires scopes: ' + JSON.stringify([constants_1.SCOPE.projects].concat(inScopes || [])));
-    runtime_store_1.default.set('auth_scopes', commandScopes);
+    const existingScopes = config_store_1.default.get(`${activeDC}.scopes`, []);
+    const requiredScopes = [constants_1.SCOPE.projects, ...inScopes];
+    logger_1.debug('> command requires scopes: ' + JSON.stringify(requiredScopes));
+    const hasAllScope = requiredScopes.every((scope) => existingScopes.includes(scope));
+    if (!hasAllScope) {
+        throw new error_1.default('Re-login required due to missing scopes!!', {
+            exit: 0,
+            errorId: 'AUTH-2',
+            arg: [ansi_colors_1.bold('catalyst login --force'), ansi_colors_1.bold('--token')]
+        });
+    }
+    runtime_store_1.default.set('auth_scopes', requiredScopes);
     runtime_store_1.default.set('user', config_store_1.default.get(`${activeDC}.user`, null));
     runtime_store_1.default.set('credential', credential_1.default.init(tokenObj.token, tokenObj.temp));
 };

package/lib/command_needs/rc.js

@@ -18,16 +18,17 @@ const error_1 = __importDefault(require("../error"));
 const rc_1 = __importDefault(require("../internal/rc"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 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 option_1 = require("../util_modules/option");
-const project_1 = require("../util_modules/project");
+const project_2 = require("../util_modules/project");
 exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const projectOpt = option_1.getGlobalOptionValue('project', null);
     const projectApi = yield endpoints_1.projectAPI();
     const envApi = yield endpoints_1.envAPI();
     const convertProjectToProperties = (project) => {
-        project = project_1.transformProject(project);
+        project = project_2.transformProject(project);
         runtime_store_1.default.set('project.name', project.name);
         runtime_store_1.default.set('project.id', project.id + '');
         runtime_store_1.default.set('project.domain', project.domain);
@@ -39,7 +40,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
                 exit: 2
             });
         }
-        runtime_store_1.default.set('project.env', project_1.transformEnv(envObj));
+        runtime_store_1.default.set('project.env', project_2.transformEnv(envObj));
     };
     let ignoreRC = false;
     if (projectOpt !== null) {
@@ -60,7 +61,11 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
                     arg: [
                         ansi_colors_1.bold(projectOpt),
                         ansi_colors_1.bold('--project'),
-                        ansi_colors_1.bold(projectArr.map((project) => '* ' + project.project_name).join('\n'))
+                        ansi_colors_1.bold(projectArr
+                            .filter((proj) => proj.project_type &&
+                            project_1.default.accepted_types.includes(proj.project_type))
+                            .map((project) => '* ' + project.project_name)
+                            .join('\n'))
                     ]
                 });
             }
@@ -146,7 +151,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
             logger_1.message('cleaning up ' +
                 constants_1.FILENAME.rc +
                 ' since the current active project for this folder is not found in remote');
-            yield project_1.removeProject(finalProjectObj.id + '');
+            yield project_2.removeProject(finalProjectObj.id + '');
             if (resolveOnNotFound) {
                 finalProjectObj = undefined;
                 return;
@@ -170,8 +175,8 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
                 exit: 2
             });
         }
-        finalEnvObj = project_1.transformEnv(envObj);
-        yield project_1.upsertEnv(finalProjectObj.id + '', envObj, {
+        finalEnvObj = project_2.transformEnv(envObj);
+        yield project_2.upsertEnv(finalProjectObj.id + '', envObj, {
             active: true,
             base: js_1.JS.isEmpty(defaultRCEnv)
         });

package/lib/commands/apig/status.js

@@ -46,13 +46,14 @@ exports.default = new command_1.default('apig:status')
         report = (yield api.getScheduleReport(previousOpt));
     }
     catch (e) {
-        if (e.status && e.status === 404) {
+        const err = error_1.default.getErrorInstance(e);
+        if (err.status && err.status === 404) {
             throw new error_1.default('There is no report available.', {
                 exit: 0,
                 errorId: 'STAT-1'
             });
         }
-        throw e;
+        throw err;
     }
     const spinner = 'API Gateway Upsert';
     const throbber = throbber_1.default.getInstance();
@@ -192,13 +193,14 @@ exports.default = new command_1.default('apig:status')
                 report = (yield api.getScheduleReport(false));
             }
             catch (ex) {
-                if (ex.status && ex.status === 404) {
+                const err = error_1.default.getErrorInstance(ex);
+                if (err.status && err.status === 404) {
                     report = (yield api.getScheduleReport(true));
                 }
                 else {
                     throbber.stopAll();
                     needIteration = false;
-                    reject(ex);
+                    reject(err);
                 }
             }
         }

package/lib/commands/client/delete.js

@@ -87,10 +87,8 @@ exports.default = new command_1.default('client:delete [client_version]')
                 localDel.version = version;
             }
             catch (error) {
-                logger_1.debug('Failed to read ' +
-                    constants_1.FILENAME.client.package_json +
-                    ' Reason: ' +
-                    error.message);
+                const err = error_1.default.getErrorInstance(error);
+                logger_1.debug('Failed to read ' + constants_1.FILENAME.client.package_json + ' Reason: ' + err.message);
             }
             if (clientVersion !== undefined && clientVersion !== localDel.version) {
                 throw new error_1.default('version unavailable in local', {

package/lib/commands/client/setup.js

@@ -37,7 +37,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('client:setup')
-    .description('Set up the client directory in your project directory')
+    .description('Set up and configure the client directory in your project directory')
     .needs('auth', [constants_1.SCOPE.webapp])
     .needs('config')
     .needs('rc')