zcatalyst-cli 1.25.0 → 1.25.2

package/lib/deploy/features/slate.js

@@ -25,89 +25,72 @@ const option_1 = require("../../util_modules/option");
 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 dId = process.env.ZC_APP_DEPLOYMENT_BUILD_ID;
     const env = getEnvironmentType();
-    if (!dId) {
-        const targets = yield config_1.slateConfig.getAllTargetDetails(false);
-        if (!targets || targets.length === 0) {
-            throw new error_1.default('No targets found');
-        }
-        const filtered = slate_utils_1.slateUtils.filterTargets(targets);
-        const validTargets = filtered.filter((targ) => {
-            var _a, _b;
-            if ((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid) {
-                return targ;
-            }
-            (0, logger_1.labeled)('Slate: ', 'Invalid Slate service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
-            (0, logger_1.error)('Reason: ' + ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
-            (0, logger_1.info)();
-            return false;
-        });
-        if (validTargets.length === 0) {
-            throw new error_1.default('No valid Slate services found to deploy', {
-                skipHelp: true
-            });
+    const targets = yield config_1.slateConfig.getAllTargetDetails(false);
+    if (!targets || targets.length === 0) {
+        throw new error_1.default('No targets found');
+    }
+    const filtered = slate_utils_1.slateUtils.filterTargets(targets);
+    const validTargets = filtered.filter((targ) => {
+        var _a, _b;
+        if ((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid) {
+            return targ;
         }
-        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 {
-                const throbberName = `prepare_slate_${targ.name}`;
-                throbber.add(throbberName, {
-                    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;
-                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);
-                throbber.remove(throbberName);
-                const response = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, targ.name, '', deploymentName ? deploymentName : '', isAppExists === null || isAppExists === void 0 ? void 0 : isAppExists.id, configDetails ? JSON.stringify(configDetails) : '', (0, option_1.getOptionValue)('m') || '');
-                targ.details = response;
-            }
-            catch (err) {
-                (0, logger_1.debug)(err);
-                _targ.validity = {
-                    valid: false,
-                    reason: error_1.default.getErrorInstance(err).message
-                };
-            }
-            prevRes.push(_targ);
-            return Promise.resolve(prevRes);
-        }), Promise.resolve([]));
-        const deployedValidTargets = deployRes.filter((targ) => {
-            var _a, _b, _c;
-            if (!((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid)) {
-                (0, logger_1.warning)('Deploy of Slate [' +
-                    targ.name +
-                    '] was unsuccessful since ' +
-                    ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
-            }
-            return (_c = targ.validity) === null || _c === void 0 ? void 0 : _c.valid;
+        (0, logger_1.labeled)('Slate: ', 'Invalid Slate service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
+        (0, logger_1.error)('Reason: ' + ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
+        (0, logger_1.info)();
+        return false;
+    });
+    if (validTargets.length === 0) {
+        throw new error_1.default('No valid Slate services found to deploy', {
+            skipHelp: true
         });
-        runtime_store_1.default.set('context.payload.slate.targets', deployedValidTargets);
-        if (deployedValidTargets.length > 0) {
-            runtime_store_1.default.set('context.payload.slate.deploy', true);
-        }
     }
-    else {
-        const source = runtime_store_1.default.get('cwd');
-        yield slate_utils_1.slateUtils.validate(source);
-        const readStream = yield slate_utils_1.slateUtils.pack();
+    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 {
-            const deployRes = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, process.env.ZC_APP_NAME, dId);
-            deployRes.name = process.env.ZC_APP_NAME;
-            runtime_store_1.default.set('context.payload.slate.targets', [deployRes]);
-            runtime_store_1.default.set('context.payload.slate.deploy', true);
+            const throbberName = `prepare_slate_${targ.name}`;
+            throbber.add(throbberName, {
+                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;
+            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);
+            throbber.remove(throbberName);
+            const response = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, targ.name, deploymentName ? deploymentName : '', isAppExists === null || isAppExists === void 0 ? void 0 : isAppExists.id, configDetails ? JSON.stringify(configDetails) : '', (0, option_1.getOptionValue)('m') || '');
+            targ.details = response;
         }
         catch (err) {
-            throw err;
+            (0, logger_1.debug)(err);
+            _targ.validity = {
+                valid: false,
+                reason: error_1.default.getErrorInstance(err).message
+            };
         }
+        prevRes.push(_targ);
+        return Promise.resolve(prevRes);
+    }), Promise.resolve([]));
+    const deployedValidTargets = deployRes.filter((targ) => {
+        var _a, _b, _c;
+        if (!((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid)) {
+            (0, logger_1.warning)('Deploy of Slate [' +
+                targ.name +
+                '] was unsuccessful since ' +
+                ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
+        }
+        return (_c = targ.validity) === null || _c === void 0 ? void 0 : _c.valid;
+    });
+    runtime_store_1.default.set('context.payload.slate.targets', deployedValidTargets);
+    if (deployedValidTargets.length > 0) {
+        runtime_store_1.default.set('context.payload.slate.deploy', true);
     }
 });
 function getEnvironmentType() {

package/lib/endpoints/lib/slate.d.ts

@@ -11,6 +11,6 @@ declare class Slate {
     getFrameworks(): Promise<Array<FrameworkType>>;
     getAllApps(): Promise<Array<ISlateAppInfo>>;
     downloadTemplate(): Promise<unknown>;
-    deploy(sourceStream: ReadStream, contentLength: number, appName: string, deployId: string, deploymentName?: string, appId?: string, config?: string, msg?: string): Promise<unknown>;
+    deploy(sourceStream: ReadStream, contentLength: number, appName: string, deploymentName?: string, appId?: string, config?: string, msg?: string): Promise<unknown>;
 }
 export default Slate;

package/lib/endpoints/lib/slate.js

@@ -62,9 +62,9 @@ class Slate {
             throw new error_1.default('Error while downloading the template', { exit: 2 });
         });
     }
-    deploy(sourceStream, contentLength, appName, deployId, deploymentName, appId, config, msg) {
+    deploy(sourceStream, contentLength, appName, deploymentName, appId, config, msg) {
         return __awaiter(this, void 0, void 0, function* () {
-            const formData = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ file: sourceStream }, (appId && { app_id: appId })), (deployId && { build_id: deployId })), (deploymentName && { deployment_name: deploymentName })), (appId || deployId ? {} : { name: appName })), (config && { configuration: config })), (msg && { message: msg }));
+            const formData = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ file: sourceStream }, (appId && { app_id: appId })), (deploymentName && { deployment_name: deploymentName })), (appId ? {} : { name: appName })), (config && { configuration: config })), (msg && { message: msg }));
             const res = yield new api_1.default(this.opts).post(`/slate/v1/project/${this.projectId}/app/upload`, {
                 formData,
                 json: false,

package/lib/internal/api.js

@@ -122,9 +122,12 @@ class API {
     }
     _logUploadProgress({ chunk, error } = {}) {
         if (this.uploadProgress) {
-            !chunk || error
-                ? this.uploadProgress.error(error)
-                : this.uploadProgress.tick(chunk.length);
+            if (chunk) {
+                this.uploadProgress.tick(chunk.length);
+            }
+            else {
+                error ? this.uploadProgress.error(error) : this.uploadProgress.error();
+            }
         }
     }
     _logDownloadProgress({ chunk, error } = {}) {

package/lib/progress.js

@@ -41,7 +41,14 @@ class Progress {
     }
     error(err) {
         const msg = this.failure ? this.failure(err) : typeof err === 'string' ? err : err === null || err === void 0 ? void 0 : err.message;
-        msg ? this.throbber.fail(this.title, { text: msg }) : this.throbber.remove(this.title);
+        if (msg) {
+            if (this.throbber.pick(this.title)) {
+                this.throbber.fail(this.title, { text: msg });
+            }
+        }
+        else {
+            this.throbber.remove(this.title);
+        }
     }
     tick(count = 1) {
         let prependedHeader = '';

package/lib/slate-utils.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateServeCommand = exports.slateUtils = void 0;
 const ansi_colors_1 = require("ansi-colors");
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("./archiver"));
 const error_1 = __importDefault(require("./error"));
@@ -24,8 +23,6 @@ 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 env_1 = require("./util_modules/env");
-const async_1 = require("./util_modules/fs/lib/async");
 exports.slateUtils = {
     validate: (source) => __awaiter(void 0, void 0, void 0, function* () {
         const sourceDirExists = yield fs_1.ASYNC.dirExists(source);
@@ -101,68 +98,6 @@ exports.slateUtils = {
         return refinedTargets;
     },
     pack: (source) => __awaiter(void 0, void 0, void 0, function* () {
-        if (env_1.isCI) {
-            source = source !== null && source !== void 0 ? source : runtime_store_1.default.get('cwd');
-            const tempDir = (0, path_1.resolve)(constants_1.FOLDERNAME.slate);
-            if (!(yield (0, async_1.dirExists)(tempDir))) {
-                (0, fs_extra_1.mkdir)(tempDir);
-                const excludePatterns = [
-                    '**/.catalyst',
-                    `**/${constants_1.FILENAME.log}`,
-                    `**/${constants_1.FILENAME.config}`,
-                    `**/${constants_1.FILENAME.rc}`,
-                    `**/${constants_1.FILENAME.app_config}`,
-                    `**/${constants_1.FILENAME.catalyst_ignore}`
-                ];
-                const files = yield fs_1.ASYNC.walk(source, {
-                    filter: {
-                        exclude: (path) => __awaiter(void 0, void 0, void 0, function* () {
-                            return !!excludePatterns.find((glob) => (0, minimatch_1.default)(path.replace(source + path_1.sep, ''), glob, {
-                                dot: true
-                            }));
-                        }),
-                        excludeDir: true
-                    }
-                });
-                const zip = new archiver_1.default('static');
-                const fileArr = [];
-                files.forEach((file) => {
-                    fileArr.push({
-                        path: (0, path_1.relative)(source, file.path),
-                        type: (0, path_1.extname)(file.path).replace('.', '').toUpperCase() || '',
-                        size: file.stats.size
-                    });
-                    zip.add(file.path.replace(source + path_1.sep, ''), file.stats.isSymbolicLink()
-                        ? fs_1.SYNC.readSymLink(file.path)
-                        : fs_1.SYNC.getReadStream(file.path), {
-                        mode: file.stats.mode
-                    });
-                });
-                const zipFinalizer = yield zip.finalize();
-                const staticZip = (0, path_1.join)(tempDir, constants_1.FILENAME.slate.static_zip);
-                yield zipFinalizer.writeZip(staticZip);
-                const content = {
-                    version: '',
-                    framework: process.env.ZC_FRAMEWORK,
-                    runtime: '',
-                    static: fileArr
-                };
-                const configJson = (0, path_1.join)(tempDir, constants_1.FILENAME.slate.config_json);
-                fs_1.SYNC.writeFile(configJson, JSON.stringify(content, null, 2) + '\n');
-            }
-            const slateZip = yield fs_1.ASYNC.walk(tempDir, { includeDirPaths: false });
-            const zipWithJson = new archiver_1.default();
-            slateZip.forEach((file) => {
-                zipWithJson.add(file.path.replace(tempDir + path_1.sep, ''), file.stats.isSymbolicLink()
-                    ? fs_1.SYNC.readSymLink(file.path)
-                    : fs_1.SYNC.getReadStream(file.path), {
-                    mode: file.stats.mode
-                });
-            });
-            const zipFinalizerWithJson = yield zipWithJson.finalize();
-            yield fs_1.ASYNC.deleteDir(tempDir);
-            return yield zipFinalizerWithJson.fsStream();
-        }
         const excludePatterns = [
             '**/.DS_Store',
             '**/.catalyst',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.25.0",
+	"version": "1.25.2",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -112,6 +112,6 @@
 	"files": [
 		"lib/**/*",
 		"templates/**/*",
-		"scripts/**/*"
+		"scripts/postInstall.js"
 	]
 }

package/scripts/send-notification.js

@@ -1,107 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-var-requires */
-
-const PACKAGE_JSON = require('../package.json');
-const HTTPS = require('https');
-const VERSION = PACKAGE_JSON.version;
-const NPM_REGISTRY_LINK = process.env.NPM_REGISTRY_LINK;
-const RELEASE_NOTES_LINK = process.env.RELEASE_NOTES_LINK;
-const API_KEY = process.env.API_KEY;
-const MERGE_REQUEST_ID = process.env.CI_MERGE_REQUEST_IID;
-
-const INSTALL_COMMAND = `npm install -g zcatalyst-cli@${VERSION}`;
-const CHANNEL_NAMES = (process.env.CHANNEL_NAMES || '').split(',');
-
-const notify = async () => {
-	let text = `Hey Team, we've released a new version of [ZCatalyst-CLI](${NPM_REGISTRY_LINK}) :fireworks: \n\n *Version:* \`v${VERSION}\``;
-
-	if (MERGE_REQUEST_ID) {
-		text =
-			text +
-			`\n* [Pipeline status](https://git.csez.zohocorpin.com/BaaS/ZCatalyst-CLI/-/merge_requests/${MERGE_REQUEST_ID}/pipelines)`;
-	}
-	const message = {
-		text,
-		bot: {
-			name: 'Dx Tools Update',
-			image: 'https://www.zoho.com/sites/zweb/images/producticon/catalyst.svg'
-		},
-		card: {
-			title: 'Announcement',
-			thumbnail: 'https://public-catlab-development.zohostratus.in/megaphone.gif',
-			theme: 'modern-inline'
-		},
-		slides: [
-			{
-				type: 'text',
-				title: 'Installation Command',
-				data: '```' + INSTALL_COMMAND + '```'
-			},
-			{
-				type: 'text',
-				title: 'Release Notes',
-				data: `${RELEASE_NOTES_LINK}`
-			}
-		]
-	};
-
-	if (!CHANNEL_NAMES || !Array.isArray(CHANNEL_NAMES) || CHANNEL_NAMES.length === 0) {
-		console.error('Invalid channels: ' + process.env.CHANNEL_NAMES);
-		process.exit(1);
-	}
-
-	await Promise.all(
-		CHANNEL_NAMES.map((channel) => {
-			return new Promise((resolve, reject) => {
-				try {
-					const reqOpts = {
-						hostname: 'cliq.zoho.com',
-						path: `/company/64396901/api/v2/channelsbyname/${channel}/message?zapikey=${API_KEY}`,
-						qs: {},
-						method: 'POST',
-						headers: {
-							'content-type': 'application/json'
-						}
-					};
-					const req = HTTPS.request(reqOpts, async (res) => {
-						if (res.statusCode === 204) {
-							console.log('Notification successful: ' + channel);
-							return resolve();
-						}
-
-						const data = [];
-						res.on('data', (chunk) => {
-							data.push(chunk);
-						});
-						res.on('end', () => {
-							const resStr = Buffer.concat(data).toString();
-							reject(
-								new Error(
-									`API ERROR ::: ${req.method} ::: https://${req.host}${req.path} ::: ${res.statusCode} ::: ${resStr}`
-								)
-							);
-						});
-					});
-					req.on('error', reject);
-					req.write(JSON.stringify(message));
-					req.end();
-				} catch (er) {
-					if (er instanceof Error) {
-						return reject(er);
-					}
-					const error = new Error();
-					error.cause = er;
-					return reject(error);
-				}
-			});
-		})
-	).catch((er) => {
-		console.error('Error sending notifications: ', er);
-		process.exit(1);
-	});
-
-	console.log('All Notifications sent successfully');
-	process.exit(0);
-};
-
-notify();