@contentstack/cli-cm-import 1.14.3 → 1.15.1

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.14.3 linux-x64 node-v18.19.1
+@contentstack/cli-cm-import/1.15.1 linux-x64 node-v18.20.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/import/module-importer.js

@@ -99,6 +99,7 @@ class ModuleImporter {
         const basePath = (0, path_1.resolve)(this.importConfig.backupDir, 'logs', 'audit');
         const auditConfig = this.importConfig.auditConfig;
         auditConfig.config.basePath = basePath;
+        auditConfig.config.branch = this.importConfig.branchName;
         try {
             const args = [
                 '--data-dir',

package/lib/import/modules/entries.d.ts

@@ -36,6 +36,8 @@ export default class EntriesImport extends BaseClass {
     private autoCreatedEntries;
     private taxonomiesPath;
     taxonomies: Record<string, unknown>;
+    rteCTs: any;
+    rteCTsWithRef: any;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<any>;
     disableMandatoryCTReferences(): Promise<void>;
@@ -63,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

@@ -37,6 +37,8 @@ class EntriesImport extends base_class_1.default {
         this.envs = {};
         this.autoCreatedEntries = [];
         this.failedEntries = [];
+        this.rteCTs = [];
+        this.rteCTsWithRef = [];
     }
     async start() {
         var _a;
@@ -150,6 +152,8 @@ class EntriesImport extends base_class_1.default {
             references: false,
             jsonRte: false,
             jsonRteEmbeddedEntries: false,
+            rte: false,
+            rteEmbeddedEntries: false,
         };
         (0, utils_1.suppressSchemaReference)(contentType.schema, flag);
         if (flag.references) {
@@ -164,6 +168,15 @@ class EntriesImport extends base_class_1.default {
                 }
             }
         }
+        if (flag.rte) {
+            this.rteCTs.push(contentType.uid);
+            if (flag.rteEmbeddedEntries) {
+                this.rteCTsWithRef.push(contentType.uid);
+                if (this.refCTs.indexOf(contentType.uid) === -1) {
+                    this.refCTs.push(contentType.uid);
+                }
+            }
+        }
         // Check if suppress modified flag
         if (flag.suppressed) {
             this.modifiedCTs.push((0, lodash_1.find)(this.cTs, { uid: contentType.uid }));
@@ -318,6 +331,12 @@ class EntriesImport extends base_class_1.default {
             if (this.jsonRteCTsWithRef.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
             }
+            if (this.rteCTs.indexOf(cTUid) > -1) {
+                entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+            }
+            if (this.rteCTsWithRef.indexOf(cTUid) > -1) {
+                entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+            }
             //will remove term if term doesn't exists in taxonomy
             (0, utils_1.lookUpTerms)(contentType === null || contentType === void 0 ? void 0 : contentType.schema, entry, this.taxonomies, this.importConfig);
             // will replace all old asset uid/urls with new ones
@@ -410,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
@@ -536,7 +555,7 @@ class EntriesImport extends base_class_1.default {
             // Removing temp values
             delete entry.sourceEntryFilePath;
             delete entry.entryOldUid;
-            if (this.jsonRteCTs.indexOf(cTUid) > -1) {
+            if (this.jsonRteCTs.indexOf(cTUid) > -1 || this.rteCTs.indexOf(cTUid) > -1) {
                 // the entries stored in eSuccessFilePath, have the same uids as the entries from source data
                 entry = (0, utils_1.restoreJsonRteEntryRefs)(entry, sourceEntry, contentType.schema, {
                     uidMapper: this.entriesUidMapper,
@@ -544,6 +563,10 @@ class EntriesImport extends base_class_1.default {
                     mappedAssetUrls: this.assetUrlMapper,
                 });
             }
+            entry = (0, utils_1.lookupAssets)({
+                content_type: contentType,
+                entry: entry,
+            }, this.assetUidMapper, this.assetUrlMapper, path.join(this.entriesPath, cTUid), this.installedExtensions);
             entry = (0, utils_1.lookupEntries)({
                 content_type: contentType,
                 entry,
@@ -687,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/default-config.d.ts

@@ -153,6 +153,7 @@ export default interface DefaultConfig {
         noTerminalOutput?: boolean;
         config?: {
             basePath?: string;
+            branch?: string;
         } & Record<string, any>;
     };
 }

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

@@ -9,6 +9,7 @@ export interface ExternalConfig {
     password?: string;
 }
 export default interface ImportConfig extends DefaultConfig, ExternalConfig {
+    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/content-type-helper.js

@@ -68,6 +68,11 @@ const suppressSchemaReference = function (schema, flag) {
             if (schema[i].field_metadata.embed_entry === true)
                 flag.jsonRteEmbeddedEntries = true;
         }
+        else if (schema[i].data_type === 'text' && schema[i].field_metadata.rich_text_type) {
+            flag.rte = true;
+            if (schema[i].field_metadata.embed_entry === true)
+                flag.rteEmbeddedEntries = true;
+        }
         if ((schema[i].hasOwnProperty('mandatory') && schema[i].mandatory) ||
             (schema[i].hasOwnProperty('unique') && schema[i].unique)) {
             if (schema[i].uid !== 'title') {

package/lib/utils/entries-helper.js

@@ -418,6 +418,21 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema = []) => {
                 }
                 break;
             }
+            case 'text': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    if (element.multiple) {
+                        let rteContent = [];
+                        for (let i = 0; i < entry[element.uid].length; i++) {
+                            rteContent.push('<p></p>');
+                        }
+                        entry[element.uid] = rteContent;
+                    }
+                    else {
+                        entry[element.uid] = '<p></p>';
+                    }
+                }
+                break;
+            }
         }
     }
     return entry;
@@ -525,11 +540,34 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { uidMa
                 }
                 break;
             }
+            case 'text': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    entry[element.uid] = sourceStackEntry[element.uid];
+                    const matches = Object.keys(uidMapper).filter((uid) => {
+                        if (sourceStackEntry[element.uid].indexOf(uid) !== -1)
+                            return uid;
+                    });
+                    if (element.multiple && Array.isArray(entry[element.uid])) {
+                        for (let i = 0; i < matches.length; i++) {
+                            entry[element.uid] = entry[element.uid].map((el) => updateUids(el, matches[i], uidMapper));
+                        }
+                    }
+                    else {
+                        for (let i = 0; i < matches.length; i++) {
+                            entry[element.uid] = updateUids(entry[element.uid], matches[i], uidMapper);
+                        }
+                    }
+                }
+                break;
+            }
         }
     }
     return entry;
 };
 exports.restoreJsonRteEntryRefs = restoreJsonRteEntryRefs;
+function updateUids(str, match, uidMapper) {
+    return str.replace(new RegExp(match, 'g'), (match) => uidMapper[match]);
+}
 function setDirtyTrue(jsonRteChild) {
     // also removing uids in this function
     if (jsonRteChild.type) {

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/marketplace-app-helper.js

@@ -60,10 +60,15 @@ 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);
+                }
             }
         }
     }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.14.3",
+  "version": "1.15.1",
   "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.14.3",
+  "version": "1.15.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.5.0",
+    "@contentstack/cli-audit": "~1.5.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "@contentstack/management": "~1.15.3",
@@ -34,7 +34,7 @@
     "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.32",
     "@types/sinon": "^10.0.2",
-    "@types/tar": "^4.0.3",
+    "@types/tar": "^6.1.3",
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "chai": "^4.2.0",
@@ -99,4 +99,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}