@contentstack/cli-cm-export 1.6.1 → 1.8.0

package/lib/export/modules-js/marketplace-apps.js

@@ -11,7 +11,7 @@ const eachOf = require('async/eachOf');
 const { cliux, HttpClient, NodeCrypto, managementSDKClient, HttpClientDecorator, OauthDecorator, isAuthenticated, } = require('@contentstack/cli-utilities');
 const { default: config } = require('../../config');
 const { formatError, log, fileHelper } = require('../../utils');
-const { getDeveloperHubUrl } = require('../../utils');
+const { getDeveloperHubUrl, createNodeCryptoInstance } = require('../../utils');
 module.exports = class ExportMarketplaceApps {
     constructor(credentialConfig) {
         this.marketplaceAppPath = null;
@@ -24,7 +24,7 @@ module.exports = class ExportMarketplaceApps {
             cliux.print('WARNING!!! To export Marketplace apps, you must be logged in. Please check csdx auth:login --help to log in', { color: 'yellow' });
             return Promise.resolve();
         }
-        this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl());
+        this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
         await this.getOrgUid();
         const httpClient = new HttpClient();
         if (!this.config.auth_token) {
@@ -39,6 +39,7 @@ module.exports = class ExportMarketplaceApps {
         log(this.config, 'Starting marketplace app export', 'success');
         this.marketplaceAppPath = path.resolve(this.config.data, this.config.branchName || '', this.marketplaceAppConfig.dirName);
         mkdirp.sync(this.marketplaceAppPath);
+        this.nodeCrypto = await createNodeCryptoInstance(config);
         return this.exportInstalledExtensions();
     }
     async getOrgUid() {
@@ -54,26 +55,6 @@ module.exports = class ExportMarketplaceApps {
             this.config.org_uid = tempStackData.org_uid;
         }
     }
-    async createNodeCryptoInstance() {
-        const cryptoArgs = {};
-        if (this.config.forceStopMarketplaceAppsPrompt) {
-            cryptoArgs['encryptionKey'] = this.config.marketplaceAppEncryptionKey;
-        }
-        else {
-            cryptoArgs['encryptionKey'] = await cliux.inquire({
-                type: 'input',
-                name: 'name',
-                default: this.config.marketplaceAppEncryptionKey,
-                validate: (url) => {
-                    if (!url)
-                        return "Encryption key can't be empty.";
-                    return true;
-                },
-                message: 'Enter marketplace app configurations encryption key',
-            });
-        }
-        this.nodeCrypto = new NodeCrypto(cryptoArgs);
-    }
     async exportInstalledExtensions() {
         const client = await managementSDKClient({ host: this.developerHubBaseUrl.split('://').pop() });
         const installedApps = (await this.getAllStackSpecificApps()) || [];

package/lib/export/modules-js/stack.js

@@ -44,8 +44,8 @@ class ExportStack {
         }
         else if (self.config.preserveStackVersion) {
             log(self.config, 'Exporting stack details', 'success');
-            let stackFolderPath = path.resolve(self.config.data, stackConfig.dirName);
-            let stackContentsFile = path.resolve(stackFolderPath, stackConfig.fileName);
+            let stackFolderPath = path.resolve(self.config.data, this.stackConfig.dirName);
+            let stackContentsFile = path.resolve(stackFolderPath, this.stackConfig.fileName);
             mkdirp.sync(stackFolderPath);
             return new Promise((resolve, reject) => {
                 return self.stackAPIClient

package/lib/types/default-config.d.ts

@@ -103,6 +103,7 @@ export default interface DefaultConfig {
             downloadLimit: number;
             limit: number;
             dependencies?: Modules[];
+            exportVersions: boolean;
         };
         extensions: {
             dirName: string;

package/lib/types/export-config.d.ts

@@ -23,6 +23,9 @@ export default interface ExportConfig extends DefaultConfig {
         'X-User-Agent': string;
     };
     access_token?: string;
+    org_uid?: string;
+    source_stack?: string;
+    sourceStackName?: string;
 }
 type branch = {
     uid: string;

package/lib/types/index.d.ts

@@ -41,5 +41,54 @@ export interface ExternalConfig extends ExportConfig {
     email?: string;
     password?: string;
 }
+export interface ExtensionsConfig {
+    dirName: string;
+    fileName: string;
+    dependencies?: Modules[];
+    limit?: number;
+}
+export interface MarketplaceAppsConfig {
+    dirName: string;
+    fileName: string;
+    dependencies?: Modules[];
+}
+export interface EnvironmentConfig {
+    dirName: string;
+    fileName: string;
+    dependencies?: Modules[];
+    limit?: number;
+}
+export interface LabelConfig {
+    dirName: string;
+    fileName: string;
+    invalidKeys: string[];
+    dependencies?: Modules[];
+    limit?: number;
+}
+export interface WebhookConfig {
+    dirName: string;
+    fileName: string;
+    dependencies?: Modules[];
+    limit?: number;
+}
+export interface WorkflowConfig {
+    dirName: string;
+    fileName: string;
+    invalidKeys: string[];
+    dependencies?: Modules[];
+    limit?: number;
+}
+export interface CustomRoleConfig {
+    dirName: string;
+    fileName: string;
+    customRolesLocalesFileName: string;
+    dependencies?: Modules[];
+}
+export interface StackConfig {
+    dirName: string;
+    fileName: string;
+    dependencies?: Modules[];
+    limit?: number;
+}
 export { default as DefaultConfig } from './default-config';
 export { default as ExportConfig } from './export-config';

package/lib/utils/interactive.d.ts

@@ -4,3 +4,4 @@ export declare const askOTP: () => Promise<string>;
 export declare const askUsername: () => Promise<string>;
 export declare const askExportDir: () => Promise<string>;
 export declare const askAPIKey: () => Promise<string>;
+export declare const askDeveloperHub: (regionName: string) => Promise<string>;

package/lib/utils/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askAPIKey = exports.askExportDir = exports.askUsername = exports.askOTP = exports.askOTPChannel = exports.askPassword = void 0;
+exports.askDeveloperHub = exports.askAPIKey = exports.askExportDir = exports.askUsername = exports.askOTP = exports.askOTPChannel = exports.askPassword = void 0;
 const tslib_1 = require("tslib");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const path = tslib_1.__importStar(require("path"));
@@ -62,10 +62,23 @@ const askExportDir = async () => {
 };
 exports.askExportDir = askExportDir;
 const askAPIKey = async () => {
-    return cli_utilities_1.cliux.inquire({
+    return await cli_utilities_1.cliux.inquire({
         type: 'input',
         message: 'Enter the stack api key',
         name: 'apiKey',
     });
 };
 exports.askAPIKey = askAPIKey;
+const askDeveloperHub = async (regionName) => {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        name: 'name',
+        validate: (url) => {
+            if (!url)
+                return "Developer-hub URL can't be empty.";
+            return true;
+        },
+        message: `Enter the developer-hub base URL for the ${regionName} region - `,
+    });
+};
+exports.askDeveloperHub = askDeveloperHub;

package/lib/utils/marketplace-app-helper.d.ts

@@ -1 +1,11 @@
-export declare const getDeveloperHubUrl: () => Promise<any>;
+import { NodeCrypto, HttpClient } from '@contentstack/cli-utilities';
+import { ExportConfig } from '../types';
+export declare const getDeveloperHubUrl: (exportConfig: ExportConfig) => Promise<any>;
+export declare function getOrgUid(config: ExportConfig): Promise<string>;
+export declare function createNodeCryptoInstance(config: ExportConfig): Promise<NodeCrypto>;
+export declare const getStackSpecificApps: (params: {
+    developerHubBaseUrl: string;
+    httpClient: HttpClient;
+    config: ExportConfig;
+    skip: number;
+}) => Promise<any>;

package/lib/utils/marketplace-app-helper.js

@@ -1,23 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeveloperHubUrl = void 0;
-let { default: config } = require('../config');
-const { cliux, configHandler } = require('@contentstack/cli-utilities');
-const getDeveloperHubUrl = async () => {
-    const { cma, name } = configHandler.get('region') || {};
-    let developerHubBaseUrl = config.developerHubUrls[cma];
+exports.getStackSpecificApps = exports.createNodeCryptoInstance = exports.getOrgUid = exports.getDeveloperHubUrl = void 0;
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_1 = require("../utils");
+const interactive_1 = require("./interactive");
+const getDeveloperHubUrl = async (exportConfig) => {
+    const { cma, name } = cli_utilities_1.configHandler.get('region') || {};
+    let developerHubBaseUrl = exportConfig === null || exportConfig === void 0 ? void 0 : exportConfig.developerHubUrls[cma];
     if (!developerHubBaseUrl) {
-        developerHubBaseUrl = await cliux.inquire({
+        developerHubBaseUrl = await (0, interactive_1.askDeveloperHub)(name);
+    }
+    return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
+};
+exports.getDeveloperHubUrl = getDeveloperHubUrl;
+async function getOrgUid(config) {
+    const tempAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: config.host });
+    const tempStackData = await tempAPIClient
+        .stack({ api_key: config.source_stack })
+        .fetch()
+        .catch((error) => {
+        (0, utils_1.log)(this.config, (0, utils_1.formatError)(error), 'error');
+    });
+    return tempStackData === null || tempStackData === void 0 ? void 0 : tempStackData.org_uid;
+}
+exports.getOrgUid = getOrgUid;
+async function createNodeCryptoInstance(config) {
+    const cryptoArgs = { encryptionKey: '' };
+    if (config.forceStopMarketplaceAppsPrompt) {
+        cryptoArgs['encryptionKey'] = config.marketplaceAppEncryptionKey;
+    }
+    else {
+        cryptoArgs['encryptionKey'] = await cli_utilities_1.cliux.inquire({
             type: 'input',
             name: 'name',
+            default: config.marketplaceAppEncryptionKey,
             validate: (url) => {
                 if (!url)
-                    return "Developer-hub URL can't be empty.";
+                    return "Encryption key can't be empty.";
                 return true;
             },
-            message: `Enter the developer-hub base URL for the ${name} region - `,
+            message: 'Enter marketplace app configurations encryption key',
         });
     }
-    return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
+    return new cli_utilities_1.NodeCrypto(cryptoArgs);
+}
+exports.createNodeCryptoInstance = createNodeCryptoInstance;
+const getStackSpecificApps = async (params) => {
+    const { developerHubBaseUrl, httpClient, config, skip } = params;
+    return httpClient
+        .get(`${developerHubBaseUrl}/installations?target_uids=${config.source_stack}&skip=${skip}`)
+        .then((data) => data.data)
+        .catch((error) => (0, utils_1.log)(config, `Failed to export marketplace-apps ${(0, utils_1.formatError)(error)}`, 'error'));
 };
-exports.getDeveloperHubUrl = getDeveloperHubUrl;
+exports.getStackSpecificApps = getStackSpecificApps;

package/lib/utils/setup-branches.d.ts

@@ -1,3 +1,3 @@
-import { ExportConfig } from 'src/types';
+import { ExportConfig } from '../types';
 declare const setupBranches: (config: ExportConfig, stackAPIClient: any) => Promise<void>;
 export default setupBranches;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.1",
+  "version": "1.8.0",
   "commands": {
     "cm:stacks:export": {
       "id": "cm:stacks:export",

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.6.1",
+  "version": "1.8.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.0",
-    "@contentstack/cli-utilities": "^1.5.0",
+    "@contentstack/cli-command": "~1.2.11",
+    "@contentstack/cli-utilities": "~1.5.1",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
-    "@oclif/core": "^2.3.0",
+    "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -26,13 +26,14 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "^1.3.11",
-    "@contentstack/cli-config": "^1.4.9",
-    "@contentstack/cli-dev-dependencies": "^1.2.3",
+    "@contentstack/cli-auth": "~1.3.11",
+    "@contentstack/cli-config": "~1.4.9",
+    "@contentstack/cli-dev-dependencies": "~1.2.3",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
     "@types/mkdirp": "^1.0.2",
     "@types/progress-stream": "^2.0.2",
+    "@types/mkdirp": "^1.0.2",
     "assert": "^2.0.0",
     "chai": "^4.2.0",
     "dotenv": "^16.0.1",
@@ -61,6 +62,7 @@
     "lint": "eslint src/**/*.ts",
     "format": "eslint src/**/*.ts --fix",
     "test:integration": "INTEGRATION_TEST=true mocha --config ./test/.mocharc.js --forbid-only \"test/run.test.js\"",
+    "test:integration:report": "INTEGRATION_TEST=true nyc --extension .js mocha --forbid-only \"test/run.test.js\"",
     "test:unit": "mocha --forbid-only \"test/unit/*.test.ts\""
   },
   "engines": {