@contentstack/cli-config 1.18.0 → 2.0.0-beta

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-config/1.18.0 linux-x64 node-v22.22.0
+@contentstack/cli-config/2.0.0-beta linux-x64 node-v22.22.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -456,18 +456,18 @@ Set region for CLI
 
 ```
 USAGE
-  $ csdx config:set:region [REGION] [-d <value> -m <value> --ui-host <value> -n <value>] [--developer-hub <value>]
-    [--personalize <value>] [--launch <value>] [--studio <value>]
+  $ csdx config:set:region [REGION] [--cda <value> --cma <value> --ui-host <value> -n <value>] [--developer-hub
+    <value>] [--personalize <value>] [--launch <value>] [--studio <value>]
 
 ARGUMENTS
   [REGION]  Name for the region
 
 FLAGS
-  -d, --cda=<value>            Custom host to set for content delivery API, if this flag is added then cma, ui-host and
+  -n, --name=<value>           Name for the region, if this flag is added then cda, cma and ui-host flags are required
+      --cda=<value>            Custom host to set for content delivery API, if this flag is added then cma, ui-host and
                                name flags are required
-  -m, --cma=<value>            Custom host to set for content management API, , if this flag is added then cda, ui-host
+      --cma=<value>            Custom host to set for content management API, , if this flag is added then cda, ui-host
                                and name flags are required
-  -n, --name=<value>           Name for the region, if this flag is added then cda, cma and ui-host flags are required
       --developer-hub=<value>  Custom host to set for Developer hub API
       --launch=<value>         Custom host to set for Launch API
       --personalize=<value>    Custom host to set for Personalize API

package/lib/commands/config/get/early-access-header.js

@@ -5,9 +5,9 @@ const cli_command_1 = require("@contentstack/cli-command");
 class GetEarlyAccessHeaderCommand extends cli_command_1.Command {
     async run() {
         try {
-            let config = cli_utilities_1.configHandler.get(`earlyAccessHeaders`);
+            const config = cli_utilities_1.configHandler.get(`earlyAccessHeaders`);
             if (config && Object.keys(config).length > 0) {
-                let tableData = Object.keys(config).map((key) => ({
+                const tableData = Object.keys(config).map((key) => ({
                     ['Alias']: key,
                     ['Early access header']: config[key],
                 }));

package/lib/commands/config/set/log.js

@@ -22,7 +22,7 @@ class LogSetCommand extends cli_command_1.Command {
                 currentLoggingConfig.path = resolvedPath;
             }
             if (flags['show-console-logs'] !== undefined) {
-                currentLoggingConfig['show-console-logs'] = flags['show-console-logs'];
+                currentLoggingConfig['showConsoleLogs'] = flags['show-console-logs'];
             }
             cli_utilities_1.configHandler.set('log', currentLoggingConfig);
             if (flags['level'] !== undefined) {
@@ -32,8 +32,9 @@ class LogSetCommand extends cli_command_1.Command {
                 cli_utilities_1.cliux.success(cli_utilities_1.messageHandler.parse('CLI_CONFIG_LOG_PATH_SET', currentLoggingConfig.path));
             }
             if (flags['show-console-logs'] !== undefined) {
-                cli_utilities_1.cliux.success(cli_utilities_1.messageHandler.parse('CLI_CONFIG_LOG_CONSOLE_SET', String(currentLoggingConfig['show-console-logs'])));
+                cli_utilities_1.cliux.success(cli_utilities_1.messageHandler.parse('CLI_CONFIG_LOG_CONSOLE_SET', String(currentLoggingConfig['showConsoleLogs'])));
             }
+            cli_utilities_1.cliux.success(cli_utilities_1.messageHandler.parse('CLI_CONFIG_LOG_SET_SUCCESS'));
         }
         catch (error) {
             (0, cli_utilities_1.handleAndLogError)(error, { module: 'config-set-log' });

package/lib/commands/config/set/rate-limit.js

@@ -25,11 +25,13 @@ class SetRateLimitCommand extends base_command_1.BaseCommand {
             const utilizeValues = (_a = utilize === null || utilize === void 0 ? void 0 : utilize.split(',')) === null || _a === void 0 ? void 0 : _a.map((u) => Number(u.trim()));
             if (utilizeValues.some((u) => isNaN(u) || u < 0 || u > 100)) {
                 cli_utilities_1.cliux.error('Utilization percentages must be numbers between 0 and 100.');
-                return;
+                this.exit(1);
+                return; // Unreachable in production, but needed when exit is stubbed in tests
             }
             if ((limitName === null || limitName === void 0 ? void 0 : limitName.length) > 0 && ((_c = (_b = limitName[0]) === null || _b === void 0 ? void 0 : _b.split(',')) === null || _c === void 0 ? void 0 : _c.length) !== utilizeValues.length) {
                 cli_utilities_1.cliux.error('The number of utilization percentages must match the number of limit names.');
-                return;
+                this.exit(1);
+                return; // Unreachable in production, but needed when exit is stubbed in tests
             }
             else {
                 config.utilize = utilize.split(',').map((v) => v.trim());
@@ -39,7 +41,8 @@ class SetRateLimitCommand extends base_command_1.BaseCommand {
             const invalidLimitNames = limitName[0].split(',').map((name) => name.trim());
             if (invalidLimitNames.some((name) => !common_utilities_1.limitNamesConfig.includes(name))) {
                 cli_utilities_1.cliux.error(`Invalid limit names provided: ${invalidLimitNames.join(', ')}`);
-                return;
+                this.exit(1);
+                return; // Unreachable in production, but needed when exit is stubbed in tests
             }
             else {
                 config['limit-name'] = limitName[0].split(',').map((n) => n.trim());

package/lib/commands/config/set/region.js

@@ -98,16 +98,12 @@ exports.default = RegionSetCommand;
 RegionSetCommand.description = 'Set region for CLI';
 RegionSetCommand.flags = {
     cda: cli_utilities_1.flags.string({
-        char: 'd',
         description: 'Custom host to set for content delivery API, if this flag is added then cma, ui-host and name flags are required',
         dependsOn: ['cma', 'ui-host', 'name'],
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-d'], ['--cda']),
     }),
     cma: cli_utilities_1.flags.string({
-        char: 'm',
         description: 'Custom host to set for content management API, , if this flag is added then cda, ui-host and name flags are required',
         dependsOn: ['cda', 'ui-host', 'name'],
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-m'], ['--cma']),
     }),
     'ui-host': cli_utilities_1.flags.string({
         description: 'Custom UI host to set for CLI, if this flag is added then cda, cma and name flags are required',

package/lib/interfaces/index.d.ts

@@ -34,3 +34,6 @@ export interface SetRateLimitConfig {
     default?: boolean;
     host?: string;
 }
+export interface RegionsMap {
+    [key: string]: Region;
+}

package/lib/utils/log-config-defaults.js

@@ -28,7 +28,7 @@ function getEffectiveLogConfig(currentConfig = {}) {
     var _a;
     const logLevel = (currentConfig === null || currentConfig === void 0 ? void 0 : currentConfig.level) || exports.LOG_CONFIG_DEFAULTS.LEVEL;
     const logPath = resolveLogPath((currentConfig === null || currentConfig === void 0 ? void 0 : currentConfig.path) || exports.LOG_CONFIG_DEFAULTS.PATH);
-    const showConsoleLogs = (_a = currentConfig === null || currentConfig === void 0 ? void 0 : currentConfig['show-console-logs']) !== null && _a !== void 0 ? _a : exports.LOG_CONFIG_DEFAULTS.SHOW_CONSOLE_LOGS;
+    const showConsoleLogs = (_a = currentConfig === null || currentConfig === void 0 ? void 0 : currentConfig['showConsoleLogs']) !== null && _a !== void 0 ? _a : exports.LOG_CONFIG_DEFAULTS.SHOW_CONSOLE_LOGS;
     return {
         level: logLevel,
         path: logPath,

package/lib/utils/rate-limit-handler.js

@@ -10,7 +10,7 @@ class RateLimitHandler {
     }
     async setRateLimit(config) {
         var _a;
-        const rateLimit = cli_utilities_1.configHandler.get('rateLimit');
+        const rateLimit = cli_utilities_1.configHandler.get('rateLimit') || {};
         rateLimit.default = Object.assign({}, common_utilities_1.defaultRalteLimitConfig);
         if (config.default) {
             rateLimit[config.org] = Object.assign({}, rateLimit.default);
@@ -62,7 +62,10 @@ class RateLimitHandler {
             });
         }
         catch (error) {
-            throw new Error(error);
+            if (error instanceof Error) {
+                throw new Error(`Error: ${error.message}`);
+            }
+            throw new Error(String(error));
         }
     }
 }

package/lib/utils/region-handler.d.ts

@@ -1,105 +1,5 @@
-declare const regions: {
-    NA: {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'AWS-NA': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    EU: {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'AWS-EU': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    AU: {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'AWS-AU': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'AZURE-NA': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'AZURE-EU': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'GCP-NA': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-    'GCP-EU': {
-        name: string;
-        cma: string;
-        cda: string;
-        uiHost: string;
-        developerHubUrl: string;
-        launchHubUrl: string;
-        personalizeUrl: string;
-        composableStudioUrl: string;
-    };
-};
+import { Region, RegionsMap } from '../interfaces';
+declare const regions: RegionsMap;
 declare class UserConfig {
     /**
      *
@@ -107,7 +7,7 @@ declare class UserConfig {
      * @param {string} region It Can be AWS-NA, AWS-EU, AWS-AU, AZURE-NA, AZURE-EU, GCP-NA, GCP-EU
      * @returns {object} region object with cma, cda, region property
      */
-    setRegion(region: any): any;
+    setRegion(region: any): Region;
     /**
      *
      * Get current host set for CLI

package/lib/utils/region-handler.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.regions = void 0;
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_1 = require("@contentstack/utils");
 function validURL(str) {
     const pattern = new RegExp('^(https?:\\/\\/)?' + // protocol (http or https)
         '([a-zA-Z0-9.-]+|' + // domain name
@@ -13,109 +14,61 @@ function validURL(str) {
     'i');
     return pattern.test(str);
 }
-// Available region list
-const regions = {
-    NA: {
-        name: 'NA',
-        cma: 'https://api.contentstack.io',
-        cda: 'https://cdn.contentstack.io',
-        uiHost: 'https://app.contentstack.com',
-        developerHubUrl: 'https://developerhub-api.contentstack.com',
-        launchHubUrl: 'https://launch-api.contentstack.com',
-        personalizeUrl: 'https://personalize-api.contentstack.com',
-        composableStudioUrl: 'https://composable-studio-api.contentstack.com',
-    },
-    'AWS-NA': {
-        name: 'AWS-NA',
-        cma: 'https://api.contentstack.io',
-        cda: 'https://cdn.contentstack.io',
-        uiHost: 'https://app.contentstack.com',
-        developerHubUrl: 'https://developerhub-api.contentstack.com',
-        launchHubUrl: 'https://launch-api.contentstack.com',
-        personalizeUrl: 'https://personalize-api.contentstack.com',
-        composableStudioUrl: 'https://composable-studio-api.contentstack.com',
-    },
-    EU: {
-        name: 'EU',
-        cma: 'https://eu-api.contentstack.com',
-        cda: 'https://eu-cdn.contentstack.com',
-        uiHost: 'https://eu-app.contentstack.com',
-        developerHubUrl: 'https://eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://eu-composable-studio-api.contentstack.com',
-    },
-    'AWS-EU': {
-        name: 'AWS-EU',
-        cma: 'https://eu-api.contentstack.com',
-        cda: 'https://eu-cdn.contentstack.com',
-        uiHost: 'https://eu-app.contentstack.com',
-        developerHubUrl: 'https://eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://eu-composable-studio-api.contentstack.com',
-    },
-    AU: {
-        name: 'AU',
-        cma: 'https://au-api.contentstack.com',
-        cda: 'https://au-cdn.contentstack.com',
-        uiHost: 'https://au-app.contentstack.com',
-        developerHubUrl: 'https://au-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://au-launch-api.contentstack.com',
-        personalizeUrl: 'https://au-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://au-composable-studio-api.contentstack.com',
-    },
-    'AWS-AU': {
-        name: 'AWS-AU',
-        cma: 'https://au-api.contentstack.com',
-        cda: 'https://au-cdn.contentstack.com',
-        uiHost: 'https://au-app.contentstack.com',
-        developerHubUrl: 'https://au-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://au-launch-api.contentstack.com',
-        personalizeUrl: 'https://au-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://au-composable-studio-api.contentstack.com',
-    },
-    'AZURE-NA': {
-        name: 'AZURE-NA',
-        cma: 'https://azure-na-api.contentstack.com',
-        cda: 'https://azure-na-cdn.contentstack.com',
-        uiHost: 'https://azure-na-app.contentstack.com',
-        developerHubUrl: 'https://azure-na-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://azure-na-launch-api.contentstack.com',
-        personalizeUrl: 'https://azure-na-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://azure-na-composable-studio-api.contentstack.com',
-    },
-    'AZURE-EU': {
-        name: 'AZURE-EU',
-        cma: 'https://azure-eu-api.contentstack.com',
-        cda: 'https://azure-eu-cdn.contentstack.com',
-        uiHost: 'https://azure-eu-app.contentstack.com',
-        developerHubUrl: 'https://azure-eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://azure-eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://azure-eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://azure-eu-composable-studio-api.contentstack.com',
-    },
-    'GCP-NA': {
-        name: 'GCP-NA',
-        cma: 'https://gcp-na-api.contentstack.com',
-        cda: 'https://gcp-na-cdn.contentstack.com',
-        uiHost: 'https://gcp-na-app.contentstack.com',
-        developerHubUrl: 'https://gcp-na-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://gcp-na-launch-api.contentstack.com',
-        personalizeUrl: 'https://gcp-na-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://gcp-na-composable-studio-api.contentstack.com',
-    },
-    'GCP-EU': {
-        name: 'GCP-EU',
-        cma: 'https://gcp-eu-api.contentstack.com',
-        cda: 'https://gcp-eu-cdn.contentstack.com',
-        uiHost: 'https://gcp-eu-app.contentstack.com',
-        developerHubUrl: 'https://gcp-eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://gcp-eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://gcp-eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://gcp-eu-composable-studio-api.contentstack.com',
-    },
-};
+/**
+ * Helper function to build region object from @contentstack/utils
+ * @param {string} regionKey - Region identifier
+ * @returns {object} Region object with all necessary URLs
+ */
+function getRegionObject(regionKey) {
+    try {
+        // getContentstackEndpoint handles all aliases defined in regions.json
+        const endpoints = (0, utils_1.getContentstackEndpoint)(regionKey);
+        if (typeof endpoints === 'string') {
+            throw new Error('Invalid endpoint response');
+        }
+        return {
+            name: regionKey,
+            cma: endpoints.contentManagement,
+            cda: endpoints.contentDelivery,
+            uiHost: endpoints.application,
+            developerHubUrl: endpoints.developerHub,
+            launchHubUrl: endpoints.launch,
+            personalizeUrl: endpoints.personalizeManagement,
+            composableStudioUrl: endpoints.composableStudio,
+        };
+    }
+    catch (error) {
+        return null;
+    }
+}
+/**
+ * Get all available regions dynamically
+ * This creates a regions object similar to the old hardcoded one but using @contentstack/utils
+ */
+function getAvailableRegions() {
+    const regionKeys = [
+        'NA',
+        'AWS-NA',
+        'EU',
+        'AWS-EU',
+        'AU',
+        'AWS-AU',
+        'AZURE-NA',
+        'AZURE-EU',
+        'GCP-NA',
+        'GCP-EU',
+    ];
+    const regions = {};
+    for (const key of regionKeys) {
+        const regionObj = getRegionObject(key);
+        if (regionObj) {
+            regions[key] = regionObj;
+        }
+    }
+    return regions;
+}
+// Available region list - now dynamically generated
+const regions = getAvailableRegions();
 exports.regions = regions;
 class UserConfig {
     /**

package/oclif.manifest.json

@@ -571,7 +571,6 @@
       ],
       "flags": {
         "cda": {
-          "char": "d",
           "dependsOn": [
             "cma",
             "ui-host",
@@ -584,7 +583,6 @@
           "type": "option"
         },
         "cma": {
-          "char": "m",
           "dependsOn": [
             "cda",
             "ui-host",
@@ -667,5 +665,5 @@
       ]
     }
   },
-  "version": "1.18.0"
+  "version": "2.0.0-beta"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.18.0",
+  "version": "2.0.0-beta",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",
@@ -22,10 +22,11 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.7.2",
-    "@contentstack/cli-utilities": "~1.17.0",
+    "@contentstack/cli-utilities": "~1.17.2",
+    "@contentstack/utils": "~1.7.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.23"
   },
   "devDependencies": {
     "@oclif/test": "^4.1.13",