CDS extractor cleanup checkpoint 1

Author: data-douser

extractors/cds/tools/cds-extractor.ts

@@ -2,7 +2,6 @@ import { join } from 'path';
 
 import { sync as globSync } from 'glob';
 
-import { determineCdsCommand } from './src/cds';
 import { orchestrateCompilation } from './src/cds/compiler';
 import { buildCdsProjectDependencyGraph } from './src/cds/parser';
 import { runJavaScriptExtractor } from './src/codeql';
@@ -99,7 +98,7 @@ try {
     for (const [projectDir, project] of dependencyGraph.projects.entries()) {
       cdsExtractorLog(
         'info',
-        `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}, Compilations to run: ${project.cdsFilesToCompile.length}`,
       );
     }
   } else {
@@ -187,18 +186,6 @@ for (const project of dependencyGraph.projects.values()) {
   cdsFilePathsToProcess.push(...project.cdsFiles);
 }
 
-// Initialize CDS command cache early to avoid repeated testing during compilation.
-// This is a critical optimization that avoids testing commands for every single file.
-logPerformanceTrackingStart('CDS Command Cache Initialization');
-try {
-  determineCdsCommand(undefined, sourceRoot);
-  logPerformanceTrackingStop('CDS Command Cache Initialization');
-  cdsExtractorLog('info', 'CDS command cache initialized successfully');
-} catch (error) {
-  logPerformanceTrackingStop('CDS Command Cache Initialization');
-  cdsExtractorLog('warn', `CDS command cache initialization failed: ${String(error)}`);
-}
-
 // TODO : Improve logging / debugging of dependencyGraph.statusSummary. Just log the JSON?
 cdsExtractorLog(
   'info',

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

@@ -1,11 +1,6 @@
 import { determineCdsCommand } from './command';
 import { compileCdsToJson } from './compile';
-import {
-  AlternativeCdsCommand,
-  CompilationAttempt,
-  CompilationTask,
-  CompilationConfig,
-} from './types';
+import { CompilationAttempt, CompilationTask, CompilationConfig } from './types';
 import { addCompilationDiagnostic } from '../../diagnostics';
 import { cdsExtractorLog } from '../../logging';
 import { CdsDependencyGraph, CdsProject } from '../parser/types';
@@ -113,20 +108,15 @@ function createCompilationTask(
   };
 }
 
-/**
- * Create compilation configuration with retry alternatives
- */
 function createCompilationConfig(
-  primaryCommand: string,
-  primaryCacheDir: string | undefined,
+  cdsCommand: string,
+  cacheDir: string | undefined,
   useProjectLevel: boolean,
-  alternatives: AlternativeCdsCommand[] = [],
 ): CompilationConfig {
   return {
-    primaryCdsCommand: primaryCommand,
-    primaryCacheDir,
+    cdsCommand: cdsCommand,
+    cacheDir: cacheDir,
     useProjectLevelCompilation: useProjectLevel,
-    alternativeCommands: alternatives,
     versionCompatibility: {
       isCompatible: true, // Will be validated during planning
     },
@@ -135,7 +125,7 @@ function createCompilationConfig(
 }
 
 /**
- * Execute a single compilation task with retry logic
+ * Execute a single compilation task
  */
 function executeCompilationTask(
   task: CompilationTask,
@@ -150,58 +140,26 @@ function executeCompilationTask(
     throw new Error(`No compilation configuration found for project ${project.projectDir}`);
   }
 
-  let lastError: Error | undefined;
-
-  // Try primary command first
-  const primaryAttempt = attemptCompilation(
+  const compilationAttempt = attemptCompilation(
     task,
-    config.primaryCdsCommand,
-    config.primaryCacheDir,
+    config.cdsCommand,
+    config.cacheDir,
     dependencyGraph,
   );
 
-  if (primaryAttempt.result.success) {
+  if (compilationAttempt.result.success) {
     task.status = 'success';
     dependencyGraph.statusSummary.successfulCompilations++;
     return;
   }
 
-  lastError = primaryAttempt.error
-    ? new Error(primaryAttempt.error.message)
-    : new Error('Primary compilation failed');
-  task.status = 'retry';
-
-  // Try alternative commands if primary failed
-  for (const alternative of config.alternativeCommands) {
-    if (task.attempts.length >= config.maxRetryAttempts) {
-      break;
-    }
-
-    cdsExtractorLog(
-      'info',
-      `Retrying compilation for ${task.sourceFiles[0]} with alternative command: ${alternative.strategy}`,
-    );
-
-    const retryAttempt = attemptCompilation(
-      task,
-      alternative.command,
-      alternative.cacheDir,
-      dependencyGraph,
-    );
-
-    if (retryAttempt.result.success) {
-      task.status = 'success';
-      dependencyGraph.statusSummary.successfulCompilations++;
-      dependencyGraph.statusSummary.retriedCompilations++;
-      return;
-    }
-
-    lastError = retryAttempt.error ? new Error(retryAttempt.error.message) : lastError;
-  }
+  // Compilation failed - mark task as failed
+  const lastError = compilationAttempt.error
+    ? new Error(compilationAttempt.error.message)
+    : new Error('Compilation failed');
 
-  // All attempts failed
   task.status = 'failed';
-  task.errorSummary = lastError?.message || 'All compilation attempts failed';
+  task.errorSummary = lastError?.message || 'Compilation failed';
   dependencyGraph.statusSummary.failedCompilations++;
 
   // Add diagnostic for failed compilation
@@ -308,7 +266,6 @@ export function generateStatusReport(dependencyGraph: CdsDependencyGraph): strin
   lines.push(`  Successful: ${summary.successfulCompilations}`);
   lines.push(`  Failed: ${summary.failedCompilations}`);
   lines.push(`  Skipped: ${summary.skippedCompilations}`);
-  lines.push(`  Retried: ${summary.retriedCompilations}`);
   lines.push('');
 
   // Performance metrics
@@ -401,7 +358,7 @@ export function planCompilationTasks(
     try {
       const cacheDir = projectCacheDirMap.get(projectDir);
 
-      // Determine primary CDS command
+      // Determine CDS command
       const cdsCommand = determineCdsCommand(cacheDir, dependencyGraph.sourceRootDir);
 
       // Create compilation configuration

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

@@ -9,7 +9,6 @@ export {
 } from './graph';
 export { findProjectForCdsFile } from './project';
 export type {
-  AlternativeCdsCommand,
   CdsCompilationResult,
   CompilationAttempt,
   CompilationStatus,

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

@@ -1,23 +1,5 @@
 /** Types for the `src/cds/compiler` package. */
 
-/**
- * Alternative CDS command configuration for retry scenarios
- */
-export interface AlternativeCdsCommand {
-  /** The command string */
-  command: string;
-  /** Cache directory to use with this command */
-  cacheDir?: string;
-  /** Strategy identifier (e.g., 'global-cds', 'npx-cds-dk') */
-  strategy: string;
-  /** Version information if available */
-  version?: string;
-  /** Priority for trying this command (higher = try first) */
-  priority: number;
-  /** Whether this command has been tested successfully */
-  tested: boolean;
-}
-
 /**
  * Result of a CDS compilation attempt
  */
@@ -67,8 +49,7 @@ export type CompilationStatus =
   | 'in_progress' // Compilation is currently running
   | 'success' // Compilation completed successfully
   | 'failed' // Compilation failed
-  | 'skipped' // Compilation was skipped (e.g., already compiled)
-  | 'retry'; // Marked for retry with different configuration
+  | 'skipped'; // Compilation was skipped (e.g., already compiled)
 
 /**
  * Compilation task representing a unit of work (file or project-level compilation)
@@ -99,17 +80,15 @@ export interface CompilationTask {
 }
 
 /**
- * Compilation configuration with retry alternatives
+ * Compilation configuration for managing compilation commands and retries.
  */
 export interface CompilationConfig {
-  /** Primary CDS command to use */
-  primaryCdsCommand: string;
-  /** Primary cache directory */
-  primaryCacheDir?: string;
+  /** CDS command to use */
+  cdsCommand: string;
+  /** Cache directory */
+  cacheDir?: string;
   /** Whether to use project-level compilation */
   useProjectLevelCompilation: boolean;
-  /** Alternative commands to try if primary fails */
-  alternativeCommands: AlternativeCdsCommand[];
   /** Version compatibility information */
   versionCompatibility: {
     isCompatible: boolean;

extractors/cds/tools/src/cds/parser/functions.ts

@@ -410,23 +410,19 @@ export function determineCdsFilesToCompile(
     return [];
   }
 
-  // If there's only one CDS file, it should be compiled individually
+  // If there's only one CDS file, it should be compiled individually.
   if (project.cdsFiles.length === 1) {
     return [...project.cdsFiles];
   }
 
-  // Check if this looks like a CAP project with typical directory structure
   const absoluteProjectDir = join(sourceRootDir, project.projectDir);
   const hasCapStructure = hasTypicalCapDirectoryStructure(project.cdsFiles);
-  const isCapProject = isLikelyCdsProject(absoluteProjectDir);
+  const hasCapDeps = hasPackageJsonWithCapDeps(absoluteProjectDir);
 
   // Use project-level compilation only if:
-  // 1. It has CAP package.json dependencies OR
+  // 1. It has CAP package.json dependencies, OR
   // 2. It has the typical CAP directory structure (db/, srv/ etc.)
-  if (
-    project.cdsFiles.length > 1 &&
-    (hasCapStructure || (isCapProject && hasPackageJsonWithCapDeps(absoluteProjectDir)))
-  ) {
+  if (project.cdsFiles.length > 1 && (hasCapStructure || hasCapDeps)) {
     // For CAP projects, we should use project-level compilation
     // Return a special marker that indicates the entire project should be compiled together
     return ['__PROJECT_LEVEL_COMPILATION__'];

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

@@ -257,7 +257,6 @@ export function buildCdsProjectDependencyGraph(
       successfulCompilations: 0,
       failedCompilations: 0,
       skippedCompilations: 0,
-      retriedCompilations: 0,
       jsonFilesGenerated: 0,
       criticalErrors: [],
       warnings: [],

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

@@ -141,8 +141,6 @@ export interface ExtractionStatusSummary {
   failedCompilations: number;
   /** Skipped compilation tasks */
   skippedCompilations: number;
-  /** Tasks that required retries */
-  retriedCompilations: number;
   /** JSON files generated */
   jsonFilesGenerated: number;
   /** Critical errors that stopped extraction */
@@ -192,7 +190,7 @@ export interface CdsProject extends BasicCdsProject {
   /** Unique identifier for this project */
   id: string;
 
-  /** Compilation configuration with retry support */
+  /** Compilation configuration */
   enhancedCompilationConfig?: import('../compiler/types.js').CompilationConfig;
 
   /** Compilation tasks for this project */
@@ -268,7 +266,7 @@ export interface CdsDependencyGraph {
 
   /** Configuration and settings */
   config: {
-    /** Maximum retry attempts for compilation */
+    /** Maximum retry attempts for task re-execution */
     maxRetryAttempts: number;
     /** Whether to enable detailed logging */
     enableDetailedLogging: boolean;

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

@@ -9,7 +9,6 @@ export {
   findBestAvailableVersion,
   getAvailableVersions,
   getCacheStatistics,
-  logCacheStatistics,
   parseSemanticVersion,
   resolveCdsVersions,
   satisfiesRange,

extractors/cds/tools/src/packageManager/installer.ts

@@ -7,7 +7,7 @@ import type { CdsDependencyCombination } from './types';
 import { CdsDependencyGraph, CdsProject } from '../cds/parser/types';
 import { DiagnosticSeverity } from '../diagnostics';
 import { cdsExtractorLog } from '../logging';
-import { resolveCdsVersions, logCacheStatistics } from './versionResolver';
+import { resolveCdsVersions } from './versionResolver';
 
 const cacheSubDirName = '.cds-extractor-cache';
 
@@ -67,6 +67,10 @@ function extractUniqueDependencyCombinations(
     const cdsDkVersion = project.packageJson.devDependencies?.['@sap/cds-dk'] ?? cdsVersion;
 
     // Resolve versions first to ensure we cache based on actual resolved versions
+    cdsExtractorLog(
+      'info',
+      `Resolving available dependency versions for project '${project.projectDir}' with dependencies: [@sap/cds@${cdsVersion}, @sap/cds-dk@${cdsDkVersion}]`,
+    );
     const resolvedVersions = resolveCdsVersions(cdsVersion, cdsDkVersion);
     const { resolvedCdsVersion, resolvedCdsDkVersion, ...rest } = resolvedVersions;
 
@@ -303,7 +307,7 @@ export function installDependencies(
     cdsExtractorLog('info', 'All dependency combinations installed successfully.');
   }
 
-  // Log project to cache directory mappings for transparency
+  // Log project-to-cache-directory mappings for transparency.
   if (projectCacheDirMap.size > 0) {
     cdsExtractorLog('info', `Project to cache directory mappings:`);
     for (const [projectDir, cacheDir] of Array.from(projectCacheDirMap.entries())) {
@@ -317,9 +321,6 @@ export function installDependencies(
     );
   }
 
-  // Log cache statistics for debugging and performance monitoring
-  logCacheStatistics();
-
   return projectCacheDirMap;
 }
 

extractors/cds/tools/src/packageManager/versionResolver.ts

@@ -134,20 +134,12 @@ export function getAvailableVersions(packageName: string): string[] {
   // Check cache first
   if (availableVersionsCache.has(packageName)) {
     cacheStats.hits++;
-    cdsExtractorLog(
-      'info',
-      `Using cached versions for ${packageName} (cache hit rate: ${cacheStats.hitRate}%)`,
-    );
     return availableVersionsCache.get(packageName)!;
   }
 
   // Cache miss - fetch from npm
   cacheStats.misses++;
   try {
-    cdsExtractorLog(
-      'info',
-      `Fetching available versions for ${packageName} from npm registry (cache miss ${cacheStats.misses})...`,
-    );
     const output = execSync(`npm view ${packageName} versions --json`, {
       encoding: 'utf8',
       timeout: 30000, // 30 second timeout
@@ -164,10 +156,6 @@ export function getAvailableVersions(packageName: string): string[] {
 
     // Cache the result
     availableVersionsCache.set(packageName, versionArray);
-    cdsExtractorLog(
-      'info',
-      `Cached ${versionArray.length} versions for ${packageName} (cache hit rate: ${cacheStats.hitRate}%)`,
-    );
 
     return versionArray;
   } catch (error) {
@@ -196,17 +184,6 @@ export function getCacheStatistics(): {
   };
 }
 
-/**
- * Log current cache statistics
- */
-export function logCacheStatistics(): void {
-  const stats = getCacheStatistics();
-  cdsExtractorLog(
-    'info',
-    `Package version cache statistics: ${stats.hits} hits, ${stats.misses} misses, ${stats.hitRate}% hit rate, ${stats.cachedPackages.length} packages cached: [${stats.cachedPackages.join(', ')}]`,
-  );
-}
-
 /**
  * Parse a semantic version string
  * @param version Version string to parse (e.g., "6.1.3", "^6.0.0", "~6.1.0", "latest")