More CDS extractor code cleanup

This commit:

- removes unused functions from CDS extractor "src/cds/**/*.ts";
- removes logging of CDS extractor memeory usage;
- renames some CDS extractor logging functions for consistency;
- addresses PR comments for the `src/cds/parser/functions.ts` file.

Author: data-douser

extractors/cds/tools/cds-extractor.ts

@@ -4,19 +4,18 @@ import { sync as globSync } from 'glob';
 
 import { determineCdsCommand } from './src/cds';
 import { orchestrateCompilation } from './src/cds/compiler';
-import { buildEnhancedCdsProjectDependencyGraph } from './src/cds/parser';
+import { buildCdsProjectDependencyGraph } from './src/cds/parser';
 import { runJavaScriptExtractor } from './src/codeql';
 import { addCompilationDiagnostic } from './src/diagnostics';
 import { configureLgtmIndexFilters, setupAndValidateEnvironment } from './src/environment';
 import {
   cdsExtractorLog,
-  endPerformanceTracking,
-  logExtractorStop,
   logExtractorStart,
-  logMemoryUsage,
+  logExtractorStop,
   logPerformanceMilestone,
+  logPerformanceTrackingStart,
+  logPerformanceTrackingStop,
   setSourceRootDirectory,
-  startPerformanceTracking,
 } from './src/logging';
 import { installDependencies } from './src/packageManager';
 import { validateArguments } from './src/utils';
@@ -37,21 +36,19 @@ setSourceRootDirectory(sourceRoot);
 
 // Log the start of the CDS extractor session as a whole.
 logExtractorStart(sourceRoot);
-// We log the memory usage at the start of the extractor to track memory growth.
-logMemoryUsage('Extractor Start');
 
 // Setup the environment and validate all requirements first, before changing
 // directory back to the "sourceRoot" directory. This ensures we can properly locate
 // the CodeQL tools.
-startPerformanceTracking('Environment Setup');
+logPerformanceTrackingStart('Environment Setup');
 const {
   success: envSetupSuccess,
   errorMessages,
   codeqlExePath,
   autobuildScriptPath,
   platformInfo,
 } = setupAndValidateEnvironment(sourceRoot);
-endPerformanceTracking('Environment Setup');
+logPerformanceTrackingStop('Environment Setup');
 
 if (!envSetupSuccess) {
   const codeqlExe = platformInfo.isWindows ? 'codeql.exe' : 'codeql';
@@ -75,7 +72,7 @@ cdsExtractorLog(
   `CodeQL CDS extractor using autobuild mode for scan of project source root directory '${sourceRoot}'.`,
 );
 
-cdsExtractorLog('info', 'Building enhanced CDS project dependency graph...');
+cdsExtractorLog('info', 'Building CDS project dependency graph...');
 
 // Build the CDS project `dependencyGraph` as the foundation for the extraction process.
 // This graph will contain all discovered CDS projects, their dependencies, the `.cds`
@@ -88,22 +85,21 @@ cdsExtractorLog('info', 'Building enhanced CDS project dependency graph...');
 let dependencyGraph;
 
 try {
-  startPerformanceTracking('Dependency Graph Build');
-  dependencyGraph = buildEnhancedCdsProjectDependencyGraph(sourceRoot, __dirname);
-  endPerformanceTracking('Dependency Graph Build');
+  logPerformanceTrackingStart('Dependency Graph Build');
+  dependencyGraph = buildCdsProjectDependencyGraph(sourceRoot, __dirname);
+  logPerformanceTrackingStop('Dependency Graph Build');
 
   logPerformanceMilestone(
     'Dependency graph created',
     `${dependencyGraph.projects.size} projects, ${dependencyGraph.statusSummary.totalCdsFiles} CDS files`,
   );
-  logMemoryUsage('After Dependency Graph');
 
   // Log details about discovered projects for debugging
   if (dependencyGraph.projects.size > 0) {
     for (const [projectDir, project] of dependencyGraph.projects.entries()) {
       cdsExtractorLog(
         'info',
-        `Enhanced Project: ${projectDir}, Status: ${project.status}, CDS files: ${project.cdsFiles.length}, Files to compile: ${project.cdsFilesToCompile.length}`,
+        `Project: ${projectDir}, Status: ${project.status}, CDS files: ${project.cdsFiles.length}, Files to compile: ${project.cdsFilesToCompile.length}`,
       );
     }
   } else {
@@ -148,15 +144,15 @@ try {
     process.exit(1);
   }
 } catch (error) {
-  cdsExtractorLog('error', `Failed to build enhanced dependency graph: ${String(error)}`);
+  cdsExtractorLog('error', `Failed to build CDS dependency graph: ${String(error)}`);
   // Exit with error since we can't continue without a proper dependency graph
   logExtractorStop(false, 'Terminated: Dependency graph build failed');
   process.exit(1);
 }
 
-startPerformanceTracking('Dependency Installation');
+logPerformanceTrackingStart('Dependency Installation');
 const projectCacheDirMap = installDependencies(dependencyGraph, sourceRoot, codeqlExePath);
-endPerformanceTracking('Dependency Installation');
+logPerformanceTrackingStop('Dependency Installation');
 
 // Check if dependency installation resulted in any usable project mappings
 if (projectCacheDirMap.size === 0) {
@@ -184,7 +180,7 @@ if (projectCacheDirMap.size === 0) {
 
 const cdsFilePathsToProcess: string[] = [];
 
-// Use the enhanced dependency graph to collect all `.cds` files from each project.
+// Use the dependency graph to collect all `.cds` files from each project.
 // We want to "extract" all `.cds` files from all projects so that we have a copy
 // of each `.cds` source file in the CodeQL database.
 for (const project of dependencyGraph.projects.values()) {
@@ -193,13 +189,13 @@ for (const project of dependencyGraph.projects.values()) {
 
 // Initialize CDS command cache early to avoid repeated testing during compilation.
 // This is a critical optimization that avoids testing commands for every single file.
-startPerformanceTracking('CDS Command Cache Initialization');
+logPerformanceTrackingStart('CDS Command Cache Initialization');
 try {
   determineCdsCommand(undefined, sourceRoot);
-  endPerformanceTracking('CDS Command Cache Initialization');
+  logPerformanceTrackingStop('CDS Command Cache Initialization');
   cdsExtractorLog('info', 'CDS command cache initialized successfully');
 } catch (error) {
-  endPerformanceTracking('CDS Command Cache Initialization');
+  logPerformanceTrackingStop('CDS Command Cache Initialization');
   cdsExtractorLog('warn', `CDS command cache initialization failed: ${String(error)}`);
 }
 
@@ -209,7 +205,7 @@ cdsExtractorLog(
   `Found ${cdsFilePathsToProcess.length} total CDS files, ${dependencyGraph.statusSummary.totalCdsFiles} CDS files in dependency graph`,
 );
 
-startPerformanceTracking('CDS Compilation');
+logPerformanceTrackingStart('CDS Compilation');
 try {
   // Use the new orchestrated compilation approach (autobuild mode, no debug)
   orchestrateCompilation(dependencyGraph, projectCacheDirMap, codeqlExePath);
@@ -229,11 +225,10 @@ try {
     // Don't exit with error - let the JavaScript extractor run on whatever was compiled
   }
 
-  endPerformanceTracking('CDS Compilation');
+  logPerformanceTrackingStop('CDS Compilation');
   logPerformanceMilestone('CDS compilation completed');
-  logMemoryUsage('After CDS Compilation');
 } catch (error) {
-  endPerformanceTracking('CDS Compilation');
+  logPerformanceTrackingStop('CDS Compilation');
   cdsExtractorLog('error', `Compilation orchestration failed: ${String(error)}`);
 
   // Add diagnostic for the overall failure
@@ -251,9 +246,9 @@ configureLgtmIndexFilters();
 
 // Run CodeQL's JavaScript extractor to process the .cds source files and
 // the compiled .cds.json files.
-startPerformanceTracking('JavaScript Extraction');
+logPerformanceTrackingStart('JavaScript Extraction');
 const extractorResult = runJavaScriptExtractor(sourceRoot, autobuildScriptPath, codeqlExePath);
-endPerformanceTracking('JavaScript Extraction');
+logPerformanceTrackingStop('JavaScript Extraction');
 
 if (!extractorResult.success && extractorResult.error) {
   cdsExtractorLog('error', `Error running JavaScript extractor: ${extractorResult.error}`);

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

@@ -7,7 +7,7 @@ import { CdsCompilationResult } from './types';
 import { getCdsVersion } from './version';
 import { fileExists, dirExists, recursivelyRenameJsonFiles } from '../../filesystem';
 import { cdsExtractorLog } from '../../logging';
-import { CdsProject } from '../parser/types';
+import { BasicCdsProject } from '../parser/types';
 
 /**
  * Compiles a CDS file to JSON using robust, project-aware compilation only.
@@ -24,7 +24,7 @@ import { CdsProject } from '../parser/types';
  *
  * @param cdsCommand The actual shell command to use for `cds compile`.
  * @param cacheDir Full path to the cache directory where dependencies are stored.
- * @param projectMap Map of project directories to {@link CdsProject} instances.
+ * @param projectMap Map of project directories to {@link BasicCdsProject} instances.
  * @param projectDir The project directory to which `cdsFilePath` belongs.
  *
  * @returns The {@link CdsCompilationResult} of the compilation attempt.
@@ -34,7 +34,7 @@ export function compileCdsToJson(
   sourceRoot: string,
   cdsCommand: string,
   cacheDir: string | undefined,
-  projectMap: Map<string, CdsProject>,
+  projectMap: Map<string, BasicCdsProject>,
   projectDir: string,
 ): CdsCompilationResult {
   try {
@@ -422,7 +422,10 @@ function createSpawnOptions(
  * @param relativePath The relative path of the file being checked
  * @returns true if the file should be compiled individually
  */
-function shouldCompileIndividually(project: CdsProject | undefined, relativePath: string): boolean {
+function shouldCompileIndividually(
+  project: BasicCdsProject | undefined,
+  relativePath: string,
+): boolean {
   return project?.cdsFilesToCompile?.includes(relativePath) ?? true;
 }
 
@@ -432,6 +435,6 @@ function shouldCompileIndividually(project: CdsProject | undefined, relativePath
  * @param project The CDS project to check
  * @returns true if project-level compilation should be used
  */
-function shouldUseProjectLevelCompilation(project: CdsProject | undefined): boolean {
+function shouldUseProjectLevelCompilation(project: BasicCdsProject | undefined): boolean {
   return project?.cdsFilesToCompile?.includes('__PROJECT_LEVEL_COMPILATION__') ?? false;
 }

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

@@ -4,11 +4,11 @@ import {
   AlternativeCdsCommand,
   CompilationAttempt,
   CompilationTask,
-  EnhancedCompilationConfig,
+  CompilationConfig,
 } from './types';
 import { addCompilationDiagnostic } from '../../diagnostics';
 import { cdsExtractorLog } from '../../logging';
-import { CdsDependencyGraph, EnhancedCdsProject } from '../parser/types';
+import { CdsDependencyGraph, CdsProject } from '../parser/types';
 
 /**
  * Attempt compilation with a specific command and configuration
@@ -43,11 +43,20 @@ function attemptCompilation(
       dependencyGraph.sourceRootDir,
       cdsCommand,
       cacheDir,
-      // Convert enhanced projects back to the format expected by compileCdsToJson
+      // Convert CDS projects to BasicCdsProject format expected by compileCdsToJson
       new Map(
         Array.from(dependencyGraph.projects.entries()).map(([key, value]) => [
           key,
-          value as import('../parser/types').CdsProject,
+          {
+            cdsFiles: value.cdsFiles,
+            cdsFilesToCompile: value.cdsFilesToCompile,
+            expectedOutputFiles: value.expectedOutputFiles,
+            projectDir: value.projectDir,
+            dependencies: value.dependencies,
+            imports: value.imports,
+            packageJson: value.packageJson,
+            compilationConfig: value.compilationConfig,
+          },
         ]),
       ),
       task.projectDir,
@@ -105,14 +114,14 @@ function createCompilationTask(
 }
 
 /**
- * Create enhanced compilation configuration with retry alternatives
+ * Create compilation configuration with retry alternatives
  */
-function createEnhancedCompilationConfig(
+function createCompilationConfig(
   primaryCommand: string,
   primaryCacheDir: string | undefined,
   useProjectLevel: boolean,
   alternatives: AlternativeCdsCommand[] = [],
-): EnhancedCompilationConfig {
+): CompilationConfig {
   return {
     primaryCdsCommand: primaryCommand,
     primaryCacheDir,
@@ -130,7 +139,7 @@ function createEnhancedCompilationConfig(
  */
 function executeCompilationTask(
   task: CompilationTask,
-  project: EnhancedCdsProject,
+  project: CdsProject,
   dependencyGraph: CdsDependencyGraph,
   codeqlExePath: string,
 ): void {
@@ -216,7 +225,7 @@ export function executeCompilationTasks(
   const compilationStartTime = new Date();
 
   // Collect all tasks and sort by priority
-  const allTasks: Array<{ task: CompilationTask; project: EnhancedCdsProject }> = [];
+  const allTasks: Array<{ task: CompilationTask; project: CdsProject }> = [];
 
   for (const project of dependencyGraph.projects.values()) {
     for (const task of project.compilationTasks) {
@@ -395,14 +404,14 @@ export function planCompilationTasks(
       // Determine primary CDS command
       const cdsCommand = determineCdsCommand(cacheDir, dependencyGraph.sourceRootDir);
 
-      // Create enhanced compilation configuration
-      const enhancedConfig = createEnhancedCompilationConfig(
+      // Create compilation configuration
+      const compilationConfig = createCompilationConfig(
         cdsCommand,
         cacheDir,
         project.cdsFilesToCompile.includes('__PROJECT_LEVEL_COMPILATION__'),
       );
 
-      project.enhancedCompilationConfig = enhancedConfig;
+      project.enhancedCompilationConfig = compilationConfig;
 
       // Create compilation tasks
       if (project.cdsFilesToCompile.includes('__PROJECT_LEVEL_COMPILATION__')) {

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

@@ -14,6 +14,6 @@ export type {
   CompilationAttempt,
   CompilationStatus,
   CompilationTask,
-  EnhancedCompilationConfig,
+  CompilationConfig,
 } from './types';
 export { getCdsVersion } from './version';

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

@@ -101,7 +101,7 @@ export interface CompilationTask {
 /**
  * Compilation configuration with retry alternatives
  */
-export interface EnhancedCompilationConfig {
+export interface CompilationConfig {
   /** Primary CDS command to use */
   primaryCdsCommand: string;
   /** Primary cache directory */