@contentstack/cli-cm-import 1.13.3 → 1.14.0

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

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

@@ -22,7 +22,9 @@ class ImportCommand extends cli_command_1.Command {
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
             const result = await moduleImporter.start();
             if (!(result === null || result === void 0 ? void 0 : result.noSuccessMsg)) {
-                (0, utils_1.log)(importConfig, `The content has been imported to the stack ${importConfig.apiKey} successfully!`, 'success');
+                (0, utils_1.log)(importConfig, importConfig.stackName
+                    ? `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 '${node_path_1.default.join(importConfig.backupDir, 'logs', 'import')}'`, 'success');
         }

package/lib/config/index.js

@@ -148,11 +148,7 @@ const config = {
         taxonomies: {
             dirName: 'taxonomies',
             fileName: 'taxonomies.json',
-        },
-        terms: {
-            dirName: 'terms',
-            fileName: 'terms.json',
-        },
+        }
     },
     languagesCode: [
         'af-za',

package/lib/import/module-importer.js

@@ -18,6 +18,10 @@ class ModuleImporter {
         this.importConfig = importConfig;
     }
     async start() {
+        if (!this.importConfig.management_token) {
+            const stackName = await this.stackAPIClient.fetch();
+            this.importConfig.stackName = stackName.name;
+        }
         if (this.importConfig.branchName) {
             await (0, utils_1.validateBranch)(this.stackAPIClient, this.importConfig, this.importConfig.branchName);
         }

package/lib/import/modules/base-class.d.ts

@@ -3,7 +3,7 @@ import { ImportConfig, ModuleClassParams } from '../../types';
 export type AdditionalKeys = {
     backupDir: string;
 };
-export type ApiModuleType = 'create-assets' | 'replace-assets' | 'publish-assets' | 'create-assets-folder' | 'create-extensions' | 'update-extensions' | 'create-locale' | 'update-locale' | 'create-gfs' | 'create-cts' | 'update-cts' | 'update-gfs' | 'create-environments' | 'create-labels' | 'update-labels' | 'create-webhooks' | 'create-workflows' | 'create-custom-role' | 'create-entries' | 'update-entries' | 'publish-entries' | 'delete-entries' | 'create-taxonomies' | 'create-terms';
+export type ApiModuleType = 'create-assets' | 'replace-assets' | 'publish-assets' | 'create-assets-folder' | 'create-extensions' | 'update-extensions' | 'create-locale' | 'update-locale' | 'create-gfs' | 'create-cts' | 'update-cts' | 'update-gfs' | 'create-environments' | 'create-labels' | 'update-labels' | 'create-webhooks' | 'create-workflows' | 'create-custom-role' | 'create-entries' | 'update-entries' | 'publish-entries' | 'delete-entries' | 'create-taxonomies' | 'create-terms' | 'import-taxonomy';
 export type ApiOptions = {
     uid?: string;
     url?: string;

package/lib/import/modules/base-class.js

@@ -122,6 +122,11 @@ class BaseClass {
             additionalInfo,
             apiData: includeParamOnCompletion ? apiData : undefined,
         });
+        if (!apiData ||
+            (entity === 'publish-entries' && !apiData.entryUid) ||
+            (entity === 'update-extensions' && !apiData.uid)) {
+            return Promise.resolve();
+        }
         switch (entity) {
             case 'create-assets-folder':
                 return this.stack
@@ -154,6 +159,16 @@ class BaseClass {
                     .create({ extension: (0, omit_1.default)(apiData, ['uid']) })
                     .then(onSuccess)
                     .catch(onReject);
+            case 'update-extensions':
+                return this.stack
+                    .extension(apiData.uid)
+                    .fetch()
+                    .then((extension) => {
+                    extension.scope = apiData.scope;
+                    return extension.update();
+                })
+                    .then(onSuccess)
+                    .catch(onReject);
             case 'create-locale':
                 return this.stack
                     .locale()
@@ -169,14 +184,8 @@ class BaseClass {
             case 'create-cts':
                 return this.stack.contentType().create(apiData).then(onSuccess).catch(onReject);
             case 'update-cts':
-                if (!apiData) {
-                    return Promise.resolve();
-                }
                 return apiData.update().then(onSuccess).catch(onReject);
             case 'update-gfs':
-                if (!apiData) {
-                    return Promise.resolve();
-                }
                 return apiData.update().then(onSuccess).catch(onReject);
             case 'create-environments':
                 return this.stack
@@ -218,9 +227,6 @@ class BaseClass {
                     .then(onSuccess)
                     .catch(onReject);
             case 'create-entries':
-                if (!apiData) {
-                    return Promise.resolve();
-                }
                 if ((_a = additionalInfo[apiData === null || apiData === void 0 ? void 0 : apiData.uid]) === null || _a === void 0 ? void 0 : _a.isLocalized) {
                     return apiData.update({ locale: additionalInfo.locale }).then(onSuccess).catch(onReject);
                 }
@@ -231,14 +237,8 @@ class BaseClass {
                     .then(onSuccess)
                     .catch(onReject);
             case 'update-entries':
-                if (!apiData) {
-                    return Promise.resolve();
-                }
                 return apiData.update({ locale: additionalInfo.locale }).then(onSuccess).catch(onReject);
             case 'publish-entries':
-                if (!apiData || !apiData.entryUid) {
-                    return Promise.resolve();
-                }
                 return this.stack
                     .contentType(additionalInfo.cTUid)
                     .entry(apiData.entryUid)
@@ -258,14 +258,17 @@ class BaseClass {
             case 'create-taxonomies':
                 return this.stack.taxonomy().create({ taxonomy: apiData }).then(onSuccess).catch(onReject);
             case 'create-terms':
-                if (apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy_uid) {
-                    return this.stack
-                        .taxonomy(apiData.taxonomy_uid)
-                        .terms()
-                        .create({ term: apiData })
-                        .then(onSuccess)
-                        .catch(onReject);
+                return this.stack
+                    .taxonomy(apiData.taxonomy_uid)
+                    .terms()
+                    .create({ term: apiData })
+                    .then(onSuccess)
+                    .catch(onReject);
+            case 'import-taxonomy':
+                if (!apiData || !apiData.filePath) {
+                    return Promise.resolve();
                 }
+                return this.stack.taxonomy(uid).import({ taxonomy: apiData.filePath }).then(onSuccess).catch(onReject);
             default:
                 return Promise.resolve();
         }

package/lib/import/modules/content-types.d.ts

@@ -32,6 +32,7 @@ export default class ContentTypesImport extends BaseClass {
     private gFsConfig;
     private taxonomiesPath;
     taxonomies: Record<string, unknown>;
+    private extPendingPath;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<any>;
     seedCTs(): Promise<any>;
@@ -55,4 +56,5 @@ export default class ContentTypesImport extends BaseClass {
      * @returns {ApiOptions} ApiOptions
      */
     serializeUpdateGFs(apiOptions: ApiOptions): ApiOptions;
+    updatePendingExtensions(): Promise<any>;
 }

package/lib/import/modules/content-types.js

@@ -39,6 +39,7 @@ class ContentTypesImport extends base_class_1.default {
         this.createdGFs = [];
         this.pendingGFs = [];
         this.taxonomiesPath = path.join(importConfig.data, 'mapper/taxonomies', 'success.json');
+        this.extPendingPath = path.join(importConfig.data, 'mapper', 'extensions', 'pending_extensions.js');
     }
     async start() {
         /**
@@ -63,6 +64,9 @@ class ContentTypesImport extends base_class_1.default {
         if (this.fieldRules.length > 0) {
             await utils_1.fsUtil.writeFile(path.join(this.cTsFolderPath, 'field_rules_uid.json'), this.fieldRules);
         }
+        (0, utils_1.log)(this.importConfig, 'Updating the extensions...', 'success');
+        await this.updatePendingExtensions();
+        (0, utils_1.log)(this.importConfig, 'Successfully updated the extensions.', 'success');
         await this.updatePendingGFs().catch((error) => {
             (0, utils_1.log)(this.importConfig, `Error while updating pending global field ${(0, utils_1.formatError)(error)}`, 'error');
         });
@@ -190,5 +194,39 @@ class ContentTypesImport extends base_class_1.default {
         apiOptions.apiData = globalFieldPayload;
         return apiOptions;
     }
+    async updatePendingExtensions() {
+        let apiContent = utils_1.fsUtil.readFile(this.extPendingPath);
+        if (apiContent.length === 0) {
+            (0, utils_1.log)(this.importConfig, `No extensions found to be updated.`, 'success');
+            return;
+        }
+        const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }) => {
+            (0, utils_1.log)(this.importConfig, `Successfully updated the '${response.title}' extension.`, 'success');
+        };
+        const onReject = ({ error, apiData }) => {
+            var _a;
+            const { uid } = apiData;
+            if ((_a = error === null || error === void 0 ? void 0 : error.errors) === null || _a === void 0 ? void 0 : _a.title) {
+                if (!this.importConfig.skipExisting) {
+                    (0, utils_1.log)(this.importConfig, `Extension '${uid}' already exists.`, 'info');
+                }
+            }
+            else {
+                (0, utils_1.log)(this.importConfig, `Failed to update '${uid}' extension due to ${(0, utils_1.formatError)(error)}.`, 'error');
+                (0, utils_1.log)(this.importConfig, error, 'error');
+            }
+        };
+        return await this.makeConcurrentCall({
+            apiContent,
+            processName: 'update extensions',
+            apiParams: {
+                reject: onReject.bind(this),
+                resolve: onSuccess.bind(this),
+                entity: 'update-extensions',
+                includeParamOnCompletion: true,
+            },
+            concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
+        }, undefined, false);
+    }
 }
 exports.default = ContentTypesImport;

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

@@ -12,6 +12,8 @@ export default class ImportExtensions extends BaseClass {
     private extSuccess;
     private extFailed;
     private existingExtensions;
+    private extPendingPath;
+    private extensionObject;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     /**
      * @method start
@@ -25,4 +27,6 @@ export default class ImportExtensions extends BaseClass {
         element: Record<string, string>;
         isLastRequest: boolean;
     }): Promise<unknown>;
+    getContentTypesInScope(): void;
+    updateUidExtension(): void;
 }

package/lib/import/modules/extensions.js

@@ -16,10 +16,12 @@ class ImportExtensions extends base_class_1.default {
         this.extUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
         this.extSuccessPath = (0, node_path_1.join)(this.mapperDirPath, 'success.json');
         this.extFailsPath = (0, node_path_1.join)(this.mapperDirPath, 'fails.json');
+        this.extPendingPath = (0, node_path_1.join)(this.mapperDirPath, 'pending_extensions.js');
         this.extFailed = [];
         this.extSuccess = [];
         this.existingExtensions = [];
         this.extUidMapper = {};
+        this.extensionObject = [];
     }
     /**
      * @method start
@@ -40,7 +42,12 @@ class ImportExtensions extends base_class_1.default {
         this.extUidMapper = utils_1.fileHelper.fileExistsSync(this.extUidMapperPath)
             ? utils_1.fsUtil.readFile((0, node_path_1.join)(this.extUidMapperPath), true)
             : {};
+        // Check whether the scope of an extension contains content-types in scope
+        // Remove the scope and store the scope with uid in pending extensions
+        this.getContentTypesInScope();
         await this.importExtensions();
+        // Update the uid of the extension
+        this.updateUidExtension();
         // Note: if any extensions present, then update it
         if (this.importConfig.replaceExisting && this.existingExtensions.length > 0) {
             await this.replaceExtensions().catch((error) => {
@@ -167,5 +174,25 @@ class ImportExtensions extends base_class_1.default {
             }
         });
     }
+    getContentTypesInScope() {
+        const extension = (0, values_1.default)(this.extensions);
+        extension.forEach((ext) => {
+            var _a;
+            let ct = ((_a = ext === null || ext === void 0 ? void 0 : ext.scope) === null || _a === void 0 ? void 0 : _a.content_types) || [];
+            if ((ct.length === 1 && ct[0] !== '$all') || (ct === null || ct === void 0 ? void 0 : ct.length) > 1) {
+                (0, utils_1.log)(this.importConfig, `Removing the content-types ${ct.join(',')} from the extension ${ext.title} ...`, 'info');
+                const { uid, scope } = ext;
+                this.extensionObject.push({ uid, scope });
+                delete ext.scope;
+                this.extensions[ext.uid] = ext;
+            }
+        });
+    }
+    updateUidExtension() {
+        for (let i in this.extensionObject) {
+            this.extensionObject[i].uid = this.extUidMapper[this.extensionObject[i].uid];
+        }
+        utils_1.fsUtil.writeFile(this.extPendingPath, this.extensionObject);
+    }
 }
 exports.default = ImportExtensions;

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

@@ -7,17 +7,13 @@ export default class ImportTaxonomies extends BaseClass {
     private taxFailsPath;
     private taxonomiesConfig;
     private taxonomies;
-    private termsFolderPath;
     private termsMapperDirPath;
-    private termsConfig;
     private termsSuccessPath;
     private termsFailsPath;
-    taxonomiesSuccess: Record<string, unknown>;
-    taxonomiesFailed: Record<string, unknown>;
-    termsSuccess: Record<string, Record<string, unknown>>;
-    termsFailed: Record<string, Record<string, unknown>>;
-    terms: Record<string, any>;
-    taxonomyUIDs: string[];
+    createdTaxonomies: Record<string, unknown>;
+    failedTaxonomies: Record<string, unknown>;
+    createdTerms: Record<string, Record<string, unknown>>;
+    failedTerms: Record<string, Record<string, unknown>>;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     /**
      * @method start
@@ -39,25 +35,8 @@ export default class ImportTaxonomies extends BaseClass {
     serializeTaxonomy(apiOptions: ApiOptions): ApiOptions;
     /**
      * create taxonomies success and fail in (mapper/taxonomies)
-     * @method createTaxonomySuccessAndFailedFile
-     */
-    createTaxonomySuccessAndFailedFile(): void;
-    /**
-     * create terms and enter success & failure related data into terms mapper file
-     * @method importTerms
-     * @async
-     * @returns {Promise<any>} Promise<any>
-     */
-    importTerms(): Promise<any>;
-    /**
-     * @method serializeTerms
-     * @param {ApiOptions} apiOptions ApiOptions
-     * @returns {ApiOptions} ApiOptions
-     */
-    serializeTerms(apiOptions: ApiOptions): ApiOptions;
-    /**
      * create terms success and fail in (mapper/taxonomies/terms)
-     * @method createTermSuccessAndFailedFile
+     * @method createSuccessAndFailedFile
      */
-    createTermSuccessAndFailedFile(): void;
+    createSuccessAndFailedFile(): void;
 }

package/lib/import/modules/taxonomies.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const keys_1 = tslib_1.__importDefault(require("lodash/keys"));
-const pick_1 = tslib_1.__importDefault(require("lodash/pick"));
 const node_path_1 = require("node:path");
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
@@ -11,18 +9,14 @@ const utils_1 = require("../../utils");
 class ImportTaxonomies extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.taxonomiesSuccess = {};
-        this.taxonomiesFailed = {};
-        this.termsSuccess = {};
-        this.termsFailed = {};
-        this.terms = [];
-        this.taxonomyUIDs = [];
+        this.createdTaxonomies = {};
+        this.failedTaxonomies = {};
+        this.createdTerms = {};
+        this.failedTerms = {};
         this.taxonomiesConfig = importConfig.modules.taxonomies;
-        this.termsConfig = importConfig.modules.terms;
         this.taxonomiesMapperDirPath = (0, node_path_1.join)(importConfig.backupDir, 'mapper', 'taxonomies');
         this.termsMapperDirPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, 'terms');
         this.taxonomiesFolderPath = (0, node_path_1.join)(importConfig.backupDir, this.taxonomiesConfig.dirName);
-        this.termsFolderPath = (0, node_path_1.join)(this.taxonomiesFolderPath, this.termsConfig.dirName);
         this.taxSuccessPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, 'success.json');
         this.taxFailsPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, 'fails.json');
         this.termsSuccessPath = (0, node_path_1.join)(this.termsMapperDirPath, 'success.json');
@@ -45,16 +39,10 @@ class ImportTaxonomies extends base_class_1.default {
         //Step 2 create taxonomies & terms mapper directory
         await utils_1.fsUtil.makeDirectory(this.taxonomiesMapperDirPath);
         await utils_1.fsUtil.makeDirectory(this.termsMapperDirPath);
-        //Step 3 import taxonomy and create success & failure file
+        // Step 3 import taxonomies
         await this.importTaxonomies();
-        this.createTaxonomySuccessAndFailedFile();
-        if (!utils_1.fileHelper.fileExistsSync(this.termsFolderPath)) {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.termsFolderPath}'`, 'error');
-            return;
-        }
-        //Step 4 import terms and create success & failure file
-        await this.importTerms();
-        this.createTermSuccessAndFailedFile();
+        //Step 4 create taxonomy & related terms success & failure file
+        this.createSuccessAndFailedFile();
         (0, utils_1.log)(this.importConfig, 'Taxonomies imported successfully!', 'success');
     }
     /**
@@ -69,24 +57,25 @@ class ImportTaxonomies extends base_class_1.default {
             return;
         }
         const apiContent = (0, values_1.default)(this.taxonomies);
-        this.taxonomyUIDs = (0, keys_1.default)(this.taxonomies);
-        const onSuccess = ({ response }) => {
-            const { uid } = response;
-            this.taxonomiesSuccess[uid] = (0, pick_1.default)(response, ['name', 'description']);
-            (0, utils_1.log)(this.importConfig, `Taxonomy '${uid}' imported successfully!`, 'success');
+        const onSuccess = ({ apiData }) => {
+            var _a;
+            const taxonomyUID = (_a = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _a === void 0 ? void 0 : _a.uid;
+            this.createdTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
+            this.createdTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
+            (0, utils_1.log)(this.importConfig, `Taxonomy '${taxonomyUID}' imported successfully!`, 'success');
         };
         const onReject = ({ error, apiData }) => {
-            var _a;
-            const err = (error === null || error === void 0 ? void 0 : error.message) ? JSON.parse(error.message) : error;
-            const { uid } = apiData;
-            if ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.taxonomy) {
-                this.taxonomiesFailed[uid] = apiData;
-                (0, utils_1.log)(this.importConfig, `Taxonomy '${uid}' failed to be import! ${err.errors.taxonomy}`, 'error');
+            var _a, _b, _c;
+            const taxonomyUID = (_a = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _a === void 0 ? void 0 : _a.uid;
+            if ((error === null || error === void 0 ? void 0 : error.errorMessage) || (error === null || error === void 0 ? void 0 : error.message)) {
+                const errorMsg = (error === null || error === void 0 ? void 0 : error.errorMessage) || ((_b = error === null || error === void 0 ? void 0 : error.errors) === null || _b === void 0 ? void 0 : _b.taxonomy) || ((_c = error === null || error === void 0 ? void 0 : error.errors) === null || _c === void 0 ? void 0 : _c.term) || (error === null || error === void 0 ? void 0 : error.message);
+                (0, utils_1.log)(this.importConfig, `Taxonomy '${taxonomyUID}' failed to be import! ${errorMsg}`, 'error');
             }
             else {
-                this.taxonomiesFailed[apiData.uid] = apiData;
-                (0, utils_1.log)(this.importConfig, `Taxonomy '${uid}' failed to be import! ${(0, utils_1.formatError)(error)}`, 'error');
+                (0, utils_1.log)(this.importConfig, `Taxonomy '${taxonomyUID}' failed to be import! ${(0, utils_1.formatError)(error)}`, 'error');
             }
+            this.failedTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
+            this.failedTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
         };
         await this.makeConcurrentCall({
             apiContent,
@@ -95,7 +84,7 @@ class ImportTaxonomies extends base_class_1.default {
                 serializeData: this.serializeTaxonomy.bind(this),
                 reject: onReject,
                 resolve: onSuccess,
-                entity: 'create-taxonomies',
+                entity: 'import-taxonomy',
                 includeParamOnCompletion: true,
             },
             concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
@@ -107,110 +96,35 @@ class ImportTaxonomies extends base_class_1.default {
      * @returns {ApiOptions} ApiOptions
      */
     serializeTaxonomy(apiOptions) {
-        const { apiData: taxonomy } = apiOptions;
-        apiOptions.apiData = taxonomy;
-        return apiOptions;
-    }
-    /**
-     * create taxonomies success and fail in (mapper/taxonomies)
-     * @method createTaxonomySuccessAndFailedFile
-     */
-    createTaxonomySuccessAndFailedFile() {
-        if (this.taxonomiesSuccess !== undefined && !(0, isEmpty_1.default)(this.taxonomiesSuccess)) {
-            utils_1.fsUtil.writeFile(this.taxSuccessPath, this.taxonomiesSuccess);
-        }
-        if (this.taxonomiesFailed !== undefined && !(0, isEmpty_1.default)(this.taxonomiesFailed)) {
-            utils_1.fsUtil.writeFile(this.taxFailsPath, this.taxonomiesFailed);
-        }
-    }
-    /**
-     * create terms and enter success & failure related data into terms mapper file
-     * @method importTerms
-     * @async
-     * @returns {Promise<any>} Promise<any>
-     */
-    async importTerms() {
-        var _a, _b;
-        if (!((_a = this.taxonomyUIDs) === null || _a === void 0 ? void 0 : _a.length)) {
-            return;
-        }
-        const onSuccess = ({ response, apiData: { taxonomy_uid } = { taxonomy_uid: null } }) => {
-            var _a;
-            const { uid } = response;
-            if (!((_a = this.termsSuccess) === null || _a === void 0 ? void 0 : _a[taxonomy_uid]))
-                this.termsSuccess[taxonomy_uid] = {};
-            this.termsSuccess[taxonomy_uid][uid] = (0, pick_1.default)(response, ['name']);
-            (0, utils_1.log)(this.importConfig, `Term '${uid}' imported successfully!`, 'success');
-        };
-        const onReject = ({ error, apiData }) => {
-            var _a, _b;
-            const { taxonomy_uid, uid } = apiData;
-            if (!((_a = this.termsFailed) === null || _a === void 0 ? void 0 : _a[taxonomy_uid]))
-                this.termsFailed[taxonomy_uid] = {};
-            const err = (error === null || error === void 0 ? void 0 : error.message) ? JSON.parse(error.message) : error;
-            if ((_b = err === null || err === void 0 ? void 0 : err.errors) === null || _b === void 0 ? void 0 : _b.term) {
-                this.termsFailed[taxonomy_uid][uid] = apiData;
-                (0, utils_1.log)(this.importConfig, `Term '${uid}' failed to be import! ${err.errors.term}`, 'error');
-            }
-            else {
-                this.termsFailed[taxonomy_uid][uid] = apiData;
-                (0, utils_1.log)(this.importConfig, `Term '${uid}' failed to be import! ${(0, utils_1.formatError)(error)}`, 'error');
-            }
-        };
-        for (const taxUID of this.taxonomyUIDs) {
-            //read terms from respective taxonomy
-            this.terms = utils_1.fsUtil.readFile((0, node_path_1.join)(this.termsFolderPath, `${taxUID}-${this.termsConfig.fileName}`), true);
-            if ((_b = this.terms) === null || _b === void 0 ? void 0 : _b.length) {
-                const apiContent = this.terms;
-                await this.makeConcurrentCall({
-                    apiContent,
-                    processName: 'import terms',
-                    apiParams: {
-                        serializeData: this.serializeTerms.bind(this),
-                        reject: onReject,
-                        resolve: onSuccess,
-                        entity: 'create-terms',
-                        includeParamOnCompletion: true,
-                    },
-                    concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
-                }, undefined, false);
-            }
-        }
-    }
-    /**
-     * @method serializeTerms
-     * @param {ApiOptions} apiOptions ApiOptions
-     * @returns {ApiOptions} ApiOptions
-     */
-    serializeTerms(apiOptions) {
-        var _a, _b;
-        const { apiData: term } = apiOptions;
-        const { parent_uid, taxonomy_uid } = term;
-        //check whether parent term exists or not in taxonomy
-        if (parent_uid !== null) {
-            if (!((_b = (_a = this.termsSuccess) === null || _a === void 0 ? void 0 : _a[taxonomy_uid]) === null || _b === void 0 ? void 0 : _b[parent_uid])) {
-                (0, utils_1.log)(this.importConfig, `Parent term '${term === null || term === void 0 ? void 0 : term.parent_uid}' does not exist! Skipping '${term.uid}' creation to avoid further issues.`, 'info');
-                apiOptions.apiData = undefined;
-            }
-            else {
-                apiOptions.apiData = term;
-            }
+        const { apiData } = apiOptions;
+        const filePath = (0, node_path_1.join)(this.taxonomiesFolderPath, `${apiData === null || apiData === void 0 ? void 0 : apiData.uid}.json`);
+        if (utils_1.fileHelper.fileExistsSync(filePath)) {
+            const taxonomyDetails = utils_1.fsUtil.readFile(filePath, true);
+            apiOptions.apiData = { filePath, taxonomy: taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.taxonomy, terms: taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.terms };
         }
         else {
-            apiOptions.apiData = term;
+            (0, utils_1.log)(this.importConfig, `No such file - ${filePath}`, 'error');
+            apiOptions.apiData = undefined;
         }
         return apiOptions;
     }
     /**
+     * create taxonomies success and fail in (mapper/taxonomies)
      * create terms success and fail in (mapper/taxonomies/terms)
-     * @method createTermSuccessAndFailedFile
+     * @method createSuccessAndFailedFile
      */
-    createTermSuccessAndFailedFile() {
-        if (this.termsSuccess !== undefined && !(0, isEmpty_1.default)(this.termsSuccess)) {
-            utils_1.fsUtil.writeFile(this.termsSuccessPath, this.termsSuccess);
+    createSuccessAndFailedFile() {
+        if (this.createdTaxonomies !== undefined && !(0, isEmpty_1.default)(this.createdTaxonomies)) {
+            utils_1.fsUtil.writeFile(this.taxSuccessPath, this.createdTaxonomies);
+        }
+        if (this.failedTaxonomies !== undefined && !(0, isEmpty_1.default)(this.failedTaxonomies)) {
+            utils_1.fsUtil.writeFile(this.taxFailsPath, this.failedTaxonomies);
+        }
+        if (this.createdTerms !== undefined && !(0, isEmpty_1.default)(this.createdTerms)) {
+            utils_1.fsUtil.writeFile(this.termsSuccessPath, this.createdTerms);
         }
-        if (this.termsFailed !== undefined && !(0, isEmpty_1.default)(this.termsFailed)) {
-            utils_1.fsUtil.writeFile(this.termsFailsPath, this.termsFailed);
+        if (this.failedTerms !== undefined && !(0, isEmpty_1.default)(this.failedTerms)) {
+            utils_1.fsUtil.writeFile(this.termsFailsPath, this.failedTerms);
         }
     }
 }

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

@@ -117,11 +117,6 @@ export default interface DefaultConfig {
             fileName: string;
             dependencies?: Modules[];
         };
-        terms: {
-            dirName: string;
-            fileName: string;
-            dependencies?: Modules[];
-        };
     };
     languagesCode: string[];
     apis: {

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

@@ -46,6 +46,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     replaceExisting?: boolean;
     skipExisting?: boolean;
     skipAudit?: boolean;
+    stackName?: string;
 }
 type branch = {
     uid: string;

package/lib/types/index.d.ts

@@ -65,12 +65,12 @@ export interface TaxonomiesConfig {
     fileName: string;
     dependencies?: Modules[];
 }
-export interface TermsConfig {
-    dirName: string;
-    fileName: string;
-    dependencies?: Modules[];
-}
 export { default as DefaultConfig } from './default-config';
 export { default as ImportConfig } from './import-config';
 export * from './entries';
 export * from './marketplace-app';
+export type ExtensionType = {
+    uid: string;
+    scope: Record<string, unknown>;
+    title: string;
+};

package/lib/utils/interactive.d.ts

@@ -1,6 +1,5 @@
 export declare const askContentDir: () => Promise<string>;
 export declare const askAPIKey: () => Promise<string>;
-export declare const askDeveloperHubUrl: (regionName: string) => Promise<string>;
 export declare const askEncryptionKey: (defaultValue: unknown) => Promise<string>;
 export declare const askAppName: (app: any, appSuffix: number) => Promise<string>;
 export declare const getAppName: (name: string, appSuffix?: number) => string;

package/lib/utils/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectConfiguration = exports.getAppName = exports.askAppName = exports.askEncryptionKey = exports.askDeveloperHubUrl = exports.askAPIKey = exports.askContentDir = void 0;
+exports.selectConfiguration = exports.getAppName = exports.askAppName = exports.askEncryptionKey = exports.askAPIKey = exports.askContentDir = void 0;
 const tslib_1 = require("tslib");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const path = tslib_1.__importStar(require("path"));
@@ -23,19 +23,6 @@ const askAPIKey = async () => {
     });
 };
 exports.askAPIKey = askAPIKey;
-const askDeveloperHubUrl = async (regionName) => {
-    return await cli_utilities_1.cliux.inquire({
-        type: 'input',
-        name: 'name',
-        validate: (url) => {
-            if (!url)
-                return "Developer-hub URL can't be empty.";
-            return true;
-        },
-        message: `Enter the developer-hub base URL for the ${regionName} region -`,
-    });
-};
-exports.askDeveloperHubUrl = askDeveloperHubUrl;
 const askEncryptionKey = async (defaultValue) => {
     return await cli_utilities_1.cliux.inquire({
         type: 'input',

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

@@ -11,8 +11,7 @@ const cli_utilities_1 = require("@contentstack/cli-utilities");
 const logger_1 = require("./logger");
 const log_1 = require("../utils/log");
 const utils_1 = require("../utils");
-const interactive_1 = require("./interactive");
-const interactive_2 = require("../utils/interactive");
+const interactive_1 = require("../utils/interactive");
 const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
     const appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({
         host: config.developerHubBaseUrl.split('://').pop(),
@@ -42,12 +41,7 @@ const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
 };
 exports.getAllStackSpecificApps = getAllStackSpecificApps;
 const getDeveloperHubUrl = async (config) => {
-    const { cma, name } = cli_utilities_1.configHandler.get('region') || {};
-    let developerHubBaseUrl = config.developerHubUrls[cma];
-    if (!developerHubBaseUrl) {
-        developerHubBaseUrl = await (0, interactive_1.askDeveloperHubUrl)(name);
-    }
-    return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
+    return (0, cli_utilities_1.createDeveloperHubUrl)(config.host);
 };
 exports.getDeveloperHubUrl = getDeveloperHubUrl;
 const getOrgUid = async (config) => {
@@ -77,8 +71,8 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
 exports.getConfirmationToCreateApps = getConfirmationToCreateApps;
 const handleNameConflict = async (app, appSuffix, config) => {
     const appName = config.forceStopMarketplaceAppsPrompt
-        ? (0, interactive_2.getAppName)(app.name, appSuffix)
-        : await (0, interactive_2.askAppName)(app, appSuffix);
+        ? (0, interactive_1.getAppName)(app.name, appSuffix)
+        : await (0, interactive_1.askAppName)(app, appSuffix);
     app.name = appName;
     return app;
 };
@@ -124,7 +118,7 @@ const ifAppAlreadyExist = async (app, currentStackApp, config) => {
         cli_utilities_1.cliux.print(`\nWARNING!!! The ${name} app already exists and it may have its own configuration. But the current app you install has its own configuration which is used internally to manage content.\n`, { color: 'yellow' });
         const configOption = config.forceStopMarketplaceAppsPrompt
             ? 'Update it with the new configuration.'
-            : await (0, interactive_2.selectConfiguration)();
+            : await (0, interactive_1.selectConfiguration)();
         if (configOption === 'Exit') {
             process.exit();
         }

package/lib/utils/taxonomies-helper.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lookUpTerms = exports.lookUpTaxonomy = void 0;
+const tslib_1 = require("tslib");
 /**
  * taxonomy lookup
  */
+const find_1 = tslib_1.__importDefault(require("lodash/find"));
 const _1 = require("./");
 /**
  * check and remove if referenced taxonomy doesn't exists in stack
@@ -66,7 +68,13 @@ const lookUpTerms = function (ctSchema, entry, taxonomiesAndTermData, importConf
         if (ctSchema[index].data_type === 'taxonomy') {
             const taxonomyFieldData = entry[ctSchema[index].uid];
             const updatedTaxonomyData = verifyAndRemoveTerms(taxonomyFieldData, taxonomiesAndTermData, importConfig);
-            entry[ctSchema[index].uid] = updatedTaxonomyData;
+            if (updatedTaxonomyData === null || updatedTaxonomyData === void 0 ? void 0 : updatedTaxonomyData.length) {
+                entry[ctSchema[index].uid] = updatedTaxonomyData;
+            }
+            else {
+                //Delete taxonomy from entry if taxonomy field removed from CT
+                delete entry[ctSchema[index].uid];
+            }
         }
     }
 };
@@ -85,7 +93,8 @@ const verifyAndRemoveTerms = function (taxonomyFieldData, taxonomiesAndTermData,
         const termUID = taxonomyData === null || taxonomyData === void 0 ? void 0 : taxonomyData.term_uid;
         if (taxonomiesAndTermData === undefined ||
             !taxonomiesAndTermData.hasOwnProperty(taxUID) ||
-            (taxonomiesAndTermData.hasOwnProperty(taxUID) && !taxonomiesAndTermData[taxUID].hasOwnProperty(termUID))) {
+            (taxonomiesAndTermData.hasOwnProperty(taxUID) &&
+                !(0, find_1.default)(taxonomiesAndTermData[taxUID], (term) => (term === null || term === void 0 ? void 0 : term.uid) === termUID))) {
             // remove term from taxonomies field data with warning if respective term doesn't exists
             (0, _1.log)(importConfig, `Term '${termUID}' does not exist. Removing it from taxonomy - '${taxUID}'`, 'warn');
             taxonomyFieldData.splice(index, 1);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.13.3",
+  "version": "1.14.0",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.13.3",
+  "version": "1.14.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "^1.3.3",
+    "@contentstack/cli-audit": "~1.4.0",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
-    "@contentstack/management": "~1.13.0",
+    "@contentstack/cli-utilities": "~1.5.12",
+    "@contentstack/management": "~1.15.3",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -25,7 +25,7 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@oclif/test": "^1.2.6",
+    "@oclif/test": "^2.5.6",
     "@types/big-json": "^3.2.0",
     "@types/bluebird": "^3.5.38",
     "@types/chai": "^4.2.18",
@@ -46,7 +46,7 @@
     "oclif": "^3.8.1",
     "rimraf": "^2.7.1",
     "sinon": "^11.1.1",
-    "tmp": "^0.2.1",
+    "tmp": "^0.2.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.3"
   },