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

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;

package/lib/endpoints/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tunnelAPI = exports.commonAPI = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
+exports.tunnelAPI = exports.commonAPI = exports.jobScheduling = exports.codeDeck = exports.gitHubAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
 const project_1 = require("../util_modules/project");
 function orgAPI({ auth = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -41,10 +41,10 @@ function orgAPI({ auth = true } = {}) {
     });
 }
 exports.orgAPI = orgAPI;
-function projectAPI({ auth = true, org = (0, project_1.getEnvId)() } = {}) {
+function projectAPI({ auth = true, org = (0, project_1.getEnvId)(), printError = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const project = (yield Promise.resolve().then(() => __importStar(require('./lib/project')))).default;
-        return new project({ authNeeded: auth }, org);
+        return new project({ authNeeded: auth, printError }, org);
     });
 }
 exports.projectAPI = projectAPI;
@@ -170,6 +170,13 @@ function codeDeck() {
     });
 }
 exports.codeDeck = codeDeck;
+function jobScheduling({ auth = true, projectId = (0, project_1.getProjectId)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const jobScheduling = (yield Promise.resolve().then(() => __importStar(require('./lib/job-scheduling')))).default;
+        return new jobScheduling(projectId, { authNeeded: auth });
+    });
+}
+exports.jobScheduling = jobScheduling;
 function commonAPI() {
     return __awaiter(this, void 0, void 0, function* () {
         const common = (yield Promise.resolve().then(() => __importStar(require('./lib/common')))).default;

package/lib/endpoints/lib/appsail.js

@@ -21,7 +21,7 @@ class AppSail {
         this.opts = opts;
         this.projectId = projectId;
     }
-    deploy(sourceFsStream, { stack, name, contentLength, command, memory, platform, envVariables = {} }) {
+    deploy(sourceFsStream, { stack, name, contentLength, command, memory, platform, envVariables = {}, catalystAuth, loginRedirect }) {
         return __awaiter(this, void 0, void 0, function* () {
             const formData = {
                 stack,
@@ -43,6 +43,12 @@ class AppSail {
                     variables: envVariables
                 };
             }
+            if (typeof catalystAuth === 'boolean') {
+                configuration.catalyst_auth = catalystAuth;
+                if (typeof loginRedirect === 'string') {
+                    configuration.login_redirect = loginRedirect;
+                }
+            }
             if (Object.keys(configuration).length > 0) {
                 formData.configuration = JSON.stringify(configuration);
             }

package/lib/endpoints/lib/job-scheduling.js

@@ -0,0 +1,61 @@
+"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 error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const logger_1 = require("../../util_modules/logger");
+class JobScheduling {
+    constructor(projectId, opts) {
+        this.opts = opts;
+        this.projectId = projectId;
+    }
+    getJobpoolDetails(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/baas/v1/project/${this.projectId}/job_scheduling/jobpool${id ? '/' + id : ''}`, {
+                resolveOnError: true
+            });
+            if (res.status === 200) {
+                if (res.body && res.body.data) {
+                    return res.body.data;
+                }
+                (0, logger_1.debug)(`get jobpool details response from server for (${id}): ${res.body}`);
+                throw new error_1.default('Server Error: Unexpected Response from server.', {
+                    exit: 2
+                });
+            }
+            if (res.status === 404 && id) {
+                const allJobpools = yield this.getJobpoolDetails();
+                throw new error_1.default(`The provided jobpool identifier (${id}) is invalid`, {
+                    exit: 1,
+                    context: res.body,
+                    status: res.status,
+                    errorId: 'JOB-SCHEDULING-1',
+                    arg: [
+                        (0, ansi_colors_1.bold)(id),
+                        (0, ansi_colors_1.bold)(allJobpools
+                            .map((pool) => `${(0, ansi_colors_1.green)('*')} ${pool.name} [${pool.id}]`)
+                            .join('\n'))
+                    ]
+                });
+            }
+            throw new error_1.default('Error when feting details of the jobpool: ' + id, {
+                exit: 2,
+                context: res.body,
+                status: res.status
+            });
+        });
+    }
+}
+exports.default = JobScheduling;

package/lib/express_middlewares/logger.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 exports.default = (appSailDetails) => (req, _RES, next) => {
-    var _a, _b;
+    var _a;
     console.log('[' +
         new Date().getTime() +
         '] ' +
-        (appSailDetails
-            ? (0, ansi_colors_1.cyan)(` Appsail[${(_b = (_a = appSailDetails === null || appSailDetails === void 0 ? void 0 : appSailDetails.target) === null || _a === void 0 ? void 0 : _a.appSail) === null || _b === void 0 ? void 0 : _b.name}] `)
-            : '') +
+        (appSailDetails ? (0, ansi_colors_1.cyan)(` Appsail[${(_a = appSailDetails === null || appSailDetails === void 0 ? void 0 : appSailDetails.target) === null || _a === void 0 ? void 0 : _a.name}] `) : '') +
         ' "' +
         (0, ansi_colors_1.cyan)(req.method) +
         '" ' +

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

@@ -32,7 +32,6 @@ 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 fs_2 = require("fs");
 const os_1 = require("os");
 const pip_install_1 = require("../../init/dependencies/python/pip-install");
 function validate() {
@@ -318,7 +317,7 @@ function pack(target) {
                     const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', target.name + Date.now().toString());
                     yield fs_1.ASYNC.ensureDir(tmpDir);
                     yield fs_1.ASYNC.emptyDir(tmpDir);
-                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), true);
+                    yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, target.stack.replace('python_', ''), (0, os_1.platform)() === 'linux');
                     const files = yield fs_1.ASYNC.walk(tmpDir);
                     files.forEach((file) => {
                         zip.add(file.path.replace(tmpDir + path_1.sep, ''), file.stats.isSymbolicLink()
@@ -578,7 +577,7 @@ function copyModDirPerm(src, dest, perm, { replace = true } = {}) {
                         return res();
                     }
                     const destFile = (0, path_1.join)(dest, (0, path_1.basename)(content.path));
-                    yield fs_1.ASYNC.copyFile(content.path, destFile, replace ? fs_2.constants.COPYFILE_FICLONE : fs_2.constants.COPYFILE_EXCL).catch((err) => {
+                    yield fs_1.ASYNC.copyFile(content.path, destFile, replace).catch((err) => {
                         if (!replace && err.code === 'EEXIST') {
                             return;
                         }

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

@@ -287,7 +287,7 @@ function compileJavaFiles(file, spawnCommand, targetVersion, targetSource, outpu
                 '*' + module.exports.classPathSep + '.',
                 '-g',
                 '-Xprefer:source',
-                '-Xlint',
+                userConfig_1.default.get('javac.disable_warnings') === 'true' ? '-Xlint:none' : '-Xlint',
                 file.replace(targetSource, outputFolder)
             ], {
                 cwd: outputFolder,

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

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeRequirements = exports.validate = void 0;
 const ansi_colors_1 = require("ansi-colors");
-const os_1 = require("os");
+const os_1 = __importStar(require("os"));
 const path_1 = __importStar(require("path"));
 const error_1 = __importDefault(require("../../error"));
 const ensure_python_1 = require("../../init/dependencies/python/ensure-python");
@@ -111,7 +111,7 @@ function removeRequirements(reqFile, target) {
         const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst', 'python', Date.now().toString());
         yield fs_1.ASYNC.ensureDir(tmpDir);
         yield fs_1.ASYNC.emptyDir(tmpDir);
-        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), true);
+        yield (0, pip_install_1.installRequirements)(reqFile, tmpDir, (_a = target.stack) === null || _a === void 0 ? void 0 : _a.replace('python_', ''), os_1.default.platform() === 'linux');
         const files = yield fs_1.ASYNC.walk(tmpDir, { depth: 1, includeDirPaths: true });
         yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
             yield fs_1.ASYNC.deleteFile((0, path_1.join)(target.source, path_1.default.basename(file.path)));

package/lib/fn-watcher.js

@@ -35,7 +35,7 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
             target.valid = true;
             target.compilationError = undefined;
             target.compilationWarning = undefined;
-            yield (0, languages_1.prepareFunctions)([target], latestEvent);
+            yield (0, languages_1.prepareFunctions)([target]);
             if (currentLatestEvent.at === latestEvent.at) {
                 latestEvent = undefined;
             }

package/lib/init/dependencies/python/ensure-python.js

@@ -99,14 +99,12 @@ function validateCommand(version, spawnCommand, skipHelp) {
                     const data = Buffer.concat(dataBuf).toString();
                     return resolve(data);
                 }
-                else {
-                    reject(new error_1.default(`unable to locate python${version} with the given binary path`, {
-                        exit: 1,
-                        errorId: 'PY-1',
-                        arg: [version, (0, ansi_colors_1.bold)(spawnCommand)],
-                        skipHelp
-                    }));
-                }
+                reject(new error_1.default(`unable to locate python${version} with the given binary path`, {
+                    exit: 1,
+                    errorId: 'PY-1',
+                    arg: [version, (0, ansi_colors_1.bold)(spawnCommand)],
+                    skipHelp
+                }));
             });
             child.on('error', (err) => {
                 reject(new error_1.default(`unable to locate python${version} with the given binary path`, {

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

@@ -36,7 +36,7 @@ function getAppSailZip() {
                         api: _gitHubAPI.appsailNodejs.bind(_gitHubAPI),
                         command: 'node index.js',
                         source: (0, project_1.resolveProjectPath)('appsail-nodejs'),
-                        build: (0, project_1.resolveProjectPath)('appsail-nodejs'),
+                        build: './',
                         stack: {
                             runtime: 'node16',
                             lang: 'node'
@@ -54,7 +54,7 @@ function getAppSailZip() {
                         api: _gitHubAPI.appsailJava.bind(_gitHubAPI),
                         command: 'java -jar demo-0.0.1-SNAPSHOT.jar',
                         source: (0, project_1.resolveProjectPath)('appsail-java'),
-                        build: (0, project_1.resolveProjectPath)('appsail-java', 'target', 'demo-0.0.1-SNAPSHOT.jar'),
+                        build: (0, path_1.join)('target', 'demo-0.0.1-SNAPSHOT.jar'),
                         stack: {
                             runtime: 'java8',
                             lang: 'java'
@@ -73,7 +73,7 @@ function getAppSailZip() {
                         api: _gitHubAPI.appsailPython.bind(_gitHubAPI),
                         command: 'python3 app.py',
                         source: (0, project_1.resolveProjectPath)('appsail-python'),
-                        build: (0, project_1.resolveProjectPath)('appsail-python'),
+                        build: './',
                         stack: {
                             runtime: 'python_3_9',
                             lang: 'python'
@@ -141,22 +141,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 })
             }))).source
         };
-    const appConfigPth = (0, path_1.join)(_appSailConfig.source, constants_1.FILENAME.app_config);
-    const isAppConfig = yield fs_1.ASYNC.fileExists(appConfigPth);
     const existingSails = config_1.appSailConfig.raw() || [];
-    yield prompt_1.default.register('file-path');
-    const appSail = yield prompt_1.default.ask(prompt_1.default.question('buildPath', 'Please provide the build path of your AppSail service: ', {
-        type: 'file-path',
-        validate: (pth) => __awaiter(void 0, void 0, void 0, function* () {
-            const buildPath = (0, path_1.resolve)(process.cwd(), pth.value);
-            if ((yield fs_1.ASYNC.dirExists(buildPath)) || (yield fs_1.ASYNC.fileExists(buildPath))) {
-                return true;
-            }
-            return 'Path does not exists';
-        }),
-        when: !_appSailConfig.build,
-        rootPath: _appSailConfig.source
-    }), prompt_1.default.question('name', 'Please provide the name for your AppSail service: ', {
+    const appName = yield prompt_1.default.ask(prompt_1.default.question('name', 'Please provide the name for your AppSail: ', {
         type: 'input',
         default: 'AppSail',
         validate: (name) => {
@@ -165,7 +151,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 : true;
             const match = name.match(constants_1.REGEX.functions.package.name)
                 ? true
-                : `Invalid function name. It should be in the following format: ${constants_1.REGEX.functions.package.name}`;
+                : `Invalid AppSail name. It should be in the following format: ${constants_1.REGEX.functions.package.name}`;
             return typeof exists === 'string'
                 ? exists
                 : typeof match === 'string'
@@ -173,16 +159,40 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     : true;
         }
     }));
-    const appSailStack = _appSailConfig.stack ||
-        (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
     const payload = {
-        source: _appSailConfig.source,
-        name: appSail.name
+        source: (0, path_1.relative)((0, project_1.getProjectRoot)(), _appSailConfig.source) || '.',
+        name: appName.name
     };
+    const appConfigPth = (0, path_1.join)(_appSailConfig.source, constants_1.FILENAME.app_config);
+    const isAppConfig = yield fs_1.ASYNC.fileExists(appConfigPth);
+    if (isAppConfig) {
+        (0, logger_1.info)();
+        (0, logger_1.warning)(`The ${(0, ansi_colors_1.bold)(constants_1.FILENAME.app_config)} file is already present in the appsail directory`);
+    }
+    const overWrite = yield prompt_1.default.ask(prompt_1.default.question('appConfig', 'Do you wish to overwrite the ' + constants_1.FILENAME.app_config, {
+        type: 'confirm',
+        default: false,
+        when: isAppConfig
+    }));
+    const activeWrite = overWrite.appConfig !== false;
+    if (!activeWrite) {
+        runtime_store_1.default.set('payload.appsail.targets', [payload]);
+        return;
+    }
+    const buildPath = yield prompt_1.default.ask(prompt_1.default.question('path', 'Please provide the build path of your AppSail service: ', {
+        type: 'input',
+        rootPath: _appSailConfig.source,
+        when: !_appSailConfig.build && activeWrite
+    }));
+    const appSailStack = _appSailConfig.stack ||
+        (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
     const appConfig = {
         command: _appSailConfig.command ||
-            'echo Please specify the start-up command in the app-config.json file under the key command',
-        build_path: _appSailConfig.build || appSail.buildPath,
+            'echo Please specify the start-up command in the app-config.json file under the key command for AppSail $X_ZC_RESOURCE_NAME',
+        build_path: _appSailConfig.build ||
+            ((0, path_1.isAbsolute)(buildPath.path)
+                ? (0, path_1.relative)(_appSailConfig.source, buildPath.path) || '.'
+                : buildPath.path),
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
@@ -209,5 +219,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     runtime_store_1.default.set('payload.appsail.targets', [payload]);
-    !isAppConfig && (yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig));
+    activeWrite && (yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig));
 });

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

@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("../../../prompt/index.js"));
 const index_js_2 = require("../../../util_modules/constants/index.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
         type: 'list',
         choices: index_js_2.PLUGIN.client.map((plugin) => {
@@ -47,5 +48,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         })
     }));
-    return (yield Promise.resolve().then(() => __importStar(require('./initializers/' + clientInitAnswer.clientFlavour)))).default();
+    return (yield (_a = './initializers/' + clientInitAnswer.clientFlavour, Promise.resolve().then(() => __importStar(require(_a))))).default();
 });

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

@@ -72,6 +72,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         prompt_1.default.choice('Browser Logic', {
             value: constants_1.FN_TYPE.browserLogic,
             short: 'browser logic'
+        }),
+        prompt_1.default.choice('Job', {
+            value: constants_1.FN_TYPE.job,
+            short: 'job'
         })
     ];
     const integServicesRes = yield integServicesPromise;

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

@@ -79,15 +79,31 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const pyRespJson = fnType === constants_1.FN_TYPE.integration
         ? yield (0, pip_install_1.pypiRes)('zcatalyst-cliq')
         : yield (0, pip_install_1.pypiRes)('zcatalyst-sdk');
+    const latestVersion = (() => {
+        const releases = pyRespJson.releases;
+        const latest = Object.entries(releases).reduce((latest, [version, details]) => {
+            var _a;
+            const whlDetails = details.at(0);
+            if (!(whlDetails === null || whlDetails === void 0 ? void 0 : whlDetails.upload_time)) {
+                return latest;
+            }
+            const uploadTime = new Date(whlDetails.upload_time).getTime();
+            if (!((_a = latest.details) === null || _a === void 0 ? void 0 : _a.upload_time) ||
+                uploadTime > new Date(latest.details.upload_time).getTime()) {
+                latest = {
+                    version,
+                    details: whlDetails
+                };
+            }
+            return latest;
+        }, {});
+        return latest.version;
+    })();
     yield fs_1.ASYNC.findAndReplace(targetPath)([
         constants_1.PLACEHOLDER.functions.python_package.name,
         constants_1.PLACEHOLDER.functions.python_package.main,
         constants_1.PLACEHOLDER.functions.python_package.sdkVersion
-    ], [
-        functionAns.name,
-        functionAns.main,
-        pyRespJson.info.version
-    ]);
+    ], [functionAns.name, functionAns.main, latestVersion]);
     yield fs_1.ASYNC.rename((0, path_1.join)(targetPath, constants_1.FILENAME.functions.python_main), () => functionAns.main);
     const integ_config = runtime_store_1.default.get('context.functions.integration.config', '');
     yield fn_utils_1.fnUtils.common.findAndReplaceConfigProps(targetPath, {

package/lib/init/features/project.js

@@ -34,26 +34,16 @@ const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const orgAPI = yield (0, endpoints_1.orgAPI)();
-    const projectAPIWithoutOrg = yield (0, endpoints_1.projectAPI)();
     const defaultRCProjectName = (0, project_1.getDefaultProjectName)(null);
     const defaultRCProjectId = (0, project_1.getDefaultProjectId)(null);
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !(0, option_1.getOptionValue)('force', false)) {
-        (0, logger_1.message)(constants_1.FILENAME.rc + ' already has ' + (0, ansi_colors_1.bold)(defaultRCProjectName) + ' as a default project.');
-        try {
-            yield projectAPIWithoutOrg.getProject(defaultRCProjectId);
-            throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option');
-        }
-        catch (err) {
-            if (js_1.JS.get(err, 'context.response.statusCode') !== 404) {
-                throw err;
-            }
-            (0, logger_1.warning)('cleaning up ' +
-                constants_1.FILENAME.rc +
-                ' since the current default project for this folder is not found in remote');
-            yield (0, project_1.removeProject)(defaultRCProjectId + '');
-        }
+        (0, logger_1.message)(constants_1.FILENAME.rc +
+            ' already has ' +
+            (0, ansi_colors_1.bold)(defaultRCProjectName) +
+            ' as a default project. To overwrite use --force option');
+        throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option', { skipHelp: true, exit: 0 });
     }
     const orgList = yield orgAPI.getAllOrgs();
     if (orgList.length === 0) {