zcatalyst-cli 1.26.0 → 1.26.1

package/lib/deploy/features/slate.js

@@ -27,7 +27,7 @@ const urls_1 = __importDefault(require("../../util_modules/constants/lib/urls"))
 const project_1 = require("../../util_modules/project");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const env = getEnvironmentType();
-    const targets = yield config_1.slateConfig.getAllTargetDetails(false);
+    const targets = yield config_1.slateConfig.getAllTargetDetails(false, false);
     if (!targets || targets.length === 0) {
         throw new error_1.default('No targets found');
     }
@@ -50,7 +50,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const slateAppConfigs = yield (yield (0, endpoints_1.slateAPI)({ env })).getAllApps();
     const throbber = throbber_1.default.getInstance();
     const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
         const targ = _targ;
         const prevRes = yield result;
         try {
@@ -59,9 +58,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 text: `Preparing Slate[${targ.name}]`
             });
             const isAppExists = slateAppConfigs.find((app) => app.name === targ.name && app.app_type === 'cli');
-            const configDetails = !isAppExists
-                ? (_a = (yield config_1.slateConfig.getTargetDetails(targ))) === null || _a === void 0 ? void 0 : _a.config
-                : undefined;
+            let configDetails;
+            if (!isAppExists) {
+                const targetWithConfig = yield config_1.slateConfig.getTargetDetails(targ);
+                if (!targetWithConfig.config) {
+                    throw new error_1.default('Unable to read slate configuration for deploy');
+                }
+                configDetails = targetWithConfig.config;
+            }
             const deploymentName = configDetails === null || configDetails === void 0 ? void 0 : configDetails.deployment_name;
             deploymentName ? configDetails === null || configDetails === void 0 ? true : delete configDetails.deployment_name : null;
             const readStream = yield slate_utils_1.slateUtils.pack(targ.source);

package/lib/docs/serve/server/lib/slate/index.toml

@@ -13,3 +13,8 @@ context = '''Error when installing the dependencies.'''
 aid = '''Please install the necessary packages before running the command ${arg[0]}'''
 link = 'https://docs.catalyst.zoho.com/en/cli/v1/serve-resources/serve-all-resources/#serve-a-slate-app'
 
+[SERVE-SLATE-4]
+context = '''The cli-config.json file was not found in the slate source directory ${arg[0]}.'''
+aid = '''Please ensure cli-config.json exists in the slate source directory with a valid dev_command using ZC_SLATE_PORT.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/serve-resources/serve-all-resources/#serve-a-slate-app'
+

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

@@ -202,9 +202,11 @@ function addExistingSlate(existingSlates) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectRoot = (0, project_1.getProjectRoot)();
         const sourceOpt = (0, option_1.getOptionValue)('source');
+        const isDuplicate = (candidateAbs) => existingSlates.findIndex((targ) => (0, path_1.resolve)(projectRoot, targ.source) === candidateAbs) !==
+            -1;
         if (sourceOpt) {
             const buildPath = (0, path_1.resolve)(projectRoot, sourceOpt);
-            if (existingSlates.findIndex((targ) => targ.source === buildPath) !== -1) {
+            if (isDuplicate(buildPath)) {
                 throw new error_1.default(`Path ${(0, ansi_colors_1.bold)(buildPath)} is already linked to a Slate app.`, {
                     exit: 1
                 });
@@ -221,7 +223,7 @@ function addExistingSlate(existingSlates) {
             type: 'file-path',
             validate: (pth) => __awaiter(this, void 0, void 0, function* () {
                 const buildPath = (0, path_1.resolve)(projectRoot, pth.value);
-                if (existingSlates.findIndex((targ) => targ.source === buildPath) !== -1)
+                if (isDuplicate(buildPath))
                     return 'Path is already linked.';
                 if (yield fs_1.ASYNC.dirExists(buildPath)) {
                     return true;

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

@@ -4,7 +4,8 @@
 // exit codes
 // 150 - start up command failure
 
-const { spawn } = require('cross-spawn');
+const EXEC = require('child_process').exec;
+
 const WAR = 'war';
 const JAVASE = 'javase';
 const NODEJS = 'nodejs';
@@ -61,12 +62,7 @@ function main() {
 			throw new Error(`invalid runtime type: ${CMD_ARGS.rtType}`);
 	}
 
-	const _process = spawn('sh', ['-c', command.toString()], {
-		cwd,
-		env: process.env,
-		stdio: 'pipe',
-		detached: true
-	});
+	const _process = EXEC(command.toString(), { cwd });
 
 	_process.on('error', (error) => {
 		// eslint-disable-next-line no-console
@@ -77,11 +73,8 @@ function main() {
 	_process.stdout.pipe(process.stdout);
 	_process.stderr.pipe(process.stderr);
 
-	['SIGINT', 'SIGTERM'].forEach((signal) => {
-		process.on(signal, () => {
-			process.kill(-_process.pid, signal);
-			process.exit();
-		});
+	process.once('SIGINT', () => {
+		_process.kill('SIGINT');
 	});
 }
 

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

@@ -51,6 +51,13 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
     }
     else {
         const configFile = (0, path_1.join)(targetSlate.source, file_names_1.default.cli_config);
+        if (!(yield (0, async_1.fileExists)(configFile))) {
+            throw new error_1.default('cli-config.json file not found in source directory', {
+                exit: 1,
+                errorId: 'SERVE-SLATE-4',
+                arg: [targetSlate.source]
+            });
+        }
         const configJson = yield (0, async_1.readJSONFile)(configFile);
         const installDeps = (0, shell_1.spawn)('npm', ['install'], {
             cwd: targetSlate.source

package/lib/slate-utils.js

@@ -18,12 +18,13 @@ const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("./archiver"));
 const error_1 = __importDefault(require("./error"));
-const runtime_store_1 = __importDefault(require("./runtime-store"));
 const fs_1 = require("./util_modules/fs");
 const option_1 = require("./util_modules/option");
 const constants_1 = require("./util_modules/constants");
 const logger_1 = require("./util_modules/logger");
 const minimatch_1 = __importDefault(require("minimatch"));
+const sync_1 = require("./util_modules/fs/lib/sync");
+const project_1 = require("./util_modules/project");
 exports.slateUtils = {
     validate: (source) => __awaiter(void 0, void 0, void 0, function* () {
         const sourceDirExists = yield fs_1.ASYNC.dirExists(source);
@@ -92,11 +93,10 @@ exports.slateUtils = {
             }
             return refined.matched;
         }
-        const refinedTargets = allTargets.filter((app) => app.source.includes(runtime_store_1.default.get('cwd')));
-        if (refinedTargets.length === 0 || !refinedTargets) {
-            throw new error_1.default('You are not in a catalyst app directory.');
-        }
-        return refinedTargets;
+        return allTargets.filter((app) => {
+            const rel = (0, path_1.relative)((0, project_1.getProjectRoot)(), app.source);
+            return rel === '' || (!rel.startsWith('..') && !rel.startsWith(path_1.sep + '..'));
+        });
     },
     pack: (source) => __awaiter(void 0, void 0, void 0, function* () {
         const excludePatterns = [
@@ -135,18 +135,27 @@ function validateServeCommand(targDetails) {
     targDetails.forEach((targ) => {
         var _a, _b, _c;
         if (((_a = targ.config) === null || _a === void 0 ? void 0 : _a.framework) !== 'static') {
-            const serveConfig = fs_1.SYNC.readJSONFile((0, path_1.join)(targ.source, constants_1.FILENAME.cli_config));
-            if (targ.validity.valid && !((_b = serveConfig === null || serveConfig === void 0 ? void 0 : serveConfig.slate) === null || _b === void 0 ? void 0 : _b.dev_command)) {
+            const configPath = (0, path_1.join)(targ.source, constants_1.FILENAME.cli_config);
+            if (!(0, sync_1.fileExists)(configPath)) {
                 targ.validity = {
                     valid: false,
-                    reason: 'Development command missing'
+                    reason: 'Missing cli-config.json file in source directory'
                 };
             }
-            if (!((_c = serveConfig === null || serveConfig === void 0 ? void 0 : serveConfig.slate) === null || _c === void 0 ? void 0 : _c.dev_command).includes('ZC_SLATE_PORT')) {
-                targ.validity = {
-                    valid: false,
-                    reason: `Port configuration is missing. Please set the ${(0, ansi_colors_1.bold)('ZC_SLATE_PORT')} as the port value in ${(0, ansi_colors_1.bold)('cli-config.json')} under your development command.`
-                };
+            else {
+                const serveConfig = fs_1.SYNC.readJSONFile(configPath);
+                if (targ.validity.valid && !((_b = serveConfig === null || serveConfig === void 0 ? void 0 : serveConfig.slate) === null || _b === void 0 ? void 0 : _b.dev_command)) {
+                    targ.validity = {
+                        valid: false,
+                        reason: 'Development command missing'
+                    };
+                }
+                if (!((_c = serveConfig === null || serveConfig === void 0 ? void 0 : serveConfig.slate) === null || _c === void 0 ? void 0 : _c.dev_command).includes('ZC_SLATE_PORT')) {
+                    targ.validity = {
+                        valid: false,
+                        reason: `Port configuration is missing. Please set the ${(0, ansi_colors_1.bold)('ZC_SLATE_PORT')} as the port value in ${(0, ansi_colors_1.bold)('cli-config.json')} under your development command.`
+                    };
+                }
             }
         }
     });

package/lib/util_modules/config/lib/slate.d.ts

@@ -95,6 +95,7 @@ export interface ISlateConfig {
     config?: ISlateConfigDetails;
     details?: ISlateUploadResponse;
     source: string;
+    originalSource?: string;
     name: string;
     validity: {
         valid?: boolean;
@@ -103,4 +104,4 @@ export interface ISlateConfig {
 }
 export declare function raw(throwError?: boolean): Array<ISlateConfig> | undefined;
 export declare function getTargetDetails(targ: ISlateConfig): Promise<ISlateConfig>;
-export declare function getAllTargetDetails(throwErr?: boolean): Promise<Array<ISlateConfig> | undefined>;
+export declare function getAllTargetDetails(throwErr?: boolean, loadConfig?: boolean): Promise<Array<ISlateConfig> | undefined>;

package/lib/util_modules/config/lib/slate.js

@@ -33,6 +33,11 @@ function raw(throwError = false) {
     }
     return config.get('slate');
 }
+function normalizeTarget(target) {
+    const originalSource = target.source;
+    const resolvedSource = (0, project_1.resolveProjectPath)(originalSource);
+    return Object.assign(Object.assign({}, target), { source: resolvedSource, originalSource });
+}
 function getTargetDetails(targ) {
     return __awaiter(this, void 0, void 0, function* () {
         const rawTargets = raw();
@@ -40,18 +45,22 @@ function getTargetDetails(targ) {
         if (!target) {
             return Object.assign(Object.assign({}, targ), { validity: { valid: false, reason: 'Slate not found' } });
         }
-        const slateConfigPth = (0, project_1.resolveProjectPath)((0, path_1.join)(targ.source, '.catalyst', constants_1.FILENAME.slate_config));
+        const normalized = normalizeTarget(target);
+        const slateConfigPth = (0, path_1.join)(normalized.source, '.catalyst', constants_1.FILENAME.slate_config);
+        if (!fs_1.SYNC.fileExists(slateConfigPth)) {
+            return Object.assign(Object.assign({}, normalized), { validity: { valid: false, reason: 'Config file not present' } });
+        }
         const slateConfigJson = fs_1.SYNC.readFile(slateConfigPth);
         const slateConfig = (0, toml_1.parseTOML)(slateConfigJson);
         if (!slateConfig) {
-            return Object.assign(Object.assign({}, targ), { validity: { valid: false, reason: 'Config file is empty' } });
+            return Object.assign(Object.assign({}, normalized), { validity: { valid: false, reason: 'Config file is empty' } });
         }
-        target.config = slateConfig;
-        return Object.assign({}, target);
+        normalized.config = slateConfig;
+        return Object.assign({}, normalized);
     });
 }
 function getAllTargetDetails() {
-    return __awaiter(this, arguments, void 0, function* (throwErr = true) {
+    return __awaiter(this, arguments, void 0, function* (throwErr = true, loadConfig = true) {
         const rawTargets = raw();
         if (!rawTargets) {
             if (throwErr) {
@@ -59,16 +68,22 @@ function getAllTargetDetails() {
             }
             return;
         }
-        return Promise.all(rawTargets.reduce((resArr, target) => {
+        return Promise.all(rawTargets.reduce((resArr, rawTarget) => {
+            var _a;
+            const target = normalizeTarget(rawTarget);
             const isPath = fs_1.SYNC.dirExists(target.source);
             if (!isPath) {
                 resArr.push(Promise.resolve(Object.assign(Object.assign({}, target), { validity: {
                         valid: false,
-                        reason: `Invalid source path: (${(0, ansi_colors_1.bold)(target.source)}) directory not found`
+                        reason: `Invalid source path: (${(0, ansi_colors_1.bold)((_a = target.originalSource) !== null && _a !== void 0 ? _a : target.source)}) directory not found`
                     } })));
                 return resArr;
             }
-            const slateConfigPth = (0, project_1.resolveProjectPath)((0, path_1.join)(target.source, '.catalyst', constants_1.FILENAME.slate_config));
+            if (!loadConfig) {
+                resArr.push(Promise.resolve(Object.assign(Object.assign({}, target), { validity: { valid: true } })));
+                return resArr;
+            }
+            const slateConfigPth = (0, path_1.join)(target.source, '.catalyst', constants_1.FILENAME.slate_config);
             const isConfigPath = fs_1.SYNC.fileExists(slateConfigPth);
             if (!isConfigPath) {
                 resArr.push(Promise.resolve(Object.assign(Object.assign({}, target), { validity: {

package/package.json

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