From 6e771e3c65266c7d0b3bcc776d7dc456af530f50 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Thu, 8 Feb 2024 12:32:15 +0530
Subject: [PATCH 1/3] Feat: Audit and check if extensions/marketplace apps are
 missing used in the content types and entries

---
 package-lock.json                             |  14 +-
 packages/contentstack-audit/README.md         |  10 +-
 packages/contentstack-audit/package.json      |   2 +-
 .../contentstack-audit/src/config/index.ts    |  20 ++-
 .../src/modules/content-types.ts              | 142 +++++++++++++--
 .../contentstack-audit/src/modules/entries.ts | 170 +++++++++++++++++-
 .../contentstack-audit/src/types/common.ts    |   6 +-
 .../src/types/content-types.ts                |  29 +--
 .../contentstack-audit/src/types/entries.ts   |  18 +-
 .../contentstack-audit/src/types/extension.ts |  48 +++++
 packages/contentstack-clone/package.json      |   2 +-
 packages/contentstack-import/README.md        |   2 +-
 packages/contentstack-import/package.json     |   4 +-
 packages/contentstack-seed/package.json       |   2 +-
 packages/contentstack/package.json            |   4 +-
 pnpm-lock.yaml                                |  10 +-
 16 files changed, 421 insertions(+), 62 deletions(-)
 create mode 100644 packages/contentstack-audit/src/types/extension.ts

diff --git a/package-lock.json b/package-lock.json
index eba3009fcb..bab8732ef2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23543,7 +23543,7 @@
       "version": "1.14.0",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-audit": "~1.3.5",
+        "@contentstack/cli-audit": "~1.4.0",
         "@contentstack/cli-auth": "~1.3.17",
         "@contentstack/cli-cm-bootstrap": "~1.8.0",
         "@contentstack/cli-cm-branches": "~1.0.22",
@@ -23551,7 +23551,7 @@
         "@contentstack/cli-cm-clone": "~1.10.0",
         "@contentstack/cli-cm-export": "~1.10.5",
         "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-cm-migrate-rte": "~1.4.15",
         "@contentstack/cli-cm-seed": "~1.7.1",
         "@contentstack/cli-command": "~1.2.17",
@@ -23608,7 +23608,7 @@
     },
     "packages/contentstack-audit": {
       "name": "@contentstack/cli-audit",
-      "version": "1.3.5",
+      "version": "1.4.0",
       "license": "MIT",
       "dependencies": {
         "@contentstack/cli-command": "~1.2.16",
@@ -24093,7 +24093,7 @@
       "dependencies": {
         "@colors/colors": "^1.5.0",
         "@contentstack/cli-cm-export": "~1.10.4",
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "async": "^3.2.4",
@@ -24993,10 +24993,10 @@
     },
     "packages/contentstack-import": {
       "name": "@contentstack/cli-cm-import",
-      "version": "1.13.3",
+      "version": "1.13.4",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-audit": "^1.3.5",
+        "@contentstack/cli-audit": "~1.4.0",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "@contentstack/management": "~1.13.0",
@@ -25472,7 +25472,7 @@
       "version": "1.7.1",
       "license": "MIT",
       "dependencies": {
-        "@contentstack/cli-cm-import": "~1.13.3",
+        "@contentstack/cli-cm-import": "~1.13.4",
         "@contentstack/cli-command": "~1.2.16",
         "@contentstack/cli-utilities": "~1.5.11",
         "inquirer": "8.2.4",
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
index 5af1961475..53417e0f57 100644
--- a/packages/contentstack-audit/README.md
+++ b/packages/contentstack-audit/README.md
@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.3.5 darwin-arm64 node-v20.8.0
+@contentstack/cli-audit/1.4.0 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -99,14 +99,14 @@ 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] [--fix-only
-    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    reference|global_field|json:rte|json:extension|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
     <value>] [--csv | --no-truncate]
 
 FLAGS
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
   --fix-only=<option>...  Provide the list of fix options
-                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
+                          <options: reference|global_field|json:rte|json:extension|blocks|group>
   --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
@@ -198,14 +198,14 @@ 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] [--fix-only
-    reference|global_field|json:rte|json:custom-field|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
+    reference|global_field|json:rte|json:extension|blocks|group] [--columns <value> | ] [--sort <value>] [--filter
     <value>] [--csv | --no-truncate]
 
 FLAGS
   --copy-dir              Create backup from the original data.
   --copy-path=<value>     Provide the path to backup the copied data
   --fix-only=<option>...  Provide the list of fix options
-                          <options: reference|global_field|json:rte|json:custom-field|blocks|group>
+                          <options: reference|global_field|json:rte|json:extension|blocks|group>
   --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
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
index 45c759d203..81bf7cf0ee 100644
--- a/packages/contentstack-audit/package.json
+++ b/packages/contentstack-audit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
diff --git a/packages/contentstack-audit/src/config/index.ts b/packages/contentstack-audit/src/config/index.ts
index 7a5a773273..e5f2eea755 100644
--- a/packages/contentstack-audit/src/config/index.ts
+++ b/packages/contentstack-audit/src/config/index.ts
@@ -3,7 +3,7 @@ const config = {
   skipRefs: ['sys_assets'],
   skipFieldTypes: ['taxonomy'],
   modules: ['content-types', 'global-fields', 'entries'],
-  'fix-fields': ['reference', 'global_field', 'json:rte', 'json:custom-field', 'blocks', 'group'],
+  'fix-fields': ['reference', 'global_field', 'json:rte', 'json:extension', 'blocks', 'group'],
   moduleConfig: {
     'content-types': {
       name: 'content type',
@@ -26,6 +26,24 @@ const config = {
       fileName: 'locales.json',
     },
   },
+  entries: {
+    systemKeys: [
+      'uid',
+      'ACL',
+      'tags',
+      'locale',
+      '_version',
+      '_metadata',
+      'published',
+      'created_at',
+      'updated_at',
+      'created_by',
+      'updated_by',
+      '_in_progress',
+      '_restore_status',
+      'publish_details',
+    ],
+  },
 };
 
 export default config;
diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
index c40500fc63..28b7d0b107 100644
--- a/packages/contentstack-audit/src/modules/content-types.ts
+++ b/packages/contentstack-audit/src/modules/content-types.ts
@@ -1,7 +1,9 @@
+import map from 'lodash/map';
 import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
-import { existsSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+
 import { ux } from '@contentstack/cli-utilities';
 
 import {
@@ -19,9 +21,11 @@ import {
   ReferenceFieldDataType,
   ContentTypeSchemaType,
   GlobalFieldSchemaTypes,
+  ExtensionOrAppFieldDataType,
 } from '../types';
 import auditConfig from '../config';
 import { $t, auditFixMsg, auditMsg, commonMsg } from '../messages';
+import { MarketplaceAppsInstallationData } from '../types/extension';
 
 /* The `ContentType` class is responsible for scanning content types, looking for references, and
 generating a report in JSON and CSV formats. */
@@ -33,6 +37,7 @@ export default class ContentType {
   public folderPath: string;
   public currentUid!: string;
   public currentTitle!: string;
+  public extensions: string[] = [];
   public inMemoryFix: boolean = false;
   public gfSchema: ContentTypeStruct[];
   public ctSchema: ContentTypeStruct[];
@@ -67,6 +72,8 @@ export default class ContentType {
 
     this.schema = this.moduleName === 'content-types' ? this.ctSchema : this.gfSchema;
 
+    await this.prerequisiteData();
+
     for (const schema of this.schema ?? []) {
       this.currentUid = schema.uid;
       this.currentTitle = schema.title;
@@ -96,6 +103,35 @@ export default class ContentType {
     return this.missingRefs;
   }
 
+  /**
+   * @method prerequisiteData
+   * The `prerequisiteData` function reads and parses JSON files to retrieve extension and marketplace
+   * app data, and stores them in the `extensions` array.
+   */
+  async prerequisiteData() {
+    const extensionPath = resolve(this.config.basePath, 'extensions', 'extensions.json');
+    const marketplacePath = resolve(this.config.basePath, 'marketplace_apps', 'marketplace_apps.json');
+
+    if (existsSync(extensionPath)) {
+      try {
+        this.extensions = Object.keys(JSON.parse(readFileSync(extensionPath, 'utf8')));
+      } catch (error) {}
+    }
+
+    if (existsSync(marketplacePath)) {
+      try {
+        const marketplaceApps: MarketplaceAppsInstallationData[] = JSON.parse(readFileSync(marketplacePath, 'utf8'));
+
+        for (const app of marketplaceApps) {
+          const metaData = map(map(app?.ui_location?.locations, 'meta').flat(), 'extension_uid').filter(
+            (val) => val,
+          ) as string[];
+          this.extensions.push(...metaData);
+        }
+      } catch (error) {}
+    }
+  }
+
   /**
    * The function checks if it can write the fix content to a file and if so, it writes the content as
    * JSON to the specified file path.
@@ -157,10 +193,16 @@ export default class ContentType {
           );
           break;
         case 'json':
-          if (child.field_metadata.extension) {
-            if (!fixTypes.includes('json:custom-field')) continue;
+          if ('extension' in child.field_metadata && child.field_metadata.extension) {
+            if (!fixTypes.includes('json:extension')) continue;
             // NOTE Custom field type
-          } else if (child.field_metadata.allow_json_rte) {
+            this.missingRefs[this.currentUid].push(
+              ...this.validateExtensionAndAppField(
+                [...tree, { uid: child.uid, name: child.display_name }],
+                child as ExtensionOrAppFieldDataType,
+              ),
+            );
+          } else if ('allow_json_rte' in child.field_metadata && child.field_metadata.allow_json_rte) {
             if (!fixTypes.includes('json:rte')) continue;
             // NOTE JSON RTE field type
             this.missingRefs[this.currentUid].push(
@@ -199,6 +241,45 @@ export default class ContentType {
     return this.validateReferenceToValues(tree, field);
   }
 
+  /**
+   * The function `validateExtensionAndAppsField` checks if a given field has a valid extension or app
+   * reference and returns any missing references.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} field - The `field` parameter is of type `ExtensionOrAppFieldDataType`.
+   * @returns The function `validateExtensionAndAppsField` returns an array of `RefErrorReturnType`
+   * objects.
+   */
+  validateExtensionAndAppField(
+    tree: Record<string, unknown>[],
+    field: ExtensionOrAppFieldDataType,
+  ): RefErrorReturnType[] {
+    if (this.fix) return [];
+
+    const missingRefs = [];
+    let { uid, extension_uid, display_name, data_type } = field;
+
+    if (!this.extensions.includes(extension_uid)) {
+      missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+    }
+
+    return missingRefs.length
+      ? [
+          {
+            tree,
+            data_type,
+            missingRefs,
+            display_name,
+            ct_uid: this.currentUid,
+            name: this.currentTitle,
+            treeStr: tree
+              .map(({ name }) => name)
+              .filter((val) => val)
+              .join(' ➜ '),
+          },
+        ]
+      : [];
+  }
+
   /**
    * The function "validateGlobalField" asynchronously validates a global field by looking for a
    * reference in a tree data structure.
@@ -298,7 +379,9 @@ export default class ContentType {
 
     for (const reference of reference_to ?? []) {
       // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
-      if (this.config.skipRefs.includes(reference)) continue;
+      if (this.config.skipRefs.includes(reference)) {
+        continue;
+      }
 
       const refExist = find(this.ctSchema, { uid: reference });
 
@@ -350,14 +433,13 @@ export default class ContentType {
           case 'json':
           case 'reference':
             if (data_type === 'json') {
-              if (field.field_metadata.extension) {
+              if ('extension' in field.field_metadata && field.field_metadata.extension) {
                 // NOTE Custom field type
-                if (!fixTypes.includes('json:custom-field')) return field;
+                if (!fixTypes.includes('json:extension')) return field;
 
                 // NOTE Fix logic
-
-                return field;
-              } else if (field.field_metadata.allow_json_rte) {
+                return this.fixMissingExtensionOrApp(tree, field as ExtensionOrAppFieldDataType);
+              } else if ('allow_json_rte' in field.field_metadata && field.field_metadata.allow_json_rte) {
                 if (!fixTypes.includes('json:rte')) return field;
 
                 return this.fixMissingReferences(tree, field as JsonRTEFieldDataType);
@@ -499,6 +581,41 @@ export default class ContentType {
       .filter((val) => val) as ModularBlockType[];
   }
 
+  /**
+   * The function checks for missing extension or app references in a given tree and fixes them if the
+   * fix flag is enabled.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} field - The `field` parameter is of type
+   * `ExtensionOrAppFieldDataType`.
+   * @returns If the `fix` flag is true and there are missing references (`missingRefs` is not empty),
+   * then `null` is returned. Otherwise, the `field` parameter is returned.
+   */
+  fixMissingExtensionOrApp(tree: Record<string, unknown>[], field: ExtensionOrAppFieldDataType) {
+    const missingRefs: string[] = [];
+    const { uid, extension_uid, data_type, display_name } = field;
+
+    if (!this.extensions.includes(extension_uid)) {
+      missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+    }
+
+    if (this.fix && !isEmpty(missingRefs)) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        data_type,
+        missingRefs,
+        display_name,
+        fixStatus: 'Fixed',
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+
+      return null
+    }
+
+    return field;
+  }
+
   /**
    * The function `fixMissingReferences` checks for missing references in a given tree and field, and
    * attempts to fix them by removing the missing references from the field's `reference_to` array.
@@ -515,7 +632,9 @@ export default class ContentType {
 
     for (const reference of reference_to ?? []) {
       // NOTE Can skip specific references keys (Ex, system defined keys can be skipped)
-      if (this.config.skipRefs.includes(reference)) continue;
+      if (this.config.skipRefs.includes(reference)) {
+        continue;
+      }
 
       const refExist = find(this.ctSchema, { uid: reference });
 
@@ -557,6 +676,7 @@ export default class ContentType {
    */
   fixGroupField(tree: Record<string, unknown>[], field: GroupFieldDataType) {
     const { data_type, display_name } = field;
+
     field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
 
     if (isEmpty(field.schema)) {
diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
index 56f5ff884f..96cae08247 100644
--- a/packages/contentstack-audit/src/modules/entries.ts
+++ b/packages/contentstack-audit/src/modules/entries.ts
@@ -1,3 +1,4 @@
+import map from 'lodash/map';
 import find from 'lodash/find';
 import values from 'lodash/values';
 import isEmpty from 'lodash/isEmpty';
@@ -31,8 +32,11 @@ import {
   EntryJsonRTEFieldDataType,
   EntryModularBlocksDataType,
   EntryReferenceFieldDataType,
+  ExtensionOrAppFieldDataType,
+  EntryExtensionOrAppFieldDataType,
 } from '../types';
 import GlobalField from './global-fields';
+import { MarketplaceAppsInstallationData } from '../types/extension';
 
 export default class Entries {
   public log: LogFn;
@@ -43,6 +47,7 @@ export default class Entries {
   public folderPath: string;
   public currentUid!: string;
   public currentTitle!: string;
+  public extensions: string[] = [];
   public gfSchema: ContentTypeStruct[];
   public ctSchema: ContentTypeStruct[];
   protected entries!: Record<string, EntryStruct>;
@@ -96,6 +101,10 @@ export default class Entries {
               this.missingRefs[this.currentUid] = [];
             }
 
+            if (this.fix) {
+              this.removeMissingKeysOnEntry(ctSchema.schema as ContentTypeSchemaType[], this.entries[entryUid]);
+            }
+
             this.lookForReference([{ locale: code, uid, name: title }], ctSchema, this.entries[entryUid]);
             this.log(
               $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, {
@@ -152,6 +161,28 @@ export default class Entries {
       ctSchema: this.ctSchema,
       gfSchema: this.gfSchema,
     }).run(true)) as ContentTypeStruct[];
+
+    const extensionPath = resolve(this.config.basePath, 'extensions', 'extensions.json');
+    const marketplacePath = resolve(this.config.basePath, 'marketplace_apps', 'marketplace_apps.json');
+
+    if (existsSync(extensionPath)) {
+      try {
+        this.extensions = Object.keys(JSON.parse(readFileSync(extensionPath, 'utf8')));
+      } catch (error) {}
+    }
+
+    if (existsSync(marketplacePath)) {
+      try {
+        const marketplaceApps: MarketplaceAppsInstallationData[] = JSON.parse(readFileSync(marketplacePath, 'utf8'));
+
+        for (const app of marketplaceApps) {
+          const metaData = map(map(app?.ui_location?.locations, 'meta').flat(), 'extension_uid').filter(
+            (val) => val,
+          ) as string[];
+          this.extensions.push(...metaData);
+        }
+      } catch (error) {}
+    }
   }
 
   /**
@@ -216,9 +247,16 @@ export default class Entries {
           );
           break;
         case 'json':
-          if (child.field_metadata.extension) {
+          if ('extension' in child.field_metadata && child.field_metadata.extension) {
+            this.missingRefs[this.currentUid].push(
+              ...this.validateExtensionAndAppField(
+                [...tree, { uid: child.uid, name: child.display_name, field: uid }],
+                child as ExtensionOrAppFieldDataType,
+                entry as EntryExtensionOrAppFieldDataType,
+              ),
+            );
             // NOTE Custom field type
-          } else if (child.field_metadata.allow_json_rte) {
+          } else if ('allow_json_rte' in child.field_metadata && child.field_metadata.allow_json_rte) {
             // NOTE JSON RTE field type
             this.validateJsonRTEFields(
               [...tree, { uid: child.uid, name: child.display_name, field: uid }],
@@ -266,6 +304,56 @@ export default class Entries {
     return this.validateReferenceValues(tree, fieldStructure, field);
   }
 
+  /**
+   * The function `validateExtensionAndAppField` checks if a given field has a valid extension
+   * reference and returns any missing references.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} fieldStructure - The `fieldStructure` parameter is of type
+   * `ExtensionOrAppFieldDataType` and represents the structure of a field in an extension or app. It
+   * contains properties such as `uid`, `display_name`, and `data_type`.
+   * @param {EntryExtensionOrAppFieldDataType} field - The `field` parameter is of type
+   * `EntryExtensionOrAppFieldDataType`, which is an object containing information about a specific
+   * field in an entry. It has the following properties:
+   * @returns an array containing an object if there are missing references. If there are no missing
+   * references, an empty array is returned.
+   */
+  validateExtensionAndAppField(
+    tree: Record<string, unknown>[],
+    fieldStructure: ExtensionOrAppFieldDataType,
+    field: EntryExtensionOrAppFieldDataType,
+  ) {
+    if (this.fix) return [];
+
+    const missingRefs = [];
+
+    let { uid, display_name, data_type } = fieldStructure || {};
+
+    if (field[uid]) {
+      let { metadata: { extension_uid } = { extension_uid: '' } } = field[uid] || {};
+
+      if (!this.extensions.includes(extension_uid)) {
+        missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+      }
+    }
+
+    return missingRefs.length
+      ? [
+          {
+            tree,
+            data_type,
+            missingRefs,
+            display_name,
+            ct_uid: this.currentUid,
+            name: this.currentTitle,
+            treeStr: tree
+              .map(({ name }) => name)
+              .filter((val) => val)
+              .join(' ➜ '),
+          },
+        ]
+      : [];
+  }
+
   /**
    * The function "validateGlobalField" is an asynchronous function that takes in a tree,
    * fieldStructure, and field as parameters and looks for references in the tree.
@@ -438,6 +526,19 @@ export default class Entries {
       : [];
   }
 
+  removeMissingKeysOnEntry(schema: ContentTypeSchemaType[], entry: EntryFieldType) {
+    // NOTE remove invalid entry keys
+    const ctFields = map(schema, 'uid');
+    const entryFields = Object.keys(entry ?? {});
+
+    entryFields.forEach((eKey) => {
+      // NOTE Key should not be system key and not exist in schema means it's invalid entry key
+      if (!this.config.entries.systemKeys.includes(eKey) && !ctFields.includes(eKey)) {
+        delete entry[eKey];
+      }
+    });
+  }
+
   /**
    * The function `runFixOnSchema` takes in a tree, schema, and entry, and applies fixes to the entry
    * based on the schema.
@@ -472,10 +573,15 @@ export default class Entries {
         case 'json':
         case 'reference':
           if (data_type === 'json') {
-            if (field.field_metadata.extension) {
+            if ('extension' in field.field_metadata && field.field_metadata.extension) {
               // NOTE Custom field type
+              this.fixMissingExtensionOrApp(
+                [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
+                field as ExtensionOrAppFieldDataType,
+                entry as EntryExtensionOrAppFieldDataType,
+              );
               break;
-            } else if (field.field_metadata.allow_json_rte) {
+            } else if ('allow_json_rte' in field.field_metadata && field.field_metadata.allow_json_rte) {
               this.fixJsonRteMissingReferences(
                 [...tree, { uid: field.uid, name: field.display_name, data_type: field.data_type }],
                 field as JsonRTEFieldDataType,
@@ -509,7 +615,6 @@ export default class Entries {
           ) as EntryGroupFieldDataType;
           break;
       }
-    
     });
 
     return entry;
@@ -576,6 +681,54 @@ export default class Entries {
     return entry;
   }
 
+  /**
+   * The function `fixMissingExtensionOrApp` checks if a field in an entry has a valid extension or app
+   * reference, and fixes it if necessary.
+   * @param {Record<string, unknown>[]} tree - An array of objects representing a tree structure.
+   * @param {ExtensionOrAppFieldDataType} field - The `field` parameter is of type
+   * `ExtensionOrAppFieldDataType`, which is an object with properties `uid`, `display_name`, and
+   * `data_type`.
+   * @param {EntryExtensionOrAppFieldDataType} entry - The `entry` parameter is of type
+   * `EntryExtensionOrAppFieldDataType`, which is an object containing the data for a specific entry.
+   * It may have a property with the key specified by the `uid` variable, which represents the field
+   * that contains the extension or app data.
+   * @returns the `field` parameter.
+   */
+  fixMissingExtensionOrApp(
+    tree: Record<string, unknown>[],
+    field: ExtensionOrAppFieldDataType,
+    entry: EntryExtensionOrAppFieldDataType,
+  ) {
+    const missingRefs = [];
+
+    let { uid, display_name, data_type } = field || {};
+
+    if (entry[uid]) {
+      let { metadata: { extension_uid } = { extension_uid: '' } } = entry[uid] || {};
+
+      if (extension_uid && !this.extensions.includes(extension_uid)) {
+        missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
+      }
+    }
+
+    if (this.fix && !isEmpty(missingRefs)) {
+      this.missingRefs[this.currentUid].push({
+        tree,
+        data_type,
+        missingRefs,
+        display_name,
+        fixStatus: 'Fixed',
+        ct_uid: this.currentUid,
+        name: this.currentTitle,
+        treeStr: tree.map(({ name }) => name).join(' ➜ '),
+      });
+
+      delete entry[uid];
+    }
+
+    return field;
+  }
+
   /**
    * The function `fixGroupField` takes in a tree, a field, and an entry, and if the field has a
    * schema, it runs a fix on the schema and returns the updated entry, otherwise it returns the
@@ -672,9 +825,9 @@ export default class Entries {
     field: ReferenceFieldDataType | JsonRTEFieldDataType,
     entry: EntryReferenceFieldDataType[],
   ) {
-
     const missingRefs: Record<string, any>[] = [];
-    entry = entry?.map((reference) => {
+    entry = entry
+      ?.map((reference) => {
         const { uid } = reference;
         const refExist = find(this.entryMetaData, { uid });
 
@@ -684,7 +837,8 @@ export default class Entries {
         }
 
         return reference;
-      }).filter((val) => val) as EntryReferenceFieldDataType[];
+      })
+      .filter((val) => val) as EntryReferenceFieldDataType[];
 
     if (!isEmpty(missingRefs)) {
       this.missingRefs[this.currentUid].push({
diff --git a/packages/contentstack-audit/src/types/common.ts b/packages/contentstack-audit/src/types/common.ts
index a0c04cfece..71d1ba844f 100644
--- a/packages/contentstack-audit/src/types/common.ts
+++ b/packages/contentstack-audit/src/types/common.ts
@@ -5,4 +5,8 @@ type IncludeFlags<T, K extends keyof T> = Pick<T, K>;
 
 type CommandNames = 'cm:stacks:audit' | 'cm:stacks:audit:fix';
 
-export { IFlags, IncludeFlags, CommandNames };
+interface AnyProperty {
+  [propName: string]: any;
+}
+
+export { IFlags, IncludeFlags, CommandNames, AnyProperty };
diff --git a/packages/contentstack-audit/src/types/content-types.ts b/packages/contentstack-audit/src/types/content-types.ts
index 95b4aff074..ebd8f32ac8 100644
--- a/packages/contentstack-audit/src/types/content-types.ts
+++ b/packages/contentstack-audit/src/types/content-types.ts
@@ -1,10 +1,11 @@
 import config from '../config';
+import { AnyProperty } from './common';
 import { ConfigType, LogFn } from './utils';
 
 type ContentTypeSchemaType =
   | ReferenceFieldDataType
   | GlobalFieldDataType
-  | CustomFieldDataType
+  | ExtensionOrAppFieldDataType
   | JsonRTEFieldDataType
   | GroupFieldDataType
   | ModularBlocksDataType;
@@ -18,7 +19,7 @@ type ContentTypeStruct = {
 
 type ModuleConstructorParam = {
   log: LogFn;
-  fix?: boolean
+  fix?: boolean;
   config: ConfigType;
   moduleName?: keyof typeof config.moduleConfig;
 };
@@ -33,10 +34,9 @@ type CommonDataTypeStruct = {
   data_type: string;
   display_name: string;
   field_metadata: {
-    extension: boolean;
     ref_multiple: boolean;
     allow_json_rte: boolean;
-  } & Record<string, unknown>;
+  } & AnyProperty;
 };
 
 type RefErrorReturnType = {
@@ -44,7 +44,7 @@ type RefErrorReturnType = {
   ct_uid: string;
   treeStr: string;
   data_type: string;
-  fixStatus?: string
+  fixStatus?: string;
   missingRefs: string[];
   display_name: string;
   tree: Record<string, unknown>[];
@@ -62,9 +62,9 @@ type GlobalFieldDataType = CommonDataTypeStruct & {
 };
 
 // NOTE Type 3
-type CustomFieldDataType = CommonDataTypeStruct & {
-  reference_to: string[];
+type ExtensionOrAppFieldDataType = Omit<CommonDataTypeStruct, 'field_metadata'> & {
   extension_uid: string;
+  field_metadata: { extension: boolean };
 };
 
 // NOTE Type 4
@@ -86,7 +86,7 @@ type ModularBlockType = {
     | JsonRTEFieldDataType
     | ModularBlocksDataType
     | ReferenceFieldDataType
-    | CustomFieldDataType
+    | ExtensionOrAppFieldDataType
     | GroupFieldDataType
   )[];
 };
@@ -96,9 +96,14 @@ type ModularBlocksDataType = CommonDataTypeStruct & {
 };
 
 // NOTE It can have following field types global, Custom, json/json rte, reference
-type GroupFieldSchemaTypes = GroupFieldDataType | CommonDataTypeStruct | GlobalFieldDataType | ReferenceFieldDataType;
+type GroupFieldSchemaTypes =
+  | GroupFieldDataType
+  | CommonDataTypeStruct
+  | GlobalFieldDataType
+  | ReferenceFieldDataType
+  | ExtensionOrAppFieldDataType;
 
-type GlobalFieldSchemaTypes = ReferenceFieldDataType | GroupFieldDataType | CustomFieldDataType;
+type GlobalFieldSchemaTypes = ReferenceFieldDataType | GroupFieldDataType | ExtensionOrAppFieldDataType;
 
 type ModularBlocksSchemaTypes = ReferenceFieldDataType | JsonRTEFieldDataType;
 
@@ -107,7 +112,7 @@ enum OutputColumn {
   'Field name' = 'display_name',
   'Field type' = 'data_type',
   'Missing references' = 'missingRefs',
-  Path = 'treeStr'
+  Path = 'treeStr',
 }
 
 export {
@@ -116,7 +121,7 @@ export {
   ModuleConstructorParam,
   ReferenceFieldDataType,
   GlobalFieldDataType,
-  CustomFieldDataType,
+  ExtensionOrAppFieldDataType,
   JsonRTEFieldDataType,
   GroupFieldDataType,
   ModularBlocksDataType,
diff --git a/packages/contentstack-audit/src/types/entries.ts b/packages/contentstack-audit/src/types/entries.ts
index 7e3f7010a5..d91b4b94b5 100644
--- a/packages/contentstack-audit/src/types/entries.ts
+++ b/packages/contentstack-audit/src/types/entries.ts
@@ -1,3 +1,5 @@
+import { AnyProperty } from './common';
+
 type Locale = {
   uid: string;
   code: string;
@@ -29,8 +31,11 @@ type EntryGlobalFieldDataType = {
 };
 
 // NOTE Type 3
-type EntryCustomFieldDataType = {
-  [key: string]: EntryStruct;
+type EntryExtensionOrAppFieldDataType = {
+  [key: string]: {
+    uid: string;
+    metadata: { extension_uid: string } & AnyProperty;
+  };
 };
 
 // NOTE Type 4
@@ -71,14 +76,19 @@ type EntryRefErrorReturnType = {
   missingRefs: string[] | Record<string, unknown>[];
 };
 
-type EntryFieldType = EntryStruct | EntryGlobalFieldDataType | EntryModularBlocksDataType | EntryGroupFieldDataType;
+type EntryFieldType =
+  | EntryStruct
+  | EntryGlobalFieldDataType
+  | EntryModularBlocksDataType
+  | EntryGroupFieldDataType
+  | EntryExtensionOrAppFieldDataType;
 
 export {
   Locale,
   EntryStruct,
   EntryFieldType,
   EntryGlobalFieldDataType,
-  EntryCustomFieldDataType,
+  EntryExtensionOrAppFieldDataType,
   EntryJsonRTEFieldDataType,
   EntryGroupFieldDataType,
   EntryModularBlocksDataType,
diff --git a/packages/contentstack-audit/src/types/extension.ts b/packages/contentstack-audit/src/types/extension.ts
new file mode 100644
index 0000000000..88705ef289
--- /dev/null
+++ b/packages/contentstack-audit/src/types/extension.ts
@@ -0,0 +1,48 @@
+type AppLocation =
+  | 'cs.cm.stack.config'
+  | 'cs.cm.stack.dashboard'
+  | 'cs.cm.stack.sidebar'
+  | 'cs.cm.stack.custom_field'
+  | 'cs.cm.stack.rte'
+  | 'cs.cm.stack.asset_sidebar'
+  | 'cs.org.config';
+
+interface ExtensionMeta {
+  uid?: string;
+  name?: string;
+  description?: string;
+  path?: string;
+  signed: boolean;
+  extension_uid?: string;
+  data_type?: string;
+  enabled?: boolean;
+  width?: number;
+  blur?: boolean;
+  default_width?: 'full' | 'half';
+}
+
+interface Extension {
+  type: AppLocation;
+  meta: ExtensionMeta[];
+}
+
+interface LocationConfiguration {
+  signed: boolean;
+  base_url: string;
+  locations: Extension[];
+}
+
+type MarketplaceAppsInstallationData = {
+  uid: string;
+  status: string;
+  configuration: any;
+  server_configuration: any;
+  target: { type: string; uid: string };
+  ui_location: LocationConfiguration;
+} & AnyProperty;
+
+interface AnyProperty {
+  [propName: string]: any;
+}
+
+export { MarketplaceAppsInstallationData };
\ No newline at end of file
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
index de90d23501..72b6d0560b 100644
--- a/packages/contentstack-clone/package.json
+++ b/packages/contentstack-clone/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@contentstack/cli-cm-export": "~1.10.4",
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "@colors/colors": "^1.5.0",
diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md
index ca6fe2c3ff..5daa5975aa 100644
--- a/packages/contentstack-import/README.md
+++ b/packages/contentstack-import/README.md
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.13.3 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-import/1.13.4 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
index dc5c4aa3cb..68bb88db64 100644
--- a/packages/contentstack-import/package.json
+++ b/packages/contentstack-import/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.13.3",
+  "version": "1.13.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "^1.3.5",
+    "@contentstack/cli-audit": "~1.4.0",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "@contentstack/management": "~1.13.0",
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
index 2322efead6..c279ba12ca 100644
--- a/packages/contentstack-seed/package.json
+++ b/packages/contentstack-seed/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
index 7fd21fa112..36bf221216 100755
--- a/packages/contentstack/package.json
+++ b/packages/contentstack/package.json
@@ -22,7 +22,7 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.3.5",
+    "@contentstack/cli-audit": "~1.4.0",
     "@contentstack/cli-auth": "~1.3.17",
     "@contentstack/cli-cm-bootstrap": "~1.8.0",
     "@contentstack/cli-cm-branches": "~1.0.22",
@@ -30,7 +30,7 @@
     "@contentstack/cli-cm-export": "~1.10.5",
     "@contentstack/cli-cm-clone": "~1.10.0",
     "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-    "@contentstack/cli-cm-import": "~1.13.3",
+    "@contentstack/cli-cm-import": "~1.13.4",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.1",
     "@contentstack/cli-command": "~1.2.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd5b947a76..5de3f4beab 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
 
   packages/contentstack:
     specifiers:
-      '@contentstack/cli-audit': ~1.3.5
+      '@contentstack/cli-audit': ~1.4.0
       '@contentstack/cli-auth': ~1.3.17
       '@contentstack/cli-cm-bootstrap': ~1.8.0
       '@contentstack/cli-cm-branches': ~1.0.22
@@ -18,7 +18,7 @@ importers:
       '@contentstack/cli-cm-clone': ~1.10.0
       '@contentstack/cli-cm-export': ~1.10.5
       '@contentstack/cli-cm-export-to-csv': ~1.6.2
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-cm-migrate-rte': ~1.4.15
       '@contentstack/cli-cm-seed': ~1.7.1
       '@contentstack/cli-command': ~1.2.17
@@ -424,7 +424,7 @@ importers:
     specifiers:
       '@colors/colors': ^1.5.0
       '@contentstack/cli-cm-export': ~1.10.4
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@oclif/test': ^2.5.6
@@ -730,7 +730,7 @@ importers:
 
   packages/contentstack-import:
     specifiers:
-      '@contentstack/cli-audit': ^1.3.5
+      '@contentstack/cli-audit': ~1.4.0
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@contentstack/management': ~1.13.0
@@ -990,7 +990,7 @@ importers:
 
   packages/contentstack-seed:
     specifiers:
-      '@contentstack/cli-cm-import': ~1.13.3
+      '@contentstack/cli-cm-import': ~1.13.4
       '@contentstack/cli-command': ~1.2.16
       '@contentstack/cli-utilities': ~1.5.11
       '@oclif/plugin-help': ^5.1.19

From fc145215eea40612f3ef5fe3ae525be247106182 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Thu, 8 Feb 2024 13:38:07 +0530
Subject: [PATCH 2/3] Entry, missing extension logic fix

---
 packages/contentstack-audit/src/modules/entries.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
index 96cae08247..a54185af8c 100644
--- a/packages/contentstack-audit/src/modules/entries.ts
+++ b/packages/contentstack-audit/src/modules/entries.ts
@@ -331,7 +331,7 @@ export default class Entries {
     if (field[uid]) {
       let { metadata: { extension_uid } = { extension_uid: '' } } = field[uid] || {};
 
-      if (!this.extensions.includes(extension_uid)) {
+      if (extension_uid && !this.extensions.includes(extension_uid)) {
         missingRefs.push({ uid, extension_uid, type: 'Extension or Apps' } as any);
       }
     }

From 1a15f155d8044451b0d8346d276ec2ea3385e5d5 Mon Sep 17 00:00:00 2001
From: Antony <antonyagustineraj@gmail.com>
Date: Fri, 9 Feb 2024 19:09:54 +0530
Subject: [PATCH 3/3] Audit command 'fixed' status correction

---
 packages/contentstack-audit/src/modules/content-types.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
index 28b7d0b107..23c0f8af37 100644
--- a/packages/contentstack-audit/src/modules/content-types.ts
+++ b/packages/contentstack-audit/src/modules/content-types.ts
@@ -538,10 +538,10 @@ export default class ContentType {
         const refErrorObj = {
           tree,
           display_name,
-          fixStatus: 'Fixed',
-          missingRefs: [reference_to],
           ct_uid: this.currentUid,
           name: this.currentTitle,
+          missingRefs: [reference_to],
+          fixStatus: this.fix ? 'Fixed' : undefined,
           treeStr: tree.map(({ name }) => name).join(' ➜ '),
         };