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

package/docs/endpoints/lib/env.toml

@@ -1,3 +1,5 @@
 [ENV-1]
-context = '''The ${arg[0]} environment for the project ${arg[1]} has been ${arg[2]}.'''
+context = '''The ${arg[0]} environment for the project ${arg[1]} has been ${arg[2]}.
+
+Reason: ${arg[4]}'''
 aid = '''Please contact catalyst support at ${arg[3]}'''

package/docs/option-filter.toml

@@ -43,8 +43,3 @@ link = ''
 context = '''The API Gateway cannot be served seperately in local.'''
 aid = '''Please include atleast one other component like functions or client along with the APIG to serve the APIG in local.'''
 link = ''
-
-[OPT-FILTER-10]
-context = '''Slate does not have a serve support.'''
-aid = '''Please start your Slate apps using the framework-specific commands.'''
-link = ''

package/lib/authentication/login.js

@@ -34,10 +34,11 @@ const option_1 = require("../util_modules/option");
 const crypto_1 = require("crypto");
 exports.missingScopes = {
     [constants_1.DC_TYPE.in.value]: getScopes(['zest', 'dataverse']),
-    [constants_1.DC_TYPE.eu.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
+    [constants_1.DC_TYPE.eu.value]: getScopes(['zest', 'dataverse']),
     [constants_1.DC_TYPE.au.value]: getScopes(['zest', 'dataverse']),
     [constants_1.DC_TYPE.ca.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
-    [constants_1.DC_TYPE.sa.value]: getScopes(['zest', 'quick_ml', 'dataverse'])
+    [constants_1.DC_TYPE.sa.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
+    [constants_1.DC_TYPE.jp.value]: getScopes(['zest', 'dataverse'])
 };
 function getScopes(keys) {
     return Object.keys(constants_1.SCOPE).filter((scope) => keys.some((prefix) => scope.startsWith(prefix)));

package/lib/commands/init.js

@@ -41,7 +41,6 @@ const command_1 = __importDefault(require("../internal/command"));
 const prompt_1 = __importDefault(require("../prompt"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
-const env_1 = require("../util_modules/env");
 const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
@@ -90,15 +89,6 @@ exports.default = new command_1.default('init [feature]')
         (0, ansi_colors_1.bold)(runtime_store_1.default.get('project.root')) +
         '\n' +
         warningText);
-    const windownConfirmation = env_1.isWindows
-        ? yield prompt_1.default.ask(prompt_1.default.question('confirmation', 'Are you ready to proceed?', {
-            type: 'confirm'
-        }))
-        : { confirmation: true };
-    if (!windownConfirmation.confirmation) {
-        (0, logger_1.message)('Aborted by user.');
-        return;
-    }
     if (feature !== 'project') {
         try {
             yield (0, features_1.project)();

package/lib/commands/slate/create.js

@@ -43,10 +43,9 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('slate:create')
     .description('Configure a new slate service in catalyst')
     .option('--name <app_name>', 'Please provide name for your slate')
-    .option('--framework <framework_name>', 'Specify frame work name for your slate')
+    .option('--framework <framework_name>', 'Specify framework name for your slate')
     .option('--template <template_url>', 'Provide template url for your slate')
     .option('--default', 'Set default app configurations')
-    .option('--production', 'Set production app configurations')
     .needs('auth')
     .needs('config', { optional: true })
     .needs('rc', { optional: true, generateRc: true })

package/lib/commands/slate/link.js

@@ -46,7 +46,6 @@ exports.default = new command_1.default('slate:link')
     .option('--framework <framework_name>', 'Specify frame work name for your slate')
     .option('--template <template_url>', 'Provide template url for your slate')
     .option('--default', 'Set default app configurations')
-    .option('--production', 'Create a app with production configurations')
     .needs('auth')
     .needs('config', { optional: true })
     .needs('rc', { optional: true, generateRc: true })

package/lib/commands/slate/unlink.js

@@ -59,11 +59,12 @@ exports.default = new command_1.default('slate:unlink')
         type: 'confirm',
         default: false
     }));
+    yield fs_1.ASYNC.deleteDir((0, path_1.join)(slateDetails.source, constants_1.FILENAME.cli_config));
     if (removeSource) {
-        fs_1.ASYNC.deleteDir(slateDetails.source);
+        yield fs_1.ASYNC.deleteDir(slateDetails.source);
     }
     else {
-        fs_1.ASYNC.deleteDir((0, path_1.join)(slateDetails.source, '.catalyst'));
+        yield fs_1.ASYNC.deleteDir((0, path_1.join)(slateDetails.source, '.catalyst'));
     }
     config.unset('slate');
     config.set('slate', slateServices.filter((slateCon) => slateCon.name !== appName));

package/lib/config-store.js

@@ -6,4 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const conf_1 = __importDefault(require("conf"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const name = runtime_store_1.default.get('context.cli.package.name');
-exports.default = new conf_1.default({ configName: name, projectName: name });
+const path = process.env['X_ZC_CREDENTIAL_PATH'];
+exports.default = new conf_1.default({ configName: name, projectName: name, cwd: path });

package/lib/endpoints/lib/env.js

@@ -37,7 +37,8 @@ class Env {
                                 (0, ansi_colors_1.bold)(constants_1.DEFAULT.env_name),
                                 (0, ansi_colors_1.bold)(projectId),
                                 ansi_colors_1.bold.red('blocked'),
-                                ansi_colors_1.italic.underline('support@zohocatalyst.com')
+                                ansi_colors_1.italic.underline('support@zohocatalyst.com'),
+                                ansi_colors_1.italic.red(JSON.stringify(devEnv.blocked_reason) || 'Unknown')
                             ]
                         });
                     }

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

@@ -49,7 +49,6 @@ const console_1 = require("console");
 const error_1 = __importDefault(require("../../../error"));
 const constants_1 = require("../../../util_modules/constants");
 const project_1 = require("../../../util_modules/project");
-const slate_1 = require("../../../deploy/features/slate");
 const toml_1 = require("../../../util_modules/parser/toml");
 const async_1 = require("../../../util_modules/fs/lib/async");
 function getFrameworkOption(frameworks, source) {
@@ -86,7 +85,6 @@ function validateAppName(appName) {
 function getAppName(existingSlates, frameworkOpt) {
     return __awaiter(this, void 0, void 0, function* () {
         let appName = (0, option_1.getOptionValue)('name');
-        const remoteApps = yield (yield (0, endpoints_1.slateAPI)({ env: (0, slate_1.getEnvironmentType)() })).getAllApps();
         if (!appName) {
             const { name } = yield prompt_1.default.ask(prompt_1.default.question('name', 'Please provide the name for your app:', {
                 type: 'input',
@@ -94,8 +92,6 @@ function getAppName(existingSlates, frameworkOpt) {
                 validate: (name) => {
                     if (existingSlates.findIndex((targ) => targ.name === name) !== -1)
                         return 'Slate already configured with this name.';
-                    if (remoteApps.findIndex((targ) => targ.name === name) !== -1)
-                        return 'App with this name already exists in remote.';
                     return validateAppName(name);
                 }
             }));
@@ -105,8 +101,6 @@ function getAppName(existingSlates, frameworkOpt) {
             if (existingSlates.findIndex((targ) => targ.name === appName) !== -1) {
                 throw new error_1.default('Slate already configured with this name.');
             }
-            else if (remoteApps.findIndex((targ) => targ.name === appName) !== -1)
-                return 'App with this name already exists in remote.';
             else {
                 const isValidApp = validateAppName(appName);
                 if (isValidApp !== true) {
@@ -161,8 +155,12 @@ function addExistingSlate(existingSlates) {
             }),
             depth: 5,
             empTxt: ' ',
-            rootPath: projectRoot
+            rootPath: projectRoot,
+            ignoreFiles: true,
+            excludeDir: true,
+            exclude: ['**/node_modules', '**/.git', '**/.catalyst']
         }));
+        prompt_1.default.deregister('file-path');
         return sourcePath;
     });
 }
@@ -194,7 +192,8 @@ function detectFramework(source, frameworkList) {
         if (isNextJs) {
             return { name: 'nextjs', source };
         }
-        const framework = frameworkList.find(({ keywords }) => keywords.some((keyword) => dependencies[keyword] !== undefined));
+        frameworkList = frameworkList.filter((framework) => !['static', 'react-vite', 'nextjs'].includes(framework.name));
+        const framework = frameworkList.find(({ keywords }) => keywords.every((keyword) => dependencies[keyword] !== undefined));
         if (!framework) {
             (0, logger_1.warning)('No matching framework found in package.json dependencies');
             return getFrameworkOption(frameworkList);
@@ -236,6 +235,7 @@ function getConfigDetails(frameworkOpt, frameworks) {
             const config = yield prompt_1.default.ask(prompt_1.default.question('installCommand', 'Provide your Install Command:', {
                 type: 'input',
                 validate: (value) => __awaiter(this, void 0, void 0, function* () {
+                    value = value.trim();
                     if (value === '')
                         return 'Please provide a valid install command';
                     else if (value.length > 50)
@@ -245,6 +245,7 @@ function getConfigDetails(frameworkOpt, frameworks) {
             }), prompt_1.default.question('buildCommand', 'Provide your Build Command:', {
                 type: 'input',
                 validate: (value) => __awaiter(this, void 0, void 0, function* () {
+                    value = value.trim();
                     if (value === '')
                         return 'Please provide a valid build command';
                     else if (value.length > 50)
@@ -254,16 +255,19 @@ function getConfigDetails(frameworkOpt, frameworks) {
             }), prompt_1.default.question('buildPath', 'Provide your Build Path:', {
                 type: 'input',
                 validate: (value) => __awaiter(this, void 0, void 0, function* () {
+                    value = value.trim();
                     if (value === '')
                         return 'Please provide a valid build path';
+                    else if (/[#%*$@?]/.test(value))
+                        return 'Build path containing invalid characters.';
                     else if (value.length > 50)
                         return 'Cannot exceed 50 characters.';
                     return true;
                 })
             }));
             (slateConfigDetails.install_command = config.installCommand),
-                (slateConfigDetails.build_path = config.buildCommand),
-                (slateConfigDetails.build_command = config.buildPath);
+                (slateConfigDetails.build_path = config.buildPath),
+                (slateConfigDetails.build_command = config.buildCommand);
         }
         return slateConfigDetails || {};
     });
@@ -286,8 +290,9 @@ exports.default = (add) => __awaiter(void 0, void 0, void 0, function* () {
             type: 'input',
             default: 'npm start',
             validate: (value) => __awaiter(void 0, void 0, void 0, function* () {
+                value = value.trim();
                 if (value === '')
-                    return 'Please provide a valid dev command';
+                    return 'Please provide a valid development command';
                 else if (value.length > 50)
                     return 'Cannot exceed 50 characters.';
                 return true;

package/lib/prompt/index.js

@@ -56,30 +56,46 @@ const choice = (name, _a = {}) => {
         disabled,
         checked }, otherOpts);
 };
+const registeredTypes = new Map();
 exports.default = {
     register: (type) => __awaiter(void 0, void 0, void 0, function* () {
+        if (registeredTypes.has(type))
+            return;
+        let module;
         switch (type) {
             case 'file-path':
-                const filePathExt = yield Promise.resolve().then(() => __importStar(require('./types/file-path')));
-                inquirer_1.default.registerPrompt('file-path', filePathExt.default);
+                module = yield Promise.resolve().then(() => __importStar(require('./types/file-path')));
                 break;
             case 'tree':
-                const treeExt = yield Promise.resolve().then(() => __importStar(require('./types/tree')));
-                inquirer_1.default.registerPrompt('tree', treeExt.default);
+                module = yield Promise.resolve().then(() => __importStar(require('./types/tree')));
                 break;
             case 'search-box':
-                const searchExt = yield Promise.resolve().then(() => __importStar(require('./types/search-box')));
-                inquirer_1.default.registerPrompt('search-box', searchExt.default);
+                module = yield Promise.resolve().then(() => __importStar(require('./types/search-box')));
                 break;
             default:
                 throw new error_1.default('No such type registered', { exit: 2 });
         }
+        inquirer_1.default.registerPrompt(type, module.default);
+        registeredTypes.set(type, module.default);
     }),
+    deregister: (type) => {
+        registeredTypes.delete(type);
+        inquirer_1.default.restoreDefaultPrompts();
+    },
     separator: (line) => {
         return new inquirer_1.default.Separator(line);
     },
     choice,
     ask: (...questions) => {
+        for (const question of questions) {
+            if (question.type && ['file-path', 'tree', 'search-box'].includes(question.type)) {
+                if (!registeredTypes.has(question.type)) {
+                    throw new error_1.default(`Prompt type "${question.type}" is not registered.`, {
+                        exit: 2
+                    });
+                }
+            }
+        }
         return inquirer_1.default.prompt(questions);
     },
     question: (name, question, _a = {}) => {

package/lib/prompt/types/file-path.js

@@ -17,10 +17,10 @@ const inquirer_autocomplete_prompt_1 = __importDefault(require("inquirer-autocom
 const fuzzy_1 = __importDefault(require("fuzzy"));
 const fs_1 = require("../../util_modules/fs");
 const ansi_colors_1 = require("ansi-colors");
-function getPaths(rootPath, pattern, exclude, defaultItem, depth) {
+function getPaths(rootPath, pattern, exclude, excludeDir, ignoreFiles, defaultItem, depth) {
     return __awaiter(this, void 0, void 0, function* () {
         const nodeList = yield fs_1.ASYNC.walk(rootPath, {
-            filter: { exclude, excludeDir: false },
+            filter: { exclude, excludeDir, ignoreFiles },
             depth,
             includeDirPaths: true
         });
@@ -35,7 +35,7 @@ function getPaths(rootPath, pattern, exclude, defaultItem, depth) {
 }
 class InquirerFilePath extends inquirer_autocomplete_prompt_1.default {
     constructor(question, rl, answers) {
-        const { rootPath = '.', exclude = [] } = question;
+        const { rootPath = '.', exclude = [], excludeDir = false, ignoreFiles = false } = question;
         const questionBase = Object.assign({
             emptyText: question.empTxt
                 ? question.empTxt
@@ -43,7 +43,7 @@ class InquirerFilePath extends inquirer_autocomplete_prompt_1.default {
                     (0, ansi_colors_1.cyan)('<return> ') +
                     'key'
         }, question, {
-            source: (_, pattern) => getPaths(rootPath, pattern, exclude, question.default, question.depth)
+            source: (_, pattern) => getPaths(rootPath, pattern, exclude, excludeDir, ignoreFiles, question.default, question.depth)
         });
         super(questionBase, rl, answers);
     }

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

@@ -37,7 +37,7 @@ function addSlateRoutes(app, details, proxy, unknownProxy) {
             return;
         }
         proxy.web(req, res, {
-            target: `http://127.0.0.1:${details.target.port.slate}`,
+            target: `http://localhost:${details.target.port.slate}`,
             ws: true
         });
     }));

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

@@ -36,18 +36,8 @@ const startSlate = (port, opts) => {
         child.on('error', (reason) => _rej(reason));
     });
 };
-const installPackages = (opts) => {
-    const child = (0, shell_1.spawn)(opts.command, [], {
-        cwd: opts.target,
-        shell: true
-    }).RAW();
-    return new Promise((_res, _rej) => {
-        child.on('spawn', () => _res(child));
-        child.on('error', (reason) => _rej(reason));
-    });
-};
 exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a;
     const targetSlate = serverDetails.target;
     if (!targetSlate || !targetSlate.config) {
         throw new error_1.default('Slate details not found');
@@ -71,9 +61,9 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
             });
         }
         if (!(yield fs_1.ASYNC.isPathExists(targetSlate.source))) {
-            throw new error_1.default('The given Slate source path does not exists', {
+            throw new error_1.default('The given Slate source path does not exist', {
                 exit: 1,
-                errorId: 'SERVE-SlATE-1',
+                errorId: 'SERVE-SLATE-2',
                 arg: [ansi_colors_1.italic.underline.red(targetSlate.source), (0, ansi_colors_1.bold)(targetSlate.name)]
             });
         }
@@ -81,56 +71,37 @@ exports.default = (serverDetails) => __awaiter(void 0, void 0, void 0, function*
         if (!configJson) {
             throw new error_1.default('Development command not found', {
                 exit: 1,
-                errorId: 'SERVE-SLATE-1',
+                errorId: 'SERVE-SLATE-3',
                 arg: ['catalyst slate:create']
             });
         }
-        if ((_a = targetSlate.config) === null || _a === void 0 ? void 0 : _a.install_command) {
-            const spwnProcess = yield installPackages({
-                target: targetSlate.source,
-                command: (_b = targetSlate.config) === null || _b === void 0 ? void 0 : _b.install_command
-            });
-            spwnProcess.once('exit', (code) => {
-                if (code === 150) {
-                    targetSlate.validity = {
-                        valid: false,
-                        reason: 'Unable to install the dependencies'
-                    };
-                    throw new error_1.default('Unable to start the Slate', {
-                        exit: 1,
-                        errorId: 'SERVE-SLATE-3',
-                        arg: [(0, ansi_colors_1.bold)('catalyst serve')]
-                    });
-                }
-            });
-        }
         child = yield startSlate(targetSlate.port.slate, {
             target: targetSlate.source,
-            command: (_c = configJson === null || configJson === void 0 ? void 0 : configJson.slate) === null || _c === void 0 ? void 0 : _c.dev_command
-        });
-        child.once('exit', (code) => {
-            if (code === 150) {
-                targetSlate.validity = {
-                    valid: false,
-                    reason: 'Unable to start the Slate'
-                };
-                throw new error_1.default('Unable to start the Slate', {
-                    exit: 1,
-                    errorId: 'SERVE-SLATE-2',
-                    arg: [(0, ansi_colors_1.bold)(targetSlate.name), (0, ansi_colors_1.underline)((configJson === null || configJson === void 0 ? void 0 : configJson.dev_command) || '')]
-                });
-            }
+            command: (_a = configJson === null || configJson === void 0 ? void 0 : configJson.slate) === null || _a === void 0 ? void 0 : _a.dev_command
         });
     }
     const masterServe = yield (0, master_1.default)(targetSlate.port.proxy, {
         slateDetails: serverDetails
     });
-    child.once('exit', () => {
-        masterServe.close((err) => {
-            if (err) {
-                (0, logger_1.debug)('Error stopping the Slate proxy server: ', err);
-            }
+    child.once('exit', (code) => {
+        child.once('exit', () => {
+            masterServe.close((err) => {
+                if (err) {
+                    (0, logger_1.debug)('Error stopping the Slate proxy server: ', err);
+                }
+            });
         });
+        if (code === 150) {
+            targetSlate.validity = {
+                valid: false,
+                reason: 'Unable to start the Slate'
+            };
+            throw new error_1.default('Slate start failed', {
+                exit: 1,
+                errorId: 'SERVE-SLATE-5',
+                arg: [(0, ansi_colors_1.bold)(targetSlate.name)]
+            });
+        }
     });
     process.on('SIGINT', () => {
         masterServe.close((err) => {

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/fs/lib/async.js

@@ -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 [];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.11-slate",
+	"version": "1.18.0-beta.12",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {