Fix/dx 3789 merge dev into v2 beta dev

.github/workflows/unit-test.yml

@@ -104,4 +104,4 @@ jobs:
       #       else
       #         echo "contentstack-audit has not changed. Skipping tests."
       #       fi
-      #     done
+      #     done

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.14.2 darwin-arm64 node-v22.14.0
+@contentstack/cli-audit/1.16.1 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -273,7 +273,7 @@ USAGE
   $ csdx help [COMMAND...] [-n]
 
 ARGUMENTS
-  COMMAND...  Command to show help for.
+  [COMMAND...]  Command to show help for.
 
 FLAGS
   -n, --nested-commands  Include all nested commands in the output.
@@ -282,8 +282,7 @@ DESCRIPTION
   Display help for csdx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.33/src/commands/help.ts)_
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.33/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.36/src/commands/help.ts)_
 
 ## `csdx plugins`
 
@@ -306,7 +305,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -380,7 +379,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -429,7 +428,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -460,7 +459,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -471,7 +470,7 @@ USAGE
   $ csdx plugins:remove [PLUGIN...] [-h] [-v]
 
 ARGUMENTS
-  PLUGIN...  plugin to uninstall
+  [PLUGIN...]  plugin to uninstall
 
 FLAGS
   -h, --help     Show CLI help.
@@ -501,7 +500,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -512,7 +511,7 @@ USAGE
   $ csdx plugins:uninstall [PLUGIN...] [-h] [-v]
 
 ARGUMENTS
-  PLUGIN...  plugin to uninstall
+  [PLUGIN...]  plugin to uninstall
 
 FLAGS
   -h, --help     Show CLI help.
@@ -529,7 +528,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -540,7 +539,7 @@ USAGE
   $ csdx plugins:unlink [PLUGIN...] [-h] [-v]
 
 ARGUMENTS
-  PLUGIN...  plugin to uninstall
+  [PLUGIN...]  plugin to uninstall
 
 FLAGS
   -h, --help     Show CLI help.
@@ -573,5 +572,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.49/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.54/src/commands/plugins/update.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -18,11 +18,11 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-command": "~1.7.0",
     "@contentstack/cli-utilities": "~1.15.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
-    "@oclif/plugin-plugins": "^5.4.38",
+    "@oclif/plugin-plugins": "^5.4.54",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",

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

@@ -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/config/index.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/test/unit/audit-base-command.test.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-auth/README.md

@@ -145,7 +145,7 @@ FLAGS
   -e, --environment=<value>    Environment name for delivery token
   -k, --stack-api-key=<value>  Stack API Key
   -m, --management             Set this flag to save management token
-  -t, --token=<value>          Add the token name
+  -t, --token=<value>          [env: TOKEN] Add the token name
   -y, --yes                    Use this flag to skip confirmation
 
 DESCRIPTION

packages/contentstack-auth/package.json

@@ -22,7 +22,7 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-command": "~1.7.0",
     "@contentstack/cli-utilities": "~1.15.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",