@contentstack/cli-cm-branches 1.0.20 → 1.0.22

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.20 linux-x64 node-v18.19.0
+@contentstack/cli-cm-branches/1.0.22 linux-x64 node-v18.19.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/branch/merge-handler.js

@@ -218,29 +218,21 @@ class MergeHandler {
     async executeEntryExpFlow(mergeJobUID, mergePayload) {
         const { mergeContent } = this.mergeSettings;
         let mergePreference = await (0, utils_1.selectContentMergePreference)();
-        let selectedMergePreference;
         const updateEntryMergeStrategy = (items, mergeStrategy) => {
             items &&
                 items.forEach((item) => {
                     item.entry_merge_strategy = mergeStrategy;
                 });
         };
-        switch (mergePreference) {
-            case 'existing_new':
-                selectedMergePreference = 'merge_existing_new';
-                updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
-                updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
-                break;
-            case 'new':
-                selectedMergePreference = 'merge_new';
-                updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
-                break;
-            case 'existing':
-                selectedMergePreference = 'merge_existing';
-                updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
-                break;
-            case 'ask_preference':
-                selectedMergePreference = 'custom';
+        const mergePreferencesMap = {
+            'existing_new': 'merge_existing_new',
+            'new': 'merge_new',
+            'existing': 'merge_existing',
+            'ask_preference': 'custom',
+        };
+        const selectedMergePreference = mergePreferencesMap[mergePreference];
+        if (selectedMergePreference) {
+            if (selectedMergePreference === 'custom') {
                 const selectedMergeItems = await (0, utils_1.selectContentMergeCustomPreferences)(mergeContent.content_types);
                 mergeContent.content_types = {
                     added: [],
@@ -250,10 +242,15 @@ class MergeHandler {
                 selectedMergeItems === null || selectedMergeItems === void 0 ? void 0 : selectedMergeItems.forEach((item) => {
                     mergeContent.content_types[item.status].push(item.value);
                 });
-                break;
-            default:
-                cli_utilities_1.cliux.error(`error: Invalid preference ${mergePreference}`);
-                process.exit(1);
+            }
+            else {
+                updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
+                updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
+            }
+        }
+        else {
+            cli_utilities_1.cliux.error(`error: Invalid preference ${mergePreference}`);
+            process.exit(1);
         }
         let scriptFolderPath = (0, utils_1.generateMergeScripts)(mergeContent.content_types, mergeJobUID);
         if (scriptFolderPath !== undefined) {
@@ -261,7 +258,7 @@ class MergeHandler {
             cli_utilities_1.cliux.print('\nWARNING!!! Migration is not intended to be run more than once. Migrated(entries/assets) will be duplicated if run more than once', { color: 'yellow' });
             let migrationCommand;
             if (os_1.default.platform() === 'win32') {
-                migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
+                migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch} file-path:./${scriptFolderPath} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
             }
             else {
                 migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath}} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;

package/lib/utils/create-merge-scripts.js

@@ -29,18 +29,16 @@ function generateMergeScripts(mergeSummary, mergeJobUID) {
         };
         const processContentTypes = (contentTypes, messageType) => {
             if (contentTypes && contentTypes.length > 0) {
-                processContentType({ type: 'assets', uid: '', entry_merge_strategy: '' }, mergeStrategies['asset_create_folder']);
                 contentTypes.forEach((contentType) => {
                     const mergeStrategy = contentType.entry_merge_strategy;
                     if (mergeStrategies.hasOwnProperty(mergeStrategy)) {
                         processContentType(contentType, mergeStrategies[mergeStrategy]);
                     }
                 });
-            }
-            else {
-                cli_utilities_1.cliux.print(`No ${messageType} entries selected for merge`, { color: 'yellow' });
+                cli_utilities_1.cliux.print(`Info: Entries of ${messageType} content types selected for the migration`, { color: 'blue' });
             }
         };
+        processContentType({ type: 'assets', uid: '', entry_merge_strategy: '' }, mergeStrategies['asset_create_folder']);
         processContentTypes(mergeSummary.modified, 'Modified');
         processContentTypes(mergeSummary.added, 'New');
         return scriptFolderPath;
@@ -85,11 +83,12 @@ function createMergeScripts(contentType, mergeJobUID, content) {
                 fs_1.default.mkdirSync(fullPath);
             }
             let filePath;
+            let milliSeconds = date.getMilliseconds().toString().padStart(3, '0');
             if (contentType.type === 'assets') {
-                filePath = `${fullPath}/${fileCreatedAt}_create_assets_folder.js`;
+                filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_create_assets_folder.js`;
             }
             else {
-                filePath = `${fullPath}/${fileCreatedAt}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${contentType.uid}.js`;
+                filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${contentType.uid}.js`;
             }
             fs_1.default.writeFileSync(filePath, content, 'utf-8');
         }

package/lib/utils/entry-create-script.js

@@ -185,7 +185,7 @@ function entryCreateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {

package/lib/utils/entry-create-update-script.js

@@ -207,7 +207,7 @@ function entryCreateUpdateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {

package/lib/utils/entry-update-script.js

@@ -207,7 +207,7 @@ function entryUpdateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.20",
+  "version": "1.0.22",
   "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.20",
+  "version": "1.0.22",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.10",
+    "@contentstack/cli-utilities": "~1.5.11",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~1.3.17",
-    "@contentstack/cli-config": "~1.4.15",
+    "@contentstack/cli-config": "~1.6.0",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
@@ -95,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}