@contentstack/cli-utilities 1.0.0 → 1.0.2

package/lib/config-handler.js

@@ -8,15 +8,65 @@ const ENC_KEY = 'encryptionKey';
 const ENCRYPT_CONF = true;
 const CONFIG_NAME = 'contentstack_cli';
 const ENC_CONFIG_NAME = 'contentstack_cli_obfuscate';
+const OLD_CONFIG_BACKUP_FLAG = 'isOldConfigBackup';
+const xdgBasedir = require('xdg-basedir');
+const path = require('path');
+const os = require('os');
+const uniqueString = require('unique-string');
+const oldConfigDirectory = xdgBasedir.config || path.join(os.tmpdir(), uniqueString());
+const pathPrefix = path.join('configstore', `${CONFIG_NAME}.json`);
+const oldConfigPath = path.join(oldConfigDirectory, pathPrefix);
 class Config {
     constructor() {
         this.init();
+        this.importOldConfig();
     }
     init() {
         return ENCRYPT_CONF === true
             ? this.getEncryptedConfig()
             : this.getDecryptedConfig();
     }
+    importOldConfig() {
+        if (!this.get(OLD_CONFIG_BACKUP_FLAG)) {
+            try {
+                const oldConfigStoreData = this.getOldConfig();
+                if (oldConfigStoreData) {
+                    this.setOldConfigStoreData(oldConfigStoreData, '');
+                    this.removeOldConfigStoreFile();
+                }
+            }
+            catch (error) {
+                console.log("No data to be imported from Old config file");
+            }
+            this.set(OLD_CONFIG_BACKUP_FLAG, true);
+        }
+    }
+    // Recursive function to migrate from the old config
+    setOldConfigStoreData(data, _path = '') {
+        for (const key in data) {
+            const value = data[key];
+            const setPath = _path ? _path + '.' + key : key;
+            if (typeof (value) == "object") {
+                this.setOldConfigStoreData(value, setPath);
+            }
+            else {
+                this.set(setPath, value);
+            }
+        }
+    }
+    removeOldConfigStoreFile() {
+        if ((0, fs_1.existsSync)(oldConfigPath)) {
+            (0, fs_1.unlinkSync)(oldConfigPath); // NOTE remove old configstore file
+        }
+    }
+    getOldConfig() {
+        try {
+            return JSON.parse((0, fs_1.readFileSync)(oldConfigPath, 'utf8'));
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
     fallbackInit() {
         return new conf_1.default({ configName: CONFIG_NAME, encryptionKey: ENC_KEY });
     }
@@ -55,8 +105,8 @@ class Config {
                 // NOTE reading old code base encrypted file if exist
                 try {
                     const config = this.fallbackInit();
-                    const configData = this.getConfigDataAndUnlinkConfigFile(config);
-                    this.getEncryptedConfig(configData, true);
+                    const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
+                    this.getEncryptedConfig(oldConfigData, true);
                 }
                 catch (error) {
                     // console.trace(error.message)
@@ -66,8 +116,8 @@ class Config {
         try {
             if (skip === false) {
                 const config = new conf_1.default({ configName: CONFIG_NAME });
-                const configData = this.getConfigDataAndUnlinkConfigFile(config);
-                this.getEncryptedConfig(configData, true);
+                const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
+                this.getEncryptedConfig(oldConfigData, true);
             }
             else {
                 getEncryptedDataElseFallBack();
@@ -93,8 +143,8 @@ class Config {
             try {
                 const encryptionKey = this.getObfuscationKey();
                 let config = new conf_1.default({ configName: CONFIG_NAME, encryptionKey });
-                const configData = this.getConfigDataAndUnlinkConfigFile(config);
-                this.getDecryptedConfig(configData); // NOTE NOTE reinitialize the config with old data and new decrypted file
+                const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
+                this.getDecryptedConfig(oldConfigData); // NOTE NOTE reinitialize the config with old data and new decrypted file
             }
             catch (error) {
                 // console.trace(error.message)

package/lib/encrypter.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
+const defaultValues = {
+    typeIdentifier: "◈",
+    algorithm: "aes-192-cbc",
+    encryptionKey: "nF2ejRQcTv",
+};
+class NodeCrypto {
+    constructor(config = defaultValues) {
+        const { algorithm, encryptionKey, typeIdentifier } = config;
+        this.algorithm = algorithm;
+        this.typeIdentifier = typeIdentifier;
+        this.key = crypto_1.default.scryptSync(encryptionKey, "salt", 24);
+    }
+    encrypt(plainData) {
+        const iv = crypto_1.default.randomBytes(16);
+        const cipher = crypto_1.default.createCipheriv(this.algorithm, this.key, iv);
+        let data = plainData;
+        switch (typeof plainData) {
+            case "number":
+                data = `${String(plainData)}${this.typeIdentifier}number`;
+                break;
+            case "object":
+                data = `${JSON.stringify(plainData)}${this.typeIdentifier}object`;
+                break;
+        }
+        const encrypted = cipher.update(data, "utf8", "hex");
+        return [
+            encrypted + cipher.final("hex"),
+            Buffer.from(iv).toString("hex"),
+        ].join("|");
+    }
+    decrypt(encryptedData) {
+        const [encrypted, iv] = encryptedData.split("|");
+        if (!iv)
+            throw new Error("IV not found");
+        const decipher = crypto_1.default.createDecipheriv(this.algorithm, this.key, Buffer.from(iv, "hex"));
+        const result = decipher.update(encrypted, "hex", "utf8") + decipher.final("utf8");
+        const [data, type] = result.split(this.typeIdentifier);
+        switch (type) {
+            case "number":
+                return Number(data);
+            case "object":
+                return JSON.parse(data);
+        }
+        return data;
+    }
+}
+exports.default = NodeCrypto;

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printFlagDeprecation = exports.configHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
+exports.chooseLocalePrompt = exports.NodeCrypto = exports.printFlagDeprecation = exports.configHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
 const tslib_1 = require("tslib");
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return tslib_1.__importDefault(logger_1).default; } });
@@ -15,3 +15,7 @@ Object.defineProperty(exports, "configHandler", { enumerable: true, get: functio
 var flag_deprecation_check_1 = require("./flag-deprecation-check");
 Object.defineProperty(exports, "printFlagDeprecation", { enumerable: true, get: function () { return tslib_1.__importDefault(flag_deprecation_check_1).default; } });
 tslib_1.__exportStar(require("./http-client"), exports);
+var encrypter_1 = require("./encrypter");
+Object.defineProperty(exports, "NodeCrypto", { enumerable: true, get: function () { return tslib_1.__importDefault(encrypter_1).default; } });
+var selectors_1 = require("./selectors");
+Object.defineProperty(exports, "chooseLocalePrompt", { enumerable: true, get: function () { return selectors_1.chooseLocale; } });

package/lib/selectors/index.js

@@ -3,12 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.chooseDeliveryTokenAlias = exports.chooseTokenAlias = exports.chooseLocale = exports.chooseLocales = exports.chooseEnvironment = exports.chooseEnvironments = exports.chooseContentTypes = exports.chooseEntry = exports.chooseContentType = exports.chooseStack = exports.chooseOrganization = void 0;
 const tslib_1 = require("tslib");
 const ora_1 = tslib_1.__importDefault(require("ora"));
+const cli_error_1 = tslib_1.__importDefault(require("../cli-error"));
 const config_handler_1 = tslib_1.__importDefault(require("../config-handler"));
 const validations_1 = require("./validations");
+const management_1 = tslib_1.__importDefault(require("@contentstack/management"));
 const inquirer = require('inquirer');
 inquirer.registerPrompt('search-list', require('inquirer-search-list'));
 inquirer.registerPrompt('search-checkbox', require('inquirer-search-checkbox'));
-const { Command } = require('@contentstack/cli-command');
+let _region;
+let _authToken;
+let _managementAPIClient;
+const region = () => {
+    if (!_region) {
+        _region = config_handler_1.default.get('region');
+    }
+    return _region;
+};
+const cmaHost = () => {
+    let cma = region().cma;
+    if (cma.startsWith('http')) {
+        const u = new URL(cma);
+        if (u.host)
+            return u.host;
+    }
+    return cma;
+};
+const managementAPIClient = (params) => {
+    if (params) {
+        _managementAPIClient = management_1.default.client(params);
+    }
+    else if (!_managementAPIClient) {
+        _managementAPIClient = management_1.default.client({ host: cmaHost() });
+    }
+    return _managementAPIClient;
+};
+const authToken = () => {
+    if (!_authToken) {
+        _authToken = config_handler_1.default.get('authtoken');
+    }
+    if (!_authToken) {
+        throw new cli_error_1.default('You are not logged in. Please login with command $ csdx auth:login');
+    }
+    return _authToken;
+};
 function chooseOrganization(client, displayMessage, region, orgUid) {
     return new Promise(async (resolve, reject) => {
         try {
@@ -81,9 +118,7 @@ function chooseStack(client, organizationId, displayMessage, region) {
 exports.chooseStack = chooseStack;
 function chooseContentType(stackApiKey, displayMessage, region) {
     return new Promise(async (resolve, reject) => {
-        const command = new Command();
-        command.managementAPIClient = { host: command.cmaHost, authtoken: command.authToken };
-        const client = command.managementAPIClient;
+        const client = managementAPIClient({ host: cmaHost(), authtoken: authToken() });
         try {
             const spinner = (0, ora_1.default)('Loading Content Types').start();
             // let {items: contentTypes} = await client.stack({api_key: stackApiKey}).contentType().query({include_count: true}).find()
@@ -113,9 +148,7 @@ function chooseContentType(stackApiKey, displayMessage, region) {
 exports.chooseContentType = chooseContentType;
 function chooseEntry(contentTypeUid, stackApiKey, displayMessage, region) {
     return new Promise(async (resolve, reject) => {
-        const command = new Command();
-        command.managementAPIClient = { host: command.cmaHost, authtoken: command.authToken };
-        const client = command.managementAPIClient;
+        const client = managementAPIClient({ host: cmaHost(), authtoken: authToken() });
         try {
             const spinner = (0, ora_1.default)('Loading Entries').start();
             let entries = await getAll(client.stack({ api_key: stackApiKey }).contentType(contentTypeUid).entry());
@@ -274,7 +307,7 @@ function chooseLocales(stack, displayMessage) {
     });
 }
 exports.chooseLocales = chooseLocales;
-function chooseLocale(stack, displayMessage) {
+function chooseLocale(stack, displayMessage, defaultLocale) {
     return new Promise(async (resolve, reject) => {
         try {
             const spinner = (0, ora_1.default)('Loading Locales').start();
@@ -290,6 +323,7 @@ function chooseLocale(stack, displayMessage) {
                 type: 'search-list',
                 name: 'chosenLocale',
                 choices: localeList,
+                default: defaultLocale,
                 message: displayMessage || 'Choose locale',
                 loop: false,
                 validate: validations_1.shouldNotBeEmpty

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "./types/index.d.ts",
@@ -32,9 +32,13 @@
     "chalk": "^4.0.0",
     "conf": "^10.1.2",
     "debug": "^4.1.1",
-    "inquirer": "^8.0.0",
+    "inquirer": "^8.2.4",
+    "inquirer-search-checkbox": "^1.0.0",
+    "inquirer-search-list": "^1.2.6",
     "ora": "^5.4.0",
-    "winston": "^3.7.2"
+    "unique-string": "^2.0.0",
+    "winston": "^3.7.2",
+    "xdg-basedir": "^4.0.0"
   },
   "devDependencies": {
     "@oclif/plugin-help": "^5.1.12",

package/src/config-handler.ts

@@ -1,23 +1,78 @@
 import Conf from 'conf';
 import { v4 as uuid } from 'uuid';
-import { existsSync, unlinkSync } from 'fs'
+import { existsSync, unlinkSync, readFileSync } from 'fs';
 
 const ENC_KEY = 'encryptionKey';
 const ENCRYPT_CONF: boolean = true
 const CONFIG_NAME = 'contentstack_cli';
 const ENC_CONFIG_NAME = 'contentstack_cli_obfuscate';
+const OLD_CONFIG_BACKUP_FLAG = 'isOldConfigBackup'
+
+const xdgBasedir = require('xdg-basedir');
+const path = require('path');
+const os = require('os');
+const uniqueString = require('unique-string');
+const oldConfigDirectory = xdgBasedir.config || path.join(os.tmpdir(), uniqueString());
+const pathPrefix = path.join('configstore', `${CONFIG_NAME}.json`);
+const oldConfigPath = path.join(oldConfigDirectory, pathPrefix);
 
 class Config {
   private config: Conf;
 
   constructor() {
     this.init()
+    this.importOldConfig()
   }
 
   init() {
     return ENCRYPT_CONF === true
       ? this.getEncryptedConfig()
       : this.getDecryptedConfig()
+
+  }
+
+  importOldConfig() {
+    if (!this.get(OLD_CONFIG_BACKUP_FLAG)) {
+      try {
+        const oldConfigStoreData = this.getOldConfig()
+        if (oldConfigStoreData) {
+          this.setOldConfigStoreData(oldConfigStoreData, '')
+          this.removeOldConfigStoreFile()
+        }
+      } catch (error) {
+        console.log("No data to be imported from Old config file");
+
+      }
+      this.set(OLD_CONFIG_BACKUP_FLAG, true)
+    }
+  }
+
+  // Recursive function to migrate from the old config
+  setOldConfigStoreData(data, _path = '') {
+    for (const key in data) {
+      const value = data[key];
+      const setPath = _path ? _path + '.' + key : key
+      if (typeof (value) == "object") {
+        this.setOldConfigStoreData(value, setPath)
+      }
+      else {
+        this.set(setPath, value)
+      }
+    }
+  }
+
+  removeOldConfigStoreFile() {
+    if (existsSync(oldConfigPath)) {
+      unlinkSync(oldConfigPath) // NOTE remove old configstore file
+    }
+  }
+
+  private getOldConfig() {
+    try {
+      return JSON.parse(readFileSync(oldConfigPath, 'utf8'));
+    } catch (error) {
+      return undefined;
+    }
   }
 
   private fallbackInit(): Conf {
@@ -64,8 +119,8 @@ class Config {
         // NOTE reading old code base encrypted file if exist
         try {
           const config = this.fallbackInit()
-          const configData = this.getConfigDataAndUnlinkConfigFile(config)
-          this.getEncryptedConfig(configData, true)
+          const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config)
+          this.getEncryptedConfig(oldConfigData, true)
         } catch (error) {
           // console.trace(error.message)
         }
@@ -75,8 +130,8 @@ class Config {
     try {
       if (skip === false) {
         const config = new Conf({ configName: CONFIG_NAME })
-        const configData = this.getConfigDataAndUnlinkConfigFile(config)
-        this.getEncryptedConfig(configData, true)
+        const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config)
+        this.getEncryptedConfig(oldConfigData, true)
       } else {
         getEncryptedDataElseFallBack()
       }
@@ -102,8 +157,8 @@ class Config {
       try {
         const encryptionKey: any = this.getObfuscationKey()
         let config = new Conf({ configName: CONFIG_NAME, encryptionKey })
-        const configData = this.getConfigDataAndUnlinkConfigFile(config)
-        this.getDecryptedConfig(configData) // NOTE NOTE reinitialize the config with old data and new decrypted file
+        const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config)
+        this.getDecryptedConfig(oldConfigData) // NOTE NOTE reinitialize the config with old data and new decrypted file
       } catch (error) {
         // console.trace(error.message)
 

package/src/encrypter.ts

@@ -0,0 +1,70 @@
+import crypto from "crypto";
+
+type CryptoConfig = {
+  algorithm?: string;
+  encryptionKey?: string;
+  typeIdentifier?: string;
+};
+
+const defaultValues: CryptoConfig = {
+  typeIdentifier: "◈",
+  algorithm: "aes-192-cbc",
+  encryptionKey: "nF2ejRQcTv",
+};
+
+export default class NodeCrypto {
+  private readonly key: Buffer;
+  private readonly algorithm: string;
+  private readonly typeIdentifier: string;
+
+  constructor(config: CryptoConfig = defaultValues) {
+    const { algorithm, encryptionKey, typeIdentifier } = config;
+    this.algorithm = algorithm;
+    this.typeIdentifier = typeIdentifier;
+    this.key = crypto.scryptSync(encryptionKey, "salt", 24);
+  }
+
+  encrypt(plainData) {
+    const iv = crypto.randomBytes(16);
+    const cipher = crypto.createCipheriv(this.algorithm, this.key, iv);
+    let data = plainData;
+
+    switch (typeof plainData) {
+      case "number":
+        data = `${String(plainData)}${this.typeIdentifier}number`;
+        break;
+      case "object":
+        data = `${JSON.stringify(plainData)}${this.typeIdentifier}object`;
+        break;
+    }
+
+    const encrypted = cipher.update(data, "utf8", "hex");
+
+    return [
+      encrypted + cipher.final("hex"),
+      Buffer.from(iv).toString("hex"),
+    ].join("|");
+  }
+
+  decrypt(encryptedData) {
+    const [encrypted, iv] = encryptedData.split("|");
+    if (!iv) throw new Error("IV not found");
+    const decipher = crypto.createDecipheriv(
+      this.algorithm,
+      this.key,
+      Buffer.from(iv, "hex")
+    );
+    const result =
+      decipher.update(encrypted, "hex", "utf8") + decipher.final("utf8");
+    const [data, type] = result.split(this.typeIdentifier);
+
+    switch (type) {
+      case "number":
+        return Number(data);
+      case "object":
+        return JSON.parse(data);
+    }
+
+    return data;
+  }
+}

package/src/index.ts

@@ -5,3 +5,5 @@ export { default as messageHandler } from './message-handler';
 export { default as configHandler } from './config-handler';
 export { default as printFlagDeprecation } from './flag-deprecation-check';
 export * from './http-client';
+export { default as NodeCrypto } from './encrypter'
+export { chooseLocale as chooseLocalePrompt } from './selectors';

package/src/selectors/index.ts

@@ -1,4 +1,5 @@
 import ora from 'ora'
+import { default as CLIError } from '../cli-error';
 import { default as config } from '../config-handler';
 import {
 	Token,
@@ -10,18 +11,66 @@ import {
 	Entry,
 	Locale
 } from './interfaces'
-import { shouldNotBeEmpty } from './validations'; 
+import { shouldNotBeEmpty } from './validations';
+import ContentstackManagementSDK from '@contentstack/management';
 
 const inquirer = require('inquirer')
 inquirer.registerPrompt('search-list', require('inquirer-search-list'))
 inquirer.registerPrompt('search-checkbox', require('inquirer-search-checkbox'))
-const {Command} = require('@contentstack/cli-command')
+
+interface Region {
+  name: string;
+  cma: string;
+  cda: string;
+}
+
+let _region: Region;
+let _authToken: string;
+let _managementAPIClient: ContentstackManagementSDK.ContentstackClient;
+
+const region = (): Region => {
+	if (!_region) {
+		_region = config.get('region');
+	}
+
+	return _region;
+}
+
+const cmaHost = () => {
+	let cma = region().cma;
+	if (cma.startsWith('http')) {
+		const u = new URL(cma);
+		if (u.host) return u.host;
+	}
+	return cma;
+}
+
+const managementAPIClient = (params) => {
+	if (params) {
+		_managementAPIClient = ContentstackManagementSDK.client(params)
+	} else if (!_managementAPIClient) {
+		_managementAPIClient = ContentstackManagementSDK.client({ host: cmaHost() });
+	}
+
+	return _managementAPIClient;
+}
+
+const authToken = () => {
+	if (!_authToken) {
+		_authToken = config.get('authtoken');
+	}
+	if (!_authToken) {
+		throw new CLIError('You are not logged in. Please login with command $ csdx auth:login');
+	}
+
+	return _authToken;
+}
 
 export function chooseOrganization(client: any, displayMessage?: string, region?: string, orgUid?: string): Promise<selectedOrganization> {
 	return new Promise(async (resolve, reject) => {
 		try {
 			const spinner = ora('Loading Organizations').start()
-			let {items: organizations} = await client.organization().fetchAll()
+			let { items: organizations } = await client.organization().fetchAll()
 			spinner.stop()
 			let orgMap: any = {}
 			if (orgUid) {
@@ -29,7 +78,7 @@ export function chooseOrganization(client: any, displayMessage?: string, region?
 					orgMap[org.uid] = org.name
 				})
 				if (orgMap[orgUid]) {
-					resolve({orgUid: orgUid, orgName: orgMap[orgUid]})
+					resolve({ orgUid: orgUid, orgName: orgMap[orgUid] })
 				} else {
 					return reject(new Error('The given orgUid doesn\'t exist or you might not have access to it.'))
 				}
@@ -46,8 +95,8 @@ export function chooseOrganization(client: any, displayMessage?: string, region?
 					loop: false,
 					validate: shouldNotBeEmpty
 				}
-				inquirer.prompt(inquirerConfig).then(({chosenOrganization}: {chosenOrganization: string}) => {
-					resolve({orgUid: orgMap[chosenOrganization], orgName: chosenOrganization})
+				inquirer.prompt(inquirerConfig).then(({ chosenOrganization }: { chosenOrganization: string }) => {
+					resolve({ orgUid: orgMap[chosenOrganization], orgName: chosenOrganization })
 				})
 			}
 		} catch (error) {
@@ -56,11 +105,11 @@ export function chooseOrganization(client: any, displayMessage?: string, region?
 	})
 }
 
-export function chooseStack(client: any, organizationId: string, displayMessage?: string, region?: string) : Promise<Stack> {
+export function chooseStack(client: any, organizationId: string, displayMessage?: string, region?: string): Promise<Stack> {
 	return new Promise(async (resolve, reject) => {
 		try {
 			const spinner = ora('Loading Stacks').start()
-			let {items: stacks} = await client.stack({organization_uid: organizationId}).query({query: {}}).find()
+			let { items: stacks } = await client.stack({ organization_uid: organizationId }).query({ query: {} }).find()
 			spinner.stop()
 			let stackMap: any = {}
 			stacks.forEach((stack: Stack) => {
@@ -74,8 +123,8 @@ export function chooseStack(client: any, organizationId: string, displayMessage?
 				message: displayMessage || 'Choose a stack',
 				loop: false,
 			}
-			inquirer.prompt(inquirerConfig).then(({chosenStack}: {chosenStack: string}) => {
-				resolve({api_key: stackMap[chosenStack], name: chosenStack})
+			inquirer.prompt(inquirerConfig).then(({ chosenStack }: { chosenStack: string }) => {
+				resolve({ api_key: stackMap[chosenStack], name: chosenStack })
 			})
 		} catch (error) {
 			console.error(error.message)
@@ -85,13 +134,12 @@ export function chooseStack(client: any, organizationId: string, displayMessage?
 
 export function chooseContentType(stackApiKey: string, displayMessage?: string, region?: string): Promise<ContentType> {
 	return new Promise(async (resolve, reject) => {
-		const command = new Command()
-		command.managementAPIClient = {host: command.cmaHost, authtoken: command.authToken}
-		const client = command.managementAPIClient
+		const client = managementAPIClient({ host: cmaHost(), authtoken: authToken() })
+
 		try {
 			const spinner = ora('Loading Content Types').start()
 			// let {items: contentTypes} = await client.stack({api_key: stackApiKey}).contentType().query({include_count: true}).find()
-			let contentTypes = await getAll(client.stack({api_key: stackApiKey}).contentType())
+			let contentTypes = await getAll(client.stack({ api_key: stackApiKey }).contentType())
 			spinner.stop()
 			let contentTypeMap: any = {}
 			contentTypes.forEach((contentType: ContentType) => {
@@ -105,23 +153,22 @@ export function chooseContentType(stackApiKey: string, displayMessage?: string,
 				message: displayMessage || 'Choose a content type',
 				loop: false,
 			}
-			inquirer.prompt(inquirerConfig).then(({chosenContentType}: {chosenContentType: string}) => {
-				resolve({uid: contentTypeMap[chosenContentType], title: chosenContentType})
+			inquirer.prompt(inquirerConfig).then(({ chosenContentType }: { chosenContentType: string }) => {
+				resolve({ uid: contentTypeMap[chosenContentType], title: chosenContentType })
 			})
 		} catch (error) {
 			console.error(error.message)
 		}
-	})	
+	})
 }
 
 export function chooseEntry(contentTypeUid: string, stackApiKey: string, displayMessage?: string, region?: string): Promise<Entry> {
 	return new Promise(async (resolve, reject) => {
-		const command = new Command()
-		command.managementAPIClient = {host: command.cmaHost, authtoken: command.authToken}
-		const client = command.managementAPIClient
+		const client = managementAPIClient({ host: cmaHost(), authtoken: authToken() })
+
 		try {
 			const spinner = ora('Loading Entries').start()
-			let entries = await getAll(client.stack({api_key: stackApiKey}).contentType(contentTypeUid).entry())
+			let entries = await getAll(client.stack({ api_key: stackApiKey }).contentType(contentTypeUid).entry())
 			spinner.stop()
 			let entryMap: any = {}
 			entries.forEach((entry: Entry) => {
@@ -135,13 +182,13 @@ export function chooseEntry(contentTypeUid: string, stackApiKey: string, display
 				message: displayMessage || 'Choose an entry',
 				loop: false
 			}
-			inquirer.prompt(inquirerConfig).then(({chosenEntry}: {chosenEntry: string}) => {
-				resolve({uid: entryMap[chosenEntry], title: chosenEntry})
+			inquirer.prompt(inquirerConfig).then(({ chosenEntry }: { chosenEntry: string }) => {
+				resolve({ uid: entryMap[chosenEntry], title: chosenEntry })
 			})
 		} catch (error) {
 			console.error(error.message)
 		}
-	})	
+	})
 }
 
 export function chooseContentTypes(stack: any, displayMessage?: string): Promise<ContentType[]> {
@@ -163,7 +210,7 @@ export function chooseContentTypes(stack: any, displayMessage?: string): Promise
 				message: displayMessage || 'Choose a content type',
 				loop: false,
 			}
-			inquirer.prompt(inquirerConfig).then(({ chosenContentTypes }: { chosenContentTypes: string[]}) => {
+			inquirer.prompt(inquirerConfig).then(({ chosenContentTypes }: { chosenContentTypes: string[] }) => {
 				let result: ContentType[] = chosenContentTypes.map(ct => {
 					let foo: ContentType = { uid: contentTypeMap[ct], title: ct }
 					return foo
@@ -173,7 +220,7 @@ export function chooseContentTypes(stack: any, displayMessage?: string): Promise
 		} catch (error) {
 			console.error(error.message)
 		}
-	})	
+	})
 }
 
 export function chooseEnvironments(stack: any, displayMessage?: string): Promise<Environment[]> {
@@ -272,7 +319,7 @@ export function chooseLocales(stack: any, displayMessage?: string): Promise<Loca
 	})
 }
 
-export function chooseLocale(stack: any, displayMessage?: string): Promise<Locale> {
+export function chooseLocale(stack: any, displayMessage?: string, defaultLocale?: Locale): Promise<Locale> {
 	return new Promise(async (resolve, reject) => {
 		try {
 			const spinner = ora('Loading Locales').start()
@@ -288,6 +335,7 @@ export function chooseLocale(stack: any, displayMessage?: string): Promise<Local
 				type: 'search-list',
 				name: 'chosenLocale',
 				choices: localeList,
+				default: defaultLocale,
 				message: displayMessage || 'Choose locale',
 				loop: false,
 				validate: shouldNotBeEmpty
@@ -338,7 +386,7 @@ export function chooseDeliveryTokenAlias(): Promise<Token> {
 	})
 }
 
-async function getAll (element: any, skip: number=0): Promise<any> {
+async function getAll(element: any, skip: number = 0): Promise<any> {
 	return new Promise(async resolve => {
 		let result: any[] = []
 		result = await fetch(element, skip, result)
@@ -348,8 +396,8 @@ async function getAll (element: any, skip: number=0): Promise<any> {
 
 async function fetch(element: any, skip: number, accumulator: any[]): Promise<any[]> {
 	return new Promise(async resolve => {
-		let queryParams = {include_count: true, skip: skip}
-		let {items: result, count: count} = await element.query(queryParams).find()
+		let queryParams = { include_count: true, skip: skip }
+		let { items: result, count: count } = await element.query(queryParams).find()
 		accumulator = accumulator.concat(result)
 		skip += result.length
 		if (skip < count)

package/types/encrypter.d.ts

@@ -0,0 +1,14 @@
+declare type CryptoConfig = {
+    algorithm?: string;
+    encryptionKey?: string;
+    typeIdentifier?: string;
+};
+export default class NodeCrypto {
+    private readonly key;
+    private readonly algorithm;
+    private readonly typeIdentifier;
+    constructor(config?: CryptoConfig);
+    encrypt(plainData: any): string;
+    decrypt(encryptedData: any): any;
+}
+export {};

package/types/http-client/client.d.ts

@@ -0,0 +1,230 @@
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import { HttpResponse } from './http-response';
+export declare class HttpClient {
+    /**
+     * The request configuration.
+     */
+    private request;
+    /**
+     * The request configuration.
+     */
+    private readonly axiosInstance;
+    /**
+     * The payload format for a JSON or form-url-encoded request.
+     */
+    private bodyFormat;
+    /**
+     * Createa new pending HTTP request instance.
+     */
+    constructor();
+    /**
+     * Create a reusable HttpClient instance.
+     *
+     * @returns {HttpClient}
+     */
+    static create(): HttpClient;
+    /**
+     * Returns the Axios request config.
+     *
+     * @returns {AxiosRequestConfig}
+     */
+    requestConfig(): AxiosRequestConfig;
+    /**
+     * Resets the request config.
+     *
+     * @returns {AxiosRequestConfig}
+     */
+    resetConfig(): HttpClient;
+    /**
+     * Use the given `baseUrl` for all requests.
+     *
+     * @param {String} baseUrl
+     *
+     * @returns {HttpClient}
+     */
+    baseUrl(baseUrl: string): HttpClient;
+    /**
+     * Add request headers.
+     * @returns {HttpClient}
+     */
+    headers(headers: any): HttpClient;
+    /**
+     * Add query parameters to the request.
+     *
+     * @param {Object} queryParams
+     *
+     * @returns {HttpClient}
+     */
+    queryParams(queryParams: object): HttpClient;
+    /**
+     * Add basic authentication via `username` and `password` to the request.
+     *
+     * @param {String} username
+     * @param {String} password
+     *
+     * @returns {HttpClient}
+     */
+    basicAuth(username: string, password: string): HttpClient;
+    /**
+     * Add an authorization `token` to the request.
+     *
+     * @param {String} token
+     * @param {String} type
+     *
+     * @returns {HttpClient}
+     */
+    token(token: string, type?: string): HttpClient;
+    /**
+     * Merge your own custom Axios options into the request.
+     *
+     * @param {Object} options
+     *
+     * @returns {HttpClient}
+     */
+    options(options?: AxiosRequestConfig): HttpClient;
+    /**
+     * Add a request payload.
+     *
+     * @param {*} data
+     *
+     * @returns {HttpClient}
+     */
+    payload(data: any): HttpClient;
+    /**
+     * Define the request `timeout` in milliseconds.
+     *
+     * @param {Number} timeout
+     *
+     * @returns {HttpClient}
+     */
+    timeout(timeout: number): HttpClient;
+    /**
+     * Tell HttpClient to send the request as JSON payload.
+     *
+     * @returns {HttpClient}
+     */
+    asJson(): HttpClient;
+    /**
+     * Tell HttpClient to send the request as form parameters,
+     * encoded as URL query parameters.
+     *
+     * @returns {HttpClient}
+     */
+    asFormParams(): HttpClient;
+    /**
+     * Set the request payload format.
+     *
+     * @param {String} format
+     *
+     * @returns {HttpClient}
+     */
+    payloadFormat(format: BodyFormat): HttpClient;
+    /**
+     * Set the `Accept` request header. This indicates what
+     * content type the server should return.
+     *
+     * @param {String} accept
+     *
+     * @returns {HttpClient}
+     */
+    accept(accept: string): HttpClient;
+    /**
+     * Set the `Accept` request header to JSON. This indicates
+     * that the server should return JSON data.
+     *
+     * @param {String} accept
+     *
+     * @returns {HttpClient}
+     */
+    acceptJson(): HttpClient;
+    /**
+     * Set the `Content-Type` request header.
+     *
+     * @param {String} contentType
+     *
+     * @returns {HttpClient}
+     */
+    contentType(contentType: string): HttpClient;
+    /**
+     * Send an HTTP GET request, optionally with the given `queryParams`.
+     *
+     * @param {String} url
+     * @param {Object} queryParams
+     *
+     * @returns {HttpResponse}
+     *
+     * @throws
+     */
+    get<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+    /**
+     * Send an HTTP POST request, optionally with the given `payload`.
+     *
+     * @param {String} url
+     * @param {Object} payload
+     *
+     * @returns {HttpResponse}
+     *
+     * @throws
+     */
+    post<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    /**
+     * Send an HTTP PUT request, optionally with the given `payload`.
+     *
+     * @param {String} url
+     * @param {Object} payload
+     *
+     * @returns {HttpResponse}
+     *
+     * @throws
+     */
+    put<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    /**
+     * Send an HTTP PATCH request, optionally with the given `payload`.
+     *
+     * @param {String} url
+     * @param {Object} payload
+     *
+     * @returns {HttpResponse}
+     *
+     * @throws
+     */
+    patch<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    /**
+     * Send an HTTP DELETE request, optionally with the given `queryParams`.
+     *
+     * @param {String} url
+     * @param {Object} queryParams
+     *
+     * @returns {HttpResponse}
+     *
+     * @throws
+     */
+    delete<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+    /**
+     * Send the HTTP request.
+     *
+     * @param {String} method
+     * @param {String} url
+     *
+     * @returns {HttpResponse}
+     *
+     * @throws
+     */
+    send<R>(method: HttpMethod, url: string): Promise<HttpResponse<R>>;
+    /**
+     * Create and send the HTTP request.
+     *
+     * @param {String} method
+     * @param {String} url
+     *
+     * @returns {Request}
+     */
+    createAndSendRequest(method: HttpMethod, url: string): Promise<AxiosResponse>;
+    /**
+     * Returns the request payload depending on the selected request payload format.
+     */
+    prepareRequestPayload(): any;
+}
+declare type BodyFormat = 'json' | 'formParams';
+declare type HttpMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS';
+export {};

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

@@ -0,0 +1,37 @@
+import { AxiosResponse } from 'axios';
+export declare class HttpResponse<ResponseType = any> {
+    /**
+     * The Axios response object.
+     */
+    private readonly response;
+    /**
+     * Wrap the given Axios `response` into a new response instance.
+     *
+     * @param {AxiosResponse} response
+     */
+    constructor(response: AxiosResponse);
+    /**
+     * Returns the response status.
+     *
+     * @returns {Number}
+     */
+    get status(): number;
+    /**
+     * Returns the response payload. This method is an alias for `response.payload()`.
+     *
+     * @returns {*}
+     */
+    get data(): any;
+    /**
+     * Returns the response payload.
+     *
+     * @returns {*}
+     */
+    get payload(): any;
+    /**
+     * Returns the response headers.
+     *
+     * @returns {Object}
+     */
+    get headers(): import("axios").AxiosResponseHeaders;
+}

package/types/http-client/index.d.ts

@@ -0,0 +1,4 @@
+import { HttpClient } from './client';
+export default HttpClient;
+export * from './client';
+export * from './http-response';

package/types/index.d.ts

@@ -5,3 +5,5 @@ export { default as messageHandler } from './message-handler';
 export { default as configHandler } from './config-handler';
 export { default as printFlagDeprecation } from './flag-deprecation-check';
 export * from './http-client';
+export { default as NodeCrypto } from './encrypter';
+export { chooseLocale as chooseLocalePrompt } from './selectors';

package/types/selectors/index.d.ts

@@ -7,6 +7,6 @@ export declare function chooseContentTypes(stack: any, displayMessage?: string):
 export declare function chooseEnvironments(stack: any, displayMessage?: string): Promise<Environment[]>;
 export declare function chooseEnvironment(stack: any, displayMessage?: string): Promise<Environment>;
 export declare function chooseLocales(stack: any, displayMessage?: string): Promise<Locale[]>;
-export declare function chooseLocale(stack: any, displayMessage?: string): Promise<Locale>;
+export declare function chooseLocale(stack: any, displayMessage?: string, defaultLocale?: Locale): Promise<Locale>;
 export declare function chooseTokenAlias(): Promise<Token>;
 export declare function chooseDeliveryTokenAlias(): Promise<Token>;