Merge branch 'feat/DX-3646' into feat/DX-3700

Author: naman-contentstack

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 6ac2ffbe2bcbc1798d714fc55e9bd6f38c40c89ba81889735339b573b758ffae
+  checksum: fa02e2883b15c973134368ce26c78187e247d3761ef14f603afc0d5ea83102a6
 - filename: pnpm-lock.yaml
-  checksum: f53e4e5ab2618734066cc92ebff75d87142f2616cf2558ae9a7170a2a5066d09
+  checksum: d4174feb2ba68c22cc45987afdaf4d89997df084e7e7eb9edc7e309b5a24aca5
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -213,4 +213,18 @@ fileignoreconfig:
   checksum: 83cf034fabee00b42b4243a8c0b8ba280ab7c1e68ffd741c49c31aaee8ca0315
 - filename: packages/contentstack-utilities/test/unit/logger.test.ts
   checksum: 11778d0252202c18a1ca6a38883d6e12fc324ff86ad0fe058bc2505f9cd66ba3
+- filename: packages/contentstack-audit/test/unit/audit-base-command.test.ts
+  checksum: 17a16b4457c820494442f335d94d0949961e68e8ca72ca0f1fa9d4d0eeb0c17a
+- filename: packages/contentstack-import/src/import/modules/taxonomies.ts
+  checksum: ed7037a220754ecfdf800f6b747059ad309e23e7bafa09f6938021246f67d998
+- filename: packages/contentstack-export/test/unit/utils/logger.test.ts
+  checksum: ce8438d323fd0e42a88ece3dfd826313993c0198dbeffe01d046f835d6aad95f
+- filename: packages/contentstack-export/test/unit/export/modules/taxonomies.test.ts
+  checksum: 57566af0bbd95a28b454e4436b0396dfec2fe05ddd5b448d46e3a8b68db8b9cb
+- filename: packages/contentstack-export/test/unit/export/modules/entries.test.ts
+  checksum: 5950c6f697224e11bec32736e6a967b0ab7ac98e9c8f8bb8eaaf10af60913e40
+- filename: packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
+  checksum: 86b11c2a2dd8c0b14aa558e4e52d6d721cd7707422c26a68e96cc5b55b9fefd8
+- filename: packages/contentstack-import-setup/src/utils/login-handler.ts
+  checksum: 3860c96e31677356963e67049762f944aef7c7b22fabb75a70ff5c64cf1ac274
 version: "1.0"

package-lock.json

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.16.1 darwin-arm64 node-v22.14.0
+@contentstack/cli-audit/1.16.1 darwin-arm64 node-v23.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -282,7 +282,7 @@ DESCRIPTION
   Display help for csdx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.36/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.34/src/commands/help.ts)_
 
 ## `csdx plugins`
 
@@ -305,7 +305,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -379,7 +379,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -428,7 +428,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -459,7 +459,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -500,7 +500,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -528,7 +528,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -572,5 +572,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.52/src/commands/plugins/update.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/README.md

@@ -271,11 +271,11 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           missingMultipleFields = missingEntry.missingMultipleFields ?? {};
           await this.prepareReport(module, missingEntryRefs);
 
-          await this.prepareReport(`Entries_Select_feild`, missingSelectFeild);
+          await this.prepareReport(`Entries_Select_field`, missingSelectFeild);
 
-          await this.prepareReport('Entries_Mandatory_feild', missingMandatoryFields);
+          await this.prepareReport('Entries_Mandatory_field', missingMandatoryFields);
 
-          await this.prepareReport('Entries_Title_feild', missingTitleFields);
+          await this.prepareReport('Entries_Title_field', missingTitleFields);
 
           await this.prepareReport('Entry_Missing_Locale_and_Env_in_Publish_Details', missingEnvLocalesInEntries);
 

packages/contentstack-audit/src/audit-base-command.ts

@@ -116,17 +116,17 @@ const config = {
     "Passed",
   ],
   ReportTitleForEntries: {
-    Entries_Select_feild: 'Entries_Select_feild',
-    Entries_Mandatory_feild: 'Entries_Mandatory_feild',
-    Entries_Title_feild: 'Entries_Title_feild',
+    Entries_Select_field: 'Entries_Select_field',
+    Entries_Mandatory_field: 'Entries_Mandatory_field',
+    Entries_Title_field: 'Entries_Title_field',
     Entry_Missing_Locale_and_Env: 'Entry_Missing_Locale_and_Env',
     Entry_Missing_Locale_and_Env_in_Publish_Details: 'Entry_Missing_Locale_and_Env_in_Publish_Details',
     Entry_Multiple_Fields:"Entry_Multiple_Fields"
   },
   feild_level_modules: [
-    'Entries_Title_feild',
-    'Entries_Mandatory_feild',
-    'Entries_Select_feild',
+    'Entries_Title_field',
+    'Entries_Mandatory_field',
+    'Entries_Select_field',
     'Entry_Missing_Locale_and_Env_in_Publish_Details',
     'field-rules',
     'Entry_Multiple_Fields',

packages/contentstack-audit/src/config/index.ts

@@ -370,4 +370,146 @@ describe('AuditBaseCommand class', () => {
         });
       });
   });
+
+  describe('prepareReport method - Report file names', () => {
+    fancy
+      .stdout({ print: process.env.PRINT === 'true' || false })
+      .stub(winston.transports, 'File', () => fsTransport)
+      .stub(winston, 'createLogger', createMockWinstonLogger)
+      .stub(fs, 'createWriteStream', () => new PassThrough())
+      .stub(fs, 'mkdirSync', () => {})
+      .stub(fs, 'existsSync', () => true)
+      .it('should generate report file with correct spelling: Entries_Select_field (not feild)', async () => {
+        const writeFileSyncSpy = sinon.spy(fs, 'writeFileSync');
+        class CMD extends AuditBaseCommand {
+          async run() {
+            await this.init();
+            this.sharedConfig.reportPath = resolve(__dirname, 'mock', 'contents');
+            
+            await this.prepareReport('Entries_Select_field', {
+              entry1: {
+                name: 'Test Entry',
+                display_name: 'Select Field',
+                missingRefs: ['ref1'],
+              },
+            });
+            
+            const jsonCall = writeFileSyncSpy.getCalls().find(call => 
+              typeof call.args[0] === 'string' && call.args[0].includes('.json')
+            );
+            return jsonCall ? (jsonCall.args[0] as string) : undefined;
+          }
+        }
+
+        const result = await CMD.run([]);
+        writeFileSyncSpy.restore();
+        expect(result).to.include('Entries_Select_field.json');
+        expect(result).to.not.include('Entries_Select_feild');
+      });
+
+    fancy
+      .stdout({ print: process.env.PRINT === 'true' || false })
+      .stub(winston.transports, 'File', () => fsTransport)
+      .stub(winston, 'createLogger', createMockWinstonLogger)
+      .stub(fs, 'createWriteStream', () => new PassThrough())
+      .stub(fs, 'mkdirSync', () => {})
+      .stub(fs, 'existsSync', () => true)
+      .it('should generate report file with correct spelling: Entries_Mandatory_field (not feild)', async () => {
+        const writeFileSyncSpy = sinon.spy(fs, 'writeFileSync');
+        class CMD extends AuditBaseCommand {
+          async run() {
+            await this.init();
+            this.sharedConfig.reportPath = resolve(__dirname, 'mock', 'contents');
+            
+            await this.prepareReport('Entries_Mandatory_field', {
+              entry1: {
+                name: 'Test Entry',
+                display_name: 'Mandatory Field',
+                missingRefs: ['ref1'],
+              },
+            });
+            
+            const jsonCall = writeFileSyncSpy.getCalls().find(call => 
+              typeof call.args[0] === 'string' && call.args[0].includes('.json')
+            );
+            return jsonCall ? (jsonCall.args[0] as string) : undefined;
+          }
+        }
+
+        const result = await CMD.run([]);
+        writeFileSyncSpy.restore();
+        expect(result).to.include('Entries_Mandatory_field.json');
+        expect(result).to.not.include('Entries_Mandatory_feild');
+      });
+
+    fancy
+      .stdout({ print: process.env.PRINT === 'true' || false })
+      .stub(winston.transports, 'File', () => fsTransport)
+      .stub(winston, 'createLogger', createMockWinstonLogger)
+      .stub(fs, 'createWriteStream', () => new PassThrough())
+      .stub(fs, 'mkdirSync', () => {})
+      .stub(fs, 'existsSync', () => true)
+      .it('should generate report file with correct spelling: Entries_Title_field (not feild)', async () => {
+        const writeFileSyncSpy = sinon.spy(fs, 'writeFileSync');
+        class CMD extends AuditBaseCommand {
+          async run() {
+            await this.init();
+            this.sharedConfig.reportPath = resolve(__dirname, 'mock', 'contents');
+            
+            await this.prepareReport('Entries_Title_field', {
+              entry1: {
+                name: 'Test Entry',
+                display_name: 'Title Field',
+                missingRefs: ['ref1'],
+              },
+            });
+            
+            const jsonCall = writeFileSyncSpy.getCalls().find(call => 
+              typeof call.args[0] === 'string' && call.args[0].includes('.json')
+            );
+            return jsonCall ? (jsonCall.args[0] as string) : undefined;
+          }
+        }
+
+        const result = await CMD.run([]);
+        writeFileSyncSpy.restore();
+        expect(result).to.include('Entries_Title_field.json');
+        expect(result).to.not.include('Entries_Title_feild');
+      });
+  });
+
+  describe('Config - ReportTitleForEntries keys', () => {
+    it('should have correct spelling in ReportTitleForEntries config', () => {
+      const config = require('../../src/config').default;
+      
+      // Verify correct spelling (field, not feild)
+      expect(config.ReportTitleForEntries).to.have.property('Entries_Select_field');
+      expect(config.ReportTitleForEntries).to.have.property('Entries_Mandatory_field');
+      expect(config.ReportTitleForEntries).to.have.property('Entries_Title_field');
+      
+      // Verify old typo is not present
+      expect(config.ReportTitleForEntries).to.not.have.property('Entries_Select_feild');
+      expect(config.ReportTitleForEntries).to.not.have.property('Entries_Mandatory_feild');
+      expect(config.ReportTitleForEntries).to.not.have.property('Entries_Title_feild');
+      
+      // Verify values match keys
+      expect(config.ReportTitleForEntries.Entries_Select_field).to.equal('Entries_Select_field');
+      expect(config.ReportTitleForEntries.Entries_Mandatory_field).to.equal('Entries_Mandatory_field');
+      expect(config.ReportTitleForEntries.Entries_Title_field).to.equal('Entries_Title_field');
+    });
+
+    it('should have correct spelling in feild_level_modules array', () => {
+      const config = require('../../src/config').default;
+      
+      // Verify correct spelling in the array
+      expect(config.feild_level_modules).to.include('Entries_Select_field');
+      expect(config.feild_level_modules).to.include('Entries_Mandatory_field');
+      expect(config.feild_level_modules).to.include('Entries_Title_field');
+      
+      // Verify old typo is not present
+      expect(config.feild_level_modules).to.not.include('Entries_Select_feild');
+      expect(config.feild_level_modules).to.not.include('Entries_Mandatory_feild');
+      expect(config.feild_level_modules).to.not.include('Entries_Title_feild');
+    });
+  });
 });

packages/contentstack-audit/test/unit/audit-base-command.test.ts

@@ -73,7 +73,11 @@ export default class ExportTaxonomies extends BaseClass {
     await this.fetchTaxonomies(masterLocale, true);
 
     if (!this.isLocaleBasedExportSupported) {
-      log.debug('Localization disabled, falling back to legacy export method', this.exportConfig.context);
+      this.taxonomies = {};
+      this.taxonomiesByLocale = {};
+
+      // Fetch taxonomies without locale parameter
+      await this.fetchTaxonomies();
       await this.exportTaxonomies();
       await this.writeTaxonomiesMetadata();
     } else {
@@ -174,15 +178,26 @@ export default class ExportTaxonomies extends BaseClass {
           log.debug(`Completed fetching all taxonomies ${localeInfo}`, this.exportConfig.context);
           break;
         }
-      } catch (error) {
+      } catch (error: any) {
         log.debug(`Error fetching taxonomies ${localeInfo}`, this.exportConfig.context);
-        handleAndLogError(error, {
-          ...this.exportConfig.context,
-          ...(localeCode && { locale: localeCode }),
-        });
-        if (checkLocaleSupport) {
+
+        if (checkLocaleSupport && this.isLocalePlanLimitationError(error)) {
+          log.debug(
+            'Taxonomy localization is not included in your plan. Falling back to non-localized export.',
+            this.exportConfig.context,
+          );
           this.isLocaleBasedExportSupported = false;
+        } else if (checkLocaleSupport) {
+          log.debug('Locale-based taxonomy export not supported, will use legacy method', this.exportConfig.context);
+          this.isLocaleBasedExportSupported = false;
+        } else {
+          // Log actual errors during normal fetch (not locale check)
+          handleAndLogError(error, {
+            ...this.exportConfig.context,
+            ...(localeCode && { locale: localeCode }),
+          });
         }
+
         // Break to avoid infinite retry loop on errors
         break;
       }
@@ -312,4 +327,15 @@ export default class ExportTaxonomies extends BaseClass {
 
     return localesToExport;
   }
+
+  private isLocalePlanLimitationError(error: any): boolean {
+    return (
+      error?.status === 403 &&
+      error?.errors?.taxonomies?.some(
+        (msg: string) =>
+          msg.toLowerCase().includes('taxonomy localization') &&
+          msg.toLowerCase().includes('not included in your plan'),
+      )
+    );
+  }
 }