@contentstack/cli-utilities 2.0.0-beta.5 → 2.0.0-beta.7

package/lib/contentstack-management-sdk.js

@@ -19,12 +19,12 @@ class ManagementSDKInitiator {
         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 bypassing, clear proxy env immediately so SDK never see it (they may read at init or first request).
-        if (!proxyConfig) {
+        // 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,
@@ -112,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

@@ -12,13 +12,13 @@ const proxy_helper_1 = require("../proxy-helper");
  */
 function getRequestHost(baseURL, url) {
     const toTry = [baseURL, url].filter(Boolean);
-    for (const candidateUrl of toTry) {
+    for (const u of toTry) {
         try {
-            const parsed = new URL(candidateUrl.startsWith('http') ? candidateUrl : `https://${candidateUrl}`);
+            const parsed = new URL(u.startsWith('http') ? u : `https://${u}`);
             return parsed.hostname || undefined;
         }
         catch (_a) {
-            // Invalid URL; try next candidate (baseURL or url)
+            // ignore
         }
     }
     return undefined;
@@ -356,13 +356,16 @@ class HttpClient {
                 this.headers({ 'x-header-ea': Object.values(earlyAccessHeaders).join(',') });
             }
         }
-        // Configure proxy if available. NO_PROXY has priority: hosts in NO_PROXY never use proxy.
+        // Configure proxy if available. NO_PROXY has priority; fall back to region CMA for host resolution.
         if (!this.request.proxy) {
-            const host = getRequestHost(this.request.baseURL, url);
-            const proxyConfig = host ? (0, proxy_helper_1.getProxyConfigForHost)(host) : (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 { loadChalk, getChalk } from './chalk';
 export type { ChalkInstance } from './chalk';

package/lib/interfaces/index.d.ts

@@ -17,7 +17,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

@@ -174,7 +174,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

@@ -97,7 +97,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

@@ -44,7 +44,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/progress-summary/summary-manager.js

@@ -128,6 +128,7 @@ class SummaryManager {
         const modulesWithFailures = Array.from(this.modules.values()).filter((m) => m.failures.length > 0);
         if (modulesWithFailures.length === 0)
             return;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars -- kept for future session log path / totals UX
         const totalFailures = modulesWithFailures.reduce((sum, m) => sum + m.failures.length, 0);
         console.log('\n' + (0, chalk_1.getChalk)().bold.red('Failure Summary:'));
         console.log((0, chalk_1.getChalk)().red('-'.repeat(50)));

package/lib/proxy-helper.d.ts

@@ -23,8 +23,9 @@ export declare function getNoProxyList(): string[];
  */
 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 `.
+ * 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
  */
@@ -39,10 +40,9 @@ export declare function getProxyConfig(): ProxyConfig | undefined;
  */
 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)
+ * 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;

package/lib/proxy-helper.js

@@ -87,40 +87,14 @@ function shouldBypassProxy(host) {
     return false;
 }
 /**
- * Get proxy configuration. Sources (in order): env (HTTP_PROXY/HTTPS_PROXY), then global config
- * from `csdx config:set:proxy --host --port --protocol `.
+ * 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: 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 (_a) {
-            // Invalid URL, continue to check global config
-        }
-    }
-    // Priority 2: Global config (csdx config:set:proxy)
+    // Priority 1: Global config (csdx config:set:proxy)
     const globalProxyConfig = config_handler_1.default.get('proxy');
     if (globalProxyConfig) {
         if (typeof globalProxyConfig === 'object') {
@@ -150,11 +124,38 @@ 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;
 }
 /**
@@ -170,30 +171,39 @@ function getProxyConfigForHost(host) {
         return undefined;
     return getProxyConfig();
 }
+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;
+}
 /**
- * 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)
+ * 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;
-    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;
+    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 '';
+    return normalizeHost(raw) || raw;
 }
 /**
  * Temporarily clear proxy-related env vars so SDK/axios cannot use them.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -9,14 +9,8 @@
     "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",
@@ -33,10 +27,10 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.29.1",
-    "@contentstack/marketplace-sdk": "^1.5.0",
-    "@oclif/core": "^4.3.0",
-    "axios": "^1.13.5",
+    "@contentstack/management": "~1.30.1",
+    "@contentstack/marketplace-sdk": "^1.5.1",
+    "@oclif/core": "^4.10.5",
+    "axios": "^1.15.0",
     "chalk": "^5.6.2",
     "cli-cursor": "^3.1.0",
     "cli-progress": "^3.12.0",
@@ -49,37 +43,42 @@
     "inquirer-search-list": "^1.2.6",
     "js-yaml": "^4.1.1",
     "klona": "^2.0.6",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "mkdirp": "^1.0.4",
     "open": "^8.4.2",
     "ora": "^5.4.1",
     "papaparse": "^5.5.3",
-    "recheck": "~4.4.5",
+    "recheck": "~4.5.0",
     "rxjs": "^6.6.7",
     "traverse": "^0.6.11",
     "tty-table": "^4.2.3",
     "unique-string": "^2.0.0",
     "uuid": "^9.0.1",
-    "winston": "^3.17.0",
+    "winston": "^3.19.0",
     "xdg-basedir": "^4.0.0"
   },
+  "overrides": {
+    "@oclif/core": {
+      "picomatch": "^4.0.4"
+    }
+  },
   "devDependencies": {
     "@types/chai": "^4.3.20",
-    "@types/inquirer": "^9.0.8",
+    "@types/inquirer": "^9.0.9",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.19.130",
     "@types/sinon": "^21.0.0",
     "@types/traverse": "^0.6.37",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.62",
+    "eslint-config-oclif": "^6.0.157",
     "eslint-config-oclif-typescript": "^3.1.14",
     "fancy-test": "^2.0.42",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
-    "sinon": "^21.0.1",
+    "sinon": "^21.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.0.0"
+    "typescript": "^5.9.3"
   }
 }