Simplify CDS project compile command

Upates the `compileProjectLevel` function of the CDS extractor to just
use the project directory as the first argument to the `cds compile`
command, which simplifies the code while accounting for a wide variety
of project (directory and file) structures.

Author: data-douser

extractors/cds/tools/src/cds/compiler/compile.ts

@@ -131,20 +131,9 @@ function compileProjectLevel(
   );
 
   // For project-level compilation, compile the entire project together
-  // This follows the CAP best practice of compiling db and srv directories together
+  // Simply pass the project directory to cds compile and let it handle all subdirectories
   const projectAbsolutePath = join(sourceRoot, projectDir);
 
-  // Common directories in CAP projects that should be compiled together
-  const capDirectories = ['db', 'srv', 'app'];
-  const existingDirectories: string[] = [];
-
-  for (const dir of capDirectories) {
-    const dirPath = join(projectAbsolutePath, dir);
-    if (dirExists(dirPath)) {
-      existingDirectories.push(dir);
-    }
-  }
-
   // Check if there are any CDS files in the project at all before proceeding
   const allCdsFiles = globSync(join(projectAbsolutePath, '**/*.cds'), {
     nodir: true,
@@ -157,24 +146,6 @@ function compileProjectLevel(
     );
   }
 
-  if (existingDirectories.length === 0) {
-    // If no standard directories, check if there are CDS files in the root
-    const rootCdsFiles = globSync(join(projectAbsolutePath, '*.cds'));
-    if (rootCdsFiles.length > 0) {
-      existingDirectories.push('.');
-    } else {
-      // Find directories that contain CDS files
-      const cdsFileParents = new Set(
-        allCdsFiles.map((file: string) => {
-          const relativePath = relative(projectAbsolutePath, file);
-          const firstDir = relativePath.split('/')[0];
-          return firstDir === relativePath ? '.' : firstDir;
-        }),
-      );
-      existingDirectories.push(...Array.from(cdsFileParents));
-    }
-  }
-
   // Generate output path for the compiled model - relative to sourceRoot for consistency
   const relativeOutputPath = join(projectDir, 'model.cds.json');
   const projectJsonOutPath = join(sourceRoot, relativeOutputPath);
@@ -185,14 +156,10 @@ function compileProjectLevel(
     cwd: sourceRoot, // Use sourceRoot as working directory for consistency
   };
 
-  // Convert directories to be relative to sourceRoot (include project prefix)
-  const projectRelativeDirectories = existingDirectories.map(dir =>
-    dir === '.' ? projectDir : join(projectDir, dir),
-  );
-
+  // Simply compile the entire project directory - let cds compile handle all subdirectories
   const compileArgs = [
     'compile',
-    ...projectRelativeDirectories, // Use paths relative to sourceRoot
+    projectDir, // Just pass the project directory, cds will find all relevant files
     '--to',
     'json',
     '--dest',
@@ -202,7 +169,7 @@ function compileProjectLevel(
     'warn',
   ];
 
-  cdsExtractorLog('info', `Compiling CAP project directories: ${existingDirectories.join(', ')}`);
+  cdsExtractorLog('info', `Compiling CAP project directory: ${projectDir}`);
   cdsExtractorLog(
     'info',
     `Executing CDS command in directory ${projectAbsolutePath}: command='${cdsCommand}' args='${JSON.stringify(compileArgs)}'`,

extractors/cds/tools/test/src/cds/compiler/compile.test.ts

@@ -421,7 +421,7 @@ describe('compile .cds to .cds.json', () => {
       );
     });
 
-    it('should use sourceRoot as cwd for project-level compilation', () => {
+    it('should use sourceRoot as cwd for project-level compilation with simplified approach', () => {
       // Setup
       const sourceRoot = '/source/root';
       const projectDir = 'test-project';
@@ -434,9 +434,6 @@ describe('compile .cds to .cds.json', () => {
         if (pattern.includes('**/*.cds')) {
           return ['test-project/srv/service.cds', 'test-project/db/schema.cds'];
         }
-        if (pattern.includes('*.cds')) {
-          return [];
-        }
         return [];
       });
 
@@ -450,12 +447,6 @@ describe('compile .cds to .cds.json', () => {
       };
       projectMap.set(projectDir, projectInfo);
 
-      // Mock filesystem checks
-      (filesystem.dirExists as jest.Mock).mockImplementation(path => {
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        return path.includes('/db') || path.includes('/srv');
-      });
-
       // Mock successful spawn process
       (childProcess.spawnSync as jest.Mock).mockReturnValue({
         status: 0,
@@ -477,14 +468,173 @@ describe('compile .cds to .cds.json', () => {
       expect(result.success).toBe(true);
       expect(result.compiledAsProject).toBe(true);
 
-      // CRITICAL: Verify that project-level compilation uses sourceRoot as cwd
+      // CRITICAL: Verify that project-level compilation uses sourceRoot as cwd with simplified approach
       expect(childProcess.spawnSync).toHaveBeenCalledWith(
         'cds',
-        expect.arrayContaining(['compile', 'test-project/db', 'test-project/srv']),
+        expect.arrayContaining(['compile', 'test-project']), // Just the project directory
         expect.objectContaining({
           cwd: sourceRoot, // CRITICAL: Must be sourceRoot, not projectAbsolutePath
         }),
       );
+
+      // Ensure no specific subdirectories are passed with simplified approach
+      const actualCall = (childProcess.spawnSync as jest.Mock).mock.calls[0];
+      const actualArgs = actualCall[1];
+      expect(actualArgs).not.toContain('test-project/db');
+      expect(actualArgs).not.toContain('test-project/srv');
+      expect(actualArgs).toContain('test-project'); // Just the base project directory
+    });
+
+    it('should use simplified project-level compilation with entire directory', () => {
+      // Setup
+      const sourceRoot = '/source/root';
+      const projectDir = 'bookshop-project';
+
+      // Set up the path.relative mock
+      (path.relative as jest.Mock).mockImplementation(() => 'bookshop-project/index.cds');
+
+      // Mock globSync to return CDS files including root-level index.cds
+      (globSync as jest.Mock).mockImplementation((pattern: string) => {
+        if (pattern.includes('**/*.cds')) {
+          // Return all CDS files in the project
+          return [
+            'bookshop-project/index.cds',
+            'bookshop-project/srv/cat-service.cds',
+            'bookshop-project/db/schema.cds',
+          ];
+        }
+        return [];
+      });
+
+      // Create project dependency map with project-level compilation marker
+      const projectMap = new Map();
+      const projectInfo = {
+        projectDir,
+        cdsFiles: [
+          'bookshop-project/index.cds',
+          'bookshop-project/srv/cat-service.cds',
+          'bookshop-project/db/schema.cds',
+        ],
+        cdsFilesToCompile: ['__PROJECT_LEVEL_COMPILATION__'],
+        imports: new Map(),
+      };
+      projectMap.set(projectDir, projectInfo);
+
+      // Mock successful spawn process
+      (childProcess.spawnSync as jest.Mock).mockReturnValue({
+        status: 0,
+        stdout: Buffer.from('Compilation successful'),
+        stderr: Buffer.from(''),
+      });
+
+      // Execute
+      const result = compileCdsToJson(
+        'index.cds',
+        sourceRoot,
+        'cds',
+        undefined,
+        projectMap,
+        projectDir,
+      );
+
+      // Verify
+      expect(result.success).toBe(true);
+      expect(result.compiledAsProject).toBe(true);
+
+      // With simplified approach: just pass the project directory, let cds compile handle everything
+      expect(childProcess.spawnSync).toHaveBeenCalledWith(
+        'cds',
+        expect.arrayContaining([
+          'compile',
+          'bookshop-project', // Only the project directory is needed
+        ]),
+        expect.objectContaining({
+          cwd: sourceRoot,
+        }),
+      );
+
+      // Ensure no specific subdirectories are passed - cds compile handles them automatically
+      const actualCall = (childProcess.spawnSync as jest.Mock).mock.calls[0];
+      const actualArgs = actualCall[1];
+      expect(actualArgs).not.toContain('bookshop-project/db');
+      expect(actualArgs).not.toContain('bookshop-project/srv');
+      expect(actualArgs).toContain('bookshop-project'); // Just the base project directory
+    });
+
+    it('should compile entire project directory with simplified approach', () => {
+      // This test verifies the simplified approach: instead of determining specific subdirectories,
+      // we just pass the project directory to cds compile and let it handle everything.
+
+      // Setup
+      const sourceRoot = '/source/root';
+      const projectDir = 'bookshop-project';
+
+      // Set up the path.relative mock
+      (path.relative as jest.Mock).mockImplementation(() => 'bookshop-project/index.cds');
+
+      // Mock globSync to return CDS files including root-level index.cds
+      (globSync as jest.Mock).mockImplementation((pattern: string) => {
+        if (pattern.includes('**/*.cds')) {
+          // Return all CDS files in the project
+          return [
+            'bookshop-project/index.cds',
+            'bookshop-project/srv/cat-service.cds',
+            'bookshop-project/db/schema.cds',
+          ];
+        }
+        return [];
+      });
+
+      // Create project dependency map with project-level compilation marker
+      const projectMap = new Map();
+      const projectInfo = {
+        projectDir,
+        cdsFiles: [
+          'bookshop-project/index.cds',
+          'bookshop-project/srv/cat-service.cds',
+          'bookshop-project/db/schema.cds',
+        ],
+        cdsFilesToCompile: ['__PROJECT_LEVEL_COMPILATION__'],
+        imports: new Map(),
+      };
+      projectMap.set(projectDir, projectInfo);
+
+      // Mock successful spawn process
+      (childProcess.spawnSync as jest.Mock).mockReturnValue({
+        status: 0,
+        stdout: Buffer.from('Compilation successful'),
+        stderr: Buffer.from(''),
+      });
+
+      // Execute
+      const result = compileCdsToJson(
+        'index.cds',
+        sourceRoot,
+        'cds',
+        undefined,
+        projectMap,
+        projectDir,
+      );
+
+      // Verify
+      expect(result.success).toBe(true);
+      expect(result.compiledAsProject).toBe(true);
+
+      // With the simplified approach, we should just pass the project directory
+      // and let cds compile handle all subdirectories automatically
+      const actualCall = (childProcess.spawnSync as jest.Mock).mock.calls[0];
+      const actualArgs = actualCall[1]; // Second argument is the args array
+
+      // The compile command should include only the project directory
+      expect(actualArgs).toContain('bookshop-project');
+
+      // Verify the simplified command structure
+      const compileIndex = actualArgs.indexOf('compile');
+      const destIndex = actualArgs.indexOf('--to');
+      const directoryArgs = actualArgs.slice(compileIndex + 1, destIndex);
+
+      // Should only contain the project directory - no need to specify subdirectories
+      expect(directoryArgs).toEqual(['bookshop-project']);
     });
   });
 });