From 1c80b23ee2a10c66e3b6f803934f87e9c80f46b9 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Wed, 15 Nov 2023 17:25:25 +0530
Subject: [PATCH] Feat: Add missing global fields schema in to content type if
 global field exists

---
 .gitignore                                    |   4 +-
 package-lock.json                             |   6 +-
 packages/contentstack-audit/README.md         |  94 +++++++++-----
 packages/contentstack-audit/package.json      |   2 +-
 .../src/audit-base-command.ts                 |  17 ++-
 .../contentstack-audit/src/base-command.ts    |   2 +
 .../src/commands/cm/stacks/audit/fix.ts       |  11 +-
 .../src/commands/cm/stacks/audit/index.ts     |   5 +-
 .../contentstack-audit/src/config/index.ts    |   1 +
 .../contentstack-audit/src/messages/index.ts  |  18 ++-
 .../src/modules/content-types.ts              |  71 +++++++++--
 .../contentstack-audit/src/modules/entries.ts |  14 ++-
 .../contentstack-audit/src/types/common.ts    |   8 ++
 .../src/types/content-types.ts                |   1 +
 .../contentstack-audit/src/types/index.ts     |   5 +-
 packages/contentstack-audit/src/util/flags.ts |  31 +++++
 packages/contentstack-audit/src/util/index.ts |   3 +-
 .../test/unit/audit-base-command.test.ts      |   2 +-
 .../test/unit/modules/content-types.test.ts   | 117 ++++++++++++++----
 .../test/unit/util/flags.test.ts              |  30 +++++
 .../package.json                              |   2 +-
 packages/contentstack/README.md               |  94 +++++++++-----
 pnpm-lock.yaml                                |   4 +-
 23 files changed, 411 insertions(+), 131 deletions(-)
 create mode 100644 packages/contentstack-audit/src/types/common.ts
 create mode 100644 packages/contentstack-audit/src/util/flags.ts
 create mode 100644 packages/contentstack-audit/test/unit/util/flags.test.ts

diff --git a/.gitignore b/.gitignore
index 329aeebd38..e378ee25cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ contentstack-cli-logs
 packages/**/package-lock.json
 .dccache
 yarn.lock
-contents-*
\ No newline at end of file
+contents-*
+*.http
+*.todo
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 0666005900..c8a0833eee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22999,7 +22999,7 @@
         "eslint-config-oclif-typescript": "^1.0.3",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
-        "oclif": "^3.10.0",
+        "oclif": "^3",
         "shx": "^0.3.4",
         "sinon": "^17.0.0",
         "ts-jest": "^29.1.1",
@@ -24048,7 +24048,6 @@
         "winston": "^3.7.2"
       },
       "devDependencies": {
-        "@contentstack/cli-dev-dependencies": "^1.2.3",
         "@oclif/test": "^2.2.10",
         "@types/chai": "^4.2.18",
         "@types/inquirer": "^9.0.3",
@@ -27315,7 +27314,7 @@
         "lodash": "^4.17.21",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
-        "oclif": "^3.10.0",
+        "oclif": "^3",
         "shx": "^0.3.4",
         "sinon": "^17.0.0",
         "ts-jest": "^29.1.1",
@@ -28689,7 +28688,6 @@
       "version": "file:packages/contentstack-config",
       "requires": {
         "@contentstack/cli-command": "~1.2.15",
-        "@contentstack/cli-dev-dependencies": "^1.2.3",
         "@contentstack/cli-utilities": "~1.5.5",
         "@oclif/test": "^2.2.10",
         "@types/chai": "^4.2.18",
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
index 0d0960ba8a..584a5c87e3 100644
--- a/packages/contentstack-audit/README.md
+++ b/packages/contentstack-audit/README.md
@@ -56,16 +56,20 @@ USAGE
     --no-truncate]
 
 FLAGS
+  --modules=<option>...  Provide the list of modules to be audited
+                         <options: content-types|global-fields|entries>
+  --report-path=<value>  Path to store the audit reports
+
+COMMON FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
-  --modules=<option>...   Provide the list of modules to be audited
-                          <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
-  --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and find possible errors in the exported Contentstack data
@@ -93,22 +97,29 @@ Perform audits and fix possible errors in the exported Contentstack data.
 ```
 USAGE
   $ csdx audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
-    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
-    [--filter <value>] [--csv | --no-truncate]
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--fix-only
+    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    <value>] [--csv | --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --fix-only=<option>...  Provide the list of fix options
+                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
   --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
   --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+COMMON FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and fix possible errors in the exported Contentstack data.
@@ -124,6 +135,8 @@ EXAMPLES
 
   $ csdx audit:fix --report-path=<path> --copy-dir --csv
 
+  $ csdx audit:fix --fix-only=reference,global_field --copy-dir
+
   $ csdx audit:fix --report-path=<path> --filter="name=<filter-value>"
 
   $ csdx audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
@@ -140,16 +153,20 @@ USAGE
     --no-truncate]
 
 FLAGS
+  --modules=<option>...  Provide the list of modules to be audited
+                         <options: content-types|global-fields|entries>
+  --report-path=<value>  Path to store the audit reports
+
+COMMON FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
-  --modules=<option>...   Provide the list of modules to be audited
-                          <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
-  --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and find possible errors in the exported Contentstack data
@@ -179,22 +196,29 @@ Perform audits and fix possible errors in the exported Contentstack data.
 ```
 USAGE
   $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
-    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
-    [--filter <value>] [--csv | --no-truncate]
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--fix-only
+    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    <value>] [--csv | --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --fix-only=<option>...  Provide the list of fix options
+                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
   --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
   --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+COMMON FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and fix possible errors in the exported Contentstack data.
@@ -210,6 +234,8 @@ EXAMPLES
 
   $ csdx cm:stacks:audit:fix --report-path=<path> --copy-dir --csv
 
+  $ csdx cm:stacks:audit:fix --fix-only=reference,global_field --copy-dir
+
   $ csdx cm:stacks:audit:fix --report-path=<path> --filter="name=<filter-value>"
 
   $ csdx cm:stacks:audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
index 705c346e06..38b14b5af4 100644
--- a/packages/contentstack-audit/package.json
+++ b/packages/contentstack-audit/package.json
@@ -42,7 +42,7 @@
     "eslint-config-oclif-typescript": "^1.0.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "oclif": "^3.10.0",
+    "oclif": "^3",
     "shx": "^0.3.4",
     "sinon": "^17.0.0",
     "ts-jest": "^29.1.1",
diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts
index 248f79e9ac..68535630f5 100644
--- a/packages/contentstack-audit/src/audit-base-command.ts
+++ b/packages/contentstack-audit/src/audit-base-command.ts
@@ -6,17 +6,17 @@ import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
 import cloneDeep from 'lodash/cloneDeep';
 import { cliux, ux } from '@contentstack/cli-utilities';
-import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'fs';
 
 import config from './config';
 import { print } from './util/log';
 import { auditMsg } from './messages';
 import { BaseCommand } from './base-command';
 import { Entries, GlobalField, ContentType } from './modules';
-import { ContentTypeStruct, OutputColumn, RefErrorReturnType } from './types';
+import { CommandNames, ContentTypeStruct, OutputColumn, RefErrorReturnType } from './types';
 
 export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseCommand> {
-  private currentCommand!: string;
+  private currentCommand!: CommandNames;
 
   get fixStatus() {
     return {
@@ -36,7 +36,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
    * @param {string} command - The `command` parameter is a string that represents the current command
    * being executed.
    */
-  async start(command: string): Promise<void> {
+  async start(command: CommandNames): Promise<void> {
     this.currentCommand = command;
     await this.promptQueue();
     await this.createBackUp();
@@ -59,6 +59,11 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     } else {
       this.log(this.messages.NO_MISSING_REF_FOUND, 'info');
       this.log('');
+
+      if (this.currentCommand === 'cm:stacks:audit:fix' && existsSync(this.sharedConfig.basePath)) {
+        // NOTE Clean up the backup dir if no issue found while audit the content
+        rmSync(this.sharedConfig.basePath, { recursive: true });
+      }
     }
   }
 
@@ -280,7 +285,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     const csvStream = csv.format({ headers: true });
     const csvPath = join(this.sharedConfig.reportPath, `${moduleName}.csv`);
     const assetFileStream = createWriteStream(csvPath);
-    
+
     return new Promise<void>((resolve, reject) => {
       assetFileStream.on('error', reject);
       csvStream.pipe(assetFileStream).on('close', resolve).on('error', reject);
@@ -312,7 +317,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       }
 
       csvStream.end();
-      assetFileStream.destroy()
+      assetFileStream.destroy();
     });
   }
 }
diff --git a/packages/contentstack-audit/src/base-command.ts b/packages/contentstack-audit/src/base-command.ts
index 2296a0264a..e5158ef675 100644
--- a/packages/contentstack-audit/src/base-command.ts
+++ b/packages/contentstack-audit/src/base-command.ts
@@ -28,10 +28,12 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   static baseFlags: FlagInput = {
     config: Flags.string({
       char: 'c',
+      helpGroup: 'COMMON',
       description: commonMsg.CONFIG,
     }),
     'data-dir': Flags.string({
       char: 'd',
+      helpGroup: 'COMMON',
       description: commonMsg.DATA_DIR,
     }),
   };
diff --git a/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts
index 3d5a197eb0..e27de41ca0 100644
--- a/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts
+++ b/packages/contentstack-audit/src/commands/cm/stacks/audit/fix.ts
@@ -1,6 +1,7 @@
 import { FlagInput, Flags, ux } from '@contentstack/cli-utilities';
 
 import config from '../../../../config';
+import { getTableFlags } from '../../../../util';
 import { auditFixMsg, auditMsg } from '../../../../messages';
 import { AuditBaseCommand } from '../../../../audit-base-command';
 
@@ -13,6 +14,7 @@ export default class AuditFix extends AuditBaseCommand {
     '$ <%= config.bin %> <%= command.id %> --copy-dir',
     '$ <%= config.bin %> <%= command.id %> --report-path=<path> --copy-dir',
     '$ <%= config.bin %> <%= command.id %> --report-path=<path> --copy-dir --csv',
+    '$ <%= config.bin %> <%= command.id %> --fix-only=reference,global_field --copy-dir',
     '$ <%= config.bin %> <%= command.id %> --report-path=<path> --filter="name=<filter-value>"',
     '$ <%= config.bin %> <%= command.id %> --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>',
   ];
@@ -37,14 +39,17 @@ export default class AuditFix extends AuditBaseCommand {
       dependsOn: ['copy-dir'],
       description: auditFixMsg.BKP_PATH,
     }),
+    'fix-only': Flags.string({
+      multiple: true,
+      options: config['fix-fields'],
+      description: auditFixMsg.FIX_OPTIONS,
+    }),
     yes: Flags.boolean({
       char: 'y',
       hidden: true,
       description: 'Use this flag to skip confirmation',
     }),
-    ...ux.table.flags({
-      only: ['columns', 'sort', 'filter', 'csv', 'no-truncate'],
-    }),
+    ...getTableFlags(),
   };
 
   /**
diff --git a/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
index ab23b96cad..f0dcd81221 100644
--- a/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
+++ b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
@@ -3,6 +3,7 @@ import { FlagInput, Flags, ux } from '@contentstack/cli-utilities';
 import config from '../../../../config';
 import { auditMsg } from '../../../../messages';
 import { AuditBaseCommand } from '../../../../audit-base-command';
+import { getTableFlags } from '../../../../util';
 
 export default class Audit extends AuditBaseCommand {
   static aliases: string[] = ['audit', 'cm:stacks:audit'];
@@ -30,9 +31,7 @@ export default class Audit extends AuditBaseCommand {
       options: config.modules,
       description: auditMsg.MODULES,
     }),
-    ...ux.table.flags({
-      only: ['columns', 'sort', 'filter', 'csv', 'no-truncate'],
-    }),
+    ...getTableFlags(),
   };
 
   /**
diff --git a/packages/contentstack-audit/src/config/index.ts b/packages/contentstack-audit/src/config/index.ts
index c47a8ac0fb..fd25645bfb 100644
--- a/packages/contentstack-audit/src/config/index.ts
+++ b/packages/contentstack-audit/src/config/index.ts
@@ -2,6 +2,7 @@ const config = {
   showTerminalOutput: true,
   skipRefs: ['sys_assets'],
   modules: ['content-types', 'global-fields', 'entries'],
+  'fix-fields': ['reference', 'global_field', 'json:rte', 'json:custom-field', 'blocks', 'group'],
   moduleConfig: {
     'content-types': {
       name: 'content type',
diff --git a/packages/contentstack-audit/src/messages/index.ts b/packages/contentstack-audit/src/messages/index.ts
index 98cfd8f112..c2304be6b5 100644
--- a/packages/contentstack-audit/src/messages/index.ts
+++ b/packages/contentstack-audit/src/messages/index.ts
@@ -1,5 +1,13 @@
 const errors = {};
 
+const tableColumnDescriptions = {
+  TABLE_COLUMN: 'only show provided columns (comma-separated)',
+  TABLE_SORT: "property to sort by (prepend '-' for descending)",
+  TABLE_CSV: 'output is csv format [alias: --output=csv]',
+  TABLE_FILTER: 'filter property by partial string matching, ex: name=foo',
+  'TABLE_NO-TRUNCATE': 'do not truncate output to fit screen',
+};
+
 const commonMsg = {
   CONFIG: 'Path of the external config',
   DATA_DIR: 'Path where the data is stored',
@@ -23,16 +31,22 @@ const auditMsg = {
 const auditFixMsg = {
   COPY_DATA: 'Create backup from the original data.',
   BKP_PATH: 'Provide the path to backup the copied data',
+  FIX_OPTIONS: 'Provide the list of fix options',
   FIXED_CONTENT_PATH_MAG: 'You can locate the fixed content at {path}.',
   EMPTY_FIX_MSG: 'Successfully removed the empty field/block found at {path} from the schema.',
   AUDIT_FIX_CMD_DESCRIPTION: 'Perform audits and fix possible errors in the exported Contentstack data.',
 };
 
-const messages: typeof errors & typeof commonMsg & typeof auditMsg & typeof auditFixMsg = {
+const messages: typeof errors &
+  typeof commonMsg &
+  typeof auditMsg &
+  typeof auditFixMsg &
+  typeof tableColumnDescriptions = {
   ...errors,
   ...commonMsg,
   ...auditMsg,
   ...auditFixMsg,
+  ...tableColumnDescriptions,
 };
 
 /**
@@ -55,4 +69,4 @@ function $t(msg: string, args: Record<string, string>): string {
 }
 
 export default messages;
-export { $t, errors, commonMsg, auditMsg, auditFixMsg };
+export { $t, errors, commonMsg, auditMsg, auditFixMsg, tableColumnDescriptions };
diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
index 10b8550e3c..b6f7742e95 100644
--- a/packages/contentstack-audit/src/modules/content-types.ts
+++ b/packages/contentstack-audit/src/modules/content-types.ts
@@ -18,6 +18,7 @@ import {
   ModuleConstructorParam,
   ReferenceFieldDataType,
   ContentTypeSchemaType,
+  GlobalFieldSchemaTypes,
 } from '../types';
 import auditConfig from '../config';
 import { $t, auditFixMsg, auditMsg, commonMsg } from '../messages';
@@ -32,6 +33,7 @@ export default class ContentType {
   public folderPath: string;
   public currentUid!: string;
   public currentTitle!: string;
+  public inMemoryFix: boolean = false;
   public gfSchema: ContentTypeStruct[];
   public ctSchema: ContentTypeStruct[];
   protected schema: ContentTypeStruct[] = [];
@@ -55,6 +57,8 @@ export default class ContentType {
    * @returns the `missingRefs` object.
    */
   async run(returnFixSchema = false) {
+    this.inMemoryFix = returnFixSchema;
+
     if (!existsSync(this.folderPath)) {
       throw new Error($t(auditMsg.NOT_VALID_PATH, { path: this.folderPath }));
     }
@@ -97,15 +101,17 @@ export default class ContentType {
   async writeFixContent() {
     let canWrite = true;
 
-    if (this.fix && !this.config.flags['copy-dir']) {
-      canWrite = this.config.flags.yes ?? (await ux.confirm(commonMsg.FIX_CONFIRMATION));
-    }
+    if (!this.inMemoryFix && this.fix) {
+      if (!this.config.flags['copy-dir']) {
+        canWrite = this.config.flags.yes ?? (await ux.confirm(commonMsg.FIX_CONFIRMATION));
+      }
 
-    if (this.fix && canWrite) {
-      writeFileSync(
-        join(this.folderPath, this.config.moduleConfig[this.moduleName].fileName),
-        JSON.stringify(this.schema),
-      );
+      if (canWrite) {
+        writeFileSync(
+          join(this.folderPath, this.config.moduleConfig[this.moduleName].fileName),
+          JSON.stringify(this.schema),
+        );
+      }
     }
   }
 
@@ -124,11 +130,15 @@ export default class ContentType {
     tree: Record<string, unknown>[],
     field: ContentTypeStruct | GlobalFieldDataType | ModularBlockType | GroupFieldDataType,
   ): Promise<void> {
+    const fixTypes = this.config.flags['fix-only'] ?? this.config['fix-fields'];
+
     if (this.fix) {
       field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
     }
 
     for (let child of field.schema ?? []) {
+      if (!fixTypes.includes(child.data_type) && child.data_type !== 'json') continue;
+
       switch (child.data_type) {
         case 'reference':
           this.missingRefs[this.currentUid].push(
@@ -146,8 +156,10 @@ export default class ContentType {
           break;
         case 'json':
           if (child.field_metadata.extension) {
+            if (!fixTypes.includes('json:custom-field')) continue;
             // NOTE Custom field type
           } else if (child.field_metadata.allow_json_rte) {
+            if (!fixTypes.includes('json:rte')) continue;
             // NOTE JSON RTE field type
             this.missingRefs[this.currentUid].push(
               ...this.validateJsonRTEFields(
@@ -196,6 +208,20 @@ export default class ContentType {
    */
   async validateGlobalField(tree: Record<string, unknown>[], field: GlobalFieldDataType): Promise<void> {
     // NOTE Any GlobalField related logic can be added here
+    if (!field.schema && !this.fix) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        data_type: field.data_type,
+        display_name: field.display_name,
+        missingRefs: 'Empty schema found',
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+
+      if (!field.schema) return;
+    }
+
     await this.lookForReference(tree, field);
   }
 
@@ -312,6 +338,10 @@ export default class ContentType {
     return schema
       .map((field) => {
         const { data_type } = field;
+        const fixTypes = this.config.flags['fix-only'] ?? this.config['fix-fields'];
+
+        if (!fixTypes.includes(data_type) && data_type !== 'json') return field;
+
         switch (data_type) {
           case 'global_field':
             return this.fixGlobalFieldReferences(tree, field as GlobalFieldDataType);
@@ -320,8 +350,14 @@ export default class ContentType {
             if (data_type === 'json') {
               if (field.field_metadata.extension) {
                 // NOTE Custom field type
+                if (!fixTypes.includes('json:custom-field')) return field;
+
+                // NOTE Fix logic
+
                 return field;
               } else if (field.field_metadata.allow_json_rte) {
+                if (!fixTypes.includes('json:rte')) return field;
+
                 return this.fixMissingReferences(tree, field as JsonRTEFieldDataType);
               }
             }
@@ -371,11 +407,28 @@ export default class ContentType {
           data_type,
           display_name,
           fixStatus: 'Fixed',
-          missingRefs: [reference_to],
           ct_uid: this.currentUid,
           name: this.currentTitle,
+          missingRefs: [reference_to],
           treeStr: tree.map(({ name }) => name).join(' ➜ '),
         });
+      } else if (!field.schema) {
+        const gfSchema = find(this.gfSchema, { uid: field.reference_to })?.schema;
+
+        if (gfSchema) {
+          field.schema = gfSchema as GlobalFieldSchemaTypes[];
+
+          this.missingRefs[this.currentUid].push({
+            tree,
+            data_type,
+            display_name,
+            fixStatus: 'Fixed',
+            ct_uid: this.currentUid,
+            name: this.currentTitle,
+            missingRefs: 'Empty schema found',
+            treeStr: tree.map(({ name }) => name).join(' ➜ '),
+          });
+        }
       }
 
       return refExist ? field : null;
diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
index 49a59ca07d..ac56750286 100644
--- a/packages/contentstack-audit/src/modules/entries.ts
+++ b/packages/contentstack-audit/src/modules/entries.ts
@@ -145,7 +145,7 @@ export default class Entries {
       moduleName: 'global-fields',
       ctSchema: this.ctSchema,
       gfSchema: this.gfSchema,
-    }).run()) as ContentTypeStruct[];
+    }).run(true)) as ContentTypeStruct[];
   }
 
   /**
@@ -155,12 +155,14 @@ export default class Entries {
   async writeFixContent(filePath: string, schema: Record<string, EntryStruct>) {
     let canWrite = true;
 
-    if (this.fix && !this.config.flags['copy-dir']) {
-      canWrite = this.config.flags.yes || (await ux.confirm(commonMsg.FIX_CONFIRMATION));
-    }
+    if (this.fix) {
+      if (!this.config.flags['copy-dir']) {
+        canWrite = this.config.flags.yes || (await ux.confirm(commonMsg.FIX_CONFIRMATION));
+      }
 
-    if (this.fix && canWrite) {
-      writeFileSync(filePath, JSON.stringify(schema));
+      if (canWrite) {
+        writeFileSync(filePath, JSON.stringify(schema));
+      }
     }
   }
 
diff --git a/packages/contentstack-audit/src/types/common.ts b/packages/contentstack-audit/src/types/common.ts
new file mode 100644
index 0000000000..a0c04cfece
--- /dev/null
+++ b/packages/contentstack-audit/src/types/common.ts
@@ -0,0 +1,8 @@
+import { ux } from "@contentstack/cli-utilities";
+
+type IFlags = typeof ux.table.Flags;
+type IncludeFlags<T, K extends keyof T> = Pick<T, K>;
+
+type CommandNames = 'cm:stacks:audit' | 'cm:stacks:audit:fix';
+
+export { IFlags, IncludeFlags, CommandNames };
diff --git a/packages/contentstack-audit/src/types/content-types.ts b/packages/contentstack-audit/src/types/content-types.ts
index 187b71188f..95b4aff074 100644
--- a/packages/contentstack-audit/src/types/content-types.ts
+++ b/packages/contentstack-audit/src/types/content-types.ts
@@ -125,4 +125,5 @@ export {
   ModularBlockType,
   OutputColumn,
   ContentTypeSchemaType,
+  GlobalFieldSchemaTypes,
 };
diff --git a/packages/contentstack-audit/src/types/index.ts b/packages/contentstack-audit/src/types/index.ts
index 6799b0cd05..9c78f7486e 100644
--- a/packages/contentstack-audit/src/types/index.ts
+++ b/packages/contentstack-audit/src/types/index.ts
@@ -1,3 +1,4 @@
-export * from "./utils";
+export * from './utils';
+export * from './common';
 export * from './entries';
-export * from './content-types';
\ No newline at end of file
+export * from './content-types';
diff --git a/packages/contentstack-audit/src/util/flags.ts b/packages/contentstack-audit/src/util/flags.ts
new file mode 100644
index 0000000000..6a9895c51d
--- /dev/null
+++ b/packages/contentstack-audit/src/util/flags.ts
@@ -0,0 +1,31 @@
+import { ux } from '@contentstack/cli-utilities';
+
+import { IFlags, IncludeFlags } from '../types';
+import { tableColumnDescriptions } from '../messages';
+
+/**
+ * The function `getTableFlags` returns a set of table flags based on the specified columns, with
+ * updated descriptions and help groups.
+ * @param {(keyof IFlags)[]} columns - An optional array of column keys from the IFlags interface. The
+ * default value is ['columns', 'sort', 'filter', 'csv', 'no-truncate'].
+ * @returns an object of type `IncludeFlags<IFlags, keyof IFlags>`.
+ */
+function getTableFlags(
+  columns: (keyof IFlags)[] = ['columns', 'sort', 'filter', 'csv', 'no-truncate'],
+): IncludeFlags<IFlags, keyof IFlags> {
+  const flags = ux.table.flags({
+    only: columns,
+  }) as IncludeFlags<IFlags, keyof IFlags>;
+
+  // NOTE Assign group and update Descriptions
+  columns.forEach((element: keyof IFlags) => {
+    flags[element].helpGroup = 'TABLE';
+
+    const descriptionKey = `TABLE_${element.toUpperCase()}` as keyof typeof tableColumnDescriptions;
+    flags.columns.description = tableColumnDescriptions[descriptionKey] ?? flags.columns.description;
+  });
+
+  return flags;
+}
+
+export { getTableFlags };
diff --git a/packages/contentstack-audit/src/util/index.ts b/packages/contentstack-audit/src/util/index.ts
index fbc476d9cf..4d9c39a4da 100644
--- a/packages/contentstack-audit/src/util/index.ts
+++ b/packages/contentstack-audit/src/util/index.ts
@@ -1 +1,2 @@
-export { default as Logger, print } from './log';
+export * from './flags'
+export { default as Logger, print } from './log';
\ No newline at end of file
diff --git a/packages/contentstack-audit/test/unit/audit-base-command.test.ts b/packages/contentstack-audit/test/unit/audit-base-command.test.ts
index 03555f2956..81301e8997 100644
--- a/packages/contentstack-audit/test/unit/audit-base-command.test.ts
+++ b/packages/contentstack-audit/test/unit/audit-base-command.test.ts
@@ -155,7 +155,7 @@ describe('AuditBaseCommand class', () => {
       .stub(AuditBaseCommand.prototype, 'showOutputOnScreen', () => {})
       .stub(fs, 'mkdirSync', () => {})
       .stub(require('fs-extra'), 'copy', () => {})
-      .it('should create backup dir', async () => {
+      .it('should throw error if not valid path provided to create backup dir', async () => {
         class CMD extends AuditBaseCommand {
           async run() {
             this.sharedConfig.flags.modules = [];
diff --git a/packages/contentstack-audit/test/unit/modules/content-types.test.ts b/packages/contentstack-audit/test/unit/modules/content-types.test.ts
index ce12786571..e7047f5ae4 100644
--- a/packages/contentstack-audit/test/unit/modules/content-types.test.ts
+++ b/packages/contentstack-audit/test/unit/modules/content-types.test.ts
@@ -24,6 +24,24 @@ describe('Content types', () => {
 
   let constructorParam: ModuleConstructorParam & CtConstructorParam;
 
+  class AuditTempClass extends ContentType {
+    constructor(public missingRefs: Record<string, any> = {}) {
+      super(constructorParam);
+      this.currentUid = 'audit';
+      this.currentTitle = 'Audit';
+      this.missingRefs['audit'] = [];
+    }
+  }
+
+  class AuditFixTempClass extends ContentType {
+    constructor(public missingRefs: Record<string, any> = {}) {
+      super({ ...constructorParam, fix: true, moduleName: undefined });
+      this.currentUid = 'audit-fix';
+      this.currentTitle = 'Audit fix';
+      this.missingRefs['audit-fix'] = [];
+    }
+  }
+
   beforeEach(() => {
     constructorParam = {
       log: () => {},
@@ -93,13 +111,7 @@ describe('Content types', () => {
       .stdout({ print: process.env.PRINT === 'true' || false })
       .stub(ContentType.prototype, 'writeFixContent', async () => {})
       .it('perform audit operation on the given CT schema', async () => {
-        const ctInstance = new (class TempClass extends ContentType {
-          constructor(public missingRefs: Record<string, any> = {}) {
-            super(constructorParam);
-            this.currentUid = 'gf';
-            this.missingRefs['gf'] = [];
-          }
-        })();
+        const ctInstance = new AuditFixTempClass();
 
         await ctInstance.run();
 
@@ -111,13 +123,7 @@ describe('Content types', () => {
       .stdout({ print: process.env.PRINT === 'true' || false })
       .stub(ContentType.prototype, 'writeFixContent', async () => {})
       .it('perform audit and fix operation on the given CT schema', async () => {
-        const ctInstance = new (class TempClass extends ContentType {
-          constructor(public missingRefs: Record<string, any> = {}) {
-            super({ ...constructorParam, fix: true, moduleName: undefined });
-            this.currentUid = 'gf';
-            this.missingRefs['gf'] = [];
-          }
-        })();
+        const ctInstance = new AuditFixTempClass();
 
         expect(JSON.stringify(await ctInstance.run(true))).includes(
           '"display_name":"Reference","reference_to":["page_4","page_3","page_2","page_1"]',
@@ -153,7 +159,7 @@ describe('Content types', () => {
     fancy
       .stdout({ print: process.env.PRINT === 'true' || false })
       .stub(ContentType.prototype, 'validateReferenceField', () => [])
-      .stub(ContentType.prototype, 'validateGlobalField', () => [])
+      .stub(ContentType.prototype, 'validateGlobalField', () => {})
       .stub(ContentType.prototype, 'validateJsonRTEFields', () => [])
       .stub(ContentType.prototype, 'validateGroupField', () => [])
       .stub(ContentType.prototype, 'validateModularBlocksField', () => [])
@@ -222,13 +228,7 @@ describe('Content types', () => {
       .stdout({ print: process.env.PRINT === 'true' || false })
       .stub(ContentType.prototype, 'runFixOnSchema', () => {})
       .it('should call lookForReference method', async () => {
-        const ctInstance = new (class TempClass extends ContentType {
-          constructor(public missingRefs: Record<string, any> = {}) {
-            super(constructorParam);
-            this.currentUid = 'gf';
-            this.missingRefs['gf'] = [];
-          }
-        })();
+        const ctInstance = new AuditTempClass();
 
         const lookForReferenceSpy = sinon.spy(ctInstance, 'lookForReference');
         const [, , , page1Ct] = ctInstance.ctSchema as CtType[];
@@ -238,5 +238,78 @@ describe('Content types', () => {
         expect(lookForReferenceSpy.called).to.be.true;
         expect(JSON.stringify(ctInstance.missingRefs)).to.be.include('"missingRefs":["page_0"]');
       });
+
+    fancy
+      .stdout({ print: process.env.PRINT === 'true' || false })
+      .stub(ContentType.prototype, 'runFixOnSchema', () => {})
+      .it('should identify missing schema on global field', async () => {
+        const ctInstance = new AuditTempClass();
+        const field = {
+          data_type: 'global_field',
+          display_name: 'Global',
+          reference_to: 'gf_0',
+          uid: 'global_field',
+        } as GlobalFieldDataType;
+
+        await ctInstance.validateGlobalField([{ uid: field.uid, name: field.display_name }], field);
+
+        const expected = {
+          audit: [
+            {
+              name: 'Audit',
+              ct_uid: 'audit',
+              data_type: field.data_type,
+              display_name: field.display_name,
+              missingRefs: 'Empty schema found',
+              tree: [{ uid: field.uid, name: field.display_name }],
+              treeStr: [{ uid: field.uid, name: field.display_name }].map(({ name }) => name).join(' ➜ '),
+            },
+          ],
+        };
+        const actual = ctInstance.missingRefs;
+        expect(actual).to.deep.equals(expected);
+      });
+  });
+
+  describe('fixGlobalFieldReferences method', () => {
+    fancy
+      .stdout({ print: process.env.PRINT === 'true' || false })
+      .stub(ContentType.prototype, 'runFixOnSchema', () => {})
+      .stub(ContentType.prototype, 'lookForReference', () => {})
+      .it('should identify missing global-field schema and attach with content-type schema', async () => {
+        // Mock/Stub
+        const ctInstance = new AuditFixTempClass();
+        const field = {
+          data_type: 'global_field',
+          display_name: 'Global',
+          reference_to: 'gf_1',
+          uid: 'global_field',
+        } as GlobalFieldDataType;
+
+        // Execution
+        const fixField = await ctInstance.fixGlobalFieldReferences([], field);
+
+        // Assertion
+        const actual = ctInstance.missingRefs;
+        const expected = {
+          'audit-fix': [
+            {
+              name: 'Audit fix',
+              ct_uid: 'audit-fix',
+              fixStatus: 'Fixed',
+              data_type: field.data_type,
+              display_name: field.display_name,
+              missingRefs: 'Empty schema found',
+              tree: [{ uid: field.uid, name: field.display_name, data_type: field.data_type }],
+              treeStr: [{ uid: field.uid, name: field.display_name, data_type: field.data_type }]
+                .map(({ name }) => name)
+                .join(' ➜ '),
+            },
+          ],
+        };
+        expect(actual).to.deep.equals(expected);
+        expect(fixField?.schema).is.not.empty;
+        expect(fixField?.schema.length).to.be.equal(2);
+      });
   });
 });
diff --git a/packages/contentstack-audit/test/unit/util/flags.test.ts b/packages/contentstack-audit/test/unit/util/flags.test.ts
new file mode 100644
index 0000000000..b0dfc98604
--- /dev/null
+++ b/packages/contentstack-audit/test/unit/util/flags.test.ts
@@ -0,0 +1,30 @@
+import { expect } from '@oclif/test';
+import { fancy } from '@contentstack/cli-dev-dependencies';
+
+import { getTableFlags } from '../../../src/util';
+
+describe('getTableFlags method', () => {
+  fancy
+    .stdout({ print: process.env.PRINT === 'true' || false })
+    .it('should return list of table flags required for audit and fix command', () => {
+      const actual = getTableFlags();
+
+      expect(actual).has.ownProperty('columns');
+      expect(actual).has.ownProperty('sort');
+      expect(actual).has.ownProperty('filter');
+      expect(actual).has.ownProperty('csv');
+      expect(actual).has.ownProperty('no-truncate');
+    });
+
+  fancy
+    .stdout({ print: process.env.PRINT === 'true' || false })
+    .it('should return only specified columns', () => {
+      const actual = getTableFlags(['columns', 'csv']);
+
+      expect(actual).has.ownProperty('columns');
+      expect(actual).has.ownProperty('csv');
+      expect(actual).has.not.ownProperty('no-truncate');
+      expect(actual).has.not.ownProperty('sort');
+      expect(actual).has.not.ownProperty('filter');
+    });
+});
diff --git a/packages/contentstack-dev-dependencies/package.json b/packages/contentstack-dev-dependencies/package.json
index 01d6aebeb6..83f5f2cc27 100644
--- a/packages/contentstack-dev-dependencies/package.json
+++ b/packages/contentstack-dev-dependencies/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "prepack": "pnpm compile",
+    "prepack": "npm run clean && npm run compile",
     "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "lint": "eslint src/**/*.ts",
diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
index 76903788a2..6d0b0bbb8a 100644
--- a/packages/contentstack/README.md
+++ b/packages/contentstack/README.md
@@ -120,16 +120,20 @@ USAGE
     --no-truncate]
 
 FLAGS
+  --modules=<option>...  Provide the list of modules to be audited
+                         <options: content-types|global-fields|entries>
+  --report-path=<value>  Path to store the audit reports
+
+COMMON FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
-  --modules=<option>...   Provide the list of modules to be audited
-                          <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
-  --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and find possible errors in the exported Contentstack data
@@ -157,22 +161,29 @@ Perform audits and fix possible errors in the exported Contentstack data.
 ```
 USAGE
   $ csdx audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
-    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
-    [--filter <value>] [--csv | --no-truncate]
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--fix-only
+    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    <value>] [--csv | --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --fix-only=<option>...  Provide the list of fix options
+                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
   --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
   --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+COMMON FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and fix possible errors in the exported Contentstack data.
@@ -188,6 +199,8 @@ EXAMPLES
 
   $ csdx audit:fix --report-path=<path> --copy-dir --csv
 
+  $ csdx audit:fix --fix-only=reference,global_field --copy-dir
+
   $ csdx audit:fix --report-path=<path> --filter="name=<filter-value>"
 
   $ csdx audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
@@ -2358,16 +2371,20 @@ USAGE
     --no-truncate]
 
 FLAGS
+  --modules=<option>...  Provide the list of modules to be audited
+                         <options: content-types|global-fields|entries>
+  --report-path=<value>  Path to store the audit reports
+
+COMMON FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
-  --modules=<option>...   Provide the list of modules to be audited
-                          <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
-  --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and find possible errors in the exported Contentstack data
@@ -2397,22 +2414,29 @@ Perform audits and fix possible errors in the exported Contentstack data.
 ```
 USAGE
   $ csdx cm:stacks:audit:fix [-c <value>] [-d <value>] [--report-path <value>] [--modules
-    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--columns <value> | ] [--sort <value>]
-    [--filter <value>] [--csv | --no-truncate]
+    content-types|global-fields|entries] [--copy-path <value> --copy-dir] [--fix-only
+    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    <value>] [--csv | --no-truncate]
 
 FLAGS
-  -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Path where the data is stored
-  --columns=<value>       only show provided columns (comma-separated)
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
-  --csv                   output is csv format [alias: --output=csv]
-  --filter=<value>        filter property by partial string matching, ex: name=foo
+  --fix-only=<option>...  Provide the list of fix options
+                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
   --modules=<option>...   Provide the list of modules to be audited
                           <options: content-types|global-fields|entries>
-  --no-truncate           do not truncate output to fit screen
   --report-path=<value>   Path to store the audit reports
-  --sort=<value>          property to sort by (prepend '-' for descending)
+
+COMMON FLAGS
+  -c, --config=<value>    Path of the external config
+  -d, --data-dir=<value>  Path where the data is stored
+
+TABLE FLAGS
+  --columns=<value>  do not truncate output to fit screen
+  --csv              output is csv format [alias: --output=csv]
+  --filter=<value>   filter property by partial string matching, ex: name=foo
+  --no-truncate      do not truncate output to fit screen
+  --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Perform audits and fix possible errors in the exported Contentstack data.
@@ -2428,6 +2452,8 @@ EXAMPLES
 
   $ csdx cm:stacks:audit:fix --report-path=<path> --copy-dir --csv
 
+  $ csdx cm:stacks:audit:fix --fix-only=reference,global_field --copy-dir
+
   $ csdx cm:stacks:audit:fix --report-path=<path> --filter="name=<filter-value>"
 
   $ csdx cm:stacks:audit:fix --report-path=<path> --modules=content-types --filter="name="<filter-value>" --copy-dir --copy-path=<path>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 20e8a43863..6e3eecd6a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -122,6 +122,7 @@ importers:
   packages/contentstack-audit:
     specifiers:
       '@contentstack/cli-command': ~1.2.15
+      '@contentstack/cli-dev-dependencies': ^1.2.3
       '@contentstack/cli-utilities': ~1.5.5
       '@oclif/plugin-help': ^5
       '@oclif/plugin-plugins': ^3.8.4
@@ -140,7 +141,7 @@ importers:
       lodash: ^4.17.21
       mocha: ^10.2.0
       nyc: ^15.1.0
-      oclif: ^3.10.0
+      oclif: ^3
       shx: ^0.3.4
       sinon: ^17.0.0
       ts-jest: ^29.1.1
@@ -161,6 +162,7 @@ importers:
       uuid: 9.0.1
       winston: 3.10.0
     devDependencies:
+      '@contentstack/cli-dev-dependencies': link:../contentstack-dev-dependencies
       '@oclif/test': 2.3.31_eyayto62fyd4eo5o5fvolpu7d4
       '@types/chai': 4.3.5
       '@types/fs-extra': 11.0.2