@contentstack/cli-cm-import 2.0.0-beta.5 → 2.0.0-beta.7

package/lib/import/modules/variant-entries.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const cli_variants_1 = require("@contentstack/cli-variants");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
@@ -13,7 +14,7 @@ class ImportVariantEntries extends base_class_1.default {
         this.config.context.module = utils_1.MODULE_CONTEXTS.VARIANT_ENTRIES;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.VARIANT_ENTRIES];
         this.personalize = importConfig.modules.personalize;
-        this.projectMapperFilePath = path_1.default.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.personalize.dirName), 'projects', 'projects.json');
+        this.projectMapperFilePath = path_1.default.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, (0, cli_utilities_1.sanitizePath)(this.personalize.dirName), 'projects', 'projects.json');
     }
     /**
      * @method start
@@ -34,8 +35,7 @@ class ImportVariantEntries extends base_class_1.default {
             progress.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.VARIANT_ENTRIES_IMPORT].IMPORTING, utils_1.PROCESS_NAMES.VARIANT_ENTRIES_IMPORT);
             cli_utilities_1.log.info('Starting variant entries import process', this.config.context);
             await this.importVariantEntries();
-            this.completeProgress(true);
-            cli_utilities_1.log.success('Variant entries imported successfully', this.config.context);
+            this.completeProgressWithMessage();
         }
         catch (error) {
             this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Variant entries import failed');

package/lib/import/modules/webhooks.js

@@ -5,6 +5,7 @@ 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 cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportWebhooks extends base_class_1.default {
@@ -13,11 +14,11 @@ class ImportWebhooks extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.WEBHOOKS;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.WEBHOOKS];
         this.webhooksConfig = importConfig.modules.webhooks;
-        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'webhooks');
+        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.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');
-        this.createdWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, 'success.json');
-        this.failedWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, 'fails.json');
+        this.webhookUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+        this.createdWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.failedWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
         this.webhooks = {};
         this.failedWebhooks = [];
         this.createdWebhooks = [];
@@ -40,8 +41,7 @@ class ImportWebhooks extends base_class_1.default {
             progress.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.WEBHOOKS_IMPORT].IMPORTING);
             await this.importWebhooks();
             this.processWebhookResults();
-            this.completeProgress(true);
-            cli_utilities_1.log.success('Webhooks have been imported successfully!', this.importConfig.context);
+            this.completeProgressWithMessage();
         }
         catch (error) {
             this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Webhooks import failed');

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

@@ -20,7 +20,7 @@ export default class ImportWorkflows extends BaseClass {
     start(): Promise<void>;
     getRoles(): Promise<void>;
     importWorkflows(): Promise<void>;
-    updateNextAvailableStagesUid(workflow: Record<string, any>, newWorkflowStages: Record<string, any>[], oldWorkflowStages: Record<string, any>[]): Promise<import("@contentstack/management/types/stack/workflow").Workflow>;
+    updateNextAvailableStagesUid(workflow: Record<string, any>, newWorkflowStages: Record<string, any>[], oldWorkflowStages: Record<string, any>[]): Promise<any>;
     /**
      * @method serializeWorkflows
      * @param {ApiOptions} apiOptions ApiOptions

package/lib/import/modules/workflows.js

@@ -11,6 +11,7 @@ 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 cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ImportWorkflows extends base_class_1.default {
@@ -19,11 +20,11 @@ class ImportWorkflows extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.WORKFLOWS;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.WORKFLOWS];
         this.workflowsConfig = importConfig.modules.workflows;
-        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'workflows');
+        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.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');
-        this.createdWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, 'success.json');
-        this.failedWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, 'fails.json');
+        this.workflowUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+        this.createdWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.failedWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
         this.workflows = {};
         this.failedWebhooks = [];
         this.createdWorkflows = [];
@@ -61,8 +62,7 @@ class ImportWorkflows extends base_class_1.default {
             await this.importWorkflows();
             progress.completeProcess(utils_1.PROCESS_NAMES.WORKFLOWS_CREATE, true);
             this.processWorkflowResults();
-            this.completeProgress(true);
-            cli_utilities_1.log.success('Workflows have been imported successfully!', this.importConfig.context);
+            this.completeProgressWithMessage();
         }
         catch (error) {
             this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Workflows import failed');

package/lib/utils/common-helper.js

@@ -11,6 +11,7 @@ const tslib_1 = require("tslib");
 const _ = tslib_1.__importStar(require("lodash"));
 const path = tslib_1.__importStar(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../constants");
 const file_helper_1 = require("./file-helper");
 const config_1 = tslib_1.__importDefault(require("../config"));
 const promise_limit_1 = tslib_1.__importDefault(require("promise-limit"));
@@ -137,8 +138,8 @@ const field_rules_update = (importConfig, ctPath) => {
                             for (let i = 0; i < fieldRuleConditionLength; i++) {
                                 if (schema.field_rules[k].conditions[i].operand_field === 'reference') {
                                     cli_utilities_1.log.debug(`Processing reference field rule condition`);
-                                    let entryMapperPath = path.resolve(importConfig.contentDir, 'mapper', 'entries');
-                                    let entryUidMapperPath = path.join(entryMapperPath, 'uid-mapping.json');
+                                    let entryMapperPath = path.resolve(importConfig.contentDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.ENTRIES);
+                                    let entryUidMapperPath = path.join(entryMapperPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
                                     let fieldRulesValue = schema.field_rules[k].conditions[i].value;
                                     let fieldRulesArray = fieldRulesValue.split('.');
                                     let updatedValue = [];

package/lib/utils/extension-helper.js

@@ -11,13 +11,14 @@ exports.lookupExtension = void 0;
  */
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../constants");
 // eslint-disable-next-line camelcase
 const lookupExtension = function (config, schema, preserveStackVersion, installedExtensions) {
     cli_utilities_1.log.debug('Starting extension lookup process...');
     const fs = new cli_utilities_1.FsUtility({ basePath: config.backupDir });
-    const extensionPath = (0, node_path_1.join)(config.backupDir, 'mapper/extensions', 'uid-mapping.json');
-    const globalfieldsPath = (0, node_path_1.join)(config.backupDir, 'mapper/globalfields', 'uid-mapping.json');
-    const marketPlaceAppsPath = (0, node_path_1.join)(config.backupDir, 'mapper/marketplace_apps', 'uid-mapping.json');
+    const extensionPath = (0, node_path_1.join)(config.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.EXTENSIONS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+    const globalfieldsPath = (0, node_path_1.join)(config.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+    const marketPlaceAppsPath = (0, node_path_1.join)(config.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.MARKETPLACE_APPS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
     cli_utilities_1.log.debug(`Extension mapping paths - Extensions: ${extensionPath}, Global fields: ${globalfieldsPath}, Marketplace apps: ${marketPlaceAppsPath}`);
     for (let i in schema) {
         if (schema[i].data_type === 'group') {

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

@@ -109,8 +109,6 @@ const setupConfig = async (importCmdFlags) => {
     if (importCmdFlags['exclude-global-modules']) {
         config['exclude-global-modules'] = importCmdFlags['exclude-global-modules'];
     }
-    // Set progress supported module to check and display console logs
-    cli_utilities_1.configHandler.set('log.progressSupportedModule', 'import');
     // Add authentication details to config for context tracking
     config.authenticationMethod = authenticationMethod;
     cli_utilities_1.log.debug('Import configuration setup completed.', Object.assign({}, config));

package/oclif.manifest.json

@@ -168,5 +168,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.5"
+  "version": "2.0.0-beta.7"
 }

package/package.json

@@ -1,22 +1,21 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~2.0.0-beta.1",
-    "@contentstack/cli-command": "~1.7.0",
-    "@contentstack/cli-utilities": "~1.17.0",
-    "@contentstack/management": "~1.27.3",
+    "@contentstack/cli-audit": "~2.0.0-beta.3",
+    "@contentstack/cli-command": "~1.7.2",
+    "@contentstack/cli-utilities": "~1.17.2",
     "@contentstack/cli-variants": "~2.0.0-beta.4",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
-    "debug": "^4.4.1",
-    "fs-extra": "^11.3.0",
-    "lodash": "^4.17.21",
+    "debug": "^4.4.3",
+    "fs-extra": "^11.3.3",
+    "lodash": "^4.17.23",
     "marked": "^4.3.0",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
@@ -25,7 +24,7 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.13",
+    "@oclif/test": "^4.1.16",
     "@types/big-json": "^3.2.5",
     "@types/bluebird": "^3.5.42",
     "@types/fs-extra": "^11.0.4",