merge conflits

Author: sunil-lakshman

.talismanrc

@@ -1,6 +1,6 @@
 fileignoreconfig:
   - filename: package-lock.json
-    checksum: 5e64367e6f00c41d8fec66e335f66202d97a0e75006c9ecd331ce8f5856e296a
+    checksum: 40f1c53aad40a1f8d711c5ccdde7d1c147d371618c237e1fec2d313af51edb97
   - filename: pnpm-lock.yaml
     checksum: aa6177859aaa87caf2892e8034657fd485c3abe7c13a833fd28449a1d33fa950
   - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
@@ -102,13 +102,13 @@ fileignoreconfig:
   - filename: packages/contentstack-audit/src/modules/workflows.ts
     checksum: 20d1f1985ea2657d3f9fc41b565a44000cbda47e2a60a576fee2aaff06f49352
   - filename: packages/contentstack-audit/src/modules/field_rules.ts
-    checksum: 3eaca968126c9e0e12115491f7942341124c9962d5285dd1cfb355d9e60c6106
+    checksum: f3ec8f44f8dd73601aa8da1207a72335faf0a12d52e792c1da90ba1bdeef38a7
   - filename: packages/contentstack-audit/src/modules/entries.ts
-    checksum: 305af34194771343fee4e1d4bef60d065f1b8d1d8c1059a332f5d6c52e637ff1
+    checksum: d8b6aa896aef2a9846f4dbde066d74d5b1e7b5cdbb8b548989616f9af7a8d26b
   - filename: packages/contentstack-audit/test/unit/base-command.test.ts
     checksum: b0fa8088fcbb17510fa275bd0dde3f6f4246f2525741c30426f07dd62fe497b0
   - filename: packages/contentstack-audit/src/modules/content-types.ts
-    checksum: ddf7b08e6a80af09c6a7019a637c26089fb76572c7c3d079a8af244b02985f16
+    checksum: e325a50db567abc5d0de758767037dbc10bb76501aadda32999bc96e17595d1b
   - filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
     checksum: b11e57f1b824d405f86438e9e7c59183f8c59b66b42d8d16dbeaf76195a30548
   - filename: packages/contentstack-import/test/unit/utils/asset-helper.test.ts
@@ -202,5 +202,9 @@ fileignoreconfig:
   - filename: packages/contentstack-import/test/unit/utils/logger.test.ts
     checksum: 794e06e657a7337c8f094d6042fb04c779683f97b860efae14e075098d2af024
   - filename: packages/contentstack-import-setup/src/import/modules/taxonomies.ts
-    checksum: 49dd8e754a0d3635585a74e943ab097593f061089a7cddc22683ec6caddbb3c5
+    checksum: c1bccc885b3f41f187f150c739b4bbd1608b01f09b0d9be0ad9214127cac071d
+  - filename: packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
+    checksum: 06035980b36802260f190af6e63632efe167f5b336693163f59268f3e788fba1
+  - filename: packages/contentstack-import-setup/src/utils/constants.ts
+    checksum: fcfabb4c53ee822e05903db77595413842d656b55e2869bae97bb6c0e0e209c3
 version: '1.0'

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

@@ -371,148 +371,6 @@ 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');
-    });
-  });
-
   describe('Progress Manager Integration', () => {
     let configHandlerStub: sinon.SinonStub;
     let initializeGlobalSummarySpy: sinon.SinonSpy;