@contentstack/cli-cm-import 1.15.0 → 1.15.2

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.0 linux-x64 node-v18.19.1
+@contentstack/cli-cm-import/1.15.2 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/entries.d.ts

@@ -65,7 +65,7 @@ export default class EntriesImport extends BaseClass {
         cTUid: string;
         locale: string;
     }): Promise<void>;
-    replaceEntriesHandler({ apiParams, element: entry }: {
+    replaceEntriesHandler({ apiParams, element: entry, }: {
         apiParams: ApiOptions;
         element: Record<string, string>;
         isLastRequest: boolean;

package/lib/import/modules/entries.js

@@ -429,7 +429,7 @@ class EntriesImport extends base_class_1.default {
             }
         }
     }
-    async replaceEntriesHandler({ apiParams, element: entry }) {
+    async replaceEntriesHandler({ apiParams, element: entry, }) {
         const { additionalInfo: { cTUid, locale } = {} } = apiParams;
         return new Promise(async (resolve, reject) => {
             const { items: [entryInStack] = [] } = (await this.stack
@@ -710,11 +710,11 @@ class EntriesImport extends base_class_1.default {
             return Promise.resolve();
         }
         // log(this.importConfig, `Starting publish entries for ${cTUid} in locale ${locale}`, 'info');
-        const onSuccess = ({ response, apiData: { environments, entryUid }, additionalInfo }) => {
-            (0, utils_1.log)(this.importConfig, `Published entry: '${entryUid}' of content type ${cTUid} and locale ${locale} in ${environments === null || environments === void 0 ? void 0 : environments.join(',')} environments`, 'info');
+        const onSuccess = ({ response, apiData: { environments, entryUid, locales }, additionalInfo }) => {
+            (0, utils_1.log)(this.importConfig, `Published the entry: '${entryUid}' of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments === null || environments === void 0 ? void 0 : environments.join(',')}' and Locales '${locales === null || locales === void 0 ? void 0 : locales.join(',')}'`, 'info');
         };
-        const onReject = ({ error, apiData, additionalInfo }) => {
-            (0, utils_1.log)(this.importConfig, `${apiData.entryUid} entry of content type ${cTUid} in locale ${locale} failed to publish`, 'error');
+        const onReject = ({ error, apiData: { environments, entryUid, locales }, additionalInfo }) => {
+            (0, utils_1.log)(this.importConfig, `Failed to publish: '${entryUid}' entry of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments === null || environments === void 0 ? void 0 : environments.join(',')}' and Locales '${locales === null || locales === void 0 ? void 0 : locales.join(',')}'`, 'error');
             (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
         };
         for (const index in indexer) {

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

@@ -163,31 +163,37 @@ class ImportMarketplaceApps {
         if ((0, isEmpty_1.default)(privateApps)) {
             return Promise.resolve();
         }
-        await (0, utils_1.getConfirmationToCreateApps)(privateApps, this.importConfig);
-        (0, utils_1.log)(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
-        for (let app of privateApps) {
-            if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
-                // NOTE Found app already exist in the same org
-                this.appUidMapping[app.uid] = app.uid;
-                cli_utilities_1.cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
-                continue;
+        let canCreatePrivateApp = await (0, utils_1.getConfirmationToCreateApps)(privateApps, this.importConfig);
+        this.importConfig.canCreatePrivateApp = canCreatePrivateApp;
+        if (canCreatePrivateApp) {
+            (0, utils_1.log)(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
+            for (let app of privateApps) {
+                if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
+                    // NOTE Found app already exist in the same org
+                    this.appUidMapping[app.uid] = app.uid;
+                    cli_utilities_1.cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
+                    continue;
+                }
+                // NOTE keys can be passed to install new app in the developer hub
+                const validKeys = [
+                    'uid',
+                    'name',
+                    'icon',
+                    'oauth',
+                    'webhook',
+                    'visibility',
+                    'target_type',
+                    'description',
+                    'ui_location',
+                    'framework_version',
+                ];
+                const manifest = (0, pick_1.default)(app.manifest, validKeys);
+                this.appOriginalName = manifest.name;
+                await this.createPrivateApp(manifest);
             }
-            // NOTE keys can be passed to install new app in the developer hub
-            const validKeys = [
-                'uid',
-                'name',
-                'icon',
-                'oauth',
-                'webhook',
-                'visibility',
-                'target_type',
-                'description',
-                'ui_location',
-                'framework_version',
-            ];
-            const manifest = (0, pick_1.default)(app.manifest, validKeys);
-            this.appOriginalName = manifest.name;
-            await this.createPrivateApp(manifest);
+        }
+        else {
+            (0, utils_1.log)(this.importConfig, 'Skipping private apps creation on Developer Hub...', 'success');
         }
         this.appOriginalName = undefined;
     }
@@ -332,6 +338,10 @@ class ImportMarketplaceApps {
         const currentStackApp = (0, find_1.default)(this.installedApps, { manifest: { uid: (_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.uid } });
         if (!currentStackApp) {
             // NOTE install new app
+            if (app.manifest.visibility === 'private' && !this.importConfig.canCreatePrivateApp) {
+                (0, utils_1.log)(this.importConfig, `Skipping the installation of the private app ${app.manifest.name}...`, 'info');
+                return Promise.resolve();
+            }
             const installation = await this.installApp(this.importConfig, 
             // NOTE if it's private app it should get uid from mapper else will use manifest uid
             this.appUidMapping[app.manifest.uid] || app.manifest.uid);

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

@@ -85,7 +85,7 @@ module.exports = class ImportMarketplaceApps {
                     return "Encryption key can't be empty.";
                 return true;
             },
-            message: 'Enter marketplace app configurations encryption key',
+            message: 'Enter Marketplace app configurations encryption key',
         });
         try {
             appConfig = !_.isEmpty(appConfig.configuration) ? appConfig.configuration : appConfig.server_configuration;

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

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

package/lib/utils/asset-helper.js

@@ -235,9 +235,11 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUrls.forEach(function (assetUrl) {
         let mappedAssetUrl = mappedAssetUrls[assetUrl];
         if (typeof mappedAssetUrl !== 'undefined') {
-            const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
-            const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
-            entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
+            //NOTE - This code was added to resolve the SRE issue but once the code was merged Assets URLs in JSON RTE started breaking
+            // const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
+            // const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
+            // entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
+            entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
             matchedUrls.push(mappedAssetUrl);
         }
         else {

package/lib/utils/interactive.js

@@ -35,7 +35,7 @@ const askEncryptionKey = async (defaultValue) => {
                 return "Encryption key can't be empty.";
             return true;
         },
-        message: 'Enter marketplace app configurations encryption key',
+        message: 'Enter Marketplace app configurations encryption key',
     });
 };
 exports.askEncryptionKey = askEncryptionKey;

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

@@ -60,13 +60,21 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
     if (!config.forceStopMarketplaceAppsPrompt) {
         if (!(await cli_utilities_1.cliux.confirm(chalk_1.default.yellow(`WARNING!!! The listed apps are private apps that are not available in the destination stack: \n\n${(0, map_1.default)(privateApps, ({ manifest: { name } }, index) => `${String(index + 1)}) ${name}`).join('\n')}\n\nWould you like to re-create the private app and then proceed with the installation? (y/n)`)))) {
             if (await cli_utilities_1.cliux.confirm(chalk_1.default.yellow(`\nWARNING!!! Canceling the app re-creation may break the content type and entry import. Would you like to proceed without re-create the private app? (y/n)`))) {
-                return Promise.resolve(true);
+                return Promise.resolve(false);
             }
-            if (!(await cli_utilities_1.cliux.confirm(chalk_1.default.yellow('\nWould you like to re-create the private app and then proceed with the installation? (y/n)')))) {
-                process.exit();
+            else {
+                if (await cli_utilities_1.cliux.confirm(chalk_1.default.yellow('\nWould you like to re-create the private app and then proceed with the installation? (y/n)'))) {
+                    return Promise.resolve(true);
+                }
+                else {
+                    return Promise.resolve(false);
+                }
             }
         }
     }
+    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.0",
+  "version": "1.15.2",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",
@@ -12,6 +12,7 @@
       "aliases": [
         "cm:import"
       ],
+      "hiddenAliases": [],
       "examples": [
         "csdx cm:stacks:import --stack-api-key <stack_api_key> --data-dir <path/of/export/destination/dir>",
         "csdx cm:stacks:import --config <path/of/config/dir>",

package/package.json

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