@contentstack/cli-cm-branches 1.0.10 → 1.0.12

package/lib/utils/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askBranchNameConfirmation = exports.selectCustomPreferences = exports.askMergeComment = exports.askExportMergeSummaryPath = exports.selectMergeExecution = exports.selectMergeStrategySubOptions = exports.selectMergeStrategy = exports.inquireRequireFieldValidation = exports.askConfirmation = exports.askBranchUid = exports.askSourceBranch = exports.askBaseBranch = exports.askStackAPIKey = exports.askCompareBranch = exports.selectModule = void 0;
+exports.selectContentMergeCustomPreferences = exports.askBranchNameConfirmation = exports.selectCustomPreferences = exports.askMergeComment = exports.askExportMergeSummaryPath = exports.selectContentMergePreference = exports.selectMergeExecution = exports.selectMergeStrategySubOptions = exports.selectMergeStrategy = exports.inquireRequireFieldValidation = exports.askConfirmation = exports.askBranchUid = exports.askSourceBranch = exports.askBaseBranch = exports.askStackAPIKey = exports.askCompareBranch = exports.selectModule = void 0;
 const tslib_1 = require("tslib");
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
@@ -133,6 +133,8 @@ async function selectMergeExecution() {
         choices: [
             { name: 'Execute Merge', value: 'both' },
             { name: 'Export Merge Summary', value: 'export' },
+            { name: 'Execute Merge and Generate Content Migration Scripts', value: 'merge_n_scripts' },
+            { name: 'Export Summary and Generate Content Migration Scripts', value: 'summary_n_scripts' },
             { name: 'Go Back', value: 'previous' },
             { name: 'Start Over', value: 'restart' },
         ],
@@ -146,6 +148,27 @@ async function selectMergeExecution() {
     return strategy;
 }
 exports.selectMergeExecution = selectMergeExecution;
+async function selectContentMergePreference() {
+    const strategy = await cli_utilities_1.cliux
+        .inquire({
+        type: 'list',
+        name: 'module',
+        choices: [
+            { name: 'Both existing and new', value: 'existing_new' },
+            { name: 'New only', value: 'new' },
+            { name: 'Existing only', value: 'existing' },
+            { name: 'Ask for preference', value: 'ask_preference' },
+        ],
+        message: 'What content entries do you want to migrate?',
+    })
+        .then((name) => name)
+        .catch((err) => {
+        cli_utilities_1.cliux.error('Failed to collect the preference');
+        process.exit(1);
+    });
+    return strategy;
+}
+exports.selectContentMergePreference = selectContentMergePreference;
 async function askExportMergeSummaryPath() {
     return await cli_utilities_1.cliux.inquire({
         type: 'input',
@@ -242,3 +265,63 @@ async function askBranchNameConfirmation() {
     });
 }
 exports.askBranchNameConfirmation = askBranchNameConfirmation;
+async function selectContentMergeCustomPreferences(payload) {
+    var _a, _b;
+    // parse rows
+    const tableRows = [];
+    if (((_a = payload.modified) === null || _a === void 0 ? void 0 : _a.length) || ((_b = payload.added) === null || _b === void 0 ? void 0 : _b.length)) {
+        (0, forEach_1.default)(payload.added, (item) => {
+            const row = {};
+            row.name = `+ ${item.title}`;
+            row.status = 'added';
+            row.value = item;
+            tableRows.push(row);
+        });
+        (0, forEach_1.default)(payload.modified, (item) => {
+            const row = {};
+            row.name = `± ${item.title}`;
+            row.status = 'modified';
+            row.value = item;
+            tableRows.push(row);
+        });
+    }
+    else {
+        return;
+    }
+    const selectedStrategies = await cli_utilities_1.cliux.inquire({
+        type: 'table',
+        message: `Select the Content Entry changes for merge`,
+        name: 'mergeContentEntriesPreferences',
+        selectAll: true,
+        pageSize: 10,
+        columns: [
+            {
+                name: 'Merge New Only',
+                value: 'merge_new',
+            },
+            {
+                name: 'Merge Modified Only',
+                value: 'merge_existing',
+            },
+            {
+                name: 'Merge Both',
+                value: 'merge_existing_new',
+            },
+            {
+                name: 'Ignore',
+                value: 'ignore',
+            },
+        ],
+        rows: tableRows,
+    });
+    let updatedArray = [];
+    (0, forEach_1.default)(selectedStrategies, (strategy, index) => {
+        const selectedItem = tableRows[index];
+        if (strategy && selectedItem) {
+            selectedItem.value.entry_merge_strategy = strategy;
+            updatedArray.push(selectedItem);
+        }
+    });
+    return updatedArray; // selected items
+}
+exports.selectContentMergeCustomPreferences = selectContentMergeCustomPreferences;

package/lib/utils/merge-helper.js

@@ -54,14 +54,6 @@ const setupMergeInputs = async (mergeFlags) => {
     if (!mergeFlags['stack-api-key']) {
         mergeFlags['stack-api-key'] = await (0, _1.askStackAPIKey)();
     }
-    if (!mergeFlags['compare-branch']) {
-        if (!compare_branch) {
-            mergeFlags['compare-branch'] = await (0, _1.askCompareBranch)();
-        }
-        else {
-            mergeFlags['compare-branch'] = compare_branch;
-        }
-    }
     if (!mergeFlags['base-branch']) {
         if (!base_branch) {
             mergeFlags['base-branch'] = (0, _1.getbranchConfig)(mergeFlags['stack-api-key']);
@@ -76,6 +68,14 @@ const setupMergeInputs = async (mergeFlags) => {
             mergeFlags['base-branch'] = base_branch;
         }
     }
+    if (!mergeFlags['compare-branch']) {
+        if (!compare_branch) {
+            mergeFlags['compare-branch'] = await (0, _1.askCompareBranch)();
+        }
+        else {
+            mergeFlags['compare-branch'] = compare_branch;
+        }
+    }
     return mergeFlags;
 };
 exports.setupMergeInputs = setupMergeInputs;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.10",
+  "version": "1.0.12",
   "commands": {
     "cm:branches:create": {
       "id": "cm:branches:create",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.11",
-    "@contentstack/cli-utilities": "^1.5.1",
+    "@contentstack/cli-command": "~1.2.12",
+    "@contentstack/cli-utilities": "~1.5.2",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.9.3",
@@ -27,9 +27,9 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "^1.3.11",
-    "@contentstack/cli-config": "^1.4.9",
-    "@contentstack/cli-dev-dependencies": "^1.2.3",
+    "@contentstack/cli-auth": "~1.3.13",
+    "@contentstack/cli-config": "~1.4.11",
+    "@contentstack/cli-dev-dependencies": "~1.2.3",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
     "@types/flat": "^5.0.2",