zcatalyst-cli 1.17.3 → 1.17.5

package/docs/command_needs/rc.toml

@@ -1,6 +1,6 @@
 [RC-1]
-context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available in the Catalyst remote console'''
-aid = '''Please use one of the available projects with the ${arg[1]} option. \nThe available projects are: \n${arg[2]}'''
+context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available is not available in the ${arg[3]} org.'''
+aid = '''Please use one of the available projects with the ${arg[1]} option or specify the correct org \nThe available projects in the ${arg[3]} org are: \n${arg[2]}'''
 link = 'https://www.zoho.com/catalyst/help/cli-options.html#Project'
 
 [RC-2]

package/lib/command_needs/rc.js

@@ -34,11 +34,6 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
     const projectOpt = globProjectOpt
         ? globProjectOpt
         : (0, env_1.getEnvVariable)('CATALYST_PROJECT', 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) {
         const orgList = yield orgApi.getAllOrgs();
@@ -50,8 +45,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 = yield (0, endpoints_1.projectAPI)();
+    let envApi = yield (0, endpoints_1.envAPI)();
     const convertProjectToProperties = (project) => {
         project = (0, project_2.transformProject)(project);
         runtime_store_1.default.set('project.name', project.name);
@@ -81,6 +76,9 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
             const projectArr = (yield projectApi.getAllProjects());
             const project = js_1.JS.find(projectArr, { project_name: projectOpt });
             if (project === undefined) {
+                const allOrgs = yield orgApi.getAllOrgs();
+                const orgId = (0, project_2.getEnvId)();
+                const orgDetails = allOrgs.find((org) => (!orgId && org.is_default) || org.name === orgId || org.id === orgId);
                 throw new error_1.default('invalid project provided with the --project option', {
                     exit: 1,
                     errorId: 'RC-1',
@@ -91,7 +89,9 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
                             .filter((proj) => proj.project_type &&
                             project_1.default.accepted_types.includes(proj.project_type))
                             .map((project) => '* ' + project.project_name)
-                            .join('\n'))
+                            .join('\n')),
+                        `${orgDetails === null || orgDetails === void 0 ? void 0 : orgDetails.name}(${orgDetails === null || orgDetails === void 0 ? void 0 : orgDetails.id})` +
+                            ((orgDetails === null || orgDetails === void 0 ? void 0 : orgDetails.is_default) ? ' [DEFAULT]' : '')
                     ]
                 });
             }

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

@@ -45,7 +45,7 @@ function getConfigJsonInputs() {
         const stack = yield (0, utils_1.validateOptions)(utils_1.validateStack, 'stack', runtimeDetailsPromise);
         const platform = yield (0, utils_1.validateOptions)(utils_1.validatePlatform, 'platform', stack);
         const optValues = {
-            buildPath: yield (0, utils_1.validateOptions)(utils_1.validateBuildPath, 'buildPath'),
+            build_path: yield (0, utils_1.validateOptions)(utils_1.validateBuildPath, 'buildPath'),
             stack,
             platform,
             command: (0, option_1.getOptionValue)('command', false)
@@ -54,7 +54,7 @@ function getConfigJsonInputs() {
         yield prompt_1.default.register('file-path');
         const appConfigAns = yield prompt_1.default.ask(prompt_1.default.question('buildPath', 'Please provide the build directory of your AppSail service', {
             type: 'file-path',
-            when: () => optValues.buildPath === false,
+            when: () => optValues.build_path === false,
             rootPath: cwd,
             validate: ({ value }) => __awaiter(this, void 0, void 0, function* () {
                 const pathRes = (0, utils_1.validateBuildPath)(value);
@@ -190,7 +190,8 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
                 text: `Preparing AppSail[${targ.name}]`
             });
             const zip = new archiver_1.default();
-            const folderPath = (0, project_1.resolveProjectPath)(targ.buildPath);
+            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 folderContents = yield fs_1.ASYNC.walk(folderPath, {
                 filter: {

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

@@ -36,7 +36,7 @@ function validateOptions(validationFn, option, ...args) {
 exports.validateOptions = validateOptions;
 function validateBuildPath(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        const cwd = runtime_store_1.default.get('cwd');
+        const cwd = process.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;

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

@@ -148,7 +148,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     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)(runtime_store_1.default.get('cwd'), pth.value);
+            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;
             }
@@ -182,7 +182,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const appConfig = {
         command: _appSailConfig.command ||
             'echo Please specify the start-up command in the app-config.json file under the key command',
-        buildPath: _appSailConfig.build || appSail.buildPath,
+        build_path: _appSailConfig.build || appSail.buildPath,
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,

package/lib/internal/api.js

@@ -55,7 +55,10 @@ class API {
             headers
         };
         if (!isExternal) {
-            this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { Accept: 'application/vnd.catalyst.v2+json', 'X-CATALYST-Environment': env, 'CATALYST-ORG': envId });
+            this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { Accept: 'application/vnd.catalyst.v2+json', 'X-CATALYST-Environment': env });
+            if (envId) {
+                this.requestOpts.headers['CATALYST-ORG'] = envId;
+            }
         }
         this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { 'User-Agent': runtime_store_1.default.get('context.cli.package.name') +
                 '/' +

package/lib/serve/server/lib/appsail/index.js

@@ -45,7 +45,7 @@ const startAppSail = (port, opts) => {
     }).RAW();
 };
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let child;
     const targetSail = serverDetails.target;
     if (!targetSail || !targetSail.appSail) {
@@ -54,16 +54,17 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     if ((_a = targetSail.appSail.scripts) === null || _a === void 0 ? void 0 : _a.preserve) {
         executeHook(targetSail.appSail.scripts.preserve, `AppSail [PRESERVE] [${(_b = targetSail.appSail) === null || _b === void 0 ? void 0 : _b.name}]`, targetSail.appSail.source);
     }
-    if (!(yield fs_1.ASYNC.isPathExists(targetSail.appSail.buildPath))) {
-        throw new error_1.default(`Build path does not exists [${targetSail.appSail.buildPath}]`, {
+    const buildPath = targetSail.appSail.buildPath
+        ? targetSail.appSail.buildPath
+        : (_c = targetSail.appSail) === null || _c === void 0 ? void 0 : _c.build_path;
+    if (!(yield fs_1.ASYNC.isPathExists(buildPath))) {
+        throw new error_1.default(`Build path does not exists [${buildPath}]`, {
             exit: 1,
             errorId: 'SERVE-APPSAIL-1',
-            arg: [ansi_colors_1.italic.red(targetSail.appSail.buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
+            arg: [ansi_colors_1.italic.red(buildPath), (0, ansi_colors_1.bold)(targetSail.appSail.name)]
         });
     }
-    const target = (yield fs_1.ASYNC.fileExists(targetSail.appSail.buildPath))
-        ? (0, path_1.dirname)(targetSail.appSail.buildPath)
-        : targetSail.appSail.buildPath;
+    const target = (yield fs_1.ASYNC.fileExists(buildPath)) ? (0, path_1.dirname)(buildPath) : buildPath;
     switch (true) {
         case targetSail.appSail.stack.startsWith('node'): {
             child = startAppSail(targetSail.port.appsail, {
@@ -139,7 +140,7 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             }
         });
     });
-    if ((_c = targetSail.appSail.scripts) === null || _c === void 0 ? void 0 : _c.postserve) {
+    if ((_d = targetSail.appSail.scripts) === null || _d === void 0 ? void 0 : _d.postserve) {
         child.once('exit', () => {
             var _a, _b, _c, _d;
             if (!((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.scripts)) {

package/lib/serve/server/lib/node/index.js

@@ -34,9 +34,9 @@ const logger_1 = require("../../../../util_modules/logger");
 const project_1 = require("../../../../util_modules/project");
 const shell_1 = require("../../../../util_modules/shell");
 exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f;
     const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
-    const _c = details.target, { ['watcher']: _ } = _c, serialisableTarget = __rest(_c, ['watcher']);
+    const _g = details.target, { ['watcher']: _ } = _g, serialisableTarget = __rest(_g, ['watcher']);
     const projectRoot = runtime_store_1.default.get('project.root');
     serialisableTarget.index = serialisableTarget.index
         ? serialisableTarget.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
@@ -44,13 +44,20 @@ exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, fun
     const opts = [
         (0, path_1.join)(__dirname, 'server'),
         details.httpPort + '',
-        JSON.stringify(serialisableTarget)
+        JSON.stringify({
+            index: ((_b = details.target) === null || _b === void 0 ? void 0 : _b.index)
+                ? details.target.index.replace(projectRoot, (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build))
+                : undefined,
+            name: (_c = details.target) === null || _c === void 0 ? void 0 : _c.name,
+            type: (_d = details.target) === null || _d === void 0 ? void 0 : _d.type,
+            source: (_e = details.target) === null || _e === void 0 ? void 0 : _e.source
+        })
     ];
     if (details.debugPort !== -1) {
         (0, logger_1.labeled)(label, 'you can attach your debugger at port : ' + details.debugPort).MESSAGE();
         opts.unshift('--inspect=' + details.debugPort);
     }
-    const targetSource = (_b = details.target) === null || _b === void 0 ? void 0 : _b.source;
+    const targetSource = (_f = details.target) === null || _f === void 0 ? void 0 : _f.source;
     const servePlugin = yield (0, plugin_loader_1.default)('functions', 'start', targetSource).catch((err) => (0, logger_1.debug)(err));
     if (typeof servePlugin === 'function') {
         const logStreamPlugin = yield (0, plugin_loader_1.default)('functions', 'logs', targetSource).catch((err) => (0, logger_1.debug)(err));

package/lib/shell/dependencies/http-functions.js

@@ -184,12 +184,13 @@ class HttpFunctions {
                         exit: 2
                     });
                 }
+                const slaveFnTarget = { index: fnTarget.index, name: fnTarget.name };
                 if ((_a = fnTarget.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
                     if (debugPort !== -1) {
                         slaveOptions.push('--inspect-brk=' + debugPort);
                     }
                     slaveOptions.push(this.nodeInvoker[fnTarget.type]);
-                    slaveOptions.push(JSON.stringify(fnTarget));
+                    slaveOptions.push(JSON.stringify(slaveFnTarget));
                     slaveOptions.push(query);
                     slaveOptions.push(JSON.stringify({
                         'x-zc-projectid': request.headers['x-zc-projectid'],
@@ -232,7 +233,7 @@ class HttpFunctions {
                     }
                     slaveOptions.push((0, path_1.basename)(invoker));
                     slaveOptions.push(javaInvokerDir);
-                    slaveOptions.push(JSON.stringify(fnTarget));
+                    slaveOptions.push(JSON.stringify(slaveFnTarget));
                     slaveOptions.push(query);
                     slaveOptions.push(JSON.stringify({
                         'x-zc-projectid': request.headers['x-zc-projectid'],

package/lib/shell/dependencies/local-function.js

@@ -95,12 +95,13 @@ class LocalFunction {
             const debugPort = runtime_store_1.default.get('context.port.debug.' + constants_1.FN_TYPE.basic, null);
             yield fs_1.ASYNC.ensureFile(this.responseFile, true);
             yield fs_1.ASYNC.ensureFile(this.metaFile, true);
+            const slaveFnTarget = { index: this.target.index, name: this.target.name };
             if ((_a = this.target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
                 if (debugPort !== null) {
                     slaveOptions.push('--inspect-brk=' + debugPort);
                 }
                 slaveOptions.push(this.nodeInvoker);
-                slaveOptions.push(JSON.stringify(this.target));
+                slaveOptions.push(JSON.stringify(slaveFnTarget));
                 slaveOptions.push(data);
                 slaveOptions.push(JSON.stringify({
                     'x-zc-projectid': (0, project_1.getProjectId)(),
@@ -132,7 +133,7 @@ class LocalFunction {
                 }
                 slaveOptions.push((0, path_1.basename)(this.javaInvoker));
                 slaveOptions.push(javaInvokerDir);
-                slaveOptions.push(JSON.stringify(this.target));
+                slaveOptions.push(JSON.stringify(slaveFnTarget));
                 slaveOptions.push(data);
                 slaveOptions.push(JSON.stringify({
                     'x-zc-projectid': (0, project_1.getProjectId)(),

package/lib/shell/prepare/languages/java.js

@@ -45,7 +45,7 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
         }
         const targetBuildPath = (0, path_1.join)(projectRoot, constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
         if (yield fs_1.ASYNC.isPathExists(targetBuildPath)) {
-            yield fs_1.ASYNC.deleteDir(targetBuildPath);
+            yield fs_1.ASYNC.emptyDir(targetBuildPath);
         }
         if (target.type === constants_1.FN_TYPE.advanced ||
             target.type === constants_1.FN_TYPE.applogic ||

package/lib/shell/prepare/languages/node.js

@@ -36,7 +36,9 @@ exports.default = (targets) => __awaiter(void 0, void 0, void 0, function* () {
         return target;
     });
     return Promise.all(nodeTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
-        yield fs_1.ASYNC.copyDir(target.source, (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name));
+        const buildPath = (0, path_1.join)(runtime_store_1.default.get('project.root'), constants_1.FOLDERNAME.build, constants_1.FOLDERNAME.functions, target.name);
+        yield fs_1.ASYNC.emptyDir(buildPath);
+        yield fs_1.ASYNC.copyDir(target.source, buildPath);
         throbber.remove('function_serve_' + target.name);
         return target;
     })));

package/lib/shell/prepare/languages/python.js

@@ -57,6 +57,7 @@ exports.default = (targets, fnWatchEvent) => __awaiter(void 0, void 0, void 0, f
                 target.failure_reason = error.message;
             }
         }
+        yield fs_1.ASYNC.emptyDir(buildPath);
         yield fs_1.ASYNC.copyDir(target.source, buildPath);
         throbber.remove('function_serve_' + target.name);
         return target;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.17.3",
+	"version": "1.17.5",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {