Lint fixes

Author: netrajpatel

.talismanrc

@@ -1,14 +1,4 @@
 fileignoreconfig:
-  - filename: packages/contentstack-branches/src/commands/cm/branches/merge-status.ts
-    checksum: 6e5b959ddcc5ff68e03c066ea185fcf6c6e57b1819069730340af35aad8a93a8
-  - filename: packages/contentstack-branches/README.md
-    checksum: cde5b34e2fb25e1a8ac4a16d079c154a843c733de224969748138e0345b7d674
-  - filename: packages/contentstack-branches/src/utils/create-branch.ts
-    checksum: d0613295ee26f7a77d026e40db0a4ab726fabd0a74965f729f1a66d1ef14768f
-  - filename: packages/contentstack-branches/src/branch/diff-handler.ts
-    checksum: 3cd4d26a2142cab7cbf2094c9251e028467d17d6a1ed6daf22f21975133805f1
   - filename: packages/contentstack-branches/src/commands/cm/branches/generate-scripts.ts
-    checksum: e549aa68d73241afbad5deff275e9657028bfce5bf4327adf2248018c5461295
-  - filename: packages/contentstack-branches/src/branch/merge-handler.ts
-    checksum: 17aa4048ef4a4a208206c3d6b850c711906323df0d19299f0448dad23305d484
+    checksum: 84b73eab889d8ee4b39f6e7317a3c55de0322f03113bc7cbd498062018353a97
 version: '1.0'

packages/contentstack-branches/src/commands/cm/branches/generate-scripts.ts

@@ -1,35 +1,40 @@
 import { Command } from '@contentstack/cli-command';
 import { cliux, flags, isAuthenticated, managementSDKClient } from '@contentstack/cli-utilities';
-import { getMergeStatusWithContentTypes, handleErrorMsg, selectContentMergePreference, selectContentMergeCustomPreferences, generateMergeScripts } from '../../../utils';
+import {
+  getMergeStatusWithContentTypes,
+  handleErrorMsg,
+  selectContentMergePreference,
+  selectContentMergeCustomPreferences,
+  generateMergeScripts,
+} from '../../../utils';
 import os from 'os';
 
 /**
  * Command to generate entry migration scripts for a completed merge job.
  * Validates that merge is complete before allowing script generation.
  */
 export default class BranchGenerateScriptsCommand extends Command {
+  static readonly aliases: string[] = [];
   static readonly description: string = 'Generate entry migration scripts for a completed merge job';
 
   static readonly examples: string[] = [
     'csdx cm:branches:generate-scripts -k bltxxxxxxxx --merge-uid merge_abc123',
     'csdx cm:branches:generate-scripts --stack-api-key bltxxxxxxxx --merge-uid merge_abc123',
   ];
 
-  static readonly usage: string = 'cm:branches:generate-scripts -k <value> --merge-uid <value>';
-
   static readonly flags = {
+    'merge-uid': flags.string({
+      description: 'Merge job UID to generate scripts for.',
+      required: true,
+    }),
     'stack-api-key': flags.string({
       char: 'k',
       description: 'Provide your stack API key.',
       required: true,
     }),
-    'merge-uid': flags.string({
-      description: 'Merge job UID to generate scripts for.',
-      required: true,
-    }),
   };
 
-  static readonly aliases: string[] = [];
+  static readonly usage: string = 'cm:branches:generate-scripts -k <value> --merge-uid <value>';
 
   /**
    * Generates entry migration scripts for a completed merge job.
@@ -47,9 +52,11 @@ export default class BranchGenerateScriptsCommand extends Command {
         handleErrorMsg(err);
       }
 
-      const { 'stack-api-key': stackAPIKey, 'merge-uid': mergeUID } = generateScriptsFlags;
+      const { 'merge-uid': mergeUID, 'stack-api-key': stackAPIKey } = generateScriptsFlags;
 
-      const stackAPIClient = await (await managementSDKClient({ host: this.cmaHost })).stack({
+      const stackAPIClient = await (
+        await managementSDKClient({ host: this.cmaHost })
+      ).stack({
         api_key: stackAPIKey,
       });
 
@@ -70,10 +77,10 @@ export default class BranchGenerateScriptsCommand extends Command {
       const { uid } = mergeStatusResponse;
 
       // Ask user for merge preference
-      let mergePreference = await selectContentMergePreference();
+      const mergePreference = await selectContentMergePreference();
 
       // Get content types data
-      const contentTypes = mergeStatusResponse.content_types ?? { added: [], modified: [], deleted: [] };
+      const contentTypes = mergeStatusResponse.content_types ?? { added: [], deleted: [], modified: [] };
 
       const updateEntryMergeStrategy = (items, mergeStrategy) => {
         items &&
@@ -83,10 +90,10 @@ export default class BranchGenerateScriptsCommand extends Command {
       };
 
       const mergePreferencesMap = {
+        ask_preference: 'custom',
+        existing: 'merge_existing',
         existing_new: 'merge_existing_new',
         new: 'merge_new',
-        existing: 'merge_existing',
-        ask_preference: 'custom',
       };
       const selectedMergePreference = mergePreferencesMap[mergePreference];
 
@@ -120,13 +127,13 @@ export default class BranchGenerateScriptsCommand extends Command {
         );
 
         let migrationCommand: string;
-        const compareBase = mergeStatusResponse.compare_branch ?? mergeStatusResponse.base_branch;
-        const baseBranch = mergeStatusResponse.base_branch ?? 'main';
+        const compareBranch = mergeStatusResponse?.merge_details?.compare_branch;
+        const baseBranch = mergeStatusResponse?.merge_details?.base_branch;
 
         if (os.platform() === 'win32') {
-          migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${compareBase} file-path:./${scriptFolderPath} --branch ${baseBranch} --stack-api-key ${stackAPIKey}`;
+          migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${compareBranch} file-path:./${scriptFolderPath} --branch ${baseBranch} --stack-api-key ${stackAPIKey}`;
         } else {
-          migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${compareBase},file-path:./${scriptFolderPath}} --branch ${baseBranch} --stack-api-key ${stackAPIKey}`;
+          migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${compareBranch},file-path:./${scriptFolderPath}} --branch ${baseBranch} --stack-api-key ${stackAPIKey}`;
         }
 
         cliux.print(