@contentstack/cli-cm-import 1.15.1 → 1.15.3

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.15.1 linux-x64 node-v18.20.1
+@contentstack/cli-cm-import/1.15.3 linux-x64 node-v18.20.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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

@@ -17,7 +17,7 @@ class ImportCommand extends cli_command_1.Command {
             let importConfig = await (0, utils_1.setupImportConfig)(flags);
             // Note setting host to create cma client
             importConfig.host = this.cmaHost;
-            backupDir = importConfig.backupDir;
+            backupDir = importConfig.cliLogsPath || importConfig.backupDir;
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(importConfig);
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
             const result = await moduleImporter.start();
@@ -26,11 +26,13 @@ class ImportCommand extends cli_command_1.Command {
                     ? `Successfully imported the content to the stack named ${importConfig.stackName} with the API key ${importConfig.apiKey} .`
                     : `The content has been imported to the stack ${importConfig.apiKey} successfully!`, 'success');
             }
-            (0, utils_1.log)(importConfig, `The log has been stored at '${(0, cli_utilities_1.pathValidator)(node_path_1.default.join(importConfig.backupDir, 'logs', 'import'))}'`, 'success');
+            (0, utils_1.log)(importConfig, `The log has been stored at '${(0, cli_utilities_1.pathValidator)(node_path_1.default.join(importConfig.cliLogsPath || importConfig.backupDir, 'logs', 'import'))}'`, 'success');
         }
         catch (error) {
             (0, utils_1.log)({ data: backupDir !== null && backupDir !== void 0 ? backupDir : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import')) }, `Failed to import stack content - ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)({ data: backupDir }, `The log has been stored at ${{ data: backupDir } ? (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import')) : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(__dirname, 'logs'))}`, 'info');
+            (0, utils_1.log)({ data: backupDir }, `The log has been stored at ${{ data: backupDir }
+                ? (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import'))
+                : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(__dirname, 'logs'))}`, 'info');
         }
     }
 }

package/lib/import/module-importer.js

@@ -96,7 +96,7 @@ class ModuleImporter {
      * fix available and the user confirms to proceed with the fix, otherwise it returns `false`.
      */
     async auditImportData(logger) {
-        const basePath = (0, path_1.resolve)(this.importConfig.backupDir, 'logs', 'audit');
+        const basePath = (0, path_1.resolve)(this.importConfig.cliLogsPath || this.importConfig.backupDir, 'logs', 'audit');
         const auditConfig = this.importConfig.auditConfig;
         auditConfig.config.basePath = basePath;
         auditConfig.config.branch = this.importConfig.branchName;

package/lib/import/modules/assets.js

@@ -220,7 +220,7 @@ class ImportAssets extends base_class_1.default {
                 return this.environments.hasOwnProperty(environment);
             });
             const environments = (0, uniq_1.default)((0, map_1.default)(publishDetails, ({ environment }) => this.environments[environment].name));
-            const locales = (0, map_1.default)(publishDetails, 'locale');
+            const locales = (0, uniq_1.default)((0, map_1.default)(publishDetails, 'locale'));
             asset.locales = locales;
             asset.environments = environments;
             apiOptions.uid = this.assetsUidMap[asset.uid];

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

@@ -9,6 +9,7 @@ export interface ExternalConfig {
     password?: string;
 }
 export default interface ImportConfig extends DefaultConfig, ExternalConfig {
+    cliLogsPath: string;
     canCreatePrivateApp: boolean;
     contentDir: string;
     data: string;

package/lib/utils/log.js

@@ -22,7 +22,7 @@ exports.log = log;
 function initLogger(config) {
     var _a;
     if (!logger) {
-        const basePath = (0, cli_utilities_1.pathValidator)((0, path_1.join)((_a = config === null || config === void 0 ? void 0 : config.data) !== null && _a !== void 0 ? _a : process.cwd(), 'logs', 'import'));
+        const basePath = (0, cli_utilities_1.pathValidator)((0, path_1.join)((_a = config === null || config === void 0 ? void 0 : config.cliLogsPath) !== null && _a !== void 0 ? _a : process.cwd(), 'logs', 'import'));
         exports.logger = logger = new cli_utilities_1.Logger(Object.assign(config !== null && config !== void 0 ? config : {}, { basePath }));
     }
     return logger;

package/lib/utils/logger.js

@@ -121,17 +121,17 @@ function init(_logPath) {
     };
 }
 const log = async (config, message, type) => {
-    config.data = config.data || path.join(__dirname, 'logs');
+    config.cliLogsPath = config.cliLogsPath || config.data || path.join(__dirname, 'logs');
     // ignoring the type argument, as we are not using it to create a logfile anymore
     if (type !== 'error') {
         // removed type argument from init method
         if (type === 'warn')
-            init(config.data).warn(message); //logged warning message in log file
+            init(config.cliLogsPath).warn(message); //logged warning message in log file
         else
-            init(config.data).log(message);
+            init(config.cliLogsPath).log(message);
     }
     else {
-        init(config.data).error(message);
+        init(config.cliLogsPath).error(message);
     }
 };
 exports.log = log;

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

@@ -72,6 +72,9 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
             }
         }
     }
+    else {
+        return Promise.resolve(true);
+    }
 };
 exports.getConfirmationToCreateApps = getConfirmationToCreateApps;
 const handleNameConflict = async (app, appSuffix, config) => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.15.1",
+  "version": "1.15.3",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.15.1",
+  "version": "1.15.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.5.3",
+    "@contentstack/cli-audit": "~1.5.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "@contentstack/management": "~1.15.3",