zcatalyst-cli 1.25.3 → 1.26.0

package/lib/util_modules/config-store.d.ts

@@ -1,6 +1,6 @@
 export default class Store {
     private static _store;
-    static changeStore(store: 'cli' | 'vscode', path?: string): void;
+    static changeStore(store: 'cli' | 'vscode' | 'zcode', path?: string): void;
     private static get istore();
     static get path(): string | undefined;
     static get store(): Record<string, unknown>;

package/lib/util_modules/config-store.js

@@ -5,22 +5,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const conf_1 = __importDefault(require("conf"));
 const path_1 = require("path");
+const error_1 = __importDefault(require("../error"));
 const path = process.env['X_ZC_CREDENTIAL_PATH'];
 class Store {
     static changeStore(store, path) {
-        if (store === 'cli') {
-            Store._store = new conf_1.default({
-                configName: 'zcatalyst-cli',
-                projectName: 'zcatalyst-cli',
-                cwd: path
-            });
-            return;
+        switch (store) {
+            case 'cli': {
+                Store._store = new conf_1.default({
+                    configName: 'zcatalyst-cli',
+                    projectName: 'zcatalyst-cli',
+                    cwd: path
+                });
+                return;
+            }
+            case 'vscode': {
+                Store._store = new conf_1.default({
+                    configName: 'auth',
+                    projectName: 'zcatalyst-vscode',
+                    cwd: path ? (0, path_1.join)(path, 'zcatalyst-vscode') : undefined
+                });
+                return;
+            }
+            case 'zcode': {
+                Store._store = new conf_1.default({
+                    configName: 'auth',
+                    projectName: 'zcatalyst-zcode',
+                    cwd: path ? (0, path_1.join)(path, 'zcatalyst-code') : undefined
+                });
+                return;
+            }
+            default: {
+                throw new error_1.default('Invalid Store type: ' + store, { exit: 2 });
+            }
         }
-        Store._store = new conf_1.default({
-            configName: 'auth',
-            projectName: 'zcatalyst-vscode',
-            cwd: path ? (0, path_1.join)(path, 'zcatalyst-vscode') : undefined
-        });
     }
     static get istore() {
         return Store._store;
@@ -47,9 +64,9 @@ class Store {
         return Store.istore.has(key);
     }
 }
-exports.default = Store;
 Store._store = new conf_1.default({
     configName: 'zcatalyst-cli',
     projectName: 'zcatalyst-cli',
     cwd: path
 });
+exports.default = Store;

package/lib/util_modules/constants/lib/apig-rules.d.ts

@@ -1,3 +1,3 @@
 import { IAPIGRules } from '../../../apig-utils';
-declare const _default: IAPIGRules[];
+declare const _default: Array<IAPIGRules>;
 export default _default;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Object.freeze({
     us: {
-        loc: 'UnitedStates',
+        loc: 'United States',
         ref: 'us',
         value: 'com',
         w_auth: 'us',
@@ -42,7 +42,7 @@ exports.default = Object.freeze({
         ext: '.ca'
     },
     sa: {
-        loc: 'SaudiArabia',
+        loc: 'Saudi Arabia',
         ref: 'sa',
         value: 'sa',
         w_auth: 'us',
@@ -58,7 +58,7 @@ exports.default = Object.freeze({
         ext: '.jp'
     },
     uae: {
-        loc: 'UnitedArabEmirates',
+        loc: 'United Arab Emirates',
         ref: 'ae',
         value: 'ae',
         w_auth: 'us',

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

@@ -1,6 +1,6 @@
 declare const _default: Readonly<{
     client: {
-        port: string;
+        domain: string;
         package: {
             name: string;
         };

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Object.freeze({
     client: {
-        port: '{{_PORT_}}',
+        domain: '{{_DOMAIN_}}',
         package: {
             name: '{{_NAME_}}'
         }

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

@@ -35,20 +35,12 @@ class URL {
         return (0, env_js_1.envOverride)('CATALYST_CONSOLE_URL', mapDataCenterUrl(URL._consoleBase));
     }
     static get contacts() {
-        const dc = (0, dc_js_1.getActiveDCType)();
-        if (dc === undefined) {
-            return URL._contacts;
-        }
-        if (dc.value === dc_type_js_1.default.ca.value) {
-            return URL._contacts.replace('.zoho.com', '.zohocloud.ca');
-        }
-        return URL._contacts.replace('.com', dc.ext);
+        return (0, env_js_1.envOverride)('ZOHO_CONTACTS', mapDataCenterUrl(URL._contacts));
     }
     static get stratusSuffix() {
         return (0, env_js_1.envOverride)('CATALYST_STRATUS_RESOURCE_SUFFIX', mapDataCenterUrl(URL._stratusSuffixBase));
     }
 }
-exports.default = URL;
 URL._authBase = 'https://accounts.zoho.com';
 URL._portalBase = 'https://accounts.zohoportal.com';
 URL._adminBase = 'https://api.catalyst.zoho.com';
@@ -63,6 +55,7 @@ URL.external = Object.freeze({
     gitHubAPI: 'https://api.github.com',
     gitHubWeb: 'https://github.com'
 });
+exports.default = URL;
 function mapDataCenterUrl(url) {
     const dc = (0, dc_js_1.getActiveDCType)();
     if (dc === undefined) {

package/lib/util_modules/container.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -35,7 +45,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContainer = exports.isSocketAccessible = exports.showContainerUsagePrompt = void 0;
+exports.showContainerUsagePrompt = showContainerUsagePrompt;
+exports.isSocketAccessible = isSocketAccessible;
+exports.isContainer = isContainer;
 const ansi_colors_1 = require("ansi-colors");
 const logger_1 = require("./logger");
 const cli_table_1 = require("../cli_table");
@@ -45,8 +57,8 @@ const error_1 = __importDefault(require("@zcatalyst/container-plugin/out/error")
 const userConfig_1 = __importStar(require("../userConfig"));
 const error_2 = __importDefault(require("../error"));
 function showContainerUsagePrompt() {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const headerText = 'Attention Developer !!!';
         const padding = Math.round((process.stdout.columns - headerText.length) / 2) - 2;
         const fillLen = padding + headerText.length + padding - 2;
@@ -152,9 +164,8 @@ function showContainerUsagePrompt() {
         (0, logger_1.info)('\n' + table.toString());
     });
 }
-exports.showContainerUsagePrompt = showContainerUsagePrompt;
-function isSocketAccessible(throwErr = true) {
-    return __awaiter(this, void 0, void 0, function* () {
+function isSocketAccessible() {
+    return __awaiter(this, arguments, void 0, function* (throwErr = true) {
         if (!(yield (0, container_plugin_1.ping)(false))) {
             const error = new error_2.default('Docker socket not accessible', {
                 exit: 1,
@@ -169,8 +180,6 @@ function isSocketAccessible(throwErr = true) {
         return true;
     });
 }
-exports.isSocketAccessible = isSocketAccessible;
 function isContainer() {
     return false;
 }
-exports.isContainer = isContainer;

package/lib/util_modules/dc.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateActiveDC = exports.getActiveDCType = exports.getActiveDC = void 0;
+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"));
@@ -35,13 +37,10 @@ function getActiveDC(dcOption) {
     }
     return config_store_js_1.default.get('active_dc', dc_type_js_1.default.us.value);
 }
-exports.getActiveDC = getActiveDC;
 function getActiveDCType() {
     const activeDC = getActiveDC();
     return Object.values(dc_type_js_1.default).find((type) => type.value === activeDC);
 }
-exports.getActiveDCType = getActiveDCType;
 function updateActiveDC(dc) {
     config_store_js_1.default.set('active_dc', dc);
 }
-exports.updateActiveDC = updateActiveDC;

package/lib/util_modules/env.d.ts

@@ -2,6 +2,9 @@ export declare const isCI: boolean;
 export declare const isMac: boolean;
 export declare const isWindows: boolean;
 export declare const isVsCode: boolean;
+export declare const isZCode: boolean;
+export declare const isExtension: 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;

package/lib/util_modules/env.js

@@ -1,6 +1,42 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvVariable = exports.envOverride = exports.isPrimaryShell = exports.isVsCode = exports.isWindows = exports.isMac = exports.isCI = void 0;
+exports.getLocalAccessDomain = exports.isExtension = exports.isZCode = exports.isVsCode = exports.isWindows = exports.isMac = exports.isCI = void 0;
+exports.isPrimaryShell = isPrimaryShell;
+exports.envOverride = envOverride;
+exports.getEnvVariable = getEnvVariable;
 exports.isCI = process &&
     !!(process.env.CI ||
         process.env.CONTINUOUS_INTEGRATION ||
@@ -13,6 +49,8 @@ exports.isWindows = process &&
     (process.platform === 'win32' ||
         (process.env.OSTYPE !== undefined && /^(msys|cygwin)$/.test(process.env.OSTYPE)));
 exports.isVsCode = process.env.ZCATALYST_VSCODE === 'true';
+exports.isZCode = process.env.ZCODE === 'true';
+exports.isExtension = exports.isVsCode || exports.isZCode;
 function isPrimaryShell() {
     if (!process || process.env.CATALYST_SUB_PROCESS) {
         return false;
@@ -22,7 +60,6 @@ function isPrimaryShell() {
     }
     return true;
 }
-exports.isPrimaryShell = isPrimaryShell;
 function envOverride(envname, value) {
     var _a;
     if (process.env[envname] !== undefined && ((_a = process.env[envname]) === null || _a === void 0 ? void 0 : _a.length)) {
@@ -30,8 +67,31 @@ function envOverride(envname, value) {
     }
     return value;
 }
-exports.envOverride = envOverride;
 function getEnvVariable(variable, fallback) {
     return process.env[variable] || fallback;
 }
-exports.getEnvVariable = getEnvVariable;
+let zcode;
+if (exports.isZCode) {
+    const moduleName = 'zcode';
+    Promise.resolve(`${moduleName}`).then(s => __importStar(require(s))).then((_code) => {
+        zcode = _code;
+    })
+        .catch((er) => {
+        console.error('Unable to import ZCode: ', er);
+    });
+}
+const getLocalAccessDomain = (port, protocol = 'http') => {
+    var _a;
+    if (zcode) {
+        try {
+            const previewUrl = (_a = zcode.workspace) === null || _a === void 0 ? void 0 : _a.previewURL(port);
+            if (previewUrl)
+                return protocol === 'http' ? previewUrl : previewUrl.replace(/^http/, 'ws');
+        }
+        catch (er) {
+            console.error('Error getting previewURL from ZCode: ', er);
+        }
+    }
+    return protocol === 'http' ? `http://localhost:${port}` : `ws://localhost:${port}`;
+};
+exports.getLocalAccessDomain = getLocalAccessDomain;

package/lib/util_modules/event-emitter.d.ts

@@ -0,0 +1,9 @@
+import EventEmitter from 'events';
+export declare class CatalystEventEmitter extends EventEmitter {
+    private listenerMap;
+    on(event: string, listener: Parameters<EventEmitter['on']>[1]): this;
+    once(event: string, listener: Parameters<EventEmitter['once']>[1]): this;
+    removeListener(event: string, listener: Parameters<EventEmitter['on']>[1]): this;
+    off(event: string, listener: Parameters<EventEmitter['off']>[1]): this;
+    emit(...args: Parameters<EventEmitter['emit']>): boolean;
+}

package/lib/util_modules/event-emitter.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CatalystEventEmitter = void 0;
+const events_1 = __importDefault(require("events"));
+const error_1 = __importDefault(require("../error"));
+const logger_1 = require("./logger");
+class CatalystEventEmitter extends events_1.default {
+    constructor() {
+        super(...arguments);
+        this.listenerMap = new WeakMap();
+    }
+    on(event, listener) {
+        const wrappedListener = (...args) => {
+            try {
+                listener(...args);
+            }
+            catch (er) {
+                throw error_1.default.getErrorInstance(er, {
+                    message: 'Error when processing the <on> listener of ServerEvent: ' + event,
+                    skipHelp: true
+                });
+            }
+        };
+        this.listenerMap.set(listener, wrappedListener);
+        super.on(event, wrappedListener);
+        return this;
+    }
+    once(event, listener) {
+        const wrappedListener = (...args) => {
+            try {
+                listener(...args);
+            }
+            catch (er) {
+                throw error_1.default.getErrorInstance(er, {
+                    message: 'Error when processing the <once> listener of ServerEvent: ' + event,
+                    skipHelp: true
+                });
+            }
+            this.listenerMap.delete(listener);
+        };
+        this.listenerMap.set(listener, wrappedListener);
+        super.once(event, wrappedListener);
+        return this;
+    }
+    removeListener(event, listener) {
+        const wrappedListener = this.listenerMap.get(listener);
+        if (wrappedListener) {
+            super.removeListener(event, wrappedListener);
+            this.listenerMap.delete(listener);
+        }
+        return this;
+    }
+    off(event, listener) {
+        return this.removeListener(event, listener);
+    }
+    emit(...args) {
+        const [event] = args;
+        if (event === 'error' && this.listenerCount('error') === 0) {
+            (0, logger_1.debug)('Unable to emit "error" event as no listeners are attached');
+            return false;
+        }
+        return super.emit(...args);
+    }
+}
+exports.CatalystEventEmitter = CatalystEventEmitter;

package/lib/util_modules/fs/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ASYNC = exports.SYNC = void 0;
 const ASYNC = __importStar(require("./lib/async"));

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

@@ -1,7 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import fs, { CopyFilterAsync, Stats } from 'fs-extra';
 type OutputType = 'buffer' | 'utf8' | undefined;
 type OutputByType<T> = T extends 'buffer' ? Buffer : string;