Fix CDS extractor args validation

Author: data-douser

extractors/cds/tools/cds-extractor.ts

@@ -20,10 +20,9 @@ import { installDependencies } from './src/packageManager';
 import { RunMode } from './src/runMode';
 import { validateArguments } from './src/utils';
 
-// Validate arguments to this script.
-// The first argument we pass is the expected run mode, which will be extracted from process.argv[2]
-// This will determine the correct minimum argument count for validation
-const validationResult = validateArguments(process.argv, RunMode.AUTOBUILD);
+// Validate the first argument matches an allowed run mode and validate that
+// the total number of arguments is correct for the specified run mode.
+const validationResult = validateArguments(process.argv);
 if (!validationResult.isValid) {
   console.warn(validationResult.usageMessage);
   // Exit with an error code on invalid use of this script.

extractors/cds/tools/src/utils.ts

@@ -32,14 +32,10 @@ export function getArg(args: string[], index: number, defaultValue = ''): string
  * - For 'autobuild' mode: <run-mode> <source-root>
  *
  * @param args Command line arguments to check.
- * @param expectedRunMode The expected run mode for validation.
  * @returns Object with validation result, usage message if failed, and validated
  * arguments if successful.
  */
-export function validateArguments(
-  args: string[],
-  expectedRunMode: RunMode,
-): {
+export function validateArguments(args: string[]): {
   isValid: boolean;
   usageMessage?: string;
   args?: {
@@ -51,11 +47,8 @@ export function validateArguments(
   const scriptPath = args[1] ?? '';
   const scriptName = scriptPath.split(/[/\\]/).pop() ?? 'cds-extractor.js';
 
-  // Each run mode has a minimum required argument count.
-  // The args array includes 'node' and the script name, so we
-  // use "minArgCount + 2".
-  const minArgCount = expectedRunMode === RunMode.INDEX_FILES ? 3 : 2;
-  if (args.length < minArgCount + 2) {
+  // Minimum arguments: node, script, run-mode, source-root (4 total)
+  if (args.length < 4) {
     return {
       isValid: false,
       usageMessage: USAGE_MESSAGE,
@@ -73,14 +66,23 @@ export function validateArguments(
     };
   }
 
-  // For 'index-files' mode, all three args are required.
+  // Validate argument count based on the actual run mode
+  // For 'index-files' mode, all three args are required: run-mode, source-root, response-file
   if (runMode === (RunMode.INDEX_FILES as string) && args.length < 5) {
     return {
       isValid: false,
       usageMessage: `For '${RunMode.INDEX_FILES}' mode: node ${scriptName} ${RunMode.INDEX_FILES} <source-root> <response-file>`,
     };
   }
 
+  // For other modes, only run-mode and source-root are required
+  if (runMode !== (RunMode.INDEX_FILES as string) && args.length < 4) {
+    return {
+      isValid: false,
+      usageMessage: `For '${runMode}' mode: node ${scriptName} ${runMode} <source-root> [<response-file>]`,
+    };
+  }
+
   // If we made it here, arguments are valid.
   const sourceRoot: string = args[3];
 
@@ -91,6 +93,8 @@ export function validateArguments(
   let usageMessage = '';
   if (runMode === (RunMode.DEBUG_PARSER as string)) {
     usageMessage = `${RunMode.DEBUG_PARSER} <source-root> [<response-file>]`;
+  } else if (runMode === (RunMode.DEBUG_COMPILER as string)) {
+    usageMessage = `${RunMode.DEBUG_COMPILER} <source-root> [<response-file>]`;
   } else if (runMode === (RunMode.INDEX_FILES as string)) {
     usageMessage = `${RunMode.INDEX_FILES} <source-root> <response-file>`;
   } else if (runMode === (RunMode.AUTOBUILD as string)) {

extractors/cds/tools/test/src/utils.test.ts

@@ -46,7 +46,7 @@ describe('utils', () => {
         'source-root',
         'response-file',
       ];
-      const result = validateArguments(args, RunMode.INDEX_FILES);
+      const result = validateArguments(args);
       expect(result.isValid).toBe(true);
       expect(result.args).toEqual({
         runMode: RunMode.INDEX_FILES,
@@ -57,7 +57,7 @@ describe('utils', () => {
 
     it('should invalidate index-files mode with missing response file', () => {
       const args = ['node', EXTRACTOR_SCRIPT_NAME, RunMode.INDEX_FILES, 'source-root'];
-      const result = validateArguments(args, RunMode.INDEX_FILES);
+      const result = validateArguments(args);
       expect(result.isValid).toBe(false);
       expect(result.usageMessage).toContain('<response-file>');
     });
@@ -71,7 +71,7 @@ describe('utils', () => {
         'source-root',
         'response-file',
       ];
-      const resultWithResponse = validateArguments(argsWithResponse, RunMode.DEBUG_PARSER);
+      const resultWithResponse = validateArguments(argsWithResponse);
       expect(resultWithResponse.isValid).toBe(true);
       expect(resultWithResponse.args).toEqual({
         runMode: RunMode.DEBUG_PARSER,
@@ -86,7 +86,7 @@ describe('utils', () => {
         RunMode.DEBUG_PARSER,
         'source-root',
       ];
-      const resultWithoutResponse = validateArguments(argsWithoutResponse, RunMode.DEBUG_PARSER);
+      const resultWithoutResponse = validateArguments(argsWithoutResponse);
       expect(resultWithoutResponse.isValid).toBe(true);
       expect(resultWithoutResponse.args).toEqual({
         runMode: RunMode.DEBUG_PARSER,
@@ -97,7 +97,7 @@ describe('utils', () => {
 
     it(`should validate minimum required arguments for runMode=${RunMode.AUTOBUILD}`, () => {
       const args = ['node', EXTRACTOR_SCRIPT_NAME, RunMode.AUTOBUILD, 'source-root'];
-      const result = validateArguments(args, RunMode.AUTOBUILD);
+      const result = validateArguments(args);
       expect(result.isValid).toBe(true);
       expect(result.args).toEqual({
         runMode: RunMode.AUTOBUILD,
@@ -108,7 +108,7 @@ describe('utils', () => {
 
     it(`should validate minimum required arguments for runMode=${RunMode.DEBUG_PARSER}`, () => {
       const args = ['node', EXTRACTOR_SCRIPT_NAME, RunMode.DEBUG_PARSER, 'source-root'];
-      const result = validateArguments(args, RunMode.DEBUG_PARSER);
+      const result = validateArguments(args);
       expect(result.isValid).toBe(true);
       expect(result.usageMessage).toContain(
         `${RunMode.DEBUG_PARSER} <source-root> [<response-file>]`,
@@ -123,7 +123,7 @@ describe('utils', () => {
         'source-root',
         'response-file',
       ];
-      const result = validateArguments(args, RunMode.INDEX_FILES);
+      const result = validateArguments(args);
       expect(result.isValid).toBe(true);
       expect(result.usageMessage).toContain(`${RunMode.INDEX_FILES} <source-root> <response-file>`);
       expect(result.args).toEqual({
@@ -135,7 +135,7 @@ describe('utils', () => {
 
     it('should invalidate when run mode is not valid', () => {
       const args = ['node', EXTRACTOR_SCRIPT_NAME, 'invalid-mode', 'source-root'];
-      const result = validateArguments(args, RunMode.AUTOBUILD);
+      const result = validateArguments(args);
       expect(result.isValid).toBe(false);
       expect(result.usageMessage).toContain('Invalid run mode');
       expect(result.usageMessage).toContain('Supported run modes:');