Merge pull request #1527 from contentstack/development

DX | 29-08-2024 | Release

packages/contentstack-audit/README.md

@@ -267,7 +267,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -341,7 +341,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -390,7 +390,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -420,7 +420,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -461,7 +461,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -489,7 +489,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -533,5 +533,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.2/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.4/src/commands/plugins/update.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/package.json

@@ -18,7 +18,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^5.0.0",

packages/contentstack-auth/package.json

@@ -22,7 +22,7 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",

packages/contentstack-bootstrap/package.json

@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@contentstack/cli-cm-seed": "~1.7.6",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",

packages/contentstack-branches/package.json

@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "@oclif/core": "^3.26.5",
     "async": "^3.2.4",
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~1.3.19",
-    "@contentstack/cli-config": "~1.6.4",
+    "@contentstack/cli-config": "~1.7.0",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^2.5.6",

packages/contentstack-bulk-publish/package.json

@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",

packages/contentstack-clone/package.json

@@ -6,9 +6,9 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.5.0",
-    "@contentstack/cli-cm-export": "~1.11.6",
-    "@contentstack/cli-cm-import": "~1.16.5",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-cm-export": "~1.11.7",
+    "@contentstack/cli-cm-import": "~1.16.6",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "async": "^3.2.4",
     "chalk": "^4.1.0",

packages/contentstack-command/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.2.19",
+  "version": "1.3.0",
   "author": "Contentstack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/contentstack-command/src/index.ts

@@ -93,6 +93,18 @@ abstract class ContentstackCommand extends Command {
     }
     throw new CLIError('No token found');
   }
+
+  get developerHubUrl() {
+    return this.region.developerHubUrl;
+  }
+
+  get launchHubUrl() {
+    return this.region.launchHubUrl;
+  }
+
+  get personalizeUrl() {
+    return this.region.personalizeUrl;
+  }
 }
 
 module.exports = {

packages/contentstack-command/src/interfaces/index.ts

@@ -3,4 +3,7 @@ export interface Region {
   cma: string;
   cda: string;
   uiHost: string;
+  developerHubUrl: string;
+  launchHubUrl: string;
+  personalizeUrl: string;
 }

packages/contentstack-config/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-config/1.6.5 darwin-arm64 node-v22.2.0
+@contentstack/cli-config/1.7.0 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -265,18 +265,23 @@ Set region for CLI
 
 ```
 USAGE
-  $ csdx config:set:region [REGION] [-d <value> -m <value> --ui-host <value> -n <value>]
+  $ csdx config:set:region [REGION] [-d <value> -m <value> --ui-host <value> -n <value>] [--developer-hub <value>]
+    [--personalize <value>] [--launch <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 name
-                      flags are required
-  -m, --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
-  --ui-host=<value>   Custom UI host to set for CLI, if this flag is added then cda, cma and name flags are required
+  -d, --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 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
+  --ui-host=<value>        Custom UI host to set for CLI, if this flag is added then cda, cma and name flags are
+                           required
 
 DESCRIPTION
   Set region for CLI
@@ -295,6 +300,14 @@ EXAMPLES
   $ csdx config:set:region GCP-NA
 
   $ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India"
+
+  $ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --developer-hub <developer_hub_url>
+
+  $ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --personalize <personalize_url>
+
+  $ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --launch <launch_url>
+
+  $ csdx config:set:region --cda <contentstack_cda_endpoint> --cma <contentstack_cma_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --developer-hub <developer_hub_url> --personalize <personalize_url> --launch <launch_url>
 ```
 
 _See code: [src/commands/config/set/region.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-config/src/commands/config/set/region.ts)_

packages/contentstack-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.6.5",
+  "version": "1.7.0",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",
@@ -21,7 +21,7 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.1",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",

packages/contentstack-config/src/commands/config/get/region.ts

@@ -18,6 +18,9 @@ export default class RegionGetCommand extends BaseCommand<typeof RegionGetComman
     cliux.print(`CDA HOST: ${currentRegion.cda}`);
     cliux.print(`CMA HOST: ${currentRegion.cma}`);
     cliux.print(`UI HOST: ${currentRegion.uiHost}`);
+    cliux.print(`Developer Hub URL: ${currentRegion.developerHubUrl}`);
+    cliux.print(`Launch URL: ${currentRegion.launchHubUrl}`);
+    cliux.print(`Personalize URL: ${currentRegion.personalizeUrl}`);
     this.logger.error(`Currently using ${currentRegion.name} region`);
 
   }

packages/contentstack-config/src/commands/config/set/region.ts

@@ -39,6 +39,15 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
       description: 'Name for the region, if this flag is added then cda, cma and ui-host flags are required',
       dependsOn: ['cda', 'cma', 'ui-host'],
     }),
+    'developer-hub': _flags.string({
+      description: 'Custom host to set for Developer hub API',
+    }),
+    'personalize': _flags.string({
+      description: 'Custom host to set for Personalize API',
+    }),
+    'launch': _flags.string({
+      description: 'Custom host to set for Launch API',
+    }),
   };
   static examples = [
     '$ csdx config:set:region',
@@ -48,6 +57,10 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
     '$ csdx config:set:region AZURE-EU',
     '$ csdx config:set:region GCP-NA',
     '$ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India"',
+    '$ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --developer-hub <developer_hub_url>',
+    '$ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --personalize <personalize_url>',
+    '$ csdx config:set:region --cma <contentstack_cma_endpoint> --cda <contentstack_cda_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --launch <launch_url>',
+    '$ csdx config:set:region --cda <contentstack_cda_endpoint> --cma <contentstack_cma_endpoint> --ui-host <contentstack_ui_host_endpoint> --name "India" --developer-hub <developer_hub_url> --personalize <personalize_url> --launch <launch_url>',    
   ];
 
   static args: ArgInput = {
@@ -60,6 +73,9 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
     let cma = regionSetFlags.cma;
     let name = regionSetFlags.name;
     let uiHost = regionSetFlags['ui-host'];
+    let developerHubUrl = regionSetFlags['developer-hub'];
+    let personalizeUrl = regionSetFlags['personalize'];
+    let launchHubUrl = regionSetFlags['launch'];
     let selectedRegion = args.region;
     if (!(cda && cma && uiHost && name) && !selectedRegion) {
       selectedRegion = await interactive.askRegions();
@@ -78,13 +94,25 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
     // Custom flag will get first priority over region argument
     if (cda && cma && uiHost && name) {
       try {
-        let customRegion: Region = { cda, cma, uiHost, name };
+        if (!developerHubUrl) {
+          developerHubUrl = this.transformUrl(cma, 'developerhub-api');
+        }
+        if (!launchHubUrl) {
+          launchHubUrl = this.transformUrl(cma, 'launch-api');
+        }
+        if (!personalizeUrl) {
+          personalizeUrl = this.transformUrl(cma, 'personalize-api');
+        }
+        let customRegion: Region = { cda, cma, uiHost, name, developerHubUrl, personalizeUrl, launchHubUrl };
         customRegion = regionHandler.setCustomRegion(customRegion);
         await authHandler.setConfigData('logout'); //Todo: Handle this logout flow well through logout command call
         cliux.success(`Custom region has been set to ${customRegion.name}`);
         cliux.success(`CMA HOST: ${customRegion.cma}`);
         cliux.success(`CDA HOST: ${customRegion.cda}`);
         cliux.success(`UI HOST: ${customRegion.uiHost}`);
+        cliux.success(`Developer Hub URL: ${customRegion.developerHubUrl}`);
+        cliux.success(`Personalize URL: ${customRegion.personalizeUrl}`);
+        cliux.success(`Launch URL: ${customRegion.launchHubUrl}`);
       } catch (error) {
         this.logger.error('failed to set the region', error);
         cliux.error(`Failed to set region due to: ${error.message}`);
@@ -96,8 +124,20 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
       cliux.success(`CDA HOST: ${regionDetails.cda}`);
       cliux.success(`CMA HOST: ${regionDetails.cma}`);
       cliux.success(`UI HOST: ${regionDetails.uiHost}`);
+      cliux.success(`Developer Hub URL: ${regionDetails.developerHubUrl}`);
+      cliux.success(`Personalize URL: ${regionDetails.personalizeUrl}`);
+      cliux.success(`Launch URL: ${regionDetails.launchHubUrl}`);
     } else {
       cliux.error(`Invalid region is given`);
     }
   }
+  transformUrl(url: string, replacement: string): string {
+    let transformedUrl = url.replace('api', replacement);
+    if (transformedUrl.startsWith('http')) {
+      transformedUrl = transformedUrl.split('//')[1];
+    }
+    transformedUrl = transformedUrl.startsWith('dev11') ? transformedUrl.replace('dev11', 'dev') : transformedUrl;
+    transformedUrl = transformedUrl.endsWith('io') ? transformedUrl.replace('io', 'com') : transformedUrl;
+    return `https://${transformedUrl}`
+  }
 }

packages/contentstack-config/src/interfaces/index.ts

@@ -15,4 +15,7 @@ export interface Region {
   cma: string;
   cda: string;
   uiHost: string;
+  developerHubUrl: string;
+  personalizeUrl: string;
+  launchHubUrl: string;
 }