zcatalyst-cli 1.26.2 → 1.27.0

package/lib/util_modules/config-store.js

@@ -4,46 +4,63 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const conf_1 = __importDefault(require("conf"));
+const fs_1 = require("fs");
 const path_1 = require("path");
 const error_1 = __importDefault(require("../error"));
 const path = process.env['X_ZC_CREDENTIAL_PATH'];
+const CONFIG_FILE_MODE = 0o600;
+const CLI_CONFIG_NAME = 'zcatalyst-cli-v1';
 class Store {
     static changeStore(store, path) {
         switch (store) {
             case 'cli': {
                 Store._store = new conf_1.default({
-                    configName: 'zcatalyst-cli',
+                    configName: CLI_CONFIG_NAME,
                     projectName: 'zcatalyst-cli',
-                    cwd: path
+                    cwd: path,
+                    configFileMode: CONFIG_FILE_MODE
                 });
-                return;
+                break;
             }
             case 'vscode': {
                 Store._store = new conf_1.default({
                     configName: 'auth',
                     projectName: 'zcatalyst-vscode',
-                    cwd: path ? (0, path_1.join)(path, 'zcatalyst-vscode') : undefined
+                    cwd: path ? (0, path_1.join)(path, 'zcatalyst-vscode') : undefined,
+                    configFileMode: CONFIG_FILE_MODE
                 });
-                return;
+                break;
             }
             case 'zcode': {
                 Store._store = new conf_1.default({
                     configName: 'auth',
                     projectName: 'zcatalyst-zcode',
-                    cwd: path ? (0, path_1.join)(path, 'zcatalyst-code') : undefined
+                    cwd: path ? (0, path_1.join)(path, 'zcatalyst-code') : undefined,
+                    configFileMode: CONFIG_FILE_MODE
                 });
-                return;
+                break;
             }
             default: {
                 throw new error_1.default('Invalid Store type: ' + store, { exit: 2 });
             }
         }
+        Store._lockDownPermissions();
+    }
+    static _lockDownPermissions() {
+        try {
+            const filePath = Store._store.path;
+            if ((0, fs_1.existsSync)(filePath)) {
+                (0, fs_1.chmodSync)(filePath, CONFIG_FILE_MODE);
+            }
+        }
+        catch (err) {
+        }
     }
     static get istore() {
         return Store._store;
     }
     static get path() {
-        return (0, path_1.join)(this._store.path, '../../');
+        return (0, path_1.dirname)(this._store.path);
     }
     static get store() {
         return Store.istore.store;
@@ -65,8 +82,10 @@ class Store {
     }
 }
 Store._store = new conf_1.default({
-    configName: 'zcatalyst-cli',
+    configName: CLI_CONFIG_NAME,
     projectName: 'zcatalyst-cli',
-    cwd: path
+    cwd: path,
+    configFileMode: CONFIG_FILE_MODE
 });
 exports.default = Store;
+Store._lockDownPermissions();

package/lib/util_modules/constants/index.d.ts

@@ -18,7 +18,6 @@ export { default as PLUGIN } from './lib/plugin';
 export { default as IAC } from './lib/iac';
 export { default as RUNTIME } from './lib/runtime';
 export { default as ENVPATH } from './lib/env-path';
-export { default as NEEDED_SCOPES } from './lib/needed-scopes';
 export { default as SIGNALS_PUBLISHERS_TYPE } from './lib/signals-publishers-type';
 export { default as SIGNALS_PUBLISHERS } from './lib/signals-publishers';
 export { default as SIGNALS_API_NAMES } from './lib/signals-api-names';

package/lib/util_modules/constants/index.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.SIGNALS_API_NAMES = exports.SIGNALS_PUBLISHERS = exports.SIGNALS_PUBLISHERS_TYPE = exports.NEEDED_SCOPES = exports.ENVPATH = exports.RUNTIME = exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.APIG_RULES = void 0;
+exports.SIGNALS_API_NAMES = exports.SIGNALS_PUBLISHERS = exports.SIGNALS_PUBLISHERS_TYPE = exports.ENVPATH = exports.RUNTIME = exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.APIG_RULES = void 0;
 var apig_rules_1 = require("./lib/apig-rules");
 Object.defineProperty(exports, "APIG_RULES", { enumerable: true, get: function () { return __importDefault(apig_rules_1).default; } });
 var cliq_handlers_1 = require("./lib/cliq-handlers");
@@ -44,8 +44,6 @@ var runtime_1 = require("./lib/runtime");
 Object.defineProperty(exports, "RUNTIME", { enumerable: true, get: function () { return __importDefault(runtime_1).default; } });
 var env_path_1 = require("./lib/env-path");
 Object.defineProperty(exports, "ENVPATH", { enumerable: true, get: function () { return __importDefault(env_path_1).default; } });
-var needed_scopes_1 = require("./lib/needed-scopes");
-Object.defineProperty(exports, "NEEDED_SCOPES", { enumerable: true, get: function () { return __importDefault(needed_scopes_1).default; } });
 var signals_publishers_type_1 = require("./lib/signals-publishers-type");
 Object.defineProperty(exports, "SIGNALS_PUBLISHERS_TYPE", { enumerable: true, get: function () { return __importDefault(signals_publishers_type_1).default; } });
 var signals_publishers_1 = require("./lib/signals-publishers");

package/lib/util_modules/constants/lib/urls.d.ts

@@ -9,6 +9,7 @@ export default class URL {
     private static readonly _stratusSuffixBase;
     private static readonly _zohoCDNBase;
     private static readonly _contacts;
+    private static readonly _zgraphql;
     static get zohoCDNUS(): string;
     static get zohoCDN(): string;
     static get auth(): string;
@@ -18,6 +19,7 @@ export default class URL {
     static get appSailDomain(): string;
     static get catalystStatic(): string;
     static get console(): string;
+    static get zgraphql(): string;
     static get contacts(): string;
     static get stratusSuffix(): string;
     static external: Readonly<{

package/lib/util_modules/constants/lib/urls.js

@@ -34,6 +34,9 @@ class URL {
     static get console() {
         return (0, env_js_1.envOverride)('CATALYST_CONSOLE_URL', mapDataCenterUrl(URL._consoleBase));
     }
+    static get zgraphql() {
+        return (0, env_js_1.envOverride)('CATALYST_ZGRAPHQL_URL', mapDataCenterUrl(URL._zgraphql));
+    }
     static get contacts() {
         return (0, env_js_1.envOverride)('ZOHO_CONTACTS', mapDataCenterUrl(URL._contacts));
     }
@@ -51,6 +54,7 @@ URL._consoleBase = 'https://console.catalyst.zoho.com';
 URL._stratusSuffixBase = '.zohostratus.com';
 URL._zohoCDNBase = 'https://static.zohocdn.com';
 URL._contacts = 'https://profile.zoho.com';
+URL._zgraphql = 'https://zgraphql.zoho.com';
 URL.external = Object.freeze({
     gitHubAPI: 'https://api.github.com',
     gitHubWeb: 'https://github.com'

package/lib/util_modules/dc.d.ts

@@ -1,4 +1,9 @@
-export declare function getActiveDC(dcOption?: string): string;
+export declare function getActiveDC(): string;
+export declare function getActiveDC(dcOption: string): string;
+export declare function getActiveDC(opts?: {
+    dcOption?: string;
+    throwError?: boolean;
+}): string | undefined;
 export declare function getActiveDCType(): {
     loc: string;
     value: string;

package/lib/util_modules/dc.js

@@ -7,11 +7,20 @@ exports.getActiveDC = getActiveDC;
 exports.getActiveDCType = getActiveDCType;
 exports.updateActiveDC = updateActiveDC;
 const ansi_colors_1 = require("ansi-colors");
-const path_1 = require("path");
 const config_store_js_1 = __importDefault(require("./config-store.js"));
 const index_js_1 = __importDefault(require("../error/index.js"));
 const dc_type_js_1 = __importDefault(require("./constants/lib/dc-type.js"));
-function getActiveDC(dcOption) {
+function getActiveDC(opts) {
+    switch (typeof opts) {
+        case 'string':
+            return _getActiveDC({ dcOption: opts, throwError: true });
+        case 'object':
+            return _getActiveDC(opts);
+        default:
+            return _getActiveDC();
+    }
+}
+function _getActiveDC({ dcOption, throwError = true } = {}) {
     const envname = 'CATALYST_ACTIVE_DC';
     if (process.env[envname] !== undefined) {
         return process.env[envname];
@@ -26,12 +35,16 @@ function getActiveDC(dcOption) {
     if (typeof dcOption === 'string') {
         const availableDcs = Object.keys(dc_type_js_1.default);
         if (!availableDcs.includes(dcOption)) {
-            throw new index_js_1.default('Provide DC in global option is not valid: ' + dcOption, {
-                exit: 1,
-                errorId: 'DC-1',
-                arg: [ansi_colors_1.bold.red(dcOption), (0, ansi_colors_1.bold)(availableDcs.map((dc) => '* ' + dc).join('\n'))],
-                docPath: (0, path_1.join)(__dirname, './docs/dc.toml')
-            });
+            if (throwError) {
+                throw new index_js_1.default('Provide DC in global option is not valid: ' + dcOption, {
+                    exit: 1,
+                    errorId: 'DC-1',
+                    arg: [ansi_colors_1.bold.red(dcOption), (0, ansi_colors_1.bold)(availableDcs.map((dc) => '* ' + dc).join('\n'))]
+                });
+            }
+            else {
+                return;
+            }
         }
         return dc_type_js_1.default[dcOption].value;
     }

package/lib/util_modules/env.d.ts

@@ -4,7 +4,10 @@ export declare const isWindows: boolean;
 export declare const isVsCode: boolean;
 export declare const isZCode: boolean;
 export declare const isExtension: boolean;
+export declare function isCLIBin(): boolean;
 export declare function isPrimaryShell(): boolean;
 export declare function envOverride(envname: string, value: string): string;
 export declare function getEnvVariable(variable: string, fallback?: unknown): unknown;
 export declare const getLocalAccessDomain: (port: number, protocol?: "http" | "ws") => string;
+export declare function isNonInteractiveMode(): boolean;
+export declare function getNonInteractiveModeSource(): 'env' | 'option' | undefined;

package/lib/util_modules/env.js

@@ -34,9 +34,15 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalAccessDomain = exports.isExtension = exports.isZCode = exports.isVsCode = exports.isWindows = exports.isMac = exports.isCI = void 0;
+exports.isCLIBin = isCLIBin;
 exports.isPrimaryShell = isPrimaryShell;
 exports.envOverride = envOverride;
 exports.getEnvVariable = getEnvVariable;
+exports.isNonInteractiveMode = isNonInteractiveMode;
+exports.getNonInteractiveModeSource = getNonInteractiveModeSource;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const option_1 = require("./option");
 exports.isCI = process &&
     !!(process.env.CI ||
         process.env.CONTINUOUS_INTEGRATION ||
@@ -51,6 +57,23 @@ exports.isWindows = process &&
 exports.isVsCode = process.env.ZCATALYST_VSCODE === 'true';
 exports.isZCode = process.env.ZCODE === 'true';
 exports.isExtension = exports.isVsCode || exports.isZCode;
+function isCLIBin() {
+    var _a;
+    if (!((_a = require.main) === null || _a === void 0 ? void 0 : _a.filename)) {
+        return false;
+    }
+    const resolveComparablePath = (filePath) => {
+        try {
+            return (0, fs_1.realpathSync)(filePath);
+        }
+        catch (_a) {
+            return (0, path_1.resolve)(filePath);
+        }
+    };
+    const mainPath = resolveComparablePath(require.main.filename);
+    const cliBinPath = resolveComparablePath((0, path_1.resolve)(__dirname, '../bin/catalyst.js'));
+    return mainPath === cliBinPath;
+}
 function isPrimaryShell() {
     if (!process || process.env.CATALYST_SUB_PROCESS) {
         return false;
@@ -95,3 +118,21 @@ const getLocalAccessDomain = (port, protocol = 'http') => {
     return protocol === 'http' ? `http://localhost:${port}` : `ws://localhost:${port}`;
 };
 exports.getLocalAccessDomain = getLocalAccessDomain;
+function isNonInteractiveMode() {
+    return getNonInteractiveModeSource() !== undefined;
+}
+function getNonInteractiveModeSource() {
+    const env = process.env.ZCATALYST_NON_INTERACTIVE;
+    if (env === '1' || env === 'true' || env === 'yes') {
+        return 'env';
+    }
+    const flag = (0, option_1.getGlobalOptionValue)('nonInteractive', false);
+    if (flag === true || flag === 'true') {
+        return 'option';
+    }
+    const _globalFlag = process.argv.includes('--non-interactive') || process.argv.includes('-ni');
+    if (_globalFlag) {
+        return 'option';
+    }
+    return undefined;
+}

package/lib/util_modules/fs/lib/sync.d.ts

@@ -34,4 +34,5 @@ export declare function readJSONFile(pth: string, opts?: fs.ReadOptions & {
 }): Record<string, any> | undefined;
 export declare function writeJSONFile(pth: string, object: Record<string, unknown>, opts?: fs.WriteOptions): void;
 export declare function readPackageJson(): Record<string, unknown> | undefined;
+export declare function getStdinType(): 'tty' | 'pipe' | 'file' | 'other';
 export declare function isDirEmpty(pth: string): boolean;

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

@@ -32,6 +32,7 @@ exports.emptyDir = emptyDir;
 exports.readJSONFile = readJSONFile;
 exports.writeJSONFile = writeJSONFile;
 exports.readPackageJson = readPackageJson;
+exports.getStdinType = getStdinType;
 exports.isDirEmpty = isDirEmpty;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
@@ -199,6 +200,24 @@ function readPackageJson() {
     });
     return pkg;
 }
+function getStdinType() {
+    if (process.stdin.isTTY) {
+        return 'tty';
+    }
+    try {
+        const stdinStat = fs_extra_1.default.fstatSync(process.stdin.fd);
+        if (stdinStat.isFIFO()) {
+            return 'pipe';
+        }
+        if (stdinStat.isFile()) {
+            return 'file';
+        }
+        return 'other';
+    }
+    catch (error) {
+        return 'other';
+    }
+}
 function isDirEmpty(pth) {
     const files = fs_extra_1.default.readdirSync(pth);
     return files.length === 0;

package/lib/util_modules/logger/utils.d.ts

@@ -6,6 +6,7 @@ export declare const CHAR: {
     info: string;
     error: string;
 };
+export declare function shellCommand(cmd: string): string;
 export declare class TTYPassThrough extends PassThrough {
     columns: number;
     rows: number;

package/lib/util_modules/logger/utils.js

@@ -7,10 +7,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _a, _LogStreamFactory_logStream;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogStreamFactory = exports.TTYPassThrough = exports.CHAR = void 0;
+exports.shellCommand = shellCommand;
 const ansi_colors_1 = require("ansi-colors");
-const env_js_1 = require("../env.js");
 const readline_1 = require("readline");
 const stream_1 = require("stream");
+const env_js_1 = require("../env.js");
 const option_1 = require("../option");
 const isSupported = !env_js_1.isWindows || process.env.CI || process.env.TERM === 'xterm-256color';
 exports.CHAR = {
@@ -19,6 +20,9 @@ exports.CHAR = {
     info: isSupported ? ansi_colors_1.bold.cyan('ℹ') : ansi_colors_1.bold.cyan('i'),
     error: isSupported ? ansi_colors_1.bold.red('✖') : ansi_colors_1.bold.red('×')
 };
+function shellCommand(cmd) {
+    return `${(0, ansi_colors_1.dim)('>')} ${(0, ansi_colors_1.italic)(cmd)} `;
+}
 class TTYPassThrough extends stream_1.PassThrough {
     constructor() {
         super(...arguments);

package/lib/util_modules/option.d.ts

@@ -3,3 +3,4 @@ export declare function getOptionValue<T = string | boolean>(key: string, fallba
 export declare function setGlobalOption(key: string, value: unknown): void;
 export declare function getGlobalOptionValue<T>(key: string, fallback?: T): T | string;
 export declare function getUnknownOpts<T>(fallback?: T): T | Array<string>;
+export declare function unsetOption(optKey: string): void;

package/lib/util_modules/option.js

@@ -8,6 +8,7 @@ exports.getOptionValue = getOptionValue;
 exports.setGlobalOption = setGlobalOption;
 exports.getGlobalOptionValue = getGlobalOptionValue;
 exports.getUnknownOpts = getUnknownOpts;
+exports.unsetOption = unsetOption;
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 function getCurrentCommand(fallback) {
     return runtime_store_1.default.get('context.opts._name', fallback);
@@ -24,3 +25,10 @@ function getGlobalOptionValue(key, fallback) {
 function getUnknownOpts(fallback) {
     return runtime_store_1.default.get('context.opts.unknownOpts', fallback);
 }
+function unsetOption(optKey) {
+    const opts = runtime_store_1.default.get('context.opts', {});
+    if (opts[optKey] !== undefined) {
+        delete opts[optKey];
+        runtime_store_1.default.set('context.opts', opts);
+    }
+}

package/lib/util_modules/{server.js → server/index.js}

@@ -51,10 +51,10 @@ exports.getHostIP = getHostIP;
 exports.isPortListening = isPortListening;
 const http_proxy_1 = __importDefault(require("http-proxy"));
 const net_1 = require("net");
-const env_1 = require("./env");
 const child_process_1 = require("child_process");
-const logger_1 = require("./logger");
-const error_1 = __importDefault(require("../error"));
+const env_1 = require("../env");
+const logger_1 = require("../logger");
+const error_1 = __importDefault(require("../../error"));
 class ConnectionDestroyer {
     constructor(server) {
         this.server = server;

package/lib/util_modules/server/needed-scopes.d.ts

@@ -0,0 +1 @@
+export declare const SERVE_SCOPES: ("ZohoCatalyst.apigateway.apis.READ" | "ZohoCatalyst.apigateway.READ" | "ZohoCatalyst.segments.ALL" | "ZohoCatalyst.cache.READ" | "ZohoCatalyst.cache.CREATE" | "ZohoCatalyst.cache.DELETE" | "ZohoCatalyst.projects.ALL" | "ZohoCatalyst.cron.ALL" | "ZohoCatalyst.zcql.CREATE" | "ZohoCatalyst.projects.users.READ" | "ZohoCatalyst.projects.users.CREATE" | "ZohoCatalyst.projects.users.DELETE" | "ZohoCatalyst.projects.users.UPDATE" | "ZohoCatalyst.authentication.CREATE" | "ZohoCatalyst.email.CREATE" | "ZohoCatalyst.tables.ALL" | "ZohoCatalyst.tables.rows.ALL" | "ZohoCatalyst.tables.columns.ALL" | "ZohoCatalyst.tables.bulk.READ" | "ZohoCatalyst.tables.bulk.CREATE" | "ZohoCatalyst.nosql.READ" | "ZohoCatalyst.nosql.rows.ALL" | "ZohoCatalyst.folders.ALL" | "ZohoCatalyst.files.CREATE" | "ZohoCatalyst.files.READ" | "ZohoCatalyst.files.DELETE" | "ZohoCatalyst.functions.ALL" | "ZohoCatalyst.functions.EXECUTE" | "ZohoCatalyst.eventlistners.ALL" | "ZohoCatalyst.eventlisteners.produce" | "ZohoCatalyst.security.rules.Read" | "ZohoCatalyst.security.rules.Update" | "ZohoCatalyst.notifications.mobile" | "ZohoCatalyst.notifications.web" | "ZohoCatalyst.search.READ" | "ZohoCatalyst.mlkit.READ" | "QuickML.deployment.READ" | "ZohoCatalyst.pdfshot.execute" | "ZohoCatalyst.dataverse.execute" | "ZohoCatalyst.grid.READ" | "ZohoCatalyst.grid.terminate" | "ZohoCatalyst.circuits.execute" | "ZohoCatalyst.circuits.execution.READ" | "ZohoCatalyst.circuits.execution.DELETE" | "ZohoCatalyst.appsail.Read" | "ZohoCatalyst.jobpool.READ" | "ZohoCatalyst.job.ALL")[];

package/lib/util_modules/{constants/lib → server}/needed-scopes.js

@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const scopes_1 = __importDefault(require("../../../authentication/constants/scopes"));
-const login_1 = require("../../../authentication/login");
-const dc_1 = require("../../dc");
+exports.SERVE_SCOPES = void 0;
+const scopes_1 = __importDefault(require("../../authentication/constants/scopes"));
+const login_1 = require("../../authentication/login");
+const dc_1 = require("../dc");
 const serveScopes = [
     scopes_1.default.api_read,
     scopes_1.default.apig_read,
@@ -56,7 +57,6 @@ const serveScopes = [
     scopes_1.default.nosql_table,
     scopes_1.default.nosql_rows
 ];
-const _missingScope = ((_a = login_1.missingScopes[(0, dc_1.getActiveDC)()]) === null || _a === void 0 ? void 0 : _a.map((dvScope) => scopes_1.default[dvScope])) || [];
-exports.default = Object.freeze({
-    SERVE: serveScopes.filter((scope) => !_missingScope.includes(scope))
-});
+const dc = (0, dc_1.getActiveDC)({ throwError: false });
+const _missingScope = (dc && ((_a = login_1.missingScopes[dc]) === null || _a === void 0 ? void 0 : _a.map((dvScope) => scopes_1.default[dvScope]))) || [];
+exports.SERVE_SCOPES = serveScopes.filter((scope) => !_missingScope.includes(scope));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.26.2",
+	"version": "1.27.0",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -97,11 +97,12 @@
 		"build:watch": "gulp watch",
 		"clean": "gulp cleanup",
 		"test:unit": "jest --config jest.config.js",
+		"test:integration": "npm run build && jest --config jest.config.js --testPathPattern=test/integration --no-coverage",
 		"lint:nofix": "eslint --ext .ts src/ --color",
 		"lint:src": "eslint --ext .ts src/ --fix --color",
 		"lint:unit": "eslint --ext .js,.ts test/ --fix --color",
 		"lint": "run-p lint:src lint:unit",
-		"test": "run-s lint:unit test:unit",
+		"test": "run-s lint:unit test:unit test:integration",
 		"prepare": "npm run build",
 		"prepublishOnly": "npm test && npm run lint",
 		"preversion": "npm run lint",