zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.10

package/lib/commands/functions/setup.js

@@ -43,8 +43,9 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:setup')
     .description('Set up and configure the function directory in your project directory')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).functions();

package/lib/commands/functions/shell.js

@@ -61,6 +61,7 @@ exports.default = new command_1.default('functions:shell')
     .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
     .needs('config')
     .needs('rc')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const httpOpt = (0, option_1.getOptionValue)('http', false);
     if (httpOpt && typeof httpOpt !== 'boolean') {

package/lib/commands/iac/export.js

@@ -73,7 +73,11 @@ exports.default = new command_1.default('iac:export')
                 arr.push(allGlobalOpts[key]);
             }
             return arr;
-        }, (env === 'Production' ? ['--production'] : []));
+        }, [
+            '--org',
+            (0, project_1.getEnvId)(),
+            ...(env === 'Production' ? ['--production'] : [])
+        ]);
         (0, shell_1.spawn)('catalyst', ['iac:status', 'export', ...optsArr], {
             shell: true,
             stdio: 'inherit'

package/lib/commands/iac/import.js

@@ -58,6 +58,7 @@ const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
 const server_js_1 = require("../../util_modules/server.js");
+const project_1 = require("../../util_modules/project");
 const getZipAndTemplate = (filePath, stagedDeploy) => __awaiter(void 0, void 0, void 0, function* () {
     const zipFile = filePath
         ? yield ASYNC.readFile((0, utils_js_1.untildify)(filePath), 'buffer')
@@ -84,6 +85,8 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
         const callbackPort = yield port_resolver_1.default.getFreePort(3000, 10, false);
         const accessUrl = new url_1.URL(`/baas/v1/project/import/${deployRes.id}/deploy`, `${constants_1.ORIGIN.admin}`);
         accessUrl.searchParams.set('redirect_url', `http://localhost:${callbackPort}/success`);
+        const orgId = (0, project_1.getEnvId)();
+        orgId && accessUrl.searchParams.set('catalyst_org', orgId);
         const server = (0, http_1.createServer)((req, resp) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 if (req.url !== '/success') {
@@ -136,7 +139,7 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
                 arr.push(allGlobalOpts[key]);
             }
             return arr;
-        }, ['--id', deployRes.id]);
+        }, ['--id', deployRes.id, '--org', (0, project_1.getEnvId)() || '']);
         yield (0, shell_1.spawn)('catalyst', ['iac:status', 'import', ...optsArr], {
             shell: true,
             stdio: 'inherit'

package/lib/commands/index.js

@@ -36,7 +36,8 @@ exports.default = (client) => {
     function loadCommand(name) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                const cmd = (yield Promise.resolve().then(() => __importStar(require('./' + name.split(':').join('/'))))).default;
+                var _a;
+                const cmd = (yield (_a = './' + name.split(':').join('/'), Promise.resolve().then(() => __importStar(require(_a))))).default;
                 try {
                     cmd.register(client);
                     resolve();
@@ -79,6 +80,8 @@ exports.default = (client) => {
         loadCommand('codelib:install'),
         loadCommand('event:generate'),
         loadCommand('event:generate:integ'),
+        loadCommand('zest:generate'),
+        loadCommand('event:generate:job'),
         loadCommand('serve'),
         loadCommand('deploy'),
         loadCommand('help'),

package/lib/commands/init.js

@@ -56,14 +56,10 @@ exports.default = new command_1.default('init [feature]')
     .description('Initialize a Catalyst project, function, and client resources in the local directory')
     .option('--force', 'force initialise a project for this directory')
     .ignore(['project'])
-    .needs('auth', [
-    constants_1.SCOPE.projects,
-    constants_1.SCOPE.stratus_create,
-    constants_1.SCOPE.stratus_read,
-    constants_1.SCOPE.project_import_create
-])
+    .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.project_import_create])
     .needs('config', { optional: true })
     .needs('rc', { optional: true, resolveOnNotFound: true })
+    .ci(false)
     .action((feature) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const config = runtime_store_1.default.get('config');
@@ -104,8 +100,15 @@ exports.default = new command_1.default('init [feature]')
         return;
     }
     if (feature !== 'project') {
-        yield (0, features_1.project)();
+        try {
+            yield (0, features_1.project)();
+        }
+        catch (er) {
+            (0, logger_1.debug)(er);
+            return;
+        }
     }
+    (0, logger_1.info)();
     const featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional! Press ' +
         (0, ansi_colors_1.cyan)('<return> ') +
         'to proceed.\n', {

package/lib/commands/login.js

@@ -40,6 +40,7 @@ exports.default = new command_1.default('login')
     .description('Log the CLI in to your Catalyst account')
     .option('--no-localhost', 'login without browser')
     .option('--force', 'force reauthentication')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication')));
     return auth.login();

package/lib/commands/logout.js

@@ -38,6 +38,7 @@ 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 Catalyst account')
+    .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication')));
     return auth.logout();

package/lib/commands/pull.js

@@ -50,6 +50,7 @@ exports.default = new command_1.default('pull [feature]')
     .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.webapp])
     .needs('config', { optional: true })
     .needs('rc')
+    .ci(false)
     .action((feature) => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     const homeDir = (yield Promise.resolve().then(() => __importStar(require('os')))).homedir();

package/lib/commands/serve.js

@@ -47,7 +47,7 @@ exports.default = new command_1.default('serve')
     .option('--only <targets>', 'only serve specified, comma-separated targets (e.g. "client,functions:f1")')
     .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('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
     .option('--no-open', 'disable opening the client automatically when served')
     .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
     .needs('config')

package/lib/commands/whoami.js

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

package/lib/commands/zest/generate/index.js

@@ -0,0 +1,304 @@
+'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __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 command_1 = __importDefault(require("../../../internal/command"));
+const constants_1 = require("../../../util_modules/constants");
+const prompt_1 = __importDefault(require("../../../prompt"));
+const js_1 = require("../../../util_modules/js");
+const endpoints_1 = require("../../../endpoints");
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const archiver_1 = __importDefault(require("../../../archiver"));
+const logger_1 = require("../../../util_modules/logger");
+const inquirer_1 = __importStar(require("inquirer"));
+const error_1 = __importDefault(require("../../../error"));
+const project_1 = require("../../../util_modules/project");
+const features_1 = require("../../../init/features");
+const path_1 = require("path");
+const throbber_1 = __importDefault(require("../../../throbber"));
+const config_1 = require("../../../util_modules/config");
+const common_1 = require("../../../init/util/common");
+const ansi_colors_1 = require("ansi-colors");
+const fs_1 = require("../../../util_modules/fs");
+const console_1 = require("console");
+function getSpecification(specs = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = (yield (yield (0, endpoints_1.zestAPI)()).getSpecifications());
+        if (!res) {
+            return specs;
+        }
+        specs.push(...res.specifications);
+        if (res.info.more_records) {
+            yield getSpecification(specs);
+        }
+        return specs;
+    });
+}
+function searchSpecification(filter, specArray = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (filter) {
+            const response = [];
+            specArray.forEach((spec) => {
+                if (spec.name.includes(filter)) {
+                    response.push(spec);
+                }
+            });
+            return response;
+        }
+        return specArray;
+    });
+}
+function pollScheduledJob(job_id) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const throbber = throbber_1.default.getInstance();
+        try {
+            const res = (yield (yield (0, endpoints_1.zestAPI)()).getScheduledJob(job_id));
+            const status = js_1.JS.capitalize(res.scheduled_jobs[0].status);
+            if (status === 'Completed') {
+                throbber.succeed('processing', { text: `Status >> ${status}` });
+                return res;
+            }
+            throbber.add('processing', { text: `Status >> ${status}` });
+            if (status === 'Failed') {
+                throbber.fail('processing', { text: `Status >> ${status}` });
+                throw new error_1.default('zest generation failed', {
+                    exit: 2,
+                    original: `${res.scheduled_jobs[0].action_info.failure_reason}`
+                });
+            }
+            yield js_1.JS.sleep(1000);
+        }
+        catch (err) {
+            throw new error_1.default('Error while processing scheduled job', {
+                exit: 2,
+                original: err
+            });
+        }
+        return yield pollScheduledJob(job_id);
+    });
+}
+function downloadSourceCode(fileId, outputDir, srcType, srcName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const zestZip = (yield (yield (0, endpoints_1.zestAPI)()).getFile(fileId, srcType, srcName));
+        yield new archiver_1.default().load(zestZip).extract(outputDir).finalize();
+    });
+}
+exports.default = new command_1.default('zest:generate')
+    .description('Generate the functions or appsail source code for your ZEST Specifications')
+    .needs('auth', [
+    constants_1.SCOPE.zest_spec_all,
+    constants_1.SCOPE.zest_schedule_job_read,
+    constants_1.SCOPE.zest_spec_all,
+    constants_1.SCOPE.zest_spec_src_action
+])
+    .needs('config', { optional: true })
+    .needs('rc', { skipOrgCheck: false })
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const specArray = yield getSpecification();
+    if (specArray.length === 0) {
+        throw new error_1.default('No Specifications Found', {
+            exit: 1,
+            errorId: 'ZEST-GEN-1'
+        });
+    }
+    yield prompt_1.default.register('search-box');
+    const specName = yield inquirer_1.default.prompt([
+        {
+            type: 'search-box',
+            name: 'specs',
+            searchable: true,
+            pageSize: 10,
+            highlight: true,
+            notFoundMsg: 'No specifications found!',
+            searchMsg: 'Search specifications...',
+            message: 'Please search and select the specifications(Use space key to select)',
+            source(_answersSoFar, input) {
+                input || (input = '');
+                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                    const fuzzyResult = yield searchSpecification(input, specArray);
+                    const data = fuzzyResult.map((element) => {
+                        return {
+                            name: `${element.name}(${element.version})`,
+                            value: element.id
+                        };
+                    });
+                    resolve(data);
+                }));
+            },
+            validate: (ansArr) => {
+                if (js_1.JS.isEmpty(ansArr)) {
+                    return 'Must select one specification.';
+                }
+                return true;
+            }
+        }
+    ]);
+    const srcTypeAns = yield prompt_1.default.ask(prompt_1.default.question('source', 'Please specify which source type you want to download', {
+        type: 'list',
+        choices: [
+            prompt_1.default.choice('Function', {
+                value: 'functions'
+            }),
+            prompt_1.default.choice('AppSail', {
+                value: 'appsail'
+            })
+        ]
+    }));
+    const srcType = srcTypeAns.source;
+    const sourceLabel = srcType.replace('functions', 'function');
+    const runtimeChoices = yield (0, common_1.getRuntimeChoices)({ fnType: 'aio' });
+    const ignoreRuntimes = ['node14', 'node12', 'node20'];
+    const stackChoices = runtimeChoices.filter((choice) => {
+        if (!(choice instanceof inquirer_1.Separator)) {
+            return !ignoreRuntimes.includes(choice.value.runtime);
+        }
+        return choice;
+    });
+    const srcStackAns = yield prompt_1.default.ask(prompt_1.default.question('stack', `Please select the language for your ${sourceLabel}`, {
+        type: 'list',
+        choices: stackChoices.map((choice) => {
+            if (!(choice instanceof inquirer_1.Separator)) {
+                return choice;
+            }
+            return choice;
+        }),
+        when: () => {
+            return runtimeChoices.length > 1;
+        }
+    }));
+    const srcStack = srcStackAns.stack.runtime;
+    const existingSails = config_1.appSailConfig.raw() || [];
+    const existingFuncs = ((_a = config_1.functionsConfig.raw()) === null || _a === void 0 ? void 0 : _a.targets) || [];
+    const source = yield prompt_1.default.ask(prompt_1.default.question('name', `Please provide a name for your ${(0, ansi_colors_1.bold)(sourceLabel)} `, {
+        type: 'input',
+        default: 'sample',
+        validate: (input) => __awaiter(void 0, void 0, void 0, function* () {
+            if (input === '') {
+                return 'Please provide a valid name.';
+            }
+            if (input === '' || !input.match(constants_1.REGEX.functions.package.name)) {
+                return `Special characters are not allowed. Includes only alphabets, numbers, hyphen and underscores.`;
+            }
+            if (srcType === 'functions' &&
+                existingFuncs.findIndex((func) => func === input) !== -1) {
+                return 'function name already exists';
+            }
+            if (srcType === 'appsail' &&
+                existingSails.findIndex((appSail) => appSail.name === input) !== -1) {
+                return 'appsail name already exists';
+            }
+            return true;
+        })
+    }));
+    const srcName = source.name;
+    let sourceCodeRes;
+    const resources = [];
+    specName.specs.forEach((element) => {
+        resources.push({ id: element });
+    });
+    const config = runtime_store_1.default.get('config');
+    let payload, outputDir;
+    if (srcType === 'appsail') {
+        const generateAppsailParams = {
+            resources: resources,
+            stack: srcStack,
+            name: srcName
+        };
+        outputDir = (0, project_1.resolveProjectPath)(`appsail-${srcName}`);
+        payload = {
+            source: outputDir,
+            name: srcName
+        };
+        if (srcStackAns.stack.lang.startsWith('java')) {
+            const basePackage = yield prompt_1.default.ask(prompt_1.default.question('basePkg', 'Please specify the base package name', {
+                type: 'input',
+                default: 'com.zoho'
+            }));
+            const install = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to install dependencies ? ', {
+                type: 'confirm',
+                default: true
+            }));
+            Object.assign(generateAppsailParams, {
+                with_dependency: install.consent,
+                config: {
+                    base_package: basePackage.basePkg
+                }
+            });
+        }
+        sourceCodeRes = yield (yield (0, endpoints_1.zestAPI)()).generateAppsail(generateAppsailParams);
+    }
+    else {
+        const functionsDirPath = (0, project_1.resolveProjectPath)(config.get('functions.source') || constants_1.FOLDERNAME.functions);
+        outputDir = (0, path_1.join)(functionsDirPath, srcName);
+        payload = {
+            source: outputDir,
+            name: srcName,
+            stack: srcStack,
+            type: 'aio'
+        };
+        sourceCodeRes = yield (yield (0, endpoints_1.zestAPI)()).generateFunction(resources, srcStack, srcName);
+    }
+    const folderExists = yield fs_1.ASYNC.dirExists(outputDir);
+    const overwriteAns = folderExists
+        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' + (0, ansi_colors_1.underline)(outputDir) + ' already exists. Overwrite ?', {
+            type: 'confirm',
+            defaultAns: false
+        }))
+        : { overwrite: true };
+    if (!overwriteAns.overwrite) {
+        (0, logger_1.labeled)('zest', `${sourceLabel} generation skipped.`).WARN();
+        return;
+    }
+    yield fs_1.ASYNC.deleteDir(outputDir);
+    runtime_store_1.default.set(`payload.${srcType}.targets`, [payload]);
+    const job_id = sourceCodeRes.job_id;
+    const throbber = throbber_1.default.getInstance();
+    (0, console_1.info)('\n' + (0, ansi_colors_1.white)('==> ') + `Generating ${js_1.JS.capitalize(sourceLabel)}`);
+    const fileId = yield pollScheduledJob(job_id).then((data) => {
+        throbber.remove('processing');
+        return data.scheduled_jobs[0].action_info.file_id;
+    });
+    (0, console_1.info)('\n' + (0, ansi_colors_1.white)('==> ') + `Downloading ${js_1.JS.capitalize(sourceLabel)}`);
+    yield downloadSourceCode(fileId, outputDir, sourceLabel, srcName);
+    (0, features_1.setCatalystConfig)(srcType, true);
+    yield config.save();
+    (0, console_1.info)();
+    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) +
+        ` file has been successfully updated with ${sourceLabel} details.`);
+    (0, console_1.info)();
+    (0, logger_1.success)(`Zest successfully generated in ${(0, ansi_colors_1.bold)((0, path_1.join)(outputDir))}.`);
+}));

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

@@ -31,6 +31,7 @@ const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
 const utils_1 = require("./utils");
 const throbber_1 = __importDefault(require("../../../throbber"));
+const minimatch_1 = __importDefault(require("minimatch"));
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -57,7 +58,7 @@ function getConfigJsonInputs() {
             when: () => optValues.build_path === false,
             rootPath: cwd,
             validate: ({ value }) => __awaiter(this, void 0, void 0, function* () {
-                const pathRes = (0, utils_1.validateBuildPath)(value);
+                const pathRes = yield (0, utils_1.validateBuildPath)(value);
                 if (!pathRes) {
                     return `Invalid path: ${value}`;
                 }
@@ -142,7 +143,9 @@ function getStandAloneTarget() {
             configJson.stack = configJson.stack.runtime;
         }
         return {
-            appSail: Object.assign({ name: nameOpt === false ? appSailName.name : nameOpt, source: cwd }, configJson),
+            name: nameOpt === false ? appSailName.name : nameOpt,
+            source: cwd,
+            config: configJson,
             validity: { valid: true }
         };
     });
@@ -157,15 +160,15 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
     const filtered = (0, appsail_utils_1.filterTargets)(targets);
     let pythonPrompt = false;
     const validTargets = (0, appsail_utils_1.validateAppSail)(filtered).filter((targ) => {
-        var _a, _b;
+        var _a;
         if (targ.validity.valid) {
             if (!pythonPrompt &&
-                ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.stack.startsWith(constants_1.RUNTIME.language.python.value))) {
+                ((_a = targ.config) === null || _a === void 0 ? void 0 : _a.stack.startsWith(constants_1.RUNTIME.language.python.value))) {
                 pythonPrompt = true;
             }
             return targ;
         }
-        (0, logger_1.labeled)('AppSail: ', 'Invalid AppSail service ' + (0, ansi_colors_1.bold)(((_b = targ.appSail) === null || _b === void 0 ? void 0 : _b.name) || 'Unknown')).ERROR();
+        (0, logger_1.labeled)('AppSail: ', 'Invalid AppSail service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
         (0, logger_1.error)('Reason: ' + targ.validity.reason);
         (0, logger_1.info)();
         return false;
@@ -179,32 +182,44 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
     const throbber = throbber_1.default.getInstance();
     const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        const targ = _targ.appSail;
+        const targ = _targ.config;
         const prevRes = yield result;
+        const throbberName = `prepare_appsail_${_targ.name}`;
         try {
             if ((_a = targ.scripts) === null || _a === void 0 ? void 0 : _a.predeploy) {
-                executeHook(targ.scripts.predeploy, 'predeploy', targ.source);
+                executeHook(targ.scripts.predeploy, 'predeploy', _targ.source);
             }
-            const throbberName = `prepare_appsail_${targ.name}`;
             throbber.add(throbberName, {
-                text: `Preparing AppSail[${targ.name}]`
+                text: `Preparing AppSail[${_targ.name}]`
             });
-            const zip = new archiver_1.default();
-            const buildPath = targ.buildPath ? targ.buildPath : targ.build_path;
-            const folderPath = (0, project_1.resolveProjectPath)(buildPath);
-            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(folderPath, constants_1.FILENAME.catalyst_ignore));
+            const folderPath = targ.build_path;
+            const isBuildPath = yield fs_1.ASYNC.isPathExists(folderPath);
+            if (!isBuildPath) {
+                throw new error_1.default(`the build path doesn't exists: ${folderPath}`, {
+                    exit: 1,
+                    skipHelp: true
+                });
+            }
+            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(_targ.source, constants_1.FILENAME.catalyst_ignore));
+            const excludePatterns = [
+                '**/.DS_Store',
+                '**/.vscode/**/*',
+                `**/${constants_1.FILENAME.log}`,
+                `**/${constants_1.FILENAME.config}`,
+                `**/${constants_1.FILENAME.rc}`,
+                `**/${constants_1.FILENAME.app_config}`,
+                `**/${constants_1.FILENAME.catalyst_ignore}`,
+                ...((ignoreFile === null || ignoreFile === void 0 ? void 0 : ignoreFile.split('\n')) || [])
+            ];
             const folderContents = yield fs_1.ASYNC.walk(folderPath, {
                 filter: {
-                    exclude: [
-                        '**/.DS_Store',
-                        '**/.vscode/**/*',
-                        `**/${constants_1.FILENAME.app_config}`,
-                        `**/${constants_1.FILENAME.catalyst_ignore}`,
-                        ...((ignoreFile === null || ignoreFile === void 0 ? void 0 : ignoreFile.split('\n')) || [])
-                    ],
+                    exclude: (path) => __awaiter(void 0, void 0, void 0, function* () {
+                        return !!excludePatterns.find((glob) => (0, minimatch_1.default)(path.replace(folderPath + path_1.sep, ''), glob, { dot: true }));
+                    }),
                     excludeDir: true
                 }
             });
+            const zip = new archiver_1.default();
             folderContents.forEach((content) => {
                 zip.add(content.path === folderPath
                     ? (0, path_1.basename)(content.path)
@@ -215,22 +230,25 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
             const finalized = yield zip.finalize();
             const zipStream = yield finalized.fsStream();
             throbber.remove(throbberName);
-            const { stack, name, command, memory, platform, env_variables } = targ;
+            const { stack, command, memory, platform, env_variables, catalyst_auth, login_redirect } = targ;
             const apiRes = yield sailAPI.deploy(zipStream.stream, {
                 stack,
-                name,
+                name: _targ.name,
                 memory,
                 platform,
                 command,
+                catalystAuth: catalyst_auth,
+                loginRedirect: login_redirect,
                 envVariables: env_variables,
                 contentLength: zipStream.length
             });
             _targ.url = apiRes.url;
             if ((_b = targ.scripts) === null || _b === void 0 ? void 0 : _b.postdeploy) {
-                executeHook(targ.scripts.postdeploy, 'postdeploy', targ.source);
+                executeHook(targ.scripts.postdeploy, 'postdeploy', _targ.source);
             }
         }
         catch (err) {
+            throbber.remove(throbberName);
             (0, logger_1.debug)(err);
             _targ.validity = {
                 valid: false,
@@ -241,10 +259,9 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
         return Promise.resolve(prevRes);
     }), Promise.resolve([]));
     const deployedValidTargets = deployRes.filter((targ) => {
-        var _a;
         if (!targ.validity.valid) {
             (0, logger_1.warning)('Deploy of AppSail [' +
-                ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) +
+                targ.name +
                 '] was unsuccessful since ' +
                 targ.validity.reason);
         }

package/lib/deploy/features/appsail/utils.js

@@ -36,10 +36,10 @@ function validateOptions(validationFn, option, ...args) {
 exports.validateOptions = validateOptions;
 function validateBuildPath(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        const cwd = process.cwd();
+        const cwd = runtime_store_1.default.get('cwd');
         if (path) {
             const buildPath = (0, path_1.isAbsolute)(path) ? path : (0, path_1.resolve)(cwd, path);
-            return (yield fs_1.ASYNC.dirExists(buildPath)) ? path : false;
+            return (yield fs_1.ASYNC.isPathExists(buildPath)) ? path : false;
         }
         return false;
     });
@@ -79,11 +79,10 @@ exports.validateName = validateName;
 function urlLogger() {
     const deployTargets = runtime_store_1.default.get('payload.appsail.targets', []);
     deployTargets.forEach((sail) => {
-        var _a, _b;
         if (sail.url !== undefined) {
-            (0, logger_1.labeled)(`AppSail(${(_a = sail.appSail) === null || _a === void 0 ? void 0 : _a.name})`, 'URL => ' + sail.url).MESSAGE();
+            (0, logger_1.labeled)(`AppSail(${sail.name})`, 'URL => ' + sail.url).MESSAGE();
         }
-        (0, logger_1.labeled)(`AppSail(${(_b = sail.appSail) === null || _b === void 0 ? void 0 : _b.name})`, 'deploy successful').SUCCESS();
+        (0, logger_1.labeled)(`AppSail(${sail.name})`, 'deploy successful').SUCCESS();
         (0, logger_1.info)();
     });
     return deployTargets;