@contentstack/cli-cm-export 1.9.0 → 1.9.2

package/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.9.0 linux-x64 node-v18.18.0
+@contentstack/cli-cm-export/1.9.2 linux-x64 node-v18.18.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/commands/cm/stacks/export.js

@@ -8,6 +8,7 @@ const export_1 = require("../../../export");
 const utils_1 = require("../../../utils");
 class ExportCommand extends cli_command_1.Command {
     async run() {
+        var _a;
         let exportDir;
         try {
             const { flags } = await this.parse(ExportCommand);
@@ -18,7 +19,9 @@ class ExportCommand extends cli_command_1.Command {
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(exportConfig);
             const moduleExporter = new export_1.ModuleExporter(managementAPIClient, exportConfig);
             await moduleExporter.start();
-            (0, utils_1.writeExportMetaFile)(exportConfig);
+            if (!((_a = exportConfig.branches) === null || _a === void 0 ? void 0 : _a.length)) {
+                (0, utils_1.writeExportMetaFile)(exportConfig);
+            }
             (0, utils_1.log)(exportConfig, `The content of the stack ${exportConfig.apiKey} has been exported successfully!`, 'success');
             (0, utils_1.log)(exportConfig, `The log has been stored at '${path_1.default.join(exportDir, 'logs', 'export')}'`, 'success');
         }

package/lib/export/module-exporter.js

@@ -31,6 +31,8 @@ class ModuleExporter {
             try {
                 this.exportConfig.branchName = branch.uid;
                 this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, branch.uid);
+                (0, utils_1.log)(this.exportConfig, `Exporting content from branch ${branch.uid}`, 'success');
+                (0, utils_1.writeExportMetaFile)(this.exportConfig, this.exportConfig.branchDir);
                 await this.export();
                 (0, utils_1.log)(this.exportConfig, `The content of branch ${branch.uid} has been exported successfully!`, 'success');
             }

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

@@ -47,12 +47,11 @@ class ExportMarketplaceApps extends base_class_1.default {
     async getAllStackSpecificApps(skip = 0) {
         const data = await (0, utils_1.getStackSpecificApps)({
             developerHubBaseUrl: this.developerHubBaseUrl,
-            httpClient: this.httpClient,
             config: this.exportConfig,
             skip,
         });
         const { data: apps, count } = data;
-        if (!this.nodeCrypto && (0, find_1.default)(apps, (app) => (0, isEmpty_1.default)(app.configuration))) {
+        if (!this.nodeCrypto && (0, find_1.default)(apps, (app) => !(0, isEmpty_1.default)(app.configuration))) {
             this.nodeCrypto = await (0, utils_1.createNodeCryptoInstance)(this.exportConfig);
         }
         const stackApps = (0, map_1.default)(apps, (app) => {

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

@@ -26,7 +26,7 @@ module.exports = class ExportMarketplaceApps {
         }
         this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
         this.appSdkAxiosInstance = await managementSDKClient({
-            host: this.developerHubBaseUrl.split('://').pop()
+            endpoint: this.developerHubBaseUrl,
         });
         await this.getOrgUid();
         const httpClient = new HttpClient();
@@ -54,7 +54,7 @@ module.exports = class ExportMarketplaceApps {
             log(this.config, formatError(error), 'error');
             console.log(error);
         });
-        if (tempStackData && tempStackData.org_uid) {
+        if (tempStackData === null || tempStackData === void 0 ? void 0 : tempStackData.org_uid) {
             this.config.org_uid = tempStackData.org_uid;
         }
     }
@@ -65,7 +65,7 @@ module.exports = class ExportMarketplaceApps {
             for (const [index, app] of _.entries(installedApps)) {
                 await this.getAppConfigurations(client, installedApps, [+index, app]);
             }
-            await fileHelper.writeFileSync(path.join(this.marketplaceAppPath, this.marketplaceAppConfig.fileName), installedApps);
+            fileHelper.writeFileSync(path.join(this.marketplaceAppPath, this.marketplaceAppConfig.fileName), installedApps);
             log(this.config, chalk.green('All the marketplace apps have been exported successfully'), 'success');
         }
         else {

package/lib/utils/common-helper.d.ts

@@ -9,4 +9,4 @@ export declare const formatError: (error: any) => any;
 export declare const executeTask: (tasks: unknown[], handler: (task: unknown) => Promise<unknown>, options: {
     concurrency: number;
 }) => Promise<unknown[]>;
-export declare const writeExportMetaFile: (exportConfig: ExportConfig) => void;
+export declare const writeExportMetaFile: (exportConfig: ExportConfig, metaFilePath?: string) => void;

package/lib/utils/common-helper.js

@@ -79,11 +79,11 @@ const executeTask = function (tasks = [], handler, options) {
 };
 exports.executeTask = executeTask;
 // Note: we can add more useful details in meta file
-const writeExportMetaFile = (exportConfig) => {
+const writeExportMetaFile = (exportConfig, metaFilePath) => {
     const exportMeta = {
         contentVersion: exportConfig.contentVersion,
         logsPath: path.join(exportConfig.exportDir, 'logs', 'export'),
     };
-    file_helper_1.fsUtil.writeFile(path.join(exportConfig.exportDir, exportConfig.branchName || '', 'export-info.json'), exportMeta);
+    file_helper_1.fsUtil.writeFile(path.join(metaFilePath || exportConfig.exportDir, 'export-info.json'), exportMeta);
 };
 exports.writeExportMetaFile = writeExportMetaFile;

package/lib/utils/file-helper.js

@@ -85,7 +85,7 @@ const writeLargeFile = function (filePath, data) {
         const stringifyStream = big_json_1.default.createStringifyStream({
             body: data,
         });
-        var writeStream = fs.createWriteStream(filePath, 'utf-8');
+        let writeStream = fs.createWriteStream(filePath, 'utf-8');
         stringifyStream.pipe(writeStream);
         writeStream.on('finish', () => {
             resolve('');

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

@@ -1,11 +1,10 @@
-import { NodeCrypto, HttpClient } from '@contentstack/cli-utilities';
+import { NodeCrypto } 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

@@ -46,9 +46,9 @@ async function createNodeCryptoInstance(config) {
 }
 exports.createNodeCryptoInstance = createNodeCryptoInstance;
 const getStackSpecificApps = async (params) => {
-    const { developerHubBaseUrl, httpClient, config, skip } = params;
+    const { developerHubBaseUrl, config, skip } = params;
     const appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
-        host: developerHubBaseUrl.split('://').pop()
+        endpoint: developerHubBaseUrl,
     });
     return appSdkAxiosInstance.axiosInstance
         .get(`${developerHubBaseUrl}/installations?target_uids=${config.source_stack}&skip=${skip}`, {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.9.0",
+  "version": "1.9.2",
   "commands": {
     "cm:stacks:export": {
       "id": "cm:stacks:export",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.12",
-    "@contentstack/cli-utilities": "~1.5.2",
+    "@contentstack/cli-command": "~1.2.14",
+    "@contentstack/cli-utilities": "~1.5.4",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -24,7 +24,7 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "~1.3.13",
+    "@contentstack/cli-auth": "~1.3.14",
     "@contentstack/cli-config": "~1.4.11",
     "@contentstack/cli-dev-dependencies": "~1.2.3",
     "@oclif/plugin-help": "^5.1.19",
@@ -94,7 +94,7 @@
     },
     "shortCommandName": {
       "cm:stacks:export": "EXPRT",
-      "cm:export": "EXPRT"
+      "cm:export": "O-EXPRT"
     }
   },
   "repository": "https://github.com/contentstack/cli"