@contentstack/cli-cm-import 1.8.4 → 1.9.0

package/lib/import/modules/environments.js

@@ -4,13 +4,12 @@ const tslib_1 = require("tslib");
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const node_path_1 = require("node:path");
-const config_1 = tslib_1.__importDefault(require("../../config"));
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportEnvironments extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.environmentsConfig = config_1.default.modules.environments;
+        this.environmentsConfig = importConfig.modules.environments;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'environments');
         this.environmentsFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.environmentsConfig.dirName);
         this.envUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -51,7 +50,7 @@ class ImportEnvironments extends base_class_1.default {
     async importEnvironments() {
         if (this.environments === undefined || (0, isEmpty_1.default)(this.environments)) {
             (0, utils_1.log)(this.importConfig, 'No Environment Found', 'info');
-            return (0, node_path_1.resolve)();
+            return;
         }
         const apiContent = (0, values_1.default)(this.environments);
         const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
@@ -83,7 +82,7 @@ class ImportEnvironments extends base_class_1.default {
                 entity: 'create-environments',
                 includeParamOnCompletion: true,
             },
-            concurrencyLimit: config_1.default.fetchConcurrency || 2,
+            concurrencyLimit: this.importConfig.fetchConcurrency || 2,
         }, undefined, false);
     }
     /**

package/lib/import/modules/extensions.js

@@ -4,13 +4,12 @@ const tslib_1 = require("tslib");
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const node_path_1 = require("node:path");
-const config_1 = tslib_1.__importDefault(require("../../config"));
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportExtensions extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.extensionsConfig = config_1.default.modules.extensions;
+        this.extensionsConfig = importConfig.modules.extensions;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'extensions');
         this.extensionsFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.extensionsConfig.dirName);
         this.extUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -51,7 +50,7 @@ class ImportExtensions extends base_class_1.default {
     async importExtensions() {
         if (this.extensions === undefined || (0, isEmpty_1.default)(this.extensions)) {
             (0, utils_1.log)(this.importConfig, 'No Extensions Found', 'info');
-            return (0, node_path_1.resolve)();
+            return;
         }
         const apiContent = (0, values_1.default)(this.extensions);
         const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }) => {
@@ -83,7 +82,7 @@ class ImportExtensions extends base_class_1.default {
                 entity: 'create-extensions',
                 includeParamOnCompletion: true,
             },
-            concurrencyLimit: config_1.default.concurrency || config_1.default.fetchConcurrency || 1,
+            concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
     }
     /**

package/lib/import/modules/global-fields.js

@@ -72,8 +72,9 @@ class ImportGlobalFields extends base_class_1.default {
     async createGFs({ apiParams, element: globalField, isLastRequest, }) {
         return new Promise(async (resolve, reject) => {
             (0, utils_1.lookupExtension)(this.config, globalField.schema, this.config.preserveStackVersion, this.installedExtensions);
-            const isReferenceFieldRemoved = await (0, utils_1.removeReferenceFields)(globalField.schema, undefined, this.stackAPIClient);
-            if (isReferenceFieldRemoved) {
+            let flag = { supressed: false };
+            await (0, utils_1.removeReferenceFields)(globalField.schema, flag, this.stackAPIClient);
+            if (flag.supressed) {
                 this.pendingGFs.push(globalField.uid);
             }
             return this.stack

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

@@ -17,7 +17,7 @@ export default class Importlabels extends BaseClass {
      * @returns {Promise<void>} Promise<void>
      */
     start(): Promise<void>;
-    importlabels(): Promise<string>;
+    importlabels(): Promise<void>;
     /**
      * @method serializelabels
      * @param {ApiOptions} apiOptions ApiOptions
@@ -30,5 +30,5 @@ export default class Importlabels extends BaseClass {
      * @param {ApiOptions} apiOptions ApiOptions
      * @returns {ApiOptions} ApiOptions
      */
-    serializeUpdatelabels(apiOptions: ApiOptions): ApiOptions;
+    serializeUpdateLabels(apiOptions: ApiOptions): ApiOptions;
 }

package/lib/import/modules/labels.js

@@ -5,13 +5,12 @@ const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
 const node_path_1 = require("node:path");
-const config_1 = tslib_1.__importDefault(require("../../config"));
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class Importlabels extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.labelsConfig = config_1.default.modules.labels;
+        this.labelsConfig = importConfig.modules.labels;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'labels');
         this.labelsFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.labelsConfig.dirName);
         this.labelUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -56,7 +55,7 @@ class Importlabels extends base_class_1.default {
     async importlabels() {
         if (this.labels === undefined || (0, isEmpty_1.default)(this.labels)) {
             (0, utils_1.log)(this.importConfig, 'No Label Found', 'info');
-            return (0, node_path_1.resolve)();
+            return;
         }
         const apiContent = (0, values_1.default)(this.labels);
         const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
@@ -86,7 +85,7 @@ class Importlabels extends base_class_1.default {
                 entity: 'create-labels',
                 includeParamOnCompletion: true,
             },
-            concurrencyLimit: config_1.default.fetchConcurrency || 1,
+            concurrencyLimit: this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
     }
     /**
@@ -124,13 +123,13 @@ class Importlabels extends base_class_1.default {
                 apiContent,
                 processName: 'update labels',
                 apiParams: {
-                    serializeData: this.serializeUpdatelabels.bind(this),
+                    serializeData: this.serializeUpdateLabels.bind(this),
                     reject: onReject.bind(this),
                     resolve: onSuccess.bind(this),
                     entity: 'update-labels',
                     includeParamOnCompletion: true,
                 },
-                concurrencyLimit: config_1.default.fetchConcurrency || 1,
+                concurrencyLimit: this.importConfig.fetchConcurrency || 1,
             }, undefined, false);
         }
     }
@@ -139,7 +138,7 @@ class Importlabels extends base_class_1.default {
      * @param {ApiOptions} apiOptions ApiOptions
      * @returns {ApiOptions} ApiOptions
      */
-    serializeUpdatelabels(apiOptions) {
+    serializeUpdateLabels(apiOptions) {
         var _a, _b;
         const { apiData: label } = apiOptions;
         const labelUid = label.uid;

package/lib/import/modules/marketplace-apps.d.ts

@@ -16,6 +16,7 @@ export default class ImportMarketplaceApps extends BaseClass {
     developerHubBaseUrl: string;
     sdkClient: ContentstackClient;
     nodeCrypto: NodeCrypto;
+    appSdkAxiosInstance: any;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     /**
      * @method start

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

@@ -13,14 +13,13 @@ const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const toLower_1 = tslib_1.__importDefault(require("lodash/toLower"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const config_1 = tslib_1.__importDefault(require("../../config"));
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const interactive_1 = require("../../utils/interactive");
 const utils_1 = require("../../utils");
 class ImportMarketplaceApps extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.marketPlaceAppConfig = config_1.default.modules.marketplace_apps;
+        this.marketPlaceAppConfig = importConfig.modules.marketplace_apps;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'marketplace_apps');
         this.marketPlaceFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.marketPlaceAppConfig.dirName);
         this.marketPlaceUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -54,6 +53,9 @@ class ImportMarketplaceApps extends base_class_1.default {
         await utils_1.fsUtil.makeDirectory(this.mapperDirPath);
         this.developerHubBaseUrl = this.importConfig.developerHubBaseUrl || (await (0, utils_1.getDeveloperHubUrl)(this.importConfig));
         this.sdkClient = await (0, cli_utilities_1.managementSDKClient)({ endpoint: this.developerHubBaseUrl });
+        this.appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
+            host: this.developerHubBaseUrl.split('://').pop()
+        });
         this.importConfig.org_uid = await (0, utils_1.getOrgUid)(this.importConfig);
         await this.setHttpClient();
         await this.startInstallation();
@@ -298,10 +300,14 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
         // TODO migrate this HTTP API call into SDK
         // NOTE Use updateAppConfig(this.sdkClient, this.importConfig, app, payload) utility when migrating to SDK call;
-        return this.httpClient
-            .put(`${this.developerHubBaseUrl}/installations/${uid}`, payload)
+        return this.appSdkAxiosInstance.axiosInstance
+            .put(`${this.developerHubBaseUrl}/installations/${uid}`, payload, {
+            headers: {
+                organization_uid: this.importConfig.org_uid,
+            },
+        })
             .then(({ data }) => {
-            if (data.message) {
+            if (data === null || data === void 0 ? void 0 : data.message) {
                 (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'success');
             }
             else {

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

@@ -17,7 +17,7 @@ export default class ImportWebhooks extends BaseClass {
      * @returns {Promise<void>} Promise<void>
      */
     start(): Promise<void>;
-    importWebhooks(): Promise<string>;
+    importWebhooks(): Promise<void>;
     /**
      * @method serializeWebhooks
      * @param {ApiOptions} apiOptions ApiOptions

package/lib/import/modules/webhooks.js

@@ -4,13 +4,12 @@ const tslib_1 = require("tslib");
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const node_path_1 = require("node:path");
-const config_1 = tslib_1.__importDefault(require("../../config"));
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportWebhooks extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.webhooksConfig = config_1.default.modules.webhooks;
+        this.webhooksConfig = importConfig.modules.webhooks;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'webhooks');
         this.webhooksFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.webhooksConfig.dirName);
         this.webhookUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -53,7 +52,7 @@ class ImportWebhooks extends base_class_1.default {
     async importWebhooks() {
         if (this.webhooks === undefined || (0, isEmpty_1.default)(this.webhooks)) {
             (0, utils_1.log)(this.importConfig, 'No Webhook Found', 'info');
-            return (0, node_path_1.resolve)();
+            return;
         }
         const apiContent = (0, values_1.default)(this.webhooks);
         const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
@@ -84,7 +83,7 @@ class ImportWebhooks extends base_class_1.default {
                 entity: 'create-webhooks',
                 includeParamOnCompletion: true,
             },
-            concurrencyLimit: config_1.default.fetchConcurrency || 1,
+            concurrencyLimit: this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
     }
     /**

package/lib/import/modules/workflows.js

@@ -10,13 +10,12 @@ const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
 const findIndex_1 = tslib_1.__importDefault(require("lodash/findIndex"));
-const config_1 = tslib_1.__importDefault(require("../../config"));
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ImportWorkflows extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.workflowsConfig = config_1.default.modules.workflows;
+        this.workflowsConfig = importConfig.modules.workflows;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'workflows');
         this.workflowsFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.workflowsConfig.dirName);
         this.workflowUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -99,10 +98,11 @@ class ImportWorkflows extends base_class_1.default {
             utils_1.fsUtil.writeFile(this.workflowUidMapperPath, this.workflowUidMapper);
         };
         const onReject = ({ error, apiData }) => {
-            var _a;
+            var _a, _b;
             const err = (error === null || error === void 0 ? void 0 : error.message) ? JSON.parse(error.message) : error;
             const { name } = apiData;
-            if ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.name) {
+            const workflowExists = ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.name) || ((_b = err === null || err === void 0 ? void 0 : err.errors) === null || _b === void 0 ? void 0 : _b['workflow.name']);
+            if (workflowExists) {
                 (0, utils_1.log)(this.importConfig, `Workflow '${name}' already exists`, 'info');
             }
             else {
@@ -125,7 +125,7 @@ class ImportWorkflows extends base_class_1.default {
                 entity: 'create-workflows',
                 includeParamOnCompletion: true,
             },
-            concurrencyLimit: config_1.default.fetchConcurrency || 1,
+            concurrencyLimit: this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
     }
     updateNextAvailableStagesUid(workflow, newWorkflowStages, oldWorkflowStages) {
@@ -209,7 +209,7 @@ class ImportWorkflows extends base_class_1.default {
                         includeParamOnCompletion: true,
                         additionalInfo: { workflowUid: workflow.uid, stageIndex },
                     },
-                    concurrencyLimit: config_1.default.fetchConcurrency || 1,
+                    concurrencyLimit: this.importConfig.fetchConcurrency || 1,
                 }, undefined, false);
             }
             stageIndex++;

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

@@ -19,6 +19,7 @@ declare class ImportMarketplaceApps {
     start(): Promise<void>;
     mapperDirPath: string;
     uidMapperPath: string;
+    appSdkAxiosInstance: any;
     getOrgUid(): Promise<void>;
     getAndValidateEncryptionKey(defaultValue: any, retry?: number): any;
     nodeCrypto: NodeCrypto;

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

@@ -38,6 +38,9 @@ module.exports = class ImportMarketplaceApps {
         }
         this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
         this.client = await managementSDKClient({ endpoint: this.developerHubBaseUrl });
+        this.appSdkAxiosInstance = await managementSDKClient({
+            host: this.developerHubBaseUrl.split('://').pop()
+        });
         await this.getOrgUid();
         const httpClient = new HttpClient();
         if (!this.config.auth_token) {
@@ -392,8 +395,12 @@ module.exports = class ImportMarketplaceApps {
         if (_.isEmpty(app) || _.isEmpty(payload) || !uid) {
             return Promise.resolve();
         }
-        return this.httpClient
-            .put(`${this.developerHubBaseUrl}/installations/${uid}`, payload)
+        return this.appSdkAxiosInstance.axiosInstance
+            .put(`${this.developerHubBaseUrl}/installations/${uid}`, payload, {
+            headers: {
+                organization_uid: this.config.org_uid
+            },
+        })
             .then(({ data }) => {
             if (data.message) {
                 log(this.config, formatError(data.message), 'success');

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

@@ -128,7 +128,6 @@ export default interface DefaultConfig {
         stacks: string;
         labels: string;
     };
-    updatedModules: string[];
     rateLimit: number;
     preserveStackVersion: boolean;
     entriesPublish: boolean;
@@ -139,6 +138,5 @@ export default interface DefaultConfig {
     developerHubBaseUrl: string;
     marketplaceAppEncryptionKey: string;
     getEncryptionKeyMaxRetry: number;
-    useNewModuleStructure: boolean;
     createBackupDir?: string;
 }

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

@@ -41,6 +41,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     authtoken?: string;
     destinationStackName?: string;
     org_uid?: string;
+    contentVersion: number;
 }
 type branch = {
     uid: string;

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

@@ -1,4 +1,4 @@
 import Bluebird from 'bluebird';
-import { ImportConfig } from 'src/types';
+import { ImportConfig } from '../types';
 export declare const uploadAssetHelper: (config: ImportConfig, req: any, fsPath: string, RETRY?: number) => Bluebird<unknown>;
 export declare const lookupAssets: (data: Record<string, any>, mappedAssetUids: Record<string, any>, mappedAssetUrls: Record<string, any>, assetUidMapperPath: string, installedExtensions: Record<string, any>[]) => any;

package/lib/utils/backup-handler.js

@@ -2,33 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
-const ncp_1 = tslib_1.__importDefault(require("ncp"));
+const fs_extra_1 = require("fs-extra");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 const index_1 = require("./index");
 function setupBackupDir(importConfig) {
     return new Promise(async (resolve, reject) => {
         if (importConfig.hasOwnProperty('useBackedupDir')) {
             return resolve(importConfig.useBackedupDir);
         }
-        //NOTE: If the backup folder's directory is provided, create it at that location; otherwise, the default path (working directory).
-        let backupDirPath = path.join(process.cwd(), '_backup_' + Math.floor(Math.random() * 1000));
-        if (importConfig.createBackupDir) {
-            if (index_1.fileHelper.fileExistsSync(importConfig.createBackupDir)) {
-                index_1.fileHelper.removeDirSync(importConfig.createBackupDir);
+        const subDir = isSubDirectory(importConfig);
+        let backupDirPath;
+        if (subDir) {
+            backupDirPath = path.resolve(importConfig.contentDir, '..', '_backup_' + Math.floor(Math.random() * 1000));
+            if (importConfig.createBackupDir) {
+                cli_utilities_1.cliux.print(`Warning!!! Provided backup directory path is a sub directory of the content directory, Cannot copy to a sub directory. Hence new backup directory created - ${backupDirPath}`, {
+                    color: 'yellow',
+                });
             }
-            index_1.fileHelper.makeDirectory(importConfig.createBackupDir);
-            backupDirPath = importConfig.createBackupDir;
         }
-        const limit = importConfig.backupConcurrency || 16;
-        if (path.isAbsolute(importConfig.contentDir)) {
-            return (0, ncp_1.default)(importConfig.contentDir, backupDirPath, { limit }, (error) => {
-                if (error) {
-                    return reject(error);
+        else {
+            //NOTE: If the backup folder's directory is provided, create it at that location; otherwise, the default path (working directory).
+            backupDirPath = path.join(process.cwd(), '_backup_' + Math.floor(Math.random() * 1000));
+            if (importConfig.createBackupDir) {
+                if (index_1.fileHelper.fileExistsSync(importConfig.createBackupDir)) {
+                    index_1.fileHelper.removeDirSync(importConfig.createBackupDir);
                 }
-                return resolve(backupDirPath);
-            });
+                index_1.fileHelper.makeDirectory(importConfig.createBackupDir);
+                backupDirPath = importConfig.createBackupDir;
+            }
         }
-        else {
-            (0, ncp_1.default)(importConfig.contentDir, backupDirPath, (error) => {
+        if (backupDirPath) {
+            cli_utilities_1.cliux.print('Copying content to the backup directory...');
+            return (0, fs_extra_1.copy)(importConfig.contentDir, backupDirPath, (error) => {
                 if (error) {
                     return reject(error);
                 }
@@ -38,3 +43,18 @@ function setupBackupDir(importConfig) {
     });
 }
 exports.default = setupBackupDir;
+/**
+ * Check whether provided backup directory path is sub directory or not
+ * @param importConfig
+ * @returns
+ */
+function isSubDirectory(importConfig) {
+    const parent = importConfig.contentDir;
+    const child = importConfig.createBackupDir ? importConfig.createBackupDir : process.cwd();
+    const relative = path.relative(parent, child);
+    if (relative) {
+        return relative && !relative.startsWith('..') && !path.isAbsolute(relative);
+    }
+    //true if both parent and child have same path
+    return true;
+}

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

@@ -1,7 +1,10 @@
 /**
  * Entries lookup
  */
-export declare const lookupEntries: (data: any, mappedUids: Record<string, any>, uidMapperPath: string) => any;
-export declare const removeUidsFromJsonRteFields: (entry: Record<string, any>, ctSchema: Record<string, any>[]) => Record<string, any>;
-export declare const removeEntryRefsFromJSONRTE: (entry: Record<string, any>, ctSchema: Record<string, any>[]) => Record<string, any>;
+export declare const lookupEntries: (data: {
+    content_type: any;
+    entry: any;
+}, mappedUids: Record<string, any>, uidMapperPath: string) => any;
+export declare const removeUidsFromJsonRteFields: (entry: Record<string, any>, ctSchema?: Record<string, any>[]) => Record<string, any>;
+export declare const removeEntryRefsFromJSONRTE: (entry: Record<string, any>, ctSchema?: Record<string, any>[]) => Record<string, any>;
 export declare const restoreJsonRteEntryRefs: (entry: Record<string, any>, sourceStackEntry: any, ctSchema: any, { mappedAssetUids, mappedAssetUrls }: any) => Record<string, any>;

package/lib/utils/entries-helper.js

@@ -94,7 +94,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         }
     };
     const find = function (schema = [], _entry) {
-        for (let i = 0, _i = schema.length; i < _i; i++) {
+        for (let i = 0, _i = schema === null || schema === void 0 ? void 0 : schema.length; i < _i; i++) {
             switch (schema[i].data_type) {
                 case 'reference':
                     if (Array.isArray(schema[i].reference_to)) {
@@ -134,7 +134,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
             }
         }
     };
-    function findEntryIdsFromJsonRte(entry, ctSchema) {
+    function findEntryIdsFromJsonRte(entry, ctSchema = []) {
         for (const element of ctSchema) {
             switch (element.data_type) {
                 case 'blocks': {
@@ -249,7 +249,7 @@ function findUidsInNewRefFields(entry, uids) {
         }
     }
 }
-const removeUidsFromJsonRteFields = (entry, ctSchema) => {
+const removeUidsFromJsonRteFields = (entry, ctSchema = []) => {
     for (const element of ctSchema) {
         switch (element.data_type) {
             case 'blocks': {
@@ -339,7 +339,7 @@ function removeUidsFromChildren(children) {
         return children;
     }
 }
-const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
+const removeEntryRefsFromJSONRTE = (entry, ctSchema = []) => {
     for (const element of ctSchema) {
         switch (element.data_type) {
             case 'blocks': {
@@ -379,7 +379,8 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                             let entryReferences = jsonRteData.children.filter((e) => doEntryReferencesExist(e));
                             if (entryReferences.length > 0) {
                                 jsonRteData.children = jsonRteData.children.filter((e) => !doEntryReferencesExist(e));
-                                if (jsonRteData.children.length === 0) { // empty children array are no longer acceptable by the API, a default structure must be there 
+                                if (jsonRteData.children.length === 0) {
+                                    // empty children array are no longer acceptable by the API, a default structure must be there
                                     jsonRteData.children.push(JSON.parse(structuredPTag));
                                 }
                                 return jsonRteData; // return jsonRteData without entry references
@@ -432,14 +433,14 @@ function doEntryReferencesExist(element) {
 function isEntryRef(element) {
     return element.type === 'reference' && element.attrs.type === 'entry';
 }
-const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema, { mappedAssetUids, mappedAssetUrls }) => {
+const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { mappedAssetUids, mappedAssetUrls }) => {
     // let mappedAssetUids = fileHelper.readFileSync(this.mappedAssetUidPath) || {};
     // let mappedAssetUrls = fileHelper.readFileSync(this.mappedAssetUrlPath) || {};
     for (const element of ctSchema) {
         switch (element.data_type) {
             case 'blocks': {
                 if (entry[element.uid]) {
-                    if (element.multiple) {
+                    if (element.multiple && Array.isArray(entry[element.uid])) {
                         entry[element.uid] = entry[element.uid].map((e, eIndex) => {
                             let key = Object.keys(e).pop();
                             let subBlock = element.blocks.filter((block) => block.uid === key).pop();
@@ -457,7 +458,7 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema, { mappedAsse
             case 'global_field':
             case 'group': {
                 if (entry[element.uid]) {
-                    if (element.multiple) {
+                    if (element.multiple && Array.isArray(entry[element.uid])) {
                         entry[element.uid] = entry[element.uid].map((e, eIndex) => {
                             let sourceStackElement = sourceStackEntry[element.uid][eIndex];
                             e = (0, exports.restoreJsonRteEntryRefs)(e, sourceStackElement, element.schema, { mappedAssetUids, mappedAssetUrls });
@@ -476,7 +477,7 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema, { mappedAsse
             }
             case 'json': {
                 if (entry[element.uid] && element.field_metadata.rich_text_type) {
-                    if (element.multiple) {
+                    if (element.multiple && Array.isArray(entry[element.uid])) {
                         entry[element.uid] = entry[element.uid].map((field, index) => {
                             // i am facing a Maximum call stack exceeded issue,
                             // probably because of this loop operation
@@ -543,7 +544,7 @@ function setDirtyTrue(jsonRteChild) {
         }
         delete jsonRteChild.uid;
         if (jsonRteChild.children && jsonRteChild.children.length > 0) {
-            jsonRteChild.children = jsonRteChild.children.map((subElement) => this.setDirtyTrue(subElement));
+            jsonRteChild.children = jsonRteChild.children.map((subElement) => setDirtyTrue(subElement));
         }
     }
     return jsonRteChild;

package/lib/utils/import-config-handler.js

@@ -24,6 +24,13 @@ const setupConfig = async (importCmdFlags) => {
     config.contentDir = path.resolve(config.contentDir);
     //Note to support the old key
     config.data = config.contentDir;
+    if ((0, file_helper_1.fileExistsSync)(path.join(config.contentDir, 'export-info.json'))) {
+        config.contentVersion =
+            ((await (0, file_helper_1.readFile)(path.join(config.contentDir, 'export-info.json'))) || {}).contentVersion || 2;
+    }
+    else {
+        config.contentVersion = 1;
+    }
     const managementTokenAlias = importCmdFlags['management-token-alias'] || importCmdFlags['alias'];
     if (managementTokenAlias) {
         const { token, apiKey } = cli_utilities_1.configHandler.get(`tokens.${managementTokenAlias}`);

package/lib/utils/logger.js

@@ -55,7 +55,7 @@ let successTransport;
 let errorTransport;
 function init(_logPath) {
     if (!logger || !errorLogger) {
-        var logsDir = path.resolve(_logPath, 'logs', 'export');
+        var logsDir = path.resolve(_logPath, 'logs', 'import');
         // Create dir if doesn't already exist
         mkdirp_1.default.sync(logsDir);
         successTransport = {

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

@@ -13,8 +13,15 @@ const interactive_1 = require("./interactive");
 const utils_1 = require("../utils");
 const interactive_2 = require("../utils/interactive");
 const getAllStackSpecificApps = async (developerHubBaseUrl, httpClient, config) => {
-    return await httpClient
-        .get(`${developerHubBaseUrl}/installations?target_uids=${config.target_stack}`)
+    const appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
+        host: developerHubBaseUrl.split('://').pop()
+    });
+    return await appSdkAxiosInstance.axiosInstance
+        .get(`${developerHubBaseUrl}/installations?target_uids=${config.target_stack}`, {
+        headers: {
+            organization_uid: config.org_uid,
+        },
+    })
         .then(({ data }) => data.data)
         .catch((error) => (0, logger_1.log)(config, `Failed to export marketplace-apps ${(0, utils_1.formatError)(error)}`, 'error'));
 };

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.4",
+  "version": "1.9.0",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,34 +1,35 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.8.4",
+  "version": "1.9.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
+    "@contentstack/management": "~1.10.2",
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
-    "@contentstack/management": "~1.10.0",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "debug": "^4.1.0",
+    "fs-extra": "^11.1.1",
     "lodash": "^4.17.20",
     "marked": "^4.0.17",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
-    "ncp": "^2.0.0",
     "promise-limit": "^2.7.0",
     "tslib": "^2.4.1",
     "winston": "^3.7.2"
   },
   "devDependencies": {
     "@oclif/test": "^1.2.6",
+    "@types/big-json": "^3.2.0",
     "@types/bluebird": "^3.5.38",
     "@types/chai": "^4.2.18",
+    "@types/fs-extra": "^11.0.1",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.2",
-    "@types/ncp": "^2.0.5",
     "@types/node": "^14.14.32",
     "@types/sinon": "^10.0.2",
     "@types/tar": "^4.0.3",