npm - zcatalyst-cli - Versions diffs - 1.18.0-beta.11 → 1.18.0-beta.12 - Mend

zcatalyst-cli 1.18.0-beta.11 → 1.18.0-beta.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (55) hide show

package/docs/commands/slate/unlink.toml +9 -0
package/docs/endpoints/lib/env.toml +3 -1
package/docs/serve/server/lib/slate/index.toml +14 -0
package/docs/slate-utils.toml +4 -0
package/lib/archiver.js +18 -9
package/lib/authentication/login.js +3 -2
package/lib/command_needs/auth.js +1 -1
package/lib/command_needs/rc.js +40 -3
package/lib/commands/deploy/index.js +6 -1
package/lib/commands/deploy/slate.js +58 -0
package/lib/commands/index.js +3 -0
package/lib/commands/init.js +4 -10
package/lib/commands/slate/create.js +59 -0
package/lib/commands/slate/link.js +59 -0
package/lib/commands/slate/unlink.js +75 -0
package/lib/config-store.js +2 -1
package/lib/deploy/features/index.js +3 -0
package/lib/deploy/features/slate.js +123 -0
package/lib/endpoints/index.js +8 -1
package/lib/endpoints/lib/env.js +2 -1
package/lib/endpoints/lib/slate.js +91 -0
package/lib/fn-utils/lib/common.js +1 -1
package/lib/init/features/appsail/index.js +1 -1
package/lib/init/features/index.js +15 -2
package/lib/init/features/project.js +1 -1
package/lib/init/features/slate/index.js +313 -0
package/lib/internal/api.js +1 -1
package/lib/internal/command.js +9 -5
package/lib/option-filter.js +8 -2
package/lib/port-resolver.js +7 -0
package/lib/prompt/index.js +22 -6
package/lib/prompt/types/file-path.js +10 -7
package/lib/serve/features/index.js +8 -1
package/lib/serve/features/slate.js +47 -0
package/lib/serve/index.js +19 -0
package/lib/serve/server/index.js +61 -1
package/lib/serve/server/lib/appsail/index.js +1 -1
package/lib/serve/server/lib/master/index.js +25 -21
package/lib/serve/server/lib/master/slate.js +45 -0
package/lib/serve/server/lib/master/utils.js +2 -2
package/lib/serve/server/lib/slate/index.js +115 -0
package/lib/serve/server/lib/slate/static-server.js +193 -0
package/lib/slate-utils.js +212 -0
package/lib/util_modules/config/index.js +3 -1
package/lib/util_modules/config/lib/slate.js +94 -0
package/lib/util_modules/constants/lib/dc-type.js +8 -0
package/lib/util_modules/constants/lib/default.js +4 -0
package/lib/util_modules/constants/lib/file-names.js +7 -1
package/lib/util_modules/constants/lib/folder-names.js +1 -0
package/lib/util_modules/constants/lib/scopes.js +3 -1
package/lib/util_modules/context-help.js +2 -2
package/lib/util_modules/fs/lib/async.js +14 -3
package/lib/util_modules/fs/lib/sync.js +6 -1
package/lib/util_modules/parser/toml.js +20 -5
package/package.json +2 -2

package/lib/serve/server/lib/slate/static-server.js ADDED Viewed

@@ -0,0 +1,193 @@
+'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 express_1 = __importDefault(require("express"));
+const events_1 = require("events");
+const chokidar_1 = require("chokidar");
+const logger_js_1 = require("../../../../util_modules/logger.js");
+const index_js_1 = require("../../../../util_modules/constants/index.js");
+const error_js_1 = __importDefault(require("../../../../error.js"));
+const index_js_2 = require("../../../../util_modules/fs/index.js");
+const path_1 = require("path");
+const ws_1 = require("ws");
+const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
+const ansi_colors_1 = require("ansi-colors");
+const server_js_1 = require("../../../../util_modules/server.js");
+function prepareScriptFile(dir, port) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const scriptFile = yield index_js_2.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
+        if (!scriptFile) {
+            throw new error_js_1.default('Unable to read the script file', { exit: 2 });
+        }
+        const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.port, 'g'), port + '');
+        yield index_js_2.ASYNC.ensureDir(dir);
+        const scriptFilePath = (0, path_1.join)(dir, 'reload-script.js');
+        yield index_js_2.ASYNC.writeFile(scriptFilePath, scriptReady);
+        return scriptFilePath;
+    });
+}
+function stringInjector(source, anchorIdx, marker, inject) {
+    const headLastIdx = anchorIdx + marker.length;
+    const scriptPrefix = source.slice(0, headLastIdx);
+    const scriptSuffix = source.slice(headLastIdx);
+    return scriptPrefix + inject + scriptSuffix;
+}
+function injectScript(scriptLocale, indexHtml) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const headIdx = indexHtml.search(/<head>/gi);
+        const scriptTag = `\n<!--  Catalyst web client reload script -->\n<script type="text/javascript" src="${scriptLocale}"></script>\n`;
+        if (headIdx !== -1) {
+            return stringInjector(indexHtml, headIdx, '<head>', scriptTag);
+        }
+        const htmlIdx = indexHtml.search(/<html>/gi);
+        const headTag = `\n<head>${scriptTag}</head>\n`;
+        return stringInjector(indexHtml, htmlIdx, '<html>', headTag);
+    });
+}
+function reloadApp(event, path, liveSockets) {
+    (0, logger_js_1.info)((0, ansi_colors_1.cyan)(`${event} detected in ${path} of the Web-Client.`));
+    liveSockets.forEach((socket) => socket.send('reload'));
+}
+function slateServer(httpPort, source, { homepage = '/index.html', enableWatch = true, notFoundPage } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const eventListener = new events_1.EventEmitter();
+        const catalystTempDir = (0, path_1.join)(source, '.catalyst');
+        const socketServerPort = yield port_resolver_js_1.default.getFreePort(httpPort, 20, true);
+        const reloadScriptSrc = enableWatch
+            ? (0, path_1.relative)(source, yield prepareScriptFile(catalystTempDir, socketServerPort))
+            : undefined;
+        if (reloadScriptSrc) {
+            const clientWatcher = (0, chokidar_1.watch)(source, {
+                ignoreInitial: true,
+                ignored: ['node_modules/**/*']
+            });
+            const liveSockets = [];
+            let watcherReady = false;
+            clientWatcher.on('error', (err) => {
+                watcherReady = false;
+                eventListener.emit('error', new error_js_1.default('client watcher error', {
+                    original: err,
+                    exit: 1,
+                    skipHelp: true
+                }));
+            });
+            clientWatcher.on('ready', () => {
+                watcherReady = true;
+                const socketServer = new ws_1.WebSocketServer({
+                    port: socketServerPort,
+                    path: '/client-reload'
+                })
+                    .on('connection', (clientSocket) => {
+                    if (!watcherReady) {
+                        clientSocket.send('watcher not ready');
+                        clientSocket.close();
+                        return;
+                    }
+                    clientSocket.on('close', () => {
+                        const socketIdx = liveSockets.findIndex((socket) => socket === clientSocket);
+                        liveSockets.splice(socketIdx, 1);
+                    });
+                    liveSockets.push(clientSocket);
+                    clientSocket.send('connected');
+                })
+                    .on('error', (err) => (0, logger_js_1.debug)(err));
+                setTimeout(() => {
+                    clientWatcher.on('change', (path) => {
+                        reloadApp('Change(s) is', (0, path_1.relative)(source, path), liveSockets);
+                    });
+                    clientWatcher.on('add', (path) => {
+                        reloadApp('Addition of file(s) is', (0, path_1.relative)(source, path), liveSockets);
+                    });
+                    clientWatcher.on('unlink', (path) => {
+                        reloadApp('Deletion of file(s) is', (0, path_1.relative)(source, path), liveSockets);
+                    });
+                }, 1000);
+                eventListener.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
+            });
+            eventListener.addListener('close', () => {
+                if (clientWatcher) {
+                    clientWatcher.close();
+                }
+                liveSockets.forEach((socket) => socket.close());
+                index_js_2.SYNC.deleteDir(reloadScriptSrc);
+            });
+        }
+        const app = (0, express_1.default)();
+        app.use('/', (req, res) => __awaiter(this, void 0, void 0, function* () {
+            const requestedFile = req.url === '/' ? homepage : decodeURIComponent(req.path);
+            if (enableWatch && (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
+                const htmlFile = yield index_js_2.ASYNC.readFile((0, path_1.join)(source, requestedFile));
+                if (!htmlFile) {
+                    res.contentType('text/html');
+                    res.status(404);
+                    res.end();
+                    eventListener.emit('error', new error_js_1.default('Unable to read the html file', {
+                        exit: 1,
+                        errorId: 'SL-SERVER-1',
+                        arg: [ansi_colors_1.red.italic(requestedFile)]
+                    }));
+                    return;
+                }
+                const injectedHtml = reloadScriptSrc
+                    ? yield injectScript(encodeURIComponent(reloadScriptSrc), htmlFile)
+                    : undefined;
+                res.contentType('text/html');
+                res.status(200);
+                res.send(injectedHtml || htmlFile);
+                return;
+            }
+            res.sendFile((0, path_1.join)(source, requestedFile), (err) => {
+                if (!err) {
+                    return;
+                }
+                if (err.code && err.code === 'ENOENT') {
+                    (0, logger_js_1.error)((0, ansi_colors_1.red)('[404 - Resource not found]: ') + (0, ansi_colors_1.bold)(requestedFile));
+                    (0, logger_js_1.info)();
+                    (0, logger_js_1.debug)(err.stack || err.message);
+                    res.status(404);
+                    notFoundPage
+                        ? res.sendFile(notFoundPage, (e) => {
+                            if (!e) {
+                                return;
+                            }
+                            (0, logger_js_1.debug)('Unable to send the 404 page to server: ', e);
+                            res.status(500);
+                            res.send('Error sending 404 page to server: ' + e.stack);
+                        })
+                        : res.send('Resource not found');
+                    return;
+                }
+                (0, logger_js_1.error)('Error fetching the resource: ' + err);
+                (0, logger_js_1.debug)(err.stack);
+                res.status(500);
+                res.send('Error fetching the resource');
+            });
+        }));
+        const server = app.listen(httpPort, '127.0.0.1').on('error', (err) => {
+            eventListener.emit('error', err);
+        });
+        const expressDestroyer = new server_js_1.ConnectionDestroyer(server);
+        eventListener.on('error', (err) => {
+            (0, logger_js_1.error)('Error when serving the web-client: ' + err.message);
+            (0, logger_js_1.info)('Please exit the command to get more info');
+            eventListener.emit('close');
+        });
+        eventListener.on('close', () => __awaiter(this, void 0, void 0, function* () {
+            yield expressDestroyer.destroy();
+            (0, logger_js_1.debug)('client server closed');
+        }));
+        return new Promise((res) => server.on('listening', () => res(eventListener)));
+    });
+}
+exports.default = slateServer;

package/lib/slate-utils.js ADDED Viewed

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -0,0 +1,94 @@
+"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');
+            }
+            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/dc-type.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/scopes.js CHANGED Viewed

@@ -80,5 +80,7 @@ exports.default = Object.freeze({
     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'
+    zest_schedule_job_read: 'ZohoZEST.scheduled_jobs.READ',
+    slate_read: 'ZohoCatalyst.Slate.app.READ',
+    slate_create: 'ZohoCatalyst.Slate.app.CREATE'
 });

package/lib/util_modules/context-help.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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;