@contentstack/cli-utilities 2.0.0-beta.2 → 2.0.0-beta.4

package/lib/progress-summary/summary-manager.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const chalk_1 = require("../chalk");
 class SummaryManager {
     constructor({ operationName, context }) {
         this.modules = new Map();
@@ -83,16 +82,16 @@ class SummaryManager {
         const totalItems = Array.from(this.modules.values()).reduce((sum, m) => sum + m.successCount + m.failureCount, 0);
         const totalSuccess = Array.from(this.modules.values()).reduce((sum, m) => sum + m.successCount, 0);
         const totalFailures = Array.from(this.modules.values()).reduce((sum, m) => sum + m.failureCount, 0);
-        console.log('\n' + chalk_1.default.bold('='.repeat(80)));
-        console.log(chalk_1.default.bold(`${this.operationName} SUMMARY`));
-        console.log('\n' + chalk_1.default.bold('Overall Statistics:'));
-        console.log(`  Total ${this.operationName} Time: ${chalk_1.default.cyan(this.formatDuration(totalDuration))}`);
-        console.log(`  Modules Processed: ${chalk_1.default.cyan(completedModules)}/${chalk_1.default.cyan(totalModules)}`);
-        console.log(`  Items Processed: ${chalk_1.default.green(totalSuccess)} success, ${chalk_1.default.red(totalFailures)} failed of ${chalk_1.default.cyan(totalItems)} total`);
-        console.log(`  Success Rate: ${chalk_1.default.cyan(this.calculateSuccessRate(totalSuccess, totalItems))}%`);
+        console.log('\n' + (0, chalk_1.getChalk)().bold('='.repeat(80)));
+        console.log((0, chalk_1.getChalk)().bold(`${this.operationName} SUMMARY`));
+        console.log('\n' + (0, chalk_1.getChalk)().bold('Overall Statistics:'));
+        console.log(`  Total ${this.operationName} Time: ${(0, chalk_1.getChalk)().cyan(this.formatDuration(totalDuration))}`);
+        console.log(`  Modules Processed: ${(0, chalk_1.getChalk)().cyan(completedModules)}/${(0, chalk_1.getChalk)().cyan(totalModules)}`);
+        console.log(`  Items Processed: ${(0, chalk_1.getChalk)().green(totalSuccess)} success, ${(0, chalk_1.getChalk)().red(totalFailures)} failed of ${(0, chalk_1.getChalk)().cyan(totalItems)} total`);
+        console.log(`  Success Rate: ${(0, chalk_1.getChalk)().cyan(this.calculateSuccessRate(totalSuccess, totalItems))}%`);
         // Module Details
-        console.log('\n' + chalk_1.default.bold('Module Details:'));
-        console.log(chalk_1.default.gray('-'.repeat(80)));
+        console.log('\n' + (0, chalk_1.getChalk)().bold('Module Details:'));
+        console.log((0, chalk_1.getChalk)().gray('-'.repeat(80)));
         Array.from(this.modules.values()).forEach((module) => {
             const status = this.getStatusIcon(module.status);
             const totalCount = module.successCount + module.failureCount;
@@ -104,18 +103,18 @@ class SummaryManager {
                 `${duration.padStart(8)}`);
         });
         // Final Status
-        console.log('\n' + chalk_1.default.bold('Final Status:'));
+        console.log('\n' + (0, chalk_1.getChalk)().bold('Final Status:'));
         if (!this.hasFailures() && failedModules === 0) {
-            console.log(chalk_1.default.bold.green(`✅ ${this.operationName} completed successfully!`));
+            console.log((0, chalk_1.getChalk)().bold.green(`✅ ${this.operationName} completed successfully!`));
         }
         else if (this.hasFailures() || failedModules > 0) {
-            console.log(chalk_1.default.bold.yellow(`⚠️ ${this.operationName} completed with failures, see the logs for more details.`));
+            console.log((0, chalk_1.getChalk)().bold.yellow(`⚠️ ${this.operationName} completed with failures, see the logs for more details.`));
         }
         else {
-            console.log(chalk_1.default.bold.red(`❌ ${this.operationName} failed`));
+            console.log((0, chalk_1.getChalk)().bold.red(`❌ ${this.operationName} failed`));
         }
-        console.log(chalk_1.default.bold('='.repeat(80)));
-        console.log(chalk_1.default.bold('='.repeat(80)));
+        console.log((0, chalk_1.getChalk)().bold('='.repeat(80)));
+        console.log((0, chalk_1.getChalk)().bold('='.repeat(80)));
         // Simple failure summary with log reference
         this.printFailureSummaryWithLogReference();
     }
@@ -130,35 +129,35 @@ class SummaryManager {
         if (modulesWithFailures.length === 0)
             return;
         const totalFailures = modulesWithFailures.reduce((sum, m) => sum + m.failures.length, 0);
-        console.log('\n' + chalk_1.default.bold.red('Failure Summary:'));
-        console.log(chalk_1.default.red('-'.repeat(50)));
+        console.log('\n' + (0, chalk_1.getChalk)().bold.red('Failure Summary:'));
+        console.log((0, chalk_1.getChalk)().red('-'.repeat(50)));
         modulesWithFailures.forEach((module) => {
-            console.log(`${chalk_1.default.bold.red('✗')} ${chalk_1.default.bold(module.name)}: ${chalk_1.default.red(module.failures.length)} failures`);
+            console.log(`${(0, chalk_1.getChalk)().bold.red('✗')} ${(0, chalk_1.getChalk)().bold(module.name)}: ${(0, chalk_1.getChalk)().red(module.failures.length)} failures`);
             // Show just first 2-3 failures briefly
             const preview = module.failures.slice(0, 2);
             preview.forEach((failure) => {
-                console.log(`    • ${chalk_1.default.gray(failure.item)}`);
+                console.log(`    • ${(0, chalk_1.getChalk)().gray(failure.item)}`);
             });
             if (module.failures.length > 2) {
-                console.log(`    ${chalk_1.default.gray(`... and ${module.failures.length - 2} more`)}`);
+                console.log(`    ${(0, chalk_1.getChalk)().gray(`... and ${module.failures.length - 2} more`)}`);
             }
         });
-        console.log(chalk_1.default.blue('\n📋 For detailed error information, check the log files:'));
-        //console.log(chalk.blue(`   ${getSessionLogPath()}`));
-        console.log(chalk_1.default.gray('   Recent errors are logged with full context and stack traces.'));
+        console.log((0, chalk_1.getChalk)().blue('\n📋 For detailed error information, check the log files:'));
+        //console.log(getChalk().blue(`   ${getSessionLogPath()}`));
+        console.log((0, chalk_1.getChalk)().gray('   Recent errors are logged with full context and stack traces.'));
     }
     getStatusIcon(status) {
         switch (status) {
             case 'completed':
-                return chalk_1.default.green('✓');
+                return (0, chalk_1.getChalk)().green('✓');
             case 'failed':
-                return chalk_1.default.red('✗');
+                return (0, chalk_1.getChalk)().red('✗');
             case 'running':
-                return chalk_1.default.yellow('●');
+                return (0, chalk_1.getChalk)().yellow('●');
             case 'pending':
-                return chalk_1.default.gray('○');
+                return (0, chalk_1.getChalk)().gray('○');
             default:
-                return chalk_1.default.gray('?');
+                return (0, chalk_1.getChalk)().gray('?');
         }
     }
     formatDuration(ms) {

package/lib/proxy-helper.d.ts

@@ -8,10 +8,51 @@ export interface ProxyConfig {
     };
 }
 /**
- * Get proxy configuration with priority: Environment variables > Global config
+ * Parse NO_PROXY / no_proxy env (both uppercase and lowercase).
+ * NO_PROXY has priority over HTTP_PROXY/HTTPS_PROXY: hosts in this list never use the proxy.
+ * Values are hostnames only, comma-separated; leading dot matches subdomains (e.g. .contentstack.io).
+ * The bypass list is fully dynamic: only env values are used (no hardcoded default).
+ * @returns List of trimmed entries, or empty array when NO_PROXY/no_proxy is unset
+ */
+export declare function getNoProxyList(): string[];
+/**
+ * Check if the given host should bypass the proxy based on NO_PROXY / no_proxy.
+ * Supports: exact host, leading-dot subdomain match (e.g. .contentstack.io), and wildcard *.
+ * @param host - Request hostname (with or without port; will be normalized)
+ * @returns true if proxy should not be used for this host
+ */
+export declare function shouldBypassProxy(host: string): boolean;
+/**
+ * Get proxy configuration. Sources (in order): env (HTTP_PROXY/HTTPS_PROXY), then global config
+ * from `csdx config:set:proxy --host --port --protocol `.
+ * For per-request use, prefer getProxyConfigForHost(host) so NO_PROXY overrides both sources.
  * @returns ProxyConfig object or undefined if no proxy is configured
  */
 export declare function getProxyConfig(): ProxyConfig | undefined;
+/**
+ * Get proxy config only when the request host is not in NO_PROXY.
+ * NO_PROXY has priority over both HTTP_PROXY/HTTPS_PROXY and over proxy set via
+ * `csdx config:set:proxy` — if the host matches NO_PROXY, no proxy is used.
+ * Use this for all outbound requests so Contentstack and localhost bypass the proxy when set.
+ * @param host - Request hostname (e.g. api.contentstack.io or full URL like https://api.contentstack.io)
+ * @returns ProxyConfig or undefined if proxy is disabled or host should bypass (NO_PROXY)
+ */
+export declare function getProxyConfigForHost(host: string): ProxyConfig | undefined;
+/**
+ * Resolve request host for proxy/NO_PROXY checks: config.host or default CMA from region.
+ * Use when the caller may omit host so NO_PROXY still applies (e.g. from region.cma).
+ * @param config - Object with optional host (e.g. API client config)
+ * @returns Host string (hostname or empty)
+ */
+export declare function resolveRequestHost(config: {
+    host?: string;
+}): string;
+/**
+ * Temporarily clear proxy-related env vars so SDK/axios cannot use them.
+ * Call the returned function to restore. Use when creating a client for a host in NO_PROXY.
+ * @returns Restore function (call to put env back)
+ */
+export declare function clearProxyEnv(): () => void;
 /**
  * Check if proxy is configured (from any source)
  * @returns true if proxy is configured, false otherwise

package/lib/proxy-helper.js

@@ -1,14 +1,99 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProxyUrl = exports.hasProxy = exports.getProxyConfig = void 0;
+exports.getNoProxyList = getNoProxyList;
+exports.shouldBypassProxy = shouldBypassProxy;
+exports.getProxyConfig = getProxyConfig;
+exports.getProxyConfigForHost = getProxyConfigForHost;
+exports.resolveRequestHost = resolveRequestHost;
+exports.clearProxyEnv = clearProxyEnv;
+exports.hasProxy = hasProxy;
+exports.getProxyUrl = getProxyUrl;
 const tslib_1 = require("tslib");
 const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
 /**
- * Get proxy configuration with priority: Environment variables > Global config
+ * Parse NO_PROXY / no_proxy env (both uppercase and lowercase).
+ * NO_PROXY has priority over HTTP_PROXY/HTTPS_PROXY: hosts in this list never use the proxy.
+ * Values are hostnames only, comma-separated; leading dot matches subdomains (e.g. .contentstack.io).
+ * The bypass list is fully dynamic: only env values are used (no hardcoded default).
+ * @returns List of trimmed entries, or empty array when NO_PROXY/no_proxy is unset
+ */
+function getNoProxyList() {
+    const raw = process.env.NO_PROXY || process.env.no_proxy || '';
+    return raw
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+}
+/**
+ * Normalize host for NO_PROXY matching: strip protocol/URL, port, lowercase, handle IPv6 brackets.
+ * Accepts hostname, host:port, or full URL (e.g. https://api.contentstack.io).
+ */
+function normalizeHost(host) {
+    if (!host || typeof host !== 'string')
+        return '';
+    let h = host.trim().toLowerCase();
+    // If it looks like a URL, extract hostname so NO_PROXY matching works (e.g. region.cma is full URL)
+    if (h.includes('://')) {
+        try {
+            const u = new URL(h);
+            h = u.hostname;
+        }
+        catch (_a) {
+            // fall through to port stripping below
+        }
+    }
+    const portIdx = h.lastIndexOf(':');
+    if (h.startsWith('[')) {
+        const close = h.indexOf(']');
+        if (close !== -1 && h.length > close + 1 && h[close + 1] === ':') {
+            h = h.slice(1, close);
+        }
+    }
+    else if (portIdx !== -1) {
+        const after = h.slice(portIdx + 1);
+        if (/^\d+$/.test(after)) {
+            h = h.slice(0, portIdx);
+        }
+    }
+    return h;
+}
+/**
+ * Check if the given host should bypass the proxy based on NO_PROXY / no_proxy.
+ * Supports: exact host, leading-dot subdomain match (e.g. .contentstack.io), and wildcard *.
+ * @param host - Request hostname (with or without port; will be normalized)
+ * @returns true if proxy should not be used for this host
+ */
+function shouldBypassProxy(host) {
+    const normalized = normalizeHost(host);
+    if (!normalized)
+        return false;
+    const list = getNoProxyList();
+    for (const entry of list) {
+        const e = entry.trim().toLowerCase();
+        if (!e)
+            continue;
+        if (e === '*')
+            return true;
+        if (e.startsWith('.')) {
+            const domain = e.slice(1);
+            if (normalized === domain || normalized.endsWith(e))
+                return true;
+        }
+        else {
+            if (normalized === e)
+                return true;
+        }
+    }
+    return false;
+}
+/**
+ * Get proxy configuration. Sources (in order): env (HTTP_PROXY/HTTPS_PROXY), then global config
+ * from `csdx config:set:proxy --host --port --protocol `.
+ * For per-request use, prefer getProxyConfigForHost(host) so NO_PROXY overrides both sources.
  * @returns ProxyConfig object or undefined if no proxy is configured
  */
 function getProxyConfig() {
-    // Priority 1: Check environment variables (HTTPS_PROXY or HTTP_PROXY)
+    // Priority 1: Environment variables (HTTPS_PROXY or HTTP_PROXY)
     const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
     if (proxyUrl) {
         try {
@@ -35,7 +120,7 @@ function getProxyConfig() {
             // Invalid URL, continue to check global config
         }
     }
-    // Priority 2: Check global config store
+    // Priority 2: Global config (csdx config:set:proxy)
     const globalProxyConfig = config_handler_1.default.get('proxy');
     if (globalProxyConfig) {
         if (typeof globalProxyConfig === 'object') {
@@ -72,7 +157,65 @@ function getProxyConfig() {
     }
     return undefined;
 }
-exports.getProxyConfig = getProxyConfig;
+/**
+ * Get proxy config only when the request host is not in NO_PROXY.
+ * NO_PROXY has priority over both HTTP_PROXY/HTTPS_PROXY and over proxy set via
+ * `csdx config:set:proxy` — if the host matches NO_PROXY, no proxy is used.
+ * Use this for all outbound requests so Contentstack and localhost bypass the proxy when set.
+ * @param host - Request hostname (e.g. api.contentstack.io or full URL like https://api.contentstack.io)
+ * @returns ProxyConfig or undefined if proxy is disabled or host should bypass (NO_PROXY)
+ */
+function getProxyConfigForHost(host) {
+    if (shouldBypassProxy(host))
+        return undefined;
+    return getProxyConfig();
+}
+/**
+ * Resolve request host for proxy/NO_PROXY checks: config.host or default CMA from region.
+ * Use when the caller may omit host so NO_PROXY still applies (e.g. from region.cma).
+ * @param config - Object with optional host (e.g. API client config)
+ * @returns Host string (hostname or empty)
+ */
+function resolveRequestHost(config) {
+    var _a;
+    if (config.host)
+        return config.host;
+    const cma = (_a = config_handler_1.default.get('region')) === null || _a === void 0 ? void 0 : _a.cma;
+    if (cma && typeof cma === 'string') {
+        if (cma.startsWith('http')) {
+            try {
+                const u = new URL(cma);
+                return u.hostname || cma;
+            }
+            catch (_b) {
+                return cma;
+            }
+        }
+        return cma;
+    }
+    return '';
+}
+/**
+ * Temporarily clear proxy-related env vars so SDK/axios cannot use them.
+ * Call the returned function to restore. Use when creating a client for a host in NO_PROXY.
+ * @returns Restore function (call to put env back)
+ */
+function clearProxyEnv() {
+    const saved = {};
+    const keys = ['HTTP_PROXY', 'HTTPS_PROXY', 'http_proxy', 'https_proxy', 'ALL_PROXY', 'all_proxy'];
+    for (const k of keys) {
+        if (k in process.env) {
+            saved[k] = process.env[k];
+            delete process.env[k];
+        }
+    }
+    return () => {
+        for (const k of keys) {
+            if (saved[k] !== undefined)
+                process.env[k] = saved[k];
+        }
+    };
+}
 /**
  * Check if proxy is configured (from any source)
  * @returns true if proxy is configured, false otherwise
@@ -80,7 +223,6 @@ exports.getProxyConfig = getProxyConfig;
 function hasProxy() {
     return !!getProxyConfig() || !!process.env.HTTPS_PROXY || !!process.env.HTTP_PROXY || !!config_handler_1.default.get('proxy');
 }
-exports.hasProxy = hasProxy;
 /**
  * Get proxy URL string for display purposes
  * @returns Proxy URL string or 'proxy server' if not available
@@ -100,4 +242,3 @@ function getProxyUrl() {
     }
     return 'proxy server';
 }
-exports.getProxyUrl = getProxyUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,14 +37,14 @@
     "@contentstack/marketplace-sdk": "^1.5.0",
     "@oclif/core": "^4.3.0",
     "axios": "^1.13.5",
-    "chalk": "^4.1.2",
+    "chalk": "^5.6.2",
     "cli-cursor": "^3.1.0",
     "cli-progress": "^3.12.0",
     "cli-table": "^0.3.11",
     "conf": "^10.2.0",
     "dotenv": "^16.6.1",
     "figures": "^3.2.0",
-    "inquirer": "8.2.7",
+    "inquirer": "12.11.1",
     "inquirer-search-checkbox": "^1.0.0",
     "inquirer-search-list": "^1.2.6",
     "js-yaml": "^4.1.1",
@@ -68,7 +68,7 @@
     "@types/inquirer": "^9.0.8",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^14.18.63",
+    "@types/node": "^18.11.9",
     "@types/sinon": "^21.0.0",
     "@types/traverse": "^0.6.37",
     "chai": "^4.5.0",
@@ -80,6 +80,6 @@
     "nyc": "^15.1.0",
     "sinon": "^21.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.0"
   }
-}
+}