zcatalyst-cli 1.18.0-beta.9 → 1.18.1

package/lib/slate-utils.js

@@ -0,0 +1,212 @@
+'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.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"));
+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 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);
+        if (!sourceDirExists) {
+            throw new error_1.default('source directory does not exist', {
+                exit: 1,
+                errorId: 'SLATE-UTILS-1',
+                arg: [ansi_colors_1.italic.red(source)]
+            });
+        }
+    }),
+    getSlateFilters(targetStr) {
+        return targetStr.split(',').reduce((filterArr, target) => {
+            const opts = target.split(':');
+            if (opts[0] === 'slate' && opts[1]) {
+                filterArr.push(opts[1]);
+                return filterArr;
+            }
+            return filterArr;
+        }, []);
+    },
+    filterTargets(allTargets) {
+        const only = (0, option_1.getOptionValue)('only');
+        if (only !== undefined) {
+            const onlyTargs = this.getSlateFilters(only);
+            if (onlyTargs.length === 0) {
+                return allTargets;
+            }
+            const refined = onlyTargs.reduce((filtered, filter) => {
+                const targDetailsIdx = allTargets.findIndex((targ) => targ.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 Slate service in ${constants_1.FILENAME.config}.`);
+            }
+            return refined.matched;
+        }
+        const except = (0, option_1.getOptionValue)('except');
+        if (except !== undefined) {
+            const exceptTargs = this.getSlateFilters(except);
+            const refined = exceptTargs.reduce((filtered, filter) => {
+                const targDetailsIdx = allTargets.findIndex((targ) => targ.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 Slate service in ${constants_1.FILENAME.config}, hence ignored.`);
+            }
+            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;
+    },
+    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',
+            '**/.vscode/**/*',
+            '**/node_modules',
+            `**/${constants_1.FILENAME.log}`,
+            `**/${constants_1.FILENAME.config}`,
+            `**/${constants_1.FILENAME.rc}`,
+            `**/${constants_1.FILENAME.app_config}`,
+            `**/${constants_1.FILENAME.catalyst_ignore}`
+        ];
+        const slateZip = 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 zipWithJson = new archiver_1.default();
+        slateZip.forEach((file) => {
+            zipWithJson.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 zipFinalizerWithJson = yield zipWithJson.finalize();
+        return yield zipFinalizerWithJson.fsStream();
+    })
+};
+function validateServeCommand(targDetails) {
+    targDetails.forEach((targ) => {
+        var _a, _b;
+        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)) {
+                targ.validity = {
+                    valid: false,
+                    reason: 'Development command missing'
+                };
+            }
+        }
+    });
+    return targDetails;
+}
+exports.validateServeCommand = validateServeCommand;

package/lib/util_modules/config/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appSailConfig = exports.apigConfig = exports.functionsConfig = exports.clientConfig = void 0;
+exports.slateConfig = exports.appSailConfig = exports.apigConfig = exports.functionsConfig = exports.clientConfig = void 0;
 const apigConfig = __importStar(require("./lib/apig"));
 exports.apigConfig = apigConfig;
 const clientConfig = __importStar(require("./lib/client"));
@@ -32,3 +32,5 @@ const functionsConfig = __importStar(require("./lib/functions"));
 exports.functionsConfig = functionsConfig;
 const appSailConfig = __importStar(require("./lib/appsail"));
 exports.appSailConfig = appSailConfig;
+const slateConfig = __importStar(require("./lib/slate.js"));
+exports.slateConfig = slateConfig;

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

@@ -0,0 +1,98 @@
+"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.getAllTargetDetails = exports.getTargetDetails = exports.raw = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const error_1 = __importDefault(require("../../../error"));
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const constants_1 = require("../../constants");
+const fs_1 = require("../../fs");
+const toml_1 = require("../../parser/toml");
+const project_1 = require("../../project");
+const path_1 = require("path");
+function raw(throwError = false) {
+    const config = runtime_store_1.default.get('config', null);
+    if (config === null) {
+        if (throwError) {
+            throw new error_1.default(constants_1.FILENAME.config + ' file is required', { exit: 2 });
+        }
+        return;
+    }
+    return config.get('slate');
+}
+exports.raw = raw;
+function getTargetDetails(targ) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rawTargets = raw();
+        const target = rawTargets === null || rawTargets === void 0 ? void 0 : rawTargets.find((tar) => tar.name === targ.name);
+        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 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' } });
+        }
+        target.config = slateConfig;
+        return Object.assign({}, target);
+    });
+}
+exports.getTargetDetails = getTargetDetails;
+function getAllTargetDetails(throwErr = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rawTargets = raw();
+        if (!rawTargets) {
+            if (throwErr) {
+                throw new error_1.default('No Slate targets found', {
+                    errorId: 'SLTARG-UTIL-1',
+                    arg: [(0, ansi_colors_1.bold)('catalyst slate:create')],
+                    exit: 1
+                });
+            }
+            return;
+        }
+        return Promise.all(rawTargets.reduce((resArr, target) => {
+            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`
+                    } })));
+                return resArr;
+            }
+            const slateConfigPth = (0, project_1.resolveProjectPath)((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: {
+                        valid: false,
+                        reason: 'Config file not present'
+                    } })));
+                return resArr;
+            }
+            const slateConfigJson = fs_1.SYNC.readFile(slateConfigPth);
+            const slateConfig = (0, toml_1.parseTOML)(slateConfigJson);
+            if (!slateConfig) {
+                resArr.push(Promise.resolve(Object.assign(Object.assign({}, target), { validity: { valid: false, reason: 'Config file is empty' } })));
+                return resArr;
+            }
+            target.config = slateConfig;
+            resArr.push(new Promise((res) => __awaiter(this, void 0, void 0, function* () {
+                return res(Object.assign(Object.assign({}, target), { validity: { valid: true } }));
+            })));
+            return resArr;
+        }, []));
+    });
+}
+exports.getAllTargetDetails = getAllTargetDetails;

package/lib/util_modules/constants/lib/cliq-handlers.js

@@ -13,8 +13,8 @@ const handlers = {
     messageaction_handler: 'messageaction_handler',
     widget_handler: 'widget_handler',
     function_handler: 'function_handler',
-    installation_handler: 'installation_handler',
-    installation_validator: 'installation_validator'
+    extension_handler: 'extension_handler',
+    link_preview_handler: 'link_preview_handler'
 };
 exports.default = Object.freeze({
     event_template_dir: (0, path_1.join)(template_root, './event/integ/cliq/'),
@@ -43,8 +43,8 @@ exports.default = Object.freeze({
         [handlers.messageaction_handler]: 'message-action-handler.js',
         [handlers.widget_handler]: 'widget-handler.js',
         [handlers.function_handler]: 'function-handler.js',
-        [handlers.installation_handler]: 'installation-handler.js',
-        [handlers.installation_validator]: 'installation-validator.js'
+        [handlers.extension_handler]: 'extension-handler.js',
+        [handlers.link_preview_handler]: 'link-preview-handler.js'
     },
     java_handler_file_mapping: {
         [handlers.bot_handler]: 'BotHandler.java',
@@ -52,8 +52,8 @@ exports.default = Object.freeze({
         [handlers.messageaction_handler]: 'MessageActionHandler.java',
         [handlers.widget_handler]: 'WidgetHandler.java',
         [handlers.function_handler]: 'FunctionHandler.java',
-        [handlers.installation_handler]: 'InstallationHandler.java',
-        [handlers.installation_validator]: 'InstallationValidator.java'
+        [handlers.extension_handler]: 'ExtensionHandler.java',
+        [handlers.link_preview_handler]: 'LinkPreviewHandler.java'
     },
     python_handler_file_mapping: {
         [handlers.bot_handler]: 'bot_handler.py',
@@ -61,8 +61,8 @@ exports.default = Object.freeze({
         [handlers.messageaction_handler]: 'message_action_handler.py',
         [handlers.widget_handler]: 'widget_handler.py',
         [handlers.function_handler]: 'function_handler.py',
-        [handlers.installation_handler]: 'installation_handler.py',
-        [handlers.installation_validator]: 'installation_validator.py'
+        [handlers.extension_handler]: 'extension_handler.py',
+        [handlers.link_preview_handler]: 'link_preview_handler.py'
     },
     handlers_event_template: {
         ['bot']: [
@@ -72,7 +72,8 @@ exports.default = Object.freeze({
             'mention_handler',
             'action_handler',
             'incomingwebhook_handler',
-            'participation_handler'
+            'participation_handler',
+            'call_handler'
         ],
         ['command']: ['execution_handler', 'suggestion_handler'],
         ['messageaction']: ['execution_handler'],
@@ -82,8 +83,15 @@ exports.default = Object.freeze({
             'form_handler',
             'form_change_handler',
             'form_values_handler',
+            'form_view_handler',
             'widget_button_handler'
         ],
-        ['installation']: ['installation_handler', 'installation_validator']
+        ['extension']: ['installation_handler', 'installation_validator', 'uninstallation_handler'],
+        ['link_preview']: [
+            'preview_handler',
+            'action_handler',
+            'menu_handler',
+            'after_send_handler'
+        ]
     }
 });

package/lib/util_modules/constants/lib/dc-type.js

@@ -48,5 +48,13 @@ exports.default = Object.freeze({
         w_auth: 'us',
         m_auth: 'us',
         ext: '.sa'
+    },
+    jp: {
+        loc: 'Japan',
+        ref: 'jp',
+        value: 'jp',
+        w_auth: 'us',
+        m_auth: 'us',
+        ext: '.jp'
     }
 });

package/lib/util_modules/constants/lib/default.js

@@ -19,6 +19,10 @@ exports.default = Object.freeze({
                 master: 3000,
                 service: 4600
             },
+            slate: {
+                master: 3000,
+                service: 4800
+            },
             client: 5000
         },
         debug: {

package/lib/util_modules/constants/lib/file-names.js

@@ -5,6 +5,10 @@ exports.default = Object.freeze({
     http_log: 'catalyst-http-log.json',
     rc: '.catalystrc',
     config: 'catalyst.json',
+    slate: {
+        config_json: 'files.json',
+        static_zip: 'static.zip'
+    },
     client: {
         package_json: 'client-package.json',
         notFoundPage: '404.html'
@@ -23,9 +27,11 @@ exports.default = Object.freeze({
         system_rules: 'catalyst-system-rules.json'
     },
     catalyst_config: 'catalyst-config.json',
+    slate_config: 'slate-config.toml',
     command_log: '.command.log',
     node_modules: 'node_modules',
     app_config: 'app-config.json',
     package_json: 'package.json',
-    catalyst_ignore: '.catalystignore'
+    catalyst_ignore: '.catalystignore',
+    cli_config: 'cli-config.json'
 });

package/lib/util_modules/constants/lib/folder-names.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Object.freeze({
     client: 'client',
     functions: 'functions',
+    slate: '.slate',
     java_fn_lib: 'lib',
     build: '.build',
     output: '.output'

package/lib/util_modules/constants/lib/placeholders.js

@@ -43,6 +43,7 @@ exports.default = Object.freeze({
         project_id: '{{__PROJECT_ID__}}',
         zaid: '{{__ZAID__}}',
         auth_domain: '{{__AUTH_DOMAIN__}}',
-        org_id: '{{__ORG_ID__}}'
+        org_id: '{{__ORG_ID__}}',
+        stratus_domain: '{{_STRATUS_DOMAIN__}}'
     }
 });

package/lib/util_modules/constants/lib/scopes.js

@@ -75,10 +75,5 @@ exports.default = Object.freeze({
     bucket_read: 'ZohoCatalyst.buckets.READ',
     object_create: 'ZohoCatalyst.buckets.objects.CREATE',
     pipline_read: 'ZohoCatalyst.pipeline.READ',
-    pipeline_exec_create: 'ZohoCatalyst.pipeline.execution.CREATE',
-    zest_file_read: 'ZohoZEST.files.READ',
-    zest_spec_read: 'ZohoZEST.specifications.READ',
-    zest_spec_all: 'ZohoZEST.specifications.ALL',
-    zest_spec_src_action: 'ZohoZEST.specifications.sources.CREATE',
-    zest_schedule_job_read: 'ZohoZEST.scheduled_jobs.READ'
+    pipeline_exec_create: 'ZohoCatalyst.pipeline.execution.CREATE'
 });

package/lib/util_modules/context-help.js

@@ -8,7 +8,7 @@ const runtime_store_1 = __importDefault(require("../runtime-store"));
 const ansi_colors_1 = require("ansi-colors");
 const fs_1 = require("./fs");
 const logger_1 = require("./logger");
-const toml_1 = __importDefault(require("./parser/toml"));
+const toml_1 = require("./parser/toml");
 function help() {
     let exitCode = 0;
     const logs = runtime_store_1.default.get('log');
@@ -40,7 +40,7 @@ function help() {
         }
         const docPath = ((_a = errQueue[0].fileName) === null || _a === void 0 ? void 0 : _a.replace((0, path_1.join)(__dirname, '../../lib'), (0, path_1.join)(__dirname, '../../docs'))) + '.toml';
         const doc = fs_1.SYNC.readFile(docPath) || '';
-        const catHelp = (0, toml_1.default)(doc);
+        const catHelp = (0, toml_1.parseTOML)(doc);
         errQueue.forEach((err) => {
             exitCode = err.exit > exitCode ? err.exit : exitCode;
             if (err.errorId === undefined ||

package/lib/util_modules/fs/lib/async.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chmod = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.findAndReplace = exports.rename = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteDir = exports.deleteFile = exports.ensureDir = exports.ensureFile = exports.walk = exports.dirList = exports.writeFile = exports.tempFile = exports.readFile = exports.fileExists = exports.dirExists = exports.isPathExists = void 0;
+exports.isDirEmpty = exports.chmod = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.findAndReplace = exports.rename = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteDir = exports.deleteFile = exports.ensureDir = exports.ensureFile = exports.walk = exports.dirList = exports.writeFile = exports.tempFile = exports.readFile = exports.fileExists = exports.dirExists = exports.isPathExists = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const minimatch_1 = __importDefault(require("minimatch"));
 const os_1 = __importDefault(require("os"));
@@ -84,7 +84,8 @@ function dirList(dir) {
 exports.dirList = dirList;
 function walk(dir, { filter = {
     exclude: [],
-    excludeDir: true
+    excludeDir: true,
+    ignoreFiles: false
 }, depth = -1, includeDirPaths = false } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const stats = yield fs_extra_1.default.lstat(dir);
@@ -98,7 +99,7 @@ function walk(dir, { filter = {
             const entryPathStats = yield fs_extra_1.default.lstat(entryPath);
             const isEntryPthDir = entryPathStats.isDirectory() && !entryPathStats.isSymbolicLink();
             let excludeMatch = false;
-            if (!(isEntryPthDir && !filter.excludeDir)) {
+            if (!isEntryPthDir || filter.excludeDir) {
                 if (typeof filter.exclude === 'function') {
                     excludeMatch = excludeMatch || (yield filter.exclude(entryPath));
                 }
@@ -108,6 +109,9 @@ function walk(dir, { filter = {
                     }
                 }
             }
+            if (!isEntryPthDir && filter.ignoreFiles && !excludeMatch) {
+                excludeMatch = true;
+            }
             if (excludeMatch) {
                 return [];
             }
@@ -249,3 +253,10 @@ function chmod(path, mode, { checkPath = true, recursive = false } = {}) {
     });
 }
 exports.chmod = chmod;
+function isDirEmpty(pth) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = yield fs_extra_1.default.readdir(pth);
+        return files.length === 0;
+    });
+}
+exports.isDirEmpty = isDirEmpty;

package/lib/util_modules/fs/lib/sync.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteTempDir = exports.tempFile = exports.deleteDir = exports.isPathInside = exports.isPathOutside = exports.renameFile = exports.modifyFileName = exports.appendFile = exports.writeFile = exports.ensureFile = exports.ensureDir = exports.readFile = exports.deleteFile = exports.getAllFiles = exports.getAllDirs = exports.dirExists = exports.pathExists = exports.fileExists = exports.readSymLink = exports.getReadStream = exports.getWriteStream = void 0;
+exports.isDirEmpty = exports.writeJSONFile = exports.readJSONFile = exports.emptyDir = exports.copyDir = exports.copyFiles = exports.copyFile = exports.deleteTempDir = exports.tempFile = exports.deleteDir = exports.isPathInside = exports.isPathOutside = exports.renameFile = exports.modifyFileName = exports.appendFile = exports.writeFile = exports.ensureFile = exports.ensureDir = exports.readFile = exports.deleteFile = exports.getAllFiles = exports.getAllDirs = exports.dirExists = exports.pathExists = exports.fileExists = exports.readSymLink = exports.getReadStream = exports.getWriteStream = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -180,3 +180,8 @@ function writeJSONFile(pth, object, opts) {
     return fs_extra_1.default.writeJsonSync(pth, object, opts);
 }
 exports.writeJSONFile = writeJSONFile;
+function isDirEmpty(pth) {
+    const files = fs_extra_1.default.readdirSync(pth);
+    return files.length === 0;
+}
+exports.isDirEmpty = isDirEmpty;

package/lib/util_modules/parser/toml.js

@@ -3,17 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const toml_1 = require("toml");
+exports.convertTOML = exports.parseTOML = void 0;
+const toml_1 = __importDefault(require("@iarna/toml"));
 const error_1 = __importDefault(require("../../error"));
-exports.default = (str) => {
+function parseTOML(str) {
     try {
-        return (0, toml_1.parse)(str);
+        return toml_1.default.parse(str);
     }
     catch (e) {
         const err = error_1.default.getErrorInstance(e, {
-            message: 'TOML Parsing error'
+            message: 'TOML Parsing error' + e
         });
         err.exit = 2;
         throw err;
     }
-};
+}
+exports.parseTOML = parseTOML;
+function convertTOML(object) {
+    try {
+        return toml_1.default.stringify(object);
+    }
+    catch (e) {
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'TOML Writing error'
+        });
+        err.exit = 2;
+        throw err;
+    }
+}
+exports.convertTOML = convertTOML;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.9",
+	"version": "1.18.1",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -21,10 +21,11 @@
 		"functions",
 		"zcatalyst"
 	],
-	"author": "Catalyst (https://catalyst.zoho.com)",
+	"author": "Catalyst (https://github.com/catalystbyzoho)",
 	"homepage": "https://catalyst.zoho.com",
 	"license": "MIT",
 	"dependencies": {
+		"@iarna/toml": "^2.2.5",
 		"ansi-colors": "^4.1.3",
 		"app-module-path": "^2.2.0",
 		"better-queue": "^3.8.10",
@@ -51,7 +52,6 @@
 		"semver": "^7.3.7",
 		"string-width": "^4.2.3",
 		"strip-ansi": "^6.0.1",
-		"toml": "^3.0.0",
 		"update-notifier": "^5.1.0",
 		"winston": "^3.7.2",
 		"ws": "^8.5.0",