@contentstack/cli-utilities 1.17.4 → 1.18.0

package/lib/contentstack-management-sdk.js

@@ -15,10 +15,16 @@ class ManagementSDKInitiator {
         this.analyticsInfo = context === null || context === void 0 ? void 0 : context.analyticsInfo;
     }
     async createAPIClient(config) {
-        // Get proxy configuration with priority: Environment variables > Global config
-        const proxyConfig = (0, proxy_helper_1.getProxyConfig)();
+        // Resolve host so NO_PROXY applies even when config.host is omitted (e.g. from region.cma)
+        const host = (0, proxy_helper_1.resolveRequestHost)(config);
+        // NO_PROXY has priority over HTTP_PROXY/HTTPS_PROXY and config-set proxy
+        const proxyConfig = (0, proxy_helper_1.getProxyConfigForHost)(host);
+        // When NO_PROXY matches, strip proxy env so SDK/axios cannot pick up HTTP_PROXY for this process.
+        if (host && (0, proxy_helper_1.shouldBypassProxy)(host)) {
+            (0, proxy_helper_1.clearProxyEnv)();
+        }
         const option = {
-            host: config.host,
+            host: config.host || host || undefined,
             maxContentLength: config.maxContentLength || 100000000,
             maxBodyLength: config.maxBodyLength || 1000000000,
             maxRequests: 10,
@@ -106,6 +112,10 @@ class ManagementSDKInitiator {
         if (proxyConfig) {
             option.proxy = proxyConfig;
         }
+        else if (host && (0, proxy_helper_1.shouldBypassProxy)(host)) {
+            option.proxy = false;
+        }
+        // When host is in NO_PROXY, do not add proxy to option at all
         if (config.endpoint) {
             option.endpoint = config.endpoint;
         }

package/lib/contentstack-marketplace-sdk.d.ts

@@ -1,6 +1,6 @@
-import { App, AppData } from '@contentstack/marketplace-sdk/types/marketplace/app';
+import type { App, AppData } from '@contentstack/marketplace-sdk/types/marketplace/app';
 import { ContentstackConfig, ContentstackClient, ContentstackToken } from '@contentstack/marketplace-sdk';
-import { Installation } from '@contentstack/marketplace-sdk/types/marketplace/installation';
+import type { Installation } from '@contentstack/marketplace-sdk/types/marketplace/installation';
 type ConfigType = Pick<ContentstackConfig, 'host' | 'endpoint' | 'retryDelay' | 'retryLimit'> & {
     skipTokenValidity?: string;
 };

package/lib/fs-utility/core.js

@@ -337,11 +337,9 @@ class FsUtility {
             this.pageInfo.after = index || 0;
             this.pageInfo.before = 1;
         }
-        /* eslint-disable unicorn/consistent-destructuring */
         if (!(0, isEmpty_1.default)(this.readIndexer[this.pageInfo.after + 1])) {
             this.pageInfo.hasNextPage = true;
         }
-        /* eslint-disable unicorn/consistent-destructuring */
         if (!(0, isEmpty_1.default)(this.readIndexer[this.pageInfo.after - 1])) {
             this.pageInfo.hasPreviousPage = true;
         }

package/lib/http-client/client.js

@@ -7,6 +7,22 @@ const http_response_1 = require("./http-response");
 const config_handler_1 = tslib_1.__importDefault(require("../config-handler"));
 const auth_handler_1 = tslib_1.__importDefault(require("../auth-handler"));
 const proxy_helper_1 = require("../proxy-helper");
+/**
+ * Derive request host from baseURL or url for NO_PROXY checks.
+ */
+function getRequestHost(baseURL, url) {
+    const toTry = [baseURL, url].filter(Boolean);
+    for (const u of toTry) {
+        try {
+            const parsed = new URL(u.startsWith('http') ? u : `https://${u}`);
+            return parsed.hostname || undefined;
+        }
+        catch (_a) {
+            // ignore
+        }
+    }
+    return undefined;
+}
 class HttpClient {
     /**
      * Createa new pending HTTP request instance.
@@ -340,12 +356,16 @@ class HttpClient {
                 this.headers({ 'x-header-ea': Object.values(earlyAccessHeaders).join(',') });
             }
         }
-        // Configure proxy if available (priority: request.proxy > getProxyConfig())
+        // Configure proxy if available. NO_PROXY has priority; fall back to region CMA for host resolution.
         if (!this.request.proxy) {
-            const proxyConfig = (0, proxy_helper_1.getProxyConfig)();
+            const host = getRequestHost(this.request.baseURL, url) || (0, proxy_helper_1.resolveRequestHost)({});
+            const proxyConfig = (0, proxy_helper_1.getProxyConfigForHost)(host);
             if (proxyConfig) {
                 this.request.proxy = proxyConfig;
             }
+            else if (host && (0, proxy_helper_1.shouldBypassProxy)(host)) {
+                this.request.proxy = false;
+            }
         }
         return await this.axiosInstance(Object.assign(Object.assign({ url,
             method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));

package/lib/http-client/http-response.d.ts

@@ -1,5 +1,5 @@
 import { AxiosResponse, AxiosResponseHeaders, RawAxiosResponseHeaders } from 'axios';
-export declare class HttpResponse<ResponseType = any> {
+export declare class HttpResponse<_ResponseType = any> {
     /**
      * The Axios response object.
      */

package/lib/index.d.ts

@@ -22,7 +22,7 @@ export * from './path-validator';
 export { default as CLITable, TableFlags, TableHeader, TableOptions, TableData } from './cli-table';
 export { App, AppData, Installation, marketplaceSDKClient, MarketplaceSDKInitiator, marketplaceSDKInitiator, ContentstackMarketplaceClient, ContentstackMarketplaceConfig, };
 export { Args, CommandHelp, Config, Errors, Flags, loadHelpClass, Help, HelpBase, HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable, Hook, Interfaces, Parser, Plugin, run, toStandardizedId, toConfiguredId, settings, Settings, flush, ux, execute, } from '@oclif/core';
-export { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/parser';
+export type { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/parser';
 export { default as TablePrompt } from './inquirer-table-prompt';
 export { Logger };
 export { default as authenticationHandler } from './authentication-handler';

package/lib/interfaces/index.d.ts

@@ -16,7 +16,7 @@ export interface InquirePayload {
     default?: any;
     message: string;
     choices?: Array<any>;
-    transformer?: Function;
+    transformer?: (value: any) => any;
     validate?(input: any, answers?: any): boolean | string | Promise<boolean | string>;
     selectAll?: boolean;
     pageSize?: number;

package/lib/logger/cli-error-handler.js

@@ -175,7 +175,7 @@ class CLIErrorHandler {
      */
     extractErrorPayload(error) {
         var _a, _b, _c, _d;
-        const { name, message, code, status, response, request, config, statusText } = error;
+        const { name, message: _message, code, status, response, request, config, statusText } = error;
         const payload = {
             name,
             message: this.extractClearMessage(error),

package/lib/logger/log.js

@@ -96,7 +96,7 @@ function getLogPath() {
         fs.accessSync(cwdPath, fs.constants.W_OK);
         return cwdPath;
     }
-    catch (error) {
+    catch (_a) {
         // If current directory is not writable, fall back to home directory
     }
     // 4. Fallback to home directory

package/lib/logger/session-path.js

@@ -43,7 +43,7 @@ function createSessionMetadataFile(sessionPath, metadata) {
     try {
         fs.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2), 'utf8');
     }
-    catch (error) {
+    catch (_a) {
         // Silently fail if metadata file cannot be created
         // Logging here would cause circular dependency
         // The session folder and logs will still be created

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. Priority order (per spec):
+ * 1. Global CLI config from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`
+ * 2. Environment variables (HTTPS_PROXY or HTTP_PROXY)
+ * 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;
+/**
+ * Hostname for NO_PROXY / proxy. Prefer `region.cma` when set so callers that pass a
+ * default SDK host (e.g. bulk-entries -> api.contentstack.io) still match rules like
+ * `.csnonprod.com` against the real API host (e.g. dev11-api.csnonprod.com).
+ */
+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,41 +1,95 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProxyUrl = exports.hasProxy = exports.getProxyConfig = void 0;
+exports.getProxyUrl = exports.hasProxy = exports.clearProxyEnv = exports.resolveRequestHost = exports.getProxyConfigForHost = exports.getProxyConfig = exports.shouldBypassProxy = exports.getNoProxyList = void 0;
 const tslib_1 = require("tslib");
 const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
 /**
- * Get proxy configuration with priority: Environment variables > Global config
- * @returns ProxyConfig object or undefined if no proxy is configured
+ * 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 getProxyConfig() {
-    // Priority 1: Check environment variables (HTTPS_PROXY or HTTP_PROXY)
-    const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
-    if (proxyUrl) {
+function getNoProxyList() {
+    const raw = process.env.NO_PROXY || process.env.no_proxy || '';
+    return raw
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+}
+exports.getNoProxyList = getNoProxyList;
+/**
+ * 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 url = new URL(proxyUrl);
-            const defaultPort = url.protocol === 'https:' ? 443 : 80;
-            const port = url.port ? Number.parseInt(url.port, 10) : defaultPort;
-            if (!Number.isNaN(port) && port >= 1 && port <= 65535) {
-                const protocol = url.protocol.replace(':', '');
-                const proxyConfig = {
-                    protocol: protocol,
-                    host: url.hostname,
-                    port: port,
-                };
-                if (url.username || url.password) {
-                    proxyConfig.auth = {
-                        username: url.username,
-                        password: url.password,
-                    };
-                }
-                return proxyConfig;
-            }
+            const u = new URL(h);
+            h = u.hostname;
         }
         catch (_a) {
-            // Invalid URL, continue to check global config
+            // 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);
         }
     }
-    // Priority 2: Check global config store
+    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;
+}
+exports.shouldBypassProxy = shouldBypassProxy;
+/**
+ * Get proxy configuration. Priority order (per spec):
+ * 1. Global CLI config from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`
+ * 2. Environment variables (HTTPS_PROXY or HTTP_PROXY)
+ * 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: Global config (csdx config:set:proxy)
     const globalProxyConfig = config_handler_1.default.get('proxy');
     if (globalProxyConfig) {
         if (typeof globalProxyConfig === 'object') {
@@ -65,14 +119,112 @@ function getProxyConfig() {
                     return proxyConfig;
                 }
             }
-            catch (_b) {
-                // Invalid URL, return undefined
+            catch (_a) {
+                // Invalid URL, continue to check environment
+            }
+        }
+    }
+    // Priority 2: Environment variables (HTTPS_PROXY or HTTP_PROXY)
+    const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+    if (proxyUrl) {
+        try {
+            const url = new URL(proxyUrl);
+            const defaultPort = url.protocol === 'https:' ? 443 : 80;
+            const port = url.port ? Number.parseInt(url.port, 10) : defaultPort;
+            if (!Number.isNaN(port) && port >= 1 && port <= 65535) {
+                const protocol = url.protocol.replace(':', '');
+                const proxyConfig = {
+                    protocol: protocol,
+                    host: url.hostname,
+                    port: port,
+                };
+                if (url.username || url.password) {
+                    proxyConfig.auth = {
+                        username: url.username,
+                        password: url.password,
+                    };
+                }
+                return proxyConfig;
             }
         }
+        catch (_b) {
+            // Invalid URL, return undefined
+        }
     }
     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();
+}
+exports.getProxyConfigForHost = getProxyConfigForHost;
+function regionCmaHostname() {
+    var _a;
+    const cma = (_a = config_handler_1.default.get('region')) === null || _a === void 0 ? void 0 : _a.cma;
+    if (!cma || typeof cma !== 'string') {
+        return '';
+    }
+    if (cma.startsWith('http')) {
+        try {
+            const u = new URL(cma);
+            return u.hostname || cma;
+        }
+        catch (_b) {
+            return cma;
+        }
+    }
+    return cma;
+}
+/**
+ * Hostname for NO_PROXY / proxy. Prefer `region.cma` when set so callers that pass a
+ * default SDK host (e.g. bulk-entries -> api.contentstack.io) still match rules like
+ * `.csnonprod.com` against the real API host (e.g. dev11-api.csnonprod.com).
+ */
+function resolveRequestHost(config) {
+    var _a;
+    const fromRegion = regionCmaHostname();
+    if (fromRegion) {
+        return normalizeHost(fromRegion) || fromRegion;
+    }
+    const raw = ((_a = config.host) === null || _a === void 0 ? void 0 : _a.trim()) || '';
+    if (!raw) {
+        return '';
+    }
+    return normalizeHost(raw) || raw;
+}
+exports.resolveRequestHost = resolveRequestHost;
+/**
+ * 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];
+        }
+    };
+}
+exports.clearProxyEnv = clearProxyEnv;
 /**
  * Check if proxy is configured (from any source)
  * @returns true if proxy is configured, false otherwise

package/package.json

@@ -1,21 +1,16 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.17.4",
+  "version": "1.18.0",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "prepack": "pnpm compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
-    "test:report": "tsc -p test && nyc --reporter=lcov --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "pretest": "tsc -p test",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "posttest": "npm run lint",
-    "lint": "eslint src/**/*.ts",
-    "format": "eslint src/**/*.ts --fix",
-    "test:unit": "mocha --forbid-only \"test/unit/**/*.test.ts\"",
-    "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
+    "test": "mocha \"test/unit/**/*.test.ts\"",
+    "lint": "eslint src/**/*.ts"
   },
   "repository": {
     "type": "git",
@@ -34,7 +29,7 @@
   "dependencies": {
     "@contentstack/management": "~1.27.5",
     "@contentstack/marketplace-sdk": "^1.5.0",
-    "@oclif/core": "^4.3.0",
+    "@oclif/core": "^4.8.3",
     "axios": "^1.13.5",
     "chalk": "^4.1.2",
     "cli-cursor": "^3.1.0",
@@ -62,6 +57,11 @@
     "winston": "^3.17.0",
     "xdg-basedir": "^4.0.0"
   },
+  "overrides": {
+    "@oclif/core": {
+      "picomatch": "^4.0.4"
+    }
+  },
   "devDependencies": {
     "@types/chai": "^4.3.20",
     "@types/inquirer": "^9.0.8",
@@ -81,4 +81,4 @@
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   }
-}
+}