zcatalyst-cli 1.15.0-beta.2 → 1.15.0-beta.4

package/lib/appsail-utils.js

@@ -0,0 +1,84 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateAppSail = exports.filterTargets = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const error_1 = __importDefault(require("./error"));
+const constants_1 = require("./util_modules/constants");
+const logger_1 = require("./util_modules/logger");
+const option_1 = require("./util_modules/option");
+function getAppSailFilters(targetStr) {
+    return targetStr.split(',').reduce((filterArr, target) => {
+        const opts = target.split(':');
+        if (opts[0] === 'appsail' && opts[1]) {
+            filterArr.push(opts[1]);
+            return filterArr;
+        }
+        return filterArr;
+    }, []);
+}
+function filterTargets(allTargets) {
+    const only = (0, option_1.getOptionValue)('only');
+    if (only !== undefined) {
+        const onlyTargs = getAppSailFilters(only);
+        if (onlyTargs.length === 0) {
+            return allTargets;
+        }
+        const refined = onlyTargs.reduce((filtered, filter) => {
+            const targDetailsIdx = allTargets.findIndex((targ) => { var _a; return ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) === filter; });
+            if (targDetailsIdx === -1) {
+                filtered.unmatched.push(filter);
+            }
+            else {
+                const targDetails = allTargets.splice(targDetailsIdx, 1);
+                filtered.matched.push(targDetails[0]);
+            }
+            return filtered;
+        }, {
+            matched: [],
+            unmatched: []
+        });
+        if (refined.unmatched.length > 0) {
+            throw new error_1.default(`The filters ${(0, ansi_colors_1.bold)(refined.unmatched.join(', '))} provided with --only option does not match with any AppSail service in ${constants_1.FILENAME.config}.`);
+        }
+        return refined.matched;
+    }
+    const except = (0, option_1.getOptionValue)('except');
+    if (except !== undefined) {
+        const exceptTargs = getAppSailFilters(except);
+        const refined = exceptTargs.reduce((filtered, filter) => {
+            const targDetailsIdx = allTargets.findIndex((targ) => { var _a; return ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) === filter; });
+            if (targDetailsIdx === -1) {
+                filtered.unmatched.push(filter);
+            }
+            else {
+                filtered.matched.splice(targDetailsIdx, 1);
+            }
+            return filtered;
+        }, {
+            matched: allTargets,
+            unmatched: []
+        });
+        if (refined.unmatched.length > 0) {
+            (0, logger_1.message)(`The filters ${(0, ansi_colors_1.bold)(refined.unmatched.join(', '))} provided with --except option does not match with any AppSail service in ${constants_1.FILENAME.config}, hence ignored.`);
+        }
+        return refined.matched;
+    }
+    return allTargets;
+}
+exports.filterTargets = filterTargets;
+function validateAppSail(targDetails) {
+    targDetails.forEach((targ) => {
+        var _a, _b;
+        if (targ.validity.valid && ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.platform) !== 'war' && !((_b = targ.appSail) === null || _b === void 0 ? void 0 : _b.command)) {
+            targ.validity = {
+                valid: false,
+                reason: 'Start-up command missing'
+            };
+        }
+    });
+    return targDetails;
+}
+exports.validateAppSail = validateAppSail;

package/lib/archiver.js

@@ -40,6 +40,7 @@ const path_1 = require("path");
 const error_1 = __importDefault(require("./error"));
 const fs_1 = require("./util_modules/fs");
 const js_1 = require("./util_modules/js");
+const logger_1 = require("./util_modules/logger");
 class Archiver {
     constructor(name = 'Archive') {
         this.name = name;
@@ -81,12 +82,28 @@ class Archiver {
             }
         });
     }
+    getFileMode(file) {
+        const permission = file.unixPermissions;
+        if (permission === null) {
+            return;
+        }
+        if (typeof permission === 'number') {
+            return permission;
+        }
+        try {
+            return Number.parseInt(permission);
+        }
+        catch (er) {
+            (0, logger_1.debug)('Zip file mode error: ', er);
+        }
+        return;
+    }
     _writeFile(file, to) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
                 const fileName = (0, path_1.basename)(file.name);
                 file.nodeStream()
-                    .pipe(fs_1.SYNC.getWriteStream((0, path_1.join)(to, fileName)))
+                    .pipe(fs_1.SYNC.getWriteStream((0, path_1.join)(to, fileName), this.getFileMode(file)))
                     .on('close', resolve);
             });
         });

package/lib/code-deck.js

@@ -0,0 +1,114 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CodeDeckToken = exports.getDeckFromGit = exports.getTemplateFile = exports.listenDeploy = void 0;
+const archiver_1 = __importDefault(require("./archiver"));
+const endpoints_1 = require("./endpoints");
+const error_1 = __importDefault(require("./error"));
+const prompt_1 = __importDefault(require("./prompt"));
+const tree_1 = require("./prompt/types/tree");
+const runtime_store_1 = __importDefault(require("./runtime-store"));
+const logger_1 = require("./util_modules/logger");
+const shell_1 = require("./util_modules/shell");
+function listenDeploy(id, gitUrl) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
+            const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
+                arr.push('--' + key);
+                if (allGlobalOpts[key]) {
+                    arr.push(allGlobalOpts[key]);
+                }
+                return arr;
+            }, ['--id', id]);
+            const childRes = yield (0, shell_1.spawn)('catalyst', ['iac:status', 'import', ...optsArr], {
+                shell: true,
+                stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
+                env: { PARENT_COMMAND: 'codedeck', GIT_URL: gitUrl }
+            })
+                .ASYNC()
+                .catch((err) => (0, logger_1.debug)(err));
+            return (childRes === null || childRes === void 0 ? void 0 : childRes.message) === 'success';
+        }
+        catch (err) {
+            return false;
+        }
+    });
+}
+exports.listenDeploy = listenDeploy;
+function getTemplateFile(deckZip) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const archiver = new archiver_1.default();
+            archiver.load(deckZip);
+            return archiver.readFile(/project-template-[\.0-9]+\.json/);
+        }
+        catch (err) {
+            throw new error_1.default('Invalid ZIP file', { exit: 1, original: err });
+        }
+    });
+}
+exports.getTemplateFile = getTemplateFile;
+function getDeckFromGit() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const deckAPI = yield (0, endpoints_1.codeDeck)();
+        const deckJson = yield deckAPI.data();
+        const transformedDeck = Object.values(deckJson).reduce((deck, rawDeck) => {
+            const deckCategory = deck[rawDeck.category];
+            if (deckCategory === undefined) {
+                deck[rawDeck.category] = [
+                    {
+                        display: rawDeck.title,
+                        value: rawDeck,
+                        short: rawDeck.title,
+                        expand: 'Description: ' + rawDeck.description.short
+                    }
+                ];
+            }
+            else {
+                deck[rawDeck.category].push({
+                    display: rawDeck.title,
+                    value: rawDeck,
+                    short: rawDeck.title,
+                    expand: 'Description: ' + rawDeck.description.short
+                });
+            }
+            return deck;
+        }, {});
+        const choices = Object.entries(transformedDeck).map(([category, deck]) => {
+            const treeNode = new tree_1.TreeNode('Category: ' + category);
+            deck.forEach((de) => treeNode.addNode(de));
+            return treeNode;
+        });
+        yield prompt_1.default.register('tree');
+        const deck = yield prompt_1.default.ask(prompt_1.default.question('code', 'Select the code library that you want to install', {
+            type: 'tree',
+            treeChoices: choices
+        }));
+        return deck.code;
+    });
+}
+exports.getDeckFromGit = getDeckFromGit;
+class CodeDeckToken {
+    static createToken(importId, gitUrl) {
+        const tokenObj = [importId, gitUrl];
+        const tokenString = JSON.stringify(tokenObj);
+        return Buffer.from(tokenString).toString('base64');
+    }
+    static getDetailsFromToken(token) {
+        const decodedString = Buffer.from(token, 'base64').toString();
+        return JSON.parse(decodedString);
+    }
+}
+exports.CodeDeckToken = CodeDeckToken;

package/lib/command_needs/rc.js

@@ -27,13 +27,13 @@ const project_2 = require("../util_modules/project");
 exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck = true } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const orgOpt = (0, option_1.getGlobalOptionValue)('org', null);
     const projectOpt = (0, option_1.getGlobalOptionValue)('project', null);
-    if (projectOpt != null && orgOpt == null) {
+    if (projectOpt !== null && orgOpt === null) {
         throw new error_1.default('Org option is needed when project option is supplied', {
             exit: 2
         });
     }
     const orgApi = yield (0, endpoints_1.orgAPI)();
-    if (orgOpt != null) {
+    if (orgOpt !== null) {
         const orgList = yield orgApi.getAllOrgs();
         const found = orgList.find((org) => org.id + '' === orgOpt);
         if (!found) {
@@ -43,8 +43,8 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         }
         runtime_store_1.default.set('project.env.id', orgOpt + '');
     }
-    let projectApi = orgOpt != null ? yield (0, endpoints_1.projectAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.projectAPI)();
-    let envApi = orgOpt != null ? yield (0, endpoints_1.envAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.envAPI)();
+    let projectApi = orgOpt !== null ? yield (0, endpoints_1.projectAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.projectAPI)();
+    let envApi = orgOpt !== null ? yield (0, endpoints_1.envAPI)({ auth: true, org: orgOpt }) : yield (0, endpoints_1.envAPI)();
     const convertProjectToProperties = (project) => {
         project = (0, project_2.transformProject)(project);
         runtime_store_1.default.set('project.name', project.name);
@@ -112,7 +112,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
     });
     runtime_store_1.default.set('rc', rcInstance);
     if (!rcInstance.loaded) {
-        if (!ignoreRC && orgOpt == null && !skipOrgCheck) {
+        if (!ignoreRC && orgOpt === null && !skipOrgCheck) {
             (0, logger_1.warning)('Not in Catalyst app directory!!!');
             const orgList = yield orgApi.getAllOrgs();
             if (orgList.length === 0) {
@@ -238,7 +238,8 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         });
     }
     if (defaultRCProject.id + '' !== finalProjectObj.id + '' &&
-        (0, option_1.getCurrentCommand)() !== 'project:reset') {
+        (0, option_1.getCurrentCommand)() !== 'project:reset' &&
+        !process.env.CATALYST_SUB_PROCESS) {
         (0, logger_1.message)('Using project other than the default project for this folder. Use ' +
             (0, ansi_colors_1.bold)('catalyst project:reset') +
             ' in order to reset.');

package/lib/commands/appsail/add.js

@@ -0,0 +1,55 @@
+"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 ansi_colors_1 = require("ansi-colors");
+const command_1 = __importDefault(require("../../internal/command"));
+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('appsail:add')
+    .description('Link an already existing AppSail service to Catalyst Project')
+    .needs('auth', [constants_1.SCOPE.functions])
+    .needs('config')
+    .needs('rc')
+    .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')))).appsail();
+    yield config.save();
+    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully updated with functions details.');
+    (0, logger_1.info)();
+    (0, logger_1.success)('AppSail service successfully linked');
+}));

package/lib/commands/codelib/install.js

@@ -0,0 +1,143 @@
+"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 ansi_colors_1 = require("ansi-colors");
+const endpoints_1 = require("../../endpoints");
+const iac_1 = __importDefault(require("../../endpoints/lib/iac"));
+const command_1 = __importDefault(require("../../internal/command"));
+const prompt_1 = __importDefault(require("../../prompt"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const constants_1 = require("../../util_modules/constants");
+const env_1 = require("../../util_modules/env");
+const fs_1 = require("../../util_modules/fs");
+const logger_1 = require("../../util_modules/logger");
+const project_1 = require("../../util_modules/project");
+const functions_1 = __importDefault(require("../../pull/features/functions"));
+const features_1 = require("../../init/features");
+const error_1 = __importDefault(require("../../error"));
+const code_deck_1 = require("../../code-deck");
+const option_1 = require("../../util_modules/option");
+exports.default = new command_1.default('codelib:install [git-url]')
+    .description('Install the code library functionalities into your project')
+    .option('-c, --continue <install-id>', 'Continue CodeLib install')
+    .needs('auth', [constants_1.SCOPE.project_import_create])
+    .needs('config')
+    .needs('rc')
+    .action((gitUrl) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const continueOpt = (0, option_1.getOptionValue)('continue', false);
+    let [_importId, _gitUrl] = ['', ''];
+    if (continueOpt) {
+        if (gitUrl) {
+            throw new error_1.default('Cannot specify [git-url] when using --continue option');
+        }
+        try {
+            [_importId, _gitUrl] = code_deck_1.CodeDeckToken.getDetailsFromToken(continueOpt);
+        }
+        catch (err) {
+            throw new error_1.default('Invalid token', { original: err });
+        }
+    }
+    const _gitHubAPI = yield (0, endpoints_1.gitHubAPI)();
+    gitUrl = gitUrl || _gitUrl;
+    if (gitUrl) {
+        const headRes = yield _gitHubAPI.validateUrl(gitUrl);
+        if (headRes !== 200) {
+            (0, logger_1.error)('Invalid GitHub URL: ' + ansi_colors_1.italic.red(`"${gitUrl}"`));
+            const listAns = yield prompt_1.default.ask(prompt_1.default.question('list', 'Do you wish to select from a list of available Code Library installations from GitHub?', { type: 'confirm', defaultAns: true }));
+            if (!listAns.list) {
+                return;
+            }
+            gitUrl = undefined;
+        }
+    }
+    const code = gitUrl
+        ? { github: { url: gitUrl } }
+        : yield (0, code_deck_1.getDeckFromGit)();
+    (0, logger_1.info)();
+    !continueOpt && (0, logger_1.info)((0, ansi_colors_1.white)('==> ') + 'Downloading CodeLib');
+    let deckZip = yield _gitHubAPI.download(code.github.url, continueOpt ? null : code.title);
+    if (!deckZip) {
+        if (!gitUrl) {
+            throw new error_1.default('Invalid code lib', { exit: 2 });
+        }
+        return;
+    }
+    const templateFile = yield (0, code_deck_1.getTemplateFile)(deckZip);
+    const templateJson = JSON.parse(templateFile || '');
+    const tmpFile = yield fs_1.ASYNC.tempFile('deck.zip', deckZip);
+    deckZip = undefined;
+    const templateComponents = Object.entries(templateJson.components).reduce((compRed, _comp) => {
+        const [key, comp] = _comp;
+        compRed[key] = (comp || [])
+            .map((item) => {
+            switch (key) {
+                case 'Functions': {
+                    const props = item.properties;
+                    return `* ${item.name} (${props.stack}) (${props.type === 'applogic' ? 'advancedio' : props.type})`;
+                }
+                case 'Filestore': {
+                    if (item.type === 'folder') {
+                        return `* ${item.name} (${item.type})`;
+                    }
+                    return '';
+                }
+                default: {
+                    return '* ' + item.name;
+                }
+            }
+        })
+            .filter((item) => item)
+            .join('\n\t\t');
+        return compRed;
+    }, {});
+    if (!continueOpt) {
+        (0, logger_1.info)();
+        (0, logger_1.info)(`The following components will be installed with ${code.title ? (0, ansi_colors_1.bold)(code.title) : 'this'} CodeLib`);
+        (0, logger_1.info)();
+        (0, logger_1.info)(Object.entries(templateComponents)
+            .map(([name, comp]) => (0, ansi_colors_1.bold)('\t' + name + ':') + '\n' + (0, ansi_colors_1.yellow)('\t\t' + comp))
+            .join('\n'));
+        (0, logger_1.info)();
+        const install = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to continue? ', {
+            type: 'confirm',
+            default: true
+        }));
+        if (!install.consent) {
+            (0, logger_1.message)('Aborted by user');
+            return;
+        }
+        const projectId = (0, project_1.getProjectId)();
+        const iacAPI = new iac_1.default(projectId);
+        const schedulerRes = yield iacAPI.update(fs_1.SYNC.getReadStream(tmpFile));
+        _importId = schedulerRes.id;
+    }
+    if (!env_1.isPrimaryShell || !_importId) {
+        return;
+    }
+    (0, logger_1.info)();
+    (0, logger_1.info)((0, ansi_colors_1.white)('==> ') + 'Installing CodeLib');
+    const importRes = yield (0, code_deck_1.listenDeploy)(_importId, code.github.url);
+    if (!importRes) {
+        return;
+    }
+    const templateFns = (((_a = templateJson.components) === null || _a === void 0 ? void 0 : _a.Functions) || []);
+    if (templateFns.length > 0) {
+        yield (0, functions_1.default)(templateFns.map((fn) => fn.name));
+        (0, features_1.setCatalystConfig)('functions', true);
+        const config = runtime_store_1.default.get('config');
+        yield config.save();
+    }
+    (0, logger_1.success)('CodeLib successfully installed');
+}));

package/lib/commands/config/set.js

@@ -20,7 +20,7 @@ exports.default = new command_1.default('config:set <key=value>')
     .description('Set catalyst configuration as a key value pair')
     .action((details) => __awaiter(void 0, void 0, void 0, function* () {
     const args = details.split('=');
-    if (args.length != 2) {
+    if (args.length !== 2) {
         throw new error_1.default('Invalid parameter passed' +
             `\nplease give the key value pairs splitted by '=' (eg. orgname=zoho) `);
     }

package/lib/commands/deploy/appsail.js

@@ -0,0 +1,62 @@
+"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 utils_1 = require("../../deploy/features/appsail/utils");
+const command_1 = __importDefault(require("../../internal/command"));
+const constants_1 = require("../../util_modules/constants");
+const logger_1 = require("../../util_modules/logger");
+exports.default = new command_1.default('appsail')
+    .description('Deploy your Catalyst AppSail service to Catalyst Development environment')
+    .option('--name <name>', 'Please specify a name for your AppSail')
+    .option('--build-path <path>', 'Specify the AppSail build path')
+    .option('--stack <stack>', 'Specify the AppSail stack')
+    .option('--platform <javase|war>', 'Specify the AppSail platform for java stack')
+    .option('--command <command>', 'Specify the AppSail startup command')
+    .needs('auth', [constants_1.SCOPE.appsail_update])
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default('appsail');
+    const deployTargets = (0, utils_1.urlLogger)();
+    (0, logger_1.info)();
+    if (deployTargets.length === 0) {
+        (0, logger_1.error)('AppSail Deploy failed');
+    }
+    else {
+        (0, logger_1.success)('Catalyst AppSail Deploy completed successfully');
+    }
+}));

package/lib/commands/{deploy.js → deploy/index.js}

@@ -1,4 +1,4 @@
-'use strict';
+"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);
@@ -35,24 +35,27 @@ 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 runtime_store_1 = __importDefault(require("../runtime-store"));
-const constants_1 = require("../util_modules/constants");
-const logger_1 = require("../util_modules/logger");
+const utils_1 = require("../../deploy/features/appsail/utils");
+const command_1 = __importDefault(require("../../internal/command"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const constants_1 = require("../../util_modules/constants");
+const logger_1 = require("../../util_modules/logger");
+const appsail_1 = __importDefault(require("./appsail"));
 exports.default = new command_1.default('deploy')
-    .description('Deploy the Catalyst project and project resources to the remote console from the local directory')
-    .option('--only <targets>', 'only deploy specified, comma-separated targets (e.g. "functions,client").' +
-    ' For Functions you can specify which functions to deploy with colon notation' +
-    ' (e.g. "--only functions:<function_name>,functions:<function_name>"). ')
+    .description('Deploy the Catalyst project and project resources to the Catalyst development environment from the local directory')
+    .option('--only <targets>', 'only deploy specified, comma-separated targets (e.g. "functions,client,appsail").' +
+    ' For Function and Appsail you can specify which functions to deploy with colon notation' +
+    ' (e.g. "--only functions:<function_name>,appsail:<appsail_name>"). ')
     .option('--except <targets>', 'deploy all targets except specified (e.g. "client")')
-    .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.webapp])
+    .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
+    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.webapp, constants_1.SCOPE.appsail_update])
     .needs('config')
-    .needs('rc')
+    .needs('rc', { optional: true })
+    .addSubCommand(appsail_1.default)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
-    const optionFilter = yield Promise.resolve().then(() => __importStar(require('../option-filter')));
+    const optionFilter = yield Promise.resolve().then(() => __importStar(require('../../option-filter')));
     optionFilter.filterTargets();
-    yield (yield Promise.resolve().then(() => __importStar(require('../deploy')))).default();
+    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default();
     const deployTargets = runtime_store_1.default
         .get('payload.targets', [])
         .filter((deploytarget) => {
@@ -86,6 +89,9 @@ exports.default = new command_1.default('deploy')
                 });
                 (0, logger_1.info)();
                 break;
+            case 'appsail':
+                (0, utils_1.urlLogger)();
+                break;
         }
     });
     if (deployTargets.length > 0) {

package/lib/commands/iac/pack.js

@@ -94,13 +94,13 @@ exports.default = new command_1.default('iac:pack [zip_name]')
                         throw new error_1.default(`No property found for function ${fn.name} in project template`, { exit: 1 });
                     }
                     fnNameByCodePath[fn.name] = fnTemplateConfig.properties.code.path;
-                    if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+                    if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
                         acc[0].push(fn);
                     }
-                    if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+                    if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
                         acc[1].push(fn);
                     }
-                    if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python)) {
+                    if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
                         acc[2].push(fn);
                     }
                     return acc;

package/lib/commands/index.js

@@ -75,6 +75,8 @@ exports.default = (client) => {
         loadCommand('functions:add'),
         loadCommand('functions:shell'),
         loadCommand('functions:config'),
+        loadCommand('appsail:add'),
+        loadCommand('codelib:install'),
         loadCommand('event:generate'),
         loadCommand('event:generate:integ'),
         loadCommand('serve'),